From admin at opensuse.org Sun Dec 1 01:40:27 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 01 Dec 2019 01:40:27 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals-debian8-jessie in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5de31a0ecb5ce_7c682adfe191260c48698a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals-debian8-jessie/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-gsm-manuals-debian8-jessie failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals-debian8-jessie Last lines of build log: [ 367s] [ 367s] A possible reason for transformation failure is invalid DocBook [ 367s] (as reported by xmllint) [ 367s] [ 367s] Error: pdflatex compilation failed [ 367s] [ 367s] ../build/Makefile.asciidoc.inc:61: recipe for target 'test-usermanual.pdf' failed [ 367s] make[3]: *** [test-usermanual.pdf] Error 1 [ 367s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 367s] Makefile:438: recipe for target 'all-recursive' failed [ 367s] make[2]: *** [all-recursive] Error 1 [ 367s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 367s] Makefile:362: recipe for target 'all' failed [ 367s] make[1]: *** [all] Error 2 [ 367s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 367s] dh_auto_build: make -j1 returned exit code 2 [ 367s] debian/rules:5: recipe for target 'binary' failed [ 367s] make: *** [binary] Error 2 [ 367s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 367s] [ 367s] cloud131 failed "build osmo-gsm-manuals-dev_0.2.0.9.45ff.dsc" at Sun Dec 1 01:40:22 UTC 2019. [ 367s] [ 367s] ### VM INTERACTION START ### [ 370s] [ 325.742993] sysrq: SysRq : Power Off [ 370s] [ 325.757829] reboot: Power down [ 370s] ### VM INTERACTION END ### [ 370s] [ 370s] cloud131 failed "build osmo-gsm-manuals-dev_0.2.0.9.45ff.dsc" at Sun Dec 1 01:40:25 UTC 2019. [ 370s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Dec 1 08:12:28 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 08:12:28 +0000 Subject: Change in osmo-bsc[master]: abis_nm.c: fix RSL connection temeout for trx->nr > 0 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16350 ) Change subject: abis_nm.c: fix RSL connection temeout for trx->nr > 0 ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/16350/1/src/osmo-bsc/abis_nm.c File src/osmo-bsc/abis_nm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/16350/1/src/osmo-bsc/abis_nm.c at 2705 PS1, Line 2705: trx = gsm_bts_trx_by_nr(sign_link->trx->bts, foh->obj_inst.trx_nr); > Probably better deferring using foh stuff after the verifications done in line 2707. Ack https://gerrit.osmocom.org/c/osmo-bsc/+/16350/1/src/osmo-bsc/abis_nm.c at 2743 PS1, Line 2743: if (trx == NULL) > Usually better using !trx for pointers. I wouldn's say !ptr is better. It's just more in-line with our existing coding style. Not critical to get merged, but definitely apperciated to follow existing style. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib4b9a198da11c88a51cfa78ffb7e7235a6365ef4 Gerrit-Change-Number: 16350 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 01 Dec 2019 08:12:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 08:27:40 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 08:27:40 +0000 Subject: Change in osmo-ggsn[master]: sgsnemu: Fix null-pointer format string argument References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/16353 ) Change subject: sgsnemu: Fix null-pointer format string argument ...................................................................... sgsnemu: Fix null-pointer format string argument Modern gcc-9.2.1 actually fails like this with --enable-werror active: In file included from sgsnemu.c:52: In function ?process_options?, inlined from ?main? at sgsnemu.c:1557:6: ../lib/syserr.h:31:3: error: ?%s? directive argument is null [-Werror=format-overflow=] 31 | logp2(sub, pri, __FILE__, __LINE__, 0, \ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 32 | fmt "\n", ##args); \ | ~~~~~~~~~~~~~~~~~ sgsnemu.c:435:3: note: in expansion of macro ?SYS_ERR? 435 | SYS_ERR(DSGSN, LOGL_ERROR, 0, | ^~~~~~~ sgsnemu.c: In function ?main?: sgsnemu.c:436:42: note: format string is defined here 436 | "Listening address must be specified: %s!", | ^~ It is correct: We are dereferencing args_info.listen_addr in a branch which explicitly checks if that is NULL beforehand :/ Change-Id: I417f447f821d396aa92049e0a791121240f1cf44 --- M sgsnemu/sgsnemu.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/53/16353/1 diff --git a/sgsnemu/sgsnemu.c b/sgsnemu/sgsnemu.c index 863ea51..7904c49 100644 --- a/sgsnemu/sgsnemu.c +++ b/sgsnemu/sgsnemu.c @@ -433,8 +433,7 @@ } } else { SYS_ERR(DSGSN, LOGL_ERROR, 0, - "Listening address must be specified: %s!", - args_info.listen_arg); + "Listening address must be specified!"); return -1; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/16353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I417f447f821d396aa92049e0a791121240f1cf44 Gerrit-Change-Number: 16353 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 08:31:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 08:31:30 +0000 Subject: Change in osmo-sgsn[master]: WIP: OsmoGbPROXY user manual In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/13763 to look at the new patch set (#4). Change subject: WIP: OsmoGbPROXY user manual ...................................................................... WIP: OsmoGbPROXY user manual This adds a very basic manual consisting of nothing more than the common chapters and a high-level description of what it is all about. Change-Id: I80d4ea016376c59995ccfcd8685c7c0e86745bd2 --- M doc/manuals/Makefile.am A doc/manuals/chapters/gbproxy.adoc A doc/manuals/osmogbproxy-usermanual-docinfo.xml A doc/manuals/osmogbproxy-usermanual.adoc 4 files changed, 212 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/63/13763/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/13763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I80d4ea016376c59995ccfcd8685c7c0e86745bd2 Gerrit-Change-Number: 13763 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 08:59:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 08:59:57 +0000 Subject: Change in osmo-sgsn[master]: Initial OsmoGbPROXY user manual In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/13763 ) Change subject: Initial OsmoGbPROXY user manual ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/13763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I80d4ea016376c59995ccfcd8685c7c0e86745bd2 Gerrit-Change-Number: 13763 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 01 Dec 2019 08:59:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 09:01:00 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 09:01:00 +0000 Subject: Change in libosmocore[master]: make use of OTC_GLOBAL when allocating library-internal contexts In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/13338 ) Change subject: make use of OTC_GLOBAL when allocating library-internal contexts ...................................................................... Patch Set 18: Code-Review-1 I think it breaks osmo-sgsn 'make check', I'll investigate. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/13338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I48f475efd3ee0d5120b8fc30861e852d1a6920b1 Gerrit-Change-Number: 13338 Gerrit-PatchSet: 18 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 01 Dec 2019 09:01:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 09:18:16 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 09:18:16 +0000 Subject: Change in osmo-gsm-manuals[master]: gsup: Fix description of Purge MS procedure References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16354 ) Change subject: gsup: Fix description of Purge MS procedure ...................................................................... gsup: Fix description of Purge MS procedure Change-Id: I5386e438a12edbc6c2ffa3e63400dd2756bb1be6 Closes: OS#1921 --- M common/chapters/gsup.adoc 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/54/16354/1 diff --git a/common/chapters/gsup.adoc b/common/chapters/gsup.adoc index e0034f9..1c18ae1 100644 --- a/common/chapters/gsup.adoc +++ b/common/chapters/gsup.adoc @@ -166,8 +166,9 @@ ==== Purge MS Using the Purge MS procedure, the SGSN or VLR can request purging of MS -related state from a previous SGSN or VLR during an inter-SGSN / inter-MSC location -update. +related state from the HLR. It is used after the SGSN or VLR detects that no radio +contact has been established for a prolonged duration (i.e. longer than the periodic LU +timeout). See 3GPP TS 23.012 Section 3.6.1.4 for a description of this procedure. .Purge MS (Normal Case) ["mscgen"] -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I5386e438a12edbc6c2ffa3e63400dd2756bb1be6 Gerrit-Change-Number: 16354 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 09:20:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 09:20:47 +0000 Subject: Change in osmo-gsm-manuals[master]: gsup: Fix description of Purge MS procedure In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16354 ) Change subject: gsup: Fix description of Purge MS procedure ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I5386e438a12edbc6c2ffa3e63400dd2756bb1be6 Gerrit-Change-Number: 16354 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 09:20:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 09:20:49 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 09:20:49 +0000 Subject: Change in osmo-gsm-manuals[master]: gsup: Fix description of Purge MS procedure In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16354 ) Change subject: gsup: Fix description of Purge MS procedure ...................................................................... gsup: Fix description of Purge MS procedure Change-Id: I5386e438a12edbc6c2ffa3e63400dd2756bb1be6 Closes: OS#1921 --- M common/chapters/gsup.adoc 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/common/chapters/gsup.adoc b/common/chapters/gsup.adoc index e0034f9..1c18ae1 100644 --- a/common/chapters/gsup.adoc +++ b/common/chapters/gsup.adoc @@ -166,8 +166,9 @@ ==== Purge MS Using the Purge MS procedure, the SGSN or VLR can request purging of MS -related state from a previous SGSN or VLR during an inter-SGSN / inter-MSC location -update. +related state from the HLR. It is used after the SGSN or VLR detects that no radio +contact has been established for a prolonged duration (i.e. longer than the periodic LU +timeout). See 3GPP TS 23.012 Section 3.6.1.4 for a description of this procedure. .Purge MS (Normal Case) ["mscgen"] -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I5386e438a12edbc6c2ffa3e63400dd2756bb1be6 Gerrit-Change-Number: 16354 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 10:17:08 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 10:17:08 +0000 Subject: Change in osmo-bsc[master]: abis_nm.c: fix RSL connection temeout for trx->nr > 0 In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/16350 to look at the new patch set (#2). Change subject: abis_nm.c: fix RSL connection temeout for trx->nr > 0 ...................................................................... abis_nm.c: fix RSL connection temeout for trx->nr > 0 After sending of NM_MT_IPACC_RSL_CONNECT message, we start a timer, and stop it on receipt of NM_MT_IPACC_RSL_CONNECT_{ACK,NACK}. When running a multi-trx setup, one can see the following warnings: DRSL NOTICE abis_nm.c:2852 (bts=0,trx=1) RSL connection request timed out DRSL NOTICE abis_nm.c:2852 (bts=0,trx=2) RSL connection request timed out even despite NM_MT_IPACC_RSL_CONNECT is actually being acknowledged. The problem is in abis_nm_rx_ipacc(): we cannot just use sign_link->trx, because the message itself was received over the OML link, so this pointer always gives us C0/TRX0. Instead, we must find a TRX by its number from the FOH header using gsm_bts_trx_by_nr(). Change-Id: Ib4b9a198da11c88a51cfa78ffb7e7235a6365ef4 --- M src/osmo-bsc/abis_nm.c 1 file changed, 21 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/50/16350/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib4b9a198da11c88a51cfa78ffb7e7235a6365ef4 Gerrit-Change-Number: 16350 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 10:18:54 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 10:18:54 +0000 Subject: Change in osmo-ggsn[master]: sgsnemu: Fix null-pointer format string argument In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/16353 ) Change subject: sgsnemu: Fix null-pointer format string argument ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/16353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I417f447f821d396aa92049e0a791121240f1cf44 Gerrit-Change-Number: 16353 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 01 Dec 2019 10:18:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 10:28:27 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 10:28:27 +0000 Subject: Change in libosmocore[master]: osmo_fsm: Esnure all state and event names are valid identifiers References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16355 ) Change subject: osmo_fsm: Esnure all state and event names are valid identifiers ...................................................................... osmo_fsm: Esnure all state and event names are valid identifiers we call osmo_identifier_valid() for the FSM name and FSM instance, but we forgot to do so for all the state and event names. This meant that they could contain spaces and the like, which in turn might create problems when exposing FSM state over CTRL. This patch shouldn't be merged as-is right now. We first have to use it to determine which of our existing programs have related issues. Change-Id: If98587eff3c48a66ed2e5cc1f01a12accab5a3e7 Closes: OS#4149 --- M src/fsm.c 1 file changed, 29 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/55/16355/1 diff --git a/src/fsm.c b/src/fsm.c index 1e8909e..2f270cb 100644 --- a/src/fsm.c +++ b/src/fsm.c @@ -286,10 +286,38 @@ */ int osmo_fsm_register(struct osmo_fsm *fsm) { + unsigned int i; + bool err = false; + + /* first collect all errors regarding identifiers (not just the first one) */ if (!osmo_identifier_valid(fsm->name)) { LOGP(DLGLOBAL, LOGL_ERROR, "Attempting to register FSM with illegal identifier '%s'\n", fsm->name); - return -EINVAL; + err = true; } + for (i = 0; i < fsm->num_states; i++) { + const struct osmo_fsm_state *states = fsm->states; + if (!osmo_identifier_valid(states[i].name)) { + LOGP(DLGLOBAL, LOGL_ERROR, "Attempting to register FSM with illegal " + "state name '%s'\n", states[i].name); + err = true; + } + } + if (fsm->event_names) { + const struct value_string *vs = fsm->event_names; + for (i = 0;; i++) { + if (vs[i].value == 0 && vs[i].str == NULL) + break; + if (!osmo_identifier_valid(vs[i].str)) { + LOGP(DLGLOBAL, LOGL_ERROR, "Attempting to register FSM with illegal" + "event name '%s'\n", vs[i].str); + err = true; + } + } + } + /* then return -EINVAL in case any identifier error[s] were encountered */ + if (err) + return -EINVAL; + if (osmo_fsm_find_by_name(fsm->name)) return -EEXIST; if (fsm->event_names == NULL) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If98587eff3c48a66ed2e5cc1f01a12accab5a3e7 Gerrit-Change-Number: 16355 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 10:37:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 10:37:39 +0000 Subject: Change in osmo-ci[master]: add '--publish' to osmo-asf4-dfu and osmo-ccid-firmware builds References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16356 ) Change subject: add '--publish' to osmo-asf4-dfu and osmo-ccid-firmware builds ...................................................................... add '--publish' to osmo-asf4-dfu and osmo-ccid-firmware builds Change-Id: Ie45b9fcabc35f6fd9aff33af0f0587c8ccd88ebd --- M jobs/master-builds.yml 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/56/16356/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index beebf31..58190cb 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -310,7 +310,12 @@ - osmocom-bb - osmo-sysmon - osmo-remsim - - osmo-asf4-dfu + - osmo-asf4-dfu: + cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' + email: gerrit-log at lists.osmocom.org laforge at gnumonks.org ewild at sysmocom.de + - osmo-ccid-firmware: + cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' + email: gerrit-log at lists.osmocom.org laforge at gnumonks.org ewild at sysmocom.de - simtrace2: cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' email: gerrit-log at lists.osmocom.org laforge at gnumonks.org kredon at sysmocom.de -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie45b9fcabc35f6fd9aff33af0f0587c8ccd88ebd Gerrit-Change-Number: 16356 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 10:38:15 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 10:38:15 +0000 Subject: Change in osmo-ci[master]: add '--publish' to osmo-asf4-dfu and osmo-ccid-firmware builds In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16356 ) Change subject: add '--publish' to osmo-asf4-dfu and osmo-ccid-firmware builds ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie45b9fcabc35f6fd9aff33af0f0587c8ccd88ebd Gerrit-Change-Number: 16356 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 10:38:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 10:38:16 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 10:38:16 +0000 Subject: Change in osmo-ci[master]: add '--publish' to osmo-asf4-dfu and osmo-ccid-firmware builds In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16356 ) Change subject: add '--publish' to osmo-asf4-dfu and osmo-ccid-firmware builds ...................................................................... add '--publish' to osmo-asf4-dfu and osmo-ccid-firmware builds Change-Id: Ie45b9fcabc35f6fd9aff33af0f0587c8ccd88ebd --- M jobs/master-builds.yml 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index beebf31..58190cb 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -310,7 +310,12 @@ - osmocom-bb - osmo-sysmon - osmo-remsim - - osmo-asf4-dfu + - osmo-asf4-dfu: + cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' + email: gerrit-log at lists.osmocom.org laforge at gnumonks.org ewild at sysmocom.de + - osmo-ccid-firmware: + cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' + email: gerrit-log at lists.osmocom.org laforge at gnumonks.org ewild at sysmocom.de - simtrace2: cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' email: gerrit-log at lists.osmocom.org laforge at gnumonks.org kredon at sysmocom.de -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie45b9fcabc35f6fd9aff33af0f0587c8ccd88ebd Gerrit-Change-Number: 16356 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 10:40:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 10:40:13 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds.yml: add osmo-fl2k In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/14921 ) Change subject: jobs/master-builds.yml: add osmo-fl2k ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/14921 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iac411a5d5e312b8db0b5388f58571141fb2f32df Gerrit-Change-Number: 14921 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 01 Dec 2019 10:40:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 10:40:16 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 10:40:16 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds.yml: add osmo-fl2k In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/14921 ) Change subject: jobs/master-builds.yml: add osmo-fl2k ...................................................................... jobs/master-builds.yml: add osmo-fl2k Related: OS#3203 Depends: https://lists.osmocom.org/pipermail/osmocom-sdr/2019-July/001951.html Change-Id: Iac411a5d5e312b8db0b5388f58571141fb2f32df --- M docker/Dockerfile_osmocom_jenkins.amd64 M jobs/master-builds.yml 2 files changed, 12 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64 index c5318fb..18402f3 100644 --- a/docker/Dockerfile_osmocom_jenkins.amd64 +++ b/docker/Dockerfile_osmocom_jenkins.amd64 @@ -19,6 +19,7 @@ bc \ bison \ bzip2 \ + cmake \ coccinelle \ cppcheck \ dahdi-source \ diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 58190cb..15acd12 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -194,6 +194,17 @@ concurrent: false cmd: 'PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"' + - osmo-fl2k: + concurrent: true + cmd: | + docker run --rm=true \ + -e HOME=/build \ + -e PARALLEL_MAKE="$PARALLEL_MAKE" \ + -e PATH="$PATH:/build_bin" \ + -w /build -i -u build \ + -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ + osmocom:amd64 /build/contrib/jenkins.sh + - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/14921 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iac411a5d5e312b8db0b5388f58571141fb2f32df Gerrit-Change-Number: 14921 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 11:53:38 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 11:53:38 +0000 Subject: Change in osmo-msc[master]: libmsc: fix potential NULL-pointer dereferences detected by GCC's LTO References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16357 ) Change subject: libmsc: fix potential NULL-pointer dereferences detected by GCC's LTO ...................................................................... libmsc: fix potential NULL-pointer dereferences detected by GCC's LTO Change-Id: Ib7ba8909dce64d1b8ff3a53495fe3eefc446ed8e --- M src/libmsc/msc_ho.c M src/libmsc/msc_vty.c 2 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/57/16357/1 diff --git a/src/libmsc/msc_ho.c b/src/libmsc/msc_ho.c index 99f37b6..a7f306e 100644 --- a/src/libmsc/msc_ho.c +++ b/src/libmsc/msc_ho.c @@ -67,9 +67,12 @@ void msc_ho_down_required_reject(struct msc_a *msc_a, enum gsm0808_cause cause) { - struct msc_i *msc_i = msc_a_msc_i(msc_a); + struct msc_i *msc_i; uint32_t event; + msc_i = msc_a_msc_i(msc_a); + OSMO_ASSERT(msc_i); + struct ran_msg ran_enc_msg = { .msg_type = RAN_MSG_HANDOVER_REQUIRED_REJECT, .handover_required_reject = { diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index f833585..cd82a07 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -1148,6 +1148,11 @@ struct gsm_sms *sms; sms = sms_from_text(receiver, sender_msisdn, 0, str); + if (!sms) { + LOGP(DLSMS, LOGL_ERROR, "Failed to allocate SMS\n"); + return CMD_WARNING; + } + sms->protocol_id = tp_pid; /* store in database for the queue */ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib7ba8909dce64d1b8ff3a53495fe3eefc446ed8e Gerrit-Change-Number: 16357 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 11:55:15 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 11:55:15 +0000 Subject: Change in simtrace2[master]: free USB buffer when allocation failed In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16097 ) Change subject: free USB buffer when allocation failed ...................................................................... Patch Set 2: late update: This relates to https://osmocom.org/issues/4251 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie9ebdd2ff966f67c9afd1ed760f106558f0091ad Gerrit-Change-Number: 16097 Gerrit-PatchSet: 2 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tsaitgaist Gerrit-CC: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 11:55:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:07:54 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 12:07:54 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_trx.c: fix potential NULL-pointer dereference References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16358 ) Change subject: trxcon/sched_trx.c: fix potential NULL-pointer dereference ...................................................................... trxcon/sched_trx.c: fix potential NULL-pointer dereference Change-Id: If1ecd9f5a70fa448327c62d38d76c8443b939248 --- M src/host/trxcon/sched_trx.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/58/16358/1 diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index 37d1acf..eb6f3dc 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -264,6 +264,8 @@ /* Choose proper multiframe layout */ ts->mf_layout = sched_mframe_layout(config, tn); + if (!ts->mf_layout) + return -EINVAL; if (ts->mf_layout->chan_config != config) return -EINVAL; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If1ecd9f5a70fa448327c62d38d76c8443b939248 Gerrit-Change-Number: 16358 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:19:25 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:19:25 +0000 Subject: Change in osmo-bsc[master]: check for osmo_fsm_register() error return value References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16359 ) Change subject: check for osmo_fsm_register() error return value ...................................................................... check for osmo_fsm_register() error return value Change-Id: I77e8ace007a3d6b9c40d3e158d1cdb7576aab77b --- M src/osmo-bsc/a_reset.c M src/osmo-bsc/abis_om2000.c 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/59/16359/1 diff --git a/src/osmo-bsc/a_reset.c b/src/osmo-bsc/a_reset.c index 9e046be..bc41914 100644 --- a/src/osmo-bsc/a_reset.c +++ b/src/osmo-bsc/a_reset.c @@ -151,7 +151,7 @@ /* Register the fsm description (if not already done) */ if (osmo_fsm_find_by_name(fsm.name) != &fsm) - osmo_fsm_register(&fsm); + OSMO_ASSERT(osmo_fsm_register(&fsm) == 0); /* Allocate and configure a new fsm instance */ reset_ctx = talloc_zero(msc, struct reset_ctx); diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c index e6b06c3..14c373b 100644 --- a/src/osmo-bsc/abis_om2000.c +++ b/src/osmo-bsc/abis_om2000.c @@ -2764,7 +2764,7 @@ static __attribute__((constructor)) void abis_om2k_init(void) { - osmo_fsm_register(&om2k_mo_fsm); - osmo_fsm_register(&om2k_bts_fsm); - osmo_fsm_register(&om2k_trx_fsm); + OSMO_ASSERT(osmo_fsm_register(&om2k_mo_fsm) == 0); + OSMO_ASSERT(osmo_fsm_register(&om2k_bts_fsm) == 0); + OSMO_ASSERT(osmo_fsm_register(&om2k_trx_fsm) == 0); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I77e8ace007a3d6b9c40d3e158d1cdb7576aab77b Gerrit-Change-Number: 16359 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:19:25 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:19:25 +0000 Subject: Change in osmo-bsc[master]: check for osmo_ss7_init() error return value References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16360 ) Change subject: check for osmo_ss7_init() error return value ...................................................................... check for osmo_ss7_init() error return value Change-Id: I0297352e3cba5f01a971dc5924f0fcc67d1e6b32 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/16360/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index da2914d..b18172c 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -847,7 +847,7 @@ logging_vty_add_deprecated_subsys(tall_bsc_ctx, "mgcp"); /* Initialize SS7 */ - osmo_ss7_init(); + OSMO_ASSERT(osmo_ss7_init() == 0); osmo_ss7_vty_init_asp(tall_bsc_ctx); osmo_sccp_vty_init(); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0297352e3cba5f01a971dc5924f0fcc67d1e6b32 Gerrit-Change-Number: 16360 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:22:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:22:43 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Check for osmo_fsm_register() error return value References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/16361 ) Change subject: mgcp_client: Check for osmo_fsm_register() error return value ...................................................................... mgcp_client: Check for osmo_fsm_register() error return value Change-Id: Ie5e7fa419117349d098b0158ed840341094f3c16 --- M src/libosmo-mgcp-client/mgcp_client_fsm.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/61/16361/1 diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c index 800ae1b..e910586 100644 --- a/src/libosmo-mgcp-client/mgcp_client_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c @@ -620,7 +620,8 @@ /* Register the fsm description (if not already done) */ if (fsm_registered == false) { - osmo_fsm_register(&fsm_mgcp_client); + if (osmo_fsm_register(&fsm_mgcp_client) < 0) + return NULL; fsm_registered = true; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/16361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie5e7fa419117349d098b0158ed840341094f3c16 Gerrit-Change-Number: 16361 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:25:24 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:25:24 +0000 Subject: Change in osmo-sgsn[master]: check for osmo_fsm_register() error return values References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16362 ) Change subject: check for osmo_fsm_register() error return values ...................................................................... check for osmo_fsm_register() error return values Change-Id: I2028c82ac1b0421101c3f5d04fd999b65abdbf08 --- M src/sgsn/gprs_gmm_attach.c M src/sgsn/gprs_gmm_fsm.c M src/sgsn/gprs_mm_state_gb_fsm.c M src/sgsn/gprs_mm_state_iu_fsm.c 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/62/16362/1 diff --git a/src/sgsn/gprs_gmm_attach.c b/src/sgsn/gprs_gmm_attach.c index 130f8d1..c903a01 100644 --- a/src/sgsn/gprs_gmm_attach.c +++ b/src/sgsn/gprs_gmm_attach.c @@ -449,7 +449,7 @@ static __attribute__((constructor)) void gprs_gmm_fsm_init(void) { - osmo_fsm_register(&gmm_attach_req_fsm); + OSMO_ASSERT(osmo_fsm_register(&gmm_attach_req_fsm) == 0); } void gmm_att_req_free(struct sgsn_mm_ctx *mm) { diff --git a/src/sgsn/gprs_gmm_fsm.c b/src/sgsn/gprs_gmm_fsm.c index fac06f2..94ecb50 100644 --- a/src/sgsn/gprs_gmm_fsm.c +++ b/src/sgsn/gprs_gmm_fsm.c @@ -183,5 +183,5 @@ static __attribute__((constructor)) void gmm_fsm_init(void) { - osmo_fsm_register(&gmm_fsm); + OSMO_ASSERT(osmo_fsm_register(&gmm_fsm) == 0); } diff --git a/src/sgsn/gprs_mm_state_gb_fsm.c b/src/sgsn/gprs_mm_state_gb_fsm.c index 4e1ed48..da3f342 100644 --- a/src/sgsn/gprs_mm_state_gb_fsm.c +++ b/src/sgsn/gprs_mm_state_gb_fsm.c @@ -119,5 +119,5 @@ static __attribute__((constructor)) void mm_state_gb_fsm_init(void) { - osmo_fsm_register(&mm_state_gb_fsm); + OSMO_ASSERT(osmo_fsm_register(&mm_state_gb_fsm) == 0); } diff --git a/src/sgsn/gprs_mm_state_iu_fsm.c b/src/sgsn/gprs_mm_state_iu_fsm.c index 1ed5f56..5e40255 100644 --- a/src/sgsn/gprs_mm_state_iu_fsm.c +++ b/src/sgsn/gprs_mm_state_iu_fsm.c @@ -117,5 +117,5 @@ static __attribute__((constructor)) void mm_state_iu_fsm_init(void) { - osmo_fsm_register(&mm_state_iu_fsm); + OSMO_ASSERT(osmo_fsm_register(&mm_state_iu_fsm) == 0); } -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I2028c82ac1b0421101c3f5d04fd999b65abdbf08 Gerrit-Change-Number: 16362 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:25:24 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:25:24 +0000 Subject: Change in osmo-sgsn[master]: check for osmo_ss7_init() error return value References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16363 ) Change subject: check for osmo_ss7_init() error return value ...................................................................... check for osmo_ss7_init() error return value Change-Id: Ic228273aa6fb197b78c70c467a4a99af317e8098 --- M src/sgsn/sgsn_main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/63/16363/1 diff --git a/src/sgsn/sgsn_main.c b/src/sgsn/sgsn_main.c index eef5f8f..7d9a851 100644 --- a/src/sgsn/sgsn_main.c +++ b/src/sgsn/sgsn_main.c @@ -393,7 +393,7 @@ ctrl_vty_init(tall_sgsn_ctx); #if BUILD_IU - osmo_ss7_init(); + OSMO_ASSERT(osmo_ss7_init() == 0); osmo_ss7_vty_init_asp(tall_sgsn_ctx); osmo_sccp_vty_init(); #endif -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ic228273aa6fb197b78c70c467a4a99af317e8098 Gerrit-Change-Number: 16363 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:25:56 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:25:56 +0000 Subject: Change in osmo-msc[master]: libmsc: fix potential NULL-pointer dereferences detected by GCC's LTO In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16357 ) Change subject: libmsc: fix potential NULL-pointer dereferences detected by GCC's LTO ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib7ba8909dce64d1b8ff3a53495fe3eefc446ed8e Gerrit-Change-Number: 16357 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 12:25:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:30:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:30:39 +0000 Subject: Change in osmo-ccid-firmware[master]: Check for osmo_fsm_register() error return value References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16364 ) Change subject: Check for osmo_fsm_register() error return value ...................................................................... Check for osmo_fsm_register() error return value Change-Id: Id2556cf01341b67735fff2685d2f7532f50a4850 --- M ccid_common/iso7816_fsm.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/64/16364/1 diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c index 412bea7..c9eba8d 100644 --- a/ccid_common/iso7816_fsm.c +++ b/ccid_common/iso7816_fsm.c @@ -1609,8 +1609,8 @@ static __attribute__((constructor)) void on_dso_load_iso7816(void) { - osmo_fsm_register(&iso7816_3_fsm); - osmo_fsm_register(&atr_fsm); - osmo_fsm_register(&tpdu_fsm); - osmo_fsm_register(&pps_fsm); + OSMO_ASSERT(osmo_fsm_register(&iso7816_3_fsm) == 0); + OSMO_ASSERT(osmo_fsm_register(&atr_fsm) == 0); + OSMO_ASSERT(osmo_fsm_register(&tpdu_fsm) == 0); + OSMO_ASSERT(osmo_fsm_register(&pps_fsm) == 0); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Id2556cf01341b67735fff2685d2f7532f50a4850 Gerrit-Change-Number: 16364 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:31:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:31:51 +0000 Subject: Change in osmocom-bb[master]: Check for osmo_fsm_register() error return value References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16365 ) Change subject: Check for osmo_fsm_register() error return value ...................................................................... Check for osmo_fsm_register() error return value Change-Id: I3e849b7ec8a7ed610f779dac57cc0c1d1aeb1aa5 --- M src/host/trxcon/trxcon.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/65/16365/1 diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c index 8e371df..ebc6f80 100644 --- a/src/host/trxcon/trxcon.c +++ b/src/host/trxcon/trxcon.c @@ -274,7 +274,7 @@ trx_log_init(tall_trxcon_ctx, app_data.debug_mask); /* Allocate the application state machine */ - osmo_fsm_register(&trxcon_fsm_def); + OSMO_ASSERT(osmo_fsm_register(&trxcon_fsm_def) == 0); trxcon_fsm = osmo_fsm_inst_alloc(&trxcon_fsm_def, tall_trxcon_ctx, NULL, LOGL_DEBUG, "main"); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3e849b7ec8a7ed610f779dac57cc0c1d1aeb1aa5 Gerrit-Change-Number: 16365 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:34:55 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:34:55 +0000 Subject: Change in osmo-remsim[master]: Check for osmo_fsm_register() error return value References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16366 ) Change subject: Check for osmo_fsm_register() error return value ...................................................................... Check for osmo_fsm_register() error return value Change-Id: Idda1a4050cf9d285225ae48a4ba6f48c04f9598b --- M src/bankd_client_fsm.c M src/rspro_client_fsm.c M src/server/rspro_server.c 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/66/16366/1 diff --git a/src/bankd_client_fsm.c b/src/bankd_client_fsm.c index cedb597..2e3fdc9 100644 --- a/src/bankd_client_fsm.c +++ b/src/bankd_client_fsm.c @@ -271,5 +271,5 @@ static __attribute__((constructor)) void on_dso_load(void) { - osmo_fsm_register(&remsim_client_bankd_fsm); + OSMO_ASSERT(osmo_fsm_register(&remsim_client_bankd_fsm) == 0); } diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index 45cd08e..c01a763 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -382,5 +382,5 @@ static __attribute__((constructor)) void on_dso_load(void) { - osmo_fsm_register(&rspro_client_server_fsm); + OSMO_ASSERT(osmo_fsm_register(&rspro_client_server_fsm) == 0); } diff --git a/src/server/rspro_server.c b/src/server/rspro_server.c index c753f16..0d059fa 100644 --- a/src/server/rspro_server.c +++ b/src/server/rspro_server.c @@ -491,7 +491,7 @@ static __attribute__((constructor)) void on_dso_load(void) { - osmo_fsm_register(&remsim_server_client_fsm); + OSMO_ASSERT(osmo_fsm_register(&remsim_server_client_fsm) == 0); } -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Idda1a4050cf9d285225ae48a4ba6f48c04f9598b Gerrit-Change-Number: 16366 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:39:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:39:12 +0000 Subject: Change in libosmocore[master]: Check for osmo_fsm_register() error return value References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16367 ) Change subject: Check for osmo_fsm_register() error return value ...................................................................... Check for osmo_fsm_register() error return value Change-Id: Idbc1557739b2a253b73914e6f1f18a6d169d882e --- M tests/fsm/fsm_dealloc_test.c M tests/fsm/fsm_test.c M tests/tdef/tdef_test.c M tests/use_count/use_count_test.c 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/67/16367/1 diff --git a/tests/fsm/fsm_dealloc_test.c b/tests/fsm/fsm_dealloc_test.c index 9a6974d..48f80e5 100644 --- a/tests/fsm/fsm_dealloc_test.c +++ b/tests/fsm/fsm_dealloc_test.c @@ -452,7 +452,7 @@ log_set_category_filter(osmo_stderr_target, DLGLOBAL, 1, LOGL_DEBUG); - osmo_fsm_register(&test_fsm); + OSMO_ASSERT(osmo_fsm_register(&test_fsm) == 0); test_osmo_fsm_term_safely(); test_osmo_fsm_set_dealloc_ctx(); diff --git a/tests/fsm/fsm_test.c b/tests/fsm/fsm_test.c index f8ebdc7..911aad8 100644 --- a/tests/fsm/fsm_test.c +++ b/tests/fsm/fsm_test.c @@ -417,7 +417,7 @@ g_ctx = NULL; OSMO_ASSERT(osmo_fsm_find_by_name(fsm.name) == NULL); - osmo_fsm_register(&fsm); + OSMO_ASSERT(osmo_fsm_register(&fsm) == 0); OSMO_ASSERT(osmo_fsm_find_by_name(fsm.name) == &fsm); OSMO_ASSERT(osmo_fsm_inst_find_by_name(&fsm, "my_id") == NULL); diff --git a/tests/tdef/tdef_test.c b/tests/tdef/tdef_test.c index 276330a..9c0808e 100644 --- a/tests/tdef/tdef_test.c +++ b/tests/tdef/tdef_test.c @@ -475,7 +475,7 @@ log_set_print_category(osmo_stderr_target, 1); log_set_use_color(osmo_stderr_target, 0); - osmo_fsm_register(&test_tdef_fsm); + OSMO_ASSERT(osmo_fsm_register(&test_tdef_fsm) == 0); test_tdef_get(argc > 1); test_tdef_get_nonexisting(); diff --git a/tests/use_count/use_count_test.c b/tests/use_count/use_count_test.c index 0b081c9..95af308 100644 --- a/tests/use_count/use_count_test.c +++ b/tests/use_count/use_count_test.c @@ -331,7 +331,7 @@ log_set_print_level(osmo_stderr_target, 1); log_set_use_color(osmo_stderr_target, 0); - osmo_fsm_register(&foo_fsm); + OSMO_ASSERT(osmo_fsm_register(&foo_fsm) == 0); test_use_count_fsm(); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idbc1557739b2a253b73914e6f1f18a6d169d882e Gerrit-Change-Number: 16367 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:39:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:39:13 +0000 Subject: Change in libosmocore[master]: gprs_ns_instantiate(): propagate errors from gprs_sns_init() to caller References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16368 ) Change subject: gprs_ns_instantiate(): propagate errors from gprs_sns_init() to caller ...................................................................... gprs_ns_instantiate(): propagate errors from gprs_sns_init() to caller Change-Id: I71f347a2f0376716e5f83d33a7931eb8a99aad77 --- M src/gb/gprs_ns.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/16368/1 diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index c77ebb3..5e6da17 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -1887,7 +1887,9 @@ struct gprs_ns_inst *nsi = talloc_zero(ctx, struct gprs_ns_inst); if (!gprs_sns_fsm_registered) { - gprs_sns_init(); + rc = gprs_sns_init(); + if (rc < 0) + return NULL; gprs_sns_fsm_registered = true; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I71f347a2f0376716e5f83d33a7931eb8a99aad77 Gerrit-Change-Number: 16368 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:41:49 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:41:49 +0000 Subject: Change in libosmocore[master]: gprs_ns_instantiate(): propagate errors from gprs_sns_init() to caller In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/16368 to look at the new patch set (#2). Change subject: gprs_ns_instantiate(): propagate errors from gprs_sns_init() to caller ...................................................................... gprs_ns_instantiate(): propagate errors from gprs_sns_init() to caller Change-Id: I71f347a2f0376716e5f83d33a7931eb8a99aad77 --- M src/gb/gprs_ns.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/16368/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I71f347a2f0376716e5f83d33a7931eb8a99aad77 Gerrit-Change-Number: 16368 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:42:22 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:42:22 +0000 Subject: Change in osmo-bsc[master]: check for osmo_ss7_init() error return value In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16360 ) Change subject: check for osmo_ss7_init() error return value ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0297352e3cba5f01a971dc5924f0fcc67d1e6b32 Gerrit-Change-Number: 16360 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 12:42:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:42:34 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:42:34 +0000 Subject: Change in osmo-bsc[master]: check for osmo_fsm_register() error return value In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16359 ) Change subject: check for osmo_fsm_register() error return value ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I77e8ace007a3d6b9c40d3e158d1cdb7576aab77b Gerrit-Change-Number: 16359 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 12:42:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:42:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:42:37 +0000 Subject: Change in osmo-bsc[master]: check for osmo_fsm_register() error return value In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16359 ) Change subject: check for osmo_fsm_register() error return value ...................................................................... check for osmo_fsm_register() error return value Change-Id: I77e8ace007a3d6b9c40d3e158d1cdb7576aab77b --- M src/osmo-bsc/a_reset.c M src/osmo-bsc/abis_om2000.c 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bsc/a_reset.c b/src/osmo-bsc/a_reset.c index 9e046be..bc41914 100644 --- a/src/osmo-bsc/a_reset.c +++ b/src/osmo-bsc/a_reset.c @@ -151,7 +151,7 @@ /* Register the fsm description (if not already done) */ if (osmo_fsm_find_by_name(fsm.name) != &fsm) - osmo_fsm_register(&fsm); + OSMO_ASSERT(osmo_fsm_register(&fsm) == 0); /* Allocate and configure a new fsm instance */ reset_ctx = talloc_zero(msc, struct reset_ctx); diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c index e6b06c3..14c373b 100644 --- a/src/osmo-bsc/abis_om2000.c +++ b/src/osmo-bsc/abis_om2000.c @@ -2764,7 +2764,7 @@ static __attribute__((constructor)) void abis_om2k_init(void) { - osmo_fsm_register(&om2k_mo_fsm); - osmo_fsm_register(&om2k_bts_fsm); - osmo_fsm_register(&om2k_trx_fsm); + OSMO_ASSERT(osmo_fsm_register(&om2k_mo_fsm) == 0); + OSMO_ASSERT(osmo_fsm_register(&om2k_bts_fsm) == 0); + OSMO_ASSERT(osmo_fsm_register(&om2k_trx_fsm) == 0); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I77e8ace007a3d6b9c40d3e158d1cdb7576aab77b Gerrit-Change-Number: 16359 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:42:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:42:37 +0000 Subject: Change in osmo-bsc[master]: check for osmo_ss7_init() error return value In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16360 ) Change subject: check for osmo_ss7_init() error return value ...................................................................... check for osmo_ss7_init() error return value Change-Id: I0297352e3cba5f01a971dc5924f0fcc67d1e6b32 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index da2914d..b18172c 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -847,7 +847,7 @@ logging_vty_add_deprecated_subsys(tall_bsc_ctx, "mgcp"); /* Initialize SS7 */ - osmo_ss7_init(); + OSMO_ASSERT(osmo_ss7_init() == 0); osmo_ss7_vty_init_asp(tall_bsc_ctx); osmo_sccp_vty_init(); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0297352e3cba5f01a971dc5924f0fcc67d1e6b32 Gerrit-Change-Number: 16360 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:42:45 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:42:45 +0000 Subject: Change in osmo-ccid-firmware[master]: Check for osmo_fsm_register() error return value In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16364 ) Change subject: Check for osmo_fsm_register() error return value ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Id2556cf01341b67735fff2685d2f7532f50a4850 Gerrit-Change-Number: 16364 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 12:42:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:42:46 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:42:46 +0000 Subject: Change in osmo-ccid-firmware[master]: Check for osmo_fsm_register() error return value In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16364 ) Change subject: Check for osmo_fsm_register() error return value ...................................................................... Check for osmo_fsm_register() error return value Change-Id: Id2556cf01341b67735fff2685d2f7532f50a4850 --- M ccid_common/iso7816_fsm.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c index 412bea7..c9eba8d 100644 --- a/ccid_common/iso7816_fsm.c +++ b/ccid_common/iso7816_fsm.c @@ -1609,8 +1609,8 @@ static __attribute__((constructor)) void on_dso_load_iso7816(void) { - osmo_fsm_register(&iso7816_3_fsm); - osmo_fsm_register(&atr_fsm); - osmo_fsm_register(&tpdu_fsm); - osmo_fsm_register(&pps_fsm); + OSMO_ASSERT(osmo_fsm_register(&iso7816_3_fsm) == 0); + OSMO_ASSERT(osmo_fsm_register(&atr_fsm) == 0); + OSMO_ASSERT(osmo_fsm_register(&tpdu_fsm) == 0); + OSMO_ASSERT(osmo_fsm_register(&pps_fsm) == 0); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Id2556cf01341b67735fff2685d2f7532f50a4850 Gerrit-Change-Number: 16364 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:42:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:42:57 +0000 Subject: Change in osmo-sgsn[master]: Initial OsmoGbPROXY user manual In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/13763 ) Change subject: Initial OsmoGbPROXY user manual ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/13763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I80d4ea016376c59995ccfcd8685c7c0e86745bd2 Gerrit-Change-Number: 13763 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 12:42:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:42:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:42:58 +0000 Subject: Change in osmo-sgsn[master]: Initial OsmoGbPROXY user manual In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/13763 ) Change subject: Initial OsmoGbPROXY user manual ...................................................................... Initial OsmoGbPROXY user manual This adds a very basic manual consisting of nothing more than the common chapters and a high-level description of what it is all about. Change-Id: I80d4ea016376c59995ccfcd8685c7c0e86745bd2 --- M doc/manuals/Makefile.am A doc/manuals/chapters/gbproxy-configuration.adoc A doc/manuals/chapters/gbproxy-control.adoc A doc/manuals/chapters/gbproxy-overview.adoc A doc/manuals/chapters/gbproxy-running.adoc A doc/manuals/osmogbproxy-usermanual-docinfo.xml A doc/manuals/osmogbproxy-usermanual.adoc 7 files changed, 284 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am index 4c6b847..72e8c77 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile.am @@ -1,12 +1,14 @@ EXTRA_DIST = osmosgsn-usermanual.adoc \ osmosgsn-usermanual-docinfo.xml \ osmosgsn-vty-reference.xml \ + osmogbproxy-usermanual.adoc \ + osmogbproxy-usermanual-docinfo.xml \ regen_doc.sh \ chapters \ vty if BUILD_MANUALS - ASCIIDOC = osmosgsn-usermanual.adoc + ASCIIDOC = osmosgsn-usermanual.adoc osmogbproxy-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc diff --git a/doc/manuals/chapters/gbproxy-configuration.adoc b/doc/manuals/chapters/gbproxy-configuration.adoc new file mode 100644 index 0000000..599b3f7 --- /dev/null +++ b/doc/manuals/chapters/gbproxy-configuration.adoc @@ -0,0 +1,6 @@ +== Configuring OsmoGbPROXY + +TBD. Unfortunately this chapter of the manual still needs to be written. +Osmocom has very limited funding and support resources; Feel free to help +us completing this documentation by contributing with code, documentation +or by supporting the developers financially. diff --git a/doc/manuals/chapters/gbproxy-control.adoc b/doc/manuals/chapters/gbproxy-control.adoc new file mode 100644 index 0000000..afe23ad --- /dev/null +++ b/doc/manuals/chapters/gbproxy-control.adoc @@ -0,0 +1,29 @@ +[[control]] +== Control interface + +The actual protocol is described in <>, the variables +common to all programs using it are described in <>. Here we +describe variables specific to OsmoGbPROXY. + +.Variables available over control interface +[options="header",width="100%",cols="20%,5%,5%,50%,20%"] +|=== +|Name|Access|Trap|Value|Comment +|nsvc-state|RO|No|",,,,,,"|See <> for details. +|gbproxy-state|RO|No|",,,,,,"|See <> for details. +|number-of-peers|RO|No|""|Count of concurrent BSS(BTS) peers. +|=== + +[[nsvc_state]] +=== nsvc-state + +Return the list of active NS-VCs (NS Virtual Circuits), including information +on the key parameters, such as NSEI, NSVCI and the local + remote ALIVE +and BLOCKED state. + +[[gbproxy_state]] +=== gbproxy-state + +Return the list of active Peers, including information on the key +parameters, such as NSEI, BVCI, and the MCC-MNC-LAC-RAC of the attached +BSS, as well as the overall state (BLOCKED or UNBLOCKED). diff --git a/doc/manuals/chapters/gbproxy-overview.adoc b/doc/manuals/chapters/gbproxy-overview.adoc new file mode 100644 index 0000000..580afae --- /dev/null +++ b/doc/manuals/chapters/gbproxy-overview.adoc @@ -0,0 +1,127 @@ +[[chapter_overview]] +== Overview + +=== About OsmoGbPROXY + +OsmoGbPROXY is the Osmocom proxy for the 3GPP Gb interface. The Gb +interface is defined by 3GPP as the protocol between the BSS and the +SGSN inside the 2G/2.5G/2.75G packet switched network domain. + +As Osmocom implements a BTS-colocated PCU, there are potentially many +Gb interface connections between all those many PCUs in the network +and the SGSN. This can be cumbersome to configure/maintain at the +SGSN sine. + +OsmoGbPROXY aggregates many PCU-facing Gb connections into one Gb +connection to the SGSN. This is achieved by + +* maintaining sepaate NS-VCs on the PCU side and on the SGSN side +* more or less transparently routing BSSGP peer-to-peer Virtual Circuits + (BVCs) through the proxy +* having some special handling for the signaling BVC (BVCI=0) which is + shared among all the PCUs connected to the proxy + +=== Data Model + +==== gbproxy_config + +This contains the parsed configuration of the OsmoGbPROXY. + +==== gproxy_peer + +A "peer" is any remote NS-entity that the proxy interacts with. A peer +includes information about: + +* the [unique] NSEI of the peer +* the [unique] BVCI of the peer +* the Routeing Area (RA) of the peer + +==== gbproxy_tlli_state + +One of the (unique) TLLI of any of the subscribers/UEs attached to any of +the BTSs/PCUs served by the proxy. + +==== gbproxy_link_info + +One of the [unique] subscribers/connections that are served through this +proxy. The information includes + +* the TLLI on BSS side +* the TLLI on SGSN side (may be different due to P-TMSI rewriting) +* the NSEI of the SGSN for this link +* a timestamp when we last conversed with this subscriber +* state related to IMSI acquisition +** a temporary queue of stored messages (until IMSI acquisition succeeds) +** N(U) rewriting state (inserting IDENTTIY REQ changes LLC sequence numbers) + +==== gbproxy_match + +A single matching rule against which IMSIs are matched. The matching rule +is expressed as regular expression. There can be one such matching rule for +each + +* routing between two different SGSNs, see below +* patching of messages (e.g. APN, PLMN) + + +=== Advanced Features + +==== PLMN patching + +This feature permits to modify the PLMN inside any BSSGP messages +containing the Routing Area ID (RAID). + +The configured core-mcc and core-mnc will be used towards the SGSN, +irrespective of which MCC/MNC the PCU is using/reporting on Gb. + +==== APN patching + +This will transparently re-write the APN name inside SM ACTIVATE PDP +REQUEST messages on the way from the MS to the SGSN. The patching is +performed based on matching on the IMSI of the subscriber. + +The configured core-apn will be used towards the SGSN, irrespective +of which APN the MS is requesting in its Layer3 signaling. + +APN patching can only be performed if no GPRS encryption is enabled in +the network! + +APN patching is useful in case a valid APN cannot reliably be +provisioned via other means, such as via the SIM Card, OTA-DM or via +CAMEL rewriting in the SGSN. + +==== P-TMSI patching + +This feature transparently rewrite the P-TMSI between MS and SGSN. This +is required when using the Secondary SGSN support, as both SGSNs could +allocate overlapping TMSIs and we must make sure they're unique across +both SGSNs. + +P-TMSI patching is required by (and hence automatically enablede if +secondary SGSN support is enabled. + +P-TMSI patching can only be performed if no GPRS encryption is enabled in +the network! + +==== IMSI Acquisition + +This is a special feature where the proxy will by itself inject GMM IDENTITY +REQUEST messages for the IMSI into the downlink BSSGP traffic in order +to establish the IMSI of subscribers for which it is not otherwise known + +IMSI acquisition is automatically enabled if secondary SGSN support is +enabled. + +==== Secondary SGSN Support + +This allows the proxy to connect not only to one SGSN, but to two +different SGSNs. IMSI matching rules are applied to determine which of +the SGSNs is to be used for traffic of this subscriber. + +One possible use case of this feature is to have a "local break-out" for +subscribers who are native to this network (and hence save +latencies/overhead of back-hauling all related traffic via the +SGSN+GGSN) while at the same time maintaining the classic behavior for +inbound roaming subscribers, where the roaming agreements mandate that +data traffic is brought back to the GGSN in the HPLMN via the SGSN of +the VPLMN. diff --git a/doc/manuals/chapters/gbproxy-running.adoc b/doc/manuals/chapters/gbproxy-running.adoc new file mode 100644 index 0000000..cac54be --- /dev/null +++ b/doc/manuals/chapters/gbproxy-running.adoc @@ -0,0 +1,39 @@ +== Running OsmoGbPROXY + +The OsmoGbPROXY executable (`osmo-gbproxy`) offers the following command-line +options: + + +=== SYNOPSIS + +*osmo-gbproxy* [-h|-V] [-d 'DBGMASK'] [-D] [-c 'CONFIGFILE'] [-s] [-e 'LOGLEVEL'] [-T] + + +=== OPTIONS + +*-h, --help*:: + Print a short help message about the supported options +*-V, --version*:: + Print the compile-time version number of the OsmoSGSN program +*-d, --debug 'DBGMASK','DBGLEVELS'*:: + Set the log subsystems and levels for logging to stderr. This + has mostly been superseded by VTY-based logging configuration, + see <> for further information. +*-D, --daemonize*:: + Fork the process as a daemon into background. +*-c, --config-file 'CONFIGFILE'*:: + Specify the file and path name of the configuration file to be + used. If none is specified, use `osmo_sgsn.cfg` in the current + working directory. +*-s, --disable-color*:: + Disable colors for logging to stderr. This has mostly been + deprecated by VTY based logging configuration, see <> + for more information. +*-e, --log-level 'LOGLEVEL'*:: + Set the global log level for logging to stderr. This has mostly + been deprecated by VTY based logging configuration, see + <> for more information. +*-T, --timestamp*:: + Enable prefixing each log line on stderr with a timestamp. This + has mostly been deprecated by VTY based logging configuration, see + <> for more information. diff --git a/doc/manuals/osmogbproxy-usermanual-docinfo.xml b/doc/manuals/osmogbproxy-usermanual-docinfo.xml new file mode 100644 index 0000000..29bb2aa --- /dev/null +++ b/doc/manuals/osmogbproxy-usermanual-docinfo.xml @@ -0,0 +1,46 @@ + + + 1 + March 21, 2019 + HW + + Initial version. + + + + + + + Harald + Welte + hwelte at sysmocom.de + HW + + sysmocom + sysmocom - s.f.m.c. GmbH + Managing Director + + + + + + 2013-2019 + sysmocom - s.f.m.c. GmbH + + + + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.3 or any later version published by the Free Software + Foundation; with no Invariant Sections, no Front-Cover Texts, + and no Back-Cover Texts. A copy of the license is included in + the section entitled "GNU Free Documentation License". + + + The Asciidoc source code of this manual can be found at + + https://git.osmocom.org/osmo-sgsn/doc/ + + + diff --git a/doc/manuals/osmogbproxy-usermanual.adoc b/doc/manuals/osmogbproxy-usermanual.adoc new file mode 100644 index 0000000..c4e0b9d --- /dev/null +++ b/doc/manuals/osmogbproxy-usermanual.adoc @@ -0,0 +1,34 @@ +:gfdl-enabled: + +OsmoGbPROXY User Manual +======================= +Harald Welte + + +include::./common/chapters/preface.adoc[] + +include::{srcdir}/chapters/gbproxy-overview.adoc[] + +include::{srcdir}/chapters/gbproxy-running.adoc[] + +include::{srcdir}/chapters/gbproxy-control.adoc[] + +include::./common/chapters/vty.adoc[] + +include::./common/chapters/logging.adoc[] + +include::{srcdir}/chapters/gbproxy-configuration.adoc[] + +include::./common/chapters/gb.adoc[] + +include::./common/chapters/control_if.adoc[] + +//include::{srcdir}/chapters/counters.adoc[] + +include::./common/chapters/port_numbers.adoc[] + +include::./common/chapters/bibliography.adoc[] + +include::./common/chapters/glossary.adoc[] + +include::./common/chapters/gfdl.adoc[] -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/13763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I80d4ea016376c59995ccfcd8685c7c0e86745bd2 Gerrit-Change-Number: 13763 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:43:10 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:43:10 +0000 Subject: Change in osmo-sgsn[master]: check for osmo_fsm_register() error return values In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16362 ) Change subject: check for osmo_fsm_register() error return values ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I2028c82ac1b0421101c3f5d04fd999b65abdbf08 Gerrit-Change-Number: 16362 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 12:43:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:43:16 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:43:16 +0000 Subject: Change in osmo-sgsn[master]: check for osmo_ss7_init() error return value In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16363 ) Change subject: check for osmo_ss7_init() error return value ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ic228273aa6fb197b78c70c467a4a99af317e8098 Gerrit-Change-Number: 16363 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 12:43:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:43:17 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:43:17 +0000 Subject: Change in osmo-sgsn[master]: check for osmo_fsm_register() error return values In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16362 ) Change subject: check for osmo_fsm_register() error return values ...................................................................... check for osmo_fsm_register() error return values Change-Id: I2028c82ac1b0421101c3f5d04fd999b65abdbf08 --- M src/sgsn/gprs_gmm_attach.c M src/sgsn/gprs_gmm_fsm.c M src/sgsn/gprs_mm_state_gb_fsm.c M src/sgsn/gprs_mm_state_iu_fsm.c 4 files changed, 4 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/sgsn/gprs_gmm_attach.c b/src/sgsn/gprs_gmm_attach.c index 130f8d1..c903a01 100644 --- a/src/sgsn/gprs_gmm_attach.c +++ b/src/sgsn/gprs_gmm_attach.c @@ -449,7 +449,7 @@ static __attribute__((constructor)) void gprs_gmm_fsm_init(void) { - osmo_fsm_register(&gmm_attach_req_fsm); + OSMO_ASSERT(osmo_fsm_register(&gmm_attach_req_fsm) == 0); } void gmm_att_req_free(struct sgsn_mm_ctx *mm) { diff --git a/src/sgsn/gprs_gmm_fsm.c b/src/sgsn/gprs_gmm_fsm.c index fac06f2..94ecb50 100644 --- a/src/sgsn/gprs_gmm_fsm.c +++ b/src/sgsn/gprs_gmm_fsm.c @@ -183,5 +183,5 @@ static __attribute__((constructor)) void gmm_fsm_init(void) { - osmo_fsm_register(&gmm_fsm); + OSMO_ASSERT(osmo_fsm_register(&gmm_fsm) == 0); } diff --git a/src/sgsn/gprs_mm_state_gb_fsm.c b/src/sgsn/gprs_mm_state_gb_fsm.c index f6d680c..811f0c2 100644 --- a/src/sgsn/gprs_mm_state_gb_fsm.c +++ b/src/sgsn/gprs_mm_state_gb_fsm.c @@ -125,5 +125,5 @@ static __attribute__((constructor)) void mm_state_gb_fsm_init(void) { - osmo_fsm_register(&mm_state_gb_fsm); + OSMO_ASSERT(osmo_fsm_register(&mm_state_gb_fsm) == 0); } diff --git a/src/sgsn/gprs_mm_state_iu_fsm.c b/src/sgsn/gprs_mm_state_iu_fsm.c index ea31941..e571026 100644 --- a/src/sgsn/gprs_mm_state_iu_fsm.c +++ b/src/sgsn/gprs_mm_state_iu_fsm.c @@ -146,5 +146,5 @@ static __attribute__((constructor)) void mm_state_iu_fsm_init(void) { - osmo_fsm_register(&mm_state_iu_fsm); + OSMO_ASSERT(osmo_fsm_register(&mm_state_iu_fsm) == 0); } -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I2028c82ac1b0421101c3f5d04fd999b65abdbf08 Gerrit-Change-Number: 16362 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:43:17 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:43:17 +0000 Subject: Change in osmo-sgsn[master]: check for osmo_ss7_init() error return value In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16363 ) Change subject: check for osmo_ss7_init() error return value ...................................................................... check for osmo_ss7_init() error return value Change-Id: Ic228273aa6fb197b78c70c467a4a99af317e8098 --- M src/sgsn/sgsn_main.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/sgsn/sgsn_main.c b/src/sgsn/sgsn_main.c index eef5f8f..7d9a851 100644 --- a/src/sgsn/sgsn_main.c +++ b/src/sgsn/sgsn_main.c @@ -393,7 +393,7 @@ ctrl_vty_init(tall_sgsn_ctx); #if BUILD_IU - osmo_ss7_init(); + OSMO_ASSERT(osmo_ss7_init() == 0); osmo_ss7_vty_init_asp(tall_sgsn_ctx); osmo_sccp_vty_init(); #endif -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ic228273aa6fb197b78c70c467a4a99af317e8098 Gerrit-Change-Number: 16363 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:44:20 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:44:20 +0000 Subject: Change in osmo-remsim[master]: Check for osmo_fsm_register() error return value In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16366 ) Change subject: Check for osmo_fsm_register() error return value ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Idda1a4050cf9d285225ae48a4ba6f48c04f9598b Gerrit-Change-Number: 16366 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 12:44:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:44:21 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:44:21 +0000 Subject: Change in osmo-remsim[master]: Check for osmo_fsm_register() error return value In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16366 ) Change subject: Check for osmo_fsm_register() error return value ...................................................................... Check for osmo_fsm_register() error return value Change-Id: Idda1a4050cf9d285225ae48a4ba6f48c04f9598b --- M src/bankd_client_fsm.c M src/rspro_client_fsm.c M src/server/rspro_server.c 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/bankd_client_fsm.c b/src/bankd_client_fsm.c index cedb597..2e3fdc9 100644 --- a/src/bankd_client_fsm.c +++ b/src/bankd_client_fsm.c @@ -271,5 +271,5 @@ static __attribute__((constructor)) void on_dso_load(void) { - osmo_fsm_register(&remsim_client_bankd_fsm); + OSMO_ASSERT(osmo_fsm_register(&remsim_client_bankd_fsm) == 0); } diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index 45cd08e..c01a763 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -382,5 +382,5 @@ static __attribute__((constructor)) void on_dso_load(void) { - osmo_fsm_register(&rspro_client_server_fsm); + OSMO_ASSERT(osmo_fsm_register(&rspro_client_server_fsm) == 0); } diff --git a/src/server/rspro_server.c b/src/server/rspro_server.c index c753f16..0d059fa 100644 --- a/src/server/rspro_server.c +++ b/src/server/rspro_server.c @@ -491,7 +491,7 @@ static __attribute__((constructor)) void on_dso_load(void) { - osmo_fsm_register(&remsim_server_client_fsm); + OSMO_ASSERT(osmo_fsm_register(&remsim_server_client_fsm) == 0); } -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Idda1a4050cf9d285225ae48a4ba6f48c04f9598b Gerrit-Change-Number: 16366 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:46:49 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:46:49 +0000 Subject: Change in libosmocore[master]: Check for osmo_fsm_register() error return value In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16367 ) Change subject: Check for osmo_fsm_register() error return value ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idbc1557739b2a253b73914e6f1f18a6d169d882e Gerrit-Change-Number: 16367 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 12:46:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:47:20 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:47:20 +0000 Subject: Change in libosmocore[master]: gprs_ns_instantiate(): propagate errors from gprs_sns_init() to caller In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16368 ) Change subject: gprs_ns_instantiate(): propagate errors from gprs_sns_init() to caller ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/16368/2/src/gb/gprs_ns.c File src/gb/gprs_ns.c: https://gerrit.osmocom.org/c/libosmocore/+/16368/2/src/gb/gprs_ns.c at 1893 PS2, Line 1893: gprs_sns_fsm_registered = true; talloc_free missing -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I71f347a2f0376716e5f83d33a7931eb8a99aad77 Gerrit-Change-Number: 16368 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 12:47:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:49:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:49:12 +0000 Subject: Change in libosmocore[master]: gprs_ns_instantiate(): propagate errors from gprs_sns_init() to caller In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/16368 to look at the new patch set (#3). Change subject: gprs_ns_instantiate(): propagate errors from gprs_sns_init() to caller ...................................................................... gprs_ns_instantiate(): propagate errors from gprs_sns_init() to caller Change-Id: I71f347a2f0376716e5f83d33a7931eb8a99aad77 --- M src/gb/gprs_ns.c 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/16368/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I71f347a2f0376716e5f83d33a7931eb8a99aad77 Gerrit-Change-Number: 16368 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:49:42 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:49:42 +0000 Subject: Change in libosmocore[master]: gprs_ns_instantiate(): propagate errors from gprs_sns_init() to caller In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16368 ) Change subject: gprs_ns_instantiate(): propagate errors from gprs_sns_init() to caller ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I71f347a2f0376716e5f83d33a7931eb8a99aad77 Gerrit-Change-Number: 16368 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 12:49:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:49:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:49:53 +0000 Subject: Change in osmocom-bb[master]: Check for osmo_fsm_register() error return value In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16365 ) Change subject: Check for osmo_fsm_register() error return value ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3e849b7ec8a7ed610f779dac57cc0c1d1aeb1aa5 Gerrit-Change-Number: 16365 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 12:49:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 12:49:54 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 12:49:54 +0000 Subject: Change in osmocom-bb[master]: Check for osmo_fsm_register() error return value In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16365 ) Change subject: Check for osmo_fsm_register() error return value ...................................................................... Check for osmo_fsm_register() error return value Change-Id: I3e849b7ec8a7ed610f779dac57cc0c1d1aeb1aa5 --- M src/host/trxcon/trxcon.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c index d49b71f..ecee518 100644 --- a/src/host/trxcon/trxcon.c +++ b/src/host/trxcon/trxcon.c @@ -295,7 +295,7 @@ } /* Allocate the application state machine */ - osmo_fsm_register(&trxcon_fsm_def); + OSMO_ASSERT(osmo_fsm_register(&trxcon_fsm_def) == 0); trxcon_fsm = osmo_fsm_inst_alloc(&trxcon_fsm_def, tall_trxcon_ctx, NULL, LOGL_DEBUG, "main"); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3e849b7ec8a7ed610f779dac57cc0c1d1aeb1aa5 Gerrit-Change-Number: 16365 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:06:27 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 13:06:27 +0000 Subject: Change in libosmocore[master]: Check for osmo_fsm_register() error return value In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16367 ) Change subject: Check for osmo_fsm_register() error return value ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idbc1557739b2a253b73914e6f1f18a6d169d882e Gerrit-Change-Number: 16367 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 13:06:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:08:08 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 13:08:08 +0000 Subject: Change in libosmocore[master]: gprs_ns_instantiate(): propagate errors from gprs_sns_init() to caller In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16368 ) Change subject: gprs_ns_instantiate(): propagate errors from gprs_sns_init() to caller ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I71f347a2f0376716e5f83d33a7931eb8a99aad77 Gerrit-Change-Number: 16368 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 13:08:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:11:38 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 13:11:38 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_trx.c: fix potential NULL-pointer dereference In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16358 ) Change subject: trxcon/sched_trx.c: fix potential NULL-pointer dereference ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If1ecd9f5a70fa448327c62d38d76c8443b939248 Gerrit-Change-Number: 16358 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 01 Dec 2019 13:11:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:11:42 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 13:11:42 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_trx.c: fix potential NULL-pointer dereference In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16358 ) Change subject: trxcon/sched_trx.c: fix potential NULL-pointer dereference ...................................................................... trxcon/sched_trx.c: fix potential NULL-pointer dereference Change-Id: If1ecd9f5a70fa448327c62d38d76c8443b939248 --- M src/host/trxcon/sched_trx.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index 37d1acf..eb6f3dc 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -264,6 +264,8 @@ /* Choose proper multiframe layout */ ts->mf_layout = sched_mframe_layout(config, tn); + if (!ts->mf_layout) + return -EINVAL; if (ts->mf_layout->chan_config != config) return -EINVAL; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If1ecd9f5a70fa448327c62d38d76c8443b939248 Gerrit-Change-Number: 16358 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:20:54 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 13:20:54 +0000 Subject: Change in osmo-iuh[master]: WIP: add SABP support to HNBGW References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16369 ) Change subject: WIP: add SABP support to HNBGW ...................................................................... WIP: add SABP support to HNBGW Change-Id: I2d91de2e37770e3635abe8004ac183857d8a6ff2 --- M include/osmocom/iuh/hnbgw.h M src/Makefile.am M src/hnbgw.c A src/hnbgw_sabp.c 4 files changed, 136 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/69/16369/1 diff --git a/include/osmocom/iuh/hnbgw.h b/include/osmocom/iuh/hnbgw.h index 4848c2f..344d20a 100644 --- a/include/osmocom/iuh/hnbgw.h +++ b/include/osmocom/iuh/hnbgw.h @@ -16,6 +16,7 @@ DHNBAP, DRUA, DRANAP, + DSABP, }; enum hnb_ctrl_node { @@ -96,6 +97,8 @@ uint16_t hnbap_stream; /*! SCTP stream ID for RUA */ uint16_t rua_stream; + /*! SCTP stream ID for SABP */ + uint16_t sabp_stream; /*! True if a HNB-REGISTER-REQ from this HNB has been accepted. Note that * this entire data structure is freed if the HNB sends HNB-DE-REGISTER-REQ. */ diff --git a/src/Makefile.am b/src/Makefile.am index b1f8153..24977c2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -85,13 +85,13 @@ rua_msg_factory.c \ hnbgw.c hnbgw_hnbap.c hnbgw_rua.c hnbgw_ranap.c \ hnbgw_vty.c \ - context_map.c hnbgw_cn.c + context_map.c hnbgw_cn.c hnbgw_sabp.c osmo_hnbgw_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOCTRL_LIBS) \ $(ASN1C_LIBS) $(OSMOSIGTRAN_LIBS) \ $(OSMONETIF_LIBS) \ hnbap/libosmo-asn1-hnbap.a rua/libosmo-asn1-rua.a \ - libosmo-ranap.la + libosmo-ranap.la libosmo-sabp.la regen: regenerate-from-asn1-source diff --git a/src/hnbgw.c b/src/hnbgw.c index 9dc67a2..d8ca123 100644 --- a/src/hnbgw.c +++ b/src/hnbgw.c @@ -258,6 +258,9 @@ rc = hnbgw_rua_rx(hnb, msg); break; case IUH_PPI_SABP: + hnb->sabp_stream = msgb_sctp_stream(msg); + rc = hnbgw_sabp_rx(hnb, msg); + break; case IUH_PPI_RNA: case IUH_PPI_PUA: LOGP(DMAIN, LOGL_ERROR, "Unimplemented SCTP PPID=%lu received\n", @@ -354,6 +357,11 @@ .color = "", .description = "RAN Application Part", }, + [DSABP] = { + .name = "DSABP", .loglevel = LOGL_DEBUG, .enabled = 1, + .color = "", + .description = "Service Area Broadcast Protocol", + }, }; static const struct log_info hnbgw_log_info = { @@ -588,6 +596,7 @@ } ranap_set_log_area(DRANAP); + sabp_set_log_area(DSABP); rc = hnbgw_cnlink_init(g_hnb_gw, "127.0.0.1", M3UA_PORT, NULL); if (rc < 0) { diff --git a/src/hnbgw_sabp.c b/src/hnbgw_sabp.c new file mode 100644 index 0000000..95177ac --- /dev/null +++ b/src/hnbgw_sabp.c @@ -0,0 +1,122 @@ +/* hnb-gw specific code for SABP (Service Area Broadcast Protocol) */ + +/* (C) 2019 by Harald Welte + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include + +#include +#include + +#include +#include +#include + +#include "asn1helpers.h" + +#include +#include +#include +#include + +static int hnbgw_sabp_tx(struct hnb_context *ctx, struct msgb *msg) +{ + if (!msg) + return -EINVAL; + + msgb_sctp_ppid(msg) = IUH_PPI_SABP; + osmo_stream_srv_send(ctx->conn, msg); + + return 0; +} + +static int sabp_rx_initiating_msg(struct msgb *msg, SABP_InitiatingMessage_t *imsg) +{ + int rc; + + switch (imsg->procedureCode) { + default: + LOGP(DSABP, LOGL_NOTICE, "Unknown SABP Procedure %lu\n", imsg->procedureCode); + rc = -1; + } + + return rc; +} + +static int sabp_rx_successful_outcome_msg(struct msgb *msg, SABP_SuccessfulOutcome_t *in) +{ + /* FIXME */ + LOGP(DSABP, LOGL_NOTICE, "Unexpected SABP Successful Outcome\n"); + return -1; +} + +static int sabp_rx_unsuccessful_outcome_msg(struct msgb *msg, SABP_UnsuccessfulOutcome_t *in) +{ + /* FIXME */ + LOGP(DSABP, LOGL_NOTICE, "Unexpected SABP Unsucessful Outcome\n"); + return -1; +} + + + +static int _hnbgw_sabp_rx(struct msgb *msg, SABP_SABP_PDU_t *pdu) +{ + int rc; + + /* it's a bit odd that we can't dispatch on procedure code, but + * that's not possible */ + switch (pdu->present) { + case SABP_SABP_PDU_PR_initiatingMessage: + rc = sabp_rx_initiating_msg(msg, &pdu->choice.initiatingMessage); + break; + case SABP_SABP_PDU_PR_successfulOutcome: + rc = sabp_rx_successful_outcome_msg(msg, &pdu->choice.successfulOutcome); + break; + case SABP_SABP_PDU_PR_unsuccessfulOutcome: + rc = sabp_rx_unsuccessful_outcome_msg(msg, &pdu->choice.unsuccessfulOutcome); + break; + default: + LOGP(DSABP, LOGL_NOTICE, "Unknown SABP presence %u\n", pdu->present); + rc = -1; + } + + return rc; +} + +int hnbgw_sabp_rx(struct hnb_context *hnb, struct msgb *msg) +{ + SABP_SABP_PDU_t _pdu, *pdu = &_pdu; + asn_dec_rval_t dec_ret; + int rc; + + /* decode and handle to _hnbgw_hnbap_rx() */ + + memset(pdu, 0, sizeof(*pdu)); + dec_ret = aper_decode(NULL, &asn_DEF_SABP_SABP_PDU, (void **) &pdu, + msg->data, msgb_length(msg), 0, 0); + if (dec_ret.code != RC_OK) { + LOGP(DSABP, LOGL_ERROR, "Error in ASN.1 decode\n"); + return -1; + } + + rc = _hnbgw_sabp_rx(msg, pdu); + + return rc; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I2d91de2e37770e3635abe8004ac183857d8a6ff2 Gerrit-Change-Number: 16369 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:20:55 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 13:20:55 +0000 Subject: Change in osmo-iuh[master]: Initial minimal OsmoHNBGW user manual References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16371 ) Change subject: Initial minimal OsmoHNBGW user manual ...................................................................... Initial minimal OsmoHNBGW user manual This adds a very basic OsmoHNBGW user manual with an "overview" and "running" chapter. It still misses any information on configuration. Change-Id: I54825a4ce5a457f87b0618332347eed8ea54afcb Closes: OS#2588 --- M .gitignore M doc/manuals/Makefile.am A doc/manuals/chapters/overview.adoc A doc/manuals/chapters/running.adoc A doc/manuals/osmohnbgw-usermanual-docinfo.xml A doc/manuals/osmohnbgw-usermanual.adoc 6 files changed, 191 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/71/16371/1 diff --git a/.gitignore b/.gitignore index f662e2a..49b2cfb 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,8 @@ include/osmocom/rua/rua_ies_defs.h include/osmocom/ranap/ranap_ies_defs.h include/osmocom/sabp/sabp_ies_defs.h + +doc/manuals/build +doc/manuals/common +doc/manuals/generated +doc/manuals/*.pdf diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am index 91aa8f8..7a76e90 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile.am @@ -1,9 +1,16 @@ EXTRA_DIST = \ + osmohnbgw-usermanual.adoc \ + osmohnbgw-usermanual-docinfo.xml \ + chapters \ osmohnbgw-vty-reference.xml \ regen_doc.sh \ vty if BUILD_MANUALS + ASCIIDOC = osmohnbgw-usermanual.adoc + ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc + include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc + VTY_REFERENCE = osmohnbgw-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc diff --git a/doc/manuals/chapters/overview.adoc b/doc/manuals/chapters/overview.adoc new file mode 100644 index 0000000..2368b4f --- /dev/null +++ b/doc/manuals/chapters/overview.adoc @@ -0,0 +1,56 @@ +[[overview]] +== Overview + + +[[intro_overview]] +=== About OsmoHNBGW + +OsmoHNBGW implements the Home NodeB Gateway function in the 3G network architecture. It serves +as a gateway between the classic 3G core network (CN) domain with its IuCS and IuPS interface +and the femtocell based RAN. + +A typical 3G network consisting of Osmocom components will look as illustrated in the following +diagram: + +[[fig-3g]] +.Typical 3G network architecture used with OsmoHNBGW +---- + +------------+ +--------+ +----------+ +---------+ + UE <-->| hNodeB |<--Iuh---->| HNB-GW |<--IuCS-->| OsmoMSC |<--GSUP-->| OsmoHLR | + UE <-->| femto cell | ...-->| | ...-->| | | | + | | | | +----------+ +---------| + +------------+<--GTP-U | | + \ | | +------+ +------+ + | | |<--IuPS-->| SGSN |<--GTP-C-->| GGSN | + | +--------+ ...-->| | GTP-U-->| | + | +------+ / +------+ + \_______________________________/ +---- + +The HNB-GW performs a translation interface between the IuCS/IuPS interfaces on the one hand +side, and the Iuh interface on the or ther hand: + +---- + Iuh IuCS/IuPS + +NAS +----+----+ +----+----+ +Non-Access Stratum | CC | MM | | CC | MM | +- - - - - - - - - - - +----+----+-------+ +----+----+ + | RANAP | | H | RANAP | +Access Stratum +---------+ HNBAP | N +---------+ - - SCCP USER SAP + | RUA | | B | SUA | \ + +---------+-------+ - +---------+ | + | SCTP | G | SCTP | } SIGTRAN + +-----------------+ W +---------+ | + | IP | | IP | / + +-----------------+ +---------+ +---- + +On the femtocell (Home NodeB) side, OsmoHNBGW implements the Iuh interface as specified by 3GPP. + +=== The Iuh interface + +Iuh consists of the following sub-layers: + +- HNBAP (Home NodeB Application Part) +- RUA (RANAP User Adaptation, between RANAP and SCTP diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc new file mode 100644 index 0000000..41909e2 --- /dev/null +++ b/doc/manuals/chapters/running.adoc @@ -0,0 +1,37 @@ +== Running OsmoHNBGW + +The OsmoHNBGW executable (`osmo-hnbgw`) offers the following command-line +arguments: + +=== SYNOPSIS + +*osmo-hnbgw* [-h|-V] [-d 'DBGMASK'] [-D] [-c 'CONFIGFILE'] [-s] [-T] [-e 'LOGLEVEL'] + +=== OPTIONS + +*-h, --help*:: + Print a short help message about the supported options +*-V, --version*:: + Print the compile-time version number of the OsmoHNBGW program +*-d, --debug 'DBGMASK','DBGLEVELS'*:: + Set the log subsystems and levels for logging to stderr. This + has mostly been superseded by VTY-based logging configuration, + see <> for further information. +*-D, --daemonize*:: + Fork the process as a daemon into background. +*-c, --config-file 'CONFIGFILE'*:: + Specify the file and path name of the configuration file to be + used. If none is specified, use `osmo-msc.cfg` in the current + working directory. +*-s, --disable-color*:: + Disable colors for logging to stderr. This has mostly been + deprecated by VTY based logging configuration, see <> + for more information. +*-T, --timestamp*:: + Enable time-stamping of log messages to stderr. This has mostly + been deprecated by VTY based logging configuration, see + <> for more information. +*-e, --log-level 'LOGLEVEL'*:: + Set the global log level for logging to stderr. This has mostly + been deprecated by VTY based logging configuration, see + <> for more information. diff --git a/doc/manuals/osmohnbgw-usermanual-docinfo.xml b/doc/manuals/osmohnbgw-usermanual-docinfo.xml new file mode 100644 index 0000000..404d2a1 --- /dev/null +++ b/doc/manuals/osmohnbgw-usermanual-docinfo.xml @@ -0,0 +1,51 @@ + + + 1 + November 30th, 2019 + HW + + Initial version + + + + + + + Harald + Welte + hwelte at sysmocom.de + HW + + sysmocom + sysmocom - s.f.m.c. GmbH + Managing Director + + + + + + 2019 + sysmocom - s.f.m.c. GmbH + + + + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.3 or any later version published by the Free Software + Foundation; with the Invariant Sections being just 'Foreword', + 'Acknowledgements' and 'Preface', with no Front-Cover Texts, + and no Back-Cover Texts. A copy of the license is included in + the section entitled "GNU Free Documentation License". + + + The Asciidoc source code of this manual can be found at + + http://git.osmocom.org/osmo-hnbgw/ + + and of the common chapters at + + http://git.osmocom.org/osmo-gsm-manuals/ + + + diff --git a/doc/manuals/osmohnbgw-usermanual.adoc b/doc/manuals/osmohnbgw-usermanual.adoc new file mode 100644 index 0000000..3f3c9c3 --- /dev/null +++ b/doc/manuals/osmohnbgw-usermanual.adoc @@ -0,0 +1,35 @@ +:gfdl-enabled: +:program-name: OsmoHNBGW + +OsmoHNBGW User Manual +===================== +Harald Welte + + +include::./common/chapters/preface.adoc[] + +include::{srcdir}/chapters/overview.adoc[] + +include::{srcdir}/chapters/running.adoc[] + +// include::{srcdir}/chapters/control.adoc[] + +// include::./common/chapters/counters-overview.adoc[] + +// include::{srcdir}/chapters/counters.adoc[] + +include::./common/chapters/vty.adoc[] + +include::./common/chapters/logging.adoc[] + +// include::{srcdir}/chapters/net.adoc[] + +// include::./common/chapters/control_if.adoc[] + +include::./common/chapters/port_numbers.adoc[] + +include::./common/chapters/bibliography.adoc[] + +include::./common/chapters/glossary.adoc[] + +include::./common/chapters/gfdl.adoc[] -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I54825a4ce5a457f87b0618332347eed8ea54afcb Gerrit-Change-Number: 16371 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:20:55 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 13:20:55 +0000 Subject: Change in osmo-iuh[master]: WIP: SABP server References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16370 ) Change subject: WIP: SABP server ...................................................................... WIP: SABP server Change-Id: Iff1d33c7482ff767aa5446a8ccfe9086fee57365 --- M src/sabp_common.c A src/sabp_server.c A src/sabp_server.h 3 files changed, 365 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/70/16370/1 diff --git a/src/sabp_common.c b/src/sabp_common.c index cdb0e32..75c89ef 100644 --- a/src/sabp_common.c +++ b/src/sabp_common.c @@ -1,6 +1,6 @@ /* common SABP code */ -/* (C) 2015 by Harald Welte +/* (C) 2019 by Harald Welte * All Rights Reserved * * This program is free software; you can redistribute it and/or modify @@ -19,6 +19,11 @@ */ #include +#include +#include +#include + +#include #include @@ -73,14 +78,17 @@ { 0, NULL } }; -static struct msgb *sabp_msgb_alloc(void) +struct msgb *osmo_sabp_msgb_alloc(void *ctx, const char *name) { - return msgb_alloc_headroom(1024+512, 512, "SABP Tx"); + /* make the messages rather large as the cell lists can be long! */ + return msgb_alloc_headroom_c(ctx, 65535, 16, name); } +extern void *tall_msgb_ctx; + static struct msgb *_sabp_gen_msg(SABP_SABP_PDU_t *pdu) { - struct msgb *msg = sabp_msgb_alloc(); + struct msgb *msg = osmo_sabp_msgb_alloc(tall_msgb_ctx, __func__); asn_enc_rval_t rval; if (!msg) @@ -213,3 +221,144 @@ { _sabp_DSABP = log_area; } + +/*********************************************************************** + * Message Reception + ***********************************************************************/ + +/* SABP was specified as ASN.1 APER encoded messages *directly* inside a TCP + * stream, without any intermediate framing layer. As TCP doesn't preserve + * message boundaries, and SABP messages are variable length, we need to + * actually parse the message up to the point of the APER-internal length + * determinant (which itself is variable-length encoded). */ + +/* Three bytes for TriggeringMessage, procedureCode and Criticality */ +#define SABP_HDR_LEN 3 + + +/*! parse a single APER length determinant. + * \param[in] in input data as received from peer + * \param[in] in_len length of 'in' + * \param[out] len_len Length of the current length determinant in octets + * \returns parsed length or -EAGAIN if more data is needed, or -EIO in case of parse error */ +static int parse_aper_len_det(const uint8_t *in, unsigned int in_len, unsigned int *len_len) +{ + /* Variable-length Length encoding according to X.961 Section 9.1 NOTE 2 */ + switch (in[0] & 0xC0) { + case 0x00: + /* total length is encoded in this octet */ + *len_len = 1; + return in[0]; + case 0x80: + /* total length (up to 16k) encoded in two octets */ + *len_len = 2; + if (in_len < 2) + return -EAGAIN; /* we need one more byte */ + return ((in[0] & 0x3F) << 8) | in[1]; + case 0xC0: + /* total length not known, encoded in chunks; first chunk length now known */ + *len_len = 1; + return (in[0] & 0x3f) * 16384; + /* we must read the chunk and then look at the variable-length encoded length + * of the next chunk */ + default: + return -EIO; + } +} + +/* msg->l1h points to first byte of current length determinant */ +#define MSGB_LEN_NEEDED(msg) (msg)->cb[0] /* total length of msgb needed (as known so far) */ +#define MSGB_APER_STATE(msg) (msg)->cb[1] /* '1' if we're expecting another length determinant */ + +/*! Read one SABP message from socket fd or store part if still not fully received. + * \param[in] ctx talloc context from which to allocate new msgb. + * \param[in] fd The fd for the socket to read from. + * \param[out] rmsg internally allocated msgb containing a fully received SABP message. + * \param[inout] tmp_msg internally allocated msgb caching data for not yet fully received message. + * + * Function is designed just like ipa_msg_recv_buffered() + */ +int osmo_sabp_recv_buffered(void *ctx, int fd, struct msgb **rmsg, struct msgb **tmp_msg) +{ + struct msgb *msg = tmp_msg ? *tmp_msg : NULL; + unsigned int len_len; + bool first_call = false; + int rc; + + if (!msg) { + msg = osmo_sabp_msgb_alloc(ctx, __func__); + if (!msg) + return -ENOMEM; + } + + if (!msgb_l1(msg)) { + /* new msgb; we expect first length determinant after 3 bytes */ + msg->l1h = msgb_data(msg) + SABP_HDR_LEN; + MSGB_LEN_NEEDED(msg) = SABP_HDR_LEN + 1; /* 1 == minimum length of length-field */ + first_call = true; + } + + /* attempt to receive missing/needed amount of bytes */ + rc = recv(fd, msg->tail, MSGB_LEN_NEEDED(msg)-msgb_length(msg), 0); + if (rc == 0) + goto discard_msg; /* dead socket */ + else if (rc < 0) { + if (errno == EAGAIN || errno == EINTR) + rc = 0; + else { + rc = -errno; + goto discard_msg; + } + } + msgb_put(msg, rc); + + /* check if we have received sufficient amount of data */ + if (msgb_length(msg) < MSGB_LEN_NEEDED(msg)) { + if (msg->len == 0) { + rc = -EAGAIN; + goto discard_msg; + } + + if (!tmp_msg) { + rc = -EIO; + goto discard_msg; + } + *tmp_msg = msg; + return -EAGAIN; + } + + if (!first_call && MSGB_APER_STATE(msg) == 0) { + /* we have read all needed bytes by now, and hence can return successfully */ + return msgb_length(msg); + } + + /* below code is only executed on first call/iteration, or if last length-det was chunked */ + OSMO_ASSERT(first_call || MSGB_APER_STATE(msg) == 1); + + OSMO_ASSERT(msg->l1h < msg->tail); + rc = parse_aper_len_det(msgb_l1(msg), msgb_l1len(msg), &len_len); + if (rc == -EIO) { + return -EIO; + } else if (rc == -EAGAIN) { + /* need (typically 1 byte) more data */ + OSMO_ASSERT(len_len > 1); + MSGB_LEN_NEEDED(msg) += len_len-1; + return -EAGAIN; + } else if (rc >= 16384) { + /* read up to next length determinant */ + MSGB_LEN_NEEDED(msg) += len_len-1 + rc + 1 /* new length determinant */; + msg->l1h += (len_len-1) + rc; /* start of next length determinant */ + MSGB_APER_STATE(msg) = 1; + return -EAGAIN; + } else { + /* full length is known now */ + MSGB_LEN_NEEDED(msg) += len_len-1 + rc; + return -EAGAIN; + } + +discard_msg: + if (tmp_msg) + *tmp_msg = NULL; + msgb_free(msg); + return rc; +} diff --git a/src/sabp_server.c b/src/sabp_server.c new file mode 100644 index 0000000..6d67a5e --- /dev/null +++ b/src/sabp_server.c @@ -0,0 +1,171 @@ +/* (C) 2019 by Harald Welte + * All Rights Reserved + * + * SPDX-License-Identifier: AGPL-3.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include "sabp_server.h" + +static int sabp_cbc_read_cb(struct osmo_stream_srv *conn) +{ + struct osmo_stream_srv_link *link = osmo_stream_srv_get_master(conn); + struct osmo_sabp_server_client *client = osmo_stream_srv_get_data(conn); + struct osmo_sabp_server *srv = osmo_stream_srv_link_get_data(link); + struct osmo_fd *ofd = osmo_stream_srv_get_ofd(conn); + struct msgb *msg = NULL; + int rc; + + LOGPSC(client, LOGL_DEBUG, "read_cb rx_msg=%p\n", client->rx_msg); + + /* message de-segmentation */ + rc = osmo_sabp_recv_buffered(conn, ofd->fd, &msg, &client->rx_msg); + if (rc < 0) { + if (rc == -EAGAIN || rc == -EINTR) { + /* more data needs to be read */ + return 0; + } else if (rc == -EPIPE || rc == -ECONNRESET) { + /* lost connection with server */ + } else if (rc == 0) { + /* connection closed with server */ + } + /* destroy connection */ + osmo_stream_srv_destroy(conn); + return -EBADF; + } + OSMO_ASSERT(msg); + LOGPSC(client, LOGL_DEBUG, "Received SABP %s\n", msgb_hexdump(msg)); + /* decode + dispatch message */ + decoded =...; + if (decoded) { + LOGPSC(client, LOGL_INFO, "Received SABP %s\n", + get_value_string(FIXME)); + srv->rx_cb(client, decoded); + } else { + LOGPSC(client, LOGL_ERROR, "Unable to decode %s\n", msgb_hexdump(msg)); + } +} + +static int sabp_server_closed_cb(struct osmo_stream_srv *conn) +{ + struct osmo_sabp_server_client *client = osmo_stream_srv_get_data(conn); + LOGSC(client, LOGL_INFO, "connection closed\n"); + llist_del(&client->list); + osmo_fsm_inst_term(client->fi, OSMO_FSM_TERM_REQUEST, NULL); + talloc_free(client); + return 0; +} + +static int sabp_server_accept_cb(struct omso_stream_srv_link *link, int fd) +{ + struct osmo_sabp_server *srv = osmo_stream_srv_link_get_data(link); + struct osmo_sabp_server_client *client = talloc_zero(srv, struct osmo_sabp_server_client); + char remote_ip[INET6_ADDRSTRLEN], portbuf[6]; + int remote_port; + OSMO_ASSERT(client); + + remote_ip[0] = '\0'; + portbuf[0] = '\0'; + osmo_sock_get_ip_and_port(fd, remote_ip, sizeof(remote_ip), portbuf, sizeof(portbuf), false); + remote_port = atoi(portbuf); + + client->conn = osmo_stream_srv_create(link, lnk, fd, sabp_server_read_cb, + sabp_srever_closed_cb, client); + if (!client->conn) { + LOGP(DSABP, LOGL_ERROR, "Unable to create stream server for %s:%d\n", + remote_ip, remote_port); + talloc_free(client); + return -1; + } + client->fi = osmo_fsm_inst_alloc(&sabp_server_fsm, client, client, LOGL_DEBUG, NULL); + if (!client->fi) { + LOGPSC(client, LOGL_ERROR, "Unable to allocate FSM\n"); + osmo_stream_srv_destroy(client->conn); + talloc_free(client); + return -1; + } + llist_add_tail(&client->lits, &srv->clients); + + /* TODO: Match client to peer? */ + + LOGPSC(client, LOGL_INFO, "New SABP client connection\n"); + osmo_fsm_inst_dispatch(client->fi, SABP_SRV_E_CMD_RESET, NULL); + + return 0; +} + +#if 0 +void sabp_server_client_tx(struct osmo_sabp_cbc_client *client, struct SABP_SABP_PDU_t *sabp) +{ + struct msgb *msg = _sabp_gen_msg(pdu); + LOGPSC(client, LOGL_INFO, "Transmitting %s\n", + get_value_string( + if (!msg) { + LOGPSC(client, LOGL_ERROR, "Failed to encode SABP %s\n", + get_value_string()); + ASN_STRUCT_FREE(sabp); + return; + } + ASN_STRUCT_FREE(sabp); + osmo_stream_srv_send(client->conn, msg); +} +#endif + +void sabp_server_client_close(struct osmo_sabp_server_client *client) +{ + osmo_stream_srv_destroy(client->conn); + /* FIXME: do we need to unlink/free the client? */ +} + + +struct osmo_sabp_server *sabp_server_create(void *ctx, const char *bind_ip, int bind_port, + int (*rx_cb)(struct osmo_sabp_server_client *client, + struct SABP_PDU *dec)) +{ + struct osmo_sabp_server *srv = talloc_zero(ctx, struct osmo_sabp_server); + int rc; + + if (bind_port == -1) + bind_port = SABP_TCP_PORT; + + OSMO_ASSERT(srv); + srv->rx_cb = rx_cbp; + INIT_LLIST_HEAD(&srv->clients); + srv->link = osmo_stream_srv_link_create(srv); + osmo_stream_srv_link_set_data(srv->link, srv); + osmo_stream_srv_link_set_nodelay(srv->link, true); + osmo_stream_srv_link_set_port(srv->link, bind_port); + if (bind_ip) + osmo_stream_srv_link_set_addr(srv->link, bind_ip); + osmo_stream_srv_link_set_accept_cb(srv->link, sabp_server_accept_cb); + rc = osmo_stream_serv_link_open(srv->link); + OSMO_ASSERT(rc == 0); + LOGP(DSABP, LOGL_NOTICE, "Listening for SABP at %s\n", + osmo_stream_srv_link_get_sockname(srv->link)); + + return srv; +} diff --git a/src/sabp_server.h b/src/sabp_server.h new file mode 100644 index 0000000..5cb0fb2 --- /dev/null +++ b/src/sabp_server.h @@ -0,0 +1,41 @@ +#pragma once +#include +#include + +#define LOGPSC(client, level, fmt, args...) \ + LOGP(DSABP, level, "%s: " fmt, sabp_server_client_name(client), ## args) + +struct osmo_sabp_server_client; +struct osmo_fsm_inst; + +/* a SABP server */ +struct osmo_sabp_sever { + /* libosmo-netif stream server */ + struct osmo_stream_srv_link *link; + + /* clients connected to this server */ + struct llist_head clients; + + /* receive call-back; called for every received message */ + int (*rx_cb)(struct osmo_sabp_server_client *client, struct SABP_SABP_PDU *dec); +}; + +struct osmo_sabp_server_client { + /* entry in osmo_cbsp_cbc.clients */ + struct llist_head list; + /* stream server connection for this client */ + struct osmo_stream_srv *conn; + /* partially received CBSP message (rx completion pending) */ + struct msgb *rx_msg; + + struct osmo_fsm_inst *fi; + + void *peer; +}; + +const char *sabp_server_client_name(const struct osmo_sabp_server_client *client); + +void sabp_server_client_close(struct osmo_sabp_server_client *client); +struct osmo_sabp_server *sabp_server_create(void *ctx, const char *bind_ip, int bind_port, + int (*rx_cb)(struct osmo_sabp_server_client *client, + struct SABP_SABP_PDU *dec)); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iff1d33c7482ff767aa5446a8ccfe9086fee57365 Gerrit-Change-Number: 16370 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:23:19 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 13:23:19 +0000 Subject: Change in openbsc[master]: manual: Fix copy+paste error References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/openbsc/+/16372 ) Change subject: manual: Fix copy+paste error ...................................................................... manual: Fix copy+paste error Change-Id: I260946d39f78cf2713dc26860935ab29b83a5532 --- M manuals/OsmoNITB/chapters/running.adoc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/72/16372/1 diff --git a/manuals/OsmoNITB/chapters/running.adoc b/manuals/OsmoNITB/chapters/running.adoc index 406c41c..f742648 100644 --- a/manuals/OsmoNITB/chapters/running.adoc +++ b/manuals/OsmoNITB/chapters/running.adoc @@ -12,7 +12,7 @@ *-h, --help*:: Print a short help message about the supported options *-V, --version*:: - Print the compile-time version number of the OsmoBTS program + Print the compile-time version number of the program *-d, --debug 'DBGMASK','DBGLEVELS'*:: Set the log subsystems and levels for logging to stderr. This has mostly been superseded by VTY-based logging configuration, -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/16372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I260946d39f78cf2713dc26860935ab29b83a5532 Gerrit-Change-Number: 16372 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:23:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 13:23:53 +0000 Subject: Change in osmo-bsc[master]: manual: Fix copy+paste error References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16373 ) Change subject: manual: Fix copy+paste error ...................................................................... manual: Fix copy+paste error Change-Id: I787c4bd4b30a6620a987efed4fd8b46e14a7ea64 --- M doc/manuals/chapters/running.adoc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/73/16373/1 diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index f62ba6e..995fd88 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -12,7 +12,7 @@ *-h, --help*:: Print a short help message about the supported options *-V, --version*:: - Print the compile-time version number of the OsmoBTS program + Print the compile-time version number of the program *-d, --debug 'DBGMASK','DBGLEVELS'*:: Set the log subsystems and levels for logging to stderr. This has mostly been superseded by VTY-based logging configuration, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I787c4bd4b30a6620a987efed4fd8b46e14a7ea64 Gerrit-Change-Number: 16373 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:24:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 13:24:30 +0000 Subject: Change in osmo-ggsn[master]: manual: Fix copy+paste error References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/16374 ) Change subject: manual: Fix copy+paste error ...................................................................... manual: Fix copy+paste error Change-Id: Ib6a97d8c93203e1f896ab1bd3d200d2223f9fc48 --- M doc/manuals/chapters/running.adoc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/74/16374/1 diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index 83470e8..51b8ae2 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -12,7 +12,7 @@ *-h, --help*:: Print a short help message about the supported options *-V, --version*:: - Print the compile-time version number of the OsmoBTS program + Print the compile-time version number of the program *-D, --daemonize*:: Fork the process as a daemon into background. *-c, --config-file 'CONFIGFILE'*:: -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/16374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ib6a97d8c93203e1f896ab1bd3d200d2223f9fc48 Gerrit-Change-Number: 16374 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:25:29 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 13:25:29 +0000 Subject: Change in osmo-mgw[master]: manual: Fix copy+paste error References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/16375 ) Change subject: manual: Fix copy+paste error ...................................................................... manual: Fix copy+paste error Change-Id: I5cd93994563520c94ed9aefbedaf9d18ea2134a6 --- M doc/manuals/chapters/running.adoc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/75/16375/1 diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index 8565ea5..c178e31 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -12,7 +12,7 @@ *-h, --help*:: Print a short help message about the supported options *-V, --version*:: - Print the compile-time version number of the OsmoBTS program + Print the compile-time version number of the program *-D, --daemonize*:: Fork the process as a daemon into background. *-c, --config-file 'CONFIGFILE'*:: -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/16375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I5cd93994563520c94ed9aefbedaf9d18ea2134a6 Gerrit-Change-Number: 16375 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:25:52 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 13:25:52 +0000 Subject: Change in osmo-msc[master]: manual: Fix copy+paste error References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16377 ) Change subject: manual: Fix copy+paste error ...................................................................... manual: Fix copy+paste error Change-Id: I2c03d8424c218155dae9038dd7cc5660a290c5c8 --- M doc/manuals/chapters/running.adoc M src/libmsc/mncc_call.c M src/libmsc/msc_ho.c 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/77/16377/1 diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index 71f336b..03dade6 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -12,7 +12,7 @@ *-h, --help*:: Print a short help message about the supported options *-V, --version*:: - Print the compile-time version number of the OsmoBTS program + Print the compile-time version number of the program *-d, --debug 'DBGMASK','DBGLEVELS'*:: Set the log subsystems and levels for logging to stderr. This has mostly been superseded by VTY-based logging configuration, diff --git a/src/libmsc/mncc_call.c b/src/libmsc/mncc_call.c index e5fc820..0deb903 100644 --- a/src/libmsc/mncc_call.c +++ b/src/libmsc/mncc_call.c @@ -60,7 +60,7 @@ void mncc_call_fsm_init(struct gsm_network *net) { - osmo_fsm_register(&mncc_call_fsm); + OSMO_ASSERT(osmo_fsm_register(&mncc_call_fsm) == 0); gsmnet = net; } diff --git a/src/libmsc/msc_ho.c b/src/libmsc/msc_ho.c index 99f37b6..ac7602f 100644 --- a/src/libmsc/msc_ho.c +++ b/src/libmsc/msc_ho.c @@ -62,7 +62,7 @@ static __attribute__((constructor)) void msc_ho_fsm_init() { - osmo_fsm_register(&msc_ho_fsm); + OSMO_ASSERT(osmo_fsm_register(&msc_ho_fsm) == 0); } void msc_ho_down_required_reject(struct msc_a *msc_a, enum gsm0808_cause cause) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2c03d8424c218155dae9038dd7cc5660a290c5c8 Gerrit-Change-Number: 16377 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:25:52 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 13:25:52 +0000 Subject: Change in osmo-msc[master]: check for osmo_ss7_init() error return value References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16376 ) Change subject: check for osmo_ss7_init() error return value ...................................................................... check for osmo_ss7_init() error return value Change-Id: I2bc34f3962ca7355f20757e36a86ab2fd1a7aef6 --- M src/osmo-msc/msc_main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/76/16376/1 diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 43a1fcb..e7570cd 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -523,7 +523,7 @@ /* For --version, vty_init() must be called before handling options */ vty_init(&msc_vty_info); - osmo_ss7_init(); + OSMO_ASSERT(osmo_ss7_init() == 0); osmo_ss7_vty_init_asp(tall_msc_ctx); osmo_sccp_vty_init(); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2bc34f3962ca7355f20757e36a86ab2fd1a7aef6 Gerrit-Change-Number: 16376 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:29:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 13:29:57 +0000 Subject: Change in osmo-pcu[master]: manual: Fix copy+paste error References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16378 ) Change subject: manual: Fix copy+paste error ...................................................................... manual: Fix copy+paste error Change-Id: I27744628edeca6895f50f84c6f2f04c2e6e2de0b --- M doc/manuals/chapters/running.adoc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/78/16378/1 diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index d9f78c8..6a52b70 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -14,7 +14,7 @@ *-h, --help*:: Print a short help message about the supported options *-V, --version*:: - Print the compile-time version number of the OsmoBTS program + Print the compile-time version number of the program //*-D, --daemonize*:: // Fork the process as a daemon into background. *-c, --config-file 'CONFIGFILE'*:: -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I27744628edeca6895f50f84c6f2f04c2e6e2de0b Gerrit-Change-Number: 16378 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:29:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 13:29:57 +0000 Subject: Change in osmo-pcu[master]: manual: Fix documentation missing "-D" command line option References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16379 ) Change subject: manual: Fix documentation missing "-D" command line option ...................................................................... manual: Fix documentation missing "-D" command line option Change-Id: I2fd0b6f52ddc6931f413921b45d9756cb1fe456d --- M doc/manuals/chapters/running.adoc 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/79/16379/1 diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index 6a52b70..d7e6383 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -15,8 +15,8 @@ Print a short help message about the supported options *-V, --version*:: Print the compile-time version number of the program -//*-D, --daemonize*:: -// Fork the process as a daemon into background. +*-D, --daemonize*:: + Fork the process as a daemon into background. *-c, --config-file 'CONFIGFILE'*:: Specify the file and path name of the configuration file to be used. If none is specified, use `osmo-pcu.cfg` in the current -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2fd0b6f52ddc6931f413921b45d9756cb1fe456d Gerrit-Change-Number: 16379 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:29:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 13:29:58 +0000 Subject: Change in osmo-pcu[master]: manual: Add missing documentation for '-i' command line option References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16380 ) Change subject: manual: Add missing documentation for '-i' command line option ...................................................................... manual: Add missing documentation for '-i' command line option Change-Id: Iec0f2ecd610e63baba46a63d3e1a0979a9d8c5a8 --- M doc/manuals/chapters/running.adoc 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/80/16380/1 diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index d7e6383..5daecf8 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -6,7 +6,7 @@ === SYNOPSIS -*osmo-pcu* [-h|-V] [-D] [-c 'CONFIGFILE'] [-r 'PRIO'] [-m 'MCC'] [-n 'MNC'] +*osmo-pcu* [-h|-V] [-D] [-c 'CONFIGFILE'] [-r 'PRIO'] [-m 'MCC'] [-n 'MNC'] [-i A.B.C.D] === OPTIONS @@ -31,3 +31,5 @@ Use the given MCC instead of that provided by BTS via PCU socket *-n, --mnc 'MNC'*:: Use the given MNC instead of that provided by BTS via PCU socket +*-i, --gsmtap-ip 'A.B.C.D'*:: + Send Um interface trace via GSMTAP to specified IP address -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iec0f2ecd610e63baba46a63d3e1a0979a9d8c5a8 Gerrit-Change-Number: 16380 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:31:25 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 13:31:25 +0000 Subject: Change in osmo-sgsn[master]: manual: Fix copy+paste error References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16381 ) Change subject: manual: Fix copy+paste error ...................................................................... manual: Fix copy+paste error Change-Id: I5753ded676951998a1fd76e4d2c2bf3311213f53 --- M doc/manuals/chapters/gbproxy-running.adoc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/81/16381/1 diff --git a/doc/manuals/chapters/gbproxy-running.adoc b/doc/manuals/chapters/gbproxy-running.adoc index cac54be..9182b48 100644 --- a/doc/manuals/chapters/gbproxy-running.adoc +++ b/doc/manuals/chapters/gbproxy-running.adoc @@ -14,7 +14,7 @@ *-h, --help*:: Print a short help message about the supported options *-V, --version*:: - Print the compile-time version number of the OsmoSGSN program + Print the compile-time version number of the program *-d, --debug 'DBGMASK','DBGLEVELS'*:: Set the log subsystems and levels for logging to stderr. This has mostly been superseded by VTY-based logging configuration, -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I5753ded676951998a1fd76e4d2c2bf3311213f53 Gerrit-Change-Number: 16381 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:32:00 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 13:32:00 +0000 Subject: Change in osmo-iuh[master]: Initial minimal OsmoHNBGW user manual In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16371 ) Change subject: Initial minimal OsmoHNBGW user manual ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I54825a4ce5a457f87b0618332347eed8ea54afcb Gerrit-Change-Number: 16371 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 13:32:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:32:02 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 13:32:02 +0000 Subject: Change in osmo-iuh[master]: Initial minimal OsmoHNBGW user manual In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16371 ) Change subject: Initial minimal OsmoHNBGW user manual ...................................................................... Initial minimal OsmoHNBGW user manual This adds a very basic OsmoHNBGW user manual with an "overview" and "running" chapter. It still misses any information on configuration. Change-Id: I54825a4ce5a457f87b0618332347eed8ea54afcb Closes: OS#2588 --- M .gitignore M doc/manuals/Makefile.am A doc/manuals/chapters/overview.adoc A doc/manuals/chapters/running.adoc A doc/manuals/osmohnbgw-usermanual-docinfo.xml A doc/manuals/osmohnbgw-usermanual.adoc 6 files changed, 191 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index f662e2a..49b2cfb 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,8 @@ include/osmocom/rua/rua_ies_defs.h include/osmocom/ranap/ranap_ies_defs.h include/osmocom/sabp/sabp_ies_defs.h + +doc/manuals/build +doc/manuals/common +doc/manuals/generated +doc/manuals/*.pdf diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am index 91aa8f8..7a76e90 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile.am @@ -1,9 +1,16 @@ EXTRA_DIST = \ + osmohnbgw-usermanual.adoc \ + osmohnbgw-usermanual-docinfo.xml \ + chapters \ osmohnbgw-vty-reference.xml \ regen_doc.sh \ vty if BUILD_MANUALS + ASCIIDOC = osmohnbgw-usermanual.adoc + ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc + include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc + VTY_REFERENCE = osmohnbgw-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc diff --git a/doc/manuals/chapters/overview.adoc b/doc/manuals/chapters/overview.adoc new file mode 100644 index 0000000..2368b4f --- /dev/null +++ b/doc/manuals/chapters/overview.adoc @@ -0,0 +1,56 @@ +[[overview]] +== Overview + + +[[intro_overview]] +=== About OsmoHNBGW + +OsmoHNBGW implements the Home NodeB Gateway function in the 3G network architecture. It serves +as a gateway between the classic 3G core network (CN) domain with its IuCS and IuPS interface +and the femtocell based RAN. + +A typical 3G network consisting of Osmocom components will look as illustrated in the following +diagram: + +[[fig-3g]] +.Typical 3G network architecture used with OsmoHNBGW +---- + +------------+ +--------+ +----------+ +---------+ + UE <-->| hNodeB |<--Iuh---->| HNB-GW |<--IuCS-->| OsmoMSC |<--GSUP-->| OsmoHLR | + UE <-->| femto cell | ...-->| | ...-->| | | | + | | | | +----------+ +---------| + +------------+<--GTP-U | | + \ | | +------+ +------+ + | | |<--IuPS-->| SGSN |<--GTP-C-->| GGSN | + | +--------+ ...-->| | GTP-U-->| | + | +------+ / +------+ + \_______________________________/ +---- + +The HNB-GW performs a translation interface between the IuCS/IuPS interfaces on the one hand +side, and the Iuh interface on the or ther hand: + +---- + Iuh IuCS/IuPS + +NAS +----+----+ +----+----+ +Non-Access Stratum | CC | MM | | CC | MM | +- - - - - - - - - - - +----+----+-------+ +----+----+ + | RANAP | | H | RANAP | +Access Stratum +---------+ HNBAP | N +---------+ - - SCCP USER SAP + | RUA | | B | SUA | \ + +---------+-------+ - +---------+ | + | SCTP | G | SCTP | } SIGTRAN + +-----------------+ W +---------+ | + | IP | | IP | / + +-----------------+ +---------+ +---- + +On the femtocell (Home NodeB) side, OsmoHNBGW implements the Iuh interface as specified by 3GPP. + +=== The Iuh interface + +Iuh consists of the following sub-layers: + +- HNBAP (Home NodeB Application Part) +- RUA (RANAP User Adaptation, between RANAP and SCTP diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc new file mode 100644 index 0000000..41909e2 --- /dev/null +++ b/doc/manuals/chapters/running.adoc @@ -0,0 +1,37 @@ +== Running OsmoHNBGW + +The OsmoHNBGW executable (`osmo-hnbgw`) offers the following command-line +arguments: + +=== SYNOPSIS + +*osmo-hnbgw* [-h|-V] [-d 'DBGMASK'] [-D] [-c 'CONFIGFILE'] [-s] [-T] [-e 'LOGLEVEL'] + +=== OPTIONS + +*-h, --help*:: + Print a short help message about the supported options +*-V, --version*:: + Print the compile-time version number of the OsmoHNBGW program +*-d, --debug 'DBGMASK','DBGLEVELS'*:: + Set the log subsystems and levels for logging to stderr. This + has mostly been superseded by VTY-based logging configuration, + see <> for further information. +*-D, --daemonize*:: + Fork the process as a daemon into background. +*-c, --config-file 'CONFIGFILE'*:: + Specify the file and path name of the configuration file to be + used. If none is specified, use `osmo-msc.cfg` in the current + working directory. +*-s, --disable-color*:: + Disable colors for logging to stderr. This has mostly been + deprecated by VTY based logging configuration, see <> + for more information. +*-T, --timestamp*:: + Enable time-stamping of log messages to stderr. This has mostly + been deprecated by VTY based logging configuration, see + <> for more information. +*-e, --log-level 'LOGLEVEL'*:: + Set the global log level for logging to stderr. This has mostly + been deprecated by VTY based logging configuration, see + <> for more information. diff --git a/doc/manuals/osmohnbgw-usermanual-docinfo.xml b/doc/manuals/osmohnbgw-usermanual-docinfo.xml new file mode 100644 index 0000000..404d2a1 --- /dev/null +++ b/doc/manuals/osmohnbgw-usermanual-docinfo.xml @@ -0,0 +1,51 @@ + + + 1 + November 30th, 2019 + HW + + Initial version + + + + + + + Harald + Welte + hwelte at sysmocom.de + HW + + sysmocom + sysmocom - s.f.m.c. GmbH + Managing Director + + + + + + 2019 + sysmocom - s.f.m.c. GmbH + + + + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.3 or any later version published by the Free Software + Foundation; with the Invariant Sections being just 'Foreword', + 'Acknowledgements' and 'Preface', with no Front-Cover Texts, + and no Back-Cover Texts. A copy of the license is included in + the section entitled "GNU Free Documentation License". + + + The Asciidoc source code of this manual can be found at + + http://git.osmocom.org/osmo-hnbgw/ + + and of the common chapters at + + http://git.osmocom.org/osmo-gsm-manuals/ + + + diff --git a/doc/manuals/osmohnbgw-usermanual.adoc b/doc/manuals/osmohnbgw-usermanual.adoc new file mode 100644 index 0000000..3f3c9c3 --- /dev/null +++ b/doc/manuals/osmohnbgw-usermanual.adoc @@ -0,0 +1,35 @@ +:gfdl-enabled: +:program-name: OsmoHNBGW + +OsmoHNBGW User Manual +===================== +Harald Welte + + +include::./common/chapters/preface.adoc[] + +include::{srcdir}/chapters/overview.adoc[] + +include::{srcdir}/chapters/running.adoc[] + +// include::{srcdir}/chapters/control.adoc[] + +// include::./common/chapters/counters-overview.adoc[] + +// include::{srcdir}/chapters/counters.adoc[] + +include::./common/chapters/vty.adoc[] + +include::./common/chapters/logging.adoc[] + +// include::{srcdir}/chapters/net.adoc[] + +// include::./common/chapters/control_if.adoc[] + +include::./common/chapters/port_numbers.adoc[] + +include::./common/chapters/bibliography.adoc[] + +include::./common/chapters/glossary.adoc[] + +include::./common/chapters/gfdl.adoc[] -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I54825a4ce5a457f87b0618332347eed8ea54afcb Gerrit-Change-Number: 16371 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:32:23 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 13:32:23 +0000 Subject: Change in libosmocore[master]: Check for osmo_fsm_register() error return value In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16367 ) Change subject: Check for osmo_fsm_register() error return value ...................................................................... Check for osmo_fsm_register() error return value Change-Id: Idbc1557739b2a253b73914e6f1f18a6d169d882e --- M tests/fsm/fsm_dealloc_test.c M tests/fsm/fsm_test.c M tests/tdef/tdef_test.c M tests/use_count/use_count_test.c 4 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/tests/fsm/fsm_dealloc_test.c b/tests/fsm/fsm_dealloc_test.c index 9a6974d..48f80e5 100644 --- a/tests/fsm/fsm_dealloc_test.c +++ b/tests/fsm/fsm_dealloc_test.c @@ -452,7 +452,7 @@ log_set_category_filter(osmo_stderr_target, DLGLOBAL, 1, LOGL_DEBUG); - osmo_fsm_register(&test_fsm); + OSMO_ASSERT(osmo_fsm_register(&test_fsm) == 0); test_osmo_fsm_term_safely(); test_osmo_fsm_set_dealloc_ctx(); diff --git a/tests/fsm/fsm_test.c b/tests/fsm/fsm_test.c index f8ebdc7..911aad8 100644 --- a/tests/fsm/fsm_test.c +++ b/tests/fsm/fsm_test.c @@ -417,7 +417,7 @@ g_ctx = NULL; OSMO_ASSERT(osmo_fsm_find_by_name(fsm.name) == NULL); - osmo_fsm_register(&fsm); + OSMO_ASSERT(osmo_fsm_register(&fsm) == 0); OSMO_ASSERT(osmo_fsm_find_by_name(fsm.name) == &fsm); OSMO_ASSERT(osmo_fsm_inst_find_by_name(&fsm, "my_id") == NULL); diff --git a/tests/tdef/tdef_test.c b/tests/tdef/tdef_test.c index 276330a..9c0808e 100644 --- a/tests/tdef/tdef_test.c +++ b/tests/tdef/tdef_test.c @@ -475,7 +475,7 @@ log_set_print_category(osmo_stderr_target, 1); log_set_use_color(osmo_stderr_target, 0); - osmo_fsm_register(&test_tdef_fsm); + OSMO_ASSERT(osmo_fsm_register(&test_tdef_fsm) == 0); test_tdef_get(argc > 1); test_tdef_get_nonexisting(); diff --git a/tests/use_count/use_count_test.c b/tests/use_count/use_count_test.c index 0b081c9..95af308 100644 --- a/tests/use_count/use_count_test.c +++ b/tests/use_count/use_count_test.c @@ -331,7 +331,7 @@ log_set_print_level(osmo_stderr_target, 1); log_set_use_color(osmo_stderr_target, 0); - osmo_fsm_register(&foo_fsm); + OSMO_ASSERT(osmo_fsm_register(&foo_fsm) == 0); test_use_count_fsm(); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idbc1557739b2a253b73914e6f1f18a6d169d882e Gerrit-Change-Number: 16367 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:32:23 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 13:32:23 +0000 Subject: Change in libosmocore[master]: gprs_ns_instantiate(): propagate errors from gprs_sns_init() to caller In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16368 ) Change subject: gprs_ns_instantiate(): propagate errors from gprs_sns_init() to caller ...................................................................... gprs_ns_instantiate(): propagate errors from gprs_sns_init() to caller Change-Id: I71f347a2f0376716e5f83d33a7931eb8a99aad77 --- M src/gb/gprs_ns.c 1 file changed, 7 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index c77ebb3..ac39e4a 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -1884,13 +1884,18 @@ */ struct gprs_ns_inst *gprs_ns_instantiate(gprs_ns_cb_t *cb, void *ctx) { - struct gprs_ns_inst *nsi = talloc_zero(ctx, struct gprs_ns_inst); + struct gprs_ns_inst *nsi; if (!gprs_sns_fsm_registered) { - gprs_sns_init(); + int rc = gprs_sns_init(); + if (rc < 0) + return NULL; gprs_sns_fsm_registered = true; } + nsi = talloc_zero(ctx, struct gprs_ns_inst); + if (!nsi) + return NULL; nsi->cb = cb; INIT_LLIST_HEAD(&nsi->gprs_nsvcs); nsi->timeout[NS_TOUT_TNS_BLOCK] = 3; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I71f347a2f0376716e5f83d33a7931eb8a99aad77 Gerrit-Change-Number: 16368 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:45:52 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 13:45:52 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Check for osmo_fsm_register() error return value In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/16361 ) Change subject: mgcp_client: Check for osmo_fsm_register() error return value ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/16361/1/src/libosmo-mgcp-client/mgcp_client_fsm.c File src/libosmo-mgcp-client/mgcp_client_fsm.c: https://gerrit.osmocom.org/c/osmo-mgw/+/16361/1/src/libosmo-mgcp-client/mgcp_client_fsm.c at 623 PS1, Line 623: osmo_fsm_register Can we just move this to a function with __attribute__((constructor)), and use OSMO_ASSERT() as we do in the other projects? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/16361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie5e7fa419117349d098b0158ed840341094f3c16 Gerrit-Change-Number: 16361 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 01 Dec 2019 13:45:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:48:36 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 13:48:36 +0000 Subject: Change in osmo-pcu[master]: manual: Add missing documentation for '-i' command line option In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16380 ) Change subject: manual: Add missing documentation for '-i' command line option ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iec0f2ecd610e63baba46a63d3e1a0979a9d8c5a8 Gerrit-Change-Number: 16380 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 01 Dec 2019 13:48:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:48:55 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 13:48:55 +0000 Subject: Change in osmo-pcu[master]: manual: Fix documentation missing "-D" command line option In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16379 ) Change subject: manual: Fix documentation missing "-D" command line option ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2fd0b6f52ddc6931f413921b45d9756cb1fe456d Gerrit-Change-Number: 16379 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 01 Dec 2019 13:48:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 13:53:06 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 13:53:06 +0000 Subject: Change in osmo-pcu[master]: manual: Fix copy+paste error In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16378 ) Change subject: manual: Fix copy+paste error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I27744628edeca6895f50f84c6f2f04c2e6e2de0b Gerrit-Change-Number: 16378 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 01 Dec 2019 13:53:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:01:19 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 14:01:19 +0000 Subject: Change in osmo-sgsn[master]: manual: Fix copy+paste error In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16381 ) Change subject: manual: Fix copy+paste error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I5753ded676951998a1fd76e4d2c2bf3311213f53 Gerrit-Change-Number: 16381 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 01 Dec 2019 14:01:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:03:36 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 14:03:36 +0000 Subject: Change in osmo-msc[master]: check for osmo_ss7_init() error return value In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16376 ) Change subject: check for osmo_ss7_init() error return value ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2bc34f3962ca7355f20757e36a86ab2fd1a7aef6 Gerrit-Change-Number: 16376 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 01 Dec 2019 14:03:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:04:29 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 14:04:29 +0000 Subject: Change in osmo-msc[master]: manual: Fix copy+paste error In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16377 ) Change subject: manual: Fix copy+paste error ...................................................................... Patch Set 1: Code-Review-1 This change seems to be mixed with another one. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2c03d8424c218155dae9038dd7cc5660a290c5c8 Gerrit-Change-Number: 16377 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 01 Dec 2019 14:04:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:30:24 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 14:30:24 +0000 Subject: Change in osmo-ggsn[master]: manual: Fix copy+paste error In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/16374 ) Change subject: manual: Fix copy+paste error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/16374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ib6a97d8c93203e1f896ab1bd3d200d2223f9fc48 Gerrit-Change-Number: 16374 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 14:30:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:30:26 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 14:30:26 +0000 Subject: Change in osmo-ggsn[master]: sgsnemu: Fix null-pointer format string argument In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/16353 ) Change subject: sgsnemu: Fix null-pointer format string argument ...................................................................... sgsnemu: Fix null-pointer format string argument Modern gcc-9.2.1 actually fails like this with --enable-werror active: In file included from sgsnemu.c:52: In function ?process_options?, inlined from ?main? at sgsnemu.c:1557:6: ../lib/syserr.h:31:3: error: ?%s? directive argument is null [-Werror=format-overflow=] 31 | logp2(sub, pri, __FILE__, __LINE__, 0, \ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 32 | fmt "\n", ##args); \ | ~~~~~~~~~~~~~~~~~ sgsnemu.c:435:3: note: in expansion of macro ?SYS_ERR? 435 | SYS_ERR(DSGSN, LOGL_ERROR, 0, | ^~~~~~~ sgsnemu.c: In function ?main?: sgsnemu.c:436:42: note: format string is defined here 436 | "Listening address must be specified: %s!", | ^~ It is correct: We are dereferencing args_info.listen_addr in a branch which explicitly checks if that is NULL beforehand :/ Change-Id: I417f447f821d396aa92049e0a791121240f1cf44 --- M sgsnemu/sgsnemu.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/sgsnemu/sgsnemu.c b/sgsnemu/sgsnemu.c index 863ea51..7904c49 100644 --- a/sgsnemu/sgsnemu.c +++ b/sgsnemu/sgsnemu.c @@ -433,8 +433,7 @@ } } else { SYS_ERR(DSGSN, LOGL_ERROR, 0, - "Listening address must be specified: %s!", - args_info.listen_arg); + "Listening address must be specified!"); return -1; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/16353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I417f447f821d396aa92049e0a791121240f1cf44 Gerrit-Change-Number: 16353 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:30:26 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 14:30:26 +0000 Subject: Change in osmo-ggsn[master]: manual: Fix copy+paste error In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/16374 ) Change subject: manual: Fix copy+paste error ...................................................................... manual: Fix copy+paste error Change-Id: Ib6a97d8c93203e1f896ab1bd3d200d2223f9fc48 --- M doc/manuals/chapters/running.adoc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index 83470e8..51b8ae2 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -12,7 +12,7 @@ *-h, --help*:: Print a short help message about the supported options *-V, --version*:: - Print the compile-time version number of the OsmoBTS program + Print the compile-time version number of the program *-D, --daemonize*:: Fork the process as a daemon into background. *-c, --config-file 'CONFIGFILE'*:: -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/16374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ib6a97d8c93203e1f896ab1bd3d200d2223f9fc48 Gerrit-Change-Number: 16374 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:30:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 14:30:51 +0000 Subject: Change in osmo-msc[master]: check for osmo_ss7_init() error return value In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16376 ) Change subject: check for osmo_ss7_init() error return value ...................................................................... check for osmo_ss7_init() error return value Change-Id: I2bc34f3962ca7355f20757e36a86ab2fd1a7aef6 --- M src/osmo-msc/msc_main.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 43a1fcb..e7570cd 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -523,7 +523,7 @@ /* For --version, vty_init() must be called before handling options */ vty_init(&msc_vty_info); - osmo_ss7_init(); + OSMO_ASSERT(osmo_ss7_init() == 0); osmo_ss7_vty_init_asp(tall_msc_ctx); osmo_sccp_vty_init(); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2bc34f3962ca7355f20757e36a86ab2fd1a7aef6 Gerrit-Change-Number: 16376 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:32:26 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 14:32:26 +0000 Subject: Change in osmo-msc[master]: manual: Fix copy+paste error In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/16377 to look at the new patch set (#2). Change subject: manual: Fix copy+paste error ...................................................................... manual: Fix copy+paste error Change-Id: I2c03d8424c218155dae9038dd7cc5660a290c5c8 --- M doc/manuals/chapters/running.adoc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/77/16377/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2c03d8424c218155dae9038dd7cc5660a290c5c8 Gerrit-Change-Number: 16377 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:32:26 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 14:32:26 +0000 Subject: Change in osmo-msc[master]: Check for osmo_fsm_register() error return value References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16382 ) Change subject: Check for osmo_fsm_register() error return value ...................................................................... Check for osmo_fsm_register() error return value Change-Id: I4cce3d6798fe3184a3085d114b749b4645620978 --- M src/libmsc/mncc_call.c M src/libmsc/msc_ho.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/82/16382/1 diff --git a/src/libmsc/mncc_call.c b/src/libmsc/mncc_call.c index e5fc820..0deb903 100644 --- a/src/libmsc/mncc_call.c +++ b/src/libmsc/mncc_call.c @@ -60,7 +60,7 @@ void mncc_call_fsm_init(struct gsm_network *net) { - osmo_fsm_register(&mncc_call_fsm); + OSMO_ASSERT(osmo_fsm_register(&mncc_call_fsm) == 0); gsmnet = net; } diff --git a/src/libmsc/msc_ho.c b/src/libmsc/msc_ho.c index 99f37b6..ac7602f 100644 --- a/src/libmsc/msc_ho.c +++ b/src/libmsc/msc_ho.c @@ -62,7 +62,7 @@ static __attribute__((constructor)) void msc_ho_fsm_init() { - osmo_fsm_register(&msc_ho_fsm); + OSMO_ASSERT(osmo_fsm_register(&msc_ho_fsm) == 0); } void msc_ho_down_required_reject(struct msc_a *msc_a, enum gsm0808_cause cause) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I4cce3d6798fe3184a3085d114b749b4645620978 Gerrit-Change-Number: 16382 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:32:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 14:32:43 +0000 Subject: Change in osmo-sgsn[master]: manual: Fix copy+paste error In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16381 ) Change subject: manual: Fix copy+paste error ...................................................................... manual: Fix copy+paste error Change-Id: I5753ded676951998a1fd76e4d2c2bf3311213f53 --- M doc/manuals/chapters/gbproxy-running.adoc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/doc/manuals/chapters/gbproxy-running.adoc b/doc/manuals/chapters/gbproxy-running.adoc index cac54be..9182b48 100644 --- a/doc/manuals/chapters/gbproxy-running.adoc +++ b/doc/manuals/chapters/gbproxy-running.adoc @@ -14,7 +14,7 @@ *-h, --help*:: Print a short help message about the supported options *-V, --version*:: - Print the compile-time version number of the OsmoSGSN program + Print the compile-time version number of the program *-d, --debug 'DBGMASK','DBGLEVELS'*:: Set the log subsystems and levels for logging to stderr. This has mostly been superseded by VTY-based logging configuration, -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I5753ded676951998a1fd76e4d2c2bf3311213f53 Gerrit-Change-Number: 16381 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:32:54 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 14:32:54 +0000 Subject: Change in osmo-pcu[master]: manual: Fix copy+paste error In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16378 ) Change subject: manual: Fix copy+paste error ...................................................................... manual: Fix copy+paste error Change-Id: I27744628edeca6895f50f84c6f2f04c2e6e2de0b --- M doc/manuals/chapters/running.adoc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index d9f78c8..6a52b70 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -14,7 +14,7 @@ *-h, --help*:: Print a short help message about the supported options *-V, --version*:: - Print the compile-time version number of the OsmoBTS program + Print the compile-time version number of the program //*-D, --daemonize*:: // Fork the process as a daemon into background. *-c, --config-file 'CONFIGFILE'*:: -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I27744628edeca6895f50f84c6f2f04c2e6e2de0b Gerrit-Change-Number: 16378 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:32:54 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 14:32:54 +0000 Subject: Change in osmo-pcu[master]: manual: Fix documentation missing "-D" command line option In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16379 ) Change subject: manual: Fix documentation missing "-D" command line option ...................................................................... manual: Fix documentation missing "-D" command line option Change-Id: I2fd0b6f52ddc6931f413921b45d9756cb1fe456d --- M doc/manuals/chapters/running.adoc 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index 6a52b70..d7e6383 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -15,8 +15,8 @@ Print a short help message about the supported options *-V, --version*:: Print the compile-time version number of the program -//*-D, --daemonize*:: -// Fork the process as a daemon into background. +*-D, --daemonize*:: + Fork the process as a daemon into background. *-c, --config-file 'CONFIGFILE'*:: Specify the file and path name of the configuration file to be used. If none is specified, use `osmo-pcu.cfg` in the current -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2fd0b6f52ddc6931f413921b45d9756cb1fe456d Gerrit-Change-Number: 16379 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:32:55 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 14:32:55 +0000 Subject: Change in osmo-pcu[master]: manual: Add missing documentation for '-i' command line option In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16380 ) Change subject: manual: Add missing documentation for '-i' command line option ...................................................................... manual: Add missing documentation for '-i' command line option Change-Id: Iec0f2ecd610e63baba46a63d3e1a0979a9d8c5a8 --- M doc/manuals/chapters/running.adoc 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index d7e6383..5daecf8 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -6,7 +6,7 @@ === SYNOPSIS -*osmo-pcu* [-h|-V] [-D] [-c 'CONFIGFILE'] [-r 'PRIO'] [-m 'MCC'] [-n 'MNC'] +*osmo-pcu* [-h|-V] [-D] [-c 'CONFIGFILE'] [-r 'PRIO'] [-m 'MCC'] [-n 'MNC'] [-i A.B.C.D] === OPTIONS @@ -31,3 +31,5 @@ Use the given MCC instead of that provided by BTS via PCU socket *-n, --mnc 'MNC'*:: Use the given MNC instead of that provided by BTS via PCU socket +*-i, --gsmtap-ip 'A.B.C.D'*:: + Send Um interface trace via GSMTAP to specified IP address -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iec0f2ecd610e63baba46a63d3e1a0979a9d8c5a8 Gerrit-Change-Number: 16380 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:33:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 14:33:18 +0000 Subject: Change in osmo-mgw[master]: manual: Fix copy+paste error In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/16375 ) Change subject: manual: Fix copy+paste error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/16375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I5cd93994563520c94ed9aefbedaf9d18ea2134a6 Gerrit-Change-Number: 16375 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 14:33:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:33:47 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 14:33:47 +0000 Subject: Change in osmo-msc[master]: manual: Fix copy+paste error In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16377 ) Change subject: manual: Fix copy+paste error ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2c03d8424c218155dae9038dd7cc5660a290c5c8 Gerrit-Change-Number: 16377 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 01 Dec 2019 14:33:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:33:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 14:33:50 +0000 Subject: Change in osmo-msc[master]: manual: Fix copy+paste error In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16377 ) Change subject: manual: Fix copy+paste error ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2c03d8424c218155dae9038dd7cc5660a290c5c8 Gerrit-Change-Number: 16377 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 14:33:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:34:01 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 14:34:01 +0000 Subject: Change in osmo-msc[master]: Check for osmo_fsm_register() error return value In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16382 ) Change subject: Check for osmo_fsm_register() error return value ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I4cce3d6798fe3184a3085d114b749b4645620978 Gerrit-Change-Number: 16382 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 01 Dec 2019 14:34:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:34:11 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 14:34:11 +0000 Subject: Change in osmo-bsc[master]: manual: Fix copy+paste error In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16373 ) Change subject: manual: Fix copy+paste error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I787c4bd4b30a6620a987efed4fd8b46e14a7ea64 Gerrit-Change-Number: 16373 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 14:34:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:34:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 14:34:12 +0000 Subject: Change in osmo-bsc[master]: manual: Fix copy+paste error In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16373 ) Change subject: manual: Fix copy+paste error ...................................................................... manual: Fix copy+paste error Change-Id: I787c4bd4b30a6620a987efed4fd8b46e14a7ea64 --- M doc/manuals/chapters/running.adoc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index f62ba6e..995fd88 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -12,7 +12,7 @@ *-h, --help*:: Print a short help message about the supported options *-V, --version*:: - Print the compile-time version number of the OsmoBTS program + Print the compile-time version number of the program *-d, --debug 'DBGMASK','DBGLEVELS'*:: Set the log subsystems and levels for logging to stderr. This has mostly been superseded by VTY-based logging configuration, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I787c4bd4b30a6620a987efed4fd8b46e14a7ea64 Gerrit-Change-Number: 16373 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:34:21 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 14:34:21 +0000 Subject: Change in openbsc[master]: manual: Fix copy+paste error In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/16372 ) Change subject: manual: Fix copy+paste error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/16372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I260946d39f78cf2713dc26860935ab29b83a5532 Gerrit-Change-Number: 16372 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 14:34:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:34:22 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 14:34:22 +0000 Subject: Change in openbsc[master]: manual: Fix copy+paste error In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/openbsc/+/16372 ) Change subject: manual: Fix copy+paste error ...................................................................... manual: Fix copy+paste error Change-Id: I260946d39f78cf2713dc26860935ab29b83a5532 --- M manuals/OsmoNITB/chapters/running.adoc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/manuals/OsmoNITB/chapters/running.adoc b/manuals/OsmoNITB/chapters/running.adoc index 406c41c..f742648 100644 --- a/manuals/OsmoNITB/chapters/running.adoc +++ b/manuals/OsmoNITB/chapters/running.adoc @@ -12,7 +12,7 @@ *-h, --help*:: Print a short help message about the supported options *-V, --version*:: - Print the compile-time version number of the OsmoBTS program + Print the compile-time version number of the program *-d, --debug 'DBGMASK','DBGLEVELS'*:: Set the log subsystems and levels for logging to stderr. This has mostly been superseded by VTY-based logging configuration, -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/16372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I260946d39f78cf2713dc26860935ab29b83a5532 Gerrit-Change-Number: 16372 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:37:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 14:37:43 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Check for osmo_fsm_register() error return value In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/16361 ) Change subject: mgcp_client: Check for osmo_fsm_register() error return value ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/16361/1/src/libosmo-mgcp-client/mgcp_client_fsm.c File src/libosmo-mgcp-client/mgcp_client_fsm.c: https://gerrit.osmocom.org/c/osmo-mgw/+/16361/1/src/libosmo-mgcp-client/mgcp_client_fsm.c at 623 PS1, Line 623: osmo_fsm_register > Can we just move this to a function with __attribute__((constructor)), and use OSMO_ASSERT() as we d [?] I'll do that in a separate commit -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/16361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie5e7fa419117349d098b0158ed840341094f3c16 Gerrit-Change-Number: 16361 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 14:37:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:39:03 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 14:39:03 +0000 Subject: Change in osmo-mgw[master]: manual: Fix copy+paste error In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/16375 ) Change subject: manual: Fix copy+paste error ...................................................................... manual: Fix copy+paste error Change-Id: I5cd93994563520c94ed9aefbedaf9d18ea2134a6 --- M doc/manuals/chapters/running.adoc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index 8565ea5..c178e31 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -12,7 +12,7 @@ *-h, --help*:: Print a short help message about the supported options *-V, --version*:: - Print the compile-time version number of the OsmoBTS program + Print the compile-time version number of the program *-D, --daemonize*:: Fork the process as a daemon into background. *-c, --config-file 'CONFIGFILE'*:: -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/16375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I5cd93994563520c94ed9aefbedaf9d18ea2134a6 Gerrit-Change-Number: 16375 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:39:19 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 14:39:19 +0000 Subject: Change in osmo-mgw[master]: Move fsm_mgcp_client regstration to __attribute__((contructor)) References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/16383 ) Change subject: Move fsm_mgcp_client regstration to __attribute__((contructor)) ...................................................................... Move fsm_mgcp_client regstration to __attribute__((contructor)) This way we can avoid the runtime overhead of checking whether or not it is initialized over and over again. It also brings this code more in line with other users of osmo_fsm_register(). Change-Id: Ia73ba8e46c13d925e88203e08a8966839e573183 --- M src/libosmo-mgcp-client/mgcp_client_fsm.c 1 file changed, 5 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/83/16383/1 diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c index e910586..e38a4ba 100644 --- a/src/libosmo-mgcp-client/mgcp_client_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c @@ -606,7 +606,6 @@ uint32_t parent_term_evt, uint32_t parent_evt, struct mgcp_conn_peer *conn_peer) { struct mgcp_ctx *mgcp_ctx; - static bool fsm_registered = false; struct osmo_fsm_inst *fi; struct in_addr ip_test; @@ -618,13 +617,6 @@ if (conn_peer->port && inet_aton(conn_peer->addr, &ip_test) == 0) return NULL; - /* Register the fsm description (if not already done) */ - if (fsm_registered == false) { - if (osmo_fsm_register(&fsm_mgcp_client) < 0) - return NULL; - fsm_registered = true; - } - /* Allocate and configure a new fsm instance */ fi = osmo_fsm_inst_alloc_child(&fsm_mgcp_client, parent_fi, parent_term_evt); OSMO_ASSERT(fi); @@ -749,3 +741,8 @@ return "empty"; return buf; } + +static __attribute__((constructor)) void osmo_mgcp_client_fsm_init() +{ + OSMO_ASSERT(osmo_fsm_register(&fsm_mgcp_client) == 0); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/16383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ia73ba8e46c13d925e88203e08a8966839e573183 Gerrit-Change-Number: 16383 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:43:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 14:43:30 +0000 Subject: Change in osmo-msc[master]: manual: Fix copy+paste error In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16377 ) Change subject: manual: Fix copy+paste error ...................................................................... manual: Fix copy+paste error Change-Id: I2c03d8424c218155dae9038dd7cc5660a290c5c8 --- M doc/manuals/chapters/running.adoc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index 71f336b..03dade6 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -12,7 +12,7 @@ *-h, --help*:: Print a short help message about the supported options *-V, --version*:: - Print the compile-time version number of the OsmoBTS program + Print the compile-time version number of the program *-d, --debug 'DBGMASK','DBGLEVELS'*:: Set the log subsystems and levels for logging to stderr. This has mostly been superseded by VTY-based logging configuration, -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2c03d8424c218155dae9038dd7cc5660a290c5c8 Gerrit-Change-Number: 16377 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:43:31 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 14:43:31 +0000 Subject: Change in osmo-msc[master]: Check for osmo_fsm_register() error return value In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16382 ) Change subject: Check for osmo_fsm_register() error return value ...................................................................... Check for osmo_fsm_register() error return value Change-Id: I4cce3d6798fe3184a3085d114b749b4645620978 --- M src/libmsc/mncc_call.c M src/libmsc/msc_ho.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/mncc_call.c b/src/libmsc/mncc_call.c index e5fc820..0deb903 100644 --- a/src/libmsc/mncc_call.c +++ b/src/libmsc/mncc_call.c @@ -60,7 +60,7 @@ void mncc_call_fsm_init(struct gsm_network *net) { - osmo_fsm_register(&mncc_call_fsm); + OSMO_ASSERT(osmo_fsm_register(&mncc_call_fsm) == 0); gsmnet = net; } diff --git a/src/libmsc/msc_ho.c b/src/libmsc/msc_ho.c index 99f37b6..ac7602f 100644 --- a/src/libmsc/msc_ho.c +++ b/src/libmsc/msc_ho.c @@ -62,7 +62,7 @@ static __attribute__((constructor)) void msc_ho_fsm_init() { - osmo_fsm_register(&msc_ho_fsm); + OSMO_ASSERT(osmo_fsm_register(&msc_ho_fsm) == 0); } void msc_ho_down_required_reject(struct msc_a *msc_a, enum gsm0808_cause cause) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I4cce3d6798fe3184a3085d114b749b4645620978 Gerrit-Change-Number: 16382 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:44:25 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 14:44:25 +0000 Subject: Change in osmo-bsc[master]: Move a_reset_fsm regstration to __attribute__((contructor)) References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16384 ) Change subject: Move a_reset_fsm regstration to __attribute__((contructor)) ...................................................................... Move a_reset_fsm regstration to __attribute__((contructor)) This way we can avoid the runtime overhead of checking whether or not it is initialized over and over again. It also brings this code more in line with other users of osmo_fsm_register(). Change-Id: I3c7220491cf6ffb1361e7259c0344df64a013a0a --- M src/osmo-bsc/a_reset.c 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/84/16384/1 diff --git a/src/osmo-bsc/a_reset.c b/src/osmo-bsc/a_reset.c index bc41914..3f51278 100644 --- a/src/osmo-bsc/a_reset.c +++ b/src/osmo-bsc/a_reset.c @@ -149,10 +149,6 @@ /* There must not be any double allocation! */ OSMO_ASSERT(msc->a.reset_fsm == NULL); - /* Register the fsm description (if not already done) */ - if (osmo_fsm_find_by_name(fsm.name) != &fsm) - OSMO_ASSERT(osmo_fsm_register(&fsm) == 0); - /* Allocate and configure a new fsm instance */ reset_ctx = talloc_zero(msc, struct reset_ctx); OSMO_ASSERT(reset_ctx); @@ -217,3 +213,8 @@ return false; } + +static __attribute__((constructor)) void a_reset_fsm_init() +{ + OSMO_ASSERT(osmo_fsm_register(&fsm) == 0); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3c7220491cf6ffb1361e7259c0344df64a013a0a Gerrit-Change-Number: 16384 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 14:57:03 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 14:57:03 +0000 Subject: Change in libosmocore[master]: gsup: Introduce OSMO_GSUP_NUM_VECTORS_REQ_IE In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/15321 to look at the new patch set (#5). Change subject: gsup: Introduce OSMO_GSUP_NUM_VECTORS_REQ_IE ...................................................................... gsup: Introduce OSMO_GSUP_NUM_VECTORS_REQ_IE This is a bit of a hack, as we want to maintain binary compatibility without breaking existing users of libosmocore. To do so, we use the 'num_auth_vectors' field in two ways now: * In the existing use case as part of SEND_AUTH_INFO_RESPONSE, it indicates the number of vectors stored in the 'auth_vectors' field * In the new use case as part of SEND_AUTH_INFO_REQUEST, it indicates the number of vectors actually requested by the MSC/SGSN/MME. Change-Id: Iaecc47280f8ce54f3e3a888c1cfc160735483d0f --- M include/osmocom/gsm/gsup.h M src/gsm/gsup.c M tests/gsup/gsup_test.c M tests/gsup/gsup_test.ok 4 files changed, 28 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/21/15321/5 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iaecc47280f8ce54f3e3a888c1cfc160735483d0f Gerrit-Change-Number: 15321 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 15:05:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 15:05:07 +0000 Subject: Change in libosmocore[master]: gsup: Introduce OSMO_GSUP_NUM_VECTORS_REQ_IE In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/15321 to look at the new patch set (#6). Change subject: gsup: Introduce OSMO_GSUP_NUM_VECTORS_REQ_IE ...................................................................... gsup: Introduce OSMO_GSUP_NUM_VECTORS_REQ_IE This is a bit of a hack, as we want to maintain binary compatibility without breaking existing users of libosmocore. To do so, we use the 'num_auth_vectors' field in two ways now: * In the existing use case as part of SEND_AUTH_INFO_RESPONSE, it indicates the number of vectors stored in the 'auth_vectors' field * In the new use case as part of SEND_AUTH_INFO_REQUEST, it indicates the number of vectors actually requested by the MSC/SGSN/MME. Change-Id: Iaecc47280f8ce54f3e3a888c1cfc160735483d0f --- M include/osmocom/gsm/gsup.h M src/gsm/gsup.c M tests/gsup/gsup_test.c M tests/gsup/gsup_test.err M tests/gsup/gsup_test.ok 5 files changed, 33 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/21/15321/6 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iaecc47280f8ce54f3e3a888c1cfc160735483d0f Gerrit-Change-Number: 15321 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 15:11:10 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 15:11:10 +0000 Subject: Change in osmo-hlr[master]: AUC: Add support for setting the AMF separation bit to '1' for EUTRAN In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/15364 to look at the new patch set (#3). Change subject: AUC: Add support for setting the AMF separation bit to '1' for EUTRAN ...................................................................... AUC: Add support for setting the AMF separation bit to '1' for EUTRAN Despite LTE/EUTRAN using the same authentication procedure (UMTS AKA) as 3G, there's one difference: The "operator defined" 16bit AMF field is reduced to 15 bits, with the first bit now being used as 'separation bit'. That bit should be '0' for 2G/3G (as it is right now) and '1' for authentication vectores generated for authentication over EUTRAN/EPS. Depends: libosmocore I93850710ab55a605bf61b95063a69682a2899bb1 (OSMO_GSUP_RAT_TYPES_IE) Change-Id: Ic766bc40f6126bb479bd0a05b0e96bec3e240008 --- M include/osmocom/hlr/db.h M src/db_auc.c M src/hlr.c M tests/db/db_test.c M tests/db/db_test.err 5 files changed, 26 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/64/15364/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ic766bc40f6126bb479bd0a05b0e96bec3e240008 Gerrit-Change-Number: 15364 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 15:54:20 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 15:54:20 +0000 Subject: Change in osmo-msc[master]: counters: clarify documentation for MSC_CTR_LOC_UPDATE_* entries References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16385 ) Change subject: counters: clarify documentation for MSC_CTR_LOC_UPDATE_* entries ...................................................................... counters: clarify documentation for MSC_CTR_LOC_UPDATE_* entries Change-Id: I4f4a0d644db0a2dd7c8eefd846ea6913c0b780ce --- M doc/manuals/chapters/counters_generated.adoc M include/osmocom/msc/gsm_data.h 2 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/85/16385/1 diff --git a/doc/manuals/chapters/counters_generated.adoc b/doc/manuals/chapters/counters_generated.adoc index 526ed01..49f2589 100644 --- a/doc/manuals/chapters/counters_generated.adoc +++ b/doc/manuals/chapters/counters_generated.adoc @@ -10,12 +10,12 @@ [options="header"] |=== | Name | Reference | Description -| loc_update_type:attach | <> | Received location update imsi attach requests. -| loc_update_type:normal | <> | Received location update normal requests. -| loc_update_type:periodic | <> | Received location update periodic requests. -| loc_update_type:detach | <> | Received location update detach indication. -| loc_update_resp:failed | <> | Rejected location updates. -| loc_update_resp:completed | <> | Successful location updates. +| loc_update_type:attach | <> | Received Location Update (IMSI Attach) requests. +| loc_update_type:normal | <> | Received Location Update (LAC change) requests. +| loc_update_type:periodic | <> | Received (periodic) Location Update requests. +| loc_update_type:detach | <> | Received IMSI Detach indications. +| loc_update_resp:failed | <> | Rejected Location Updates requests. +| loc_update_resp:completed | <> | Successful Location Update procedures. | cm_service_request:rejected | <> | Rejected CM Service Request. | cm_service_request:accepted | <> | Accepted CM Service Request. | paging_resp:rejected | <> | Rejected Paging Response. diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 60008b9..ca5c38a 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -65,12 +65,12 @@ }; static const struct rate_ctr_desc msc_ctr_description[] = { - [MSC_CTR_LOC_UPDATE_TYPE_ATTACH] = {"loc_update_type:attach", "Received location update imsi attach requests."}, - [MSC_CTR_LOC_UPDATE_TYPE_NORMAL] = {"loc_update_type:normal", "Received location update normal requests."}, - [MSC_CTR_LOC_UPDATE_TYPE_PERIODIC] = {"loc_update_type:periodic", "Received location update periodic requests."}, - [MSC_CTR_LOC_UPDATE_TYPE_DETACH] = {"loc_update_type:detach", "Received location update detach indication."}, - [MSC_CTR_LOC_UPDATE_FAILED] = {"loc_update_resp:failed", "Rejected location updates."}, - [MSC_CTR_LOC_UPDATE_COMPLETED] = {"loc_update_resp:completed", "Successful location updates."}, + [MSC_CTR_LOC_UPDATE_TYPE_ATTACH] = {"loc_update_type:attach", "Received Location Update (IMSI Attach) requests."}, + [MSC_CTR_LOC_UPDATE_TYPE_NORMAL] = {"loc_update_type:normal", "Received Location Update (LAC change) requests."}, + [MSC_CTR_LOC_UPDATE_TYPE_PERIODIC] = {"loc_update_type:periodic", "Received (periodic) Location Update requests."}, + [MSC_CTR_LOC_UPDATE_TYPE_DETACH] = {"loc_update_type:detach", "Received IMSI Detach indications."}, + [MSC_CTR_LOC_UPDATE_FAILED] = {"loc_update_resp:failed", "Rejected Location Update requests."}, + [MSC_CTR_LOC_UPDATE_COMPLETED] = {"loc_update_resp:completed", "Successful Location Update procedures."}, [MSC_CTR_CM_SERVICE_REQUEST_REJECTED] = {"cm_service_request:rejected", "Rejected CM Service Request."}, [MSC_CTR_CM_SERVICE_REQUEST_ACCEPTED] = {"cm_service_request:accepted", "Accepted CM Service Request."}, [MSC_CTR_PAGING_RESP_REJECTED] = {"paging_resp:rejected", "Rejected Paging Response."}, -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I4f4a0d644db0a2dd7c8eefd846ea6913c0b780ce Gerrit-Change-Number: 16385 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 15:54:53 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 15:54:53 +0000 Subject: Change in osmo-msc[master]: counters: clarify documentation for MSC_CTR_SMS_* entries In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16172 ) Change subject: counters: clarify documentation for MSC_CTR_SMS_* entries ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I081cf962ce2658ceab02699f3cdee19658d00939 Gerrit-Change-Number: 16172 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 01 Dec 2019 15:54:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 15:55:42 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 15:55:42 +0000 Subject: Change in osmo-msc[master]: counters: clarify documentation for MSC_CTR_LOC_UPDATE_* entries In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16385 ) Change subject: counters: clarify documentation for MSC_CTR_LOC_UPDATE_* entries ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I4f4a0d644db0a2dd7c8eefd846ea6913c0b780ce Gerrit-Change-Number: 16385 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 01 Dec 2019 15:55:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 15:56:05 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 15:56:05 +0000 Subject: Change in osmo-msc[master]: counters: clarify documentation for MSC_CTR_SMS_* entries In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16172 ) Change subject: counters: clarify documentation for MSC_CTR_SMS_* entries ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I081cf962ce2658ceab02699f3cdee19658d00939 Gerrit-Change-Number: 16172 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 01 Dec 2019 15:56:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 16:16:04 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 16:16:04 +0000 Subject: Change in osmo-msc[master]: counters: clarify documentation for MSC_CTR_CALL_* entries References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16386 ) Change subject: counters: clarify documentation for MSC_CTR_CALL_* entries ...................................................................... counters: clarify documentation for MSC_CTR_CALL_* entries Change-Id: Iad1ef917a229c3be51bd8fbe155f009f81e7d72a --- M doc/manuals/chapters/counters_generated.adoc M include/osmocom/msc/gsm_data.h 2 files changed, 14 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/86/16386/1 diff --git a/doc/manuals/chapters/counters_generated.adoc b/doc/manuals/chapters/counters_generated.adoc index 49f2589..d73803d 100644 --- a/doc/manuals/chapters/counters_generated.adoc +++ b/doc/manuals/chapters/counters_generated.adoc @@ -26,13 +26,13 @@ | sms:delivered | <> | Total MT SMS delivery attempts. | sms:rp_err_mem | <> | Failed MT SMS delivery attempts (no memory). | sms:rp_err_other | <> | Failed MT SMS delivery attempts (other reason). -| call:mo_setup | <> | Received setup requests from a MS to init a MO call. -| call:mo_connect_ack | <> | Received a connect ack from MS of a MO call. Call is now successful connected up. -| call:mt_setup | <> | Sent setup requests to the MS (MT). -| call:mt_connect | <> | Sent a connect to the MS (MT). -| call:active | <> | Count total amount of calls that ever reached active state. -| call:complete | <> | Count total amount of calls which got terminated by disconnect req or ind after reaching active state. -| call:incomplete | <> | Count total amount of call which got terminated by any other reason after reaching active state. +| call:mo_setup | <> | Received MO SETUP messages (MO call establishment). +| call:mo_connect_ack | <> | Received MO CONNECT messages (MO call establishment). +| call:mt_setup | <> | Sent MT SETUP messages (MT call establishment). +| call:mt_connect | <> | Sent MT CONNECT messages (MT call establishment). +| call:active | <> | Calls that ever reached the active state. +| call:complete | <> | Calls terminated by DISCONNECT message after reaching the active state. +| call:incomplete | <> | Calls terminated by any other reason after reaching the active state. | nc_ss:mo_requests | <> | Received MS-initiated call independent SS/USSD requests. | nc_ss:mo_established | <> | Established MS-initiated call independent SS/USSD sessions. | nc_ss:mt_requests | <> | Received network-initiated call independent SS/USSD requests. diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index ca5c38a..87629ad 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -83,13 +83,13 @@ [MSC_CTR_SMS_DELIVERED] = {"sms:delivered", "Total MT SMS delivery attempts."}, [MSC_CTR_SMS_RP_ERR_MEM] = {"sms:rp_err_mem", "Failed MT SMS delivery attempts (no memory)."}, [MSC_CTR_SMS_RP_ERR_OTHER] = {"sms:rp_err_other", "Failed MT SMS delivery attempts (other reason)."}, - [MSC_CTR_CALL_MO_SETUP] = {"call:mo_setup", "Received setup requests from a MS to init a MO call."}, - [MSC_CTR_CALL_MO_CONNECT_ACK] = {"call:mo_connect_ack", "Received a connect ack from MS of a MO call. Call is now successful connected up."}, - [MSC_CTR_CALL_MT_SETUP] = {"call:mt_setup", "Sent setup requests to the MS (MT)."}, - [MSC_CTR_CALL_MT_CONNECT] = {"call:mt_connect", "Sent a connect to the MS (MT)."}, - [MSC_CTR_CALL_ACTIVE] = {"call:active", "Count total amount of calls that ever reached active state."}, - [MSC_CTR_CALL_COMPLETE] = {"call:complete", "Count total amount of calls which got terminated by disconnect req or ind after reaching active state."}, - [MSC_CTR_CALL_INCOMPLETE] = {"call:incomplete", "Count total amount of call which got terminated by any other reason after reaching active state."}, + [MSC_CTR_CALL_MO_SETUP] = {"call:mo_setup", "Received MO SETUP messages (MO call establishment)."}, + [MSC_CTR_CALL_MO_CONNECT_ACK] = {"call:mo_connect_ack", "Received MO CONNECT messages (MO call establishment)."}, + [MSC_CTR_CALL_MT_SETUP] = {"call:mt_setup", "Sent MT SETUP messages (MT call establishment)."}, + [MSC_CTR_CALL_MT_CONNECT] = {"call:mt_connect", "Sent MT CONNECT messages (MT call establishment)."}, + [MSC_CTR_CALL_ACTIVE] = {"call:active", "Calls that ever reached the active state."}, + [MSC_CTR_CALL_COMPLETE] = {"call:complete", "Calls terminated by DISCONNECT message after reaching the active state."}, + [MSC_CTR_CALL_INCOMPLETE] = {"call:incomplete", "Calls terminated by any other reason after reaching the active state."}, [MSC_CTR_NC_SS_MO_REQUESTS] = {"nc_ss:mo_requests", "Received MS-initiated call independent SS/USSD requests."}, [MSC_CTR_NC_SS_MO_ESTABLISHED] = {"nc_ss:mo_established", "Established MS-initiated call independent SS/USSD sessions."}, [MSC_CTR_NC_SS_MT_REQUESTS] = {"nc_ss:mt_requests", "Received network-initiated call independent SS/USSD requests."}, -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iad1ef917a229c3be51bd8fbe155f009f81e7d72a Gerrit-Change-Number: 16386 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 16:16:04 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 16:16:04 +0000 Subject: Change in osmo-msc[master]: counters: polish documentation of cm_service_request / paging_resp References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16387 ) Change subject: counters: polish documentation of cm_service_request / paging_resp ...................................................................... counters: polish documentation of cm_service_request / paging_resp Change-Id: I273bc4165c70cd54ed94ff5f99377189f3306f51 --- M doc/manuals/chapters/counters_generated.adoc M include/osmocom/msc/gsm_data.h 2 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/87/16387/1 diff --git a/doc/manuals/chapters/counters_generated.adoc b/doc/manuals/chapters/counters_generated.adoc index d73803d..f55be27 100644 --- a/doc/manuals/chapters/counters_generated.adoc +++ b/doc/manuals/chapters/counters_generated.adoc @@ -16,10 +16,10 @@ | loc_update_type:detach | <> | Received IMSI Detach indications. | loc_update_resp:failed | <> | Rejected Location Updates requests. | loc_update_resp:completed | <> | Successful Location Update procedures. -| cm_service_request:rejected | <> | Rejected CM Service Request. -| cm_service_request:accepted | <> | Accepted CM Service Request. -| paging_resp:rejected | <> | Rejected Paging Response. -| paging_resp:accepted | <> | Accepted Paging Response. +| cm_service_request:rejected | <> | Rejected CM Service Requests. +| cm_service_request:accepted | <> | Accepted CM Service Requests. +| paging_resp:rejected | <> | Rejected Paging Responses. +| paging_resp:accepted | <> | Accepted Paging Responses. | sms:submitted | <> | Total MO SMS received from the MS. | sms:no_receiver | <> | Failed MO SMS delivery attempts (no receiver found). | sms:deliver_unknown_error | <> | Failed MO SMS delivery attempts (other reason). diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 87629ad..3459d15 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -71,10 +71,10 @@ [MSC_CTR_LOC_UPDATE_TYPE_DETACH] = {"loc_update_type:detach", "Received IMSI Detach indications."}, [MSC_CTR_LOC_UPDATE_FAILED] = {"loc_update_resp:failed", "Rejected Location Update requests."}, [MSC_CTR_LOC_UPDATE_COMPLETED] = {"loc_update_resp:completed", "Successful Location Update procedures."}, - [MSC_CTR_CM_SERVICE_REQUEST_REJECTED] = {"cm_service_request:rejected", "Rejected CM Service Request."}, - [MSC_CTR_CM_SERVICE_REQUEST_ACCEPTED] = {"cm_service_request:accepted", "Accepted CM Service Request."}, - [MSC_CTR_PAGING_RESP_REJECTED] = {"paging_resp:rejected", "Rejected Paging Response."}, - [MSC_CTR_PAGING_RESP_ACCEPTED] = {"paging_resp:accepted", "Accepted Paging Response."}, + [MSC_CTR_CM_SERVICE_REQUEST_REJECTED] = {"cm_service_request:rejected", "Rejected CM Service Requests."}, + [MSC_CTR_CM_SERVICE_REQUEST_ACCEPTED] = {"cm_service_request:accepted", "Accepted CM Service Requests."}, + [MSC_CTR_PAGING_RESP_REJECTED] = {"paging_resp:rejected", "Rejected Paging Responses."}, + [MSC_CTR_PAGING_RESP_ACCEPTED] = {"paging_resp:accepted", "Accepted Paging Responses."}, [MSC_CTR_SMS_SUBMITTED] = {"sms:submitted", "Total MO SMS received from the MS."}, [MSC_CTR_SMS_NO_RECEIVER] = {"sms:no_receiver", "Failed MO SMS delivery attempts (no receiver found)."}, [MSC_CTR_SMS_DELIVER_UNKNOWN_ERROR] = {"sms:deliver_unknown_error", "Failed MO SMS delivery attempts (other reason)."}, -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I273bc4165c70cd54ed94ff5f99377189f3306f51 Gerrit-Change-Number: 16387 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 16:37:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 16:37:18 +0000 Subject: Change in libosmo-sccp[master]: check for osmo_fsm_register() failures and propagate error References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16388 ) Change subject: check for osmo_fsm_register() failures and propagate error ...................................................................... check for osmo_fsm_register() failures and propagate error Change-Id: Id8861144e4880383a173b7e6ae7860beebac09d9 --- M examples/sccp_demo_user.c M src/osmo_ss7.c M stp/stp_main.c M tests/ss7/ss7_test.c M tests/vty/ss7_asp_vty_test.c 5 files changed, 22 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/88/16388/1 diff --git a/examples/sccp_demo_user.c b/examples/sccp_demo_user.c index 28dd166..b55b50c 100644 --- a/examples/sccp_demo_user.c +++ b/examples/sccp_demo_user.c @@ -230,7 +230,7 @@ signal(SIGUSR2, &signal_handler); init_logging(); - osmo_ss7_init(); + OSMO_ASSERT(osmo_ss7_init() == 0); osmo_fsm_log_addr(false); vty_init(&vty_info); osmo_ss7_vty_init_asp(NULL); diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index a07fbed..1ca8b5e 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -2061,13 +2061,26 @@ int osmo_ss7_init(void) { + int rc; + if (ss7_initialized) return 1; - osmo_fsm_register(&sccp_scoc_fsm); - osmo_fsm_register(&xua_as_fsm); - osmo_fsm_register(&xua_asp_fsm); - osmo_fsm_register(&ipa_asp_fsm); - osmo_fsm_register(&xua_default_lm_fsm); + rc = osmo_fsm_register(&sccp_scoc_fsm); + if (rc < 0) + return rc; + rc = osmo_fsm_register(&xua_as_fsm); + if (rc < 0) + return rc; + rc = osmo_fsm_register(&xua_asp_fsm); + if (rc < 0) + return rc; + rc = osmo_fsm_register(&ipa_asp_fsm); + if (rc < 0) + return rc; + rc = osmo_fsm_register(&xua_default_lm_fsm); + if (rc < 0) + return rc; + ss7_initialized = true; return 0; } diff --git a/stp/stp_main.c b/stp/stp_main.c index 4cc2586..3923ed2 100644 --- a/stp/stp_main.c +++ b/stp/stp_main.c @@ -175,7 +175,7 @@ fputs(stp_copyright, stdout); fputs("\n", stdout); - osmo_ss7_init(); + OSMO_ASSERT(osmo_ss7_init() == 0); osmo_fsm_log_addr(false); logging_vty_add_cmds(); osmo_stats_vty_add_cmds(); diff --git a/tests/ss7/ss7_test.c b/tests/ss7/ss7_test.c index a3f47b6..ae96a4b 100644 --- a/tests/ss7/ss7_test.c +++ b/tests/ss7/ss7_test.c @@ -302,7 +302,7 @@ osmo_fsm_log_addr(false); /* init */ - osmo_ss7_init(); + OSMO_ASSERT(osmo_ss7_init() == 0); s7i = osmo_ss7_instance_find_or_create(NULL, 0); OSMO_ASSERT(osmo_ss7_instance_find(0) == s7i); OSMO_ASSERT(osmo_ss7_instance_find(23) == NULL); diff --git a/tests/vty/ss7_asp_vty_test.c b/tests/vty/ss7_asp_vty_test.c index 76ffcf2..eb575bc 100644 --- a/tests/vty/ss7_asp_vty_test.c +++ b/tests/vty/ss7_asp_vty_test.c @@ -164,7 +164,7 @@ osmo_init_logging2(root_ctx, &log_info); logging_vty_add_cmds(); - osmo_ss7_init(); + OSMO_ASSERT(osmo_ss7_init() == 0); osmo_ss7_vty_init_asp(root_ctx); osmo_sccp_vty_init(); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id8861144e4880383a173b7e6ae7860beebac09d9 Gerrit-Change-Number: 16388 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 16:57:38 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 16:57:38 +0000 Subject: Change in libosmo-sccp[master]: check for osmo_fsm_register() failures and propagate error In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16388 ) Change subject: check for osmo_fsm_register() failures and propagate error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id8861144e4880383a173b7e6ae7860beebac09d9 Gerrit-Change-Number: 16388 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 01 Dec 2019 16:57:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 16:59:10 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 16:59:10 +0000 Subject: Change in osmo-bsc[master]: Move a_reset_fsm regstration to __attribute__((contructor)) In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16384 ) Change subject: Move a_reset_fsm regstration to __attribute__((contructor)) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3c7220491cf6ffb1361e7259c0344df64a013a0a Gerrit-Change-Number: 16384 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 01 Dec 2019 16:59:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 16:59:54 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 16:59:54 +0000 Subject: Change in osmo-mgw[master]: Move fsm_mgcp_client regstration to __attribute__((contructor)) In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/16383 ) Change subject: Move fsm_mgcp_client regstration to __attribute__((contructor)) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/16383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ia73ba8e46c13d925e88203e08a8966839e573183 Gerrit-Change-Number: 16383 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 01 Dec 2019 16:59:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 19:41:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 19:41:37 +0000 Subject: Change in libosmo-sccp[master]: xua_asp_fsm: Ensure xUA client includes traffic-mode if configured References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16389 ) Change subject: xua_asp_fsm: Ensure xUA client includes traffic-mode if configured ...................................................................... xua_asp_fsm: Ensure xUA client includes traffic-mode if configured When a client (ASP) sends an ASPAC to the server (SG), it should include the traffic-mode configured for it's ASs, if any. Change-Id: Ia850df22df529dab74959e8666f85976002c482c Related: OS#4285 --- M src/xua_asp_fsm.c 1 file changed, 30 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/89/16389/1 diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index e09c46c..6114b47 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -141,6 +141,32 @@ xua_asp_send_xlm_prim_simple(asp, prim_type, op); } +/* determine the osmo_ss7_as_traffic_mode to be used by this ASP; will + * iterate over all AS configured for this ASP. If they're compatible, + * a single traffic mode is returned. If they're incompatible, -EINVAL + * is returned. If there is none configured, -1 is returned */ +static int determine_traf_mode(struct osmo_ss7_asp *asp) +{ + struct osmo_ss7_as *as; + int tmode = -1; + + llist_for_each_entry(as, &asp->inst->as_list, list) { + if (!osmo_ss7_as_has_asp(as, asp)) + continue; + /* we only care about traffic modes explicitly set */ + if (!as->cfg.mode_set_by_vty) + continue; + if (tmode == -1) { + /* this is the first AS; we use this traffic mode */ + tmode = as->cfg.mode; + } else { + if (tmode != as->cfg.mode) + return -EINVAL; + } + } + return tmode; +} + /* ask the xUA implementation to transmit a specific message */ static int peer_send(struct osmo_fsm_inst *fi, int out_event, struct xua_msg *in) { @@ -148,6 +174,7 @@ struct osmo_ss7_asp *asp = xafp->asp; struct xua_msg *xua = xua_msg_alloc(); struct msgb *msg; + int rc; switch (out_event) { case XUA_ASP_E_ASPSM_ASPUP: @@ -188,6 +215,9 @@ /* RFC3868 Ch. 3.6.1 */ xua->hdr = XUA_HDR(SUA_MSGC_ASPTM, SUA_ASPTM_ACTIVE); /* Optional: Traffic Mode Type */ + rc = determine_traf_mode(asp); + if (rc >= 0) + xua_msg_add_u32(xua, M3UA_IEI_TRAF_MODE_TYP, osmo_ss7_tmode_to_xua(rc)); /* Optional: Routing Context */ /* Optional: TID Label */ /* Optional: DRN Label */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia850df22df529dab74959e8666f85976002c482c Gerrit-Change-Number: 16389 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 19:41:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 19:41:37 +0000 Subject: Change in libosmo-sccp[master]: xua_asp_fsm: Ensure xUA client includes routing contexts in ASPAC/ASPIA References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16390 ) Change subject: xua_asp_fsm: Ensure xUA client includes routing contexts in ASPAC/ASPIA ...................................................................... xua_asp_fsm: Ensure xUA client includes routing contexts in ASPAC/ASPIA If we are running in ASP (client) role, and we are about to transmit an ASPAC or ASPIA to the SG, we must make sure to include any applicable routing contexts. Change-Id: Iee4f0d553d6845a9ae08cb5e4f57fdec443e4ef9 Related: OS#4285 --- M src/xua_asp_fsm.c 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/90/16390/1 diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 6114b47..546c665 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -167,6 +167,30 @@ return tmode; } +/* add M3UA_IEI_ROUTE_CTX to xua_msg containig all routing keys of ASs within ASP */ +static int xua_msg_add_asp_rctx(struct xua_msg *xua, struct osmo_ss7_asp *asp) +{ + struct osmo_ss7_as *as; + uint32_t rctx[128]; + unsigned int i = 0; + + /* iterate over all ASs and build array of routing contexts */ + llist_for_each_entry(as, &asp->inst->as_list, list) { + if (!osmo_ss7_as_has_asp(as, asp)) + continue; + rctx[i++] = htonl(as->cfg.routing_key.context); + if (i >= ARRAY_SIZE(rctx)-1) { + break; + } + } + /* add xUA IE with routing contests to the message (if any) */ + if (i) + xua_msg_add_data(xua, M3UA_IEI_ROUTE_CTX, i*sizeof(uint32_t), (uint8_t *)rctx); + + /* return count of routing contexts added */ + return i; +} + /* ask the xUA implementation to transmit a specific message */ static int peer_send(struct osmo_fsm_inst *fi, int out_event, struct xua_msg *in) { @@ -219,6 +243,7 @@ if (rc >= 0) xua_msg_add_u32(xua, M3UA_IEI_TRAF_MODE_TYP, osmo_ss7_tmode_to_xua(rc)); /* Optional: Routing Context */ + xua_msg_add_asp_rctx(xua, asp); /* Optional: TID Label */ /* Optional: DRN Label */ /* Optional: Info String */ @@ -236,6 +261,7 @@ /* RFC3868 Ch. 3.6.3 */ xua->hdr = XUA_HDR(SUA_MSGC_ASPTM, SUA_ASPTM_INACTIVE); /* Optional: Routing Context */ + xua_msg_add_asp_rctx(xua, asp); /* Optional: Info String */ break; case XUA_ASP_E_ASPTM_ASPIA_ACK: -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iee4f0d553d6845a9ae08cb5e4f57fdec443e4ef9 Gerrit-Change-Number: 16390 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 19:45:10 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 19:45:10 +0000 Subject: Change in libosmo-abis[master]: input/ipaccess.c: propagate errors from ipa_parse_unitid() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16391 ) Change subject: input/ipaccess.c: propagate errors from ipa_parse_unitid() ...................................................................... input/ipaccess.c: propagate errors from ipa_parse_unitid() Change-Id: Ic190daae31936959de8efb5a6de8744c016d5643 --- M src/input/ipaccess.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/91/16391/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 0f8e2d5..65851ef 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -143,7 +143,11 @@ } unitid = (char *) TLVP_VAL(&tlvp, IPAC_IDTAG_UNIT); unitid[len - 1] = '\0'; - ipa_parse_unitid(unitid, &unit_data); + ret = ipa_parse_unitid(unitid, &unit_data); + if (ret) { + LOGP(DLINP, LOGL_ERROR, "Failed to parse unit ID '%s'\n", unitid); + goto err; + } if (!line->ops->sign_link_up) { LOGP(DLINP, LOGL_ERROR, -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic190daae31936959de8efb5a6de8744c016d5643 Gerrit-Change-Number: 16391 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 19:45:10 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 19:45:10 +0000 Subject: Change in libosmo-abis[master]: input/ipaccess.c: fix debug message on receipt of IPAC_MSGT_ID_GET References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16392 ) Change subject: input/ipaccess.c: fix debug message on receipt of IPAC_MSGT_ID_GET ...................................................................... input/ipaccess.c: fix debug message on receipt of IPAC_MSGT_ID_GET Change-Id: I83c52c9733852cfebf183819fb36bd634d84bf7d --- M src/input/ipaccess.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/92/16392/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 65851ef..2166524 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -720,7 +720,7 @@ if (link->ofd->priv_nr >= E1INP_SIGN_RSL) trx_nr = link->ofd->priv_nr - E1INP_SIGN_RSL; - LOGP(DLINP, LOGL_NOTICE, "received ID get from %u/%u/%u\n", + LOGP(DLINP, LOGL_NOTICE, "received ID_GET for unit ID %u/%u/%u\n", dev->site_id, dev->bts_id, trx_nr); rmsg = ipa_bts_id_resp(dev, data + 1, len - 1, trx_nr); ret = ipa_send(link->ofd->fd, rmsg->data, rmsg->len); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I83c52c9733852cfebf183819fb36bd634d84bf7d Gerrit-Change-Number: 16392 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 19:45:10 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 19:45:10 +0000 Subject: Change in libosmo-abis[master]: e1_input.c: make reference counting get() / put() more verbose References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16393 ) Change subject: e1_input.c: make reference counting get() / put() more verbose ...................................................................... e1_input.c: make reference counting get() / put() more verbose Change-Id: I1c730d6d146b365712b28e3d37e038344ea850bc --- M src/e1_input.c 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/93/16393/1 diff --git a/src/e1_input.c b/src/e1_input.c index 4717830..eb973ef 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -419,12 +419,19 @@ void e1inp_line_get(struct e1inp_line *line) { - line->refcnt++; + int old_refcnt = line->refcnt++; + + LOGP(DLINP, LOGL_DEBUG, "Line '%s' (%p) reference count get: %d -> %d\n", + line->name, line, old_refcnt, line->refcnt); } void e1inp_line_put(struct e1inp_line *line) { - line->refcnt--; + int old_refcnt = line->refcnt--; + + LOGP(DLINP, LOGL_DEBUG, "Line '%s' (%p) reference count put: %d -> %d\n", + line->name, line, old_refcnt, line->refcnt); + if (line->refcnt == 0) { /* Remove our counter group from libosmocore's global counter * list if we are freeing the last remaining talloc context. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I1c730d6d146b365712b28e3d37e038344ea850bc Gerrit-Change-Number: 16393 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 19:57:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 19:57:07 +0000 Subject: Change in libosmo-sccp[master]: Add "no traffic-mode" configuration to AS References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16394 ) Change subject: Add "no traffic-mode" configuration to AS ...................................................................... Add "no traffic-mode" configuration to AS As per RFC4666 it is optional whether or not a traffic-mode IE is part of ASPAC requests from ASP to SG. We implemented that so far by having none as default, unless the user specified an explicit traffic-mode in the VTY. However, we had no command to remove that explicit configuration and return to the implicit one. Change-Id: Ibe2b298dd76dc4b02521dc411ae9d570eaf5a9a2 --- M src/osmo_ss7_vty.c 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/94/16394/1 diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 591254e..eaf5326 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -866,6 +866,16 @@ return CMD_SUCCESS; } +DEFUN(as_no_traf_mode, as_no_traf_mode_cmd, + "no traffic-mode", + NO_STR "Remove explicit traffic-mode configuration for this AS\n") +{ + struct osmo_ss7_as *as = vty->index; + as->cfg.mode = 0; + as->cfg.mode_set_by_vty = false; + return CMD_SUCCESS; +} + DEFUN(as_recov_tout, as_recov_tout_cmd, "recovery-timeout <1-2000>", "Specifies the recovery timeout value in milliseconds\n" @@ -1920,6 +1930,7 @@ install_element(L_CS7_AS_NODE, &as_asp_cmd); install_element(L_CS7_AS_NODE, &as_no_asp_cmd); install_element(L_CS7_AS_NODE, &as_traf_mode_cmd); + install_element(L_CS7_AS_NODE, &as_no_traf_mode_cmd); install_element(L_CS7_AS_NODE, &as_recov_tout_cmd); install_element(L_CS7_AS_NODE, &as_qos_class_cmd); install_element(L_CS7_AS_NODE, &as_rout_key_cmd); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ibe2b298dd76dc4b02521dc411ae9d570eaf5a9a2 Gerrit-Change-Number: 16394 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 19:58:05 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 19:58:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: M3UA client-side tests: Expect routing context IE in ASPAC References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16395 ) Change subject: stp: M3UA client-side tests: Expect routing context IE in ASPAC ...................................................................... stp: M3UA client-side tests: Expect routing context IE in ASPAC Change-Id: I7011480fed2492add28bbd64a27c0ad71609cb32 Related: OS#4285 --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/95/16395/1 diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index c550d40..23f93d8 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -549,7 +549,7 @@ f_init_m3ua(); f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0)); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(1055, 4)); f_clear_m3ua(); } @@ -566,7 +566,7 @@ f_M3UA_asp_up_act(0); f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0)); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(1055, 4)); f_sleep(1.0); @@ -588,7 +588,7 @@ f_M3UA_asp_up_act(0); f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0)); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(1055, 4)); f_sleep(1.0); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7011480fed2492add28bbd64a27c0ad71609cb32 Gerrit-Change-Number: 16395 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 19:58:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 19:58:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: Add TC_clnt_asp_act_tmt_loadshare() References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16396 ) Change subject: stp: Add TC_clnt_asp_act_tmt_loadshare() ...................................................................... stp: Add TC_clnt_asp_act_tmt_loadshare() This test case checks if the traffic-mode is communicated to the SG if we operate in ASP mode. Change-Id: If7d84b73b36a91fb697daf6263ec93b8672cbdc2 Related: OS#4285 --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/16396/1 diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 23f93d8..a44e6ad 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -554,6 +554,18 @@ f_clear_m3ua(); } +/* Expect inbound connection from ASP/SCTP-client, followed by ASP-UP + ASP-ACT */ +testcase TC_clnt_asp_act_tmt_loadshare() runs on RAW_M3UA_CT { + f_init_common(); + f_vty_config2(VTY, {"cs7 instance 0", "as as-client m3ua"}, "traffic-mode loadshare"); + f_init_m3ua(); + f_init_m3ua_srv(); + + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), tmt := c_M3UA_TMT_loadshare, rctx := int2oct(1055, 4)); + + f_clear_m3ua(); +} + /* Test traffic being routed through "server" side STP (M3UA SG), coming back in "client" * side STP (M3UA ASP) */ testcase TC_clnt_sg_to_asp() runs on RAW_M3UA_CT { @@ -629,6 +641,9 @@ execute( TC_clnt_asp_act() ); execute( TC_clnt_sg_to_asp() ); execute( TC_clnt_asp_to_sg() ); + + /* put this one last as it changes the stp side config */ + execute( TC_clnt_asp_act_tmt_loadshare() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If7d84b73b36a91fb697daf6263ec93b8672cbdc2 Gerrit-Change-Number: 16396 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 19:59:04 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 19:59:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: M3UA client-side tests: Expect routing context IE in ASPAC In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16395 ) Change subject: stp: M3UA client-side tests: Expect routing context IE in ASPAC ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7011480fed2492add28bbd64a27c0ad71609cb32 Gerrit-Change-Number: 16395 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 19:59:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 19:59:21 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 19:59:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: Add TC_clnt_asp_act_tmt_loadshare() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16396 ) Change subject: stp: Add TC_clnt_asp_act_tmt_loadshare() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If7d84b73b36a91fb697daf6263ec93b8672cbdc2 Gerrit-Change-Number: 16396 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 19:59:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 19:59:24 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 19:59:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: M3UA client-side tests: Expect routing context IE in ASPAC In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16395 ) Change subject: stp: M3UA client-side tests: Expect routing context IE in ASPAC ...................................................................... stp: M3UA client-side tests: Expect routing context IE in ASPAC Change-Id: I7011480fed2492add28bbd64a27c0ad71609cb32 Related: OS#4285 --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index c550d40..23f93d8 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -549,7 +549,7 @@ f_init_m3ua(); f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0)); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(1055, 4)); f_clear_m3ua(); } @@ -566,7 +566,7 @@ f_M3UA_asp_up_act(0); f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0)); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(1055, 4)); f_sleep(1.0); @@ -588,7 +588,7 @@ f_M3UA_asp_up_act(0); f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0)); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(1055, 4)); f_sleep(1.0); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7011480fed2492add28bbd64a27c0ad71609cb32 Gerrit-Change-Number: 16395 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 19:59:24 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 19:59:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: Add TC_clnt_asp_act_tmt_loadshare() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16396 ) Change subject: stp: Add TC_clnt_asp_act_tmt_loadshare() ...................................................................... stp: Add TC_clnt_asp_act_tmt_loadshare() This test case checks if the traffic-mode is communicated to the SG if we operate in ASP mode. Change-Id: If7d84b73b36a91fb697daf6263ec93b8672cbdc2 Related: OS#4285 --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 23f93d8..a44e6ad 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -554,6 +554,18 @@ f_clear_m3ua(); } +/* Expect inbound connection from ASP/SCTP-client, followed by ASP-UP + ASP-ACT */ +testcase TC_clnt_asp_act_tmt_loadshare() runs on RAW_M3UA_CT { + f_init_common(); + f_vty_config2(VTY, {"cs7 instance 0", "as as-client m3ua"}, "traffic-mode loadshare"); + f_init_m3ua(); + f_init_m3ua_srv(); + + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), tmt := c_M3UA_TMT_loadshare, rctx := int2oct(1055, 4)); + + f_clear_m3ua(); +} + /* Test traffic being routed through "server" side STP (M3UA SG), coming back in "client" * side STP (M3UA ASP) */ testcase TC_clnt_sg_to_asp() runs on RAW_M3UA_CT { @@ -629,6 +641,9 @@ execute( TC_clnt_asp_act() ); execute( TC_clnt_sg_to_asp() ); execute( TC_clnt_asp_to_sg() ); + + /* put this one last as it changes the stp side config */ + execute( TC_clnt_asp_act_tmt_loadshare() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If7d84b73b36a91fb697daf6263ec93b8672cbdc2 Gerrit-Change-Number: 16396 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 19:59:45 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 19:59:45 +0000 Subject: Change in libosmo-abis[master]: input/ipaccess.c: propagate errors from ipa_parse_unitid() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16391 ) Change subject: input/ipaccess.c: propagate errors from ipa_parse_unitid() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic190daae31936959de8efb5a6de8744c016d5643 Gerrit-Change-Number: 16391 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 19:59:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 20:00:08 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 20:00:08 +0000 Subject: Change in libosmo-abis[master]: input/ipaccess.c: fix debug message on receipt of IPAC_MSGT_ID_GET In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16392 ) Change subject: input/ipaccess.c: fix debug message on receipt of IPAC_MSGT_ID_GET ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I83c52c9733852cfebf183819fb36bd634d84bf7d Gerrit-Change-Number: 16392 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 20:00:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 20:00:11 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 20:00:11 +0000 Subject: Change in libosmo-abis[master]: input/ipaccess.c: propagate errors from ipa_parse_unitid() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16391 ) Change subject: input/ipaccess.c: propagate errors from ipa_parse_unitid() ...................................................................... input/ipaccess.c: propagate errors from ipa_parse_unitid() Change-Id: Ic190daae31936959de8efb5a6de8744c016d5643 --- M src/input/ipaccess.c 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 0f8e2d5..65851ef 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -143,7 +143,11 @@ } unitid = (char *) TLVP_VAL(&tlvp, IPAC_IDTAG_UNIT); unitid[len - 1] = '\0'; - ipa_parse_unitid(unitid, &unit_data); + ret = ipa_parse_unitid(unitid, &unit_data); + if (ret) { + LOGP(DLINP, LOGL_ERROR, "Failed to parse unit ID '%s'\n", unitid); + goto err; + } if (!line->ops->sign_link_up) { LOGP(DLINP, LOGL_ERROR, -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic190daae31936959de8efb5a6de8744c016d5643 Gerrit-Change-Number: 16391 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 20:00:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 20:00:12 +0000 Subject: Change in libosmo-abis[master]: input/ipaccess.c: fix debug message on receipt of IPAC_MSGT_ID_GET In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16392 ) Change subject: input/ipaccess.c: fix debug message on receipt of IPAC_MSGT_ID_GET ...................................................................... input/ipaccess.c: fix debug message on receipt of IPAC_MSGT_ID_GET Change-Id: I83c52c9733852cfebf183819fb36bd634d84bf7d --- M src/input/ipaccess.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 65851ef..2166524 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -720,7 +720,7 @@ if (link->ofd->priv_nr >= E1INP_SIGN_RSL) trx_nr = link->ofd->priv_nr - E1INP_SIGN_RSL; - LOGP(DLINP, LOGL_NOTICE, "received ID get from %u/%u/%u\n", + LOGP(DLINP, LOGL_NOTICE, "received ID_GET for unit ID %u/%u/%u\n", dev->site_id, dev->bts_id, trx_nr); rmsg = ipa_bts_id_resp(dev, data + 1, len - 1, trx_nr); ret = ipa_send(link->ofd->fd, rmsg->data, rmsg->len); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I83c52c9733852cfebf183819fb36bd634d84bf7d Gerrit-Change-Number: 16392 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 20:01:04 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 20:01:04 +0000 Subject: Change in libosmo-abis[master]: e1_input.c: make reference counting get() / put() more verbose In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16393 ) Change subject: e1_input.c: make reference counting get() / put() more verbose ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I1c730d6d146b365712b28e3d37e038344ea850bc Gerrit-Change-Number: 16393 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 20:01:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 20:01:09 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 20:01:09 +0000 Subject: Change in libosmo-abis[master]: e1_input.c: make reference counting get() / put() more verbose In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16393 ) Change subject: e1_input.c: make reference counting get() / put() more verbose ...................................................................... e1_input.c: make reference counting get() / put() more verbose Change-Id: I1c730d6d146b365712b28e3d37e038344ea850bc --- M src/e1_input.c 1 file changed, 9 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/e1_input.c b/src/e1_input.c index 4717830..eb973ef 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -419,12 +419,19 @@ void e1inp_line_get(struct e1inp_line *line) { - line->refcnt++; + int old_refcnt = line->refcnt++; + + LOGP(DLINP, LOGL_DEBUG, "Line '%s' (%p) reference count get: %d -> %d\n", + line->name, line, old_refcnt, line->refcnt); } void e1inp_line_put(struct e1inp_line *line) { - line->refcnt--; + int old_refcnt = line->refcnt--; + + LOGP(DLINP, LOGL_DEBUG, "Line '%s' (%p) reference count put: %d -> %d\n", + line->name, line, old_refcnt, line->refcnt); + if (line->refcnt == 0) { /* Remove our counter group from libosmocore's global counter * list if we are freeing the last remaining talloc context. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I1c730d6d146b365712b28e3d37e038344ea850bc Gerrit-Change-Number: 16393 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 20:01:20 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 20:01:20 +0000 Subject: Change in osmo-bsc[master]: Move a_reset_fsm regstration to __attribute__((contructor)) In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16384 ) Change subject: Move a_reset_fsm regstration to __attribute__((contructor)) ...................................................................... Move a_reset_fsm regstration to __attribute__((contructor)) This way we can avoid the runtime overhead of checking whether or not it is initialized over and over again. It also brings this code more in line with other users of osmo_fsm_register(). Change-Id: I3c7220491cf6ffb1361e7259c0344df64a013a0a --- M src/osmo-bsc/a_reset.c 1 file changed, 5 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/osmo-bsc/a_reset.c b/src/osmo-bsc/a_reset.c index bc41914..3f51278 100644 --- a/src/osmo-bsc/a_reset.c +++ b/src/osmo-bsc/a_reset.c @@ -149,10 +149,6 @@ /* There must not be any double allocation! */ OSMO_ASSERT(msc->a.reset_fsm == NULL); - /* Register the fsm description (if not already done) */ - if (osmo_fsm_find_by_name(fsm.name) != &fsm) - OSMO_ASSERT(osmo_fsm_register(&fsm) == 0); - /* Allocate and configure a new fsm instance */ reset_ctx = talloc_zero(msc, struct reset_ctx); OSMO_ASSERT(reset_ctx); @@ -217,3 +213,8 @@ return false; } + +static __attribute__((constructor)) void a_reset_fsm_init() +{ + OSMO_ASSERT(osmo_fsm_register(&fsm) == 0); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3c7220491cf6ffb1361e7259c0344df64a013a0a Gerrit-Change-Number: 16384 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 20:01:27 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 20:01:27 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: Check for osmo_fsm_register() error return value In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/16361 ) Change subject: mgcp_client: Check for osmo_fsm_register() error return value ...................................................................... mgcp_client: Check for osmo_fsm_register() error return value Change-Id: Ie5e7fa419117349d098b0158ed840341094f3c16 --- M src/libosmo-mgcp-client/mgcp_client_fsm.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c index 800ae1b..e910586 100644 --- a/src/libosmo-mgcp-client/mgcp_client_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c @@ -620,7 +620,8 @@ /* Register the fsm description (if not already done) */ if (fsm_registered == false) { - osmo_fsm_register(&fsm_mgcp_client); + if (osmo_fsm_register(&fsm_mgcp_client) < 0) + return NULL; fsm_registered = true; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/16361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie5e7fa419117349d098b0158ed840341094f3c16 Gerrit-Change-Number: 16361 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 20:01:27 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 20:01:27 +0000 Subject: Change in osmo-mgw[master]: Move fsm_mgcp_client regstration to __attribute__((contructor)) In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/16383 ) Change subject: Move fsm_mgcp_client regstration to __attribute__((contructor)) ...................................................................... Move fsm_mgcp_client regstration to __attribute__((contructor)) This way we can avoid the runtime overhead of checking whether or not it is initialized over and over again. It also brings this code more in line with other users of osmo_fsm_register(). Change-Id: Ia73ba8e46c13d925e88203e08a8966839e573183 --- M src/libosmo-mgcp-client/mgcp_client_fsm.c 1 file changed, 5 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c index e910586..e38a4ba 100644 --- a/src/libosmo-mgcp-client/mgcp_client_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c @@ -606,7 +606,6 @@ uint32_t parent_term_evt, uint32_t parent_evt, struct mgcp_conn_peer *conn_peer) { struct mgcp_ctx *mgcp_ctx; - static bool fsm_registered = false; struct osmo_fsm_inst *fi; struct in_addr ip_test; @@ -618,13 +617,6 @@ if (conn_peer->port && inet_aton(conn_peer->addr, &ip_test) == 0) return NULL; - /* Register the fsm description (if not already done) */ - if (fsm_registered == false) { - if (osmo_fsm_register(&fsm_mgcp_client) < 0) - return NULL; - fsm_registered = true; - } - /* Allocate and configure a new fsm instance */ fi = osmo_fsm_inst_alloc_child(&fsm_mgcp_client, parent_fi, parent_term_evt); OSMO_ASSERT(fi); @@ -749,3 +741,8 @@ return "empty"; return buf; } + +static __attribute__((constructor)) void osmo_mgcp_client_fsm_init() +{ + OSMO_ASSERT(osmo_fsm_register(&fsm_mgcp_client) == 0); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/16383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ia73ba8e46c13d925e88203e08a8966839e573183 Gerrit-Change-Number: 16383 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 20:01:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 20:01:35 +0000 Subject: Change in libosmo-sccp[master]: check for osmo_fsm_register() failures and propagate error In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16388 ) Change subject: check for osmo_fsm_register() failures and propagate error ...................................................................... check for osmo_fsm_register() failures and propagate error Change-Id: Id8861144e4880383a173b7e6ae7860beebac09d9 --- M examples/sccp_demo_user.c M src/osmo_ss7.c M stp/stp_main.c M tests/ss7/ss7_test.c M tests/vty/ss7_asp_vty_test.c 5 files changed, 22 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/examples/sccp_demo_user.c b/examples/sccp_demo_user.c index 28dd166..b55b50c 100644 --- a/examples/sccp_demo_user.c +++ b/examples/sccp_demo_user.c @@ -230,7 +230,7 @@ signal(SIGUSR2, &signal_handler); init_logging(); - osmo_ss7_init(); + OSMO_ASSERT(osmo_ss7_init() == 0); osmo_fsm_log_addr(false); vty_init(&vty_info); osmo_ss7_vty_init_asp(NULL); diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index a07fbed..1ca8b5e 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -2061,13 +2061,26 @@ int osmo_ss7_init(void) { + int rc; + if (ss7_initialized) return 1; - osmo_fsm_register(&sccp_scoc_fsm); - osmo_fsm_register(&xua_as_fsm); - osmo_fsm_register(&xua_asp_fsm); - osmo_fsm_register(&ipa_asp_fsm); - osmo_fsm_register(&xua_default_lm_fsm); + rc = osmo_fsm_register(&sccp_scoc_fsm); + if (rc < 0) + return rc; + rc = osmo_fsm_register(&xua_as_fsm); + if (rc < 0) + return rc; + rc = osmo_fsm_register(&xua_asp_fsm); + if (rc < 0) + return rc; + rc = osmo_fsm_register(&ipa_asp_fsm); + if (rc < 0) + return rc; + rc = osmo_fsm_register(&xua_default_lm_fsm); + if (rc < 0) + return rc; + ss7_initialized = true; return 0; } diff --git a/stp/stp_main.c b/stp/stp_main.c index 4cc2586..3923ed2 100644 --- a/stp/stp_main.c +++ b/stp/stp_main.c @@ -175,7 +175,7 @@ fputs(stp_copyright, stdout); fputs("\n", stdout); - osmo_ss7_init(); + OSMO_ASSERT(osmo_ss7_init() == 0); osmo_fsm_log_addr(false); logging_vty_add_cmds(); osmo_stats_vty_add_cmds(); diff --git a/tests/ss7/ss7_test.c b/tests/ss7/ss7_test.c index a3f47b6..ae96a4b 100644 --- a/tests/ss7/ss7_test.c +++ b/tests/ss7/ss7_test.c @@ -302,7 +302,7 @@ osmo_fsm_log_addr(false); /* init */ - osmo_ss7_init(); + OSMO_ASSERT(osmo_ss7_init() == 0); s7i = osmo_ss7_instance_find_or_create(NULL, 0); OSMO_ASSERT(osmo_ss7_instance_find(0) == s7i); OSMO_ASSERT(osmo_ss7_instance_find(23) == NULL); diff --git a/tests/vty/ss7_asp_vty_test.c b/tests/vty/ss7_asp_vty_test.c index 76ffcf2..eb575bc 100644 --- a/tests/vty/ss7_asp_vty_test.c +++ b/tests/vty/ss7_asp_vty_test.c @@ -164,7 +164,7 @@ osmo_init_logging2(root_ctx, &log_info); logging_vty_add_cmds(); - osmo_ss7_init(); + OSMO_ASSERT(osmo_ss7_init() == 0); osmo_ss7_vty_init_asp(root_ctx); osmo_sccp_vty_init(); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id8861144e4880383a173b7e6ae7860beebac09d9 Gerrit-Change-Number: 16388 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 20:47:04 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 1 Dec 2019 20:47:04 +0000 Subject: Change in osmo-bts[master]: common/abis.c: use tall_bts_ctx as talloc-context for libosmo_abis_in... References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/16397 ) Change subject: common/abis.c: use tall_bts_ctx as talloc-context for libosmo_abis_init() ...................................................................... common/abis.c: use tall_bts_ctx as talloc-context for libosmo_abis_init() This way it's much easier to introspect the library internal talloc allocations from the VTY interface. Change-Id: Ic8d9fc7ce3da8abf0ea73d2b20366133cd801c37 --- M src/common/abis.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/97/16397/1 diff --git a/src/common/abis.c b/src/common/abis.c index 24eb8a1..56c8348 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -260,7 +260,7 @@ g_bts = bts; oml_init(&bts->mo); - libosmo_abis_init(NULL); + libosmo_abis_init(tall_bts_ctx); osmo_signal_register_handler(SS_L_INPUT, &inp_s_cbfn, bts); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic8d9fc7ce3da8abf0ea73d2b20366133cd801c37 Gerrit-Change-Number: 16397 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 21:16:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 21:16:37 +0000 Subject: Change in docker-playground[master]: remsim: Ensure non-overlapping junit-xml filenames References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16398 ) Change subject: remsim: Ensure non-overlapping junit-xml filenames ...................................................................... remsim: Ensure non-overlapping junit-xml filenames The default filename pattern of the JUnit log plugins of TTCN-3 is "junit-xml-%u.xml" where %u represents the PID of the process. This is typically a good idea as the PID doesn't wrap that quickly. However, if you're executing a new docker container for every test suite run, then chances are high that two subsequent runs of the test suite container might end up with the same PID and hence the smae filename. This results in the output file being overwritten, which is what's responsible for many missing RemsimServer_Tests results on the jenkins.osmocom.org test results analyzer. Change-Id: I9b6d1b5a943eb4e058ad2bf7cf8acee7b70e68b6 Closes: OS#4205 --- M ttcn3-remsim-test/REMSIM_Tests.cfg M ttcn3-remsim-test/bankd/REMSIM_Tests.cfg M ttcn3-remsim-test/client/REMSIM_Tests.cfg 3 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/98/16398/1 diff --git a/ttcn3-remsim-test/REMSIM_Tests.cfg b/ttcn3-remsim-test/REMSIM_Tests.cfg index 5a9f026..837f12b 100644 --- a/ttcn3-remsim-test/REMSIM_Tests.cfg +++ b/ttcn3-remsim-test/REMSIM_Tests.cfg @@ -3,6 +3,7 @@ "/osmo-ttcn3-hacks/remsim/REMSIM_Tests.default" [LOGGING] +*.JUnitLogger.filename_stem := "junit-xml-server" [TESTPORT_PARAMETERS] diff --git a/ttcn3-remsim-test/bankd/REMSIM_Tests.cfg b/ttcn3-remsim-test/bankd/REMSIM_Tests.cfg index 2e77590..ca83346 100644 --- a/ttcn3-remsim-test/bankd/REMSIM_Tests.cfg +++ b/ttcn3-remsim-test/bankd/REMSIM_Tests.cfg @@ -3,6 +3,7 @@ "/osmo-ttcn3-hacks/remsim/REMSIM_Tests.default" [LOGGING] +*.JUnitLogger.filename_stem := "junit-xml-bankd" [TESTPORT_PARAMETERS] diff --git a/ttcn3-remsim-test/client/REMSIM_Tests.cfg b/ttcn3-remsim-test/client/REMSIM_Tests.cfg index d3f8d42..2484c73 100644 --- a/ttcn3-remsim-test/client/REMSIM_Tests.cfg +++ b/ttcn3-remsim-test/client/REMSIM_Tests.cfg @@ -3,6 +3,7 @@ "/osmo-ttcn3-hacks/remsim/REMSIM_Tests.default" [LOGGING] +*.JUnitLogger.filename_stem := "junit-xml-client" [TESTPORT_PARAMETERS] # IP address to which ATS binds emulated remsim-server -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9b6d1b5a943eb4e058ad2bf7cf8acee7b70e68b6 Gerrit-Change-Number: 16398 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 21:29:09 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 21:29:09 +0000 Subject: Change in docker-playground[master]: remsim: Ensure non-overlapping junit-xml filenames In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16398 ) Change subject: remsim: Ensure non-overlapping junit-xml filenames ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9b6d1b5a943eb4e058ad2bf7cf8acee7b70e68b6 Gerrit-Change-Number: 16398 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 01 Dec 2019 21:29:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 1 21:29:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 1 Dec 2019 21:29:12 +0000 Subject: Change in docker-playground[master]: remsim: Ensure non-overlapping junit-xml filenames In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16398 ) Change subject: remsim: Ensure non-overlapping junit-xml filenames ...................................................................... remsim: Ensure non-overlapping junit-xml filenames The default filename pattern of the JUnit log plugins of TTCN-3 is "junit-xml-%u.xml" where %u represents the PID of the process. This is typically a good idea as the PID doesn't wrap that quickly. However, if you're executing a new docker container for every test suite run, then chances are high that two subsequent runs of the test suite container might end up with the same PID and hence the smae filename. This results in the output file being overwritten, which is what's responsible for many missing RemsimServer_Tests results on the jenkins.osmocom.org test results analyzer. Change-Id: I9b6d1b5a943eb4e058ad2bf7cf8acee7b70e68b6 Closes: OS#4205 --- M ttcn3-remsim-test/REMSIM_Tests.cfg M ttcn3-remsim-test/bankd/REMSIM_Tests.cfg M ttcn3-remsim-test/client/REMSIM_Tests.cfg 3 files changed, 3 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-remsim-test/REMSIM_Tests.cfg b/ttcn3-remsim-test/REMSIM_Tests.cfg index 5a9f026..837f12b 100644 --- a/ttcn3-remsim-test/REMSIM_Tests.cfg +++ b/ttcn3-remsim-test/REMSIM_Tests.cfg @@ -3,6 +3,7 @@ "/osmo-ttcn3-hacks/remsim/REMSIM_Tests.default" [LOGGING] +*.JUnitLogger.filename_stem := "junit-xml-server" [TESTPORT_PARAMETERS] diff --git a/ttcn3-remsim-test/bankd/REMSIM_Tests.cfg b/ttcn3-remsim-test/bankd/REMSIM_Tests.cfg index 2e77590..ca83346 100644 --- a/ttcn3-remsim-test/bankd/REMSIM_Tests.cfg +++ b/ttcn3-remsim-test/bankd/REMSIM_Tests.cfg @@ -3,6 +3,7 @@ "/osmo-ttcn3-hacks/remsim/REMSIM_Tests.default" [LOGGING] +*.JUnitLogger.filename_stem := "junit-xml-bankd" [TESTPORT_PARAMETERS] diff --git a/ttcn3-remsim-test/client/REMSIM_Tests.cfg b/ttcn3-remsim-test/client/REMSIM_Tests.cfg index d3f8d42..2484c73 100644 --- a/ttcn3-remsim-test/client/REMSIM_Tests.cfg +++ b/ttcn3-remsim-test/client/REMSIM_Tests.cfg @@ -3,6 +3,7 @@ "/osmo-ttcn3-hacks/remsim/REMSIM_Tests.default" [LOGGING] +*.JUnitLogger.filename_stem := "junit-xml-client" [TESTPORT_PARAMETERS] # IP address to which ATS binds emulated remsim-server -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9b6d1b5a943eb4e058ad2bf7cf8acee7b70e68b6 Gerrit-Change-Number: 16398 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 08:42:22 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 08:42:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSUP_Types: Add support for GSUP_IE_RAT_TYPE In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15365 ) Change subject: GSUP_Types: Add support for GSUP_IE_RAT_TYPE ...................................................................... GSUP_Types: Add support for GSUP_IE_RAT_TYPE Depends: libosmocore I93850710ab55a605bf61b95063a69682a2899bb1 Change-Id: I5d899fc6f6d4cf6123609b596022a853561f35f5 --- M library/GSUP_Types.ttcn 1 file changed, 46 insertions(+), 6 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index 74fbfc4..e1aa24c 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -43,6 +43,7 @@ OSMO_GSUP_AUTS_IE ('26'O), OSMO_GSUP_RES_IE ('27'O), OSMO_GSUP_CN_DOMAIN_IE ('28'O), + OSMO_GSUP_RAT_TYPE_IE ('29'O), OSMO_GSUP_SESSION_ID_IE ('30'O), OSMO_GSUP_SESSION_STATE_IE ('31'O), @@ -232,11 +233,21 @@ cause_rr, tag = OSMO_GSUP_CAUSE_RR_IE; cause_bssap, tag = OSMO_GSUP_CAUSE_BSSAP_IE; cause_sm, tag = OSMO_GSUP_CAUSE_SM_IE; + rat_type, tag = OSMO_GSUP_RAT_TYPE_IE; )" }; type record of GSUP_IE GSUP_IEs; +type enumerated GSUP_RatType { + RAT_TYPE_UNKNOWN (0), + RAT_TYPE_GERAN_A (1), + RAT_TYPE_UTRAN_Iu (2), + RAT_TYPE_EUTRAN_SGs (3) +} with { variant "FIELDLENGTH(8)" }; + +type record of GSUP_RatType GSUP_RatTypes; + type union GSUP_IeValue { hexstring imsi, integer cause, @@ -287,7 +298,9 @@ OCT1 cause_rr, OCT1 cause_bssap, - OCT1 cause_sm + OCT1 cause_sm, + + GSUP_RatTypes rat_type }; type record GSUP_PDU { @@ -433,6 +446,12 @@ template (value) GSUP_PDU ts_GSUP_SAI_REQ(hexstring imsi) := ts_GSUP(OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST, { valueof(ts_GSUP_IE_IMSI(imsi)) }); +template (value) GSUP_PDU ts_GSUP_SAI_REQ_EPS(hexstring imsi) := + ts_GSUP(OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST, { + valueof(ts_GSUP_IE_IMSI(imsi)), + valueof(ts_GSUP_IE_RAT_TYPE({RAT_TYPE_EUTRAN_SGs})) + }); + template GSUP_PDU tr_GSUP_SAI_REQ(template hexstring imsi) := tr_GSUP_IMSI(OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST, imsi); @@ -1105,6 +1124,23 @@ } } + +template (present) GSUP_IE tr_GSUP_IE_RAT_TYPE(template (present) GSUP_RatTypes ratt) := { + tag := OSMO_GSUP_RAT_TYPE_IE, + len := ?, + val := { + rat_type := ratt + } +} +template (value) GSUP_IE ts_GSUP_IE_RAT_TYPE(GSUP_RatTypes ratt) := { + tag := OSMO_GSUP_RAT_TYPE_IE, + len := 0, /* overwritten */ + val := { + rat_type := ratt + } +} + + private function f_gen_ts_ss_ies( hexstring imsi, OCT4 sid, @@ -1486,14 +1522,18 @@ } ); -function f_gsup_find_ie(GSUP_PDU msg, GSUP_IEI iei, out GSUP_IeValue ret) return boolean { - for (var integer i := 0; i < sizeof(msg.ies); i := i+1) { - if (msg.ies[i].tag == iei) { - ret := msg.ies[i].val; +function f_gsup_find_nested_ie(GSUP_IEs ies, GSUP_IEI iei, out GSUP_IeValue ret) return boolean { + for (var integer i := 0; i < sizeof(ies); i := i+1) { + if (ies[i].tag == iei) { + ret := ies[i].val; return true; } } - return false; + return false; +} + +function f_gsup_find_ie(GSUP_PDU msg, GSUP_IEI iei, out GSUP_IeValue ret) return boolean { + return f_gsup_find_nested_ie(msg.ies, iei, ret); } template GSUP_AN_APDU t_GSUP_AN_APDU( -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5d899fc6f6d4cf6123609b596022a853561f35f5 Gerrit-Change-Number: 15365 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 08:42:22 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 08:42:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: HLR: Add test for generating EPS (LTE) tuples with separation bit == 1 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15366 ) Change subject: HLR: Add test for generating EPS (LTE) tuples with separation bit == 1 ...................................................................... HLR: Add test for generating EPS (LTE) tuples with separation bit == 1 Depends: osmo-hlr Ic766bc40f6126bb479bd0a05b0e96bec3e240008 Change-Id: I40c6cf7e28ad9331e6c27fe7acafa3f9e277eedf --- M hlr/HLR_Tests.ttcn 1 file changed, 75 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index f8d7483..8a96d7f 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -293,6 +293,30 @@ return sl; } +function f_gen_3G_subs() runs on test_CT return HlrSubscriberList { + var HlrSubscriber sub; + var HlrSubscriberList sl := {}; + + sub := valueof(t_Sub3G(f_rnd_imsi('26242'H), '49161'H & f_rnd_hexstring(7, 9), "milenage", false)); + sl := sl & { sub }; + + sub := valueof(t_Sub3G(f_rnd_imsi('26242'H), '49161'H & f_rnd_hexstring(7, 9), "milenage", true)); + sl := sl & { sub }; + + sub := valueof(t_Sub2G3G(f_rnd_imsi('26242'H), '49161'H & f_rnd_hexstring(7, 9), + "comp128v1", "milenage", false)); + sl := sl & { sub }; + + sub := valueof(t_Sub2G3G(f_rnd_imsi('26242'H), '49161'H & f_rnd_hexstring(7, 9), + "comp128v2", "milenage", false)); + sl := sl & { sub }; + + sub := valueof(t_Sub2G3G(f_rnd_imsi('26242'H), '49161'H & f_rnd_hexstring(7, 9), + "comp128v3", "milenage", false)); + sl := sl & { sub }; + + return sl; +} function f_vty_transceive_match(TELNETasp_PT pt, charstring cmd, template charstring exp_ret) { var charstring ret := f_vty_transceive_ret(pt, cmd); @@ -370,7 +394,8 @@ ***********************************************************************/ /* perform SendAuthInfo for given imsi, return the GSUP response/error */ -function f_perform_SAI(hexstring imsi, template (omit) integer exp_err_cause := omit) +function f_perform_SAI(hexstring imsi, template (omit) integer exp_err_cause := omit, + boolean is_eps := false) runs on HLR_ConnHdlr return GSUP_PDU { var GSUP_PDU ret; timer T := 3.0; @@ -379,7 +404,11 @@ exp_fail := true; } - GSUP.send(valueof(ts_GSUP_SAI_REQ(imsi))); + if (is_eps) { + GSUP.send(ts_GSUP_SAI_REQ_EPS(imsi)); + } else { + GSUP.send(valueof(ts_GSUP_SAI_REQ(imsi))); + } T.start; alt { [exp_fail] GSUP.receive(tr_GSUP_SAI_ERR(imsi, exp_err_cause)) -> value ret { @@ -682,6 +711,7 @@ private function f_TC_gsup_sai() runs on HLR_ConnHdlr { var GSUP_PDU res; res := f_perform_SAI(g_pars.sub.imsi); + f_ensure_amf_separation_bit(res, '0'B); /* TODO: match if tuple[s] matches expectation */ setverdict(pass); } @@ -697,6 +727,48 @@ setverdict(pass); } +private function f_ensure_amf_separation_bit(GSUP_PDU res, BIT1 sep_bit) +{ + for (var integer i := 0; i < lengthof(res.ies); i := i+1) { + var GSUP_IE tuple := res.ies[i]; + if (tuple.tag != OSMO_GSUP_AUTH_TUPLE_IE) { + continue; + } + var GSUP_IeValue autn; + if (f_gsup_find_nested_ie(tuple.val.auth_tuple, OSMO_GSUP_AUTN_IE, autn) == false) { + setverdict(fail, "Couldn't find AUTN IE in tuple ", i); + mtc.stop; + } + var bitstring amf := oct2bit(substr(autn.autn, 6, 2)); + if (amf[0] != sep_bit) { + setverdict(fail, "AMF bit 0 (separation bit) must be ", sep_bit," but was not"); + mtc.stop; + } + } +} + +/* test SAI for a number of different subscriber cases (algo, 2g/3g, ...) */ +private function f_TC_gsup_sai_eps() runs on HLR_ConnHdlr { + var GSUP_PDU res; + res := f_perform_SAI(g_pars.sub.imsi, is_eps := true); + f_ensure_amf_separation_bit(res, '1'B); + + /* TODO: match if tuple[s] matches expectation */ + setverdict(pass); +} +testcase TC_gsup_sai_eps() runs on test_CT { + var HlrSubscriberList sl; + var GSUP_PDU res; + + f_init(false); + + sl := f_gen_3G_subs(); + f_start_handler_per_sub(refers(f_TC_gsup_sai_eps), sl); + + setverdict(pass); +} + + /* test UL for unknown IMSI */ private function f_TC_ul_unknown_imsi() runs on HLR_ConnHdlr { var GSUP_PDU res; @@ -1397,6 +1469,7 @@ control { execute( TC_gsup_sai_err_invalid_imsi() ); execute( TC_gsup_sai() ); + execute( TC_gsup_sai_eps() ); execute( TC_gsup_ul_unknown_imsi() ); execute( TC_gsup_sai_err_unknown_imsi() ); execute( TC_gsup_ul() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I40c6cf7e28ad9331e6c27fe7acafa3f9e277eedf Gerrit-Change-Number: 15366 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 08:44:36 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 08:44:36 +0000 Subject: Change in osmo-msc[master]: counters: polish documentation of cm_service_request / paging_resp In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16387 ) Change subject: counters: polish documentation of cm_service_request / paging_resp ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I273bc4165c70cd54ed94ff5f99377189f3306f51 Gerrit-Change-Number: 16387 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Dec 2019 08:44:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 08:44:38 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 08:44:38 +0000 Subject: Change in osmo-msc[master]: counters: clarify documentation for MSC_CTR_CALL_* entries In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16386 ) Change subject: counters: clarify documentation for MSC_CTR_CALL_* entries ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iad1ef917a229c3be51bd8fbe155f009f81e7d72a Gerrit-Change-Number: 16386 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Dec 2019 08:44:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 08:44:40 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 08:44:40 +0000 Subject: Change in osmo-msc[master]: counters: clarify documentation for MSC_CTR_LOC_UPDATE_* entries In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16385 ) Change subject: counters: clarify documentation for MSC_CTR_LOC_UPDATE_* entries ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I4f4a0d644db0a2dd7c8eefd846ea6913c0b780ce Gerrit-Change-Number: 16385 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Dec 2019 08:44:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 08:44:42 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 08:44:42 +0000 Subject: Change in osmo-msc[master]: counters: clarify documentation for MSC_CTR_SMS_* entries In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16172 ) Change subject: counters: clarify documentation for MSC_CTR_SMS_* entries ...................................................................... counters: clarify documentation for MSC_CTR_SMS_* entries Please note that counter "sms:delivered" assumes "Delivered MT SMS", but actually counts total number MT SMS delivery attempts. This change describes its _actual_ (erroneous) behaviour. Change-Id: I081cf962ce2658ceab02699f3cdee19658d00939 Related: OS#4273 --- M doc/manuals/chapters/counters_generated.adoc M include/osmocom/msc/gsm_data.h 2 files changed, 14 insertions(+), 13 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/manuals/chapters/counters_generated.adoc b/doc/manuals/chapters/counters_generated.adoc index e2587e8..526ed01 100644 --- a/doc/manuals/chapters/counters_generated.adoc +++ b/doc/manuals/chapters/counters_generated.adoc @@ -20,12 +20,12 @@ | cm_service_request:accepted | <> | Accepted CM Service Request. | paging_resp:rejected | <> | Rejected Paging Response. | paging_resp:accepted | <> | Accepted Paging Response. -| sms:submitted | <> | Received a RPDU from a MS (MO). -| sms:no_receiver | <> | Counts SMS which couldn't routed because no receiver found. -| sms:delivered | <> | Global SMS Deliver attempts. -| sms:rp_err_mem | <> | CAUSE_MT_MEM_EXCEEDED errors of MS responses on a sms deliver attempt. -| sms:rp_err_other | <> | Other error of MS responses on a sms delive attempt. -| sms:deliver_unknown_error | <> | Unknown error occurred during sms delivery. +| sms:submitted | <> | Total MO SMS received from the MS. +| sms:no_receiver | <> | Failed MO SMS delivery attempts (no receiver found). +| sms:deliver_unknown_error | <> | Failed MO SMS delivery attempts (other reason). +| sms:delivered | <> | Total MT SMS delivery attempts. +| sms:rp_err_mem | <> | Failed MT SMS delivery attempts (no memory). +| sms:rp_err_other | <> | Failed MT SMS delivery attempts (other reason). | call:mo_setup | <> | Received setup requests from a MS to init a MO call. | call:mo_connect_ack | <> | Received a connect ack from MS of a MO call. Call is now successful connected up. | call:mt_setup | <> | Sent setup requests to the MS (MT). diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index bcee213..60008b9 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -75,13 +75,14 @@ [MSC_CTR_CM_SERVICE_REQUEST_ACCEPTED] = {"cm_service_request:accepted", "Accepted CM Service Request."}, [MSC_CTR_PAGING_RESP_REJECTED] = {"paging_resp:rejected", "Rejected Paging Response."}, [MSC_CTR_PAGING_RESP_ACCEPTED] = {"paging_resp:accepted", "Accepted Paging Response."}, - [MSC_CTR_SMS_SUBMITTED] = {"sms:submitted", "Received a RPDU from a MS (MO)."}, - [MSC_CTR_SMS_NO_RECEIVER] = {"sms:no_receiver", "Counts SMS which couldn't routed because no receiver found."}, - [MSC_CTR_SMS_DELIVERED] = {"sms:delivered", "Global SMS Deliver attempts."}, - [MSC_CTR_SMS_RP_ERR_MEM] = {"sms:rp_err_mem", "CAUSE_MT_MEM_EXCEEDED errors of MS responses on a sms deliver attempt."}, - [MSC_CTR_SMS_RP_ERR_OTHER] = {"sms:rp_err_other", "Other error of MS responses on a sms delive attempt."}, - [MSC_CTR_SMS_DELIVER_UNKNOWN_ERROR] = {"sms:deliver_unknown_error", "Unknown error occurred during sms delivery."}, - /* FIXME: count also sms delivered */ + [MSC_CTR_SMS_SUBMITTED] = {"sms:submitted", "Total MO SMS received from the MS."}, + [MSC_CTR_SMS_NO_RECEIVER] = {"sms:no_receiver", "Failed MO SMS delivery attempts (no receiver found)."}, + [MSC_CTR_SMS_DELIVER_UNKNOWN_ERROR] = {"sms:deliver_unknown_error", "Failed MO SMS delivery attempts (other reason)."}, + /* FIXME: "sms:delivered" should actually count number of _successfully_ delivered MT SMS. + * The current description reflects its current (errorneous) behaviour. */ + [MSC_CTR_SMS_DELIVERED] = {"sms:delivered", "Total MT SMS delivery attempts."}, + [MSC_CTR_SMS_RP_ERR_MEM] = {"sms:rp_err_mem", "Failed MT SMS delivery attempts (no memory)."}, + [MSC_CTR_SMS_RP_ERR_OTHER] = {"sms:rp_err_other", "Failed MT SMS delivery attempts (other reason)."}, [MSC_CTR_CALL_MO_SETUP] = {"call:mo_setup", "Received setup requests from a MS to init a MO call."}, [MSC_CTR_CALL_MO_CONNECT_ACK] = {"call:mo_connect_ack", "Received a connect ack from MS of a MO call. Call is now successful connected up."}, [MSC_CTR_CALL_MT_SETUP] = {"call:mt_setup", "Sent setup requests to the MS (MT)."}, -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I081cf962ce2658ceab02699f3cdee19658d00939 Gerrit-Change-Number: 16172 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 08:44:42 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 08:44:42 +0000 Subject: Change in osmo-msc[master]: counters: clarify documentation for MSC_CTR_LOC_UPDATE_* entries In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16385 ) Change subject: counters: clarify documentation for MSC_CTR_LOC_UPDATE_* entries ...................................................................... counters: clarify documentation for MSC_CTR_LOC_UPDATE_* entries Change-Id: I4f4a0d644db0a2dd7c8eefd846ea6913c0b780ce --- M doc/manuals/chapters/counters_generated.adoc M include/osmocom/msc/gsm_data.h 2 files changed, 12 insertions(+), 12 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/manuals/chapters/counters_generated.adoc b/doc/manuals/chapters/counters_generated.adoc index 526ed01..49f2589 100644 --- a/doc/manuals/chapters/counters_generated.adoc +++ b/doc/manuals/chapters/counters_generated.adoc @@ -10,12 +10,12 @@ [options="header"] |=== | Name | Reference | Description -| loc_update_type:attach | <> | Received location update imsi attach requests. -| loc_update_type:normal | <> | Received location update normal requests. -| loc_update_type:periodic | <> | Received location update periodic requests. -| loc_update_type:detach | <> | Received location update detach indication. -| loc_update_resp:failed | <> | Rejected location updates. -| loc_update_resp:completed | <> | Successful location updates. +| loc_update_type:attach | <> | Received Location Update (IMSI Attach) requests. +| loc_update_type:normal | <> | Received Location Update (LAC change) requests. +| loc_update_type:periodic | <> | Received (periodic) Location Update requests. +| loc_update_type:detach | <> | Received IMSI Detach indications. +| loc_update_resp:failed | <> | Rejected Location Updates requests. +| loc_update_resp:completed | <> | Successful Location Update procedures. | cm_service_request:rejected | <> | Rejected CM Service Request. | cm_service_request:accepted | <> | Accepted CM Service Request. | paging_resp:rejected | <> | Rejected Paging Response. diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 60008b9..ca5c38a 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -65,12 +65,12 @@ }; static const struct rate_ctr_desc msc_ctr_description[] = { - [MSC_CTR_LOC_UPDATE_TYPE_ATTACH] = {"loc_update_type:attach", "Received location update imsi attach requests."}, - [MSC_CTR_LOC_UPDATE_TYPE_NORMAL] = {"loc_update_type:normal", "Received location update normal requests."}, - [MSC_CTR_LOC_UPDATE_TYPE_PERIODIC] = {"loc_update_type:periodic", "Received location update periodic requests."}, - [MSC_CTR_LOC_UPDATE_TYPE_DETACH] = {"loc_update_type:detach", "Received location update detach indication."}, - [MSC_CTR_LOC_UPDATE_FAILED] = {"loc_update_resp:failed", "Rejected location updates."}, - [MSC_CTR_LOC_UPDATE_COMPLETED] = {"loc_update_resp:completed", "Successful location updates."}, + [MSC_CTR_LOC_UPDATE_TYPE_ATTACH] = {"loc_update_type:attach", "Received Location Update (IMSI Attach) requests."}, + [MSC_CTR_LOC_UPDATE_TYPE_NORMAL] = {"loc_update_type:normal", "Received Location Update (LAC change) requests."}, + [MSC_CTR_LOC_UPDATE_TYPE_PERIODIC] = {"loc_update_type:periodic", "Received (periodic) Location Update requests."}, + [MSC_CTR_LOC_UPDATE_TYPE_DETACH] = {"loc_update_type:detach", "Received IMSI Detach indications."}, + [MSC_CTR_LOC_UPDATE_FAILED] = {"loc_update_resp:failed", "Rejected Location Update requests."}, + [MSC_CTR_LOC_UPDATE_COMPLETED] = {"loc_update_resp:completed", "Successful Location Update procedures."}, [MSC_CTR_CM_SERVICE_REQUEST_REJECTED] = {"cm_service_request:rejected", "Rejected CM Service Request."}, [MSC_CTR_CM_SERVICE_REQUEST_ACCEPTED] = {"cm_service_request:accepted", "Accepted CM Service Request."}, [MSC_CTR_PAGING_RESP_REJECTED] = {"paging_resp:rejected", "Rejected Paging Response."}, -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I4f4a0d644db0a2dd7c8eefd846ea6913c0b780ce Gerrit-Change-Number: 16385 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 08:44:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 08:44:43 +0000 Subject: Change in osmo-msc[master]: counters: clarify documentation for MSC_CTR_CALL_* entries In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16386 ) Change subject: counters: clarify documentation for MSC_CTR_CALL_* entries ...................................................................... counters: clarify documentation for MSC_CTR_CALL_* entries Change-Id: Iad1ef917a229c3be51bd8fbe155f009f81e7d72a --- M doc/manuals/chapters/counters_generated.adoc M include/osmocom/msc/gsm_data.h 2 files changed, 14 insertions(+), 14 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/manuals/chapters/counters_generated.adoc b/doc/manuals/chapters/counters_generated.adoc index 49f2589..d73803d 100644 --- a/doc/manuals/chapters/counters_generated.adoc +++ b/doc/manuals/chapters/counters_generated.adoc @@ -26,13 +26,13 @@ | sms:delivered | <> | Total MT SMS delivery attempts. | sms:rp_err_mem | <> | Failed MT SMS delivery attempts (no memory). | sms:rp_err_other | <> | Failed MT SMS delivery attempts (other reason). -| call:mo_setup | <> | Received setup requests from a MS to init a MO call. -| call:mo_connect_ack | <> | Received a connect ack from MS of a MO call. Call is now successful connected up. -| call:mt_setup | <> | Sent setup requests to the MS (MT). -| call:mt_connect | <> | Sent a connect to the MS (MT). -| call:active | <> | Count total amount of calls that ever reached active state. -| call:complete | <> | Count total amount of calls which got terminated by disconnect req or ind after reaching active state. -| call:incomplete | <> | Count total amount of call which got terminated by any other reason after reaching active state. +| call:mo_setup | <> | Received MO SETUP messages (MO call establishment). +| call:mo_connect_ack | <> | Received MO CONNECT messages (MO call establishment). +| call:mt_setup | <> | Sent MT SETUP messages (MT call establishment). +| call:mt_connect | <> | Sent MT CONNECT messages (MT call establishment). +| call:active | <> | Calls that ever reached the active state. +| call:complete | <> | Calls terminated by DISCONNECT message after reaching the active state. +| call:incomplete | <> | Calls terminated by any other reason after reaching the active state. | nc_ss:mo_requests | <> | Received MS-initiated call independent SS/USSD requests. | nc_ss:mo_established | <> | Established MS-initiated call independent SS/USSD sessions. | nc_ss:mt_requests | <> | Received network-initiated call independent SS/USSD requests. diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index ca5c38a..87629ad 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -83,13 +83,13 @@ [MSC_CTR_SMS_DELIVERED] = {"sms:delivered", "Total MT SMS delivery attempts."}, [MSC_CTR_SMS_RP_ERR_MEM] = {"sms:rp_err_mem", "Failed MT SMS delivery attempts (no memory)."}, [MSC_CTR_SMS_RP_ERR_OTHER] = {"sms:rp_err_other", "Failed MT SMS delivery attempts (other reason)."}, - [MSC_CTR_CALL_MO_SETUP] = {"call:mo_setup", "Received setup requests from a MS to init a MO call."}, - [MSC_CTR_CALL_MO_CONNECT_ACK] = {"call:mo_connect_ack", "Received a connect ack from MS of a MO call. Call is now successful connected up."}, - [MSC_CTR_CALL_MT_SETUP] = {"call:mt_setup", "Sent setup requests to the MS (MT)."}, - [MSC_CTR_CALL_MT_CONNECT] = {"call:mt_connect", "Sent a connect to the MS (MT)."}, - [MSC_CTR_CALL_ACTIVE] = {"call:active", "Count total amount of calls that ever reached active state."}, - [MSC_CTR_CALL_COMPLETE] = {"call:complete", "Count total amount of calls which got terminated by disconnect req or ind after reaching active state."}, - [MSC_CTR_CALL_INCOMPLETE] = {"call:incomplete", "Count total amount of call which got terminated by any other reason after reaching active state."}, + [MSC_CTR_CALL_MO_SETUP] = {"call:mo_setup", "Received MO SETUP messages (MO call establishment)."}, + [MSC_CTR_CALL_MO_CONNECT_ACK] = {"call:mo_connect_ack", "Received MO CONNECT messages (MO call establishment)."}, + [MSC_CTR_CALL_MT_SETUP] = {"call:mt_setup", "Sent MT SETUP messages (MT call establishment)."}, + [MSC_CTR_CALL_MT_CONNECT] = {"call:mt_connect", "Sent MT CONNECT messages (MT call establishment)."}, + [MSC_CTR_CALL_ACTIVE] = {"call:active", "Calls that ever reached the active state."}, + [MSC_CTR_CALL_COMPLETE] = {"call:complete", "Calls terminated by DISCONNECT message after reaching the active state."}, + [MSC_CTR_CALL_INCOMPLETE] = {"call:incomplete", "Calls terminated by any other reason after reaching the active state."}, [MSC_CTR_NC_SS_MO_REQUESTS] = {"nc_ss:mo_requests", "Received MS-initiated call independent SS/USSD requests."}, [MSC_CTR_NC_SS_MO_ESTABLISHED] = {"nc_ss:mo_established", "Established MS-initiated call independent SS/USSD sessions."}, [MSC_CTR_NC_SS_MT_REQUESTS] = {"nc_ss:mt_requests", "Received network-initiated call independent SS/USSD requests."}, -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iad1ef917a229c3be51bd8fbe155f009f81e7d72a Gerrit-Change-Number: 16386 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 08:44:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 08:44:43 +0000 Subject: Change in osmo-msc[master]: counters: polish documentation of cm_service_request / paging_resp In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16387 ) Change subject: counters: polish documentation of cm_service_request / paging_resp ...................................................................... counters: polish documentation of cm_service_request / paging_resp Change-Id: I273bc4165c70cd54ed94ff5f99377189f3306f51 --- M doc/manuals/chapters/counters_generated.adoc M include/osmocom/msc/gsm_data.h 2 files changed, 8 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/manuals/chapters/counters_generated.adoc b/doc/manuals/chapters/counters_generated.adoc index d73803d..f55be27 100644 --- a/doc/manuals/chapters/counters_generated.adoc +++ b/doc/manuals/chapters/counters_generated.adoc @@ -16,10 +16,10 @@ | loc_update_type:detach | <> | Received IMSI Detach indications. | loc_update_resp:failed | <> | Rejected Location Updates requests. | loc_update_resp:completed | <> | Successful Location Update procedures. -| cm_service_request:rejected | <> | Rejected CM Service Request. -| cm_service_request:accepted | <> | Accepted CM Service Request. -| paging_resp:rejected | <> | Rejected Paging Response. -| paging_resp:accepted | <> | Accepted Paging Response. +| cm_service_request:rejected | <> | Rejected CM Service Requests. +| cm_service_request:accepted | <> | Accepted CM Service Requests. +| paging_resp:rejected | <> | Rejected Paging Responses. +| paging_resp:accepted | <> | Accepted Paging Responses. | sms:submitted | <> | Total MO SMS received from the MS. | sms:no_receiver | <> | Failed MO SMS delivery attempts (no receiver found). | sms:deliver_unknown_error | <> | Failed MO SMS delivery attempts (other reason). diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 87629ad..3459d15 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -71,10 +71,10 @@ [MSC_CTR_LOC_UPDATE_TYPE_DETACH] = {"loc_update_type:detach", "Received IMSI Detach indications."}, [MSC_CTR_LOC_UPDATE_FAILED] = {"loc_update_resp:failed", "Rejected Location Update requests."}, [MSC_CTR_LOC_UPDATE_COMPLETED] = {"loc_update_resp:completed", "Successful Location Update procedures."}, - [MSC_CTR_CM_SERVICE_REQUEST_REJECTED] = {"cm_service_request:rejected", "Rejected CM Service Request."}, - [MSC_CTR_CM_SERVICE_REQUEST_ACCEPTED] = {"cm_service_request:accepted", "Accepted CM Service Request."}, - [MSC_CTR_PAGING_RESP_REJECTED] = {"paging_resp:rejected", "Rejected Paging Response."}, - [MSC_CTR_PAGING_RESP_ACCEPTED] = {"paging_resp:accepted", "Accepted Paging Response."}, + [MSC_CTR_CM_SERVICE_REQUEST_REJECTED] = {"cm_service_request:rejected", "Rejected CM Service Requests."}, + [MSC_CTR_CM_SERVICE_REQUEST_ACCEPTED] = {"cm_service_request:accepted", "Accepted CM Service Requests."}, + [MSC_CTR_PAGING_RESP_REJECTED] = {"paging_resp:rejected", "Rejected Paging Responses."}, + [MSC_CTR_PAGING_RESP_ACCEPTED] = {"paging_resp:accepted", "Accepted Paging Responses."}, [MSC_CTR_SMS_SUBMITTED] = {"sms:submitted", "Total MO SMS received from the MS."}, [MSC_CTR_SMS_NO_RECEIVER] = {"sms:no_receiver", "Failed MO SMS delivery attempts (no receiver found)."}, [MSC_CTR_SMS_DELIVER_UNKNOWN_ERROR] = {"sms:deliver_unknown_error", "Failed MO SMS delivery attempts (other reason)."}, -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I273bc4165c70cd54ed94ff5f99377189f3306f51 Gerrit-Change-Number: 16387 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 08:44:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 08:44:53 +0000 Subject: Change in osmo-msc[master]: libmsc: fix potential NULL-pointer dereferences detected by GCC's LTO In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16357 ) Change subject: libmsc: fix potential NULL-pointer dereferences detected by GCC's LTO ...................................................................... libmsc: fix potential NULL-pointer dereferences detected by GCC's LTO Change-Id: Ib7ba8909dce64d1b8ff3a53495fe3eefc446ed8e --- M src/libmsc/msc_ho.c M src/libmsc/msc_vty.c 2 files changed, 9 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/msc_ho.c b/src/libmsc/msc_ho.c index ac7602f..aa513eb 100644 --- a/src/libmsc/msc_ho.c +++ b/src/libmsc/msc_ho.c @@ -67,9 +67,12 @@ void msc_ho_down_required_reject(struct msc_a *msc_a, enum gsm0808_cause cause) { - struct msc_i *msc_i = msc_a_msc_i(msc_a); + struct msc_i *msc_i; uint32_t event; + msc_i = msc_a_msc_i(msc_a); + OSMO_ASSERT(msc_i); + struct ran_msg ran_enc_msg = { .msg_type = RAN_MSG_HANDOVER_REQUIRED_REJECT, .handover_required_reject = { diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index f833585..cd82a07 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -1148,6 +1148,11 @@ struct gsm_sms *sms; sms = sms_from_text(receiver, sender_msisdn, 0, str); + if (!sms) { + LOGP(DLSMS, LOGL_ERROR, "Failed to allocate SMS\n"); + return CMD_WARNING; + } + sms->protocol_id = tp_pid; /* store in database for the queue */ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib7ba8909dce64d1b8ff3a53495fe3eefc446ed8e Gerrit-Change-Number: 16357 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 08:45:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 08:45:32 +0000 Subject: Change in osmo-bsc[master]: abis_nm.c: fix RSL connection temeout for trx->nr > 0 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16350 ) Change subject: abis_nm.c: fix RSL connection temeout for trx->nr > 0 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib4b9a198da11c88a51cfa78ffb7e7235a6365ef4 Gerrit-Change-Number: 16350 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Dec 2019 08:45:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 08:45:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 08:45:48 +0000 Subject: Change in osmo-bsc[master]: abis_nm.c: fix RSL connection timeout for trx->nr > 0 In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#3) to the change originally created by fixeria. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16350 ) Change subject: abis_nm.c: fix RSL connection timeout for trx->nr > 0 ...................................................................... abis_nm.c: fix RSL connection timeout for trx->nr > 0 After sending of NM_MT_IPACC_RSL_CONNECT message, we start a timer, and stop it on receipt of NM_MT_IPACC_RSL_CONNECT_{ACK,NACK}. When running a multi-trx setup, one can see the following warnings: DRSL NOTICE abis_nm.c:2852 (bts=0,trx=1) RSL connection request timed out DRSL NOTICE abis_nm.c:2852 (bts=0,trx=2) RSL connection request timed out even despite NM_MT_IPACC_RSL_CONNECT is actually being acknowledged. The problem is in abis_nm_rx_ipacc(): we cannot just use sign_link->trx, because the message itself was received over the OML link, so this pointer always gives us C0/TRX0. Instead, we must find a TRX by its number from the FOH header using gsm_bts_trx_by_nr(). Change-Id: Ib4b9a198da11c88a51cfa78ffb7e7235a6365ef4 --- M src/osmo-bsc/abis_nm.c 1 file changed, 21 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/50/16350/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib4b9a198da11c88a51cfa78ffb7e7235a6365ef4 Gerrit-Change-Number: 16350 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 08:45:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 08:45:53 +0000 Subject: Change in osmo-bsc[master]: abis_nm.c: fix RSL connection timeout for trx->nr > 0 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16350 ) Change subject: abis_nm.c: fix RSL connection timeout for trx->nr > 0 ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib4b9a198da11c88a51cfa78ffb7e7235a6365ef4 Gerrit-Change-Number: 16350 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Dec 2019 08:45:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 08:46:10 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 08:46:10 +0000 Subject: Change in osmo-bsc[master]: abis_nm.c: fix RSL connection timeout for trx->nr > 0 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16350 ) Change subject: abis_nm.c: fix RSL connection timeout for trx->nr > 0 ...................................................................... abis_nm.c: fix RSL connection timeout for trx->nr > 0 After sending of NM_MT_IPACC_RSL_CONNECT message, we start a timer, and stop it on receipt of NM_MT_IPACC_RSL_CONNECT_{ACK,NACK}. When running a multi-trx setup, one can see the following warnings: DRSL NOTICE abis_nm.c:2852 (bts=0,trx=1) RSL connection request timed out DRSL NOTICE abis_nm.c:2852 (bts=0,trx=2) RSL connection request timed out even despite NM_MT_IPACC_RSL_CONNECT is actually being acknowledged. The problem is in abis_nm_rx_ipacc(): we cannot just use sign_link->trx, because the message itself was received over the OML link, so this pointer always gives us C0/TRX0. Instead, we must find a TRX by its number from the FOH header using gsm_bts_trx_by_nr(). Change-Id: Ib4b9a198da11c88a51cfa78ffb7e7235a6365ef4 --- M src/osmo-bsc/abis_nm.c 1 file changed, 21 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index ca0df68..7ca4e79 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -2699,6 +2699,7 @@ struct tlv_parsed tp; struct ipacc_ack_signal_data signal; struct e1inp_sign_link *sign_link = msg->dst; + struct gsm_bts_trx *trx; foh = (struct abis_om_fom_hdr *) (oh->data + 1 + idstrlen); @@ -2709,6 +2710,10 @@ abis_nm_tlv_parse(&tp, sign_link->trx->bts, foh->data, oh->length-sizeof(*foh)); + /* The message might be received over the main OML link, so we cannot + * just use sign_link->trx. Resolve it by number from the FOM header. */ + trx = gsm_bts_trx_by_nr(sign_link->trx->bts, foh->obj_inst.trx_nr); + DEBUGPFOH(DNM, foh, "Rx IPACCESS(0x%02x): %s\n", foh->msg_type, osmo_hexdump(foh->data, oh->length - sizeof(*foh))); @@ -2727,7 +2732,9 @@ DEBUGPC(DNM, "STREAM=0x%02x ", *TLVP_VAL(&tp, NM_ATT_IPACC_STREAM_ID)); DEBUGPC(DNM, "\n"); - osmo_timer_del(&sign_link->trx->rsl_connect_timeout); + if (!trx) + goto obj_inst_error; + osmo_timer_del(&trx->rsl_connect_timeout); break; case NM_MT_IPACC_RSL_CONNECT_NACK: LOGPFOH(DNM, LOGL_ERROR, foh, "RSL CONNECT NACK "); @@ -2736,7 +2743,9 @@ abis_nm_nack_cause_name(*TLVP_VAL(&tp, NM_ATT_NACK_CAUSES))); else LOGPC(DNM, LOGL_ERROR, "\n"); - osmo_timer_del(&sign_link->trx->rsl_connect_timeout); + if (!trx) + goto obj_inst_error; + osmo_timer_del(&trx->rsl_connect_timeout); break; case NM_MT_IPACC_SET_NVATTR_ACK: DEBUGPFOH(DNM, foh, "SET NVATTR ACK\n"); @@ -2783,12 +2792,16 @@ case NM_MT_IPACC_RSL_CONNECT_NACK: case NM_MT_IPACC_SET_NVATTR_NACK: case NM_MT_IPACC_GET_NVATTR_NACK: - signal.trx = gsm_bts_trx_by_nr(sign_link->trx->bts, foh->obj_inst.trx_nr); + if (!trx) + goto obj_inst_error; + signal.trx = trx; signal.msg_type = foh->msg_type; osmo_signal_dispatch(SS_NM, S_NM_IPACC_NACK, &signal); break; case NM_MT_IPACC_SET_NVATTR_ACK: - signal.trx = gsm_bts_trx_by_nr(sign_link->trx->bts, foh->obj_inst.trx_nr); + if (!trx) + goto obj_inst_error; + signal.trx = trx; signal.msg_type = foh->msg_type; osmo_signal_dispatch(SS_NM, S_NM_IPACC_ACK, &signal); break; @@ -2797,6 +2810,10 @@ } return 0; + +obj_inst_error: + LOGPFOH(DNM, LOGL_ERROR, foh, "Unknown object instance\n"); + return -EINVAL; } /* send an ip-access manufacturer specific message */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib4b9a198da11c88a51cfa78ffb7e7235a6365ef4 Gerrit-Change-Number: 16350 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 08:56:55 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 2 Dec 2019 08:56:55 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds.yml: fix osmo-fl2k References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16399 ) Change subject: jobs/master-builds.yml: fix osmo-fl2k ...................................................................... jobs/master-builds.yml: fix osmo-fl2k Don't use the old "osmocom:amd64" image. Remove the entire cmd line, so it uses the default docker command with the default docker image "osmocom:deb9_amd64". Also remove concurrent: true, because that default nowadays too. Related: OS#3203 Change-Id: I93db12d3652f26db059e0ede52d2b2fdd3e89d34 --- M jobs/master-builds.yml 1 file changed, 1 insertion(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/99/16399/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 15acd12..0bd2de7 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -194,17 +194,7 @@ concurrent: false cmd: 'PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"' - - osmo-fl2k: - concurrent: true - cmd: | - docker run --rm=true \ - -e HOME=/build \ - -e PARALLEL_MAKE="$PARALLEL_MAKE" \ - -e PATH="$PATH:/build_bin" \ - -w /build -i -u build \ - -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ - osmocom:amd64 /build/contrib/jenkins.sh - + - osmo-fl2k - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I93db12d3652f26db059e0ede52d2b2fdd3e89d34 Gerrit-Change-Number: 16399 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 09:00:32 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 2 Dec 2019 09:00:32 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds.yml: fix osmo-fl2k In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16399 ) Change subject: jobs/master-builds.yml: fix osmo-fl2k ...................................................................... Patch Set 1: Verified+1 Code-Review+2 Trivial fix, and tested here: https://jenkins.osmocom.org/jenkins/job/master-osmo-fl2k/6/ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I93db12d3652f26db059e0ede52d2b2fdd3e89d34 Gerrit-Change-Number: 16399 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 02 Dec 2019 09:00:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 09:00:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 09:00:37 +0000 Subject: Change in osmo-ccid-firmware[master]: fix the host/emulation build In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16319 ) Change subject: fix the host/emulation build ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ib07a58b6102b1709f295d08a764c6f118a2d0b9e Gerrit-Change-Number: 16319 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-Comment-Date: Mon, 02 Dec 2019 09:00:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 09:00:38 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 2 Dec 2019 09:00:38 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds.yml: fix osmo-fl2k In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16399 ) Change subject: jobs/master-builds.yml: fix osmo-fl2k ...................................................................... jobs/master-builds.yml: fix osmo-fl2k Don't use the old "osmocom:amd64" image. Remove the entire cmd line, so it uses the default docker command with the default docker image "osmocom:deb9_amd64". Also remove concurrent: true, because that default nowadays too. Related: OS#3203 Change-Id: I93db12d3652f26db059e0ede52d2b2fdd3e89d34 --- M jobs/master-builds.yml 1 file changed, 1 insertion(+), 11 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 15acd12..0bd2de7 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -194,17 +194,7 @@ concurrent: false cmd: 'PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"' - - osmo-fl2k: - concurrent: true - cmd: | - docker run --rm=true \ - -e HOME=/build \ - -e PARALLEL_MAKE="$PARALLEL_MAKE" \ - -e PATH="$PATH:/build_bin" \ - -w /build -i -u build \ - -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ - osmocom:amd64 /build/contrib/jenkins.sh - + - osmo-fl2k - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I93db12d3652f26db059e0ede52d2b2fdd3e89d34 Gerrit-Change-Number: 16399 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 09:00:55 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 09:00:55 +0000 Subject: Change in osmo-ccid-firmware[master]: fix the host/emulation build In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16319 ) Change subject: fix the host/emulation build ...................................................................... fix the host/emulation build Going for __ARM__ to distinguish host and firmware builds is not sufficient here, since we might be building on a ARM host, so there is now a OCTSIMFWBUILD define. Change-Id: Ib07a58b6102b1709f295d08a764c6f118a2d0b9e --- M ccid_common/ccid_slot_fsm.c M ccid_common/iso7816_3.c M ccid_common/iso7816_fsm.c M ccid_host/Makefile M sysmoOCTSIM/gcc/Makefile 5 files changed, 32 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c index 3a591d7..08cbbad 100644 --- a/ccid_common/ccid_slot_fsm.c +++ b/ccid_common/ccid_slot_fsm.c @@ -98,7 +98,11 @@ osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_POWER_UP_IND, NULL); cs->icc_powered = true; card_uart_ctrl(ss->cuart, CUART_CTL_CLOCK, true); +#ifdef OCTSIMFWBUILD delay_us(10000); +#else + usleep(10000); +#endif osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_RESET_REL_IND, NULL); card_uart_ctrl(ss->cuart, CUART_CTL_RST, false); @@ -119,7 +123,9 @@ case ISO7816_E_PPS_DONE_IND: case ISO7816_E_PPS_FAILED_IND: cs->event_data = data; +#ifdef OCTSIMFWBUILD asm volatile("dmb st": : :"memory"); +#endif cs->event = event; break; default: @@ -329,35 +335,38 @@ void *ctx = g_tall_ctx; /* FIXME */ struct iso_fsm_slot *ss = ccid_slot2iso_fsm_slot(cs); struct card_uart *cuart = talloc_zero(ctx, struct card_uart); - char id_buf[16] = "SIM0"; - char devname[] = "foobar"; + char id_buf[3+3+1]; + char devname[2+1]; + char *devnamep = 0; + char *drivername = "asf4"; int rc; LOGPCS(cs, LOGL_DEBUG, "%s\n", __func__); - /* HACK: make this in some way configurable so it works both in the firmware - * and on the host (functionfs) */ -// if (cs->slot_nr == 0) { -// cs->icc_present = true; -// devname = "/dev/ttyUSB5"; -// } - devname[0] = cs->slot_nr +0x30; - devname[1] = 0; - //sprintf(devname, "%d", cs->slot_nr); + snprintf(id_buf, sizeof(id_buf), "SIM%d", cs->slot_nr); +#ifdef OCTSIMFWBUILD + snprintf(devname, sizeof(devname), "%d", cs->slot_nr); + devnamep = devname; +#else + if (cs->slot_nr == 0) { + cs->icc_present = true; + devnamep = "/dev/ttyUSB5"; + } + drivername = "tty"; +#endif if (!cuart) return -ENOMEM; - //snprintf(id_buf, sizeof(id_buf), "SIM%d", cs->slot_nr); - id_buf[3] = cs->slot_nr +0x30; - if (devname) { - rc = card_uart_open(cuart, "asf4", devname); + if (devnamep) { + rc = card_uart_open(cuart, drivername, devnamep); if (rc < 0) { LOGPCS(cs, LOGL_ERROR, "Cannot open UART %s: %d\n", devname, rc); talloc_free(cuart); return rc; } } + ss->fi = iso7816_fsm_alloc(ctx, LOGL_DEBUG, id_buf, cuart, iso_fsm_clot_user_cb, ss); if (!ss->fi) { LOGPCS(cs, LOGL_ERROR, "Cannot allocate ISO FSM\n"); diff --git a/ccid_common/iso7816_3.c b/ccid_common/iso7816_3.c index f7262fb..9a3a7cb 100644 --- a/ccid_common/iso7816_3.c +++ b/ccid_common/iso7816_3.c @@ -18,7 +18,7 @@ #include #include -#include "utils.h" +#include #include "iso7816_3.h" const uint16_t iso7816_3_fi_table[16] = { diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c index c9eba8d..c76d97d 100644 --- a/ccid_common/iso7816_fsm.c +++ b/ccid_common/iso7816_fsm.c @@ -1193,7 +1193,7 @@ } } -#include + static void tpdu_s_tx_hdr_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct osmo_fsm_inst *parent_fi = fi->proc.parent; @@ -1213,7 +1213,9 @@ } - +#if 0 +#include +#endif static void tpdu_s_procedure_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct tpdu_fsm_priv *tfp = get_tpdu_fsm_priv(fi); diff --git a/ccid_host/Makefile b/ccid_host/Makefile index e9f34cc..7625177 100644 --- a/ccid_host/Makefile +++ b/ccid_host/Makefile @@ -11,6 +11,7 @@ ../ccid_common/ccid_proto.o \ ../ccid_common/ccid_device.o \ ../ccid_common/ccid_slot_fsm.o \ + ../ccid_common/iso7816_3.o \ ../ccid_common/iso7816_fsm.o $(CC) $(CFLAGS) -o $@ $^ $(LIBS) -laio @@ -28,6 +29,7 @@ cuart_driver_tty.o \ utils_ringbuffer.o \ ../ccid_common/iso7816_fsm.o \ + ../ccid_common/iso7816_3.o \ ../ccid_common/cuart.o $(CC) $(CFLAGS) -o $@ $^ $(LIBS) $(shell pkg-config --libs libosmosim) diff --git a/sysmoOCTSIM/gcc/Makefile b/sysmoOCTSIM/gcc/Makefile index 7a37036..6c0974f 100644 --- a/sysmoOCTSIM/gcc/Makefile +++ b/sysmoOCTSIM/gcc/Makefile @@ -9,7 +9,7 @@ CFLAGS_CPU=-D__SAME54N19A__ -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 CFLAGS=-x c -mthumb -DDEBUG -Os -ffunction-sections -fdata-sections -mlong-calls \ - -g3 -Wall -c -std=gnu99 $(CFLAGS_CPU) + -g3 -Wall -c -std=gnu99 $(CFLAGS_CPU) -DOCTSIMFWBUILD CC = $(CROSS_COMPILE)gcc LD = $(CROSS_COMPILE)ld -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ib07a58b6102b1709f295d08a764c6f118a2d0b9e Gerrit-Change-Number: 16319 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 09:48:33 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 2 Dec 2019 09:48:33 +0000 Subject: Change in osmo-bts[master]: common/abis.c: pass gsm_bts_trx to e1inp_sign_link_create() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16339 ) Change subject: common/abis.c: pass gsm_bts_trx to e1inp_sign_link_create() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8a6242d3e02f9bd19d287ecad18e001a5991175f Gerrit-Change-Number: 16339 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Dec 2019 09:48:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 09:51:47 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 2 Dec 2019 09:51:47 +0000 Subject: Change in osmo-bts[master]: common/abis.c: pass gsm_bts_trx to e1inp_sign_link_create() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16339 ) Change subject: common/abis.c: pass gsm_bts_trx to e1inp_sign_link_create() ...................................................................... common/abis.c: pass gsm_bts_trx to e1inp_sign_link_create() Change-Id: I8a6242d3e02f9bd19d287ecad18e001a5991175f --- M src/common/abis.c 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/common/abis.c b/src/common/abis.c index 24eb8a1..e18e8d9 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -108,12 +108,11 @@ e1inp_ts_config_sign(&line->ts[E1INP_SIGN_OML-1], line); sign_link = g_bts->oml_link = e1inp_sign_link_create(&line->ts[E1INP_SIGN_OML-1], - E1INP_SIGN_OML, NULL, 255, 0); + E1INP_SIGN_OML, g_bts->c0, 255, 0); if (clock_gettime(CLOCK_MONOTONIC, &g_bts->oml_conn_established_timestamp) != 0) memset(&g_bts->oml_conn_established_timestamp, 0, sizeof(g_bts->oml_conn_established_timestamp)); drain_oml_queue(g_bts); - sign_link->trx = g_bts->c0; bts_link_estab(g_bts); break; default: @@ -129,8 +128,7 @@ e1inp_ts_config_sign(&line->ts[type-1], line); sign_link = trx->rsl_link = e1inp_sign_link_create(&line->ts[type-1], - E1INP_SIGN_RSL, NULL, 0, 0); - sign_link->trx = trx; + E1INP_SIGN_RSL, trx, 0, 0); trx_link_estab(trx); break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8a6242d3e02f9bd19d287ecad18e001a5991175f Gerrit-Change-Number: 16339 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 10:00:49 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 2 Dec 2019 10:00:49 +0000 Subject: Change in libosmocore[master]: gsup: Introduce OSMO_GSUP_NUM_VECTORS_REQ_IE In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15321 ) Change subject: gsup: Introduce OSMO_GSUP_NUM_VECTORS_REQ_IE ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iaecc47280f8ce54f3e3a888c1cfc160735483d0f Gerrit-Change-Number: 15321 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Mon, 02 Dec 2019 10:00:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 10:03:36 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 10:03:36 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds.yml: fix osmo-fl2k In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16399 ) Change subject: jobs/master-builds.yml: fix osmo-fl2k ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I93db12d3652f26db059e0ede52d2b2fdd3e89d34 Gerrit-Change-Number: 16399 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 02 Dec 2019 10:03:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 10:04:21 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 2 Dec 2019 10:04:21 +0000 Subject: Change in osmo-hlr[master]: AUC: Add support for setting the AMF separation bit to '1' for EUTRAN In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15364 ) Change subject: AUC: Add support for setting the AMF separation bit to '1' for EUTRAN ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/15364/3/src/db_auc.c File src/db_auc.c: https://gerrit.osmocom.org/c/osmo-hlr/+/15364/3/src/db_auc.c at 215 PS3, Line 215: aud3g.u.umts.amf[0] = aud3g.u.umts.amf[0] & 0x7f; aud3g.u.umts.amf[0] &= 0x7f; -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ic766bc40f6126bb479bd0a05b0e96bec3e240008 Gerrit-Change-Number: 15364 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Dec 2019 10:04:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 10:11:17 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 2 Dec 2019 10:11:17 +0000 Subject: Change in libosmo-sccp[master]: xua_asp_fsm: Ensure xUA client includes traffic-mode if configured In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16389 ) Change subject: xua_asp_fsm: Ensure xUA client includes traffic-mode if configured ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/16389/1/src/xua_asp_fsm.c File src/xua_asp_fsm.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/16389/1/src/xua_asp_fsm.c at 146 PS1, Line 146: * a single traffic mode is returned. If they're incompatible, -EINVAL Worth mentioning enum osmo_ss7_as_traffic_mode here. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia850df22df529dab74959e8666f85976002c482c Gerrit-Change-Number: 16389 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Dec 2019 10:11:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 10:14:30 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 2 Dec 2019 10:14:30 +0000 Subject: Change in libosmo-sccp[master]: xua_asp_fsm: Ensure xUA client includes routing contexts in ASPAC/ASPIA In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16390 ) Change subject: xua_asp_fsm: Ensure xUA client includes routing contexts in ASPAC/ASPIA ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iee4f0d553d6845a9ae08cb5e4f57fdec443e4ef9 Gerrit-Change-Number: 16390 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Dec 2019 10:14:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 10:17:12 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 2 Dec 2019 10:17:12 +0000 Subject: Change in libosmo-sccp[master]: Add "no traffic-mode" configuration to AS In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16394 ) Change subject: Add "no traffic-mode" configuration to AS ...................................................................... Patch Set 1: (1 comment) You need to update the VTY tests: Expect: ' recovery-timeout <1-2000>' Got: ' no traffic-mode' https://gerrit.osmocom.org/c/libosmo-sccp/+/16394/1/src/osmo_ss7_vty.c File src/osmo_ss7_vty.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/16394/1/src/osmo_ss7_vty.c at 874 PS1, Line 874: as->cfg.mode = 0; = OSMO_SS7_AS_TMOD_OVERRIDE; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ibe2b298dd76dc4b02521dc411ae9d570eaf5a9a2 Gerrit-Change-Number: 16394 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 02 Dec 2019 10:17:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 10:19:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 10:19:35 +0000 Subject: Change in libosmo-sccp[master]: xua_asp_fsm: Ensure xUA client includes traffic-mode if configured In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16389 to look at the new patch set (#2). Change subject: xua_asp_fsm: Ensure xUA client includes traffic-mode if configured ...................................................................... xua_asp_fsm: Ensure xUA client includes traffic-mode if configured When a client (ASP) sends an ASPAC to the server (SG), it should include the traffic-mode configured for it's ASs, if any. Change-Id: Ia850df22df529dab74959e8666f85976002c482c Related: OS#4285 --- M src/xua_asp_fsm.c 1 file changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/89/16389/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia850df22df529dab74959e8666f85976002c482c Gerrit-Change-Number: 16389 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 10:19:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 10:19:39 +0000 Subject: Change in libosmo-sccp[master]: xua_asp_fsm: Ensure xUA client includes traffic-mode if configured In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16389 ) Change subject: xua_asp_fsm: Ensure xUA client includes traffic-mode if configured ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia850df22df529dab74959e8666f85976002c482c Gerrit-Change-Number: 16389 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Dec 2019 10:19:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 10:21:45 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 2 Dec 2019 10:21:45 +0000 Subject: Change in osmo-bts[master]: common/abis.c: use tall_bts_ctx as talloc-context for libosmo_abis_in... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16397 ) Change subject: common/abis.c: use tall_bts_ctx as talloc-context for libosmo_abis_init() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic8d9fc7ce3da8abf0ea73d2b20366133cd801c37 Gerrit-Change-Number: 16397 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Dec 2019 10:21:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 10:24:13 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 2 Dec 2019 10:24:13 +0000 Subject: Change in libosmo-sccp[master]: xua_asp_fsm: Ensure xUA client includes traffic-mode if configured In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16389 ) Change subject: xua_asp_fsm: Ensure xUA client includes traffic-mode if configured ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia850df22df529dab74959e8666f85976002c482c Gerrit-Change-Number: 16389 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Dec 2019 10:24:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 11:14:26 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 2 Dec 2019 11:14:26 +0000 Subject: Change in osmo-pcu[master]: Remove dash from name used in VTY cmd prompt In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16326 ) Change subject: Remove dash from name used in VTY cmd prompt ...................................................................... Remove dash from name used in VTY cmd prompt Others projects don't contain a dash in there, and it seems to cause problems with TTCN3 VTY expectations. Change-Id: I3430abb5fc622dec293457466e760de95fa3a05c --- M osmoappdesc.py M src/pcu_vty.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/osmoappdesc.py b/osmoappdesc.py index b3938f5..3bd418e 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -18,7 +18,7 @@ "osmo-pcu": ["doc/examples/osmo-pcu.cfg"] } -apps = [(4240, "src/osmo-pcu", "Osmo-PCU", "osmo-pcu"), +apps = [(4240, "src/osmo-pcu", "OsmoPCU", "osmo-pcu"), ] vty_command = ["src/osmo-pcu", "-c", "doc/examples/osmo-pcu.cfg"] diff --git a/src/pcu_vty.c b/src/pcu_vty.c index afc8a9b..26d0b18 100644 --- a/src/pcu_vty.c +++ b/src/pcu_vty.c @@ -1215,7 +1215,7 @@ "There is NO WARRANTY, to the extent permitted by law.\r\n"; struct vty_app_info pcu_vty_info = { - .name = "Osmo-PCU", + .name = "OsmoPCU", .version = PACKAGE_VERSION, .copyright = pcu_copyright, .go_parent_cb = pcu_vty_go_parent, -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3430abb5fc622dec293457466e760de95fa3a05c Gerrit-Change-Number: 16326 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 11:14:50 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 2 Dec 2019 11:14:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Add VTY support and use it to set (M)CS lqual thresholds In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16327 ) Change subject: pcu: Add VTY support and use it to set (M)CS lqual thresholds ...................................................................... pcu: Add VTY support and use it to set (M)CS lqual thresholds Requires osmo-pcu.git I3430abb5fc622dec293457466e760de95fa3a05c, before that commit OsmoPCU cmd prompt contained a dash which resulted in TTCN3 being unable to match it. Change-Id: I221675721b65b3ab44179e9657da70ba4004d7de --- M pcu/PCU_Tests.default M pcu/PCU_Tests_RAW.ttcn M pcu/gen_links.sh M pcu/regen_makefile.sh 4 files changed, 91 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved neels: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/pcu/PCU_Tests.default b/pcu/PCU_Tests.default index 2a87345..537744f 100644 --- a/pcu/PCU_Tests.default +++ b/pcu/PCU_Tests.default @@ -21,10 +21,20 @@ }, sgsn_role := true } +Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU"; [TESTPORT_PARAMETERS] *.*.udpReuseAddress := "yes"; *.PCU.socket_type := "SEQPACKET" +*.PCUVTY.CTRL_MODE := "client" +*.PCUVTY.CTRL_HOSTNAME := "127.0.0.1" +*.PCUVTY.CTRL_PORTNUM := "4240" +*.PCUVTY.CTRL_LOGIN_SKIPPED := "yes" +*.PCUVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" +*.PCUVTY.CTRL_READMODE := "buffered" +*.PCUVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" +*.PCUVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" +*.PCUVTY.PROMPT1 := "OsmoPCU> " [MAIN_CONTROLLER] diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index 6129831..5bb5fa7 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -21,6 +21,9 @@ import from GSM_Types all; import from GSM_RR_Types all; +import from Osmocom_VTY_Functions all; +import from TELNETasp_PortType all; + import from RLCMAC_CSN1_Types all; import from RLCMAC_Types all; @@ -456,11 +459,42 @@ setverdict(pass); } +type record lqual_range { + /* component reference to the IPA_Client component used for RSL */ + uint8_t low, + uint8_t high +} + type component RAW_PCU_Test_CT extends bssgp_CT { /* Connection to the BTS component (one for now) */ port RAW_PCU_MSG_PT BTS; /* Connection to the PCUIF component */ port RAW_PCU_MSG_PT PCUIF; + /* VTY connection to the PCU */ + port TELNETasp_PT PCUVTY; + + /* Uplink CS/MCS thresholds, default from pcu_main.c: */ + var lqual_range g_cs_lqual_ranges[4] := {{low := 0, high := 6}, + {low := 5, high := 8}, + {low := 7, high := 13}, + {low := 12,high := 35}}; + var lqual_range g_mcs_lqual_ranges[9] := {{low := 0, high := 6}, + {low := 5, high := 8}, + {low := 7, high := 13}, + {low := 12,high := 15}, + {low := 14, high := 17}, + {low := 16, high := 18}, + {low := 17,high := 20}, + {low := 19, high := 24}, + {low := 23,high := 35}}; + var uint8_t g_cs_initial_dl := 1; + var uint8_t g_cs_initial_ul := 1; + var uint8_t g_mcs_initial_dl := 1; + var uint8_t g_mcs_initial_ul := 1; + var uint8_t g_cs_max_dl := 4; + var uint8_t g_cs_max_ul := 4; + var uint8_t g_mcs_max_dl := 9; + var uint8_t g_mcs_max_ul := 9; /* Guard timeout */ timer g_T_guard := 60.0; @@ -473,6 +507,43 @@ } } +private function f_pcuvty_set_allowed_cs_mcs() runs on RAW_PCU_Test_CT { + f_vty_config2(PCUVTY, {"pcu"}, "cs " & int2str(g_cs_initial_dl) & " " & int2str(g_cs_initial_ul)); + f_vty_config2(PCUVTY, {"pcu"}, "cs max " & int2str(g_cs_max_dl) & " " & int2str(g_cs_max_ul)); + + f_vty_config2(PCUVTY, {"pcu"}, "mcs " & int2str(g_mcs_initial_dl) & " " & int2str(g_mcs_initial_ul)); + f_vty_config2(PCUVTY, {"pcu"}, "mcs max " & int2str(g_mcs_max_dl) & " " & int2str(g_mcs_max_ul)); +} + +private function f_pcuvty_set_link_quality_ranges() runs on RAW_PCU_Test_CT { + var charstring cmd; + + cmd := "cs link-quality-ranges" & + " cs1 " & int2str(g_cs_lqual_ranges[0].high) & + " cs2 " & int2str(g_cs_lqual_ranges[1].low) & " " & int2str(g_cs_lqual_ranges[1].high) & + " cs3 " & int2str(g_cs_lqual_ranges[2].low) & " " & int2str(g_cs_lqual_ranges[2].high) & + " cs4 " & int2str(g_cs_lqual_ranges[3].low); + f_vty_config2(PCUVTY, {"pcu"}, cmd); + + cmd := "mcs link-quality-ranges" & + " mcs1 " & int2str(g_mcs_lqual_ranges[0].high) & + " mcs2 " & int2str(g_mcs_lqual_ranges[1].low) & " " & int2str(g_mcs_lqual_ranges[1].high) & + " mcs3 " & int2str(g_mcs_lqual_ranges[2].low) & " " & int2str(g_mcs_lqual_ranges[2].high) & + " mcs4 " & int2str(g_mcs_lqual_ranges[3].low) & " " & int2str(g_mcs_lqual_ranges[3].high) & + " mcs5 " & int2str(g_mcs_lqual_ranges[4].low) & " " & int2str(g_mcs_lqual_ranges[4].high) & + " mcs6 " & int2str(g_mcs_lqual_ranges[5].low) & " " & int2str(g_mcs_lqual_ranges[5].high) & + " mcs7 " & int2str(g_mcs_lqual_ranges[6].low) & " " & int2str(g_mcs_lqual_ranges[6].high) & + " mcs8 " & int2str(g_mcs_lqual_ranges[7].low) & " " & int2str(g_mcs_lqual_ranges[7].high) & + " mcs9 " & int2str(g_mcs_lqual_ranges[8].low); + f_vty_config2(PCUVTY, {"pcu"}, cmd); +} + +private function f_init_vty(charstring id) runs on RAW_PCU_Test_CT { + map(self:PCUVTY, system:PCUVTY); + f_vty_set_prompts(PCUVTY); + f_vty_transceive(PCUVTY, "enable"); +} + private function f_init_raw(charstring id, template (value) PCUIF_info_ind info_ind := ts_PCUIF_INFO_default) runs on RAW_PCU_Test_CT { var RAW_PCUIF_CT vc_PCUIF; @@ -492,6 +563,8 @@ connect(vc_BTS:PCUIF, vc_PCUIF:BTS); connect(vc_BTS:TC, self:BTS); + f_init_vty(id); + vc_PCUIF.start(f_PCUIF_CT_handler(mp_pcu_sock_path)); vc_BTS.start(f_BTS_CT_handler(0, valueof(info_ind))); @@ -967,6 +1040,9 @@ /* Initialize the PCU interface abstraction */ f_init_raw(testcasename()); + f_pcuvty_set_allowed_cs_mcs(); + f_pcuvty_set_link_quality_ranges(); + /* Establish an Uplink TBF */ ok := f_establish_tbf(rr_imm_ass); if (not ok) { diff --git a/pcu/gen_links.sh b/pcu/gen_links.sh index f9f6dd5..9ad318c 100755 --- a/pcu/gen_links.sh +++ b/pcu/gen_links.sh @@ -44,9 +44,12 @@ FILES="SNDCP_Types.ttcn" gen_links $DIR $FILES +DIR=$BASEDIR/titan.TestPorts.TELNETasp/src +FILES="TELNETasp_PT.cc TELNETasp_PT.hh TELNETasp_PortType.ttcn" +gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc L1CTL_Types.ttcn L1CTL_PortType.ttcn L1CTL_PortType_CtrlFunct.ttcn L1CTL_PortType_CtrlFunctDef.cc LAPDm_RAW_PT.ttcn LAPDm_Types.ttcn " +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc L1CTL_Types.ttcn L1CTL_PortType.ttcn L1CTL_PortType_CtrlFunct.ttcn L1CTL_PortType_CtrlFunctDef.cc LAPDm_RAW_PT.ttcn LAPDm_Types.ttcn " FILES+="NS_Emulation.ttcn NS_CodecPort.ttcn NS_CodecPort_CtrlFunct.ttcn NS_CodecPort_CtrlFunctDef.cc " FILES+="BSSGP_Emulation.ttcn Osmocom_Gb_Types.ttcn " FILES+="LLC_Templates.ttcn L3_Templates.ttcn L3_Common.ttcn " diff --git a/pcu/regen_makefile.sh b/pcu/regen_makefile.sh index ff712dc..c2f636d 100755 --- a/pcu/regen_makefile.sh +++ b/pcu/regen_makefile.sh @@ -1,5 +1,5 @@ #!/bin/sh -FILES="*.ttcn BSSGP_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc NS_CodecPort_CtrlFunctDef.cc UD_PT.cc RLCMAC_EncDec.cc LLC_EncDec.cc L1CTL_PortType_CtrlFunctDef.cc Native_FunctionDefs.cc" +FILES="*.ttcn BSSGP_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc NS_CodecPort_CtrlFunctDef.cc UD_PT.cc RLCMAC_EncDec.cc LLC_EncDec.cc L1CTL_PortType_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc" ../regen-makefile.sh PCU_Tests.ttcn $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I221675721b65b3ab44179e9657da70ba4004d7de Gerrit-Change-Number: 16327 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 11:14:50 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 2 Dec 2019 11:14:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce tests to check UL CS initial and max In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16337 ) Change subject: pcu: Introduce tests to check UL CS initial and max ...................................................................... pcu: Introduce tests to check UL CS initial and max Related: OS#4286 Change-Id: I3aa654e6f678698e5b8cb4914f1ca5b39fc08568 --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 151 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index 5bb5fa7..24187b7 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -1058,7 +1058,7 @@ var template (value) RlcmacUlBlock ul_data := t_RLCMAC_UL_DATA( tfi := ul_tbf_ass.dynamic.tfi_assignment, - cv := 15, /* 15 UL blocks to be sent (to be overridden in loop) */ + cv := 15, /* 16 UL blocks to be sent (to be overridden in loop) */ bsn := 0, /* TODO: what should be here? */ blocks := { /* To be generated in loop */ }); @@ -1111,6 +1111,154 @@ } } +/* Test the max UL CS set by VTY works fine */ +testcase TC_cs_initial_ul() runs on RAW_PCU_Test_CT { + var GsmRrMessage rr_imm_ass; + var PacketUlAssign ul_tbf_ass; + var RlcmacDlBlock dl_block; + var boolean ok; + var integer lqual_cb; + var ChCodingCommand last_ch_coding; + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename()); + + /* Set initial UL CS to 3 */ + g_cs_initial_ul := 3; + f_pcuvty_set_allowed_cs_mcs(); + f_pcuvty_set_link_quality_ranges(); + + /* Take lqual (dB->cB) so that we stay in that CS */ + lqual_cb := g_cs_lqual_ranges[2].low * 10; + + /* Establish an Uplink TBF */ + ok := f_establish_tbf(rr_imm_ass); + if (not ok) { + setverdict(fail, "Failed to establish TBF"); + mtc.stop; + } + + ok := f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass); + if (not ok) { + setverdict(fail, "Immediate Assignment not an Uplink TBF"); + mtc.stop; + } + + var template (value) RlcmacUlBlock ul_data := t_RLCMAC_UL_DATA( + tfi := ul_tbf_ass.dynamic.tfi_assignment, + cv := 3, /* 8 UL blocks to be sent (to be overridden in loop) */ + bsn := 0, /* TODO: what should be here? */ + blocks := { /* To be generated in loop */ }); + + /* HACK: patch missing TLLI; otherwise OsmoPCU rejects DATA.req */ + ul_data.data.tlli := '00000001'O; + + /* 3 UL blocks, check we are in same initial CS: */ + for (var integer i := 0; i < 3; i := i + 1) { + /* Prepare a new UL block (CV, random payload) */ + ul_data.data.mac_hdr.countdown := (7 - i); + ul_data.data.blocks := { valueof(t_RLCMAC_LLCBLOCK(f_rnd_octstring(10))) }; + + /* Enqueue DATA.ind (both TDMA frame and block numbers to be patched) */ + f_tx_rlcmac_ul_block(ul_data, lqual_cb); + + /* Enqueue RTS.req, expect DATA.req with UL ACK from the PCU */ + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block); + last_ch_coding := dl_block.ctrl.payload.u.ul_ack_nack.gprs.ch_coding_cmd; + } + + if (last_ch_coding != CH_CODING_CS3) { + setverdict(fail, "Channel Coding does not match our expectations (CS-3): ", last_ch_coding); + mtc.stop; + } + + setverdict(pass); + + /* Remaining UL blocks are used to make sure regardless of initial + /* lqual, we can go lower at any time */ + + /* 5 UL blocks, check we are in same initial CS: */ + for (var integer i := 3; i < 8; i := i + 1) { + /* Prepare a new UL block (CV, random payload) */ + ul_data.data.mac_hdr.countdown := (7 - i); + ul_data.data.blocks := { valueof(t_RLCMAC_LLCBLOCK(f_rnd_octstring(10))) }; + + /* Enqueue DATA.ind (both TDMA frame and block numbers to be patched) */ + f_tx_rlcmac_ul_block(ul_data, 0); /* 0 dB, make sure we downgrade CS */ + + /* Enqueue RTS.req, expect DATA.req with UL ACK from the PCU */ + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block); + + last_ch_coding := dl_block.ctrl.payload.u.ul_ack_nack.gprs.ch_coding_cmd; + } + + if (last_ch_coding != CH_CODING_CS1) { + setverdict(fail, "Channel Coding does not match our expectations (CS-1): ", last_ch_coding); + } else { + setverdict(pass); + } +} + +/* Test the max UL CS set by VTY works fine */ +testcase TC_cs_max_ul() runs on RAW_PCU_Test_CT { + var GsmRrMessage rr_imm_ass; + var PacketUlAssign ul_tbf_ass; + var RlcmacDlBlock dl_block; + var boolean ok; + var ChCodingCommand last_ch_coding; + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename()); + + /* Set maximum allowed UL CS to 3 */ + g_cs_max_ul := 3; + f_pcuvty_set_allowed_cs_mcs(); + f_pcuvty_set_link_quality_ranges(); + + /* Establish an Uplink TBF */ + ok := f_establish_tbf(rr_imm_ass); + if (not ok) { + setverdict(fail, "Failed to establish TBF"); + mtc.stop; + } + + ok := f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass); + if (not ok) { + setverdict(fail, "Immediate Assignment not an Uplink TBF"); + mtc.stop; + } + + var template (value) RlcmacUlBlock ul_data := t_RLCMAC_UL_DATA( + tfi := ul_tbf_ass.dynamic.tfi_assignment, + cv := 15, /* 16 UL blocks to be sent (to be overridden in loop) */ + bsn := 0, /* TODO: what should be here? */ + blocks := { /* To be generated in loop */ }); + + /* HACK: patch missing TLLI; otherwise OsmoPCU rejects DATA.req */ + ul_data.data.tlli := '00000001'O; + + /* 16 UL blocks */ + for (var integer i := 0; i < 16; i := i + 1) { + /* Prepare a new UL block (CV, random payload) */ + ul_data.data.mac_hdr.countdown := (15 - i); + ul_data.data.blocks := { valueof(t_RLCMAC_LLCBLOCK(f_rnd_octstring(10))) }; + + /* Enqueue DATA.ind (both TDMA frame and block numbers to be patched) */ + f_tx_rlcmac_ul_block(ul_data, 40*10); /* 40 dB */ + + /* Enqueue RTS.req, expect DATA.req with UL ACK from the PCU */ + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block); + + last_ch_coding := dl_block.ctrl.payload.u.ul_ack_nack.gprs.ch_coding_cmd; + } + + if (last_ch_coding != CH_CODING_CS3) { + setverdict(fail, "Channel Coding does not match our expectations (CS-3): ", last_ch_coding); + } else { + setverdict(pass); + } +} + /* Verify PCU drops TBF after some time of inactivity. */ testcase TC_t3169() runs on RAW_PCU_Test_CT { var PCUIF_info_ind info_ind; @@ -1233,6 +1381,8 @@ execute( TC_ta_rach_imm_ass() ); execute( TC_ta_ptcch_ul_multi_tbf() ); execute( TC_cs_lqual_ul_tbf() ); + execute( TC_cs_initial_ul() ); + execute( TC_cs_max_ul() ); execute( TC_t3169() ); execute( TC_mo_ping_pong() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3aa654e6f678698e5b8cb4914f1ca5b39fc08568 Gerrit-Change-Number: 16337 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 11:15:11 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 2 Dec 2019 11:15:11 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: Enable ip forwarding and masquerading on boot In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16226 ) Change subject: ansible: gsm-tester: Enable ip forwarding and masquerading on boot ...................................................................... Patch Set 3: Code-Review+2 +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2c89cf9cfcb55b3153e7be212c68ffa8db0f6927 Gerrit-Change-Number: 16226 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Dec 2019 11:15:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 11:15:14 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 2 Dec 2019 11:15:14 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: Enable ip forwarding and masquerading on boot In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16226 ) Change subject: ansible: gsm-tester: Enable ip forwarding and masquerading on boot ...................................................................... ansible: gsm-tester: Enable ip forwarding and masquerading on boot Some nodes in the internal network, such as LimeNetMicro, will need Internet access to upgrade osmo-trx-lms from OBS repos. It also makes it easier to update manually other nodes inside the internal network. Change-Id: I2c89cf9cfcb55b3153e7be212c68ffa8db0f6927 --- M ansible/roles/gsm-tester-network/README.md M ansible/roles/gsm-tester-network/defaults/main.yml A ansible/roles/gsm-tester-network/files/ogt-sysctl.conf M ansible/roles/gsm-tester-network/tasks/main.yml A ansible/roles/gsm-tester-network/templates/etc/iptables-ogt 5 files changed, 34 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve neels: Looks good to me, but someone else must approve pespin: Looks good to me, approved; Verified diff --git a/ansible/roles/gsm-tester-network/README.md b/ansible/roles/gsm-tester-network/README.md index e324929..689a127 100644 --- a/ansible/roles/gsm-tester-network/README.md +++ b/ansible/roles/gsm-tester-network/README.md @@ -4,4 +4,5 @@ # variables -- `bts_interface` (eth1): on which network interface the bts is configured. +- `bts_interface` (enp2s0): on which network interface the bts is configured. +- `gw_interface` (enp1s0): on which network interface the traffic is routed towards default gateway. diff --git a/ansible/roles/gsm-tester-network/defaults/main.yml b/ansible/roles/gsm-tester-network/defaults/main.yml index 3e506da..5bfdf63 100644 --- a/ansible/roles/gsm-tester-network/defaults/main.yml +++ b/ansible/roles/gsm-tester-network/defaults/main.yml @@ -1,3 +1,4 @@ --- -bts_interface: eth1 +bts_interface: enp2s0 +gw_interface: enp1s0 diff --git a/ansible/roles/gsm-tester-network/files/ogt-sysctl.conf b/ansible/roles/gsm-tester-network/files/ogt-sysctl.conf new file mode 100644 index 0000000..119d730 --- /dev/null +++ b/ansible/roles/gsm-tester-network/files/ogt-sysctl.conf @@ -0,0 +1 @@ +net.ipv4.ip_forward=1 diff --git a/ansible/roles/gsm-tester-network/tasks/main.yml b/ansible/roles/gsm-tester-network/tasks/main.yml index 210bf1e..b77fc0e 100644 --- a/ansible/roles/gsm-tester-network/tasks/main.yml +++ b/ansible/roles/gsm-tester-network/tasks/main.yml @@ -9,3 +9,15 @@ - name: start all network interface command: ifup -a when: gsm_tester_network_interface is changed + +- name: allow ip forwarding and masquerading traffic from internal network (iptables) + template: + src: etc/iptables-ogt + dest: /etc/network/if-up.d/iptables-ogt + mode: 0755 + +- name: allow ip forwarding from internal network (sysctl) + copy: + src: ogt-sysctl.conf + dest: /etc/sysctl.d + notify: restart udev diff --git a/ansible/roles/gsm-tester-network/templates/etc/iptables-ogt b/ansible/roles/gsm-tester-network/templates/etc/iptables-ogt new file mode 100644 index 0000000..5a781c5 --- /dev/null +++ b/ansible/roles/gsm-tester-network/templates/etc/iptables-ogt @@ -0,0 +1,17 @@ +#!/bin/sh + +IPT="/sbin/iptables" + +if [ "$IFACE" = "{{ gw_interface }}" ]; then + # Apply masquerading if not yet applied: + if [ "x$($IPT -t nat -S | grep "\-A POSTROUTING -o {{ gw_interface }} -j MASQUERADE" -c)" = "x0" ]; then + $IPT -t nat -A POSTROUTING -o {{ gw_interface }} -j MASQUERADE + fi + + # Allow IP forwarding if not yet enabled: + if [ "x$($IPT -t filter -S | grep "\-A FORWARD -j ACCEPT" -c)" = "x0" ]; then + $IPT -t filter -A FORWARD -j ACCEPT + fi + + echo "osmo-gsm-tester iptables rules loaded." +fi -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2c89cf9cfcb55b3153e7be212c68ffa8db0f6927 Gerrit-Change-Number: 16226 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 12:03:34 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 12:03:34 +0000 Subject: Change in libosmo-sccp[master]: xua_asp_fsm: Ensure xUA client includes traffic-mode if configured In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16389 ) Change subject: xua_asp_fsm: Ensure xUA client includes traffic-mode if configured ...................................................................... xua_asp_fsm: Ensure xUA client includes traffic-mode if configured When a client (ASP) sends an ASPAC to the server (SG), it should include the traffic-mode configured for it's ASs, if any. Change-Id: Ia850df22df529dab74959e8666f85976002c482c Related: OS#4285 --- M src/xua_asp_fsm.c 1 file changed, 31 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index e09c46c..ff81edd 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -141,6 +141,33 @@ xua_asp_send_xlm_prim_simple(asp, prim_type, op); } +/* determine the osmo_ss7_as_traffic_mode to be used by this ASP; will + * iterate over all AS configured for this ASP. If they're compatible, + * a single traffic mode is returned as enum osmo_ss7_as_traffic_mode. + * If they're incompatible, -EINVAL is returned. If there is none + * configured, -1 is returned */ +static int determine_traf_mode(struct osmo_ss7_asp *asp) +{ + struct osmo_ss7_as *as; + int tmode = -1; + + llist_for_each_entry(as, &asp->inst->as_list, list) { + if (!osmo_ss7_as_has_asp(as, asp)) + continue; + /* we only care about traffic modes explicitly set */ + if (!as->cfg.mode_set_by_vty) + continue; + if (tmode == -1) { + /* this is the first AS; we use this traffic mode */ + tmode = as->cfg.mode; + } else { + if (tmode != as->cfg.mode) + return -EINVAL; + } + } + return tmode; +} + /* ask the xUA implementation to transmit a specific message */ static int peer_send(struct osmo_fsm_inst *fi, int out_event, struct xua_msg *in) { @@ -148,6 +175,7 @@ struct osmo_ss7_asp *asp = xafp->asp; struct xua_msg *xua = xua_msg_alloc(); struct msgb *msg; + int rc; switch (out_event) { case XUA_ASP_E_ASPSM_ASPUP: @@ -188,6 +216,9 @@ /* RFC3868 Ch. 3.6.1 */ xua->hdr = XUA_HDR(SUA_MSGC_ASPTM, SUA_ASPTM_ACTIVE); /* Optional: Traffic Mode Type */ + rc = determine_traf_mode(asp); + if (rc >= 0) + xua_msg_add_u32(xua, M3UA_IEI_TRAF_MODE_TYP, osmo_ss7_tmode_to_xua(rc)); /* Optional: Routing Context */ /* Optional: TID Label */ /* Optional: DRN Label */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia850df22df529dab74959e8666f85976002c482c Gerrit-Change-Number: 16389 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 12:07:24 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 2 Dec 2019 12:07:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Handle PCUIF (DE)ACT.req messages References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16400 ) Change subject: pcu: Handle PCUIF (DE)ACT.req messages ...................................................................... pcu: Handle PCUIF (DE)ACT.req messages Change-Id: I4440a6b24fb76b4f8096706769250b91bd2444bb --- M pcu/PCUIF_RAW_Components.ttcn 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/00/16400/1 diff --git a/pcu/PCUIF_RAW_Components.ttcn b/pcu/PCUIF_RAW_Components.ttcn index ab8b3b7..6d29404 100644 --- a/pcu/PCUIF_RAW_Components.ttcn +++ b/pcu/PCUIF_RAW_Components.ttcn @@ -339,7 +339,6 @@ /* Wait until the PCU is connected */ PCUIF.receive(tr_RAW_PCU_EV(PCU_EV_CONNECT)); - /* TODO: implement ACT.req handling */ alt { /* Wait for TXT.ind (PCU_VERSION) and respond with INFO.ind (SI13) */ [] PCUIF.receive(tr_PCUIF_TXT_IND(bts_nr, PCU_VERSION, ?)) -> value pcu_msg { @@ -360,6 +359,18 @@ vc_CLCK_GEN.start(f_ClckGen_CT_handler()); repeat; } + /* PCU -> TS becomes active */ + [] PCUIF.receive(tr_PCUIF_ACT_REQ(bts_nr, ?, ?)) -> value pcu_msg { + log("Rx ACT.req from the PCU: TRX" & int2str(pcu_msg.u.act_req.trx_nr) & + "/TS" & int2str(pcu_msg.u.act_req.ts_nr)); + repeat; + } + /* PCU -> TS becomes inactive */ + [] PCUIF.receive(tr_PCUIF_DEACT_REQ(bts_nr, ?, ?)) -> value pcu_msg { + log("Rx DEACT.req from the PCU: TRX" & int2str(pcu_msg.u.act_req.trx_nr) & + "/TS" & int2str(pcu_msg.u.act_req.ts_nr)); + repeat; + } /* PCU -> test case forwarding (filter by the BTS number) */ [] PCUIF.receive(tr_PCUIF_MSG(?, bts_nr)) -> value pcu_msg { TC.send(pcu_msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4440a6b24fb76b4f8096706769250b91bd2444bb Gerrit-Change-Number: 16400 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 12:44:26 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 2 Dec 2019 12:44:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Handle PCUIF (DE)ACT.req messages In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16400 ) Change subject: pcu: Handle PCUIF (DE)ACT.req messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4440a6b24fb76b4f8096706769250b91bd2444bb Gerrit-Change-Number: 16400 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Dec 2019 12:44:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 12:45:36 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 2 Dec 2019 12:45:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Handle PCUIF (DE)ACT.req messages In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16400 ) Change subject: pcu: Handle PCUIF (DE)ACT.req messages ...................................................................... pcu: Handle PCUIF (DE)ACT.req messages Change-Id: I4440a6b24fb76b4f8096706769250b91bd2444bb --- M pcu/PCUIF_RAW_Components.ttcn 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pcu/PCUIF_RAW_Components.ttcn b/pcu/PCUIF_RAW_Components.ttcn index ab8b3b7..6d29404 100644 --- a/pcu/PCUIF_RAW_Components.ttcn +++ b/pcu/PCUIF_RAW_Components.ttcn @@ -339,7 +339,6 @@ /* Wait until the PCU is connected */ PCUIF.receive(tr_RAW_PCU_EV(PCU_EV_CONNECT)); - /* TODO: implement ACT.req handling */ alt { /* Wait for TXT.ind (PCU_VERSION) and respond with INFO.ind (SI13) */ [] PCUIF.receive(tr_PCUIF_TXT_IND(bts_nr, PCU_VERSION, ?)) -> value pcu_msg { @@ -360,6 +359,18 @@ vc_CLCK_GEN.start(f_ClckGen_CT_handler()); repeat; } + /* PCU -> TS becomes active */ + [] PCUIF.receive(tr_PCUIF_ACT_REQ(bts_nr, ?, ?)) -> value pcu_msg { + log("Rx ACT.req from the PCU: TRX" & int2str(pcu_msg.u.act_req.trx_nr) & + "/TS" & int2str(pcu_msg.u.act_req.ts_nr)); + repeat; + } + /* PCU -> TS becomes inactive */ + [] PCUIF.receive(tr_PCUIF_DEACT_REQ(bts_nr, ?, ?)) -> value pcu_msg { + log("Rx DEACT.req from the PCU: TRX" & int2str(pcu_msg.u.act_req.trx_nr) & + "/TS" & int2str(pcu_msg.u.act_req.ts_nr)); + repeat; + } /* PCU -> test case forwarding (filter by the BTS number) */ [] PCUIF.receive(tr_PCUIF_MSG(?, bts_nr)) -> value pcu_msg { TC.send(pcu_msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4440a6b24fb76b4f8096706769250b91bd2444bb Gerrit-Change-Number: 16400 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 13:21:25 2019 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 2 Dec 2019 13:21:25 +0000 Subject: Change in osmo-ccid-firmware[master]: rename the global talloc context References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16401 ) Change subject: rename the global talloc context ...................................................................... rename the global talloc context both the host and the firmware build require a global talloc context with external linkage, so let's agree on one name. Change-Id: Idced24869863983bfde0c9c438498999717f2042 --- M ccid_host/ccid_main_functionfs.c M ccid_host/cuart_fsm_test.c M ccid_host/hub_main_functionfs.c 3 files changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/01/16401/1 diff --git a/ccid_host/ccid_main_functionfs.c b/ccid_host/ccid_main_functionfs.c index 8e95c73..d3e0c3c 100644 --- a/ccid_host/ccid_main_functionfs.c +++ b/ccid_host/ccid_main_functionfs.c @@ -506,13 +506,13 @@ .send_int = ccid_ops_send_int, }; -static void *tall_main_ctx; +void *g_tall_ctx; static void signal_handler(int signal) { switch (signal) { case SIGUSR1: - talloc_report_full(tall_main_ctx, stderr); + talloc_report_full(g_tall_ctx, stderr); break; } } @@ -523,9 +523,9 @@ struct ufunc_handle ufh = (struct ufunc_handle) { 0, }; int rc; - tall_main_ctx = talloc_named_const(NULL, 0, "ccid_main_functionfs"); - msgb_talloc_ctx_init(tall_main_ctx, 0); - osmo_init_logging2(tall_main_ctx, &log_info); + g_tall_ctx = talloc_named_const(NULL, 0, "ccid_main_functionfs"); + msgb_talloc_ctx_init(g_tall_ctx, 0); + osmo_init_logging2(g_tall_ctx, &log_info); signal(SIGUSR1, &signal_handler); diff --git a/ccid_host/cuart_fsm_test.c b/ccid_host/cuart_fsm_test.c index 1151b34..5b03bfe 100644 --- a/ccid_host/cuart_fsm_test.c +++ b/ccid_host/cuart_fsm_test.c @@ -37,13 +37,13 @@ } } -static void *tall_main_ctx; +static void *g_tall_ctx; static void signal_handler(int signal) { switch (signal) { case SIGUSR1: - talloc_report_full(tall_main_ctx, stderr); + talloc_report_full(g_tall_ctx, stderr); break; } } @@ -54,9 +54,9 @@ uint8_t atr[64]; int rc; - tall_main_ctx = talloc_named_const(NULL, 0, "main"); - msgb_talloc_ctx_init(tall_main_ctx, 0); - osmo_init_logging2(tall_main_ctx, &log_info); + g_tall_ctx = talloc_named_const(NULL, 0, "main"); + msgb_talloc_ctx_init(g_tall_ctx, 0); + osmo_init_logging2(g_tall_ctx, &log_info); osmo_fsm_log_addr(false); signal(SIGUSR1, &signal_handler); diff --git a/ccid_host/hub_main_functionfs.c b/ccid_host/hub_main_functionfs.c index c019cde..f350e50 100644 --- a/ccid_host/hub_main_functionfs.c +++ b/ccid_host/hub_main_functionfs.c @@ -464,13 +464,13 @@ .num_cat = ARRAY_SIZE(log_info_cat), }; -static void *tall_main_ctx; +static void *g_tall_ctx; static void signal_handler(int signal) { switch (signal) { case SIGUSR1: - talloc_report_full(tall_main_ctx, stderr); + talloc_report_full(g_tall_ctx, stderr); break; } } @@ -481,9 +481,9 @@ struct ufunc_handle ufh = (struct ufunc_handle) { 0, }; int rc; - tall_main_ctx = talloc_named_const(NULL, 0, "hub_main_functionfs"); - msgb_talloc_ctx_init(tall_main_ctx, 0); - osmo_init_logging2(tall_main_ctx, &log_info); + g_tall_ctx = talloc_named_const(NULL, 0, "hub_main_functionfs"); + msgb_talloc_ctx_init(g_tall_ctx, 0); + osmo_init_logging2(g_tall_ctx, &log_info); signal(SIGUSR1, &signal_handler); -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Idced24869863983bfde0c9c438498999717f2042 Gerrit-Change-Number: 16401 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 14:59:46 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 2 Dec 2019 14:59:46 +0000 Subject: Change in osmo-gsm-manuals[master]: Cosmetic: fix Makefile.vty.reference.inc example References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16402 ) Change subject: Cosmetic: fix Makefile.vty.reference.inc example ...................................................................... Cosmetic: fix Makefile.vty.reference.inc example All files listed in VTY_REFERENCE must end in ".xml". Change-Id: I20abc1899f4bdf0a11482224937217dfddc17c53 --- M build/Makefile.vty-reference.inc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/02/16402/1 diff --git a/build/Makefile.vty-reference.inc b/build/Makefile.vty-reference.inc index 9d8f127..0129a5c 100644 --- a/build/Makefile.vty-reference.inc +++ b/build/Makefile.vty-reference.inc @@ -17,7 +17,7 @@ # e.g. # # OSMO_GSM_MANUALS_DIR = .. -# VTY_REFERENCE = osmofoo-vty-reference +# VTY_REFERENCE = osmofoo-vty-reference.xml # include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc # # This uses the Makefile.docbook.inc, you should not mix uses of -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I20abc1899f4bdf0a11482224937217dfddc17c53 Gerrit-Change-Number: 16402 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 14:59:46 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 2 Dec 2019 14:59:46 +0000 Subject: Change in osmo-gsm-manuals[master]: Support multiple VTY reference manuals References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16403 ) Change subject: Support multiple VTY reference manuals ...................................................................... Support multiple VTY reference manuals Adjust vty_reference_combine.sh, so we can change the output dir from "generated" to a subdir inside "generated" when building anything but the first VTY reference. Add a generic pattern to Makefile.vty-reference for additional VTY references, that uses slightly different paths compared to the first VTY reference, in order to avoid collisions. Related: OS#4292 Change-Id: I4dea3e07b88175b2a88e577129360af7ec5f87e1 --- M build/Makefile.vty-reference.inc M build/vty_reference_combine.sh 2 files changed, 41 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/03/16403/1 diff --git a/build/Makefile.vty-reference.inc b/build/Makefile.vty-reference.inc index 0129a5c..90ef8e6 100644 --- a/build/Makefile.vty-reference.inc +++ b/build/Makefile.vty-reference.inc @@ -22,15 +22,36 @@ # # This uses the Makefile.docbook.inc, you should not mix uses of # Makefile.vty-reference.inc and Makefile.docbook.inc. +# +# In order to add more than one VTY reference, do this for each additional one: +# - Extend VTY_REFERENCE with the new entry, make sure it ends in "-vty-reference": +# VTY_REFERENCE = osmofoo-vty-reference.xml osmobar-vty-reference.xml +# - Create a new osmobar-vty-reference.xml file, just like osmofoo-vty-reference.xml, but with +# "generated/docbook_osmobar-vty-reference.xml" as sections-vty path instead of +# "generated/docbook_vty.xml". +# - Create vty-osmobar/*_additions.xml and vty-osmobar/*_reference.xml. Pay attention to the +# directory name, it must start with vty-osmo* instead of "vty" and it must match the prefix +# of your new VTY_REFERENCE entry (osmofoo in this example). +# - Full example: osmo-sgsn.git I24c3ca2fc2446673edceefb797c7d800c3a1a5d2 DOCBOOKS = $(VTY_REFERENCE) + +# First VTY reference DOCBOOKS_DEPS = generated/docbook_vty.xml + +# Additional VTY references: append "generated/docbook_" prefix +# For example: +# VTY_REFERENCE = osmosgsn-vty-reference.xml osmogbproxy-vty-reference.xml +# DOCBOOK_DEPS = generated/docbook_vty.xml generated/docbook_osmogbproxy-vty-reference.xml +DOCBOOKS_DEPS += $(patsubst %,generated/docbook_%,$(filter-out $(firstword $(VTY_REFERENCE)),$(VTY_REFERENCE))) + include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.docbook.inc MERGE_DOC = $(shell realpath $(OSMO_GSM_MANUALS_DIR)/merge_doc.xsl) CLEAN_FILES += generated +# First VTY reference generated/docbook_vty.xml: \ $(srcdir)/vty/*xml \ $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \ @@ -42,3 +63,16 @@ $(srcdir)/vty/*additions*.xml xsltproc $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml + +generated/docbook_%-vty-reference.xml: \ + $(srcdir)/vty-%/*xml \ + $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \ + $(OSMO_GSM_MANUALS_DIR)/common/chapters/vty.xml \ + $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl + export VTYDIR="$(srcdir)/vty-$(patsubst generated/docbook_%-vty-reference.xml,%,$@)" && \ + export VTYGEN="$@_combine" && \ + $(OSMO_GSM_MANUALS_DIR)/build/vty_reference_combine.sh "$(MERGE_DOC)" \ + $$VTYDIR/*reference.xml \ + $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \ + $$VTYDIR/*additions*.xml && \ + xsltproc $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl $$VTYGEN/combined.xml > "$@" diff --git a/build/vty_reference_combine.sh b/build/vty_reference_combine.sh index 449b227..6ab279e 100755 --- a/build/vty_reference_combine.sh +++ b/build/vty_reference_combine.sh @@ -3,6 +3,10 @@ # see Makefile.vty-reference.inc set -e +# Allow overriding the "generated" output dir, so we don't have collisions when building multiple VTY references in one +# Osmocom project (OS#4292) +VTYGEN=${VTYGEN:-generated} + # first argument: merge_doc.xsl MERGE_DOC="$1" shift @@ -12,11 +16,11 @@ test "$(ls -1 $reference | wc -l)" = "1" shift -combined="generated/combined.xml" -combine_src="generated/combine_src.xml" +combined="$VTYGEN/combined.xml" +combine_src="$VTYGEN/combine_src.xml" set -x -mkdir -p generated +mkdir -p "$VTYGEN" cp $reference "$combined" while [ -n "$1" ]; do -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I4dea3e07b88175b2a88e577129360af7ec5f87e1 Gerrit-Change-Number: 16403 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 14:59:46 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 2 Dec 2019 14:59:46 +0000 Subject: Change in osmo-gsm-manuals[master]: tests: add second VTY reference References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16404 ) Change subject: tests: add second VTY reference ...................................................................... tests: add second VTY reference Related: OS#4292 Change-Id: I2f0170e14febc68c0122062358f362003a2e3e5e --- M tests/Makefile.am A tests/test2-vty-reference.xml A tests/vty-test2/test2_vty_additions.xml A tests/vty-test2/test2_vty_reference.xml 4 files changed, 58 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/04/16404/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 6eba2c5..eb307b2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -26,7 +26,7 @@ include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc -VTY_REFERENCE = test-vty-reference.xml +VTY_REFERENCE = test-vty-reference.xml test2-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/tests/test2-vty-reference.xml b/tests/test2-vty-reference.xml new file mode 100644 index 0000000..b8fea23 --- /dev/null +++ b/tests/test2-vty-reference.xml @@ -0,0 +1,38 @@ + + + + +]> + + + + + + v1 + 2nd December 2019 + os + Initial + + + + Test VTY Reference No. 2 + + + 2019 + + + + This work is copyrighted by sysmocom - s.f.m.c. GmbH. All rights reserved. + + + + + + &chapter-vty; + + diff --git a/tests/vty-test2/test2_vty_additions.xml b/tests/vty-test2/test2_vty_additions.xml new file mode 100644 index 0000000..a4c675e --- /dev/null +++ b/tests/vty-test2/test2_vty_additions.xml @@ -0,0 +1,2 @@ + + diff --git a/tests/vty-test2/test2_vty_reference.xml b/tests/vty-test2/test2_vty_reference.xml new file mode 100644 index 0000000..e5674e7 --- /dev/null +++ b/tests/vty-test2/test2_vty_reference.xml @@ -0,0 +1,17 @@ + + + Common Commands + These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. + + + + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I2f0170e14febc68c0122062358f362003a2e3e5e Gerrit-Change-Number: 16404 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 15:00:06 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 2 Dec 2019 15:00:06 +0000 Subject: Change in osmo-sgsn[master]: gitignore: fix paths to binaries References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16405 ) Change subject: gitignore: fix paths to binaries ...................................................................... gitignore: fix paths to binaries Change-Id: Ia968bbc5de34e9068d4b414e5a701b958ae517e5 --- M .gitignore 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/05/16405/1 diff --git a/.gitignore b/.gitignore index 70193ff..b3e50f5 100644 --- a/.gitignore +++ b/.gitignore @@ -39,9 +39,9 @@ # apps and app data -src/gprs/osmo-sgsn -src/gprs/osmo-gbproxy -src/gprs/osmo-gtphub +src/sgsn/osmo-sgsn +src/gbproxy/osmo-gbproxy +src/gtphub/osmo-gtphub src/libcommon/gsup_test_client #tests -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ia968bbc5de34e9068d4b414e5a701b958ae517e5 Gerrit-Change-Number: 16405 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 15:00:06 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 2 Dec 2019 15:00:06 +0000 Subject: Change in osmo-sgsn[master]: doc: add OsmoGbProxy VTY reference References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16406 ) Change subject: doc: add OsmoGbProxy VTY reference ...................................................................... doc: add OsmoGbProxy VTY reference Depends: (osmo-gsm-manuals) I4dea3e07b88175b2a88e577129360af7ec5f87e1 Related: OS#4292 Change-Id: I24c3ca2fc2446673edceefb797c7d800c3a1a5d2 --- M doc/manuals/Makefile.am A doc/manuals/osmogbproxy-vty-reference.xml A doc/manuals/vty-osmogbproxy/gbproxy_vty_additions.xml A doc/manuals/vty-osmogbproxy/gbproxy_vty_reference.xml 4 files changed, 1,672 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/06/16406/1 diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am index 72e8c77..56763b4 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile.am @@ -3,6 +3,7 @@ osmosgsn-vty-reference.xml \ osmogbproxy-usermanual.adoc \ osmogbproxy-usermanual-docinfo.xml \ + osmogbproxy-vty-reference.xml \ regen_doc.sh \ chapters \ vty @@ -12,7 +13,7 @@ ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - VTY_REFERENCE = osmosgsn-vty-reference.xml + VTY_REFERENCE = osmosgsn-vty-reference.xml osmogbproxy-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc OSMO_REPOSITORY = osmo-sgsn diff --git a/doc/manuals/osmogbproxy-vty-reference.xml b/doc/manuals/osmogbproxy-vty-reference.xml new file mode 100644 index 0000000..ecf2268 --- /dev/null +++ b/doc/manuals/osmogbproxy-vty-reference.xml @@ -0,0 +1,38 @@ + + + + +]> + + + + + + v1 + 2nd December 2019 + hw + Initial + + + + OsmoGbProxy VTY Reference + + + 2019 + + + + This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. + + + + + + &chapter-vty; + + diff --git a/doc/manuals/vty-osmogbproxy/gbproxy_vty_additions.xml b/doc/manuals/vty-osmogbproxy/gbproxy_vty_additions.xml new file mode 100644 index 0000000..6da2d2f --- /dev/null +++ b/doc/manuals/vty-osmogbproxy/gbproxy_vty_additions.xml @@ -0,0 +1,5 @@ + + + Configure the Gb proxy + + diff --git a/doc/manuals/vty-osmogbproxy/gbproxy_vty_reference.xml b/doc/manuals/vty-osmogbproxy/gbproxy_vty_reference.xml new file mode 100644 index 0000000..1db3c0d --- /dev/null +++ b/doc/manuals/vty-osmogbproxy/gbproxy_vty_reference.xml @@ -0,0 +1,1627 @@ + + + Common Commands + These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + view + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + enable + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-log + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-stats + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-line + + + + + + + + + + + + + + + + + + + + + config-ns + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-gbproxy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I24c3ca2fc2446673edceefb797c7d800c3a1a5d2 Gerrit-Change-Number: 16406 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 15:00:06 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 2 Dec 2019 15:00:06 +0000 Subject: Change in osmo-sgsn[master]: regen_doc.sh: support gbproxy, run without docker References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16407 ) Change subject: regen_doc.sh: support gbproxy, run without docker ...................................................................... regen_doc.sh: support gbproxy, run without docker Do not only update the VTY reference and counters of osmo-sgsn, but also the VTY reference of gbproxy. This was not possible with the old code path of calling "regen_doc.sh" inside docker-playground.git, as it expects the program to be updated to have the same name as the docker image. Using the docker-playground script also has the disadvantage, that one must push the development branch to git.osmocom.org before updating the VTY reference/counters, because that script would build a new docker container with a freshly cloned repository, check out the same commit that we have already locally, build that and then finally regenerate the docs. So instead of adding another parameter for the docker image to the script in docker-playground.git and calling it twice, simplify the process by rewriting the regen_doc.sh script in osmo-sgsn.git. Make it start the locally installed osmo-sgsn and osmo-gbproxy binaries and call osmo_interact_vty.py on them. Related: OS#4292 Change-Id: I8b5bd5347ea34266ad650383372630f2a84d5cce --- M doc/manuals/regen_doc.sh 1 file changed, 71 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/07/16407/1 diff --git a/doc/manuals/regen_doc.sh b/doc/manuals/regen_doc.sh index d758436..847b764 100755 --- a/doc/manuals/regen_doc.sh +++ b/doc/manuals/regen_doc.sh @@ -1,17 +1,77 @@ -#!/bin/sh -x +#!/bin/sh -e -if [ -z "$DOCKER_PLAYGROUND" ]; then - echo "You need to set DOCKER_PLAYGROUND" +require_osmo_interact_vty() { + if command -v osmo_interact_vty.py >/dev/null 2>&1; then + return + fi + echo "ERROR: osmo_interact_vty.py not found. Are osmo-python-tests in PATH?" exit 1 -fi +} -SCRIPT=$(realpath "$0") -MANUAL_DIR=$(dirname "$SCRIPT") +# $1: "update_vty_reference" or "update_counters" +# $2: output file +# $3: port +# $4-$n: command +interact_vty() { + action="$1" + output="$2" + port="$3" + log="/tmp/$4.log" + shift 3 -COMMIT=${COMMIT:-$(git log -1 --format=format:%H)} + echo "Starting in background: $@" + "$@" > "$log" 2>&1 & + pid="$!" -cd "$DOCKER_PLAYGROUND/scripts" || exit 1 + sleep 0.5 + if ! kill -0 "$pid" 2>/dev/null; then + echo "ERROR: start failed!" + cat "$log" + exit 1 + fi -OSMO_SGSN_BRANCH=$COMMIT ./regen_doc.sh osmo-sgsn 4245 \ - "$MANUAL_DIR/chapters/counters_generated.adoc" \ - "$MANUAL_DIR/vty/sgsn_vty_reference.xml" + case "$action" in + "update_vty_reference") + echo "Updating VTY reference: $output" + osmo_interact_vty.py -X -p "$port" -H 127.0.0.1 -O "$output" + ;; + "update_counters") + echo "Updating asciidoc counters: $output" + osmo_interact_vty.py -c "enable;show asciidoc counters" -p "$port" -H 127.0.0.1 -O "$output" + ;; + *) + echo "ERROR: invalid argument: $action" + exit 1 + ;; + esac + + kill "$pid" + echo "Done (killed $1)" + echo +} + +DIR="$(cd "$(dirname "$0")"; pwd)" +cd "$DIR" + +require_osmo_interact_vty + +interact_vty \ + "update_vty_reference" \ + "vty/sgsn_vty_reference.xml" \ + 4245 \ + osmo-sgsn -c "../examples/osmo-sgsn/osmo-sgsn.cfg" + +interact_vty \ + "update_vty_reference" \ + "vty-osmogbproxy/gbproxy_vty_reference.xml" \ + 4246 \ + osmo-gbproxy -c "../examples/osmo-gbproxy/osmo-gbproxy.cfg" + +interact_vty \ + "update_counters" \ + "chapters/counters_generated.adoc" \ + 4245 \ + osmo-sgsn -c "../examples/osmo-sgsn/osmo-sgsn.cfg" + + +echo "Done with all" -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16407 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8b5bd5347ea34266ad650383372630f2a84d5cce Gerrit-Change-Number: 16407 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 15:20:55 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 2 Dec 2019 15:20:55 +0000 Subject: Change in osmo-gsm-manuals[master]: Cosmetic: fix Makefile.vty.reference.inc example In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16402 ) Change subject: Cosmetic: fix Makefile.vty.reference.inc example ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I20abc1899f4bdf0a11482224937217dfddc17c53 Gerrit-Change-Number: 16402 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Dec 2019 15:20:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 15:21:34 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 2 Dec 2019 15:21:34 +0000 Subject: Change in osmo-sgsn[master]: gitignore: fix paths to binaries In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16405 ) Change subject: gitignore: fix paths to binaries ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ia968bbc5de34e9068d4b414e5a701b958ae517e5 Gerrit-Change-Number: 16405 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Dec 2019 15:21:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:25:36 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 2 Dec 2019 18:25:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix RLCMAC template naming References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16408 ) Change subject: pcu: Fix RLCMAC template naming ...................................................................... pcu: Fix RLCMAC template naming There's also DL_ACK_NACK message for which a template will be introduced soon, so let's rename and fix typos/wrong descriptions to avoid confusion later. Change-Id: I4a2025ad282006953fcfadf429c980b77cb94371 --- M library/RLCMAC_Types.ttcn M pcu/PCU_Tests.ttcn M pcu/PCU_Tests_RAW.ttcn 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/08/16408/1 diff --git a/library/RLCMAC_Types.ttcn b/library/RLCMAC_Types.ttcn index 359cb74..b0dac35 100644 --- a/library/RLCMAC_Types.ttcn +++ b/library/RLCMAC_Types.ttcn @@ -328,8 +328,8 @@ } } - /* Receive Template for Downlink ACK/NACK */ - template RlcmacDlBlock tr_RLCMAC_ACK_NACK(template uint5_t ul_tfi, template GprsTlli tlli := ?) := { + /* Receive Template for Uplink ACK/NACK */ + template RlcmacDlBlock tr_RLCMAC_UL_ACK_NACK(template uint5_t ul_tfi, template GprsTlli tlli := ?) := { ctrl := { mac_hdr := { payload_type := (MAC_PT_RLCMAC_NO_OPT, MAC_PT_RLCMAC_OPT), @@ -384,7 +384,7 @@ retry := retry } - /* Template for Uplink Conntrol ACK */ + /* Template for Uplink Control ACK */ template RlcmacUlBlock ts_RLCMAC_CTRL_ACK(GprsTlli tlli, CtrlAck ack := MS_RCVD_TWO_RLC_SAME_RTI_DIFF_RBSN) := { ctrl := { mac_hdr := t_RLCMAC_UlMacCtrlH(MAC_PT_RLCMAC_NO_OPT), diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 4288061..1c2b271 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -358,7 +358,7 @@ } alt { - [] L1.receive(RLCMAC_ph_data_ind:{cs:=?, ts_nr:=?, fn:=?, block:=tr_RLCMAC_ACK_NACK(0, g_mmctx.tlli)}) -> value dl { + [] L1.receive(RLCMAC_ph_data_ind:{cs:=?, ts_nr:=?, fn:=?, block:=tr_RLCMAC_UL_ACK_NACK(0, g_mmctx.tlli)}) -> value dl { log("found matching ACK/NACK"); /* send CTRL ACK in uplink */ var GsmFrameNumber ul_fn := f_rrbp_fn(dl.fn, dl.block.ctrl.mac_hdr.rrbp); diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index 24187b7..4a6f54a 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -738,7 +738,7 @@ private function f_rx_rlcmac_dl_block_exp_ack_nack(out RlcmacDlBlock dl_block) runs on RAW_PCU_Test_CT { f_rx_rlcmac_dl_block(dl_block); - if (not match(dl_block, tr_RLCMAC_ACK_NACK(ul_tfi := ?, tlli := ?))) { + if (not match(dl_block, tr_RLCMAC_UL_ACK_NACK(ul_tfi := ?, tlli := ?))) { setverdict(fail, "Failed to match Packet Uplink ACK / NACK"); mtc.stop; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4a2025ad282006953fcfadf429c980b77cb94371 Gerrit-Change-Number: 16408 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:25:36 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 2 Dec 2019 18:25:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: TC_mo_ping_pong: Check DL block is sent and ACK it References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16409 ) Change subject: pcu: TC_mo_ping_pong: Check DL block is sent and ACK it ...................................................................... pcu: TC_mo_ping_pong: Check DL block is sent and ACK it Function f_rx_rlcmac_dl_block_exp_data() still misses proper verification of data. Apparently the received message has 2 blocks, first with expected 10 bytes, but next one contains 18 bytes with 4 actual bytes and other bits are padding. Last DL ACK/NACK sent is not yet working correctly. osmo-pcu seems to be unable to match it against sent DL block (I think due to non-matching FN), and instead drops it and schedules after timeout an IMM ASS to try to send DL block again. Change-Id: Icf66dd5c07690368722c586632c38fb7e770053c --- M library/RLCMAC_CSN1_Types.ttcn M library/RLCMAC_Types.ttcn M pcu/PCU_Tests_RAW.ttcn 3 files changed, 55 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/09/16409/1 diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index 29ec07b..a2f9a92 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -643,11 +643,11 @@ } } - private const ILevel iNone := { + const ILevel iNone := { presence := '0'B, i_level := omit } - private const ChannelQualityReport c_ChQualRep_default := { + const ChannelQualityReport c_ChQualRep_default := { c_value := 0, rxqual := 0, sign_var := 0, diff --git a/library/RLCMAC_Types.ttcn b/library/RLCMAC_Types.ttcn index b0dac35..8e6942e 100644 --- a/library/RLCMAC_Types.ttcn +++ b/library/RLCMAC_Types.ttcn @@ -256,7 +256,30 @@ } } - /* Template fro uplink Data block */ + /* Send Template for Downlink ACK/NACK */ + template RlcmacUlBlock ts_RLCMAC_DL_ACK_NACK(template uint5_t tfi, AckNackDescription andesc, boolean retry := false) := { + ctrl := { + mac_hdr := { + payload_type := MAC_PT_RLCMAC_NO_OPT, + spare := '00000'B, + retry := retry + }, + payload := { + msg_type := PACKET_DL_ACK_NACK, + u := { + dl_ack_nack := { + dl_tfi := tfi, + ack_nack_desc := andesc, + chreq_desc_presence := '0'B, + chreq_desc := omit, + ch_qual_rep := c_ChQualRep_default + } + } + } + } + } + + /* Template for uplink Data block */ template RlcmacUlBlock t_RLCMAC_UL_DATA(template uint5_t tfi, template uint4_t cv, template uint7_t bsn, template LlcBlocks blocks := {}, template boolean stall := false) := { data := { diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index 4a6f54a..410dc31 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -46,6 +46,8 @@ modulepar { charstring mp_pcu_sock_path := PCU_SOCK_DEFAULT; + + float X2002 := 0.2; /* Timer -2002, IMM ASSIGN confirm delay */ } type component RAW_NS_CT { @@ -753,6 +755,19 @@ } } +private function f_rx_rlcmac_dl_block_exp_data(out RlcmacDlBlock dl_block, octetstring data) +runs on RAW_PCU_Test_CT { + var template RlcmacDlBlock dl_template := tr_RLCMAC_DATA_RRBP; + dl_template.data.blocks := ?; + /* TODO: match data correctly: { valueof(t_RLCMAC_LLCBLOCK(data)) }; */ + + f_rx_rlcmac_dl_block(dl_block); + if (not match(dl_block, dl_template)) { + setverdict(fail, "Failed to match Packet data: ", dl_block, " vs ", dl_template); + mtc.stop; + } +} + testcase TC_pcuif_suspend() runs on RAW_PCU_Test_CT { var octetstring ra_id := enc_RoutingAreaIdentification(mp_gb_cfg.cell_id.ra_id); var GprsTlli tlli := 'FFFFFFFF'O; @@ -1320,9 +1335,15 @@ var PacketDlAssign dl_tbf_ass; var RlcmacDlBlock dl_block; var PCUIF_Message pcu_msg; - var octetstring data; + var octetstring data := f_rnd_octstring(10); var boolean ok; var OCT4 tlli := '00000001'O; + var AckNackDescription ack_nack_desc; + + ack_nack_desc.final_ack := '0'B; + ack_nack_desc.starting_seq_nr := 0; + ack_nack_desc.receive_block_bitmap := '0000000000000000000000000000000000000000000000000000000000000000'B; + /* Initialize NS/BSSGP side */ f_init_bssgp(); @@ -1354,7 +1375,7 @@ BSSGP[0].receive(tr_BSSGP_UL_UD(tlli, mp_gb_cfg.cell_id)); /* Now SGSN sends some DL data, PCU will page on CCCH (PCH) */ - BSSGP[0].send(ts_BSSGP_DL_UD(tlli, f_rnd_octstring(10))); + BSSGP[0].send(ts_BSSGP_DL_UD(tlli, data)); f_pcuif_rx_pch_imm_tbf_ass(rr_imm_ass); ok := f_imm_ass_verify_dl_tbf_ass(rr_imm_ass, dl_tbf_ass); @@ -1363,7 +1384,12 @@ mtc.stop; } - /* TODO: ACK the assignment and the DL block somehow? */ + /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ + f_sleep(X2002); + f_rx_rlcmac_dl_block_exp_data(dl_block, data); + + /* ACK the DL block */ + f_tx_rlcmac_ul_block(ts_RLCMAC_DL_ACK_NACK(dl_block.data.mac_hdr.hdr_ext.tfi, ack_nack_desc)); } control { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icf66dd5c07690368722c586632c38fb7e770053c Gerrit-Change-Number: 16409 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:32:42 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:32:42 +0000 Subject: Change in simtrace2[master]: simtrace2_api: Remove dead code References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16410 ) Change subject: simtrace2_api: Remove dead code ...................................................................... simtrace2_api: Remove dead code Change-Id: Iab393a6cf9ae1218e1554d9c0bfb7aab2cc3c35e --- M host/lib/simtrace2_api.c 1 file changed, 0 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/10/16410/1 diff --git a/host/lib/simtrace2_api.c b/host/lib/simtrace2_api.c index 7a0289d..b2b2829 100644 --- a/host/lib/simtrace2_api.c +++ b/host/lib/simtrace2_api.c @@ -38,11 +38,8 @@ #include -//#include #include #include -//#include "apdu_dispatch.h" -//#include "simtrace2-discovery.h" #include #include @@ -60,14 +57,6 @@ return msgb_alloc_headroom(1024+32, 32, "SIMtrace"); } -#if 0 -static void apdu_out_cb(uint8_t *buf, unsigned int len, void *user_data) -{ - printf("APDU: %s\n", osmo_hexdump(buf, len)); - gsmtap_send_sim(buf, len); -} -#endif - /*! \brief Transmit a given command to the SIMtrace2 device */ int osmo_st2_transp_tx_msg(struct osmo_st2_transport *transp, struct msgb *msg) { -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Iab393a6cf9ae1218e1554d9c0bfb7aab2cc3c35e Gerrit-Change-Number: 16410 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:32:44 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:32:44 +0000 Subject: Change in simtrace2[master]: minor: fix spacing References: Message-ID: Hello tsaitgaist, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/simtrace2/+/16411 to review the following change. Change subject: minor: fix spacing ...................................................................... minor: fix spacing Change-Id: I2f3127c7b276c9726fd0242e3e29be22f9d6255c --- M firmware/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/11/16411/1 diff --git a/firmware/Makefile b/firmware/Makefile index a879297..9a03eca 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -100,7 +100,7 @@ C_LIBCOMMON = string.c stdio.c fputs.c usb_buf.c ringbuffer.c pseudo_talloc.c host_communication.c C_BOARD = $(notdir $(wildcard libboard/common/source/*.c)) -C_BOARD += $(notdir $(wildcard libboard/$(BOARD)/source/*.c)) +C_BOARD += $(notdir $(wildcard libboard/$(BOARD)/source/*.c)) C_APPLEVEL = $(notdir $(wildcard apps/$(APP)/*.c)) -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2f3127c7b276c9726fd0242e3e29be22f9d6255c Gerrit-Change-Number: 16411 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:32:45 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:32:45 +0000 Subject: Change in simtrace2[master]: fix baudrate of 'make log' References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16412 ) Change subject: fix baudrate of 'make log' ...................................................................... fix baudrate of 'make log' Change-Id: Id186a594b1ce3ea0cd38f0cb82a99e5d87101433 --- M firmware/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/12/16412/1 diff --git a/firmware/Makefile b/firmware/Makefile index 9a03eca..4318e2d 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -231,7 +231,7 @@ SERIAL ?= /dev/ttyUSB0 log: - stty -F $(SERIAL) 115200 + stty -F $(SERIAL) 921600 lsof $(SERIAL) && echo "log is already opened" || ( sed -u "s/\r//" $(SERIAL) | ts ) clean: -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Id186a594b1ce3ea0cd38f0cb82a99e5d87101433 Gerrit-Change-Number: 16412 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:32:45 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:32:45 +0000 Subject: Change in simtrace2[master]: minor: updated copyright years References: Message-ID: Hello tsaitgaist, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/simtrace2/+/16413 to review the following change. Change subject: minor: updated copyright years ...................................................................... minor: updated copyright years Change-Id: I9254b1ddf6436b5a4964b9124a36ae17bfc22886 --- M firmware/apps/cardem/main.c M firmware/apps/dfu/main.c 2 files changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/13/16413/1 diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c index 209c79f..3c5a32c 100644 --- a/firmware/apps/cardem/main.c +++ b/firmware/apps/cardem/main.c @@ -1,7 +1,7 @@ /* SIMtrace 2 firmware card emulation application * * (C) 2015-2017 by Harald Welte - * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon + * (C) 2018-2019, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -158,7 +158,8 @@ printf("\n\r\n\r" "=============================================================================\n\r" - "SIMtrace2 firmware " GIT_VERSION " (C) 2010-2016 by Harald Welte\n\r" + "SIMtrace2 firmware " GIT_VERSION "\n\r" + "(C) 2010-2017 by Harald Welte, 2018-2019 by Kevin Redon\n\r" "=============================================================================\n\r"); #if (TRACE_LEVEL >= TRACE_LEVEL_INFO) diff --git a/firmware/apps/dfu/main.c b/firmware/apps/dfu/main.c index f9b6aed..271fbec 100644 --- a/firmware/apps/dfu/main.c +++ b/firmware/apps/dfu/main.c @@ -1,7 +1,7 @@ /* SIMtrace 2 firmware USB DFU bootloader * * (C) 2015-2017 by Harald Welte - * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon + * (C) 2018-2019 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -248,7 +248,8 @@ printf("\n\r\n\r" "=============================================================================\n\r" - "DFU bootloader %s for board %s (C) 2010-2017 by Harald Welte\n\r" + "DFU bootloader %s for board %s\n\r" + "(C) 2010-2017 by Harald Welte, 2018-2019 by Kevin Redon\n\r" "=============================================================================\n\r", manifest_revision, manifest_board); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I9254b1ddf6436b5a4964b9124a36ae17bfc22886 Gerrit-Change-Number: 16413 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:32:46 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:32:46 +0000 Subject: Change in simtrace2[master]: dfu: minor: make debug output only verbose in info level References: Message-ID: Hello tsaitgaist, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/simtrace2/+/16414 to review the following change. Change subject: dfu: minor: make debug output only verbose in info level ...................................................................... dfu: minor: make debug output only verbose in info level the longer output is to fast and often incomplete. the shorter version is enough to view the progress when not debugging. Change-Id: I97bb84da68d1f3bc14fb7c05400edf1748f55460 --- M firmware/apps/dfu/main.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/14/16414/1 diff --git a/firmware/apps/dfu/main.c b/firmware/apps/dfu/main.c index 271fbec..97cd074 100644 --- a/firmware/apps/dfu/main.c +++ b/firmware/apps/dfu/main.c @@ -66,7 +66,11 @@ WDT_Restart(WDT); } - printf("dnload(altif=%u, offset=%u, len=%u)\n\r", altif, offset, len); +#if TRACE_LEVEL >= TRACE_LEVEL_INFO + TRACE_INFO("dnload(altif=%u, offset=%u, len=%u)\n\r", altif, offset, len); +#else + printf("DL off=%u\n\r", offset); +#endif #ifdef PINS_LEDS PIO_Clear(&pinsLeds[LED_NUM_RED]); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I97bb84da68d1f3bc14fb7c05400edf1748f55460 Gerrit-Change-Number: 16414 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:32:46 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:32:46 +0000 Subject: Change in simtrace2[master]: minor: move USB debug output from info to debug level References: Message-ID: Hello tsaitgaist, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/simtrace2/+/16415 to review the following change. Change subject: minor: move USB debug output from info to debug level ...................................................................... minor: move USB debug output from info to debug level else it's too nosy while debugging other components, not often used, and break the flow since it does not and a line. Change-Id: I8920ff7c33b4c9fb174bb31a29334a63fcbede43 --- M firmware/atmel_softpack_libraries/usb/device/core/USBDDriver.c 1 file changed, 24 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/15/16415/1 diff --git a/firmware/atmel_softpack_libraries/usb/device/core/USBDDriver.c b/firmware/atmel_softpack_libraries/usb/device/core/USBDDriver.c index 22889cf..c6cf6e0 100644 --- a/firmware/atmel_softpack_libraries/usb/device/core/USBDDriver.c +++ b/firmware/atmel_softpack_libraries/usb/device/core/USBDDriver.c @@ -251,7 +251,7 @@ switch (type) { case USBGenericDescriptor_DEVICE: - TRACE_INFO_WP("Dev "); + TRACE_DEBUG_WP("Dev "); /* Adjust length and send descriptor */ @@ -263,7 +263,7 @@ break; case USBGenericDescriptor_CONFIGURATION: - TRACE_INFO_WP("Cfg "); + TRACE_DEBUG_WP("Cfg "); /* Adjust length and send descriptor */ @@ -280,7 +280,7 @@ break; case USBGenericDescriptor_DEVICEQUALIFIER: - TRACE_INFO_WP("Qua "); + TRACE_DEBUG_WP("Qua "); /* Check if descriptor exists */ @@ -301,7 +301,7 @@ break; case USBGenericDescriptor_OTHERSPEEDCONFIGURATION: - TRACE_INFO_WP("OSC "); + TRACE_DEBUG_WP("OSC "); /* Check if descriptor exists */ @@ -327,7 +327,7 @@ break; case USBGenericDescriptor_STRING: - TRACE_INFO_WP("Str%d ", indexRDesc); + TRACE_DEBUG_WP("Str%d ", indexRDesc); /* Check if descriptor exists */ @@ -504,13 +504,13 @@ uint32_t length; uint32_t address; - TRACE_INFO_WP("Std "); + TRACE_DEBUG_WP("Std "); /* Check request code */ switch (USBGenericRequest_GetRequest(pRequest)) { case USBGenericRequest_GETDESCRIPTOR: - TRACE_INFO_WP("gDesc "); + TRACE_DEBUG_WP("gDesc "); /* Send the requested descriptor */ type = USBGetDescriptorRequest_GetDescriptorType(pRequest); @@ -520,7 +520,7 @@ break; case USBGenericRequest_SETADDRESS: - TRACE_INFO_WP("sAddr "); + TRACE_DEBUG_WP("sAddr "); /* Sends a zero-length packet and then set the device address */ address = USBSetAddressRequest_GetAddress(pRequest); @@ -528,7 +528,7 @@ break; case USBGenericRequest_SETCONFIGURATION: - TRACE_INFO_WP("sCfg "); + TRACE_DEBUG_WP("sCfg "); /* Set the requested configuration */ cfgnum = USBSetConfigurationRequest_GetConfiguration(pRequest); @@ -536,27 +536,27 @@ break; case USBGenericRequest_GETCONFIGURATION: - TRACE_INFO_WP("gCfg "); + TRACE_DEBUG_WP("gCfg "); /* Send the current configuration number */ GetConfiguration(pDriver); break; case USBGenericRequest_GETSTATUS: - TRACE_INFO_WP("gSta "); + TRACE_DEBUG_WP("gSta "); /* Check who is the recipient */ switch (USBGenericRequest_GetRecipient(pRequest)) { case USBGenericRequest_DEVICE: - TRACE_INFO_WP("Dev "); + TRACE_DEBUG_WP("Dev "); /* Send the device status */ GetDeviceStatus(pDriver); break; case USBGenericRequest_ENDPOINT: - TRACE_INFO_WP("Ept "); + TRACE_DEBUG_WP("Ept "); /* Send the endpoint status */ eptnum = USBGenericRequest_GetEndpointNumber(pRequest); @@ -572,13 +572,13 @@ break; case USBGenericRequest_CLEARFEATURE: - TRACE_INFO_WP("cFeat "); + TRACE_DEBUG_WP("cFeat "); /* Check which is the requested feature */ switch (USBFeatureRequest_GetFeatureSelector(pRequest)) { case USBFeatureRequest_ENDPOINTHALT: - TRACE_INFO_WP("Hlt "); + TRACE_DEBUG_WP("Hlt "); /* Unhalt endpoint and send a zero-length packet */ USBD_Unhalt(USBGenericRequest_GetEndpointNumber(pRequest)); @@ -586,7 +586,7 @@ break; case USBFeatureRequest_DEVICEREMOTEWAKEUP: - TRACE_INFO_WP("RmWU "); + TRACE_DEBUG_WP("RmWU "); /* Disable remote wake-up and send a zero-length packet */ pDriver->isRemoteWakeUpEnabled = 0; @@ -602,13 +602,13 @@ break; case USBGenericRequest_SETFEATURE: - TRACE_INFO_WP("sFeat "); + TRACE_DEBUG_WP("sFeat "); /* Check which is the selected feature */ switch (USBFeatureRequest_GetFeatureSelector(pRequest)) { case USBFeatureRequest_DEVICEREMOTEWAKEUP: - TRACE_INFO_WP("RmWU "); + TRACE_DEBUG_WP("RmWU "); /* Enable remote wake-up and send a ZLP */ pDriver->isRemoteWakeUpEnabled = 1; @@ -616,25 +616,25 @@ break; case USBFeatureRequest_ENDPOINTHALT: - TRACE_INFO_WP("Halt "); + TRACE_DEBUG_WP("Halt "); /* Halt endpoint */ USBD_Halt(USBGenericRequest_GetEndpointNumber(pRequest)); USBD_Write(0, 0, 0, 0, 0); break; case USBFeatureRequest_OTG_B_HNP_ENABLE: - TRACE_INFO_WP("OTG_B_HNP_ENABLE "); + TRACE_DEBUG_WP("OTG_B_HNP_ENABLE "); pDriver->otg_features_supported |= 1<otg_features_supported |= 1<otg_features_supported |= 1< Gerrit-Reviewer: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:32:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:32:47 +0000 Subject: Change in simtrace2[master]: minor: improve debug output References: Message-ID: Hello tsaitgaist, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/simtrace2/+/16416 to review the following change. Change subject: minor: improve debug output ...................................................................... minor: improve debug output Change-Id: Ibfc22b95c0be3ac78bd50a40e31cc7d8546d81d9 --- M firmware/libcommon/source/sniffer.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/16/16416/1 diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c index 33c16d3..82c4b3f 100644 --- a/firmware/libcommon/source/sniffer.c +++ b/firmware/libcommon/source/sniffer.c @@ -214,8 +214,8 @@ if (0 != d) { wt_d = d; } - wt = wt_wi*960UL*wt_d; - TRACE_INFO("WT updated to %lu\n\r", wt); + wt = wt_wi * 960UL * wt_d; + TRACE_INFO("WT updated to %lu ETU\n\r", wt); } /*! Allocate USB buffer and push + initialize simtrace_msg_hdr -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ibfc22b95c0be3ac78bd50a40e31cc7d8546d81d9 Gerrit-Change-Number: 16416 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:32:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:32:47 +0000 Subject: Change in simtrace2[master]: minor : fix typo in comment References: Message-ID: Hello tsaitgaist, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/simtrace2/+/16417 to review the following change. Change subject: minor : fix typo in comment ...................................................................... minor : fix typo in comment Change-Id: Ie310143fe713a51fa1adf8bf7599374282341f2e --- M firmware/libcommon/source/simtrace_iso7816.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/17/16417/1 diff --git a/firmware/libcommon/source/simtrace_iso7816.c b/firmware/libcommon/source/simtrace_iso7816.c index 889ca2d..8ee3f8c 100644 --- a/firmware/libcommon/source/simtrace_iso7816.c +++ b/firmware/libcommon/source/simtrace_iso7816.c @@ -80,7 +80,7 @@ } /* - * char_stat is zero if no error occured. + * char_stat is zero if no error occurred. * Otherwise it is filled with the content of the status register. */ void mode_trace_usart1_irq(void) @@ -110,7 +110,7 @@ rbuf_write(&sim_rcv_buf, c); } else { TRACE_DEBUG("e %x st: %x\n", c, stat); - } /* else: error occured */ + } /* else: error occurred */ char_stat = stat; } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie310143fe713a51fa1adf8bf7599374282341f2e Gerrit-Change-Number: 16417 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:32:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:32:48 +0000 Subject: Change in simtrace2[master]: better detect VCC and nRST changes on simtrace2 board References: Message-ID: Hello tsaitgaist, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/simtrace2/+/16418 to review the following change. Change subject: better detect VCC and nRST changes on simtrace2 board ...................................................................... better detect VCC and nRST changes on simtrace2 board monitoring the state changes of the VCC and nRST lines is required to correctly detect warm and cold reset Change-Id: I72099956332724f84226e1495fdc5a5b1a034695 --- M firmware/libboard/simtrace/include/board.h 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/18/16418/1 diff --git a/firmware/libboard/simtrace/include/board.h b/firmware/libboard/simtrace/include/board.h index c109bea..35c9426 100644 --- a/firmware/libboard/simtrace/include/board.h +++ b/firmware/libboard/simtrace/include/board.h @@ -74,9 +74,9 @@ /** Phone connection **/ /* Phone USIM slot 1 VCC pin (VCC_PHONE in schematic) */ -#define PIN_USIM1_VCC {PIO_PA25, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT} +#define PIN_USIM1_VCC {PIO_PA25, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_EDGE | PIO_DEGLITCH } /* Phone USIM slot 1 RST pin (active low; RST_PHONE in schematic) */ -#define PIN_USIM1_nRST {PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_RISE_EDGE | PIO_DEGLITCH } +#define PIN_USIM1_nRST {PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_EDGE | PIO_DEGLITCH } /* Phone I/O data signal input/output (I/O_PHONE in schematic) */ #define PIN_PHONE_IO {PIO_PA22A_TXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT} /* Phone CLK clock input (CLK_PHONE in schematic) */ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I72099956332724f84226e1495fdc5a5b1a034695 Gerrit-Change-Number: 16418 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:32:49 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:32:49 +0000 Subject: Change in simtrace2[master]: minor: ignore usbstring binary References: Message-ID: Hello tsaitgaist, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/simtrace2/+/16419 to review the following change. Change subject: minor: ignore usbstring binary ...................................................................... minor: ignore usbstring binary Change-Id: I18fc3179f8b7f3f1272d26853007876156fc1e03 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/19/16419/1 diff --git a/.gitignore b/.gitignore index a4e484c..cb3ffb3 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ host/simtrace2-remsim host/simtrace2-remsim-usb2udp usb_strings_generated.h +firmware/usbstring/usbstring -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I18fc3179f8b7f3f1272d26853007876156fc1e03 Gerrit-Change-Number: 16419 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:39:15 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:39:15 +0000 Subject: Change in simtrace2[master]: simtrace2-remsim: Use simplest ATR References: Message-ID: Hello tsaitgaist, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/simtrace2/+/16420 to review the following change. Change subject: simtrace2-remsim: Use simplest ATR ...................................................................... simtrace2-remsim: Use simplest ATR this ATR does not encode any data and uses all defaults. the lower default speed is also better handled by the hardware. handling faster speeds is upcoming. Change-Id: I5a4f2f94bea1a15aedbef5a6f2f49344387dc11d --- M host/src/simtrace2-remsim.c 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/20/16420/1 diff --git a/host/src/simtrace2-remsim.c b/host/src/simtrace2-remsim.c index 03d11df..d51f081 100644 --- a/host/src/simtrace2-remsim.c +++ b/host/src/simtrace2-remsim.c @@ -432,9 +432,7 @@ if (!skip_atr) { /* set the ATR */ - uint8_t real_atr[] = { 0x3B, 0x9F, 0x96, 0x80, 0x1F, 0xC7, 0x80, 0x31, - 0xA0, 0x73, 0xBE, 0x21, 0x13, 0x67, 0x43, 0x20, - 0x07, 0x18, 0x00, 0x00, 0x01, 0xA5 }; + uint8_t real_atr[] = { 0x3B, 0x00 }; // the simplest ATR atr_update_csum(real_atr, sizeof(real_atr)); osmo_st2_cardem_request_set_atr(ci, real_atr, sizeof(real_atr)); } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I5a4f2f94bea1a15aedbef5a6f2f49344387dc11d Gerrit-Change-Number: 16420 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:39:16 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:39:16 +0000 Subject: Change in simtrace2[master]: cardem: use simplest ATR as default ATR References: Message-ID: Hello tsaitgaist, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/simtrace2/+/16421 to review the following change. Change subject: cardem: use simplest ATR as default ATR ...................................................................... cardem: use simplest ATR as default ATR This is the shortest and simplest ATR possible according to the ISO 7816-3 spec. It does not offer any non-default parameters (F, D, WI, ...) Change-Id: I4ff41b5120bcadca652296f9d3691f7606be2bd2 --- M firmware/libcommon/source/card_emu.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/21/16421/1 diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 497b963..923226a 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -1151,8 +1151,8 @@ } } -/* shortest ATR found in smartcard_list.txt */ -static const uint8_t default_atr[] = { 0x3B, 0x02, 0x14, 0x50 }; +/* shortest ATR possible (uses default speed and no options) */ +static const uint8_t default_atr[] = { 0x3B, 0x00 }; static struct card_handle card_handles[NUM_SLOTS]; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I4ff41b5120bcadca652296f9d3691f7606be2bd2 Gerrit-Change-Number: 16421 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:41:17 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:41:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix RLCMAC template naming In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16408 ) Change subject: pcu: Fix RLCMAC template naming ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4a2025ad282006953fcfadf429c980b77cb94371 Gerrit-Change-Number: 16408 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Dec 2019 18:41:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:42:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:42:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix RLCMAC template naming In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16408 ) Change subject: pcu: Fix RLCMAC template naming ...................................................................... pcu: Fix RLCMAC template naming There's also DL_ACK_NACK message for which a template will be introduced soon, so let's rename and fix typos/wrong descriptions to avoid confusion later. Change-Id: I4a2025ad282006953fcfadf429c980b77cb94371 --- M library/RLCMAC_Types.ttcn M pcu/PCU_Tests.ttcn M pcu/PCU_Tests_RAW.ttcn 3 files changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/RLCMAC_Types.ttcn b/library/RLCMAC_Types.ttcn index 359cb74..b0dac35 100644 --- a/library/RLCMAC_Types.ttcn +++ b/library/RLCMAC_Types.ttcn @@ -328,8 +328,8 @@ } } - /* Receive Template for Downlink ACK/NACK */ - template RlcmacDlBlock tr_RLCMAC_ACK_NACK(template uint5_t ul_tfi, template GprsTlli tlli := ?) := { + /* Receive Template for Uplink ACK/NACK */ + template RlcmacDlBlock tr_RLCMAC_UL_ACK_NACK(template uint5_t ul_tfi, template GprsTlli tlli := ?) := { ctrl := { mac_hdr := { payload_type := (MAC_PT_RLCMAC_NO_OPT, MAC_PT_RLCMAC_OPT), @@ -384,7 +384,7 @@ retry := retry } - /* Template for Uplink Conntrol ACK */ + /* Template for Uplink Control ACK */ template RlcmacUlBlock ts_RLCMAC_CTRL_ACK(GprsTlli tlli, CtrlAck ack := MS_RCVD_TWO_RLC_SAME_RTI_DIFF_RBSN) := { ctrl := { mac_hdr := t_RLCMAC_UlMacCtrlH(MAC_PT_RLCMAC_NO_OPT), diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 4288061..1c2b271 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -358,7 +358,7 @@ } alt { - [] L1.receive(RLCMAC_ph_data_ind:{cs:=?, ts_nr:=?, fn:=?, block:=tr_RLCMAC_ACK_NACK(0, g_mmctx.tlli)}) -> value dl { + [] L1.receive(RLCMAC_ph_data_ind:{cs:=?, ts_nr:=?, fn:=?, block:=tr_RLCMAC_UL_ACK_NACK(0, g_mmctx.tlli)}) -> value dl { log("found matching ACK/NACK"); /* send CTRL ACK in uplink */ var GsmFrameNumber ul_fn := f_rrbp_fn(dl.fn, dl.block.ctrl.mac_hdr.rrbp); diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index 24187b7..4a6f54a 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -738,7 +738,7 @@ private function f_rx_rlcmac_dl_block_exp_ack_nack(out RlcmacDlBlock dl_block) runs on RAW_PCU_Test_CT { f_rx_rlcmac_dl_block(dl_block); - if (not match(dl_block, tr_RLCMAC_ACK_NACK(ul_tfi := ?, tlli := ?))) { + if (not match(dl_block, tr_RLCMAC_UL_ACK_NACK(ul_tfi := ?, tlli := ?))) { setverdict(fail, "Failed to match Packet Uplink ACK / NACK"); mtc.stop; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4a2025ad282006953fcfadf429c980b77cb94371 Gerrit-Change-Number: 16408 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:42:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:42:30 +0000 Subject: Change in simtrace2[master]: simtrace2_api: Remove dead code In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16410 ) Change subject: simtrace2_api: Remove dead code ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Iab393a6cf9ae1218e1554d9c0bfb7aab2cc3c35e Gerrit-Change-Number: 16410 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Dec 2019 18:42:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:42:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:42:47 +0000 Subject: Change in simtrace2[master]: minor: fix spacing In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16411 ) Change subject: minor: fix spacing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2f3127c7b276c9726fd0242e3e29be22f9d6255c Gerrit-Change-Number: 16411 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-Comment-Date: Mon, 02 Dec 2019 18:42:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:42:52 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:42:52 +0000 Subject: Change in simtrace2[master]: fix baudrate of 'make log' In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16412 ) Change subject: fix baudrate of 'make log' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Id186a594b1ce3ea0cd38f0cb82a99e5d87101433 Gerrit-Change-Number: 16412 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Dec 2019 18:42:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:42:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:42:59 +0000 Subject: Change in simtrace2[master]: minor: updated copyright years In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16413 ) Change subject: minor: updated copyright years ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I9254b1ddf6436b5a4964b9124a36ae17bfc22886 Gerrit-Change-Number: 16413 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-Comment-Date: Mon, 02 Dec 2019 18:42:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:43:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:43:06 +0000 Subject: Change in simtrace2[master]: dfu: minor: make debug output only verbose in info level In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16414 ) Change subject: dfu: minor: make debug output only verbose in info level ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I97bb84da68d1f3bc14fb7c05400edf1748f55460 Gerrit-Change-Number: 16414 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-Comment-Date: Mon, 02 Dec 2019 18:43:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:43:19 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:43:19 +0000 Subject: Change in simtrace2[master]: minor: move USB debug output from info to debug level In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16415 ) Change subject: minor: move USB debug output from info to debug level ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I8920ff7c33b4c9fb174bb31a29334a63fcbede43 Gerrit-Change-Number: 16415 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-Comment-Date: Mon, 02 Dec 2019 18:43:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:43:22 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:43:22 +0000 Subject: Change in simtrace2[master]: minor: improve debug output In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16416 ) Change subject: minor: improve debug output ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ibfc22b95c0be3ac78bd50a40e31cc7d8546d81d9 Gerrit-Change-Number: 16416 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-Comment-Date: Mon, 02 Dec 2019 18:43:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:43:27 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:43:27 +0000 Subject: Change in simtrace2[master]: minor : fix typo in comment In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16417 ) Change subject: minor : fix typo in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie310143fe713a51fa1adf8bf7599374282341f2e Gerrit-Change-Number: 16417 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-Comment-Date: Mon, 02 Dec 2019 18:43:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:43:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:43:35 +0000 Subject: Change in simtrace2[master]: better detect VCC and nRST changes on simtrace2 board In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16418 ) Change subject: better detect VCC and nRST changes on simtrace2 board ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I72099956332724f84226e1495fdc5a5b1a034695 Gerrit-Change-Number: 16418 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-Comment-Date: Mon, 02 Dec 2019 18:43:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:43:38 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:43:38 +0000 Subject: Change in simtrace2[master]: minor: ignore usbstring binary In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16419 ) Change subject: minor: ignore usbstring binary ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I18fc3179f8b7f3f1272d26853007876156fc1e03 Gerrit-Change-Number: 16419 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-Comment-Date: Mon, 02 Dec 2019 18:43:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:43:41 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:43:41 +0000 Subject: Change in simtrace2[master]: simtrace2-remsim: Use simplest ATR In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16420 ) Change subject: simtrace2-remsim: Use simplest ATR ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I5a4f2f94bea1a15aedbef5a6f2f49344387dc11d Gerrit-Change-Number: 16420 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-Comment-Date: Mon, 02 Dec 2019 18:43:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:43:44 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:43:44 +0000 Subject: Change in simtrace2[master]: cardem: use simplest ATR as default ATR In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16421 ) Change subject: cardem: use simplest ATR as default ATR ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I4ff41b5120bcadca652296f9d3691f7606be2bd2 Gerrit-Change-Number: 16421 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-Comment-Date: Mon, 02 Dec 2019 18:43:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:43:45 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:43:45 +0000 Subject: Change in simtrace2[master]: simtrace2_api: Remove dead code In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16410 ) Change subject: simtrace2_api: Remove dead code ...................................................................... simtrace2_api: Remove dead code Change-Id: Iab393a6cf9ae1218e1554d9c0bfb7aab2cc3c35e --- M host/lib/simtrace2_api.c 1 file changed, 0 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/host/lib/simtrace2_api.c b/host/lib/simtrace2_api.c index 7a0289d..b2b2829 100644 --- a/host/lib/simtrace2_api.c +++ b/host/lib/simtrace2_api.c @@ -38,11 +38,8 @@ #include -//#include #include #include -//#include "apdu_dispatch.h" -//#include "simtrace2-discovery.h" #include #include @@ -60,14 +57,6 @@ return msgb_alloc_headroom(1024+32, 32, "SIMtrace"); } -#if 0 -static void apdu_out_cb(uint8_t *buf, unsigned int len, void *user_data) -{ - printf("APDU: %s\n", osmo_hexdump(buf, len)); - gsmtap_send_sim(buf, len); -} -#endif - /*! \brief Transmit a given command to the SIMtrace2 device */ int osmo_st2_transp_tx_msg(struct osmo_st2_transport *transp, struct msgb *msg) { -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Iab393a6cf9ae1218e1554d9c0bfb7aab2cc3c35e Gerrit-Change-Number: 16410 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:43:46 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:43:46 +0000 Subject: Change in simtrace2[master]: minor: fix spacing In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16411 ) Change subject: minor: fix spacing ...................................................................... minor: fix spacing Change-Id: I2f3127c7b276c9726fd0242e3e29be22f9d6255c --- M firmware/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/Makefile b/firmware/Makefile index a879297..9a03eca 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -100,7 +100,7 @@ C_LIBCOMMON = string.c stdio.c fputs.c usb_buf.c ringbuffer.c pseudo_talloc.c host_communication.c C_BOARD = $(notdir $(wildcard libboard/common/source/*.c)) -C_BOARD += $(notdir $(wildcard libboard/$(BOARD)/source/*.c)) +C_BOARD += $(notdir $(wildcard libboard/$(BOARD)/source/*.c)) C_APPLEVEL = $(notdir $(wildcard apps/$(APP)/*.c)) -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2f3127c7b276c9726fd0242e3e29be22f9d6255c Gerrit-Change-Number: 16411 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:43:46 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:43:46 +0000 Subject: Change in simtrace2[master]: fix baudrate of 'make log' In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16412 ) Change subject: fix baudrate of 'make log' ...................................................................... fix baudrate of 'make log' Change-Id: Id186a594b1ce3ea0cd38f0cb82a99e5d87101433 --- M firmware/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/Makefile b/firmware/Makefile index 9a03eca..4318e2d 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -231,7 +231,7 @@ SERIAL ?= /dev/ttyUSB0 log: - stty -F $(SERIAL) 115200 + stty -F $(SERIAL) 921600 lsof $(SERIAL) && echo "log is already opened" || ( sed -u "s/\r//" $(SERIAL) | ts ) clean: -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Id186a594b1ce3ea0cd38f0cb82a99e5d87101433 Gerrit-Change-Number: 16412 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:43:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:43:47 +0000 Subject: Change in simtrace2[master]: minor: updated copyright years In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16413 ) Change subject: minor: updated copyright years ...................................................................... minor: updated copyright years Change-Id: I9254b1ddf6436b5a4964b9124a36ae17bfc22886 --- M firmware/apps/cardem/main.c M firmware/apps/dfu/main.c 2 files changed, 6 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c index 209c79f..3c5a32c 100644 --- a/firmware/apps/cardem/main.c +++ b/firmware/apps/cardem/main.c @@ -1,7 +1,7 @@ /* SIMtrace 2 firmware card emulation application * * (C) 2015-2017 by Harald Welte - * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon + * (C) 2018-2019, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -158,7 +158,8 @@ printf("\n\r\n\r" "=============================================================================\n\r" - "SIMtrace2 firmware " GIT_VERSION " (C) 2010-2016 by Harald Welte\n\r" + "SIMtrace2 firmware " GIT_VERSION "\n\r" + "(C) 2010-2017 by Harald Welte, 2018-2019 by Kevin Redon\n\r" "=============================================================================\n\r"); #if (TRACE_LEVEL >= TRACE_LEVEL_INFO) diff --git a/firmware/apps/dfu/main.c b/firmware/apps/dfu/main.c index f9b6aed..271fbec 100644 --- a/firmware/apps/dfu/main.c +++ b/firmware/apps/dfu/main.c @@ -1,7 +1,7 @@ /* SIMtrace 2 firmware USB DFU bootloader * * (C) 2015-2017 by Harald Welte - * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon + * (C) 2018-2019 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -248,7 +248,8 @@ printf("\n\r\n\r" "=============================================================================\n\r" - "DFU bootloader %s for board %s (C) 2010-2017 by Harald Welte\n\r" + "DFU bootloader %s for board %s\n\r" + "(C) 2010-2017 by Harald Welte, 2018-2019 by Kevin Redon\n\r" "=============================================================================\n\r", manifest_revision, manifest_board); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I9254b1ddf6436b5a4964b9124a36ae17bfc22886 Gerrit-Change-Number: 16413 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:43:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:43:47 +0000 Subject: Change in simtrace2[master]: dfu: minor: make debug output only verbose in info level In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16414 ) Change subject: dfu: minor: make debug output only verbose in info level ...................................................................... dfu: minor: make debug output only verbose in info level the longer output is to fast and often incomplete. the shorter version is enough to view the progress when not debugging. Change-Id: I97bb84da68d1f3bc14fb7c05400edf1748f55460 --- M firmware/apps/dfu/main.c 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/apps/dfu/main.c b/firmware/apps/dfu/main.c index 271fbec..97cd074 100644 --- a/firmware/apps/dfu/main.c +++ b/firmware/apps/dfu/main.c @@ -66,7 +66,11 @@ WDT_Restart(WDT); } - printf("dnload(altif=%u, offset=%u, len=%u)\n\r", altif, offset, len); +#if TRACE_LEVEL >= TRACE_LEVEL_INFO + TRACE_INFO("dnload(altif=%u, offset=%u, len=%u)\n\r", altif, offset, len); +#else + printf("DL off=%u\n\r", offset); +#endif #ifdef PINS_LEDS PIO_Clear(&pinsLeds[LED_NUM_RED]); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I97bb84da68d1f3bc14fb7c05400edf1748f55460 Gerrit-Change-Number: 16414 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:43:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:43:48 +0000 Subject: Change in simtrace2[master]: minor: move USB debug output from info to debug level In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16415 ) Change subject: minor: move USB debug output from info to debug level ...................................................................... minor: move USB debug output from info to debug level else it's too nosy while debugging other components, not often used, and break the flow since it does not and a line. Change-Id: I8920ff7c33b4c9fb174bb31a29334a63fcbede43 --- M firmware/atmel_softpack_libraries/usb/device/core/USBDDriver.c 1 file changed, 24 insertions(+), 24 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/atmel_softpack_libraries/usb/device/core/USBDDriver.c b/firmware/atmel_softpack_libraries/usb/device/core/USBDDriver.c index 22889cf..c6cf6e0 100644 --- a/firmware/atmel_softpack_libraries/usb/device/core/USBDDriver.c +++ b/firmware/atmel_softpack_libraries/usb/device/core/USBDDriver.c @@ -251,7 +251,7 @@ switch (type) { case USBGenericDescriptor_DEVICE: - TRACE_INFO_WP("Dev "); + TRACE_DEBUG_WP("Dev "); /* Adjust length and send descriptor */ @@ -263,7 +263,7 @@ break; case USBGenericDescriptor_CONFIGURATION: - TRACE_INFO_WP("Cfg "); + TRACE_DEBUG_WP("Cfg "); /* Adjust length and send descriptor */ @@ -280,7 +280,7 @@ break; case USBGenericDescriptor_DEVICEQUALIFIER: - TRACE_INFO_WP("Qua "); + TRACE_DEBUG_WP("Qua "); /* Check if descriptor exists */ @@ -301,7 +301,7 @@ break; case USBGenericDescriptor_OTHERSPEEDCONFIGURATION: - TRACE_INFO_WP("OSC "); + TRACE_DEBUG_WP("OSC "); /* Check if descriptor exists */ @@ -327,7 +327,7 @@ break; case USBGenericDescriptor_STRING: - TRACE_INFO_WP("Str%d ", indexRDesc); + TRACE_DEBUG_WP("Str%d ", indexRDesc); /* Check if descriptor exists */ @@ -504,13 +504,13 @@ uint32_t length; uint32_t address; - TRACE_INFO_WP("Std "); + TRACE_DEBUG_WP("Std "); /* Check request code */ switch (USBGenericRequest_GetRequest(pRequest)) { case USBGenericRequest_GETDESCRIPTOR: - TRACE_INFO_WP("gDesc "); + TRACE_DEBUG_WP("gDesc "); /* Send the requested descriptor */ type = USBGetDescriptorRequest_GetDescriptorType(pRequest); @@ -520,7 +520,7 @@ break; case USBGenericRequest_SETADDRESS: - TRACE_INFO_WP("sAddr "); + TRACE_DEBUG_WP("sAddr "); /* Sends a zero-length packet and then set the device address */ address = USBSetAddressRequest_GetAddress(pRequest); @@ -528,7 +528,7 @@ break; case USBGenericRequest_SETCONFIGURATION: - TRACE_INFO_WP("sCfg "); + TRACE_DEBUG_WP("sCfg "); /* Set the requested configuration */ cfgnum = USBSetConfigurationRequest_GetConfiguration(pRequest); @@ -536,27 +536,27 @@ break; case USBGenericRequest_GETCONFIGURATION: - TRACE_INFO_WP("gCfg "); + TRACE_DEBUG_WP("gCfg "); /* Send the current configuration number */ GetConfiguration(pDriver); break; case USBGenericRequest_GETSTATUS: - TRACE_INFO_WP("gSta "); + TRACE_DEBUG_WP("gSta "); /* Check who is the recipient */ switch (USBGenericRequest_GetRecipient(pRequest)) { case USBGenericRequest_DEVICE: - TRACE_INFO_WP("Dev "); + TRACE_DEBUG_WP("Dev "); /* Send the device status */ GetDeviceStatus(pDriver); break; case USBGenericRequest_ENDPOINT: - TRACE_INFO_WP("Ept "); + TRACE_DEBUG_WP("Ept "); /* Send the endpoint status */ eptnum = USBGenericRequest_GetEndpointNumber(pRequest); @@ -572,13 +572,13 @@ break; case USBGenericRequest_CLEARFEATURE: - TRACE_INFO_WP("cFeat "); + TRACE_DEBUG_WP("cFeat "); /* Check which is the requested feature */ switch (USBFeatureRequest_GetFeatureSelector(pRequest)) { case USBFeatureRequest_ENDPOINTHALT: - TRACE_INFO_WP("Hlt "); + TRACE_DEBUG_WP("Hlt "); /* Unhalt endpoint and send a zero-length packet */ USBD_Unhalt(USBGenericRequest_GetEndpointNumber(pRequest)); @@ -586,7 +586,7 @@ break; case USBFeatureRequest_DEVICEREMOTEWAKEUP: - TRACE_INFO_WP("RmWU "); + TRACE_DEBUG_WP("RmWU "); /* Disable remote wake-up and send a zero-length packet */ pDriver->isRemoteWakeUpEnabled = 0; @@ -602,13 +602,13 @@ break; case USBGenericRequest_SETFEATURE: - TRACE_INFO_WP("sFeat "); + TRACE_DEBUG_WP("sFeat "); /* Check which is the selected feature */ switch (USBFeatureRequest_GetFeatureSelector(pRequest)) { case USBFeatureRequest_DEVICEREMOTEWAKEUP: - TRACE_INFO_WP("RmWU "); + TRACE_DEBUG_WP("RmWU "); /* Enable remote wake-up and send a ZLP */ pDriver->isRemoteWakeUpEnabled = 1; @@ -616,25 +616,25 @@ break; case USBFeatureRequest_ENDPOINTHALT: - TRACE_INFO_WP("Halt "); + TRACE_DEBUG_WP("Halt "); /* Halt endpoint */ USBD_Halt(USBGenericRequest_GetEndpointNumber(pRequest)); USBD_Write(0, 0, 0, 0, 0); break; case USBFeatureRequest_OTG_B_HNP_ENABLE: - TRACE_INFO_WP("OTG_B_HNP_ENABLE "); + TRACE_DEBUG_WP("OTG_B_HNP_ENABLE "); pDriver->otg_features_supported |= 1<otg_features_supported |= 1<otg_features_supported |= 1< Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:43:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:43:48 +0000 Subject: Change in simtrace2[master]: minor: improve debug output In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16416 ) Change subject: minor: improve debug output ...................................................................... minor: improve debug output Change-Id: Ibfc22b95c0be3ac78bd50a40e31cc7d8546d81d9 --- M firmware/libcommon/source/sniffer.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c index 33c16d3..82c4b3f 100644 --- a/firmware/libcommon/source/sniffer.c +++ b/firmware/libcommon/source/sniffer.c @@ -214,8 +214,8 @@ if (0 != d) { wt_d = d; } - wt = wt_wi*960UL*wt_d; - TRACE_INFO("WT updated to %lu\n\r", wt); + wt = wt_wi * 960UL * wt_d; + TRACE_INFO("WT updated to %lu ETU\n\r", wt); } /*! Allocate USB buffer and push + initialize simtrace_msg_hdr -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ibfc22b95c0be3ac78bd50a40e31cc7d8546d81d9 Gerrit-Change-Number: 16416 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:43:49 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:43:49 +0000 Subject: Change in simtrace2[master]: minor : fix typo in comment In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16417 ) Change subject: minor : fix typo in comment ...................................................................... minor : fix typo in comment Change-Id: Ie310143fe713a51fa1adf8bf7599374282341f2e --- M firmware/libcommon/source/simtrace_iso7816.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/source/simtrace_iso7816.c b/firmware/libcommon/source/simtrace_iso7816.c index 889ca2d..8ee3f8c 100644 --- a/firmware/libcommon/source/simtrace_iso7816.c +++ b/firmware/libcommon/source/simtrace_iso7816.c @@ -80,7 +80,7 @@ } /* - * char_stat is zero if no error occured. + * char_stat is zero if no error occurred. * Otherwise it is filled with the content of the status register. */ void mode_trace_usart1_irq(void) @@ -110,7 +110,7 @@ rbuf_write(&sim_rcv_buf, c); } else { TRACE_DEBUG("e %x st: %x\n", c, stat); - } /* else: error occured */ + } /* else: error occurred */ char_stat = stat; } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie310143fe713a51fa1adf8bf7599374282341f2e Gerrit-Change-Number: 16417 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:43:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:43:50 +0000 Subject: Change in simtrace2[master]: better detect VCC and nRST changes on simtrace2 board In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16418 ) Change subject: better detect VCC and nRST changes on simtrace2 board ...................................................................... better detect VCC and nRST changes on simtrace2 board monitoring the state changes of the VCC and nRST lines is required to correctly detect warm and cold reset Change-Id: I72099956332724f84226e1495fdc5a5b1a034695 --- M firmware/libboard/simtrace/include/board.h 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libboard/simtrace/include/board.h b/firmware/libboard/simtrace/include/board.h index c109bea..35c9426 100644 --- a/firmware/libboard/simtrace/include/board.h +++ b/firmware/libboard/simtrace/include/board.h @@ -74,9 +74,9 @@ /** Phone connection **/ /* Phone USIM slot 1 VCC pin (VCC_PHONE in schematic) */ -#define PIN_USIM1_VCC {PIO_PA25, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT} +#define PIN_USIM1_VCC {PIO_PA25, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_EDGE | PIO_DEGLITCH } /* Phone USIM slot 1 RST pin (active low; RST_PHONE in schematic) */ -#define PIN_USIM1_nRST {PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_RISE_EDGE | PIO_DEGLITCH } +#define PIN_USIM1_nRST {PIO_PA24, PIOA, ID_PIOA, PIO_INPUT, PIO_IT_EDGE | PIO_DEGLITCH } /* Phone I/O data signal input/output (I/O_PHONE in schematic) */ #define PIN_PHONE_IO {PIO_PA22A_TXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT} /* Phone CLK clock input (CLK_PHONE in schematic) */ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I72099956332724f84226e1495fdc5a5b1a034695 Gerrit-Change-Number: 16418 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:43:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:43:51 +0000 Subject: Change in simtrace2[master]: minor: ignore usbstring binary In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16419 ) Change subject: minor: ignore usbstring binary ...................................................................... minor: ignore usbstring binary Change-Id: I18fc3179f8b7f3f1272d26853007876156fc1e03 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index a4e484c..cb3ffb3 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ host/simtrace2-remsim host/simtrace2-remsim-usb2udp usb_strings_generated.h +firmware/usbstring/usbstring -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I18fc3179f8b7f3f1272d26853007876156fc1e03 Gerrit-Change-Number: 16419 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:43:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:43:51 +0000 Subject: Change in simtrace2[master]: simtrace2-remsim: Use simplest ATR In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16420 ) Change subject: simtrace2-remsim: Use simplest ATR ...................................................................... simtrace2-remsim: Use simplest ATR this ATR does not encode any data and uses all defaults. the lower default speed is also better handled by the hardware. handling faster speeds is upcoming. Change-Id: I5a4f2f94bea1a15aedbef5a6f2f49344387dc11d --- M host/src/simtrace2-remsim.c 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/host/src/simtrace2-remsim.c b/host/src/simtrace2-remsim.c index 03d11df..d51f081 100644 --- a/host/src/simtrace2-remsim.c +++ b/host/src/simtrace2-remsim.c @@ -432,9 +432,7 @@ if (!skip_atr) { /* set the ATR */ - uint8_t real_atr[] = { 0x3B, 0x9F, 0x96, 0x80, 0x1F, 0xC7, 0x80, 0x31, - 0xA0, 0x73, 0xBE, 0x21, 0x13, 0x67, 0x43, 0x20, - 0x07, 0x18, 0x00, 0x00, 0x01, 0xA5 }; + uint8_t real_atr[] = { 0x3B, 0x00 }; // the simplest ATR atr_update_csum(real_atr, sizeof(real_atr)); osmo_st2_cardem_request_set_atr(ci, real_atr, sizeof(real_atr)); } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I5a4f2f94bea1a15aedbef5a6f2f49344387dc11d Gerrit-Change-Number: 16420 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:43:52 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:43:52 +0000 Subject: Change in simtrace2[master]: cardem: use simplest ATR as default ATR In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16421 ) Change subject: cardem: use simplest ATR as default ATR ...................................................................... cardem: use simplest ATR as default ATR This is the shortest and simplest ATR possible according to the ISO 7816-3 spec. It does not offer any non-default parameters (F, D, WI, ...) Change-Id: I4ff41b5120bcadca652296f9d3691f7606be2bd2 --- M firmware/libcommon/source/card_emu.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 497b963..923226a 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -1151,8 +1151,8 @@ } } -/* shortest ATR found in smartcard_list.txt */ -static const uint8_t default_atr[] = { 0x3B, 0x02, 0x14, 0x50 }; +/* shortest ATR possible (uses default speed and no options) */ +static const uint8_t default_atr[] = { 0x3B, 0x00 }; static struct card_handle card_handles[NUM_SLOTS]; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I4ff41b5120bcadca652296f9d3691f7606be2bd2 Gerrit-Change-Number: 16421 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tsaitgaist Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:44:03 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:44:03 +0000 Subject: Change in osmo-gsm-manuals[master]: Cosmetic: fix Makefile.vty.reference.inc example In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16402 ) Change subject: Cosmetic: fix Makefile.vty.reference.inc example ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I20abc1899f4bdf0a11482224937217dfddc17c53 Gerrit-Change-Number: 16402 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Dec 2019 18:44:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:44:10 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:44:10 +0000 Subject: Change in osmo-gsm-manuals[master]: Cosmetic: fix Makefile.vty.reference.inc example In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16402 ) Change subject: Cosmetic: fix Makefile.vty.reference.inc example ...................................................................... Cosmetic: fix Makefile.vty.reference.inc example All files listed in VTY_REFERENCE must end in ".xml". Change-Id: I20abc1899f4bdf0a11482224937217dfddc17c53 --- M build/Makefile.vty-reference.inc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/build/Makefile.vty-reference.inc b/build/Makefile.vty-reference.inc index 9d8f127..0129a5c 100644 --- a/build/Makefile.vty-reference.inc +++ b/build/Makefile.vty-reference.inc @@ -17,7 +17,7 @@ # e.g. # # OSMO_GSM_MANUALS_DIR = .. -# VTY_REFERENCE = osmofoo-vty-reference +# VTY_REFERENCE = osmofoo-vty-reference.xml # include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc # # This uses the Makefile.docbook.inc, you should not mix uses of -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I20abc1899f4bdf0a11482224937217dfddc17c53 Gerrit-Change-Number: 16402 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:45:11 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:45:11 +0000 Subject: Change in libosmo-sccp[master]: xua_asp_fsm: Ensure xUA client includes routing contexts in ASPAC/ASPIA In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16390 ) Change subject: xua_asp_fsm: Ensure xUA client includes routing contexts in ASPAC/ASPIA ...................................................................... xua_asp_fsm: Ensure xUA client includes routing contexts in ASPAC/ASPIA If we are running in ASP (client) role, and we are about to transmit an ASPAC or ASPIA to the SG, we must make sure to include any applicable routing contexts. Change-Id: Iee4f0d553d6845a9ae08cb5e4f57fdec443e4ef9 Related: OS#4285 --- M src/xua_asp_fsm.c 1 file changed, 26 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index ff81edd..9f30559 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -168,6 +168,30 @@ return tmode; } +/* add M3UA_IEI_ROUTE_CTX to xua_msg containig all routing keys of ASs within ASP */ +static int xua_msg_add_asp_rctx(struct xua_msg *xua, struct osmo_ss7_asp *asp) +{ + struct osmo_ss7_as *as; + uint32_t rctx[128]; + unsigned int i = 0; + + /* iterate over all ASs and build array of routing contexts */ + llist_for_each_entry(as, &asp->inst->as_list, list) { + if (!osmo_ss7_as_has_asp(as, asp)) + continue; + rctx[i++] = htonl(as->cfg.routing_key.context); + if (i >= ARRAY_SIZE(rctx)-1) { + break; + } + } + /* add xUA IE with routing contests to the message (if any) */ + if (i) + xua_msg_add_data(xua, M3UA_IEI_ROUTE_CTX, i*sizeof(uint32_t), (uint8_t *)rctx); + + /* return count of routing contexts added */ + return i; +} + /* ask the xUA implementation to transmit a specific message */ static int peer_send(struct osmo_fsm_inst *fi, int out_event, struct xua_msg *in) { @@ -220,6 +244,7 @@ if (rc >= 0) xua_msg_add_u32(xua, M3UA_IEI_TRAF_MODE_TYP, osmo_ss7_tmode_to_xua(rc)); /* Optional: Routing Context */ + xua_msg_add_asp_rctx(xua, asp); /* Optional: TID Label */ /* Optional: DRN Label */ /* Optional: Info String */ @@ -237,6 +262,7 @@ /* RFC3868 Ch. 3.6.3 */ xua->hdr = XUA_HDR(SUA_MSGC_ASPTM, SUA_ASPTM_INACTIVE); /* Optional: Routing Context */ + xua_msg_add_asp_rctx(xua, asp); /* Optional: Info String */ break; case XUA_ASP_E_ASPTM_ASPIA_ACK: -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iee4f0d553d6845a9ae08cb5e4f57fdec443e4ef9 Gerrit-Change-Number: 16390 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:46:40 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:46:40 +0000 Subject: Change in osmo-ccid-firmware[master]: rename the global talloc context In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16401 ) Change subject: rename the global talloc context ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Idced24869863983bfde0c9c438498999717f2042 Gerrit-Change-Number: 16401 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Dec 2019 18:46:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:46:44 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:46:44 +0000 Subject: Change in osmo-ccid-firmware[master]: rename the global talloc context In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16401 ) Change subject: rename the global talloc context ...................................................................... rename the global talloc context both the host and the firmware build require a global talloc context with external linkage, so let's agree on one name. Change-Id: Idced24869863983bfde0c9c438498999717f2042 --- M ccid_host/ccid_main_functionfs.c M ccid_host/cuart_fsm_test.c M ccid_host/hub_main_functionfs.c 3 files changed, 15 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ccid_host/ccid_main_functionfs.c b/ccid_host/ccid_main_functionfs.c index 8e95c73..d3e0c3c 100644 --- a/ccid_host/ccid_main_functionfs.c +++ b/ccid_host/ccid_main_functionfs.c @@ -506,13 +506,13 @@ .send_int = ccid_ops_send_int, }; -static void *tall_main_ctx; +void *g_tall_ctx; static void signal_handler(int signal) { switch (signal) { case SIGUSR1: - talloc_report_full(tall_main_ctx, stderr); + talloc_report_full(g_tall_ctx, stderr); break; } } @@ -523,9 +523,9 @@ struct ufunc_handle ufh = (struct ufunc_handle) { 0, }; int rc; - tall_main_ctx = talloc_named_const(NULL, 0, "ccid_main_functionfs"); - msgb_talloc_ctx_init(tall_main_ctx, 0); - osmo_init_logging2(tall_main_ctx, &log_info); + g_tall_ctx = talloc_named_const(NULL, 0, "ccid_main_functionfs"); + msgb_talloc_ctx_init(g_tall_ctx, 0); + osmo_init_logging2(g_tall_ctx, &log_info); signal(SIGUSR1, &signal_handler); diff --git a/ccid_host/cuart_fsm_test.c b/ccid_host/cuart_fsm_test.c index 1151b34..5b03bfe 100644 --- a/ccid_host/cuart_fsm_test.c +++ b/ccid_host/cuart_fsm_test.c @@ -37,13 +37,13 @@ } } -static void *tall_main_ctx; +static void *g_tall_ctx; static void signal_handler(int signal) { switch (signal) { case SIGUSR1: - talloc_report_full(tall_main_ctx, stderr); + talloc_report_full(g_tall_ctx, stderr); break; } } @@ -54,9 +54,9 @@ uint8_t atr[64]; int rc; - tall_main_ctx = talloc_named_const(NULL, 0, "main"); - msgb_talloc_ctx_init(tall_main_ctx, 0); - osmo_init_logging2(tall_main_ctx, &log_info); + g_tall_ctx = talloc_named_const(NULL, 0, "main"); + msgb_talloc_ctx_init(g_tall_ctx, 0); + osmo_init_logging2(g_tall_ctx, &log_info); osmo_fsm_log_addr(false); signal(SIGUSR1, &signal_handler); diff --git a/ccid_host/hub_main_functionfs.c b/ccid_host/hub_main_functionfs.c index c019cde..f350e50 100644 --- a/ccid_host/hub_main_functionfs.c +++ b/ccid_host/hub_main_functionfs.c @@ -464,13 +464,13 @@ .num_cat = ARRAY_SIZE(log_info_cat), }; -static void *tall_main_ctx; +static void *g_tall_ctx; static void signal_handler(int signal) { switch (signal) { case SIGUSR1: - talloc_report_full(tall_main_ctx, stderr); + talloc_report_full(g_tall_ctx, stderr); break; } } @@ -481,9 +481,9 @@ struct ufunc_handle ufh = (struct ufunc_handle) { 0, }; int rc; - tall_main_ctx = talloc_named_const(NULL, 0, "hub_main_functionfs"); - msgb_talloc_ctx_init(tall_main_ctx, 0); - osmo_init_logging2(tall_main_ctx, &log_info); + g_tall_ctx = talloc_named_const(NULL, 0, "hub_main_functionfs"); + msgb_talloc_ctx_init(g_tall_ctx, 0); + osmo_init_logging2(g_tall_ctx, &log_info); signal(SIGUSR1, &signal_handler); -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Idced24869863983bfde0c9c438498999717f2042 Gerrit-Change-Number: 16401 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:46:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:46:51 +0000 Subject: Change in osmo-ccid-firmware[master]: reenable host builds In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16320 ) Change subject: reenable host builds ...................................................................... reenable host builds Change-Id: Ie00468b7abcd1e9a3efe85b52f08a708430426fe --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 4ba1f19..6fd8469 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -14,7 +14,7 @@ inst="$TOPDIR/install" export deps inst -: ' + echo echo "=============== libosmocore hostt build ===========" osmo-build-dep.sh libosmocore "" --disable-doxygen @@ -28,7 +28,7 @@ make clean make $PARALLEL_MAKE make clean -' + # adapted from echo echo "=============== libosmocore cross-build ===========" -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ie00468b7abcd1e9a3efe85b52f08a708430426fe Gerrit-Change-Number: 16320 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:48:09 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:48:09 +0000 Subject: Change in osmo-hlr[master]: AUC: Add support for setting the AMF separation bit to '1' for EUTRAN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15364 ) Change subject: AUC: Add support for setting the AMF separation bit to '1' for EUTRAN ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ic766bc40f6126bb479bd0a05b0e96bec3e240008 Gerrit-Change-Number: 15364 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Dec 2019 18:48:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 18:48:11 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 18:48:11 +0000 Subject: Change in osmo-hlr[master]: AUC: Add support for setting the AMF separation bit to '1' for EUTRAN In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15364 ) Change subject: AUC: Add support for setting the AMF separation bit to '1' for EUTRAN ...................................................................... AUC: Add support for setting the AMF separation bit to '1' for EUTRAN Despite LTE/EUTRAN using the same authentication procedure (UMTS AKA) as 3G, there's one difference: The "operator defined" 16bit AMF field is reduced to 15 bits, with the first bit now being used as 'separation bit'. That bit should be '0' for 2G/3G (as it is right now) and '1' for authentication vectores generated for authentication over EUTRAN/EPS. Depends: libosmocore I93850710ab55a605bf61b95063a69682a2899bb1 (OSMO_GSUP_RAT_TYPES_IE) Change-Id: Ic766bc40f6126bb479bd0a05b0e96bec3e240008 --- M include/osmocom/hlr/db.h M src/db_auc.c M src/hlr.c M tests/db/db_test.c M tests/db/db_test.err 5 files changed, 26 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/hlr/db.h b/include/osmocom/hlr/db.h index eacc78e..c927099 100644 --- a/include/osmocom/hlr/db.h +++ b/include/osmocom/hlr/db.h @@ -66,7 +66,7 @@ int db_get_auc(struct db_context *dbc, const char *imsi, unsigned int auc_3g_ind, struct osmo_auth_vector *vec, unsigned int num_vec, const uint8_t *rand_auts, - const uint8_t *auts); + const uint8_t *auts, bool separation_bit); #include #include diff --git a/src/db_auc.c b/src/db_auc.c index e3a840e..ecb9f58 100644 --- a/src/db_auc.c +++ b/src/db_auc.c @@ -189,7 +189,7 @@ int db_get_auc(struct db_context *dbc, const char *imsi, unsigned int auc_3g_ind, struct osmo_auth_vector *vec, unsigned int num_vec, const uint8_t *rand_auts, - const uint8_t *auts) + const uint8_t *auts, bool separation_bit) { struct osmo_sub_auth_data aud2g, aud3g; int64_t subscr_id; @@ -209,6 +209,12 @@ aud3g.u.umts.ind_bitlen, aud3g.u.umts.ind); aud3g.u.umts.ind &= (1U << aud3g.u.umts.ind_bitlen) - 1; } + /* the first bit (bit0) cannot be used as AMF anymore, but has been + * re-appropriated as the separation bit. See 3GPP TS 33.102 Annex H + * together with 3GPP TS 33.401 / 33.402 / 33.501 */ + aud3g.u.umts.amf[0] = aud3g.u.umts.amf[0] & 0x7f; + if (separation_bit) + aud3g.u.umts.amf[0] |= 0x80; LOGAUC(imsi, LOGL_DEBUG, "Calling to generate %u vectors\n", num_vec); rc = auc_compute_vectors(vec, num_vec, &aud2g, &aud3g, rand_auts, auts); diff --git a/src/hlr.c b/src/hlr.c index 1638e67..a71b7e1 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -233,6 +233,7 @@ { struct osmo_gsup_message gsup_out; struct msgb *msg_out; + bool separation_bit = false; int rc; subscr_create_on_demand(gsup->imsi); @@ -241,10 +242,13 @@ memset(&gsup_out, 0, sizeof(gsup_out)); memcpy(&gsup_out.imsi, &gsup->imsi, sizeof(gsup_out.imsi)); + if (gsup->current_rat_type == OSMO_RAT_EUTRAN_SGS) + separation_bit = true; + rc = db_get_auc(dbc, gsup->imsi, conn->auc_3g_ind, gsup_out.auth_vectors, ARRAY_SIZE(gsup_out.auth_vectors), - gsup->rand, gsup->auts); + gsup->rand, gsup->auts, separation_bit); if (rc <= 0) { gsup_out.message_type = OSMO_GSUP_MSGT_SEND_AUTH_INFO_ERROR; switch (rc) { diff --git a/tests/db/db_test.c b/tests/db/db_test.c index d6060dd..b9b263d 100644 --- a/tests/db/db_test.c +++ b/tests/db/db_test.c @@ -115,7 +115,7 @@ #define ASSERT_DB_GET_AUC(imsi, expect_rc) \ do { \ struct osmo_auth_vector vec[N_VECTORS]; \ - ASSERT_RC(db_get_auc(dbc, imsi, 3, vec, N_VECTORS, NULL, NULL), expect_rc); \ + ASSERT_RC(db_get_auc(dbc, imsi, 3, vec, N_VECTORS, NULL, NULL, false), expect_rc); \ } while (0) /* Not linking the real auc_compute_vectors(), just returning num_vec. diff --git a/tests/db/db_test.err b/tests/db/db_test.err index a3e4d58..6423550 100644 --- a/tests/db/db_test.err +++ b/tests/db/db_test.err @@ -814,7 +814,7 @@ DAUC IMSI='999999999': No such subscriber -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -2 +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL, false) --> -2 DAUC IMSI='123456789000000': No such subscriber @@ -833,7 +833,7 @@ DAUC IMSI='123456789000000': No 3G Auth Data -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -ENOKEY +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL, false) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data @@ -852,7 +852,7 @@ } 3G: none -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> 3 +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL, false) --> 3 DAUC IMSI='123456789000000': No 3G Auth Data DAUC IMSI='123456789000000': Calling to generate 3 vectors DAUC IMSI='123456789000000': Generated 3 vectors @@ -915,7 +915,7 @@ DAUC IMSI='123456789000000': No 3G Auth Data -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -ENOKEY +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL, false) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data @@ -940,7 +940,7 @@ DAUC IMSI='123456789000000': No 3G Auth Data -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -ENOKEY +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL, false) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data @@ -963,7 +963,7 @@ .u.umts.ind_bitlen = 5, } -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> 3 +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL, false) --> 3 DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': Calling to generate 3 vectors DAUC IMSI='123456789000000': Generated 3 vectors @@ -1042,7 +1042,7 @@ DAUC IMSI='123456789000000': No 3G Auth Data -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -ENOKEY +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL, false) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data @@ -1064,7 +1064,7 @@ .u.umts.ind_bitlen = 5, } -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> 3 +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL, false) --> 3 DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': Calling to generate 3 vectors DAUC IMSI='123456789000000': Generated 3 vectors @@ -1077,7 +1077,7 @@ DAUC IMSI='123456789000000': No 3G Auth Data -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -ENOKEY +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL, false) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data @@ -1105,7 +1105,7 @@ .u.umts.ind_bitlen = 5, } -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> 3 +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL, false) --> 3 DAUC IMSI='123456789000000': Calling to generate 3 vectors DAUC IMSI='123456789000000': Generated 3 vectors DAUC IMSI='123456789000000': Updating SQN=0 in DB @@ -1323,7 +1323,7 @@ DAUC IMSI='123456789000000': No 3G Auth Data -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -ENOKEY +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL, false) --> -ENOKEY DAUC IMSI='123456789000000': No 2G Auth Data DAUC IMSI='123456789000000': No 3G Auth Data @@ -1332,7 +1332,7 @@ db_subscr_get_by_imsi(dbc, imsi0, &g_subscr) --> -ENOENT DAUC Cannot read subscriber from db: IMSI='123456789000000': No such subscriber -db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL) --> -2 +db_get_auc(dbc, imsi0, 3, vec, N_VECTORS, NULL, NULL, false) --> -2 DAUC IMSI='123456789000000': No such subscriber ===== test_subscr_aud: SUCCESS -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ic766bc40f6126bb479bd0a05b0e96bec3e240008 Gerrit-Change-Number: 15364 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:19:56 2019 From: gerrit-no-reply at lists.osmocom.org (gnutoo) Date: Mon, 2 Dec 2019 23:19:56 +0000 Subject: Change in pysim[master]: python3 conversion: Use braces around print calls In-Reply-To: References: Message-ID: Hello fixeria, neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/15502 to look at the new patch set (#3). Change subject: python3 conversion: Use braces around print calls ...................................................................... python3 conversion: Use braces around print calls This is required to run under python3. Without it we have errors that looks like that: $ python3 pySim-read.py File "pySim-read.py", line 132 print "HPLMNAcT: Can't read file -- " + str(e) SyntaxError: invalid syntax Signed-off-by: Denis 'GNUtoo' Carikli Change-Id: Ia472baa8c14b87fe917ea52a998d5ccda66d20d1 --- M README.md M pySim-prog.py M pySim-read.py M pySim/card_handler.py M pySim/transport/serial.py 5 files changed, 51 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/02/15502/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia472baa8c14b87fe917ea52a998d5ccda66d20d1 Gerrit-Change-Number: 15502 Gerrit-PatchSet: 3 Gerrit-Owner: gnutoo Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:19:56 2019 From: gerrit-no-reply at lists.osmocom.org (gnutoo) Date: Mon, 2 Dec 2019 23:19:56 +0000 Subject: Change in pysim[master]: switch to python3 In-Reply-To: References: Message-ID: Hello fixeria, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/15504 to look at the new patch set (#5). Change subject: switch to python3 ...................................................................... switch to python3 Signed-off-by: Denis 'GNUtoo' Carikli Change-Id: I430d173535e0cd5bb895b9dfc9070cbc40cfc8ff --- M contrib/jenkins.sh M pySim-prog.py M pySim-read.py 3 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/04/15504/5 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I430d173535e0cd5bb895b9dfc9070cbc40cfc8ff Gerrit-Change-Number: 15504 Gerrit-PatchSet: 5 Gerrit-Owner: gnutoo Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:21:23 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:21:23 +0000 Subject: Change in osmo-bts[master]: common/abis.c: use tall_bts_ctx as talloc-context for libosmo_abis_in... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16397 ) Change subject: common/abis.c: use tall_bts_ctx as talloc-context for libosmo_abis_init() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic8d9fc7ce3da8abf0ea73d2b20366133cd801c37 Gerrit-Change-Number: 16397 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Dec 2019 23:21:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:21:27 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:21:27 +0000 Subject: Change in osmo-bts[master]: common/abis.c: use tall_bts_ctx as talloc-context for libosmo_abis_in... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16397 ) Change subject: common/abis.c: use tall_bts_ctx as talloc-context for libosmo_abis_init() ...................................................................... common/abis.c: use tall_bts_ctx as talloc-context for libosmo_abis_init() This way it's much easier to introspect the library internal talloc allocations from the VTY interface. Change-Id: Ic8d9fc7ce3da8abf0ea73d2b20366133cd801c37 --- M src/common/abis.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/common/abis.c b/src/common/abis.c index e18e8d9..2da1ddd 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -258,7 +258,7 @@ g_bts = bts; oml_init(&bts->mo); - libosmo_abis_init(NULL); + libosmo_abis_init(tall_bts_ctx); osmo_signal_register_handler(SS_L_INPUT, &inp_s_cbfn, bts); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic8d9fc7ce3da8abf0ea73d2b20366133cd801c37 Gerrit-Change-Number: 16397 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:22:22 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:22:22 +0000 Subject: Change in osmo-sgsn[master]: gitignore: fix paths to binaries In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16405 ) Change subject: gitignore: fix paths to binaries ...................................................................... gitignore: fix paths to binaries Change-Id: Ia968bbc5de34e9068d4b414e5a701b958ae517e5 --- M .gitignore 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 70193ff..b3e50f5 100644 --- a/.gitignore +++ b/.gitignore @@ -39,9 +39,9 @@ # apps and app data -src/gprs/osmo-sgsn -src/gprs/osmo-gbproxy -src/gprs/osmo-gtphub +src/sgsn/osmo-sgsn +src/gbproxy/osmo-gbproxy +src/gtphub/osmo-gtphub src/libcommon/gsup_test_client #tests -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ia968bbc5de34e9068d4b414e5a701b958ae517e5 Gerrit-Change-Number: 16405 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:23:17 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:23:17 +0000 Subject: Change in libosmo-abis[master]: Enable DAHDI support by default; require --disable-dahdi otherwise In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16023 ) Change subject: Enable DAHDI support by default; require --disable-dahdi otherwise ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Id9f7f063e7ca9e3ab4aa96fc93f243caf50fb66a Gerrit-Change-Number: 16023 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Dec 2019 23:23:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:23:20 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:23:20 +0000 Subject: Change in libosmo-abis[master]: Enable DAHDI support by default; require --disable-dahdi otherwise In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16023 ) Change subject: Enable DAHDI support by default; require --disable-dahdi otherwise ...................................................................... Enable DAHDI support by default; require --disable-dahdi otherwise libosmo-abis was built with DAHDI support, if the related header files were present at built time, and without if not. This kind of automagic enabling/disabling of features is wrong. Let's require DAHDI support by default, and force the user to take a conscious decision by using an explicit --disable-dahdi if he doesn't want it. At the same time, update debian/control to list dahdi-source as build dependency. Change-Id: Id9f7f063e7ca9e3ab4aa96fc93f243caf50fb66a Closes: OS#4248 --- M configure.ac M debian/control M src/Makefile.am M src/input/dahdi.c 4 files changed, 14 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index ba33ed9..5a83eb1 100644 --- a/configure.ac +++ b/configure.ac @@ -64,7 +64,16 @@ PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) PKG_CHECK_MODULES(ORTP, ortp >= 0.22.0) -AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built)) +AC_ARG_ENABLE([dahdi], + AC_HELP_STRING([--disable-dahdi], + [disable support for DAHID ISDN (E1/T1) cards [default=yes]]), + [enable_dahdi="$enableval"], [enable_dahdi="yes"]) +AM_CONDITIONAL(ENABLE_DAHDI, test "x$enable_dahdi" = "xyes") +if test "x$enable_dahdi" = "xyes"; then + AC_CHECK_HEADERS([dahdi/user.h],[],[AC_MSG_ERROR([DAHDI input driver enabled but DAHDI not found])]) +else + AC_MSG_WARN([DAHDI input driver will not be built]) +fi AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/debian/control b/debian/control index 24a082e..b9e2078 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ autotools-dev, autoconf, automake, + dahdi-source, libtool, dh-autoreconf, libdpkg-perl, diff --git a/src/Makefile.am b/src/Makefile.am index f4277ae..9c438c9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,7 +19,6 @@ ipa_proxy.c \ subchan_demux.c \ trau_frame.c \ - input/dahdi.c \ input/ipa.c \ input/ipa_keepalive.c \ input/ipaccess.c \ @@ -28,6 +27,9 @@ input/misdn.c \ input/rs232.c \ input/unixsocket.c +if ENABLE_DAHDI +libosmoabis_la_SOURCES += input/dahdi.c +endif libosmotrau_la_CFLAGS = $(AM_CFLAGS) $(ORTP_CFLAGS) libosmotrau_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(TRAU_LIBVERSION) diff --git a/src/input/dahdi.c b/src/input/dahdi.c index 6594eea..5da0a2d 100644 --- a/src/input/dahdi.c +++ b/src/input/dahdi.c @@ -26,8 +26,6 @@ #include "config.h" -#ifdef HAVE_DAHDI_USER_H - #include #include #include @@ -756,5 +754,3 @@ /* register the driver with the core */ return e1inp_driver_register(&dahdi_driver); } - -#endif /* HAVE_DAHDI_USER_H */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Id9f7f063e7ca9e3ab4aa96fc93f243caf50fb66a Gerrit-Change-Number: 16023 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:24:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:24:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: expect only one Paging on GERAN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16301 ) Change subject: msc: expect only one Paging on GERAN ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie914ea88f31ac158f4bd1700143bbe728dd05e0b Gerrit-Change-Number: 16301 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Dec 2019 23:24:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:26:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:26:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: add tests for SMS and voice call while Paging In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297 ) Change subject: msc: add tests for SMS and voice call while Paging ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297/2/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297/2/msc/MSC_Tests.ttcn at 168 PS2, Line 168: private function f_logp(charstring log_msg) runs on BSC_ConnHdlr > Does it really need to run on BSC_ConnHdlr? Can we move this function to library/ ? Ack https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297/2/msc/MSC_Tests.ttcn at 1938 PS2, Line 1938: spars.tp.ud := 'C8329BFD064D9B53'O; > what are these hexstrings? TP-UD should ring a Bell: tdpdu user data, i.e. the SMS payload -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ieeae6322d4e80893ea3408c6b74bf8e32bea8e46 Gerrit-Change-Number: 16297 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 02 Dec 2019 23:26:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:26:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:26:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: fix 2 Iu tests: use f_mm_common() instead of f_mm_auth() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16299 ) Change subject: msc: fix 2 Iu tests: use f_mm_common() instead of f_mm_auth() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id2bf160ac4e1cad4770202c6a6f1b8eeeee21d68 Gerrit-Change-Number: 16299 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Dec 2019 23:26:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:27:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:27:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Iu: fix missing 'ran_is_geran := false' for TC_iu_lu_and_mt_sms_... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16300 ) Change subject: msc: Iu: fix missing 'ran_is_geran := false' for TC_iu_lu_and_mt_sms_paging_repeated ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I011795cacf62f2cac6861fe657966795e6370ddb Gerrit-Change-Number: 16300 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Dec 2019 23:27:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:28:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:28:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: TC_mo_ping_pong: Check DL block is sent and ACK it In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16409 ) Change subject: pcu: TC_mo_ping_pong: Check DL block is sent and ACK it ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icf66dd5c07690368722c586632c38fb7e770053c Gerrit-Change-Number: 16409 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Dec 2019 23:28:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:28:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:28:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: initial checkin of CCID tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16308 ) Change subject: initial checkin of CCID tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16308 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I35f41cb0097a4408afe7c31f42463baaa47f15bd Gerrit-Change-Number: 16308 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Dec 2019 23:28:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:29:08 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:29:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ccid: Many more CCID tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16310 ) Change subject: ccid: Many more CCID tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id046aff7c35b5ad3ab55fdf53a53e7637602d147 Gerrit-Change-Number: 16310 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Dec 2019 23:29:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:29:40 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:29:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pps exchange after power on In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16311 ) Change subject: pps exchange after power on ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibe289de5134eec4f7ba26c75ceb4714ad523f0da Gerrit-Change-Number: 16311 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Dec 2019 23:29:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:29:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:29:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: initial checkin of CCID tests In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16308 ) Change subject: initial checkin of CCID tests ...................................................................... initial checkin of CCID tests Change-Id: I35f41cb0097a4408afe7c31f42463baaa47f15bd --- A ccid/CCID_Tests.cfg A ccid/CCID_Tests.default A ccid/CCID_Tests.ttcn A ccid/gen_links.sh A ccid/regen_makefile.sh M deps/Makefile 6 files changed, 260 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ccid/CCID_Tests.cfg b/ccid/CCID_Tests.cfg new file mode 100644 index 0000000..de427b2 --- /dev/null +++ b/ccid/CCID_Tests.cfg @@ -0,0 +1,20 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"../Common.cfg" +# testsuite specific configuration, not expected to change +"./CCID_Tests.default" + +# Local configuration below + +[LOGGING] +ConsoleMask := ERROR | WARNING | TESTCASE | USER; + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] + + +[MAIN_CONTROLLER] + +[EXECUTE] +CCID_Tests.control diff --git a/ccid/CCID_Tests.default b/ccid/CCID_Tests.default new file mode 100644 index 0000000..f441d67 --- /dev/null +++ b/ccid/CCID_Tests.default @@ -0,0 +1,8 @@ +[LOGGING] +mtc.FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] + +[EXECUTE] diff --git a/ccid/CCID_Tests.ttcn b/ccid/CCID_Tests.ttcn new file mode 100644 index 0000000..a985536 --- /dev/null +++ b/ccid/CCID_Tests.ttcn @@ -0,0 +1,199 @@ +module CCID_Tests { + +import from General_Types all; +import from Osmocom_Types all; +import from Misc_Helpers all; + +import from USB_PortType all; + +import from CCID_Types all; +import from CCID_Templates all; +import from CCID_Emulation all; + +/* global test component; manages CCID device */ +type component Test_CT { + var CCID_Emulation_CT vc_CCID; + port USB_PT USB; + var Slot_CT vc_SLOT[NR_SLOTS]; +}; + +/* per-slot test component; manages one slot */ +type component Slot_CT { + var uint8_t g_slot_nr; + port CCID_SLOT_PT CCID; + timer g_Tguard := 10.0; +}; + +private const integer NR_SLOTS := 4; + +/*********************************************************************** + * helper infrastructure + ***********************************************************************/ + +type function void_fn() runs on Slot_CT; + +/* altstep running on the per-slot test component */ +private altstep as_Tguard() runs on Slot_CT { + [] g_Tguard.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Tguard timeout"); + } +} + +/* first function inside Slot_CT; wait for CCID_EVENT_UP + call testcase-specific function */ +private function f_handler_init(void_fn fn, integer slot_nr) runs on Slot_CT { + g_slot_nr := slot_nr; + CCID.receive(CCID_Emulation_Event:{up_down:=CCID_EVENT_UP}); + g_Tguard.start; + activate(as_Tguard()); + + fn.apply(); +} + +/* start a single slot handler */ +private function f_start_handler(void_fn fn, integer slot_nr) runs on Test_CT +{ + var Slot_CT vc; + + vc_SLOT[slot_nr] := Slot_CT.create("Slot" & int2str(slot_nr)); + connect(vc_SLOT[slot_nr]:CCID, vc_CCID:SLOT[slot_nr]); + vc_SLOT[slot_nr].start(f_handler_init(fn, slot_nr)); +} + +private function f_wait_handlers_complete() runs on Test_CT { + var integer i; + + for (i := 0; i < NR_SLOTS; i := i+1) { + if (vc_SLOT[i] != null) { + vc_SLOT[i].done; + } + } + setverdict(pass); +} + +private function f_start_and_wait() runs on Test_CT { + /* start CCID_Emulation last, it will trigger all the per-slot components */ + vc_CCID.start(CCID_Emulation.main()); + f_wait_handlers_complete(); +} + +private function f_init() runs on Test_CT { + var integer i; + vc_CCID := CCID_Emulation_CT.create("CCID"); + map(vc_CCID:USB, system:USB); + for (i := 0; i < NR_SLOTS; i := i+1) { + vc_SLOT[i] := null; + } +} + +private function f_power_on(CCID_PowerSelect psel := CCID_PWRSEL_AUTO) runs on Slot_CT { + CCID.send(ts_CCID_IccPowerOn(g_slot_nr, psel)); + CCID.receive(tr_CCID_DataBlock(g_slot_nr)); +} + +private function f_xceive(octetstring tx, template octetstring rx) runs on Slot_CT return octetstring { + var CCID_PDU pdu; + + CCID.send(ts_CCID_XfrBlock(g_slot_nr, tx, 0)); + alt { + [] CCID.receive(tr_CCID_DataBlock(g_slot_nr, ?, rx)) -> value pdu { + return pdu.u.DataBlock.abData; + } + [] CCID.receive(tr_CCID_DataBlock(g_slot_nr, ?, ?)) -> value pdu { + setverdict(fail, "Received unexpected DataBlock ", pdu); + self.stop; + } + [] CCID.receive(CCID_PDU:?) -> value pdu { + setverdict(fail, "Received unexpected CCID ", pdu); + self.stop; + } + } + return ''O; +} + + +/*********************************************************************** + * actual test cases + ***********************************************************************/ + + +/* request 100 times the slot status */ +private function f_TC_getstatus() runs on Slot_CT +{ + var integer i; + for (i := 0; i < 100; i := i+1) { + CCID.send(ts_CCID_GetSlotStatus(g_slot_nr)); + /* it would be fun to simply send more requests here, but the CCID + * spec doesn't permit more than one unresponded command [per slot] */ + alt { + [] CCID.receive(tr_CCID_SlotStatus(g_slot_nr)); + [] CCID.receive { + setverdict(fail, "Unexpected data from device"); + } + } + } + setverdict(pass); +} +testcase TC_get_status() runs on Test_CT +{ + var integer i; + + f_init(); + + for (i := 0; i < NR_SLOTS; i := i+1) { + f_start_handler(refers(f_TC_getstatus), i); + } + + f_start_and_wait(); +} + + +private function f_TC_power_on() runs on Slot_CT +{ + f_power_on(); +} +testcase TC_power_on() runs on Test_CT +{ + var integer i; + + f_init(); + + for (i := 0; i < NR_SLOTS; i := i+1) { + f_start_handler(refers(f_TC_power_on), i); + } + + f_start_and_wait(); +} + +private function f_TC_select_mf() runs on Slot_CT +{ + var integer i; + f_power_on(); + for (i := 0; i < 10000; i := i+1) { + f_xceive('00a40004023f00'O, ?); + } +} +testcase TC_select_mf() runs on Test_CT +{ + var integer i; + + f_init(); + + for (i := 0; i < NR_SLOTS; i := i+1) { + f_start_handler(refers(f_TC_select_mf), i); + } + + f_start_and_wait(); +} + + + +control { + execute( TC_get_status() ); + execute( TC_power_on() ); + execute( TC_select_mf() ); +} + + + + +} diff --git a/ccid/gen_links.sh b/ccid/gen_links.sh new file mode 100755 index 0000000..e53954b --- /dev/null +++ b/ccid/gen_links.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +BASEDIR=../deps + +. ../gen_links.sh.inc + +#DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src +#FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" +#gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.USB/src +FILES="USB_PT.cc USB_PT.hh USB_PortType.ttcn USB_PortTypes.ttcn USB_Templates.ttcn USB_Types.ttcn USB_Component.ttcn " +FILES+="CCID_Types.ttcn CCID_Templates.ttcn CCID_Emulation.ttcn " +gen_links $DIR $FILES + +DIR=../library +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn " +FILES+="Native_Functions.ttcn Native_FunctionDefs.cc " +gen_links $DIR $FILES + +ignore_pp_results diff --git a/ccid/regen_makefile.sh b/ccid/regen_makefile.sh new file mode 100755 index 0000000..215d9c6 --- /dev/null +++ b/ccid/regen_makefile.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +FILES="*.ttcn USB_PT.cc Native_FunctionDefs.cc " + +../regen-makefile.sh CCID_Tests.ttcn $FILES + +#sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lusb/' Makefile +sed -i -e '/^LINUX_LIBS/ s/$/ `pkg-config --libs libusb-1.0`/' Makefile +sed -i -e '/^CPPFLAGS/ s/$/ `pkg-config --cflags libusb-1.0`/' Makefile diff --git a/deps/Makefile b/deps/Makefile index 2d8f687..5d263aa 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -67,7 +67,8 @@ titan.ProtocolEmulations.M3UA OSMOGIT_REPOS= titan.ProtocolModules.MAP \ - titan.ProtocolModules.BSSMAP + titan.ProtocolModules.BSSMAP \ + titan.TestPorts.USB ALL_REPOS=$(ECLIPSEGIT_REPOS) $(ECLIPSEGIT2_REPOS) $(OSMOGITHUB_REPOS) $(OSMOGIT_REPOS) @@ -121,6 +122,7 @@ titan.TestPorts.TELNETasp_commit= R.9.A titan.TestPorts.UDPasp_commit= R.8.A titan.TestPorts.UNIX_DOMAIN_SOCKETasp_commit= R.2.A-4-gbacd73d +titan.TestPorts.USB_commit= master all: $(foreach dir,$(ALL_REPOS),$(dir)/update) clean: $(foreach dir,$(ALL_REPOS),$(dir)/clean) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16308 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I35f41cb0097a4408afe7c31f42463baaa47f15bd Gerrit-Change-Number: 16308 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:29:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:29:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ccid: Increase guard timeout to 120s In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16309 ) Change subject: ccid: Increase guard timeout to 120s ...................................................................... ccid: Increase guard timeout to 120s Change-Id: Ie824dcf7b3f0d50ba4652d1a6e46d9ed81c5f069 --- M ccid/CCID_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/ccid/CCID_Tests.ttcn b/ccid/CCID_Tests.ttcn index a985536..cf615d4 100644 --- a/ccid/CCID_Tests.ttcn +++ b/ccid/CCID_Tests.ttcn @@ -21,7 +21,7 @@ type component Slot_CT { var uint8_t g_slot_nr; port CCID_SLOT_PT CCID; - timer g_Tguard := 10.0; + timer g_Tguard := 120.0; }; private const integer NR_SLOTS := 4; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie824dcf7b3f0d50ba4652d1a6e46d9ed81c5f069 Gerrit-Change-Number: 16309 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:29:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:29:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ccid: Many more CCID tests In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16310 ) Change subject: ccid: Many more CCID tests ...................................................................... ccid: Many more CCID tests Change-Id: Id046aff7c35b5ad3ab55fdf53a53e7637602d147 --- M ccid/CCID_Tests.ttcn 1 file changed, 404 insertions(+), 31 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ccid/CCID_Tests.ttcn b/ccid/CCID_Tests.ttcn index cf615d4..f6816be 100644 --- a/ccid/CCID_Tests.ttcn +++ b/ccid/CCID_Tests.ttcn @@ -1,15 +1,27 @@ module CCID_Tests { +/* TTCN-3 tests for USB CCID (Chip Card Interface Device) + * + * (C) 2018-2019 by Harald Welte + */ + import from General_Types all; import from Osmocom_Types all; import from Misc_Helpers all; import from USB_PortType all; +import from USB_Component all; import from CCID_Types all; import from CCID_Templates all; import from CCID_Emulation all; +modulepar { + USB_Device_Match mp_usb_dev_match := { vid_pid := { vid := '1df0'H, pid := '6141'H } }; + integer mp_use_slot_count := 8; + boolean mp_test_power_off := true; + boolean mp_quirk_resetpar_returns_slotsts := false; +} /* global test component; manages CCID device */ type component Test_CT { var CCID_Emulation_CT vc_CCID; @@ -24,12 +36,16 @@ timer g_Tguard := 120.0; }; -private const integer NR_SLOTS := 4; +/* maximum number of slots we are supporting in the test suite */ +private const integer NR_SLOTS := 16; /*********************************************************************** * helper infrastructure ***********************************************************************/ +const octetstring c_UICC_SELECT_MF := '00a40004023f00'O; +const octetstring c_SIM_SELECT_MF := 'a0a40004023f00'O; + type function void_fn() runs on Slot_CT; /* altstep running on the per-slot test component */ @@ -39,6 +55,18 @@ } } +private altstep as_ccid_any() runs on Slot_CT { + var CCID_PDU pdu; + [] CCID.receive(CCID_PDU:?) -> value pdu { + setverdict(fail, "Received unexpected CCID ", pdu); + self.stop; + } + [] CCID.receive { + setverdict(fail, "Received unexpected non-CCID"); + self.stop; + } +} + /* first function inside Slot_CT; wait for CCID_EVENT_UP + call testcase-specific function */ private function f_handler_init(void_fn fn, integer slot_nr) runs on Slot_CT { g_slot_nr := slot_nr; @@ -72,7 +100,8 @@ private function f_start_and_wait() runs on Test_CT { /* start CCID_Emulation last, it will trigger all the per-slot components */ - vc_CCID.start(CCID_Emulation.main()); + var CCID_Emulation_Params cep := { usb_dev_match := mp_usb_dev_match }; + vc_CCID.start(CCID_Emulation.main(cep)); f_wait_handlers_complete(); } @@ -85,37 +114,125 @@ } } -private function f_power_on(CCID_PowerSelect psel := CCID_PWRSEL_AUTO) runs on Slot_CT { - CCID.send(ts_CCID_IccPowerOn(g_slot_nr, psel)); - CCID.receive(tr_CCID_DataBlock(g_slot_nr)); -} -private function f_xceive(octetstring tx, template octetstring rx) runs on Slot_CT return octetstring { +/* transceive a CCID command (send 'tx' on OUT; expect 'rx' on IN) */ +private function f_ccid_xceive(template (value) CCID_PDU tx, template (present) CCID_PDU exp_rx) +runs on Slot_CT return CCID_PDU { var CCID_PDU pdu; - CCID.send(ts_CCID_XfrBlock(g_slot_nr, tx, 0)); + tx.hdr.bSlot := g_slot_nr; + exp_rx.hdr.bSlot := g_slot_nr; + + CCID.send(tx); alt { - [] CCID.receive(tr_CCID_DataBlock(g_slot_nr, ?, rx)) -> value pdu { - return pdu.u.DataBlock.abData; + [] CCID.receive(exp_rx) -> value pdu { + return pdu; } - [] CCID.receive(tr_CCID_DataBlock(g_slot_nr, ?, ?)) -> value pdu { - setverdict(fail, "Received unexpected DataBlock ", pdu); - self.stop; - } - [] CCID.receive(CCID_PDU:?) -> value pdu { - setverdict(fail, "Received unexpected CCID ", pdu); - self.stop; - } + [] as_ccid_any(); } - return ''O; + return pdu; +} + +private template (present) CCID_Header_IN tr_inact := + tr_CCID_HeaderIN_OK(icc_status := (CCID_ICC_STATUS_PRES_INACT, CCID_ICC_STATUS_NO_ICC)); + +private template (present) CCID_Header_IN tr_act := + tr_CCID_HeaderIN_OK(icc_status := CCID_ICC_STATUS_PRES_ACT); + +/* Send IccPowerOn on OUT; expect DataBlock in retunr */ +private function f_ccid_power_on(CCID_PowerSelect psel := CCID_PWRSEL_AUTO, + template (present) CCID_Header_IN hdr_in := tr_act) +runs on Slot_CT return CCID_PDU { + var CCID_PDU pdu; + + pdu := f_ccid_xceive(ts_CCID_IccPowerOn(g_slot_nr, psel), + tr_CCID_DataBlock(g_slot_nr, hdr_in := hdr_in) ); + return pdu; +} + +/* Send IccPowerOn on OUT; expect SlotStatus in return */ +private function f_ccid_power_off(template (present) CCID_Header_IN hdr_in := tr_inact) +runs on Slot_CT return CCID_PDU { + var CCID_PDU pdu; + + pdu := f_ccid_xceive(ts_CCID_IccPowerOff(g_slot_nr), + tr_CCID_SlotStatus(slot := g_slot_nr, hdr_in := hdr_in) ); + return pdu; +} + +/* Send IccClockCommand on OUT; expect SlotStatus in return */ +private function f_ccid_clock_cmd(CCID_ClockCommand cmd, + template (present) CCID_Header_IN hdr_in := tr_CCID_HeaderIN_OK) +runs on Slot_CT return CCID_PDU { + var CCID_PDU pdu; + + pdu := f_ccid_xceive(ts_CCID_ClockCommand(g_slot_nr, cmd), + tr_CCID_SlotStatus(slot := g_slot_nr, hdr_in := hdr_in)); + return pdu; +} + +/* Send XfrBlock on OUT; expect DataBlock in return */ +private function f_ccid_xfr(octetstring tx, template octetstring rx) runs on Slot_CT return octetstring { + var CCID_PDU pdu; + + pdu := f_ccid_xceive(ts_CCID_XfrBlock(g_slot_nr, tx, 0), + tr_CCID_DataBlock(g_slot_nr, ?, ?, rx) ); + return pdu.u.DataBlock.abData; +} + +/* Send SetParameters on OUT; expect Parameters on IN */ +private function f_ccid_set_par(template (value) CCID_ProtocolData par, + template (present) CCID_Header_IN hdr_in := tr_CCID_HeaderIN_OK) +runs on Slot_CT return CCID_PDU { + var CCID_PDU pdu; + + pdu := f_ccid_xceive(ts_CCID_SetParameters(g_slot_nr, par), + tr_CCID_Parameters(g_slot_nr, hdr_in := hdr_in)); + return pdu; +} + +/* Send GetParameters on OUT; expect Parameters on IN */ +private function f_ccid_get_par(template (present) CCID_Header_IN hdr_in := tr_CCID_HeaderIN_OK) +runs on Slot_CT return CCID_PDU { + var CCID_PDU pdu; + + pdu := f_ccid_xceive(ts_CCID_GetParameters(g_slot_nr), + tr_CCID_Parameters(g_slot_nr, hdr_in := hdr_in)); + return pdu; +} + +/* Send ResetParameters on OUT; expect Parameters on IN */ +private function f_ccid_reset_par(template (present) CCID_Header_IN hdr_in := tr_CCID_HeaderIN_OK) +runs on Slot_CT return CCID_PDU { + var CCID_PDU pdu; + + /* [at least] Omnikey seems to have failed to follow the CCID spec here :/ */ + if (mp_quirk_resetpar_returns_slotsts) { + pdu := f_ccid_xceive(ts_CCID_ResetParameters(g_slot_nr), + tr_CCID_SlotStatus(g_slot_nr, hdr_in := hdr_in)); + } else { + pdu := f_ccid_xceive(ts_CCID_ResetParameters(g_slot_nr), + tr_CCID_Parameters(g_slot_nr, hdr_in := hdr_in)); + } + return pdu; +} + +/* Send Escape on OUT; expect Escape on IN */ +private function f_ccid_escape(template (value) octetstring data, + template (present) CCID_Header_IN hdr_in := tr_CCID_HeaderIN_OK) +runs on Slot_CT return CCID_PDU { + var CCID_PDU pdu; + + pdu := f_ccid_xceive(ts_CCID_Escape(g_slot_nr, data), + tr_CCID_EscapeIN(g_slot_nr, hdr_in := hdr_in)); + return pdu; } /*********************************************************************** - * actual test cases + * Test behavior regarding valid situations ***********************************************************************/ - /* request 100 times the slot status */ private function f_TC_getstatus() runs on Slot_CT { @@ -126,9 +243,7 @@ * spec doesn't permit more than one unresponded command [per slot] */ alt { [] CCID.receive(tr_CCID_SlotStatus(g_slot_nr)); - [] CCID.receive { - setverdict(fail, "Unexpected data from device"); - } + [] as_ccid_any(); } } setverdict(pass); @@ -139,7 +254,7 @@ f_init(); - for (i := 0; i < NR_SLOTS; i := i+1) { + for (i := 0; i < mp_use_slot_count; i := i+1) { f_start_handler(refers(f_TC_getstatus), i); } @@ -149,7 +264,7 @@ private function f_TC_power_on() runs on Slot_CT { - f_power_on(); + f_ccid_power_on(); } testcase TC_power_on() runs on Test_CT { @@ -157,19 +272,65 @@ f_init(); - for (i := 0; i < NR_SLOTS; i := i+1) { + for (i := 0; i < mp_use_slot_count; i := i+1) { f_start_handler(refers(f_TC_power_on), i); } f_start_and_wait(); } +private function f_TC_power_off() runs on Slot_CT +{ + f_ccid_power_on(); + f_ccid_power_off(); +} +testcase TC_power_off() runs on Test_CT +{ + var integer i; + + f_init(); + + for (i := 0; i < mp_use_slot_count; i := i+1) { + f_start_handler(refers(f_TC_power_off), i); + } + + f_start_and_wait(); +} + + +/* repeat IccPowerOn on slot that's already active (next warm reset ATR) */ +private function f_TC_power_on_warm() runs on Slot_CT +{ + var integer i; + + /* initial power on */ + f_ccid_power_on(); + + /* additional power on */ + for (i := 0; i < 20; i := i+1) { + f_ccid_power_on(); + } +} +testcase TC_power_on_warm() runs on Test_CT +{ + var integer i; + + f_init(); + + for (i := 0; i < mp_use_slot_count; i := i+1) { + f_start_handler(refers(f_TC_power_on_warm), i); + } + + f_start_and_wait(); +} + +/* transfer 1000 APDUs by issuing SELECT MF */ private function f_TC_select_mf() runs on Slot_CT { var integer i; - f_power_on(); - for (i := 0; i < 10000; i := i+1) { - f_xceive('00a40004023f00'O, ?); + f_ccid_power_on(); + for (i := 0; i < 1000; i := i+1) { + f_ccid_xfr(c_UICC_SELECT_MF, ?); } } testcase TC_select_mf() runs on Test_CT @@ -178,19 +339,231 @@ f_init(); - for (i := 0; i < NR_SLOTS; i := i+1) { + for (i := 0; i < mp_use_slot_count; i := i+1) { f_start_handler(refers(f_TC_select_mf), i); } f_start_and_wait(); } +/* GetParametrs: verify contents */ +private function f_TC_get_params() runs on Slot_CT +{ + var CCID_PDU par; + f_ccid_power_on(); + par := f_ccid_get_par(); + log(par); +} +testcase TC_get_params() runs on Test_CT +{ + var integer i; + + f_init(); + + for (i := 0; i < mp_use_slot_count; i := i+1) { + f_start_handler(refers(f_TC_get_params), i); + } + f_start_and_wait(); +} + +/* SetParameters: verify change */ +private function f_TC_set_params() runs on Slot_CT +{ + var CCID_PDU par; + f_ccid_power_on(); + + /* get current parameters */ + par := f_ccid_get_par(); + + /* modify some of them */ + var CCID_ProtocolData pd := par.u.Parameters.abProtocolData; + pd.T0.bGuardTimeT0 := 23; + pd.T0.bWaitingIntegerT0 := 42; + par := f_ccid_set_par(pd); + + /* check if modifications were applied */ + var template (present) CCID_ProtocolData tr_PD := { + T0 := { + Findex := ?, + Dindex := ?, + bRFU := ?, + inv_convention := ?, + bRFU2 := ?, + bGuardTimeT0 := 23, + bWaitingIntegerT0 := 42, + bClockStop := ? + } + }; + if (match(par.u.Parameters.abProtocolData, tr_PD)) { + setverdict(pass); + } else { + setverdict(fail, "SetParameters didn't change GuardTime/WaitingInteger"); + } +} +testcase TC_set_params() runs on Test_CT +{ + var integer i; + + f_init(); + + for (i := 0; i < mp_use_slot_count; i := i+1) { + f_start_handler(refers(f_TC_set_params), i); + } + f_start_and_wait(); +} + +/* ResetParameters: verify change */ +private function f_TC_reset_params() runs on Slot_CT +{ + var CCID_PDU par; + + f_TC_set_params(); + par := f_ccid_reset_par(); + if (mp_quirk_resetpar_returns_slotsts) { + par := f_ccid_get_par(); + } + if (par.u.Parameters.abProtocolData.T0.bGuardTimeT0 == 23 or + par.u.Parameters.abProtocolData.T0.bWaitingIntegerT0 == 42) { + setverdict(fail, "ResetParameters didn't reset properly"); + } +} +testcase TC_reset_params() runs on Test_CT +{ + var integer i; + + f_init(); + + for (i := 0; i < mp_use_slot_count; i := i+1) { + f_start_handler(refers(f_TC_reset_params), i); + } + f_start_and_wait(); +} + + + +/* TODO */ +/* IccPowerOn: verify that CCID resets all parameters to default values */ +/* IccPowerOn: verify that bPowerSelect has no effect in active state */ +/* XfrBlock: length corner cases (Lc/Le max, ...) */ +/* IccClock: verify clock has stopped/restarted */ +/* Abort for command that already terminated */ +/* Abort for command that's still processing */ + + +/*********************************************************************** + * Test behavior regarding invalid situations + ***********************************************************************/ + +/* message for invalid slot number (more than we have) */ +private function f_TC_inval_slot() runs on Slot_CT { + CCID.send(ts_CCID_GetSlotStatus(g_slot_nr)); + alt { + [] CCID.receive(tr_CCID_SlotStatus(hdr_in := tr_CCID_HeaderIN_FAIL(CCID_ERR_SLOT_NOT_EXIST))) { + setverdict(pass); + } + [] CCID.receive(tr_CCID_SlotStatus) { + setverdict(fail, "Unexpected SlotStatus"); + mtc.stop; + } + [] as_ccid_any(); + } +} +testcase TC_inval_slot() runs on Test_CT { + f_init(); + f_start_handler(refers(f_TC_inval_slot), 15); + f_start_and_wait(); +} + +/* switch card off and then XfrBlock. Requires reader with IccPowerOff support */ +private function f_TC_xfer_off() runs on Slot_CT { + f_ccid_power_off(); + CCID.send(ts_CCID_XfrBlock(g_slot_nr, c_SIM_SELECT_MF, 0)); + alt { + [] CCID.receive(tr_CCID_DataBlock(slot:=g_slot_nr, hdr_in:=tr_CCID_HeaderIN_FAIL)) { + setverdict(pass); + } + [] CCID.receive(tr_CCID_DataBlock(slot:=g_slot_nr, hdr_in:=tr_CCID_HeaderIN_OK)) { + setverdict(fail, "Expected XfrBlock to fail"); + mtc.stop; + } + [] as_ccid_any(); + } +} +testcase TC_xfer_off() runs on Test_CT { + f_init(); + f_start_handler(refers(f_TC_xfer_off), 0); + f_start_and_wait(); +} + + +/* unsupported Mechanical */ +private function f_TC_unsupp_mechanical() runs on Slot_CT { + CCID.send(ts_CCID_Mechanical(g_slot_nr, CCID_MECH_FN_EJECT_CARD)); + alt { + [] CCID.receive(tr_CCID_SlotStatus(hdr_in := tr_CCID_HeaderIN_FAIL(CCID_ERR_CMD_NOT_SUPPORTED))) { + setverdict(pass); + } + [] as_ccid_any(); + } +} +testcase TC_unsupp_mechanical() runs on Test_CT { + f_init(); + f_start_handler(refers(f_TC_unsupp_mechanical), 0); + f_start_and_wait(); +} + +/* unsupported Secure */ +private function f_TC_unsupp_secure() runs on Slot_CT { + CCID.send(ts_CCID_Secure(g_slot_nr, 0, 0, ''O)); + alt { + [] CCID.receive(tr_CCID_DataBlock(hdr_in := tr_CCID_HeaderIN_FAIL(CCID_ERR_CMD_NOT_SUPPORTED))) { + setverdict(pass); + } + [] as_ccid_any(); + } +} +testcase TC_unsupp_secure() runs on Test_CT { + f_init(); + f_start_handler(refers(f_TC_unsupp_secure), 0); + f_start_and_wait(); +} + + +/* TODO */ +/* truncated message */ +/* IccPowerOn with wrong voltage (> 0x04) */ +/* XfrBlock on empty slot */ +/* GetParameters on empty slot */ +/* SetParameters for bProtocolNum > 0x01 */ +/* SetParameters: invalid parameters */ +/* set unsupported frequency */ +/* set unsupported clock rate */ +/* XfrBlock: bWI in T=0? */ +/* XfrBlock: wLevelParameter not matching level? */ +/* Abort for command that was not even submitted yet*/ +/* dwMaxCCIDMessageLength */ control { + /* valid transactions */ execute( TC_get_status() ); execute( TC_power_on() ); + execute( TC_power_on_warm() ); + if (mp_test_power_off) { + execute( TC_power_off() ); + } execute( TC_select_mf() ); + execute( TC_get_params() ); + execute( TC_set_params() ); + execute( TC_reset_params() ); + + /* error handling */ + execute( TC_inval_slot() ); + if (mp_test_power_off) { + execute( TC_xfer_off() ); + } + execute( TC_unsupp_mechanical() ); + execute( TC_unsupp_secure() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id046aff7c35b5ad3ab55fdf53a53e7637602d147 Gerrit-Change-Number: 16310 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:29:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:29:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pps exchange after power on In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16311 ) Change subject: pps exchange after power on ...................................................................... pps exchange after power on Change-Id: Ibe289de5134eec4f7ba26c75ceb4714ad523f0da --- M ccid/CCID_Tests.ttcn 1 file changed, 49 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Hoernchen: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/ccid/CCID_Tests.ttcn b/ccid/CCID_Tests.ttcn index f6816be..c620b0b 100644 --- a/ccid/CCID_Tests.ttcn +++ b/ccid/CCID_Tests.ttcn @@ -46,6 +46,54 @@ const octetstring c_UICC_SELECT_MF := '00a40004023f00'O; const octetstring c_SIM_SELECT_MF := 'a0a40004023f00'O; +/* Table 7 of ISO7816-3 */ +type enumerated ISO7816_Fi { + ISO7816_FI_372_4MHz ('0000'B), + ISO7816_FI_372_5MHz ('0001'B), + ISO7816_FI_558_6MHz ('0010'B), + ISO7816_FI_744_8MHz ('0011'B), + ISO7816_FI_1116_12MHz ('0100'B), + ISO7816_FI_1488_16MHz ('0101'B), + ISO7816_FI_1860_20MHz ('0110'B), + + ISO7816_FI_512_5MHz ('1001'B), + ISO7816_FI_768_7MHz ('1010'B), + ISO7816_FI_1024_10MHz ('1011'B), + ISO7816_FI_1536_15MHz ('1100'B), + ISO7816_FI_2048_20MHz ('1101'B) +}; + +/* Table 8 of ISO7816-3 */ +type enumerated ISO7816_Di { + ISO7816_DI_1 ('0001'B), + ISO7816_DI_2 ('0010'B), + ISO7816_DI_4 ('0011'B), + ISO7816_DI_8 ('0100'B), + ISO7816_DI_16 ('0101'B), + ISO7816_DI_32 ('0110'B), + ISO7816_DI_64 ('0111'B), + + ISO7816_DI_12 ('1000'B), + ISO7816_DI_20 ('1001'B) +} + +private template (value) CCID_ProtocolData ts_ProtoDataT0(ISO7816_Fi fi, ISO7816_Di di, + uint8_t guard_time := 0, + uint8_t wait_int := 0) := { + T0 := { + Findex := enum2int(fi), + Dindex := enum2int(di), + + bRFU := '000000'B, + inv_convention := false, + bRFU2 := '0'B, + + bGuardTimeT0 := guard_time, + bWaitingIntegerT0 := wait_int, + bClockStop := STOPPING_NOT_ALLOWED + } +}; + type function void_fn() runs on Slot_CT; /* altstep running on the per-slot test component */ @@ -329,6 +377,7 @@ { var integer i; f_ccid_power_on(); + f_ccid_set_par(ts_ProtoDataT0(ISO7816_FI_512_5MHz, ISO7816_DI_32)); for (i := 0; i < 1000; i := i+1) { f_ccid_xfr(c_UICC_SELECT_MF, ?); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibe289de5134eec4f7ba26c75ceb4714ad523f0da Gerrit-Change-Number: 16311 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:32:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:32:35 +0000 Subject: Change in libosmocore[master]: sim: allow opening reader# > 0 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15927 ) Change subject: sim: allow opening reader# > 0 ...................................................................... Patch Set 3: Ping? Would want to get this merged sooner than later. Thanks -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4b1abc8d8aae4bd9a32f927269d7ebfef902d7c5 Gerrit-Change-Number: 15927 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 02 Dec 2019 23:32:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:33:41 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:33:41 +0000 Subject: Change in osmo-msc[master]: sms db: when storing an SMS, retrieve the ID In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16218 ) Change subject: sms db: when storing an SMS, retrieve the ID ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5fa55307a6abb8bbfe56619235d7b79fbbda6caf Gerrit-Change-Number: 16218 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 02 Dec 2019 23:33:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:36:16 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:36:16 +0000 Subject: Change in osmo-hlr[master]: gsup_server: send routing error back to the correct peer In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16336 ) Change subject: gsup_server: send routing error back to the correct peer ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Icafaedc11b5925149d338bdcb987ae985a7323d6 Gerrit-Change-Number: 16336 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Dec 2019 23:36:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:36:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:36:43 +0000 Subject: Change in osmo-hlr[master]: hlr_vty_subscr: prettier output for last LU seen In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16214 ) Change subject: hlr_vty_subscr: prettier output for last LU seen ...................................................................... Patch Set 19: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I24f9e86c1aa0b1576290094e024562f41b988f37 Gerrit-Change-Number: 16214 Gerrit-PatchSet: 19 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Dec 2019 23:36:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:40:46 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:40:46 +0000 Subject: Change in osmo-hlr[master]: adoc: add D-GSM chapter to osmohlr-usermanual In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16211 ) Change subject: adoc: add D-GSM chapter to osmohlr-usermanual ...................................................................... Patch Set 22: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I392b5523870c2ef3267179160028d26f3f761b77 Gerrit-Change-Number: 16211 Gerrit-PatchSet: 22 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 02 Dec 2019 23:40:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:42:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:42:12 +0000 Subject: Change in osmo-hlr[master]: drop error log for when a subscriber does not exist In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16212 ) Change subject: drop error log for when a subscriber does not exist ...................................................................... Patch Set 22: It could at least be a DEBUG message. Or are we sure that all users of the db API will always log themselves? -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5044e9b4519b948edc4e451cef0f7830d315619b Gerrit-Change-Number: 16212 Gerrit-PatchSet: 22 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 02 Dec 2019 23:42:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:42:38 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:42:38 +0000 Subject: Change in osmo-hlr[master]: vty: show subscriber: change format of 'last LU seen' In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15359 ) Change subject: vty: show subscriber: change format of 'last LU seen' ...................................................................... Patch Set 12: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6731968f05050399f4dd43b241290186e0c59e1a Gerrit-Change-Number: 15359 Gerrit-PatchSet: 12 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Mon, 02 Dec 2019 23:42:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:43:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:43:12 +0000 Subject: Change in osmo-hlr[master]: vty: show subscriber: show lu d, h, m, s ago, not just seconds In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16262 ) Change subject: vty: show subscriber: show lu d,h,m,s ago, not just seconds ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I0fe34e0f065160ef959b2b7b4dd040f3f2985f43 Gerrit-Change-Number: 16262 Gerrit-PatchSet: 8 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 02 Dec 2019 23:43:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 2 23:46:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 2 Dec 2019 23:46:39 +0000 Subject: Change in osmo-hlr[master]: add mslookup_manual_test In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16210 ) Change subject: add mslookup_manual_test ...................................................................... Patch Set 22: I would really love to see those kind of tests done in ttcn3. There we have GSUP, VTY and Im sure also a DNS module exists. The added benefit is that the Tests dont usw the same implementation of encoding/decoding. Sure it wastes time to redo it. But it Paine me to See that in 2019 we still are writing non-,unit-,Tests outside oft ttcn3. Festung external network interfaces is not a unit test! -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I80473528c9524263b60fc3ba37ba246c80bfe452 Gerrit-Change-Number: 16210 Gerrit-PatchSet: 22 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 02 Dec 2019 23:46:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 10:41:38 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 3 Dec 2019 10:41:38 +0000 Subject: Change in osmo-gsm-manuals[master]: tests: add second VTY reference In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16404 to look at the new patch set (#2). Change subject: tests: add second VTY reference ...................................................................... tests: add second VTY reference Related: OS#4292 Change-Id: I2f0170e14febc68c0122062358f362003a2e3e5e --- M tests/Makefile.am A tests/test2-vty-reference.xml A tests/vty-test2/test2_vty_additions.xml A tests/vty-test2/test2_vty_reference.xml 4 files changed, 62 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/04/16404/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I2f0170e14febc68c0122062358f362003a2e3e5e Gerrit-Change-Number: 16404 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 10:46:47 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 3 Dec 2019 10:46:47 +0000 Subject: Change in osmo-gsm-manuals[master]: Support multiple VTY reference manuals In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16403 ) Change subject: Support multiple VTY reference manuals ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I4dea3e07b88175b2a88e577129360af7ec5f87e1 Gerrit-Change-Number: 16403 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 10:46:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 10:48:38 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 3 Dec 2019 10:48:38 +0000 Subject: Change in osmo-sgsn[master]: doc: add OsmoGbProxy VTY reference In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16406 to look at the new patch set (#2). Change subject: doc: add OsmoGbProxy VTY reference ...................................................................... doc: add OsmoGbProxy VTY reference Depends: (osmo-gsm-manuals) I4dea3e07b88175b2a88e577129360af7ec5f87e1 Related: OS#4292 Change-Id: I24c3ca2fc2446673edceefb797c7d800c3a1a5d2 --- M doc/manuals/Makefile.am A doc/manuals/osmogbproxy-vty-reference.xml A doc/manuals/vty-osmogbproxy/gbproxy_vty_additions.xml A doc/manuals/vty-osmogbproxy/gbproxy_vty_reference.xml 4 files changed, 1,675 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/06/16406/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I24c3ca2fc2446673edceefb797c7d800c3a1a5d2 Gerrit-Change-Number: 16406 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 10:50:44 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 10:50:44 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Disable dahdi support in libosmo-abis References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/16422 ) Change subject: contrib: Disable dahdi support in libosmo-abis ...................................................................... contrib: Disable dahdi support in libosmo-abis Since libosmo-abis d4be696bbc20522a0284b6d0aefa872585f6926f it is enabled by default. Since we don't need it so far and required dependencies are not available in sysmobts SDK, let's disable it explicitly. Change-Id: Id017f3d2f51d30fa53881b627460fb568f19713b --- M contrib/jenkins-build-osmo-bsc.sh M contrib/jenkins-build-osmo-bts-oc2g.sh M contrib/jenkins-build-osmo-bts-sysmo.sh M contrib/jenkins-build-osmo-bts.sh M contrib/jenkins-build-osmo-hlr.sh M contrib/jenkins-build-osmo-iuh.sh M contrib/jenkins-build-osmo-mgw.sh M contrib/jenkins-build-osmo-msc.sh M contrib/jenkins-build-osmo-nitb.sh M contrib/jenkins-build-osmo-sgsn.sh M contrib/jenkins-build-osmo-stp.sh 11 files changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/22/16422/1 diff --git a/contrib/jenkins-build-osmo-bsc.sh b/contrib/jenkins-build-osmo-bsc.sh index 5d4d333..761fc39 100755 --- a/contrib/jenkins-build-osmo-bsc.sh +++ b/contrib/jenkins-build-osmo-bsc.sh @@ -5,7 +5,7 @@ . "$(dirname "$0")/jenkins-build-common.sh" build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen -build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-abis ${SANITIZE_FLAGS} --disable-dahdi build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen build_repo libosmo-sccp ${SANITIZE_FLAGS} build_repo osmo-mgw ${SANITIZE_FLAGS} diff --git a/contrib/jenkins-build-osmo-bts-oc2g.sh b/contrib/jenkins-build-osmo-bts-oc2g.sh index aa37beb..9a02ab0 100755 --- a/contrib/jenkins-build-osmo-bts-oc2g.sh +++ b/contrib/jenkins-build-osmo-bts-oc2g.sh @@ -25,7 +25,7 @@ L1_OC2G_HEADERS="$PWD/oc2g-fw/inc" build_repo libosmocore --disable-pcsc --disable-doxygen --disable-gnutls --disable-detect-tls-gcc-arm-bug -build_repo libosmo-abis +build_repo libosmo-abis --disable-dahdi build_repo osmo-bts --disable-sysmocom-bts --enable-oc2g --with-oc2g="$L1_OC2G_HEADERS" create_bin_tgz osmo-bts-oc2g diff --git a/contrib/jenkins-build-osmo-bts-sysmo.sh b/contrib/jenkins-build-osmo-bts-sysmo.sh index 1acf8b0..4370ecd 100755 --- a/contrib/jenkins-build-osmo-bts-sysmo.sh +++ b/contrib/jenkins-build-osmo-bts-sysmo.sh @@ -19,7 +19,7 @@ . "$(dirname "$0")/jenkins-build-common.sh" build_repo libosmocore --disable-pcsc --disable-doxygen --disable-gnutls --disable-detect-tls-gcc-arm-bug -build_repo libosmo-abis +build_repo libosmo-abis --disable-dahdi build_repo osmo-bts --enable-sysmocom-bts --with-openbsc=$base/openbsc/openbsc/include create_bin_tgz osmo-bts-sysmo diff --git a/contrib/jenkins-build-osmo-bts.sh b/contrib/jenkins-build-osmo-bts.sh index ee87d7f..182dbf7 100755 --- a/contrib/jenkins-build-osmo-bts.sh +++ b/contrib/jenkins-build-osmo-bts.sh @@ -7,7 +7,7 @@ have_repo octphy-2g-headers build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen -build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-abis ${SANITIZE_FLAGS} --disable-dahdi build_repo osmo-bts ${SANITIZE_FLAGS} --enable-trx --with-openbsc=$base/openbsc/openbsc/include --enable-octphy --with-octsdr-2g=$base/octphy-2g-headers create_bin_tgz "osmo-bts-trx osmo-bts-octphy osmo-bts-virtual" diff --git a/contrib/jenkins-build-osmo-hlr.sh b/contrib/jenkins-build-osmo-hlr.sh index 0b60955..b6d6947 100755 --- a/contrib/jenkins-build-osmo-hlr.sh +++ b/contrib/jenkins-build-osmo-hlr.sh @@ -5,7 +5,7 @@ . "$(dirname "$0")/jenkins-build-common.sh" build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen -build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-abis ${SANITIZE_FLAGS} --disable-dahdi build_repo osmo-hlr ${SANITIZE_FLAGS} create_bin_tgz osmo-hlr diff --git a/contrib/jenkins-build-osmo-iuh.sh b/contrib/jenkins-build-osmo-iuh.sh index e8e7fa8..412110e 100755 --- a/contrib/jenkins-build-osmo-iuh.sh +++ b/contrib/jenkins-build-osmo-iuh.sh @@ -5,7 +5,7 @@ . "$(dirname "$0")/jenkins-build-common.sh" build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen -build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-abis ${SANITIZE_FLAGS} --disable-dahdi build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen build_repo libosmo-sccp ${SANITIZE_FLAGS} build_repo libasn1c ${SANITIZE_FLAGS} diff --git a/contrib/jenkins-build-osmo-mgw.sh b/contrib/jenkins-build-osmo-mgw.sh index a04e0ca..2128fa2 100755 --- a/contrib/jenkins-build-osmo-mgw.sh +++ b/contrib/jenkins-build-osmo-mgw.sh @@ -5,7 +5,7 @@ . "$(dirname "$0")/jenkins-build-common.sh" build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen -build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-abis ${SANITIZE_FLAGS} --disable-dahdi build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen build_repo osmo-mgw ${SANITIZE_FLAGS} diff --git a/contrib/jenkins-build-osmo-msc.sh b/contrib/jenkins-build-osmo-msc.sh index c64f94d..64243de 100755 --- a/contrib/jenkins-build-osmo-msc.sh +++ b/contrib/jenkins-build-osmo-msc.sh @@ -5,7 +5,7 @@ . "$(dirname "$0")/jenkins-build-common.sh" build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen -build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-abis ${SANITIZE_FLAGS} --disable-dahdi build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen build_repo libsmpp34 ${SANITIZE_FLAGS} build_repo libosmo-sccp ${SANITIZE_FLAGS} diff --git a/contrib/jenkins-build-osmo-nitb.sh b/contrib/jenkins-build-osmo-nitb.sh index 4f81fa8..8ecbdba 100755 --- a/contrib/jenkins-build-osmo-nitb.sh +++ b/contrib/jenkins-build-osmo-nitb.sh @@ -5,7 +5,7 @@ . "$(dirname "$0")/jenkins-build-common.sh" build_repo libosmocore --disable-doxygen -build_repo libosmo-abis +build_repo libosmo-abis --disable-dahdi build_repo libosmo-netif --disable-doxygen build_repo openggsn build_repo libsmpp34 diff --git a/contrib/jenkins-build-osmo-sgsn.sh b/contrib/jenkins-build-osmo-sgsn.sh index f296f8b..128e7b7 100755 --- a/contrib/jenkins-build-osmo-sgsn.sh +++ b/contrib/jenkins-build-osmo-sgsn.sh @@ -5,7 +5,7 @@ . "$(dirname "$0")/jenkins-build-common.sh" build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen -build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-abis ${SANITIZE_FLAGS} --disable-dahdi build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen build_repo libosmo-sccp ${SANITIZE_FLAGS} build_repo osmo-ggsn ${SANITIZE_FLAGS} diff --git a/contrib/jenkins-build-osmo-stp.sh b/contrib/jenkins-build-osmo-stp.sh index 5f9c421..c937eef 100755 --- a/contrib/jenkins-build-osmo-stp.sh +++ b/contrib/jenkins-build-osmo-stp.sh @@ -5,7 +5,7 @@ . "$(dirname "$0")/jenkins-build-common.sh" build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen -build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-abis ${SANITIZE_FLAGS} --disable-dahdi build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen build_repo libosmo-sccp ${SANITIZE_FLAGS} -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/16422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Id017f3d2f51d30fa53881b627460fb568f19713b Gerrit-Change-Number: 16422 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 11:04:07 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 3 Dec 2019 11:04:07 +0000 Subject: Change in osmo-sip-connector[master]: mncc.c: fix gsm_mncc_rtp size checks References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16423 ) Change subject: mncc.c: fix gsm_mncc_rtp size checks ...................................................................... mncc.c: fix gsm_mncc_rtp size checks Verify is the parsed data is at least the size of the struct, not exactly the size. Make it accept messages with additional data, like the SDP information the TTCN-3 testsuite is sending since Ic9568c8927507e161aadfad1a4d20aa896d8ae30. This change makes the size checks consistent with the two other size checks in the file: if (rc < sizeof(*rtp)) { if (rc < sizeof(**mncc)) { This is the same patch as I522ce7f206932a816a64f03d916799c3215bb8c7, but with a different Change-Id, so I can push it together with a release tag to gerrit. We'll create a new release with this patch on top of the last release, so all TTCN-3 tests are passing for latest again (less effort than adding a second code path for the old version in the testsuite). Related: OS#4282 Change-Id: I9fc71bb6fa946ff4f0934de85e5ec29b8dd67b7f --- M src/mncc.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/23/16423/1 diff --git a/src/mncc.c b/src/mncc.c index f5a44d5..2230574 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -458,7 +458,7 @@ struct call *call; struct mncc_call_leg *leg; - if (rc != sizeof(*data)) { + if (rc < sizeof(*data)) { LOGP(DMNCC, LOGL_ERROR, "gsm_mncc of wrong size %d vs. %zu\n", rc, sizeof(*data)); return close_connection(conn); @@ -534,7 +534,7 @@ { struct mncc_call_leg *leg; - if (rc != sizeof(**mncc)) { + if (rc < sizeof(**mncc)) { LOGP(DMNCC, LOGL_ERROR, "gsm_mncc of wrong size %d vs. %zu\n", rc, sizeof(**mncc)); close_connection(conn); -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I9fc71bb6fa946ff4f0934de85e5ec29b8dd67b7f Gerrit-Change-Number: 16423 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 11:04:08 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 3 Dec 2019 11:04:08 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sip-connector=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E4-6321_=E2=86=92_1=2E3=2E1?= References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16424 ) Change subject: Bump version: 1.3.0.4-6321 ? 1.3.1 ...................................................................... Bump version: 1.3.0.4-6321 ? 1.3.1 Change-Id: Ia91bf12c88506d7ee209c479a10a2cdf397ea667 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/24/16424/1 diff --git a/debian/changelog b/debian/changelog index bbe3db5..37d80aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-sip-connector (1.3.1) unstable; urgency=medium + + * mncc.c: fix gsm_mncc_rtp size checks + + -- Oliver Smith Tue, 03 Dec 2019 11:58:56 +0100 + osmo-sip-connector (1.3.0) unstable; urgency=medium [ Keith ] -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ia91bf12c88506d7ee209c479a10a2cdf397ea667 Gerrit-Change-Number: 16424 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 12:08:04 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 12:08:04 +0000 Subject: Change in osmo-gsm-manuals[master]: Support multiple VTY reference manuals In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16403 ) Change subject: Support multiple VTY reference manuals ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I4dea3e07b88175b2a88e577129360af7ec5f87e1 Gerrit-Change-Number: 16403 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 12:08:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 12:08:33 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 12:08:33 +0000 Subject: Change in osmo-gsm-manuals[master]: tests: add second VTY reference In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16404 ) Change subject: tests: add second VTY reference ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I2f0170e14febc68c0122062358f362003a2e3e5e Gerrit-Change-Number: 16404 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 12:08:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 12:09:59 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 12:09:59 +0000 Subject: Change in pysim[master]: python3 conversion: Use braces around print calls In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/15502 ) Change subject: python3 conversion: Use braces around print calls ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/pysim/+/15502/3/pySim-prog.py File pySim-prog.py: https://gerrit.osmocom.org/c/pysim/+/15502/3/pySim-prog.py at 1 PS3, Line 1: #!/usr/bin/env python2 You must change this to python3 if you use braces around print right? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia472baa8c14b87fe917ea52a998d5ccda66d20d1 Gerrit-Change-Number: 15502 Gerrit-PatchSet: 3 Gerrit-Owner: gnutoo Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 12:09:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 12:13:18 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 12:13:18 +0000 Subject: Change in osmo-sgsn[master]: doc: add OsmoGbProxy VTY reference In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16406 ) Change subject: doc: add OsmoGbProxy VTY reference ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I24c3ca2fc2446673edceefb797c7d800c3a1a5d2 Gerrit-Change-Number: 16406 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 12:13:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 12:14:04 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 12:14:04 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Disable dahdi support in libosmo-abis In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/16422 ) Change subject: contrib: Disable dahdi support in libosmo-abis ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/16422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Id017f3d2f51d30fa53881b627460fb568f19713b Gerrit-Change-Number: 16422 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 12:14:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 12:16:12 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 12:16:12 +0000 Subject: Change in osmo-sip-connector[master]: mncc.c: fix gsm_mncc_rtp size checks In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16423 ) Change subject: mncc.c: fix gsm_mncc_rtp size checks ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I9fc71bb6fa946ff4f0934de85e5ec29b8dd67b7f Gerrit-Change-Number: 16423 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 12:16:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 12:16:16 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 12:16:16 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sip-connector=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E4-6321_=E2=86=92_1=2E3=2E1?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16424 ) Change subject: Bump version: 1.3.0.4-6321 ? 1.3.1 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ia91bf12c88506d7ee209c479a10a2cdf397ea667 Gerrit-Change-Number: 16424 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 12:16:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 12:56:34 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 12:56:34 +0000 Subject: Change in meta-telephony[201705]: lksctp-tools: RRECOMENDS kernel-module-sctp References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/meta-telephony/+/16425 ) Change subject: lksctp-tools: RRECOMENDS kernel-module-sctp ...................................................................... lksctp-tools: RRECOMENDS kernel-module-sctp Previously the kernel module was only pulled in for ${PN}-utils and ${PN}-ptest, but not for the library itself. As a result, apps using only the library (like osmo-msc->libosmocore->libsctp) fail because the kernel module is not installed in the image. Change-Id: If69b82d1c03079b09284a325bd418313e8187cf9 --- M recipes-misc/lksctp-tools/lksctp-tools_1.0.16.bb 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/25/16425/1 diff --git a/recipes-misc/lksctp-tools/lksctp-tools_1.0.16.bb b/recipes-misc/lksctp-tools/lksctp-tools_1.0.16.bb index f69e71c..7aaa6e1 100644 --- a/recipes-misc/lksctp-tools/lksctp-tools_1.0.16.bb +++ b/recipes-misc/lksctp-tools/lksctp-tools_1.0.16.bb @@ -17,6 +17,8 @@ SRC_URI[md5sum] = "708bb0b5a6806ad6e8d13c55b067518e" SRC_URI[sha256sum] = "0903dd526b7f30a89d5031aa2c82757612becc38ed7bc6e4f972f8deae351f26" +PR = "r1" + #| arm-oe-linux-gnueabi-libtool: link: arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork --sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm -shared -fPIC -DPIC .libs/bindx.o .libs/connectx.o .libs/peeloff.o .libs/opt_info.o .libs/addrs.o .libs/sendmsg.o .libs/recvmsg.o -march=armv5te -marm -mthumb-interwork --sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm -O2 -Wl,--version-script=/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/lksctp-tools/1.0.16-r0/lksctp-tools-1.0.16/src/lib/Versions.map -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-soname -Wl,libsctp.so.1 -o .libs/libsctp.so.1.0.16 #| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.0/ld: error: symbol sctp_connectx has undefined version #| collect2: error: ld returned 1 exit status @@ -61,5 +63,6 @@ FILES_${PN}-utils = "${bindir}/*" +RRECOMMENDS_${PN} += "kernel-module-sctp" RRECOMMENDS_${PN}-utils += "kernel-module-sctp" RRECOMMENDS_${PN}-ptest += "kernel-module-sctp" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: If69b82d1c03079b09284a325bd418313e8187cf9 Gerrit-Change-Number: 16425 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 12:56:35 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 12:56:35 +0000 Subject: Change in meta-telephony[201705]: libosmo-abis.inc: Use PACKAGECONFIG to handle dahdi support, enable i... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/meta-telephony/+/16427 ) Change subject: libosmo-abis.inc: Use PACKAGECONFIG to handle dahdi support, enable it by default ...................................................................... libosmo-abis.inc: Use PACKAGECONFIG to handle dahdi support, enable it by default Building with DAHDI support can be controlled by bbappend or config file on the BSP meta layer as described here: https://www.yoctoproject.org/docs/current/ref-manual/ref-manual.html#var-PACKAGECONFIG Change-Id: I0d875896bc97e973489672f004cb49fae02bdd46 --- M recipes-osmocom/libosmo-abis/libosmo-abis.inc 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/27/16427/1 diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis.inc b/recipes-osmocom/libosmo-abis/libosmo-abis.inc index dcfcbf7..955ebe3 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis.inc +++ b/recipes-osmocom/libosmo-abis/libosmo-abis.inc @@ -2,13 +2,17 @@ HOMEPAGE = "https://osmocom.org/projects/libosmo-abis" LICENSE = "AGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" DEPENDS = "libosmocore ortp libtalloc" -DEPENDS_append_geode = "dahdi-linux" inherit autotools pkgconfig +PACKAGECONFIG ??= "\ + dahdi \ + " +PACKAGECONFIG[dahdi] = "--enable-dahdi,--disable-dahdi,dahdi-linux," + PACKAGES =+ "libosmotrau libosmotrau-dev" FILES_libosmotrau = "${libdir}/libosmotrau${SOLIBS}" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I0d875896bc97e973489672f004cb49fae02bdd46 Gerrit-Change-Number: 16427 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 12:56:34 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 12:56:34 +0000 Subject: Change in meta-telephony[201705]: libosmo-abis.inc: Clean up var order and update homepage References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/meta-telephony/+/16426 ) Change subject: libosmo-abis.inc: Clean up var order and update homepage ...................................................................... libosmo-abis.inc: Clean up var order and update homepage Change-Id: I94f9e7ab31f8f750acd6003d83e47dfa15e8459c --- M recipes-osmocom/libosmo-abis/libosmo-abis.inc 1 file changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/26/16426/1 diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis.inc b/recipes-osmocom/libosmo-abis/libosmo-abis.inc index 58f4242..dcfcbf7 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis.inc +++ b/recipes-osmocom/libosmo-abis/libosmo-abis.inc @@ -1,12 +1,11 @@ DESCRIPTION = "An utility library for Open Source Mobile Communications" -DEPENDS = "libosmocore ortp libtalloc" -DEPENDS_append_geode = "dahdi-linux" -HOMEPAGE = "http://openbsc.gnumonks.org" +HOMEPAGE = "https://osmocom.org/projects/libosmo-abis" LICENSE = "AGPLv3" - +LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" INC_PR="r0.${META_TELEPHONY_OSMO_INC}" -LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" +DEPENDS = "libosmocore ortp libtalloc" +DEPENDS_append_geode = "dahdi-linux" inherit autotools pkgconfig -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I94f9e7ab31f8f750acd6003d83e47dfa15e8459c Gerrit-Change-Number: 16426 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 12:58:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 12:58:01 +0000 Subject: Change in meta-telephony[201705]: libosmo-abis.inc: Use PACKAGECONFIG to handle dahdi support, enable i... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16427 ) Change subject: libosmo-abis.inc: Use PACKAGECONFIG to handle dahdi support, enable it by default ...................................................................... Patch Set 1: Verified+1 That works together with https://git.sysmocom.de/poky/system-images/commit/?h=pespin/201705&id=6c68a99f4531c83f95a7c077b62db4af276404bd I tested it and it's not build for sysmobts platform after applying it. -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I0d875896bc97e973489672f004cb49fae02bdd46 Gerrit-Change-Number: 16427 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 12:58:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 13:01:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 13:01:35 +0000 Subject: Change in meta-telephony[201705]: lksctp-tools: RRECOMENDS kernel-module-sctp In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16425 ) Change subject: lksctp-tools: RRECOMENDS kernel-module-sctp ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: If69b82d1c03079b09284a325bd418313e8187cf9 Gerrit-Change-Number: 16425 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 03 Dec 2019 13:01:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 13:01:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 13:01:48 +0000 Subject: Change in meta-telephony[201705]: libosmo-abis.inc: Clean up var order and update homepage In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16426 ) Change subject: libosmo-abis.inc: Clean up var order and update homepage ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I94f9e7ab31f8f750acd6003d83e47dfa15e8459c Gerrit-Change-Number: 16426 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 03 Dec 2019 13:01:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 13:02:09 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 13:02:09 +0000 Subject: Change in meta-telephony[201705]: libosmo-abis.inc: Use PACKAGECONFIG to handle dahdi support, enable i... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16427 ) Change subject: libosmo-abis.inc: Use PACKAGECONFIG to handle dahdi support, enable it by default ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I0d875896bc97e973489672f004cb49fae02bdd46 Gerrit-Change-Number: 16427 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 13:02:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 13:03:44 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 13:03:44 +0000 Subject: Change in osmo-sip-connector[master]: mncc.c: fix gsm_mncc_rtp size checks In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16423 ) Change subject: mncc.c: fix gsm_mncc_rtp size checks ...................................................................... Patch Set 1: I think this should go as a patch against that latest tag, effectively crating a branch. So it should probably not be in refs/for/master but something like refs/for/1.1.1 ? -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I9fc71bb6fa946ff4f0934de85e5ec29b8dd67b7f Gerrit-Change-Number: 16423 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 03 Dec 2019 13:03:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 13:04:34 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 13:04:34 +0000 Subject: Change in osmo-sip-connector[master]: mncc.c: fix gsm_mncc_rtp size checks In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16423 ) Change subject: mncc.c: fix gsm_mncc_rtp size checks ...................................................................... Patch Set 1: Code-Review+2 > I think this should go as a patch against that latest tag, > effectively crating a branch. So it should probably not be in > refs/for/master but something like refs/for/1.1.1 ? 1.3.1, sorry. and looking at the git history, there are only three relatively low-risk changes since 1.3.0, so we can do this via master and then tag 1.3.1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I9fc71bb6fa946ff4f0934de85e5ec29b8dd67b7f Gerrit-Change-Number: 16423 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 13:04:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 13:04:53 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 3 Dec 2019 13:04:53 +0000 Subject: Change in osmo-hlr[master]: add mslookup_manual_test In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16210 ) Change subject: add mslookup_manual_test ...................................................................... Patch Set 22: > Festung external network interfaces is not a unit test! Autocorrect? ;) But you are right, I'm working on TTCN-3 tests using the titan DNS modules (see SYS#4618). -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I80473528c9524263b60fc3ba37ba246c80bfe452 Gerrit-Change-Number: 16210 Gerrit-PatchSet: 22 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 03 Dec 2019 13:04:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 13:05:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 13:05:48 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sip-connector=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E4-6321_=E2=86=92_1=2E3=2E1?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16424 ) Change subject: Bump version: 1.3.0.4-6321 ? 1.3.1 ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-sip-connector/+/16424/1/debian/changelog File debian/changelog: https://gerrit.osmocom.org/c/osmo-sip-connector/+/16424/1/debian/changelog at 3 PS1, Line 3: * mncc.c: fix gsm_mncc_rtp size checks this looks like it is created on a branch forked from 1.3.0 with only a single commit. However, it is still submitted against refs/for/master, which is confusing. Either we do it in master (with the complete changelog of master since 1.3.0) or we do it on a branch with only one patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ia91bf12c88506d7ee209c479a10a2cdf397ea667 Gerrit-Change-Number: 16424 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 03 Dec 2019 13:05:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 13:06:00 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 13:06:00 +0000 Subject: Change in osmo-sip-connector[master]: mncc.c: fix gsm_mncc_rtp size checks In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16423 ) Change subject: mncc.c: fix gsm_mncc_rtp size checks ...................................................................... Patch Set 1: -Code-Review > Patch Set 1: Code-Review+2 > > > I think this should go as a patch against that latest tag, > > effectively crating a branch. So it should probably not be in > > refs/for/master but something like refs/for/1.1.1 ? > > 1.3.1, sorry. and looking at the git history, there are only three relatively low-risk changes since 1.3.0, so we can do this via master and then tag 1.3.1 Yes sorry, I'll take care of it. I usually create a fake branch pointing at the tag I want to release on top of, then submit against that branch through gerrit. Then once merged I submit the tag. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I9fc71bb6fa946ff4f0934de85e5ec29b8dd67b7f Gerrit-Change-Number: 16423 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 13:06:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 13:06:34 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 13:06:34 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sip-connector=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E4-6321_=E2=86=92_1=2E3=2E1?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16424 ) Change subject: Bump version: 1.3.0.4-6321 ? 1.3.1 ...................................................................... Patch Set 1: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ia91bf12c88506d7ee209c479a10a2cdf397ea667 Gerrit-Change-Number: 16424 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 03 Dec 2019 13:06:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 13:25:22 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 13:25:22 +0000 Subject: Change in meta-telephony[201705]: libosmo-abis.inc: Clean up var order and update homepage In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16426 ) Change subject: libosmo-abis.inc: Clean up var order and update homepage ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I94f9e7ab31f8f750acd6003d83e47dfa15e8459c Gerrit-Change-Number: 16426 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 13:25:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 13:25:24 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 13:25:24 +0000 Subject: Change in meta-telephony[201705]: lksctp-tools: RRECOMENDS kernel-module-sctp In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16425 ) Change subject: lksctp-tools: RRECOMENDS kernel-module-sctp ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: If69b82d1c03079b09284a325bd418313e8187cf9 Gerrit-Change-Number: 16425 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 13:25:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 13:25:31 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 13:25:31 +0000 Subject: Change in meta-telephony[201705]: lksctp-tools: RRECOMENDS kernel-module-sctp In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16425 ) Change subject: lksctp-tools: RRECOMENDS kernel-module-sctp ...................................................................... lksctp-tools: RRECOMENDS kernel-module-sctp Previously the kernel module was only pulled in for ${PN}-utils and ${PN}-ptest, but not for the library itself. As a result, apps using only the library (like osmo-msc->libosmocore->libsctp) fail because the kernel module is not installed in the image. Change-Id: If69b82d1c03079b09284a325bd418313e8187cf9 --- M recipes-misc/lksctp-tools/lksctp-tools_1.0.16.bb 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Verified diff --git a/recipes-misc/lksctp-tools/lksctp-tools_1.0.16.bb b/recipes-misc/lksctp-tools/lksctp-tools_1.0.16.bb index f69e71c..7aaa6e1 100644 --- a/recipes-misc/lksctp-tools/lksctp-tools_1.0.16.bb +++ b/recipes-misc/lksctp-tools/lksctp-tools_1.0.16.bb @@ -17,6 +17,8 @@ SRC_URI[md5sum] = "708bb0b5a6806ad6e8d13c55b067518e" SRC_URI[sha256sum] = "0903dd526b7f30a89d5031aa2c82757612becc38ed7bc6e4f972f8deae351f26" +PR = "r1" + #| arm-oe-linux-gnueabi-libtool: link: arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork --sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm -shared -fPIC -DPIC .libs/bindx.o .libs/connectx.o .libs/peeloff.o .libs/opt_info.o .libs/addrs.o .libs/sendmsg.o .libs/recvmsg.o -march=armv5te -marm -mthumb-interwork --sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm -O2 -Wl,--version-script=/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/lksctp-tools/1.0.16-r0/lksctp-tools-1.0.16/src/lib/Versions.map -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-soname -Wl,libsctp.so.1 -o .libs/libsctp.so.1.0.16 #| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.0/ld: error: symbol sctp_connectx has undefined version #| collect2: error: ld returned 1 exit status @@ -61,5 +63,6 @@ FILES_${PN}-utils = "${bindir}/*" +RRECOMMENDS_${PN} += "kernel-module-sctp" RRECOMMENDS_${PN}-utils += "kernel-module-sctp" RRECOMMENDS_${PN}-ptest += "kernel-module-sctp" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: If69b82d1c03079b09284a325bd418313e8187cf9 Gerrit-Change-Number: 16425 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 13:25:31 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 13:25:31 +0000 Subject: Change in meta-telephony[201705]: libosmo-abis.inc: Clean up var order and update homepage In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16426 ) Change subject: libosmo-abis.inc: Clean up var order and update homepage ...................................................................... libosmo-abis.inc: Clean up var order and update homepage Change-Id: I94f9e7ab31f8f750acd6003d83e47dfa15e8459c --- M recipes-osmocom/libosmo-abis/libosmo-abis.inc 1 file changed, 4 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Verified diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis.inc b/recipes-osmocom/libosmo-abis/libosmo-abis.inc index 58f4242..dcfcbf7 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis.inc +++ b/recipes-osmocom/libosmo-abis/libosmo-abis.inc @@ -1,12 +1,11 @@ DESCRIPTION = "An utility library for Open Source Mobile Communications" -DEPENDS = "libosmocore ortp libtalloc" -DEPENDS_append_geode = "dahdi-linux" -HOMEPAGE = "http://openbsc.gnumonks.org" +HOMEPAGE = "https://osmocom.org/projects/libosmo-abis" LICENSE = "AGPLv3" - +LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" INC_PR="r0.${META_TELEPHONY_OSMO_INC}" -LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" +DEPENDS = "libosmocore ortp libtalloc" +DEPENDS_append_geode = "dahdi-linux" inherit autotools pkgconfig -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I94f9e7ab31f8f750acd6003d83e47dfa15e8459c Gerrit-Change-Number: 16426 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 13:25:32 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 13:25:32 +0000 Subject: Change in meta-telephony[201705]: libosmo-abis.inc: Use PACKAGECONFIG to handle dahdi support, enable i... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16427 ) Change subject: libosmo-abis.inc: Use PACKAGECONFIG to handle dahdi support, enable it by default ...................................................................... libosmo-abis.inc: Use PACKAGECONFIG to handle dahdi support, enable it by default Building with DAHDI support can be controlled by bbappend or config file on the BSP meta layer as described here: https://www.yoctoproject.org/docs/current/ref-manual/ref-manual.html#var-PACKAGECONFIG Change-Id: I0d875896bc97e973489672f004cb49fae02bdd46 --- M recipes-osmocom/libosmo-abis/libosmo-abis.inc 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: pespin: Verified laforge: Looks good to me, approved diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis.inc b/recipes-osmocom/libosmo-abis/libosmo-abis.inc index dcfcbf7..955ebe3 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis.inc +++ b/recipes-osmocom/libosmo-abis/libosmo-abis.inc @@ -2,13 +2,17 @@ HOMEPAGE = "https://osmocom.org/projects/libosmo-abis" LICENSE = "AGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" -INC_PR="r0.${META_TELEPHONY_OSMO_INC}" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" DEPENDS = "libosmocore ortp libtalloc" -DEPENDS_append_geode = "dahdi-linux" inherit autotools pkgconfig +PACKAGECONFIG ??= "\ + dahdi \ + " +PACKAGECONFIG[dahdi] = "--enable-dahdi,--disable-dahdi,dahdi-linux," + PACKAGES =+ "libosmotrau libosmotrau-dev" FILES_libosmotrau = "${libdir}/libosmotrau${SOLIBS}" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I0d875896bc97e973489672f004cb49fae02bdd46 Gerrit-Change-Number: 16427 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 13:51:49 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 3 Dec 2019 13:51:49 +0000 Subject: Change in osmo-dev[master]: ttcn3.sh: support sip (osmo-sip-connector) In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/16315 ) Change subject: ttcn3.sh: support sip (osmo-sip-connector) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/16315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I9eed35628f25be37bf0190e5d5797d792c1f0ef9 Gerrit-Change-Number: 16315 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 13:51:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 13:51:53 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 3 Dec 2019 13:51:53 +0000 Subject: Change in osmo-dev[master]: ttcn3.sh: support sip (osmo-sip-connector) In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/16315 ) Change subject: ttcn3.sh: support sip (osmo-sip-connector) ...................................................................... ttcn3.sh: support sip (osmo-sip-connector) Change-Id: I9eed35628f25be37bf0190e5d5797d792c1f0ef9 --- M ttcn3/ttcn3.sh 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: osmith: Verified pespin: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index 4cb4344..5322182 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -10,7 +10,7 @@ if [ -z "$PROJECT" ]; then echo "usage: $(basename $0) PROJECT" echo "example: $(basename $0) hlr" - echo "known working projects: hlr, mgw, msc, pcu, pcu-sns, sgsn" + echo "known working projects: hlr, mgw, msc, pcu, pcu-sns, sip, sgsn" echo "wip: bts, bts-oml" echo "" echo "notes (see docker-playground.git/ttcn3-*/jenkins.sh):" @@ -59,6 +59,7 @@ pcu-sns) echo "osmo-pcu" ;; pcu) echo "osmo-pcu osmo-bsc osmo-bts-virtual virtphy" ;; sgsn) echo "osmo-stp osmo-sgsn" ;; + sip) echo "osmo-sip-connector" ;; *) echo "osmo-$PROJECT" ;; esac } -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/16315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I9eed35628f25be37bf0190e5d5797d792c1f0ef9 Gerrit-Change-Number: 16315 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 13:54:30 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 3 Dec 2019 13:54:30 +0000 Subject: Change in osmo-hlr[master]: gsup_client.h: fix license header: GPLv2+ References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16428 ) Change subject: gsup_client.h: fix license header: GPLv2+ ...................................................................... gsup_client.h: fix license header: GPLv2+ gsup_client.c is GPLv2 too, having AGPLv3 in the header file does not make sense. Change-Id: I3827a7c70d60137ffc654c1ca53c2652bb3df147 --- M include/osmocom/gsupclient/gsup_client.h 1 file changed, 5 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/28/16428/1 diff --git a/include/osmocom/gsupclient/gsup_client.h b/include/osmocom/gsupclient/gsup_client.h index 154e3e0..b417ade 100644 --- a/include/osmocom/gsupclient/gsup_client.h +++ b/include/osmocom/gsupclient/gsup_client.h @@ -6,18 +6,17 @@ * Author: Jacob Erlbeck * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ #pragma once -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3827a7c70d60137ffc654c1ca53c2652bb3df147 Gerrit-Change-Number: 16428 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 14:12:30 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 3 Dec 2019 14:12:30 +0000 Subject: Change in osmo-hlr[master]: contrib/dgsm/ add example esme and dialplan In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16204 ) Change subject: contrib/dgsm/ add example esme and dialplan ...................................................................... Patch Set 18: (1 comment) Is there another license you would prefer for freeswitch_dialplan_dgsm.py? https://gerrit.osmocom.org/c/osmo-hlr/+/16204/18/contrib/dgsm/esme_dgsm.py File contrib/dgsm/esme_dgsm.py: https://gerrit.osmocom.org/c/osmo-hlr/+/16204/18/contrib/dgsm/esme_dgsm.py at 4 PS18, Line 4: Copyright 2019 sysmocom s.f.m.c GmbH > No need to AGPL here, imho This file is based on code from Rhizomatica, released under AGPL (see comment below in the file). -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I26e8dd8d9a08187fccb3e74ee91366bc24f6c608 Gerrit-Change-Number: 16204 Gerrit-PatchSet: 18 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 14:12:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 14:14:11 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 3 Dec 2019 14:14:11 +0000 Subject: Change in osmo-hlr[master]: add libosmo-mslookup abstract client In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#17) to the change originally created by neels. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16202 ) Change subject: add libosmo-mslookup abstract client ...................................................................... add libosmo-mslookup abstract client mslookup is a key concept in Distributed GSM, which allows querying the current location of a subscriber in a number of cooperating but independent core network sites, by arbitrary service names and by MSISDN/IMSI. Add the abstract mslookup client library. An actual lookup method (besides mslookup_client_fake.c) is added in a subsequent patch. For a detailed overview of this and upcoming patches, please see the elaborate comment at the top of mslookup.c. Add as separate library, libosmo-mslookup, to allow adding D-GSM capability to arbitrary client programs. osmo-hlr will be the only mslookup server implementation, added in a subsequent patch. osmo-hlr itself will also use this library and act as an mslookup client, when requesting the home HLR for locally unknown IMSIs. Related: OS#4237 Patch-by: osmith, nhofmeyr Change-Id: I83487ab8aad1611eb02e997dafbcb8344da13df1 --- M .gitignore M configure.ac M debian/control A debian/libosmo-mslookup-dev.install A debian/libosmo-mslookup0.install M include/Makefile.am M include/osmocom/hlr/logging.h A include/osmocom/mslookup/mslookup.h A include/osmocom/mslookup/mslookup_client.h A include/osmocom/mslookup/mslookup_client_fake.h A libosmo-mslookup.pc.in M src/Makefile.am A src/mslookup/Makefile.am A src/mslookup/mslookup.c A src/mslookup/mslookup_client.c A src/mslookup/mslookup_client_fake.c M tests/Makefile.am A tests/mslookup/Makefile.am A tests/mslookup/mslookup_client_test.c A tests/mslookup/mslookup_client_test.err A tests/mslookup/mslookup_test.c A tests/mslookup/mslookup_test.err M tests/testsuite.at 23 files changed, 1,614 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/02/16202/17 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I83487ab8aad1611eb02e997dafbcb8344da13df1 Gerrit-Change-Number: 16202 Gerrit-PatchSet: 17 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 14:14:11 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 3 Dec 2019 14:14:11 +0000 Subject: Change in osmo-hlr[master]: add mDNS lookup method to libosmo-mslookup In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#8) to the change originally created by neels. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16256 ) Change subject: add mDNS lookup method to libosmo-mslookup ...................................................................... add mDNS lookup method to libosmo-mslookup Add the first actually useful lookup method to the mslookup library: multicast DNS. The server side is added in a subsequent commit, when the mslookup server is implemented for the osmo-hlr program. Use custom DNS encoding instead of libc-ares (which we use in OsmoSGSN already), because libc-ares is only a DNS client implementation and we will need both client and server. Related: OS#4237 Patch-by: osmith, nhofmeyr Change-Id: I03a0ffa1d4dc1b24ac78a5ad0975bca90a49c728 --- M .gitignore M configure.ac M include/Makefile.am M include/osmocom/Makefile.am A include/osmocom/mslookup/Makefile.am A include/osmocom/mslookup/mdns.h A include/osmocom/mslookup/mdns_msg.h A include/osmocom/mslookup/mdns_rfc.h A include/osmocom/mslookup/mdns_sock.h A include/osmocom/mslookup/mslookup_client_mdns.h M src/mslookup/Makefile.am A src/mslookup/mdns.c A src/mslookup/mdns_msg.c A src/mslookup/mdns_rfc.c A src/mslookup/mdns_sock.c A src/mslookup/mslookup_client_mdns.c M tests/mslookup/Makefile.am A tests/mslookup/mdns_test.c A tests/mslookup/mdns_test.err A tests/mslookup/mslookup_client_mdns_test.c A tests/mslookup/mslookup_client_mdns_test.err M tests/testsuite.at 22 files changed, 2,771 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/56/16256/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I03a0ffa1d4dc1b24ac78a5ad0975bca90a49c728 Gerrit-Change-Number: 16256 Gerrit-PatchSet: 8 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 14:14:11 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 3 Dec 2019 14:14:11 +0000 Subject: Change in osmo-hlr[master]: add osmo-mslookup-client program In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#19) to the change originally created by neels. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16203 ) Change subject: add osmo-mslookup-client program ...................................................................... add osmo-mslookup-client program Standalone program using libosmo-mslookup to easily integrate with programs that want to connect services (SIP, SMS,...) to the current location of a subscriber. Also useful for manual testing. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: Ie68a5c1db04fb4dff00dc3c774a1162f5b9fabf7 --- M .gitignore M configure.ac M contrib/Makefile.am A contrib/dgsm/Makefile.am A contrib/dgsm/osmo-mslookup-pipe.py A contrib/dgsm/osmo-mslookup-socket.py M src/mslookup/Makefile.am A src/mslookup/osmo-mslookup-client.c 8 files changed, 948 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/03/16203/19 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ie68a5c1db04fb4dff00dc3c774a1162f5b9fabf7 Gerrit-Change-Number: 16203 Gerrit-PatchSet: 19 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 14:14:11 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 3 Dec 2019 14:14:11 +0000 Subject: Change in osmo-hlr[master]: refactor: add and use lu_fsm, osmo_gsup_req, osmo_gt In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#20) to the change originally created by neels. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16205 ) Change subject: refactor: add and use lu_fsm, osmo_gsup_req, osmo_gt ...................................................................... refactor: add and use lu_fsm, osmo_gsup_req, osmo_gt These are seemingly orthogonal changes in one patch, because they are in fact sufficiently intertwined that we are not willing to spend the time to separate them. They are also refactoring changes, unlikely to make sense on their own. ** lu_fsm: Attempting to make luop.c keep state about incoming GSUP requests made me find shortcomings in several places: - since it predates osmo_fsm, it is a state machine that does not strictly enforce the order of state transitions or the right sequence of incoming events. - several places OSMO_ASSERT() on data received from the network. - modifies the subscriber state before a LU is accepted. - dead code about canceling a subscriber in a previous VLR. That would be a good thing to actually do, which should also be trivial now that we record vlr_name and sgsn_name, but I decided to remove the dead code for now. To both step up the LU game *and* make it easier for me to integrate osmo_gsup_req handling, I decided to create a lu_fsm, drawing from my, by now, ample experience of writing osmo_fsms. ** osmo_gsup_req: Prepare for D-GSM, where osmo-hlr will do proxy routing for remote HLRs / communicate with remote MSCs via a proxy: a) It is important that a response that osmo-hlr generates and that is sent back to a requesting MSC contains all IEs that are needed to route it back to the requester. Particularly source_name must become destination_name in the response to be able to even reach the requesting MSC. Other fields are also necessary to match, which were so far taken care of in individual numerous code paths. b) For some operations, the response to a GSUP request is generated asynchronously (like Update Location Request -> Response, or taking the response from an EUSE, or the upcoming proxying to a remote HLR). To be able to feed a request message's information back into the response, we must thus keep the request data around. Since struct osmo_gsup_message references a lot of external data, usually with pointers directly into the received msgb, it is not so trivial to pass GSUP message data around asynchronously, on its own. osmo_gsup_req is the combined solution for both a and b: it keeps all data for a GSUP message by taking ownership of the incoming msgb, and it provides an explicit API "forcing" callers to respond with osmo_gsup_req_respond(), so that all code paths trivially are definitely responding with the correct IEs set to match the request's routing (by using osmo_gsup_make_response() recently added to libosmocore). Adjust all osmo-hlr code paths to use *only* osmo_gsup_req to respond to incoming requests received on the GSUP server (above LU code being one of them). In fact, the same should be done on the client side. Hence osmo_gsup_req is implemented in a server/client agnostic way, and is placed in libosmo-gsupclient. As soon as we see routing errors in complex GSUP setups, using osmo_gsup_req in the related GSUP client is likely to resolve those problems without much thinking required beyond making all code paths use it. libosmo-gsupclient is hence added to osmo-hlr binary's own library dependencies. It would have been added by the D-GSM proxy routing anyway, we are just doing it a little sooner. ** global_title.c / osmo_gt: We so far handle a Global Title a.k.a. an IPA unit name as pointer + size, or as just pointer with implicit talloc size. To ease working with GSUP peer identification data, I require: - a non-allocated storage of a Global Title. It brings the drawback of being size limited, but our current implementation is anyway only able to handle MSC and SGSN names of 31 characters (see struct hlr_subscriber). - a single-argument handle for Global Title, - easy to use utility functions like osmo_gt_name(), osmo_gt_cmp(), and copying by simple assignment, a = b. Hence this patch adds a osmo_gt in global_title.h and global_title.c. Heavily used in LU and osmo_gsup_req. Depends: libosmocore Id9692880079ea0f219f52d81b1923a76fc640566 Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 --- M configure.ac M include/Makefile.am A include/osmocom/gsupclient/global_title.h A include/osmocom/gsupclient/gsup_req.h M include/osmocom/hlr/Makefile.am M include/osmocom/hlr/db.h M include/osmocom/hlr/gsup_router.h M include/osmocom/hlr/gsup_server.h M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_ussd.h M include/osmocom/hlr/logging.h A include/osmocom/hlr/lu_fsm.h D include/osmocom/hlr/luop.h M src/Makefile.am M src/db.c M src/db_hlr.c M src/gsup_router.c M src/gsup_send.c M src/gsup_server.c M src/gsupclient/Makefile.am A src/gsupclient/global_title.c M src/gsupclient/gsup_client.c A src/gsupclient/gsup_req.c M src/hlr.c M src/hlr_ussd.c M src/logging.c A src/lu_fsm.c D src/luop.c M tests/Makefile.am M tests/db/Makefile.am M tests/db/db_test.c M tests/db/db_test.err A tests/gsup/Makefile.am A tests/gsup/gsup_test.c A tests/gsup/gsup_test.err A tests/gsup/gsup_test.ok M tests/gsup_server/Makefile.am M tests/test_nodes.vty M tests/testsuite.at 39 files changed, 1,626 insertions(+), 905 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/05/16205/20 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 Gerrit-Change-Number: 16205 Gerrit-PatchSet: 20 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 14:14:11 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 3 Dec 2019 14:14:11 +0000 Subject: Change in osmo-hlr[master]: D-GSM 1/n: add mslookup server in osmo-hlr In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#20) to the change originally created by neels. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16209 ) Change subject: D-GSM 1/n: add mslookup server in osmo-hlr ...................................................................... D-GSM 1/n: add mslookup server in osmo-hlr Implement the mslookup server to service remote mslookup requests. This patch merely adds the logic to answer incoming mslookup requests, an actual method to receive requests (mDNS) follows in a subsequent patch. - API to configure service names and addresses for the local site (per MSC). - determine whether a subscriber is on a local MSC (checking the local proxy will be added in subsequent patch that adds proxy capability). - VTY config follows in a subsequent patch. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: Ife4a61d71926d08f310a1aeed9d9f1974f64178b --- M include/osmocom/hlr/Makefile.am M include/osmocom/hlr/hlr.h A include/osmocom/hlr/mslookup_server.h A include/osmocom/hlr/timestamp.h M src/Makefile.am M src/hlr.c A src/mslookup_server.c A src/timestamp.c 8 files changed, 534 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/09/16209/20 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ife4a61d71926d08f310a1aeed9d9f1974f64178b Gerrit-Change-Number: 16209 Gerrit-PatchSet: 20 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 14:14:37 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 3 Dec 2019 14:14:37 +0000 Subject: Change in osmo-hlr[master]: mdns: properly zero initialize result data In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16335 ) Change subject: mdns: properly zero initialize result data ...................................................................... Abandoned squashed -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ie58ccc01e107cd2939ca782ab6fa5f6e16195433 Gerrit-Change-Number: 16335 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 14:14:58 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 3 Dec 2019 14:14:58 +0000 Subject: Change in osmo-hlr[master]: add mDNS lookup method to libosmo-mslookup In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16256 ) Change subject: add mDNS lookup method to libosmo-mslookup ...................................................................... Patch Set 8: (2 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/16256/7/src/mslookup/mdns.c File src/mslookup/mdns.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16256/7/src/mslookup/mdns.c at 117 PS7, Line 117: case OSMO_MDNS_RFC_RECORD_TYPE_A: > Typically no indent of case in switch, but not critical Done https://gerrit.osmocom.org/c/osmo-hlr/+/16256/7/src/mslookup/mdns_msg.c File src/mslookup/mdns_msg.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16256/7/src/mslookup/mdns_msg.c at 67 PS7, Line 67: ret = talloc(ctx, struct osmo_mdns_msg_request); > We rarely ose talloc without _zero as a safeguard. [?] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I03a0ffa1d4dc1b24ac78a5ad0975bca90a49c728 Gerrit-Change-Number: 16256 Gerrit-PatchSet: 8 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 03 Dec 2019 14:14:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 14:16:22 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 3 Dec 2019 14:16:22 +0000 Subject: Change in osmo-hlr[master]: add libosmo-mslookup abstract client In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16202 ) Change subject: add libosmo-mslookup abstract client ...................................................................... Patch Set 17: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16202/16/include/osmocom/mslookup/mslookup.h File include/osmocom/mslookup/mslookup.h: https://gerrit.osmocom.org/c/osmo-hlr/+/16202/16/include/osmocom/mslookup/mslookup.h at 16 PS16, Line 16: * along with this program. If not, see . > We may want to consider more permissive licensing for the library. [?] Changed to GPLv2+ (adjusted whole patchset). -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I83487ab8aad1611eb02e997dafbcb8344da13df1 Gerrit-Change-Number: 16202 Gerrit-PatchSet: 17 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 14:16:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 14:17:32 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 3 Dec 2019 14:17:32 +0000 Subject: Change in osmo-hlr[master]: add osmo-mslookup-client program In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16203 ) Change subject: add osmo-mslookup-client program ...................................................................... Patch Set 19: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16203/18/src/mslookup/osmo-mslookup-client.c File src/mslookup/osmo-mslookup-client.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16203/18/src/mslookup/osmo-mslookup-client.c at 50 PS18, Line 50: "This program is free software; you can redistribute it and/or modify\n" > License violation if the lib is not changed from agpl Right :) changed the header on top of the file, so it also says GPLv2+. That also means, the whole mslookup directory is under that license now. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ie68a5c1db04fb4dff00dc3c774a1162f5b9fabf7 Gerrit-Change-Number: 16203 Gerrit-PatchSet: 19 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 14:17:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 14:19:31 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 3 Dec 2019 14:19:31 +0000 Subject: Change in osmo-hlr[master]: refactor: add and use lu_fsm, osmo_gsup_req, osmo_gt In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16205 ) Change subject: refactor: add and use lu_fsm, osmo_gsup_req, osmo_gt ...................................................................... Patch Set 20: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16205/19/include/osmocom/gsupclient/global_title.h File include/osmocom/gsupclient/global_title.h: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/19/include/osmocom/gsupclient/global_title.h at 13 PS19, Line 13: * GNU Affero General Public License for more details. > gsupclient is not agpl so far, please don't change it fixed. gsup_client.h had AGPL in the header though, submitted patch to fix this here: https://gerrit.osmocom.org/c/osmo-hlr/+/16428 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 Gerrit-Change-Number: 16205 Gerrit-PatchSet: 20 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 03 Dec 2019 14:19:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 14:20:04 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 3 Dec 2019 14:20:04 +0000 Subject: Change in osmo-hlr[master]: D-GSM 1/n: add mslookup server in osmo-hlr In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16209 ) Change subject: D-GSM 1/n: add mslookup server in osmo-hlr ...................................................................... Patch Set 20: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16209/19/include/osmocom/hlr/hlr_ussd.h File include/osmocom/hlr/hlr_ussd.h: https://gerrit.osmocom.org/c/osmo-hlr/+/16209/19/include/osmocom/hlr/hlr_ussd.h at 12 PS19, Line 12: * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > This looks unrelated Done -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ife4a61d71926d08f310a1aeed9d9f1974f64178b Gerrit-Change-Number: 16209 Gerrit-PatchSet: 20 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 03 Dec 2019 14:20:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 14:40:29 2019 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 3 Dec 2019 14:40:29 +0000 Subject: Change in simtrace2[master]: minor: fix typo References: Message-ID: tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16430 ) Change subject: minor: fix typo ...................................................................... minor: fix typo Change-Id: I462291078fe9b05bfdf6fb7ab0f96b1edeecdac6 --- M firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/30/16430/1 diff --git a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c index 444b75f..ac4d7df 100644 --- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c +++ b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c @@ -208,7 +208,7 @@ * activate itself, rather than boot into the application */ g_dfu->magic = USB_DFU_MAGIC; - /* Disconnect the USB by remoting the pull-up */ + /* Disconnect the USB by removing the pull-up */ USBD_Disconnect(); __disable_irq(); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I462291078fe9b05bfdf6fb7ab0f96b1edeecdac6 Gerrit-Change-Number: 16430 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 14:40:29 2019 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 3 Dec 2019 14:40:29 +0000 Subject: Change in simtrace2[master]: DFU: increase USB reset duration to 50 ms References: Message-ID: tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16431 ) Change subject: DFU: increase USB reset duration to 50 ms ...................................................................... DFU: increase USB reset duration to 50 ms the specification requires a reset duration of at least 10 ms. reset is indicated by the device to the host by removing the pull-up on D+ (host to device reset is a USB packet). we used 20 ms, but on some setups (USB host, stack, hub, and load dependent), this does not seem to be enough (no USB enumeration was performed afterward, at least for the DFU bootloader). increasing to 50 ms solved the issue on the affected setups. instead of USB suspend, the more proper USB disconnect is used. this mainly disables the pull-up provided by the USB peripheral. USB activate is not required since the follow up initialisation takes care of it. Change-Id: If5ceb3b8f7a8f134d4439fdd138dd12b46589f97 --- M firmware/apps/dfu/main.c 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/31/16431/1 diff --git a/firmware/apps/dfu/main.c b/firmware/apps/dfu/main.c index f9b6aed..0f1e0de 100644 --- a/firmware/apps/dfu/main.c +++ b/firmware/apps/dfu/main.c @@ -295,17 +295,16 @@ TRACE_INFO("USB init...\n\r"); /* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */ + USBD_Disconnect(); #ifdef PIN_USB_PULLUP const Pin usb_dp_pullup = PIN_USB_PULLUP; PIO_Configure(&usb_dp_pullup, 1); PIO_Set(&usb_dp_pullup); #endif - USBD_HAL_Suspend(); - mdelay(20); + mdelay(50); #ifdef PIN_USB_PULLUP PIO_Clear(&usb_dp_pullup); #endif - USBD_HAL_Activate(); USBDFU_Initialize(&dfu_descriptors); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: If5ceb3b8f7a8f134d4439fdd138dd12b46589f97 Gerrit-Change-Number: 16431 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 14:40:30 2019 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Tue, 3 Dec 2019 14:40:30 +0000 Subject: Change in simtrace2[master]: DFU: restart bootloader when USB conf failed References: Message-ID: tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16432 ) Change subject: DFU: restart bootloader when USB conf failed ...................................................................... DFU: restart bootloader when USB conf failed when starting the DFU bootloader, but USB configuration (e.g. enumeration) failed, the MCU restarted in the main application. this occured after a DFU detach and were the USB host missed the USB reset. now after MCU reset, the bootloader is started again, since this is what was requested to begin with. the bootloader will always restart in the bootloader until USB enumeration succeeded. this boot loop can be stopped by unplugging/removing power from the device. Change-Id: I4062a7d8a7934af2119c169759b614dc45990651 --- M firmware/apps/dfu/main.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/32/16432/1 diff --git a/firmware/apps/dfu/main.c b/firmware/apps/dfu/main.c index 0f1e0de..21418b0 100644 --- a/firmware/apps/dfu/main.c +++ b/firmware/apps/dfu/main.c @@ -313,8 +313,8 @@ check_exec_dbg_cmd(); #if 1 if (i >= MAX_USB_ITER * 3) { - TRACE_ERROR("Resetting board (USB could " - "not be configured)\n\r"); + TRACE_ERROR("Resetting board (USB could not be configured)\n\r"); + g_dfu->magic = USB_DFU_MAGIC; // start the bootloader after reboot USBD_Disconnect(); NVIC_SystemReset(); } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I4062a7d8a7934af2119c169759b614dc45990651 Gerrit-Change-Number: 16432 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 15:24:51 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 15:24:51 +0000 Subject: Change in simtrace2[master]: minor: fix typo In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16430 ) Change subject: minor: fix typo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I462291078fe9b05bfdf6fb7ab0f96b1edeecdac6 Gerrit-Change-Number: 16430 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 15:24:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 15:46:28 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 15:46:28 +0000 Subject: Change in osmo-remsim[master]: cosmetic: more comments; spelling fixes in comments References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16433 ) Change subject: cosmetic: more comments; spelling fixes in comments ...................................................................... cosmetic: more comments; spelling fixes in comments Change-Id: I4939a386ac48e4e66bce9784d9a1539426c41aae --- M src/bankd_client_fsm.c M src/rspro_client_fsm.c 2 files changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/33/16433/1 diff --git a/src/bankd_client_fsm.c b/src/bankd_client_fsm.c index 2e3fdc9..7ddc065 100644 --- a/src/bankd_client_fsm.c +++ b/src/bankd_client_fsm.c @@ -63,15 +63,18 @@ } /*********************************************************************** - * bankd connection FSM: Remsim Client connection to Bankd + * client-side FSM for RSPRO connection to remsim-bankd + * + * This is part of remsim-client and manages the connection to remsim-bankd, + * over which actual TPDU exchanges happen. ***********************************************************************/ enum bankd_conn_fsm_state { - /* waiting for initial connectiong to remsim-bankd */ + /* waiting for initial connection to remsim-bankd */ BDC_ST_INIT, /* bankd connection established, waiting for ClientConnectRes */ BDC_ST_ESTABLISHED, - /* bankd connection etsablished, ClientConnect succeeded */ + /* bankd connection established, ClientConnect succeeded */ BDC_ST_CONNECTED, /* connection lost, we're waiting for a re-establish */ BDC_ST_REESTABLISH, diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index c01a763..7045778 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -44,7 +44,16 @@ #define T2_RECONNECT 10 /*********************************************************************** - * server connection FSM: remsim-{client,bankd} to remsim-server + * client-side FSM for a RSPRO connection to remsim-server + * + * This implements the TCP/IPA client side of an RSPRO connection between + * a logical (TCP-level) client implementation and a remote RSPRO server. + * + * 'client' and 'server' here strictly refer to RSPRO protocol roles, not + * to be confused with the remsim-client or remsim-server! + * + * Specifically, this RSPRO client FSM is used by both remsim-client and + * remsim-bankd for their RSPRO control connection to remsim-server. ***********************************************************************/ static void push_and_send(struct ipa_client_conn *ipa, struct msgb *msg_tx) -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I4939a386ac48e4e66bce9784d9a1539426c41aae Gerrit-Change-Number: 16433 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 15:46:29 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 15:46:29 +0000 Subject: Change in osmo-remsim[master]: bankd: send IPA CCM ID_ACK after receiving ID_ACK References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16434 ) Change subject: bankd: send IPA CCM ID_ACK after receiving ID_ACK ...................................................................... bankd: send IPA CCM ID_ACK after receiving ID_ACK It is customary in the IPA protocol that a a server side responds with an ID_ACK if the client sends an ID_ACK. Due to the lack of any protocol specification, it's unclear why exactly, but we know it does happen. osmo-remsim-bankd so far failed to implement this, which is not directly a problem as the only user (osmo-remsim-client) didn't care. However, when executing TTCN3 test cases, the IPA_Emulation expects that ID_ACK and related test fail. Change-Id: Ie55c9d5c435df786e97ec3900837bb21ab80140a --- M src/bankd/bankd_main.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/34/16434/1 diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 8cfeb96..9f99f83 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -747,6 +747,8 @@ switch (hh->data[0]) { case IPAC_MSGT_PING: return ipa_ccm_send_pong(worker->client.fd); + case IPAC_MSGT_ID_ACK: + return ipa_ccm_send_id_ack(g_worker->client.fd); default: LOGW(worker, "IPA CCM 0x%02x not implemented yet\n", hh->data[0]); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ie55c9d5c435df786e97ec3900837bb21ab80140a Gerrit-Change-Number: 16434 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 15:48:26 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 15:48:26 +0000 Subject: Change in osmo-remsim[master]: cosmetic: more comments; spelling fixes in comments In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16433 ) Change subject: cosmetic: more comments; spelling fixes in comments ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I4939a386ac48e4e66bce9784d9a1539426c41aae Gerrit-Change-Number: 16433 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 03 Dec 2019 15:48:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 15:48:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 15:48:50 +0000 Subject: Change in simtrace2[master]: minor: fix typo In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16430 ) Change subject: minor: fix typo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I462291078fe9b05bfdf6fb7ab0f96b1edeecdac6 Gerrit-Change-Number: 16430 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 15:48:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 15:48:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 15:48:51 +0000 Subject: Change in simtrace2[master]: minor: fix typo In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16430 ) Change subject: minor: fix typo ...................................................................... minor: fix typo Change-Id: I462291078fe9b05bfdf6fb7ab0f96b1edeecdac6 --- M firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c index 444b75f..ac4d7df 100644 --- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c +++ b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c @@ -208,7 +208,7 @@ * activate itself, rather than boot into the application */ g_dfu->magic = USB_DFU_MAGIC; - /* Disconnect the USB by remoting the pull-up */ + /* Disconnect the USB by removing the pull-up */ USBD_Disconnect(); __disable_irq(); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I462291078fe9b05bfdf6fb7ab0f96b1edeecdac6 Gerrit-Change-Number: 16430 Gerrit-PatchSet: 2 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 15:51:16 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 15:51:16 +0000 Subject: Change in simtrace2[master]: DFU: increase USB reset duration to 50 ms In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16431 ) Change subject: DFU: increase USB reset duration to 50 ms ...................................................................... Patch Set 1: Code-Review+2 I think we may have a similar issue in OCTSIM. I've seen it several times that when resetting from JTAG, the host PC would not detect a USB reset. Only if I held the board in JTAG-reset for more than a brief period [manually], it would detect it. -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: If5ceb3b8f7a8f134d4439fdd138dd12b46589f97 Gerrit-Change-Number: 16431 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 03 Dec 2019 15:51:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 15:51:49 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 15:51:49 +0000 Subject: Change in simtrace2[master]: DFU: restart bootloader when USB conf failed In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16432 ) Change subject: DFU: restart bootloader when USB conf failed ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I4062a7d8a7934af2119c169759b614dc45990651 Gerrit-Change-Number: 16432 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 03 Dec 2019 15:51:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 15:51:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 15:51:53 +0000 Subject: Change in simtrace2[master]: DFU: increase USB reset duration to 50 ms In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16431 ) Change subject: DFU: increase USB reset duration to 50 ms ...................................................................... DFU: increase USB reset duration to 50 ms the specification requires a reset duration of at least 10 ms. reset is indicated by the device to the host by removing the pull-up on D+ (host to device reset is a USB packet). we used 20 ms, but on some setups (USB host, stack, hub, and load dependent), this does not seem to be enough (no USB enumeration was performed afterward, at least for the DFU bootloader). increasing to 50 ms solved the issue on the affected setups. instead of USB suspend, the more proper USB disconnect is used. this mainly disables the pull-up provided by the USB peripheral. USB activate is not required since the follow up initialisation takes care of it. Change-Id: If5ceb3b8f7a8f134d4439fdd138dd12b46589f97 --- M firmware/apps/dfu/main.c 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/firmware/apps/dfu/main.c b/firmware/apps/dfu/main.c index 97cd074..36f80a8 100644 --- a/firmware/apps/dfu/main.c +++ b/firmware/apps/dfu/main.c @@ -300,17 +300,16 @@ TRACE_INFO("USB init...\n\r"); /* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */ + USBD_Disconnect(); #ifdef PIN_USB_PULLUP const Pin usb_dp_pullup = PIN_USB_PULLUP; PIO_Configure(&usb_dp_pullup, 1); PIO_Set(&usb_dp_pullup); #endif - USBD_HAL_Suspend(); - mdelay(20); + mdelay(50); #ifdef PIN_USB_PULLUP PIO_Clear(&usb_dp_pullup); #endif - USBD_HAL_Activate(); USBDFU_Initialize(&dfu_descriptors); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: If5ceb3b8f7a8f134d4439fdd138dd12b46589f97 Gerrit-Change-Number: 16431 Gerrit-PatchSet: 2 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 15:51:54 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 15:51:54 +0000 Subject: Change in simtrace2[master]: DFU: restart bootloader when USB conf failed In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16432 ) Change subject: DFU: restart bootloader when USB conf failed ...................................................................... DFU: restart bootloader when USB conf failed when starting the DFU bootloader, but USB configuration (e.g. enumeration) failed, the MCU restarted in the main application. this occured after a DFU detach and were the USB host missed the USB reset. now after MCU reset, the bootloader is started again, since this is what was requested to begin with. the bootloader will always restart in the bootloader until USB enumeration succeeded. this boot loop can be stopped by unplugging/removing power from the device. Change-Id: I4062a7d8a7934af2119c169759b614dc45990651 --- M firmware/apps/dfu/main.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/firmware/apps/dfu/main.c b/firmware/apps/dfu/main.c index 36f80a8..3d0cc1e 100644 --- a/firmware/apps/dfu/main.c +++ b/firmware/apps/dfu/main.c @@ -318,8 +318,8 @@ check_exec_dbg_cmd(); #if 1 if (i >= MAX_USB_ITER * 3) { - TRACE_ERROR("Resetting board (USB could " - "not be configured)\n\r"); + TRACE_ERROR("Resetting board (USB could not be configured)\n\r"); + g_dfu->magic = USB_DFU_MAGIC; // start the bootloader after reboot USBD_Disconnect(); NVIC_SystemReset(); } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I4062a7d8a7934af2119c169759b614dc45990651 Gerrit-Change-Number: 16432 Gerrit-PatchSet: 2 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 15:52:00 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 15:52:00 +0000 Subject: Change in osmo-remsim[master]: bankd: send IPA CCM ID_ACK after receiving ID_ACK In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16434 ) Change subject: bankd: send IPA CCM ID_ACK after receiving ID_ACK ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ie55c9d5c435df786e97ec3900837bb21ab80140a Gerrit-Change-Number: 16434 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 03 Dec 2019 15:52:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 15:52:01 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 15:52:01 +0000 Subject: Change in osmo-remsim[master]: cosmetic: more comments; spelling fixes in comments In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16433 ) Change subject: cosmetic: more comments; spelling fixes in comments ...................................................................... cosmetic: more comments; spelling fixes in comments Change-Id: I4939a386ac48e4e66bce9784d9a1539426c41aae --- M src/bankd_client_fsm.c M src/rspro_client_fsm.c 2 files changed, 16 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/bankd_client_fsm.c b/src/bankd_client_fsm.c index 2e3fdc9..7ddc065 100644 --- a/src/bankd_client_fsm.c +++ b/src/bankd_client_fsm.c @@ -63,15 +63,18 @@ } /*********************************************************************** - * bankd connection FSM: Remsim Client connection to Bankd + * client-side FSM for RSPRO connection to remsim-bankd + * + * This is part of remsim-client and manages the connection to remsim-bankd, + * over which actual TPDU exchanges happen. ***********************************************************************/ enum bankd_conn_fsm_state { - /* waiting for initial connectiong to remsim-bankd */ + /* waiting for initial connection to remsim-bankd */ BDC_ST_INIT, /* bankd connection established, waiting for ClientConnectRes */ BDC_ST_ESTABLISHED, - /* bankd connection etsablished, ClientConnect succeeded */ + /* bankd connection established, ClientConnect succeeded */ BDC_ST_CONNECTED, /* connection lost, we're waiting for a re-establish */ BDC_ST_REESTABLISH, diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index c01a763..7045778 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -44,7 +44,16 @@ #define T2_RECONNECT 10 /*********************************************************************** - * server connection FSM: remsim-{client,bankd} to remsim-server + * client-side FSM for a RSPRO connection to remsim-server + * + * This implements the TCP/IPA client side of an RSPRO connection between + * a logical (TCP-level) client implementation and a remote RSPRO server. + * + * 'client' and 'server' here strictly refer to RSPRO protocol roles, not + * to be confused with the remsim-client or remsim-server! + * + * Specifically, this RSPRO client FSM is used by both remsim-client and + * remsim-bankd for their RSPRO control connection to remsim-server. ***********************************************************************/ static void push_and_send(struct ipa_client_conn *ipa, struct msgb *msg_tx) -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I4939a386ac48e4e66bce9784d9a1539426c41aae Gerrit-Change-Number: 16433 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 15:52:02 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 15:52:02 +0000 Subject: Change in osmo-remsim[master]: bankd: send IPA CCM ID_ACK after receiving ID_ACK In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16434 ) Change subject: bankd: send IPA CCM ID_ACK after receiving ID_ACK ...................................................................... bankd: send IPA CCM ID_ACK after receiving ID_ACK It is customary in the IPA protocol that a a server side responds with an ID_ACK if the client sends an ID_ACK. Due to the lack of any protocol specification, it's unclear why exactly, but we know it does happen. osmo-remsim-bankd so far failed to implement this, which is not directly a problem as the only user (osmo-remsim-client) didn't care. However, when executing TTCN3 test cases, the IPA_Emulation expects that ID_ACK and related test fail. Change-Id: Ie55c9d5c435df786e97ec3900837bb21ab80140a --- M src/bankd/bankd_main.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 8cfeb96..9f99f83 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -747,6 +747,8 @@ switch (hh->data[0]) { case IPAC_MSGT_PING: return ipa_ccm_send_pong(worker->client.fd); + case IPAC_MSGT_ID_ACK: + return ipa_ccm_send_id_ack(g_worker->client.fd); default: LOGW(worker, "IPA CCM 0x%02x not implemented yet\n", hh->data[0]); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ie55c9d5c435df786e97ec3900837bb21ab80140a Gerrit-Change-Number: 16434 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 15:52:54 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 15:52:54 +0000 Subject: Change in osmo-hlr[master]: gsup_client.h: fix license header: GPLv2+ In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16428 ) Change subject: gsup_client.h: fix license header: GPLv2+ ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3827a7c70d60137ffc654c1ca53c2652bb3df147 Gerrit-Change-Number: 16428 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 03 Dec 2019 15:52:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 15:52:55 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 15:52:55 +0000 Subject: Change in osmo-hlr[master]: gsup_client.h: fix license header: GPLv2+ In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16428 ) Change subject: gsup_client.h: fix license header: GPLv2+ ...................................................................... gsup_client.h: fix license header: GPLv2+ gsup_client.c is GPLv2 too, having AGPLv3 in the header file does not make sense. Change-Id: I3827a7c70d60137ffc654c1ca53c2652bb3df147 --- M include/osmocom/gsupclient/gsup_client.h 1 file changed, 5 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/gsupclient/gsup_client.h b/include/osmocom/gsupclient/gsup_client.h index 154e3e0..b417ade 100644 --- a/include/osmocom/gsupclient/gsup_client.h +++ b/include/osmocom/gsupclient/gsup_client.h @@ -6,18 +6,17 @@ * Author: Jacob Erlbeck * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ #pragma once -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3827a7c70d60137ffc654c1ca53c2652bb3df147 Gerrit-Change-Number: 16428 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 15:53:31 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 15:53:31 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Disable dahdi support in libosmo-abis In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/16422 ) Change subject: contrib: Disable dahdi support in libosmo-abis ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/16422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Id017f3d2f51d30fa53881b627460fb568f19713b Gerrit-Change-Number: 16422 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 15:53:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 15:53:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 15:53:33 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Disable dahdi support in libosmo-abis In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/16422 ) Change subject: contrib: Disable dahdi support in libosmo-abis ...................................................................... contrib: Disable dahdi support in libosmo-abis Since libosmo-abis d4be696bbc20522a0284b6d0aefa872585f6926f it is enabled by default. Since we don't need it so far and required dependencies are not available in sysmobts SDK, let's disable it explicitly. Change-Id: Id017f3d2f51d30fa53881b627460fb568f19713b --- M contrib/jenkins-build-osmo-bsc.sh M contrib/jenkins-build-osmo-bts-oc2g.sh M contrib/jenkins-build-osmo-bts-sysmo.sh M contrib/jenkins-build-osmo-bts.sh M contrib/jenkins-build-osmo-hlr.sh M contrib/jenkins-build-osmo-iuh.sh M contrib/jenkins-build-osmo-mgw.sh M contrib/jenkins-build-osmo-msc.sh M contrib/jenkins-build-osmo-nitb.sh M contrib/jenkins-build-osmo-sgsn.sh M contrib/jenkins-build-osmo-stp.sh 11 files changed, 11 insertions(+), 11 deletions(-) Approvals: pespin: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins-build-osmo-bsc.sh b/contrib/jenkins-build-osmo-bsc.sh index 5d4d333..761fc39 100755 --- a/contrib/jenkins-build-osmo-bsc.sh +++ b/contrib/jenkins-build-osmo-bsc.sh @@ -5,7 +5,7 @@ . "$(dirname "$0")/jenkins-build-common.sh" build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen -build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-abis ${SANITIZE_FLAGS} --disable-dahdi build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen build_repo libosmo-sccp ${SANITIZE_FLAGS} build_repo osmo-mgw ${SANITIZE_FLAGS} diff --git a/contrib/jenkins-build-osmo-bts-oc2g.sh b/contrib/jenkins-build-osmo-bts-oc2g.sh index aa37beb..9a02ab0 100755 --- a/contrib/jenkins-build-osmo-bts-oc2g.sh +++ b/contrib/jenkins-build-osmo-bts-oc2g.sh @@ -25,7 +25,7 @@ L1_OC2G_HEADERS="$PWD/oc2g-fw/inc" build_repo libosmocore --disable-pcsc --disable-doxygen --disable-gnutls --disable-detect-tls-gcc-arm-bug -build_repo libosmo-abis +build_repo libosmo-abis --disable-dahdi build_repo osmo-bts --disable-sysmocom-bts --enable-oc2g --with-oc2g="$L1_OC2G_HEADERS" create_bin_tgz osmo-bts-oc2g diff --git a/contrib/jenkins-build-osmo-bts-sysmo.sh b/contrib/jenkins-build-osmo-bts-sysmo.sh index 1acf8b0..4370ecd 100755 --- a/contrib/jenkins-build-osmo-bts-sysmo.sh +++ b/contrib/jenkins-build-osmo-bts-sysmo.sh @@ -19,7 +19,7 @@ . "$(dirname "$0")/jenkins-build-common.sh" build_repo libosmocore --disable-pcsc --disable-doxygen --disable-gnutls --disable-detect-tls-gcc-arm-bug -build_repo libosmo-abis +build_repo libosmo-abis --disable-dahdi build_repo osmo-bts --enable-sysmocom-bts --with-openbsc=$base/openbsc/openbsc/include create_bin_tgz osmo-bts-sysmo diff --git a/contrib/jenkins-build-osmo-bts.sh b/contrib/jenkins-build-osmo-bts.sh index ee87d7f..182dbf7 100755 --- a/contrib/jenkins-build-osmo-bts.sh +++ b/contrib/jenkins-build-osmo-bts.sh @@ -7,7 +7,7 @@ have_repo octphy-2g-headers build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen -build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-abis ${SANITIZE_FLAGS} --disable-dahdi build_repo osmo-bts ${SANITIZE_FLAGS} --enable-trx --with-openbsc=$base/openbsc/openbsc/include --enable-octphy --with-octsdr-2g=$base/octphy-2g-headers create_bin_tgz "osmo-bts-trx osmo-bts-octphy osmo-bts-virtual" diff --git a/contrib/jenkins-build-osmo-hlr.sh b/contrib/jenkins-build-osmo-hlr.sh index 0b60955..b6d6947 100755 --- a/contrib/jenkins-build-osmo-hlr.sh +++ b/contrib/jenkins-build-osmo-hlr.sh @@ -5,7 +5,7 @@ . "$(dirname "$0")/jenkins-build-common.sh" build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen -build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-abis ${SANITIZE_FLAGS} --disable-dahdi build_repo osmo-hlr ${SANITIZE_FLAGS} create_bin_tgz osmo-hlr diff --git a/contrib/jenkins-build-osmo-iuh.sh b/contrib/jenkins-build-osmo-iuh.sh index e8e7fa8..412110e 100755 --- a/contrib/jenkins-build-osmo-iuh.sh +++ b/contrib/jenkins-build-osmo-iuh.sh @@ -5,7 +5,7 @@ . "$(dirname "$0")/jenkins-build-common.sh" build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen -build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-abis ${SANITIZE_FLAGS} --disable-dahdi build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen build_repo libosmo-sccp ${SANITIZE_FLAGS} build_repo libasn1c ${SANITIZE_FLAGS} diff --git a/contrib/jenkins-build-osmo-mgw.sh b/contrib/jenkins-build-osmo-mgw.sh index a04e0ca..2128fa2 100755 --- a/contrib/jenkins-build-osmo-mgw.sh +++ b/contrib/jenkins-build-osmo-mgw.sh @@ -5,7 +5,7 @@ . "$(dirname "$0")/jenkins-build-common.sh" build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen -build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-abis ${SANITIZE_FLAGS} --disable-dahdi build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen build_repo osmo-mgw ${SANITIZE_FLAGS} diff --git a/contrib/jenkins-build-osmo-msc.sh b/contrib/jenkins-build-osmo-msc.sh index c64f94d..64243de 100755 --- a/contrib/jenkins-build-osmo-msc.sh +++ b/contrib/jenkins-build-osmo-msc.sh @@ -5,7 +5,7 @@ . "$(dirname "$0")/jenkins-build-common.sh" build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen -build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-abis ${SANITIZE_FLAGS} --disable-dahdi build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen build_repo libsmpp34 ${SANITIZE_FLAGS} build_repo libosmo-sccp ${SANITIZE_FLAGS} diff --git a/contrib/jenkins-build-osmo-nitb.sh b/contrib/jenkins-build-osmo-nitb.sh index 4f81fa8..8ecbdba 100755 --- a/contrib/jenkins-build-osmo-nitb.sh +++ b/contrib/jenkins-build-osmo-nitb.sh @@ -5,7 +5,7 @@ . "$(dirname "$0")/jenkins-build-common.sh" build_repo libosmocore --disable-doxygen -build_repo libosmo-abis +build_repo libosmo-abis --disable-dahdi build_repo libosmo-netif --disable-doxygen build_repo openggsn build_repo libsmpp34 diff --git a/contrib/jenkins-build-osmo-sgsn.sh b/contrib/jenkins-build-osmo-sgsn.sh index f296f8b..128e7b7 100755 --- a/contrib/jenkins-build-osmo-sgsn.sh +++ b/contrib/jenkins-build-osmo-sgsn.sh @@ -5,7 +5,7 @@ . "$(dirname "$0")/jenkins-build-common.sh" build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen -build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-abis ${SANITIZE_FLAGS} --disable-dahdi build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen build_repo libosmo-sccp ${SANITIZE_FLAGS} build_repo osmo-ggsn ${SANITIZE_FLAGS} diff --git a/contrib/jenkins-build-osmo-stp.sh b/contrib/jenkins-build-osmo-stp.sh index 5f9c421..c937eef 100755 --- a/contrib/jenkins-build-osmo-stp.sh +++ b/contrib/jenkins-build-osmo-stp.sh @@ -5,7 +5,7 @@ . "$(dirname "$0")/jenkins-build-common.sh" build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen -build_repo libosmo-abis ${SANITIZE_FLAGS} +build_repo libosmo-abis ${SANITIZE_FLAGS} --disable-dahdi build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen build_repo libosmo-sccp ${SANITIZE_FLAGS} -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/16422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Id017f3d2f51d30fa53881b627460fb568f19713b Gerrit-Change-Number: 16422 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 15:54:23 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 15:54:23 +0000 Subject: Change in osmo-gsm-manuals[master]: Support multiple VTY reference manuals In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16403 ) Change subject: Support multiple VTY reference manuals ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I4dea3e07b88175b2a88e577129360af7ec5f87e1 Gerrit-Change-Number: 16403 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 15:54:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 15:54:45 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 15:54:45 +0000 Subject: Change in osmo-gsm-manuals[master]: tests: add second VTY reference In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16404 ) Change subject: tests: add second VTY reference ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I2f0170e14febc68c0122062358f362003a2e3e5e Gerrit-Change-Number: 16404 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 15:54:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 15:54:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 15:54:48 +0000 Subject: Change in osmo-gsm-manuals[master]: Support multiple VTY reference manuals In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16403 ) Change subject: Support multiple VTY reference manuals ...................................................................... Support multiple VTY reference manuals Adjust vty_reference_combine.sh, so we can change the output dir from "generated" to a subdir inside "generated" when building anything but the first VTY reference. Add a generic pattern to Makefile.vty-reference for additional VTY references, that uses slightly different paths compared to the first VTY reference, in order to avoid collisions. Related: OS#4292 Change-Id: I4dea3e07b88175b2a88e577129360af7ec5f87e1 --- M build/Makefile.vty-reference.inc M build/vty_reference_combine.sh 2 files changed, 43 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/build/Makefile.vty-reference.inc b/build/Makefile.vty-reference.inc index 0129a5c..b2daf8a 100644 --- a/build/Makefile.vty-reference.inc +++ b/build/Makefile.vty-reference.inc @@ -22,15 +22,37 @@ # # This uses the Makefile.docbook.inc, you should not mix uses of # Makefile.vty-reference.inc and Makefile.docbook.inc. +# +# In order to add more than one VTY reference, do this for each additional one: +# - Extend VTY_REFERENCE with the new entry, make sure it ends in "-vty-reference.xml": +# VTY_REFERENCE = osmofoo-vty-reference.xml osmobar-vty-reference.xml +# - Create a new osmobar-vty-reference.xml file, just like osmofoo-vty-reference.xml, but with +# "generated/docbook_osmobar-vty-reference.xml" as sections-vty path instead of +# "generated/docbook_vty.xml". +# - Create vty-osmobar/*_additions.xml and vty-osmobar/*_reference.xml. Pay attention to the +# directory name, it must start with vty-* instead of "vty" and it must match the prefix of +# your new VTY_REFERENCE entry ("vty-osmobar" in this example). +# - Add osmobar-vty-reference.xml and vty-osmobar to EXTRA_DIST in Makefile.am. +# - Full example: osmo-sgsn.git I24c3ca2fc2446673edceefb797c7d800c3a1a5d2 DOCBOOKS = $(VTY_REFERENCE) + +# First VTY reference DOCBOOKS_DEPS = generated/docbook_vty.xml + +# Additional VTY references: prepend "generated/docbook_" +# For example: +# VTY_REFERENCE = osmosgsn-vty-reference.xml osmogbproxy-vty-reference.xml +# DOCBOOK_DEPS = generated/docbook_vty.xml generated/docbook_osmogbproxy-vty-reference.xml +DOCBOOKS_DEPS += $(patsubst %,generated/docbook_%,$(filter-out $(firstword $(VTY_REFERENCE)),$(VTY_REFERENCE))) + include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.docbook.inc MERGE_DOC = $(shell realpath $(OSMO_GSM_MANUALS_DIR)/merge_doc.xsl) CLEAN_FILES += generated +# First VTY reference generated/docbook_vty.xml: \ $(srcdir)/vty/*xml \ $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \ @@ -42,3 +64,17 @@ $(srcdir)/vty/*additions*.xml xsltproc $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml + +# Additional VTY references +generated/docbook_%-vty-reference.xml: \ + $(srcdir)/vty-%/*xml \ + $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \ + $(OSMO_GSM_MANUALS_DIR)/common/chapters/vty.xml \ + $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl + export VTYDIR="$(srcdir)/vty-$(patsubst generated/docbook_%-vty-reference.xml,%,$@)" && \ + export VTYGEN="$@_combine" && \ + $(OSMO_GSM_MANUALS_DIR)/build/vty_reference_combine.sh "$(MERGE_DOC)" \ + $$VTYDIR/*reference.xml \ + $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \ + $$VTYDIR/*additions*.xml && \ + xsltproc $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl $$VTYGEN/combined.xml > "$@" diff --git a/build/vty_reference_combine.sh b/build/vty_reference_combine.sh index 449b227..6ab279e 100755 --- a/build/vty_reference_combine.sh +++ b/build/vty_reference_combine.sh @@ -3,6 +3,10 @@ # see Makefile.vty-reference.inc set -e +# Allow overriding the "generated" output dir, so we don't have collisions when building multiple VTY references in one +# Osmocom project (OS#4292) +VTYGEN=${VTYGEN:-generated} + # first argument: merge_doc.xsl MERGE_DOC="$1" shift @@ -12,11 +16,11 @@ test "$(ls -1 $reference | wc -l)" = "1" shift -combined="generated/combined.xml" -combine_src="generated/combine_src.xml" +combined="$VTYGEN/combined.xml" +combine_src="$VTYGEN/combine_src.xml" set -x -mkdir -p generated +mkdir -p "$VTYGEN" cp $reference "$combined" while [ -n "$1" ]; do -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I4dea3e07b88175b2a88e577129360af7ec5f87e1 Gerrit-Change-Number: 16403 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 15:54:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 15:54:48 +0000 Subject: Change in osmo-gsm-manuals[master]: tests: add second VTY reference In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16404 ) Change subject: tests: add second VTY reference ...................................................................... tests: add second VTY reference Related: OS#4292 Change-Id: I2f0170e14febc68c0122062358f362003a2e3e5e --- M tests/Makefile.am A tests/test2-vty-reference.xml A tests/vty-test2/test2_vty_additions.xml A tests/vty-test2/test2_vty_reference.xml 4 files changed, 62 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/tests/Makefile.am b/tests/Makefile.am index 6eba2c5..641b35c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,10 @@ OSMO_GSM_MANUALS_DIR = $(top_srcdir) EXTRA_DIST = test-usermanual-docinfo.xml \ test-vty-reference.xml \ - vty + vty \ + test2-vty-reference.xml \ + vty-test2 \ + $(NULL) # Do not install any of the test pdfs OSMO_GSM_MANUALS_NO_INSTALL = 1 @@ -26,7 +29,7 @@ include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc -VTY_REFERENCE = test-vty-reference.xml +VTY_REFERENCE = test-vty-reference.xml test2-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/tests/test2-vty-reference.xml b/tests/test2-vty-reference.xml new file mode 100644 index 0000000..b8fea23 --- /dev/null +++ b/tests/test2-vty-reference.xml @@ -0,0 +1,38 @@ + + + + +]> + + + + + + v1 + 2nd December 2019 + os + Initial + + + + Test VTY Reference No. 2 + + + 2019 + + + + This work is copyrighted by sysmocom - s.f.m.c. GmbH. All rights reserved. + + + + + + &chapter-vty; + + diff --git a/tests/vty-test2/test2_vty_additions.xml b/tests/vty-test2/test2_vty_additions.xml new file mode 100644 index 0000000..a4c675e --- /dev/null +++ b/tests/vty-test2/test2_vty_additions.xml @@ -0,0 +1,2 @@ + + diff --git a/tests/vty-test2/test2_vty_reference.xml b/tests/vty-test2/test2_vty_reference.xml new file mode 100644 index 0000000..e5674e7 --- /dev/null +++ b/tests/vty-test2/test2_vty_reference.xml @@ -0,0 +1,17 @@ + + + Common Commands + These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. + + + + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I2f0170e14febc68c0122062358f362003a2e3e5e Gerrit-Change-Number: 16404 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 16:32:22 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 16:32:22 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sip-connector=5Bpespin/base=5D=3A_Bump_version=3A_1=2E3=2E0=2E5-b544_=E2=86=92_1=2E3=2E1?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16435 ) Change subject: Bump version: 1.3.0.5-b544 ? 1.3.1 ...................................................................... Bump version: 1.3.0.5-b544 ? 1.3.1 Change-Id: Ia27acab3c15143f3703f47ee476a7d0c4f0251f5 --- M debian/changelog 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/35/16435/1 diff --git a/debian/changelog b/debian/changelog index bbe3db5..9454d41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +osmo-sip-connector (1.3.1) unstable; urgency=medium + + [ Keith ] + * coverity: Address issue found by coverity + + [ Philipp Maier ] + * mncc: check fd before closing a connection + + [ Alexander Couzens ] + * .service: require to ran after network-online.target + * exit if the sip agent failed to start + + [ Oliver Smith ] + * mncc.c: fix gsm_mncc_rtp size checks + + -- Pau Espin Pedrol Tue, 03 Dec 2019 17:30:24 +0100 + osmo-sip-connector (1.3.0) unstable; urgency=medium [ Keith ] -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: pespin/base Gerrit-Change-Id: Ia27acab3c15143f3703f47ee476a7d0c4f0251f5 Gerrit-Change-Number: 16435 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 16:37:22 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 16:37:22 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Use set -e before applying changes to prepare release References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16436 ) Change subject: osmo-release.sh: Use set -e before applying changes to prepare release ...................................................................... osmo-release.sh: Use set -e before applying changes to prepare release Change-Id: I783c3645537258a75ae6f5a684489d629b852188 --- M osmo-release.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/36/16436/1 diff --git a/osmo-release.sh b/osmo-release.sh index 4450436..916af84 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -162,6 +162,7 @@ exit 0 fi +set -e if [ -f "TODO-RELEASE" ]; then grep '#' TODO-RELEASE > TODO-RELEASE.clean mv TODO-RELEASE.clean TODO-RELEASE -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I783c3645537258a75ae6f5a684489d629b852188 Gerrit-Change-Number: 16436 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 16:38:43 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 3 Dec 2019 16:38:43 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sip-connector=5Bpespin/base=5D=3A_Bump_version=3A_1=2E3=2E0=2E5-b544_=E2=86=92_1=2E3=2E1?= In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16435 ) Change subject: Bump version: 1.3.0.5-b544 ? 1.3.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: pespin/base Gerrit-Change-Id: Ia27acab3c15143f3703f47ee476a7d0c4f0251f5 Gerrit-Change-Number: 16435 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 16:38:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 16:40:17 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 16:40:17 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sip-connector=5Bpespin/base=5D=3A_Bump_version=3A_1=2E3=2E0=2E5-b544_=E2=86=92_1=2E3=2E1?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16435 ) Change subject: Bump version: 1.3.0.5-b544 ? 1.3.1 ...................................................................... Bump version: 1.3.0.5-b544 ? 1.3.1 Change-Id: Ia27acab3c15143f3703f47ee476a7d0c4f0251f5 --- M debian/changelog 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index bbe3db5..9454d41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +osmo-sip-connector (1.3.1) unstable; urgency=medium + + [ Keith ] + * coverity: Address issue found by coverity + + [ Philipp Maier ] + * mncc: check fd before closing a connection + + [ Alexander Couzens ] + * .service: require to ran after network-online.target + * exit if the sip agent failed to start + + [ Oliver Smith ] + * mncc.c: fix gsm_mncc_rtp size checks + + -- Pau Espin Pedrol Tue, 03 Dec 2019 17:30:24 +0100 + osmo-sip-connector (1.3.0) unstable; urgency=medium [ Keith ] -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: pespin/base Gerrit-Change-Id: Ia27acab3c15143f3703f47ee476a7d0c4f0251f5 Gerrit-Change-Number: 16435 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 16:46:40 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 3 Dec 2019 16:46:40 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sip-connector=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E4-6321_=E2=86=92_1=2E3=2E1?= In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16424 ) Change subject: Bump version: 1.3.0.4-6321 ? 1.3.1 ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ia91bf12c88506d7ee209c479a10a2cdf397ea667 Gerrit-Change-Number: 16424 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 16:46:51 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 3 Dec 2019 16:46:51 +0000 Subject: Change in osmo-sip-connector[master]: mncc.c: fix gsm_mncc_rtp size checks In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16423 ) Change subject: mncc.c: fix gsm_mncc_rtp size checks ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I9fc71bb6fa946ff4f0934de85e5ec29b8dd67b7f Gerrit-Change-Number: 16423 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 18:28:14 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 18:28:14 +0000 Subject: Change in osmo-bts[master]: rsl_rx_chan_act: Apply bitmask when parsing IE MS_POWER References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/16437 ) Change subject: rsl_rx_chan_act: Apply bitmask when parsing IE MS_POWER ...................................................................... rsl_rx_chan_act: Apply bitmask when parsing IE MS_POWER Change-Id: I99c6a4d353f405582d5e4f9d12c01c25c7bb4dff --- M src/common/rsl.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/37/16437/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index 09a9217..67eb622 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1150,7 +1150,7 @@ lchan->bs_power = *TLVP_VAL(&tp, RSL_IE_BS_POWER); /* 9.3.13 MS Power */ if (TLVP_PRES_LEN(&tp, RSL_IE_MS_POWER, 1)) { - lchan->ms_power_ctrl.max = *TLVP_VAL(&tp, RSL_IE_MS_POWER); + lchan->ms_power_ctrl.max = *TLVP_VAL(&tp, RSL_IE_MS_POWER) & 0x1F; lchan->ms_power_ctrl.current = lchan->ms_power_ctrl.max; lchan->ms_power_ctrl.fixed = false; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I99c6a4d353f405582d5e4f9d12c01c25c7bb4dff Gerrit-Change-Number: 16437 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 18:28:15 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 18:28:15 +0000 Subject: Change in osmo-bts[master]: rsl: Clarify when autnonoums MS Power Ctrl Loop is used References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/16438 ) Change subject: rsl: Clarify when autnonoums MS Power Ctrl Loop is used ...................................................................... rsl: Clarify when autnonoums MS Power Ctrl Loop is used Simplify when the fixed field is set in rsl_rx_chan_activ. Comment talks about enabling autonoumous control loop, but it is actually describing it when disabling it, which is confusing. Change-Id: Id6b444a33ab062f6dab11a0ce62d8aecaea87591 --- M src/common/rsl.c 1 file changed, 6 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/38/16438/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index 67eb622..b315d30 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1100,7 +1100,7 @@ /* Initialize channel defaults */ lchan->ms_power_ctrl.max = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, 0); lchan->ms_power_ctrl.current = lchan->ms_power_ctrl.max; - lchan->ms_power_ctrl.fixed = false; + lchan->ms_power_ctrl.fixed = true; rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)); @@ -1152,7 +1152,6 @@ if (TLVP_PRES_LEN(&tp, RSL_IE_MS_POWER, 1)) { lchan->ms_power_ctrl.max = *TLVP_VAL(&tp, RSL_IE_MS_POWER) & 0x1F; lchan->ms_power_ctrl.current = lchan->ms_power_ctrl.max; - lchan->ms_power_ctrl.fixed = false; } /* 9.3.24 Timing Advance */ if (TLVP_PRES_LEN(&tp, RSL_IE_TIMING_ADVANCE, 1)) @@ -1160,13 +1159,11 @@ /* 9.3.32 BS Power Parameters */ /* 9.3.31 MS Power Parameters */ - if (TLVP_PRESENT(&tp, RSL_IE_MS_POWER_PARAM)) - lchan->ms_power_ctrl.fixed = false; - else { + if (TLVP_PRESENT(&tp, RSL_IE_MS_POWER_PARAM)) { /* Spec explicitly states BTS should only perform * autonomous MS power control loop in BTS if 'MS Power * Parameters' IE is present! */ - lchan->ms_power_ctrl.fixed = true; + lchan->ms_power_ctrl.fixed = false; } /* 9.3.16 Physical Context */ @@ -1637,12 +1634,12 @@ LOGPLCHAN(lchan, DRSL, LOGL_INFO, "Rx MS POWER CONTROL %" PRIu8 "\n", pwr); /* 9.3.31 MS Power Parameters (O) */ - if (TLVP_PRESENT(&tp, RSL_IE_MS_POWER_PARAM)) - lchan->ms_power_ctrl.fixed = false; - else { + if (TLVP_PRESENT(&tp, RSL_IE_MS_POWER_PARAM)) { /* Spec explicitly states BTS should only perform * autonomous MS power control loop in BTS if 'MS Power * Parameters' IE is present! */ + lchan->ms_power_ctrl.fixed = false; + } else { lchan->ms_power_ctrl.fixed = true; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id6b444a33ab062f6dab11a0ce62d8aecaea87591 Gerrit-Change-Number: 16438 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 18:28:15 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 18:28:15 +0000 Subject: Change in osmo-bts[master]: power_control.c: Log maximum allowed MS Power Level References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/16439 ) Change subject: power_control.c: Log maximum allowed MS Power Level ...................................................................... power_control.c: Log maximum allowed MS Power Level Change-Id: I983ff824ef6f54f1e800819d622158d5e2a51f04 --- M src/common/power_control.c 1 file changed, 10 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/39/16439/1 diff --git a/src/common/power_control.c b/src/common/power_control.c index d2a6c1d..f6138d6 100644 --- a/src/common/power_control.c +++ b/src/common/power_control.c @@ -104,16 +104,20 @@ if (lchan->ms_power_ctrl.current == new_power) { LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "Keeping MS power at control level %d, %d dBm " - "(rx-ms-pwr-lvl %" PRIu8 ", rx-current %d dBm, rx-target %d dBm)\n", - new_power, ms_pwr_dbm(band, new_power), ms_power, rxLevel, bts->ul_power_target); + "(rx-ms-pwr-lvl %" PRIu8 ", max-ms-pwr-lvl %" PRIu8 ", rx-current %d dBm, rx-target %d dBm)\n", + new_power, ms_pwr_dbm(band, new_power), + ms_power, lchan->ms_power_ctrl.max, + rxLevel, bts->ul_power_target); return 0; } LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "%s MS power from control level %d (%d dBm) to %d, %d dBm " - "(rx-ms-pwr-lvl %" PRIu8 ", rx-current %d dBm, rx-target %d dBm)\n", - (diff > 0) ? "Raising" : "Lowering", - lchan->ms_power_ctrl.current, ms_pwr_dbm(band, lchan->ms_power_ctrl.current), - new_power, ms_pwr_dbm(band, new_power), ms_power, rxLevel, bts->ul_power_target); + "(rx-ms-pwr-lvl %" PRIu8 ", max-ms-pwr-lvl %" PRIu8 ", rx-current %d dBm, rx-target %d dBm)\n", + (diff > 0) ? "Raising" : "Lowering", + lchan->ms_power_ctrl.current, ms_pwr_dbm(band, lchan->ms_power_ctrl.current), + new_power, ms_pwr_dbm(band, new_power), + ms_power, lchan->ms_power_ctrl.max, + rxLevel, bts->ul_power_target); /* store the resulting new MS power level in the lchan */ lchan->ms_power_ctrl.current = new_power; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I983ff824ef6f54f1e800819d622158d5e2a51f04 Gerrit-Change-Number: 16439 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 18:28:15 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 3 Dec 2019 18:28:15 +0000 Subject: Change in osmo-bts[master]: power_control.c: Clarify loop algo vars and use correct ones during log References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/16440 ) Change subject: power_control.c: Clarify loop algo vars and use correct ones during log ...................................................................... power_control.c: Clarify loop algo vars and use correct ones during log Rename some variables so that: * Variables containing power control levels end up with "_lvl". * Variables containing power levels end up with _dbm. * Move old current_dbm var to be ms_dbm, to match its power control level counterpart ms_power_lvl, and add current_dbm to match its counterpart ns_power_ctrl.current. Now that variables are more clear, it also becomes clear that old "diff > 0" condition, apart from difficult, was currently wrong, since in order to print the raise/low verb we want to compare between old and new values, not between received and new values. Change-Id: I4e279a6b93fbcc5da25bf8c9213310939fd493ce --- M src/common/power_control.c 1 file changed, 18 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/40/16440/1 diff --git a/src/common/power_control.c b/src/common/power_control.c index f6138d6..e9215fc 100644 --- a/src/common/power_control.c +++ b/src/common/power_control.c @@ -38,29 +38,29 @@ /*! compute the new MS POWER LEVEL communicated to the MS and store it in lchan. * \param lchan logical channel for which to compute (and in which to store) new power value. - * \param[in] ms_power MS Power Level received from Uplink L1 SACCH Header in SACCH block. + * \param[in] ms_power_lvl MS Power Level received from Uplink L1 SACCH Header in SACCH block. * \param[in] rxLevel Signal level of the received SACCH block, in dBm. */ int lchan_ms_pwr_ctrl(struct gsm_lchan *lchan, - const uint8_t ms_power, const int rxLevel) + const uint8_t ms_power_lvl, const int rxLevel) { int diff; struct gsm_bts_trx *trx = lchan->ts->trx; struct gsm_bts *bts = trx->bts; enum gsm_band band = bts->band; - int8_t new_power; /* TS 05.05 power level */ - int8_t new_dbm, current_dbm, bsc_max_dbm; + int8_t new_power_lvl; /* TS 05.05 power level */ + int8_t ms_dbm, new_dbm, current_dbm, bsc_max_dbm; if (!trx_ms_pwr_ctrl_is_osmo(lchan->ts->trx)) return 0; if (lchan->ms_power_ctrl.fixed) return 0; - current_dbm = ms_pwr_dbm(band, ms_power); - if (current_dbm < 0) { + ms_dbm = ms_pwr_dbm(band, ms_power_lvl); + if (ms_dbm < 0) { LOGPLCHAN(lchan, DLOOP, LOGL_NOTICE, "Failed to calculate dBm for power ctl level %" PRIu8 " on band %s\n", - ms_power, gsm_band_name(band)); + ms_power_lvl, gsm_band_name(band)); return 0; } bsc_max_dbm = ms_pwr_dbm(band, lchan->ms_power_ctrl.max); @@ -83,7 +83,7 @@ else if (diff < -MS_LOWER_MAX_DB) diff = -MS_LOWER_MAX_DB; - new_dbm = current_dbm + diff; + new_dbm = ms_dbm + diff; /* Make sure new_dbm is never negative. ms_pwr_ctl_lvl() can later on cope with any unsigned dbm value, regardless of band minimal value. */ @@ -94,33 +94,33 @@ if (new_dbm > bsc_max_dbm) new_dbm = bsc_max_dbm; - new_power = ms_pwr_ctl_lvl(band, new_dbm); - if (new_power < 0) { + new_power_lvl = ms_pwr_ctl_lvl(band, new_dbm); + if (new_power_lvl < 0) { LOGPLCHAN(lchan, DLOOP, LOGL_NOTICE, "Failed to retrieve power level for %" PRId8 " dBm on band %d\n", new_dbm, band); return 0; } - if (lchan->ms_power_ctrl.current == new_power) { + if (lchan->ms_power_ctrl.current == new_power_lvl) { LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "Keeping MS power at control level %d, %d dBm " "(rx-ms-pwr-lvl %" PRIu8 ", max-ms-pwr-lvl %" PRIu8 ", rx-current %d dBm, rx-target %d dBm)\n", - new_power, ms_pwr_dbm(band, new_power), - ms_power, lchan->ms_power_ctrl.max, + new_power_lvl, new_dbm, + ms_power_lvl, lchan->ms_power_ctrl.max, rxLevel, bts->ul_power_target); return 0; } + current_dbm = ms_pwr_dbm(band, lchan->ms_power_ctrl.current); LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "%s MS power from control level %d (%d dBm) to %d, %d dBm " "(rx-ms-pwr-lvl %" PRIu8 ", max-ms-pwr-lvl %" PRIu8 ", rx-current %d dBm, rx-target %d dBm)\n", - (diff > 0) ? "Raising" : "Lowering", - lchan->ms_power_ctrl.current, ms_pwr_dbm(band, lchan->ms_power_ctrl.current), - new_power, ms_pwr_dbm(band, new_power), - ms_power, lchan->ms_power_ctrl.max, + (new_dbm > current_dbm) ? "Raising" : "Lowering", + lchan->ms_power_ctrl.current, current_dbm, new_power_lvl, new_dbm, + ms_power_lvl, lchan->ms_power_ctrl.max, rxLevel, bts->ul_power_target); /* store the resulting new MS power level in the lchan */ - lchan->ms_power_ctrl.current = new_power; + lchan->ms_power_ctrl.current = new_power_lvl; bts_model_adjst_ms_pwr(lchan); return 1; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4e279a6b93fbcc5da25bf8c9213310939fd493ce Gerrit-Change-Number: 16440 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 19:10:05 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 19:10:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSUP_Types: Split RAT_TYPE_IE to SUPPORTED / CURRENT References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16441 ) Change subject: GSUP_Types: Split RAT_TYPE_IE to SUPPORTED / CURRENT ...................................................................... GSUP_Types: Split RAT_TYPE_IE to SUPPORTED / CURRENT We added the RAT_TYPE_IE while the respective change in libosmocore was still in gerrit review. Meanwhile the support there has been split into two parts: A list of supported radio access types and another IE indicating the current RAT. Let's catch up with that in the GSUP implementation. This makes TC_gsup_sai_eps() pass again. Change-Id: I2c609dc523cbec562c6c6a05f4c7d600649ff52d --- M library/GSUP_Types.ttcn 1 file changed, 28 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/41/16441/1 diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index e1aa24c..8977d9f 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -43,7 +43,8 @@ OSMO_GSUP_AUTS_IE ('26'O), OSMO_GSUP_RES_IE ('27'O), OSMO_GSUP_CN_DOMAIN_IE ('28'O), - OSMO_GSUP_RAT_TYPE_IE ('29'O), + OSMO_GSUP_SUPPORTED_RAT_TYPES_IE ('29'O), + OSMO_GSUP_CURRENT_RAT_TYPE_IE ('2a'O), OSMO_GSUP_SESSION_ID_IE ('30'O), OSMO_GSUP_SESSION_STATE_IE ('31'O), @@ -233,7 +234,8 @@ cause_rr, tag = OSMO_GSUP_CAUSE_RR_IE; cause_bssap, tag = OSMO_GSUP_CAUSE_BSSAP_IE; cause_sm, tag = OSMO_GSUP_CAUSE_SM_IE; - rat_type, tag = OSMO_GSUP_RAT_TYPE_IE; + supported_rat_types, tag = OSMO_GSUP_SUPPORTED_RAT_TYPES_IE; + current_rat_type, tag = OSMO_GSUP_CURRENT_RAT_TYPE_IE; )" }; @@ -300,7 +302,8 @@ OCT1 cause_bssap, OCT1 cause_sm, - GSUP_RatTypes rat_type + GSUP_RatTypes supported_rat_types, + GSUP_RatType current_rat_type }; type record GSUP_PDU { @@ -449,7 +452,7 @@ template (value) GSUP_PDU ts_GSUP_SAI_REQ_EPS(hexstring imsi) := ts_GSUP(OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST, { valueof(ts_GSUP_IE_IMSI(imsi)), - valueof(ts_GSUP_IE_RAT_TYPE({RAT_TYPE_EUTRAN_SGs})) + valueof(ts_GSUP_IE_CURRENT_RAT_TYPE(RAT_TYPE_EUTRAN_SGs)) }); template GSUP_PDU tr_GSUP_SAI_REQ(template hexstring imsi) := @@ -1124,19 +1127,33 @@ } } - -template (present) GSUP_IE tr_GSUP_IE_RAT_TYPE(template (present) GSUP_RatTypes ratt) := { - tag := OSMO_GSUP_RAT_TYPE_IE, +template (present) GSUP_IE tr_GSUP_IE_SUPPORTED_RAT_TYPES(template (present) GSUP_RatTypes ratt) := { + tag := OSMO_GSUP_SUPPORTED_RAT_TYPES_IE, len := ?, val := { - rat_type := ratt + supported_rat_types := ratt } } -template (value) GSUP_IE ts_GSUP_IE_RAT_TYPE(GSUP_RatTypes ratt) := { - tag := OSMO_GSUP_RAT_TYPE_IE, +template (value) GSUP_IE ts_GSUP_IE_SUPPORTED_RAT_TYPES(GSUP_RatTypes ratt) := { + tag := OSMO_GSUP_SUPPORTED_RAT_TYPES_IE, len := 0, /* overwritten */ val := { - rat_type := ratt + supported_rat_types := ratt + } +} + +template (present) GSUP_IE tr_GSUP_IE_CURRENT_RAT_TYPE(template (present) GSUP_RatType ratt) := { + tag := OSMO_GSUP_CURRENT_RAT_TYPE_IE, + len := ?, + val := { + current_rat_type := ratt + } +} +template (value) GSUP_IE ts_GSUP_IE_CURRENT_RAT_TYPE(GSUP_RatType ratt) := { + tag := OSMO_GSUP_CURRENT_RAT_TYPE_IE, + len := 0, /* overwritten */ + val := { + current_rat_type := ratt } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2c609dc523cbec562c6c6a05f4c7d600649ff52d Gerrit-Change-Number: 16441 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 19:10:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 19:10:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: Don't attempt to find AUTN in 2G-only tuple References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16442 ) Change subject: hlr: Don't attempt to find AUTN in 2G-only tuple ...................................................................... hlr: Don't attempt to find AUTN in 2G-only tuple In Change-Id I40c6cf7e28ad9331e6c27fe7acafa3f9e277eedf we introduced a patch that verifies the AMF separation bit for 3G/3G vs 4G authentication. However, the test ignored the fact that AUTN cannot be present in pure 2G tuples. This makes TC_gsup_sai pass again. Change-Id: I9b61e62a58b583461dd5e67dd12119be282cae21 --- M hlr/HLR_Tests.ttcn 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/42/16442/1 diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index 8a96d7f..50109a6 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -711,7 +711,9 @@ private function f_TC_gsup_sai() runs on HLR_ConnHdlr { var GSUP_PDU res; res := f_perform_SAI(g_pars.sub.imsi); - f_ensure_amf_separation_bit(res, '0'B); + if (ispresent(g_pars.sub.aud3g)) { + f_ensure_amf_separation_bit(res, '0'B); + } /* TODO: match if tuple[s] matches expectation */ setverdict(pass); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9b61e62a58b583461dd5e67dd12119be282cae21 Gerrit-Change-Number: 16442 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 19:12:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 19:12:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSUP_Types: Split RAT_TYPE_IE to SUPPORTED / CURRENT In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16441 ) Change subject: GSUP_Types: Split RAT_TYPE_IE to SUPPORTED / CURRENT ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2c609dc523cbec562c6c6a05f4c7d600649ff52d Gerrit-Change-Number: 16441 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 03 Dec 2019 19:12:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 19:12:14 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 19:12:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: Don't attempt to find AUTN in 2G-only tuple In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16442 ) Change subject: hlr: Don't attempt to find AUTN in 2G-only tuple ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9b61e62a58b583461dd5e67dd12119be282cae21 Gerrit-Change-Number: 16442 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 03 Dec 2019 19:12:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 19:12:15 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 19:12:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSUP_Types: Split RAT_TYPE_IE to SUPPORTED / CURRENT In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16441 ) Change subject: GSUP_Types: Split RAT_TYPE_IE to SUPPORTED / CURRENT ...................................................................... GSUP_Types: Split RAT_TYPE_IE to SUPPORTED / CURRENT We added the RAT_TYPE_IE while the respective change in libosmocore was still in gerrit review. Meanwhile the support there has been split into two parts: A list of supported radio access types and another IE indicating the current RAT. Let's catch up with that in the GSUP implementation. This makes TC_gsup_sai_eps() pass again. Change-Id: I2c609dc523cbec562c6c6a05f4c7d600649ff52d --- M library/GSUP_Types.ttcn 1 file changed, 28 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index e1aa24c..8977d9f 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -43,7 +43,8 @@ OSMO_GSUP_AUTS_IE ('26'O), OSMO_GSUP_RES_IE ('27'O), OSMO_GSUP_CN_DOMAIN_IE ('28'O), - OSMO_GSUP_RAT_TYPE_IE ('29'O), + OSMO_GSUP_SUPPORTED_RAT_TYPES_IE ('29'O), + OSMO_GSUP_CURRENT_RAT_TYPE_IE ('2a'O), OSMO_GSUP_SESSION_ID_IE ('30'O), OSMO_GSUP_SESSION_STATE_IE ('31'O), @@ -233,7 +234,8 @@ cause_rr, tag = OSMO_GSUP_CAUSE_RR_IE; cause_bssap, tag = OSMO_GSUP_CAUSE_BSSAP_IE; cause_sm, tag = OSMO_GSUP_CAUSE_SM_IE; - rat_type, tag = OSMO_GSUP_RAT_TYPE_IE; + supported_rat_types, tag = OSMO_GSUP_SUPPORTED_RAT_TYPES_IE; + current_rat_type, tag = OSMO_GSUP_CURRENT_RAT_TYPE_IE; )" }; @@ -300,7 +302,8 @@ OCT1 cause_bssap, OCT1 cause_sm, - GSUP_RatTypes rat_type + GSUP_RatTypes supported_rat_types, + GSUP_RatType current_rat_type }; type record GSUP_PDU { @@ -449,7 +452,7 @@ template (value) GSUP_PDU ts_GSUP_SAI_REQ_EPS(hexstring imsi) := ts_GSUP(OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST, { valueof(ts_GSUP_IE_IMSI(imsi)), - valueof(ts_GSUP_IE_RAT_TYPE({RAT_TYPE_EUTRAN_SGs})) + valueof(ts_GSUP_IE_CURRENT_RAT_TYPE(RAT_TYPE_EUTRAN_SGs)) }); template GSUP_PDU tr_GSUP_SAI_REQ(template hexstring imsi) := @@ -1124,19 +1127,33 @@ } } - -template (present) GSUP_IE tr_GSUP_IE_RAT_TYPE(template (present) GSUP_RatTypes ratt) := { - tag := OSMO_GSUP_RAT_TYPE_IE, +template (present) GSUP_IE tr_GSUP_IE_SUPPORTED_RAT_TYPES(template (present) GSUP_RatTypes ratt) := { + tag := OSMO_GSUP_SUPPORTED_RAT_TYPES_IE, len := ?, val := { - rat_type := ratt + supported_rat_types := ratt } } -template (value) GSUP_IE ts_GSUP_IE_RAT_TYPE(GSUP_RatTypes ratt) := { - tag := OSMO_GSUP_RAT_TYPE_IE, +template (value) GSUP_IE ts_GSUP_IE_SUPPORTED_RAT_TYPES(GSUP_RatTypes ratt) := { + tag := OSMO_GSUP_SUPPORTED_RAT_TYPES_IE, len := 0, /* overwritten */ val := { - rat_type := ratt + supported_rat_types := ratt + } +} + +template (present) GSUP_IE tr_GSUP_IE_CURRENT_RAT_TYPE(template (present) GSUP_RatType ratt) := { + tag := OSMO_GSUP_CURRENT_RAT_TYPE_IE, + len := ?, + val := { + current_rat_type := ratt + } +} +template (value) GSUP_IE ts_GSUP_IE_CURRENT_RAT_TYPE(GSUP_RatType ratt) := { + tag := OSMO_GSUP_CURRENT_RAT_TYPE_IE, + len := 0, /* overwritten */ + val := { + current_rat_type := ratt } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2c609dc523cbec562c6c6a05f4c7d600649ff52d Gerrit-Change-Number: 16441 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 19:12:15 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 19:12:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: Don't attempt to find AUTN in 2G-only tuple In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16442 ) Change subject: hlr: Don't attempt to find AUTN in 2G-only tuple ...................................................................... hlr: Don't attempt to find AUTN in 2G-only tuple In Change-Id I40c6cf7e28ad9331e6c27fe7acafa3f9e277eedf we introduced a patch that verifies the AMF separation bit for 3G/3G vs 4G authentication. However, the test ignored the fact that AUTN cannot be present in pure 2G tuples. This makes TC_gsup_sai pass again. Change-Id: I9b61e62a58b583461dd5e67dd12119be282cae21 --- M hlr/HLR_Tests.ttcn 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index 8a96d7f..50109a6 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -711,7 +711,9 @@ private function f_TC_gsup_sai() runs on HLR_ConnHdlr { var GSUP_PDU res; res := f_perform_SAI(g_pars.sub.imsi); - f_ensure_amf_separation_bit(res, '0'B); + if (ispresent(g_pars.sub.aud3g)) { + f_ensure_amf_separation_bit(res, '0'B); + } /* TODO: match if tuple[s] matches expectation */ setverdict(pass); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9b61e62a58b583461dd5e67dd12119be282cae21 Gerrit-Change-Number: 16442 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 19:12:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 19:12:30 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Use set -e before applying changes to prepare release In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16436 ) Change subject: osmo-release.sh: Use set -e before applying changes to prepare release ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I783c3645537258a75ae6f5a684489d629b852188 Gerrit-Change-Number: 16436 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 03 Dec 2019 19:12:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 19:12:31 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 19:12:31 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Use set -e before applying changes to prepare release In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16436 ) Change subject: osmo-release.sh: Use set -e before applying changes to prepare release ...................................................................... osmo-release.sh: Use set -e before applying changes to prepare release Change-Id: I783c3645537258a75ae6f5a684489d629b852188 --- M osmo-release.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/osmo-release.sh b/osmo-release.sh index 4450436..916af84 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -162,6 +162,7 @@ exit 0 fi +set -e if [ -f "TODO-RELEASE" ]; then grep '#' TODO-RELEASE > TODO-RELEASE.clean mv TODO-RELEASE.clean TODO-RELEASE -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I783c3645537258a75ae6f5a684489d629b852188 Gerrit-Change-Number: 16436 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 19:13:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 19:13:06 +0000 Subject: Change in osmo-sgsn[master]: doc: add OsmoGbProxy VTY reference In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16406 ) Change subject: doc: add OsmoGbProxy VTY reference ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I24c3ca2fc2446673edceefb797c7d800c3a1a5d2 Gerrit-Change-Number: 16406 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 19:13:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 19:13:23 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 19:13:23 +0000 Subject: Change in osmo-sgsn[master]: regen_doc.sh: support gbproxy, run without docker In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16407 ) Change subject: regen_doc.sh: support gbproxy, run without docker ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16407 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8b5bd5347ea34266ad650383372630f2a84d5cce Gerrit-Change-Number: 16407 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 03 Dec 2019 19:13:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 19:13:25 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 19:13:25 +0000 Subject: Change in osmo-sgsn[master]: doc: add OsmoGbProxy VTY reference In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16406 ) Change subject: doc: add OsmoGbProxy VTY reference ...................................................................... doc: add OsmoGbProxy VTY reference Depends: (osmo-gsm-manuals) I4dea3e07b88175b2a88e577129360af7ec5f87e1 Related: OS#4292 Change-Id: I24c3ca2fc2446673edceefb797c7d800c3a1a5d2 --- M doc/manuals/Makefile.am A doc/manuals/osmogbproxy-vty-reference.xml A doc/manuals/vty-osmogbproxy/gbproxy_vty_additions.xml A doc/manuals/vty-osmogbproxy/gbproxy_vty_reference.xml 4 files changed, 1,675 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am index 72e8c77..cd57cf1 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile.am @@ -5,14 +5,17 @@ osmogbproxy-usermanual-docinfo.xml \ regen_doc.sh \ chapters \ - vty + vty \ + osmogbproxy-vty-reference.xml \ + vty-osmogbproxy \ + $(NULL) if BUILD_MANUALS ASCIIDOC = osmosgsn-usermanual.adoc osmogbproxy-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - VTY_REFERENCE = osmosgsn-vty-reference.xml + VTY_REFERENCE = osmosgsn-vty-reference.xml osmogbproxy-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc OSMO_REPOSITORY = osmo-sgsn diff --git a/doc/manuals/osmogbproxy-vty-reference.xml b/doc/manuals/osmogbproxy-vty-reference.xml new file mode 100644 index 0000000..ecf2268 --- /dev/null +++ b/doc/manuals/osmogbproxy-vty-reference.xml @@ -0,0 +1,38 @@ + + + + +]> + + + + + + v1 + 2nd December 2019 + hw + Initial + + + + OsmoGbProxy VTY Reference + + + 2019 + + + + This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. + + + + + + &chapter-vty; + + diff --git a/doc/manuals/vty-osmogbproxy/gbproxy_vty_additions.xml b/doc/manuals/vty-osmogbproxy/gbproxy_vty_additions.xml new file mode 100644 index 0000000..6da2d2f --- /dev/null +++ b/doc/manuals/vty-osmogbproxy/gbproxy_vty_additions.xml @@ -0,0 +1,5 @@ + + + Configure the Gb proxy + + diff --git a/doc/manuals/vty-osmogbproxy/gbproxy_vty_reference.xml b/doc/manuals/vty-osmogbproxy/gbproxy_vty_reference.xml new file mode 100644 index 0000000..1db3c0d --- /dev/null +++ b/doc/manuals/vty-osmogbproxy/gbproxy_vty_reference.xml @@ -0,0 +1,1627 @@ + + + Common Commands + These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + view + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + enable + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-log + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-stats + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-line + + + + + + + + + + + + + + + + + + + + + config-ns + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-gbproxy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I24c3ca2fc2446673edceefb797c7d800c3a1a5d2 Gerrit-Change-Number: 16406 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 19:13:25 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 19:13:25 +0000 Subject: Change in osmo-sgsn[master]: regen_doc.sh: support gbproxy, run without docker In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16407 ) Change subject: regen_doc.sh: support gbproxy, run without docker ...................................................................... regen_doc.sh: support gbproxy, run without docker Do not only update the VTY reference and counters of osmo-sgsn, but also the VTY reference of gbproxy. This was not possible with the old code path of calling "regen_doc.sh" inside docker-playground.git, as it expects the program to be updated to have the same name as the docker image. Using the docker-playground script also has the disadvantage, that one must push the development branch to git.osmocom.org before updating the VTY reference/counters, because that script would build a new docker container with a freshly cloned repository, check out the same commit that we have already locally, build that and then finally regenerate the docs. So instead of adding another parameter for the docker image to the script in docker-playground.git and calling it twice, simplify the process by rewriting the regen_doc.sh script in osmo-sgsn.git. Make it start the locally installed osmo-sgsn and osmo-gbproxy binaries and call osmo_interact_vty.py on them. Related: OS#4292 Change-Id: I8b5bd5347ea34266ad650383372630f2a84d5cce --- M doc/manuals/regen_doc.sh 1 file changed, 71 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/regen_doc.sh b/doc/manuals/regen_doc.sh index d758436..847b764 100755 --- a/doc/manuals/regen_doc.sh +++ b/doc/manuals/regen_doc.sh @@ -1,17 +1,77 @@ -#!/bin/sh -x +#!/bin/sh -e -if [ -z "$DOCKER_PLAYGROUND" ]; then - echo "You need to set DOCKER_PLAYGROUND" +require_osmo_interact_vty() { + if command -v osmo_interact_vty.py >/dev/null 2>&1; then + return + fi + echo "ERROR: osmo_interact_vty.py not found. Are osmo-python-tests in PATH?" exit 1 -fi +} -SCRIPT=$(realpath "$0") -MANUAL_DIR=$(dirname "$SCRIPT") +# $1: "update_vty_reference" or "update_counters" +# $2: output file +# $3: port +# $4-$n: command +interact_vty() { + action="$1" + output="$2" + port="$3" + log="/tmp/$4.log" + shift 3 -COMMIT=${COMMIT:-$(git log -1 --format=format:%H)} + echo "Starting in background: $@" + "$@" > "$log" 2>&1 & + pid="$!" -cd "$DOCKER_PLAYGROUND/scripts" || exit 1 + sleep 0.5 + if ! kill -0 "$pid" 2>/dev/null; then + echo "ERROR: start failed!" + cat "$log" + exit 1 + fi -OSMO_SGSN_BRANCH=$COMMIT ./regen_doc.sh osmo-sgsn 4245 \ - "$MANUAL_DIR/chapters/counters_generated.adoc" \ - "$MANUAL_DIR/vty/sgsn_vty_reference.xml" + case "$action" in + "update_vty_reference") + echo "Updating VTY reference: $output" + osmo_interact_vty.py -X -p "$port" -H 127.0.0.1 -O "$output" + ;; + "update_counters") + echo "Updating asciidoc counters: $output" + osmo_interact_vty.py -c "enable;show asciidoc counters" -p "$port" -H 127.0.0.1 -O "$output" + ;; + *) + echo "ERROR: invalid argument: $action" + exit 1 + ;; + esac + + kill "$pid" + echo "Done (killed $1)" + echo +} + +DIR="$(cd "$(dirname "$0")"; pwd)" +cd "$DIR" + +require_osmo_interact_vty + +interact_vty \ + "update_vty_reference" \ + "vty/sgsn_vty_reference.xml" \ + 4245 \ + osmo-sgsn -c "../examples/osmo-sgsn/osmo-sgsn.cfg" + +interact_vty \ + "update_vty_reference" \ + "vty-osmogbproxy/gbproxy_vty_reference.xml" \ + 4246 \ + osmo-gbproxy -c "../examples/osmo-gbproxy/osmo-gbproxy.cfg" + +interact_vty \ + "update_counters" \ + "chapters/counters_generated.adoc" \ + 4245 \ + osmo-sgsn -c "../examples/osmo-sgsn/osmo-sgsn.cfg" + + +echo "Done with all" -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16407 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8b5bd5347ea34266ad650383372630f2a84d5cce Gerrit-Change-Number: 16407 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 19:56:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 19:56:48 +0000 Subject: =?UTF-8?Q?Change_in_osmo-remsim=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E1=2E10-35d9-dirty_=E2=86=92_0=2E2=2E2?= References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16443 ) Change subject: Bump version: 0.2.1.10-35d9-dirty ? 0.2.2 ...................................................................... Bump version: 0.2.1.10-35d9-dirty ? 0.2.2 Change-Id: I77c86455f9c36c16271bc8e7f8f3f72d682d23fd --- M debian/changelog M debian/control D debian/libosmo-rspro0.install M src/Makefile.am 4 files changed, 22 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/43/16443/1 diff --git a/debian/changelog b/debian/changelog index 5554597..0ff1dea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +osmo-remsim (0.2.2) unstable; urgency=medium + + [ Harald Welte ] + * rspro_client_fsm: Fix another memory leak + * remsim-apitool: Fix slotmap-create (integer needed, not string!) + * rspro_dec_msg: Simplify msgb ownership handling + * bankd_client_fsm: close IPA client connection before re-establishing it + * Check for osmo_fsm_register() error return value + * cosmetic: more comments; spelling fixes in comments + * bankd: send IPA CCM ID_ACK after receiving ID_ACK + + [ Joachim Steiger ] + * add contrib/remsim-apitool.py to control the REST-interface of osmo-remsim-server + + [ K?vin Redon ] + * remsim-apitool.py: pass IDs as integer + * client: fix help strings + + -- Harald Welte Tue, 03 Dec 2019 20:38:18 +0100 + osmo-remsim (0.2.1) unstable; urgency=medium * rspro_client_fsm/remsim_client: Fix double-free diff --git a/debian/control b/debian/control index c693fde..7638015 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Vcs-Git: git://git.osmocom.org/osmo-remsim Homepage: https://projects.osmocom.org/projects/osmo-remsim -Package: libosmo-rspro0 +Package: libosmo-rspro1 Section: libs Architecture: any Multi-Arch: same diff --git a/debian/libosmo-rspro0.install b/debian/libosmo-rspro0.install deleted file mode 100644 index 2b3a85d..0000000 --- a/debian/libosmo-rspro0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libosmo-rspro*.so.* diff --git a/src/Makefile.am b/src/Makefile.am index 165c3f7..fa0f732 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,7 +11,7 @@ $(PCSC_CFLAGS) $(USB_CFLAGS) $(OSMOSIM_CFLAGS) \ -I$(top_srcdir)/include/osmocom/rspro -RSPRO_LIBVERSION=0:0:0 +RSPRO_LIBVERSION=1:0:0 lib_LTLIBRARIES = libosmo-rspro.la libosmo_rspro_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(RSPRO_LIBVERSION) libosmo_rspro_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16443 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I77c86455f9c36c16271bc8e7f8f3f72d682d23fd Gerrit-Change-Number: 16443 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 19:57:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 19:57:51 +0000 Subject: =?UTF-8?Q?Change_in_osmo-remsim=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E1=2E10-35d9-dirty_=E2=86=92_0=2E2=2E2?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16443 ) Change subject: Bump version: 0.2.1.10-35d9-dirty ? 0.2.2 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16443 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I77c86455f9c36c16271bc8e7f8f3f72d682d23fd Gerrit-Change-Number: 16443 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 03 Dec 2019 19:57:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 19:58:15 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 19:58:15 +0000 Subject: Change in osmo-bts[master]: rsl_rx_chan_act: Apply bitmask when parsing IE MS_POWER In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16437 ) Change subject: rsl_rx_chan_act: Apply bitmask when parsing IE MS_POWER ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I99c6a4d353f405582d5e4f9d12c01c25c7bb4dff Gerrit-Change-Number: 16437 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 03 Dec 2019 19:58:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 19:58:17 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 19:58:17 +0000 Subject: Change in osmo-bts[master]: rsl_rx_chan_act: Apply bitmask when parsing IE MS_POWER In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16437 ) Change subject: rsl_rx_chan_act: Apply bitmask when parsing IE MS_POWER ...................................................................... rsl_rx_chan_act: Apply bitmask when parsing IE MS_POWER Change-Id: I99c6a4d353f405582d5e4f9d12c01c25c7bb4dff --- M src/common/rsl.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/common/rsl.c b/src/common/rsl.c index 09a9217..67eb622 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1150,7 +1150,7 @@ lchan->bs_power = *TLVP_VAL(&tp, RSL_IE_BS_POWER); /* 9.3.13 MS Power */ if (TLVP_PRES_LEN(&tp, RSL_IE_MS_POWER, 1)) { - lchan->ms_power_ctrl.max = *TLVP_VAL(&tp, RSL_IE_MS_POWER); + lchan->ms_power_ctrl.max = *TLVP_VAL(&tp, RSL_IE_MS_POWER) & 0x1F; lchan->ms_power_ctrl.current = lchan->ms_power_ctrl.max; lchan->ms_power_ctrl.fixed = false; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I99c6a4d353f405582d5e4f9d12c01c25c7bb4dff Gerrit-Change-Number: 16437 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 19:58:55 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 19:58:55 +0000 Subject: Change in osmo-bts[master]: power_control.c: Log maximum allowed MS Power Level In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16439 ) Change subject: power_control.c: Log maximum allowed MS Power Level ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I983ff824ef6f54f1e800819d622158d5e2a51f04 Gerrit-Change-Number: 16439 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 03 Dec 2019 19:58:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 20:00:14 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 20:00:14 +0000 Subject: Change in osmo-bts[master]: rsl: Clarify when autnonoums MS Power Ctrl Loop is used In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16438 ) Change subject: rsl: Clarify when autnonoums MS Power Ctrl Loop is used ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id6b444a33ab062f6dab11a0ce62d8aecaea87591 Gerrit-Change-Number: 16438 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 03 Dec 2019 20:00:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 20:20:20 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 3 Dec 2019 20:20:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: TC_mo_ping_pong: Check DL block is sent and ACK it In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16409 ) Change subject: pcu: TC_mo_ping_pong: Check DL block is sent and ACK it ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icf66dd5c07690368722c586632c38fb7e770053c Gerrit-Change-Number: 16409 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 03 Dec 2019 20:20:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 20:35:56 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 20:35:56 +0000 Subject: Change in libosmocore[master]: osmo-arfcn: Fix '-h' option References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16444 ) Change subject: osmo-arfcn: Fix '-h' option ...................................................................... osmo-arfcn: Fix '-h' option Change-Id: I13decca25dcdb75191c1e78058704ae8efa69b33 --- M utils/osmo-arfcn.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/16444/1 diff --git a/utils/osmo-arfcn.c b/utils/osmo-arfcn.c index aee132c..5087842 100644 --- a/utils/osmo-arfcn.c +++ b/utils/osmo-arfcn.c @@ -100,7 +100,7 @@ char *param; enum program_mode mode = MODE_NONE; - while ((opt = getopt(argc, argv, "pa:f:ud")) != -1) { + while ((opt = getopt(argc, argv, "pa:f:udh")) != -1) { switch (opt) { case 'p': pcs = 1; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16444 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I13decca25dcdb75191c1e78058704ae8efa69b33 Gerrit-Change-Number: 16444 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 20:35:56 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 20:35:56 +0000 Subject: Change in libosmocore[master]: utils: exit(2) on unsupported positional arguments on command line References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16445 ) Change subject: utils: exit(2) on unsupported positional arguments on command line ...................................................................... utils: exit(2) on unsupported positional arguments on command line Change-Id: Icc76cae2225ec4e664b950176dd861fa15712f59 --- M utils/osmo-arfcn.c M utils/osmo-auc-gen.c 2 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/16445/1 diff --git a/utils/osmo-arfcn.c b/utils/osmo-arfcn.c index 5087842..5f138f8 100644 --- a/utils/osmo-arfcn.c +++ b/utils/osmo-arfcn.c @@ -128,6 +128,11 @@ } } + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments in command line\n"); + exit(2); + } + switch (mode) { case MODE_NONE: help(argv[0]); diff --git a/utils/osmo-auc-gen.c b/utils/osmo-auc-gen.c index ec9bad8..65cfa31 100644 --- a/utils/osmo-auc-gen.c +++ b/utils/osmo-auc-gen.c @@ -247,6 +247,11 @@ } } + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments in command line\n"); + exit(2); + } + if (!rand_is_set) { rc = osmo_get_rand_id(_rand, 16); if (rc < 0) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16445 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icc76cae2225ec4e664b950176dd861fa15712f59 Gerrit-Change-Number: 16445 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 20:41:45 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 20:41:45 +0000 Subject: Change in osmo-trx[master]: trx: exit() on unsupported positional arguments on command line References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/16446 ) Change subject: trx: exit() on unsupported positional arguments on command line ...................................................................... trx: exit() on unsupported positional arguments on command line Change-Id: Ifeea65a359e9ca307efb2c721fd0fb6f0959e976 --- M Transceiver52M/osmo-trx.cpp 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/46/16446/1 diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index 2346488..16047a9 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -381,6 +381,11 @@ } } + if (argc > optind) { + LOG(ERROR) << "Unsupported positional arguments on command line"; + goto bad_config; + } + /* Cmd line option specific validation & setup */ if (trx->cfg.num_chans > TRX_CHAN_MAX) { -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ifeea65a359e9ca307efb2c721fd0fb6f0959e976 Gerrit-Change-Number: 16446 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 20:49:38 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 20:49:38 +0000 Subject: Change in osmo-bsc[master]: exit(2) on unsupported positional arguments on command line References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16447 ) Change subject: exit(2) on unsupported positional arguments on command line ...................................................................... exit(2) on unsupported positional arguments on command line Change-Id: I3b8781e220326387f1c437c39aff8661326f1e0a --- M src/ipaccess/ipaccess-proxy.c M src/osmo-bsc/osmo_bsc_main.c M src/utils/bs11_config.c 3 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/47/16447/1 diff --git a/src/ipaccess/ipaccess-proxy.c b/src/ipaccess/ipaccess-proxy.c index 3d5f301..f4d620b 100644 --- a/src/ipaccess/ipaccess-proxy.c +++ b/src/ipaccess/ipaccess-proxy.c @@ -1200,6 +1200,10 @@ break; } } + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } if ((options_mask & (IPA_PROXY_OPT_LISTEN_IP | IPA_PROXY_OPT_BSC_IP)) != (IPA_PROXY_OPT_LISTEN_IP | IPA_PROXY_OPT_BSC_IP)) { printf("ERROR: You have to specify `--listen' and `--bsc' " diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index b18172c..6b14279 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -171,6 +171,11 @@ break; } } + + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } } /* Callback function for NACK on the OML NM */ diff --git a/src/utils/bs11_config.c b/src/utils/bs11_config.c index 2a2340c..7cd4203 100644 --- a/src/utils/bs11_config.c +++ b/src/utils/bs11_config.c @@ -854,6 +854,10 @@ if (optind+1 < argc) value = argv[optind+1]; } + if (optind+2 < argc) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3b8781e220326387f1c437c39aff8661326f1e0a Gerrit-Change-Number: 16447 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 20:51:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 20:51:18 +0000 Subject: Change in osmo-mgw[master]: exit(2) on unsupported positional arguments on command line References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/16448 ) Change subject: exit(2) on unsupported positional arguments on command line ...................................................................... exit(2) on unsupported positional arguments on command line Change-Id: I5398edac755280d2982285802516681aa5255470 --- M src/osmo-mgw/mgw_main.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/48/16448/1 diff --git a/src/osmo-mgw/mgw_main.c b/src/osmo-mgw/mgw_main.c index adc1751..4168e0d 100644 --- a/src/osmo-mgw/mgw_main.c +++ b/src/osmo-mgw/mgw_main.c @@ -132,6 +132,10 @@ break; }; } + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } } /* Callback function to be called when the RSIP ("Reset in Progress") mgcp -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/16448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I5398edac755280d2982285802516681aa5255470 Gerrit-Change-Number: 16448 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 20:53:17 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 20:53:17 +0000 Subject: Change in osmo-iuh[master]: exit(2) on unsupported positional arguments on command line References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16449 ) Change subject: exit(2) on unsupported positional arguments on command line ...................................................................... exit(2) on unsupported positional arguments on command line Change-Id: Id33caf93325074f9e5b2b322ac497b1c21c3f406 --- M src/hnbgw.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/49/16449/1 diff --git a/src/hnbgw.c b/src/hnbgw.c index 9dc67a2..0db04af 100644 --- a/src/hnbgw.c +++ b/src/hnbgw.c @@ -455,6 +455,11 @@ break; } } + + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } } CTRL_CMD_DEFINE_RO(hnb_info, "info"); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16449 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Id33caf93325074f9e5b2b322ac497b1c21c3f406 Gerrit-Change-Number: 16449 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 20:54:24 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 3 Dec 2019 20:54:24 +0000 Subject: Change in libosmocore[master]: osmo-arfcn: Fix '-h' option In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16444 ) Change subject: osmo-arfcn: Fix '-h' option ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16444 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I13decca25dcdb75191c1e78058704ae8efa69b33 Gerrit-Change-Number: 16444 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 03 Dec 2019 20:54:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 20:55:11 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 20:55:11 +0000 Subject: Change in osmo-cbc[master]: exit(2) on unsupported positional arguments on command line References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/16450 ) Change subject: exit(2) on unsupported positional arguments on command line ...................................................................... exit(2) on unsupported positional arguments on command line Change-Id: I701e6bffbfdfc98ff09b1d824e7707ef5a8b8059 --- M src/cbc_main.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/50/16450/1 diff --git a/src/cbc_main.c b/src/cbc_main.c index d5d5296..d60621c 100644 --- a/src/cbc_main.c +++ b/src/cbc_main.c @@ -131,6 +131,11 @@ break; } } + + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } } static void signal_handler(int signal) -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/16450 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I701e6bffbfdfc98ff09b1d824e7707ef5a8b8059 Gerrit-Change-Number: 16450 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 21:14:56 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 21:14:56 +0000 Subject: Change in osmo-e1-recorder[master]: e1_recorder: Add --help and --version command line arguments References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16451 ) Change subject: e1_recorder: Add --help and --version command line arguments ...................................................................... e1_recorder: Add --help and --version command line arguments Change-Id: Ie676466e5406243cf4205948cddd95426e2b8c10 --- M src/e1_recorder.c 1 file changed, 23 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-recorder refs/changes/51/16451/1 diff --git a/src/e1_recorder.c b/src/e1_recorder.c index 4887c3d..1afd40d 100644 --- a/src/e1_recorder.c +++ b/src/e1_recorder.c @@ -14,6 +14,8 @@ #include "storage.h" #include "recorder.h" +#include "config.h" + static enum osmo_e1cap_capture_mode ts2cap_mode(struct e1inp_ts *ts) { switch (ts->type) { @@ -111,8 +113,8 @@ struct vty_app_info vty_info = { .name = "osmo-e1-recorder", - .version = "0", - .copyright = "(C) 2016 by Harald Welte \n", + .version = PACKAGE_VERSION, + .copyright = "(C) 2016-2019 by Harald Welte \n", }; static void *rec_tall_ctx; @@ -131,16 +133,26 @@ } } +static void print_help(void) +{ + printf( " -h --help This help\n" + " -V --version Print version of the program\n" + " -c --config FILE Specify configuration file\n" + ); +} + static void handle_options(int argc, char **argv) { while (1) { int option_index = 0, c; static const struct option long_options[] = { { "config-file", 1, 0, 'c' }, + { "help", 0, 0, 'h' }, + { "version", 0, 0, 'V' }, { 0, 0, 0, 0 } }; - c = getopt_long(argc, argv, "c:", + c = getopt_long(argc, argv, "c:hV", long_options, &option_index); if (c == -1) break; @@ -149,6 +161,14 @@ case 'c': g_config_file = optarg; break; + case 'h': + print_help(); + exit(0); + break; + case 'V': + print_version(1); + exit(0); + break; } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: Ie676466e5406243cf4205948cddd95426e2b8c10 Gerrit-Change-Number: 16451 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 21:14:56 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 21:14:56 +0000 Subject: Change in osmo-e1-recorder[master]: e1cap_dump: Add -h and -V to print help / version of program References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16452 ) Change subject: e1cap_dump: Add -h and -V to print help / version of program ...................................................................... e1cap_dump: Add -h and -V to print help / version of program Change-Id: I621c1f15e1bdb38691ae1fc50c5190ae2701eb58 --- M src/e1cap_dump.c 1 file changed, 23 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-recorder refs/changes/52/16452/1 diff --git a/src/e1cap_dump.c b/src/e1cap_dump.c index c172b55..2d9249e 100644 --- a/src/e1cap_dump.c +++ b/src/e1cap_dump.c @@ -19,6 +19,8 @@ #include "flip_bits.h" #include "hdlc.h" +#include "config.h" + struct e1_recorder g_recorder; enum mode { @@ -201,12 +203,32 @@ return 0; } +static void print_help(void) +{ + printf( " -h Print this message\n" + " -V Print version of the program\n" + " -l LINE_NR Filter on line number\n" + " -s SLOT_NR Filter on timeslot number\n" + " -b Raw binary output mode (for piping stdout)\n" + " -S Super-Channel mode\n" + " -u SUBSLOT_NR Filter on 16k sub-slot number\n" + " -p PCAP_FILE Write LAPD PCAP file\n" + ); +}; + static int handle_options(int argc, char **argv) { int opt; - while ((opt = getopt(argc, argv, "l:s:bSu:p:")) != -1) { + while ((opt = getopt(argc, argv, "hVl:s:bSu:p:")) != -1) { switch (opt) { + case 'h': + print_help(); + exit(0); + case 'V': + printf("%s version %s\n", PACKAGE_NAME, PACKAGE_VERSION); + exit(0); + break; case 'l': /* Filter on E1 Line Number */ g_filter_line = atoi(optarg); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I621c1f15e1bdb38691ae1fc50c5190ae2701eb58 Gerrit-Change-Number: 16452 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 21:14:56 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 21:14:56 +0000 Subject: Change in osmo-e1-recorder[master]: exit(2) on unsupported positional arguments on command line References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16453 ) Change subject: exit(2) on unsupported positional arguments on command line ...................................................................... exit(2) on unsupported positional arguments on command line Change-Id: I6d4efa6ddef41607aecd5ceee78e400db821292f --- M src/e1_recorder.c M src/e1cap_dump.c 2 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-recorder refs/changes/53/16453/1 diff --git a/src/e1_recorder.c b/src/e1_recorder.c index 1afd40d..5986901 100644 --- a/src/e1_recorder.c +++ b/src/e1_recorder.c @@ -171,6 +171,11 @@ break; } } + + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } } int main(int argc, char **argv) diff --git a/src/e1cap_dump.c b/src/e1cap_dump.c index 2d9249e..68460ab 100644 --- a/src/e1cap_dump.c +++ b/src/e1cap_dump.c @@ -297,6 +297,11 @@ exit(2); } + if (argc > optind+1) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } + f = osmo_e1cap_open(NULL, argv[optind++]); if (!f) { fprintf(stderr, "Unable to open input file\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I6d4efa6ddef41607aecd5ceee78e400db821292f Gerrit-Change-Number: 16453 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 21:17:04 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 21:17:04 +0000 Subject: Change in osmo-hlr[master]: hlr: exit(2) on unsupported positional arguments on command line References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16454 ) Change subject: hlr: exit(2) on unsupported positional arguments on command line ...................................................................... hlr: exit(2) on unsupported positional arguments on command line Change-Id: I0c2738d380a7e79622fb3db2062c17782555e82d --- M src/hlr.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/54/16454/1 diff --git a/src/hlr.c b/src/hlr.c index a71b7e1..c3737d5 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -792,6 +792,11 @@ break; } } + + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } } static void signal_hdlr(int signal) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I0c2738d380a7e79622fb3db2062c17782555e82d Gerrit-Change-Number: 16454 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 21:19:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 21:19:47 +0000 Subject: Change in osmo-msc[master]: msc: exit(2) on unsupported positional arguments on command line References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16455 ) Change subject: msc: exit(2) on unsupported positional arguments on command line ...................................................................... msc: exit(2) on unsupported positional arguments on command line Change-Id: Iad858974e9d97ae14f3da6dc21267aafafcda0ef --- M src/osmo-msc/msc_main.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/55/16455/1 diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index e7570cd..cffdaef 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -198,6 +198,11 @@ exit(-1); } } + + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } } struct gsm_network *msc_network_alloc(void *ctx, -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iad858974e9d97ae14f3da6dc21267aafafcda0ef Gerrit-Change-Number: 16455 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 21:28:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 21:28:33 +0000 Subject: Change in osmo-sgsn[master]: exit(2) on unsupported positional arguments on command line References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16456 ) Change subject: exit(2) on unsupported positional arguments on command line ...................................................................... exit(2) on unsupported positional arguments on command line Change-Id: I4f2d70d0b0f1b7bdb8604c930aba8fbb53d8bd54 --- M src/gbproxy/gb_proxy_main.c M src/gtphub/gtphub_main.c M src/sgsn/sgsn_main.c 3 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/56/16456/1 diff --git a/src/gbproxy/gb_proxy_main.c b/src/gbproxy/gb_proxy_main.c index 4319fda..8c83980 100644 --- a/src/gbproxy/gb_proxy_main.c +++ b/src/gbproxy/gb_proxy_main.c @@ -196,6 +196,11 @@ break; } } + + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } } int gbproxy_vty_is_config_node(struct vty *vty, int node) diff --git a/src/gtphub/gtphub_main.c b/src/gtphub/gtphub_main.c index f693f09..664c801 100644 --- a/src/gtphub/gtphub_main.c +++ b/src/gtphub/gtphub_main.c @@ -322,6 +322,11 @@ break; } } + + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } } int main(int argc, char **argv) diff --git a/src/sgsn/sgsn_main.c b/src/sgsn/sgsn_main.c index 7d9a851..3b18b05 100644 --- a/src/sgsn/sgsn_main.c +++ b/src/sgsn/sgsn_main.c @@ -271,6 +271,11 @@ break; } } + + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } } /* default categories */ -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16456 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4f2d70d0b0f1b7bdb8604c930aba8fbb53d8bd54 Gerrit-Change-Number: 16456 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 21:29:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 21:29:32 +0000 Subject: Change in osmo-sysmon[master]: exit(2) on unsupported positional arguments on command line References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sysmon/+/16457 ) Change subject: exit(2) on unsupported positional arguments on command line ...................................................................... exit(2) on unsupported positional arguments on command line Change-Id: I32f9565c649a149638878a7283ddd8407ddff1ed --- M src/osysmon_main.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/57/16457/1 diff --git a/src/osysmon_main.c b/src/osysmon_main.c index 07a065e..206246c 100644 --- a/src/osysmon_main.c +++ b/src/osysmon_main.c @@ -197,6 +197,11 @@ break; } } + + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } } static struct osmo_timer_list print_timer; -- To view, visit https://gerrit.osmocom.org/c/osmo-sysmon/+/16457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-Change-Id: I32f9565c649a149638878a7283ddd8407ddff1ed Gerrit-Change-Number: 16457 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 22:44:29 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 3 Dec 2019 22:44:29 +0000 Subject: Change in osmo-ci[master]: add gerrit-verifications for osmo-e1-recorder and osmo-cbc References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16458 ) Change subject: add gerrit-verifications for osmo-e1-recorder and osmo-cbc ...................................................................... add gerrit-verifications for osmo-e1-recorder and osmo-cbc Change-Id: I1df28b4e7a7cbcf9151cd57a77001d88f1875415 --- M jobs/gerrit-verifications.yml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/58/16458/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 5f4385a..3628b54 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -204,6 +204,8 @@ - osmo-asf4-dfu - osmo-ccid-firmware - osmo-e1d + - osmo-cbc + - osmo-e1-recorder - gapk - pysim: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1df28b4e7a7cbcf9151cd57a77001d88f1875415 Gerrit-Change-Number: 16458 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 23:07:31 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 3 Dec 2019 23:07:31 +0000 Subject: Change in osmo-hlr[master]: drop error log for when a subscriber does not exist In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16212 ) Change subject: drop error log for when a subscriber does not exist ...................................................................... Patch Set 23: > Patch Set 22: > > It could at least be a DEBUG message. Or are we sure that all users of the db API will always log themselves? All callers (except some vty cmd implementations, s.b.) issue an error message if they expect a subscriber and can't find one. Arguably the vty should not LOGP() but vty_out() anyway. When checking I found some minor rc evaluation issues and created https://osmocom.org/issues/4303 A LOGL_DEBUG message could be ok, but after looking at the code that seems like log spam / duplication. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5044e9b4519b948edc4e451cef0f7830d315619b Gerrit-Change-Number: 16212 Gerrit-PatchSet: 23 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 03 Dec 2019 23:07:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 23:08:59 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 3 Dec 2019 23:08:59 +0000 Subject: Change in osmo-hlr[master]: vty: show subscriber: change format of 'last LU seen' In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15359 ) Change subject: vty: show subscriber: change format of 'last LU seen' ...................................................................... Patch Set 13: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/15359/13//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-hlr/+/15359/13//COMMIT_MSG at 2 PS13, Line 2: Author: Neels Hofmeyr hold on, why did the author change to me? The original patch was by laforge. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6731968f05050399f4dd43b241290186e0c59e1a Gerrit-Change-Number: 15359 Gerrit-PatchSet: 13 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Tue, 03 Dec 2019 23:08:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 23:14:03 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 3 Dec 2019 23:14:03 +0000 Subject: Change in osmo-hlr[master]: add mslookup_manual_test In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16210 ) Change subject: add mslookup_manual_test ...................................................................... Patch Set 23: > Patch Set 22: > > I would really love to see those kind of tests done in ttcn3. There we have GSUP, VTY and Im sure also a DNS module exists. The added benefit is that the Tests dont usw the same implementation of encoding/decoding. > > Sure it wastes time to redo it. But it Paine me to See that in 2019 we still are writing non-,unit-,Tests outside oft ttcn3. Festung external network interfaces is not a unit test! This was a quick and dirty test setup i needed for testing interaction between 4 HLRs and what to expect when real world traffic happens in that situation; I posted before that we don't really need to merge this patch at all (but comments in gerrit are pretty hard to spot IMHO). ttcn tests are osmith's task :) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I80473528c9524263b60fc3ba37ba246c80bfe452 Gerrit-Change-Number: 16210 Gerrit-PatchSet: 23 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 03 Dec 2019 23:14:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 3 23:14:37 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 3 Dec 2019 23:14:37 +0000 Subject: Change in osmo-hlr[master]: add mslookup_manual_test In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16210 ) Change subject: add mslookup_manual_test ...................................................................... Patch Set 23: Code-Review-2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I80473528c9524263b60fc3ba37ba246c80bfe452 Gerrit-Change-Number: 16210 Gerrit-PatchSet: 23 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 03 Dec 2019 23:14:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 01:40:55 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 4 Dec 2019 01:40:55 +0000 Subject: Change in osmo-hlr[master]: add libosmo-mslookup abstract client In-Reply-To: References: Message-ID: Hello fixeria, pespin, laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16202 to look at the new patch set (#18). Change subject: add libosmo-mslookup abstract client ...................................................................... add libosmo-mslookup abstract client mslookup is a key concept in Distributed GSM, which allows querying the current location of a subscriber in a number of cooperating but independent core network sites, by arbitrary service names and by MSISDN/IMSI. Add the abstract mslookup client library. An actual lookup method (besides mslookup_client_fake.c) is added in a subsequent patch. For a detailed overview of this and upcoming patches, please see the elaborate comment at the top of mslookup.c. Add as separate library, libosmo-mslookup, to allow adding D-GSM capability to arbitrary client programs. osmo-hlr will be the only mslookup server implementation, added in a subsequent patch. osmo-hlr itself will also use this library and act as an mslookup client, when requesting the home HLR for locally unknown IMSIs. Related: OS#4237 Patch-by: osmith, nhofmeyr Change-Id: I83487ab8aad1611eb02e997dafbcb8344da13df1 --- M .gitignore M configure.ac M debian/control A debian/libosmo-mslookup-dev.install A debian/libosmo-mslookup0.install M include/Makefile.am M include/osmocom/hlr/logging.h A include/osmocom/mslookup/mslookup.h A include/osmocom/mslookup/mslookup_client.h A include/osmocom/mslookup/mslookup_client_fake.h A libosmo-mslookup.pc.in M src/Makefile.am A src/mslookup/Makefile.am A src/mslookup/mslookup.c A src/mslookup/mslookup_client.c A src/mslookup/mslookup_client_fake.c M tests/Makefile.am A tests/mslookup/Makefile.am A tests/mslookup/mslookup_client_test.c A tests/mslookup/mslookup_client_test.err A tests/mslookup/mslookup_test.c A tests/mslookup/mslookup_test.err M tests/testsuite.at 23 files changed, 1,614 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/02/16202/18 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I83487ab8aad1611eb02e997dafbcb8344da13df1 Gerrit-Change-Number: 16202 Gerrit-PatchSet: 18 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 01:40:55 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 4 Dec 2019 01:40:55 +0000 Subject: Change in osmo-hlr[master]: add osmo-mslookup-client program In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16203 to look at the new patch set (#20). Change subject: add osmo-mslookup-client program ...................................................................... add osmo-mslookup-client program Standalone program using libosmo-mslookup to easily integrate with programs that want to connect services (SIP, SMS,...) to the current location of a subscriber. Also useful for manual testing. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: Ie68a5c1db04fb4dff00dc3c774a1162f5b9fabf7 --- M .gitignore M configure.ac M contrib/Makefile.am A contrib/dgsm/Makefile.am A contrib/dgsm/osmo-mslookup-pipe.py A contrib/dgsm/osmo-mslookup-socket.py M src/mslookup/Makefile.am A src/mslookup/osmo-mslookup-client.c 8 files changed, 948 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/03/16203/20 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ie68a5c1db04fb4dff00dc3c774a1162f5b9fabf7 Gerrit-Change-Number: 16203 Gerrit-PatchSet: 20 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 01:40:55 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 4 Dec 2019 01:40:55 +0000 Subject: Change in osmo-hlr[master]: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 to look at the new patch set (#21). Change subject: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name ...................................................................... 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name These are seemingly orthogonal changes in one patch, because they are in fact sufficiently intertwined that we are not willing to spend the time to separate them. They are also refactoring changes, unlikely to make sense on their own. ** lu_fsm: Attempting to make luop.c keep state about incoming GSUP requests made me find shortcomings in several places: - since it predates osmo_fsm, it is a state machine that does not strictly enforce the order of state transitions or the right sequence of incoming events. - several places OSMO_ASSERT() on data received from the network. - modifies the subscriber state before a LU is accepted. - dead code about canceling a subscriber in a previous VLR. That would be a good thing to actually do, which should also be trivial now that we record vlr_name and sgsn_name, but I decided to remove the dead code for now. To both step up the LU game *and* make it easier for me to integrate osmo_gsup_req handling, I decided to create a lu_fsm, drawing from my, by now, ample experience of writing osmo_fsms. ** osmo_gsup_req: Prepare for D-GSM, where osmo-hlr will do proxy routing for remote HLRs / communicate with remote MSCs via a proxy: a) It is important that a response that osmo-hlr generates and that is sent back to a requesting MSC contains all IEs that are needed to route it back to the requester. Particularly source_name must become destination_name in the response to be able to even reach the requesting MSC. Other fields are also necessary to match, which were so far taken care of in individual numerous code paths. b) For some operations, the response to a GSUP request is generated asynchronously (like Update Location Request -> Response, or taking the response from an EUSE, or the upcoming proxying to a remote HLR). To be able to feed a request message's information back into the response, we must thus keep the request data around. Since struct osmo_gsup_message references a lot of external data, usually with pointers directly into the received msgb, it is not so trivial to pass GSUP message data around asynchronously, on its own. osmo_gsup_req is the combined solution for both a and b: it keeps all data for a GSUP message by taking ownership of the incoming msgb, and it provides an explicit API "forcing" callers to respond with osmo_gsup_req_respond(), so that all code paths trivially are definitely responding with the correct IEs set to match the request's routing (by using osmo_gsup_make_response() recently added to libosmocore). Adjust all osmo-hlr code paths to use *only* osmo_gsup_req to respond to incoming requests received on the GSUP server (above LU code being one of them). In fact, the same should be done on the client side. Hence osmo_gsup_req is implemented in a server/client agnostic way, and is placed in libosmo-gsupclient. As soon as we see routing errors in complex GSUP setups, using osmo_gsup_req in the related GSUP client is likely to resolve those problems without much thinking required beyond making all code paths use it. libosmo-gsupclient is hence added to osmo-hlr binary's own library dependencies. It would have been added by the D-GSM proxy routing anyway, we are just doing it a little sooner. ** gsup_peer_id.c / osmo_ipa_name: We so far handle an IPA unit name as pointer + size, or as just pointer with implicit talloc size. To ease working with GSUP peer identification data, I require: - a non-allocated storage of an IPA Name. It brings the drawback of being size limited, but our current implementation is anyway only able to handle MSC and SGSN names of 31 characters (see struct hlr_subscriber). - a single-argument handle for IPA Name, - easy to use utility functions like osmo_ipa_name_to_str(), osmo_ipa_name_cmp(), and copying by simple assignment, a = b. Hence this patch adds a osmo_ipa_name in gsup_peer_id.h and gsup_peer_id.c. Heavily used in LU and osmo_gsup_req. Depends: libosmocore Id9692880079ea0f219f52d81b1923a76fc640566 Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 --- M configure.ac M include/Makefile.am A include/osmocom/gsupclient/gsup_req.h A include/osmocom/gsupclient/ipa_name.h M include/osmocom/hlr/Makefile.am M include/osmocom/hlr/db.h M include/osmocom/hlr/gsup_router.h M include/osmocom/hlr/gsup_server.h M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_ussd.h M include/osmocom/hlr/logging.h A include/osmocom/hlr/lu_fsm.h D include/osmocom/hlr/luop.h M src/Makefile.am M src/db.c M src/db_hlr.c M src/gsup_router.c M src/gsup_send.c M src/gsup_server.c M src/gsupclient/Makefile.am M src/gsupclient/gsup_client.c A src/gsupclient/gsup_req.c A src/gsupclient/ipa_name.c M src/hlr.c M src/hlr_ussd.c M src/logging.c A src/lu_fsm.c D src/luop.c M tests/Makefile.am M tests/db/Makefile.am M tests/db/db_test.c M tests/db/db_test.err A tests/gsup/Makefile.am A tests/gsup/gsup_test.c A tests/gsup/gsup_test.err A tests/gsup/gsup_test.ok M tests/gsup_server/Makefile.am M tests/test_nodes.vty M tests/testsuite.at 39 files changed, 1,626 insertions(+), 905 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/05/16205/21 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 Gerrit-Change-Number: 16205 Gerrit-PatchSet: 21 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 01:40:55 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 4 Dec 2019 01:40:55 +0000 Subject: Change in osmo-hlr[master]: gsup client: add up_down_cb(), add osmo_gsup_client_create3() In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16206 to look at the new patch set (#21). Change subject: gsup client: add up_down_cb(), add osmo_gsup_client_create3() ...................................................................... gsup client: add up_down_cb(), add osmo_gsup_client_create3() For the GSUP clients in upcoming D-GSM enabled osmo-hlr, it will be necessary to trigger an event as soon as a GSUP client connection becomes ready for communication. Add the osmo_gsup_client->up_down_cb. Add osmo_gsup_client_create3() pass the up_down_cb in the arguments. Also add a cb data argument. We need the callbacks and data pointer in the osmo_gsup_client_create() function right before startup, because this function immediately starts up the connection. Who knows whether callbacks might trigger right away. Because there are so many arguments, and to prevent the need for ever new versions of this function, pass the arguments as an extendable struct. Change-Id: I6f181e42b678465bc9945f192559dc57d2083c6d --- M include/osmocom/gsupclient/gsup_client.h M src/gsupclient/gsup_client.c 2 files changed, 74 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/06/16206/21 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6f181e42b678465bc9945f192559dc57d2083c6d Gerrit-Change-Number: 16206 Gerrit-PatchSet: 21 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 01:40:55 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 4 Dec 2019 01:40:55 +0000 Subject: Change in osmo-hlr[master]: db v5: prep for D-GSM: add vlr_via_proxy and sgsn_via_proxy In-Reply-To: References: Message-ID: Hello laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16207 to look at the new patch set (#21). Change subject: db v5: prep for D-GSM: add vlr_via_proxy and sgsn_via_proxy ...................................................................... db v5: prep for D-GSM: add vlr_via_proxy and sgsn_via_proxy D-GSM will store in the HLR DB whether a locally connected MSC has attached the subscriber (last_lu_seen[_ps]), or whether the attach happened via a GSUP proxy from a different site. Add columns for this separately in this patch. Change-Id: I98c7b3870559ede84adf56e4bf111f53c7487745 --- M include/osmocom/hlr/db.h M sql/hlr.sql M src/db.c M src/db_hlr.c M tests/db_upgrade/db_upgrade_test.ok 5 files changed, 75 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/07/16207/21 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I98c7b3870559ede84adf56e4bf111f53c7487745 Gerrit-Change-Number: 16207 Gerrit-PatchSet: 21 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 01:40:55 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 4 Dec 2019 01:40:55 +0000 Subject: Change in osmo-hlr[master]: D-GSM 1/n: add mslookup server in osmo-hlr In-Reply-To: References: Message-ID: Hello laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16209 to look at the new patch set (#21). Change subject: D-GSM 1/n: add mslookup server in osmo-hlr ...................................................................... D-GSM 1/n: add mslookup server in osmo-hlr Implement the mslookup server to service remote mslookup requests. This patch merely adds the logic to answer incoming mslookup requests, an actual method to receive requests (mDNS) follows in a subsequent patch. - API to configure service names and addresses for the local site (per MSC). - determine whether a subscriber is on a local MSC (checking the local proxy will be added in subsequent patch that adds proxy capability). - VTY config follows in a subsequent patch. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: Ife4a61d71926d08f310a1aeed9d9f1974f64178b --- M include/osmocom/hlr/Makefile.am M include/osmocom/hlr/hlr.h A include/osmocom/hlr/mslookup_server.h A include/osmocom/hlr/timestamp.h M src/Makefile.am M src/hlr.c A src/mslookup_server.c A src/timestamp.c 8 files changed, 534 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/09/16209/21 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ife4a61d71926d08f310a1aeed9d9f1974f64178b Gerrit-Change-Number: 16209 Gerrit-PatchSet: 21 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 01:40:55 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 4 Dec 2019 01:40:55 +0000 Subject: Change in osmo-hlr[master]: D-GSM 2/n: implement mDNS method of mslookup server In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16257 to look at the new patch set (#11). Change subject: D-GSM 2/n: implement mDNS method of mslookup server ...................................................................... D-GSM 2/n: implement mDNS method of mslookup server Implement the mslookup server's mDNS responder, to actually service remote mslookup requests: - VTY mslookup/server config with service names, - the mslookup_mdns_server listening for mslookup requests, For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: I5cae6459090588b4dd292be90a5e8903432669d2 --- M include/osmocom/hlr/Makefile.am M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_vty.h M include/osmocom/hlr/mslookup_server.h A include/osmocom/hlr/mslookup_server_mdns.h M src/Makefile.am A src/dgsm_vty.c M src/hlr.c A src/mslookup_server_mdns.c M tests/test_nodes.vty M tests/test_subscriber.vty 11 files changed, 569 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/57/16257/11 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5cae6459090588b4dd292be90a5e8903432669d2 Gerrit-Change-Number: 16257 Gerrit-PatchSet: 11 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 01:40:55 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 4 Dec 2019 01:40:55 +0000 Subject: Change in osmo-hlr[master]: D-GSM 3/n: implement roaming by mslookup in osmo-hlr In-Reply-To: References: Message-ID: Hello laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 to look at the new patch set (#12). Change subject: D-GSM 3/n: implement roaming by mslookup in osmo-hlr ...................................................................... D-GSM 3/n: implement roaming by mslookup in osmo-hlr Add mslookup client to find remote home HLRs of unknown IMSIs, and proxy/forward GSUP for those to the right remote HLR instances. Add remote_hlr.c to manage one GSUP client per remote HLR GSUP address. Add proxy.c to keep state about remotely handled IMSIs (remote GSUP address, MSISDN, and probably more in future patches). The mslookup_server that determines whether a given MSISDN is attached locally now also needs to look in the proxy record: it is always the osmo-hlr immediately peering for the MSC that should respond to mslookup service address queries like SIP and SMPP. (Only gsup.hlr service is always answered by the home HLR.) Add dgsm.c to set up an mdns mslookup client, ask for IMSI homes, and to decide which GSUP is handled locally and which needs to go to a remote HLR. Add full VTY config and VTY tests. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa --- M include/osmocom/hlr/Makefile.am A include/osmocom/hlr/dgsm.h M include/osmocom/hlr/gsup_server.h M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_vty.h M include/osmocom/hlr/logging.h A include/osmocom/hlr/proxy.h A include/osmocom/hlr/remote_hlr.h M src/Makefile.am A src/dgsm.c M src/dgsm_vty.c M src/hlr.c M src/hlr_vty.c M src/logging.c M src/mslookup_server.c M src/mslookup_server_mdns.c A src/proxy.c A src/remote_hlr.c M tests/test_nodes.vty 19 files changed, 1,867 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/58/16258/12 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa Gerrit-Change-Number: 16258 Gerrit-PatchSet: 12 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 01:40:55 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 4 Dec 2019 01:40:55 +0000 Subject: Change in osmo-hlr[master]: gsup_server: send routing error back to the correct peer In-Reply-To: References: Message-ID: Hello laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16336 to look at the new patch set (#3). Change subject: gsup_server: send routing error back to the correct peer ...................................................................... gsup_server: send routing error back to the correct peer If a peer attempts to add a route to an ipa-name that we already have in the routing system, don't send the routing error to the peer that already has the name, but to the peer that attempts to re-use it and would cause the collision. This is fixing a situation where for example a locally attached MSC has name 'MSC-1', and a remote site is proxying GSUP here for a remote MSC that also has the name 'MSC-1'. Send the routing error back to the proxy, not local 'MSC-1'. Change-Id: Icafaedc11b5925149d338bdcb987ae985a7323d6 --- M src/gsup_server.c 1 file changed, 14 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/36/16336/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Icafaedc11b5925149d338bdcb987ae985a7323d6 Gerrit-Change-Number: 16336 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 01:41:04 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 4 Dec 2019 01:41:04 +0000 Subject: Change in osmo-hlr[master]: 2/2: fixup: add osmo_gsup_peer_id with type enum and union References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16459 ) Change subject: 2/2: fixup: add osmo_gsup_peer_id with type enum and union ...................................................................... 2/2: fixup: add osmo_gsup_peer_id with type enum and union During code review it was requested to insert an ability to handle different kinds of peer id, in order to be able to add a Global Title in the future. Add this, but only in the publicly visible API. For osmo-hlr internal code, I intend to push implementing this into the future, when a different peer identification actually gets introduced. This way we don't need to implement it now in all osmo-hlr code paths (save time now), but still make all API users aware that this type may be extended in the future. Change-Id: Ide9dcdca283ab989240cfc6e53e9211862a199c5 --- M include/Makefile.am A include/osmocom/gsupclient/gsup_peer_id.h M include/osmocom/gsupclient/gsup_req.h D include/osmocom/gsupclient/ipa_name.h M include/osmocom/hlr/db.h M include/osmocom/hlr/gsup_server.h M src/Makefile.am M src/db_hlr.c M src/gsup_server.c M src/gsupclient/Makefile.am A src/gsupclient/gsup_peer_id.c M src/gsupclient/gsup_req.c D src/gsupclient/ipa_name.c M src/hlr.c M src/hlr_ussd.c M src/lu_fsm.c M tests/db/Makefile.am M tests/db/db_test.c M tests/gsup_server/Makefile.am 19 files changed, 329 insertions(+), 174 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/59/16459/1 diff --git a/include/Makefile.am b/include/Makefile.am index aeeb03f..cf95854 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = osmocom nobase_include_HEADERS = \ - osmocom/gsupclient/ipa_name.h \ + osmocom/gsupclient/gsup_peer_id.h \ osmocom/gsupclient/gsup_client.h \ osmocom/gsupclient/gsup_req.h \ osmocom/mslookup/mdns.h \ diff --git a/include/osmocom/gsupclient/gsup_peer_id.h b/include/osmocom/gsupclient/gsup_peer_id.h new file mode 100644 index 0000000..f67671b --- /dev/null +++ b/include/osmocom/gsupclient/gsup_peer_id.h @@ -0,0 +1,64 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#pragma once +#include +#include +#include + +/*! IPA Name: Arbitrary length blob, not necessarily zero-terminated. + * In osmo-hlr, struct hlr_subscriber is mostly used as static reference and cannot serve as talloc context, which is + * why this is also implemented as a fixed-maximum-size buffer instead of a talloc'd arbitrary sized buffer. + * NOTE: The length of val may be extended in the future if it becomes necessary. + * At the time of writing, this holds IPA unit name strings of very limited length. + */ +struct osmo_ipa_name { + size_t len; + uint8_t val[128]; +}; + +bool osmo_ipa_name_is_empty(struct osmo_ipa_name *ipa_name); +int osmo_ipa_name_set(struct osmo_ipa_name *ipa_name, const uint8_t *val, size_t len); +int osmo_ipa_name_set_str(struct osmo_ipa_name *ipa_name, const char *str_fmt, ...); +int osmo_ipa_name_cmp(const struct osmo_ipa_name *a, const struct osmo_ipa_name *b); +const char *osmo_ipa_name_to_str(const struct osmo_ipa_name *ipa_name); + +enum osmo_gsup_peer_id_type { + OSMO_GSUP_PEER_ID_EMPTY=0, + OSMO_GSUP_PEER_ID_IPA_NAME, + /* OSMO_GSUP_PEER_ID_GLOBAL_TITLE, <-- currently not implemented, but likely future possibility */ +}; + +extern const struct value_string osmo_gsup_peer_id_type_names[]; +static inline const char *osmo_gsup_peer_id_type_name(enum osmo_gsup_peer_id_type val) +{ return get_value_string(osmo_gsup_peer_id_type_names, val); } + +struct osmo_gsup_peer_id { + enum osmo_gsup_peer_id_type type; + union { + struct osmo_ipa_name ipa_name; + }; +}; + +bool osmo_gsup_peer_id_is_empty(struct osmo_gsup_peer_id *gsup_peer_id); +int osmo_gsup_peer_id_set(struct osmo_gsup_peer_id *gsup_peer_id, enum osmo_gsup_peer_id_type type, + const uint8_t *val, size_t len); +int osmo_gsup_peer_id_set_str(struct osmo_gsup_peer_id *gsup_peer_id, enum osmo_gsup_peer_id_type type, + const char *str_fmt, ...); +int osmo_gsup_peer_id_cmp(const struct osmo_gsup_peer_id *a, const struct osmo_gsup_peer_id *b); +const char *osmo_gsup_peer_id_to_str(const struct osmo_gsup_peer_id *gsup_peer_id); diff --git a/include/osmocom/gsupclient/gsup_req.h b/include/osmocom/gsupclient/gsup_req.h index 09959f0..a8d74f5 100644 --- a/include/osmocom/gsupclient/gsup_req.h +++ b/include/osmocom/gsupclient/gsup_req.h @@ -19,14 +19,14 @@ #pragma once #include -#include +#include struct osmo_gsup_req; #define LOG_GSUP_REQ_CAT_SRC(req, subsys, level, file, line, fmt, args...) \ LOGPSRC(subsys, level, file, line, "GSUP %u: %s: IMSI-%s %s: " fmt, \ (req) ? (req)->nr : 0, \ - (req) ? osmo_ipa_name_to_str(&(req)->source_name) : "NULL", \ + (req) ? osmo_gsup_peer_id_to_str(&(req)->source_name) : "NULL", \ (req) ? (req)->gsup.imsi : "NULL", \ (req) ? osmo_gsup_message_type_name((req)->gsup.message_type) : "NULL", \ ##args) @@ -56,11 +56,11 @@ /* The ultimate source of this message: the source_name form the GSUP message, or, if not present, then the * immediate GSUP peer. GSUP messages going via a proxy reflect the initial source in the source_name. * This source_name is implicitly added to the routes for the conn the message was received on. */ - struct osmo_ipa_name source_name; + struct osmo_gsup_peer_id source_name; /* If the source_name is not an immediate GSUP peer, this is set to the closest intermediate peer between here * and source_name. */ - struct osmo_ipa_name via_proxy; + struct osmo_gsup_peer_id via_proxy; /* Identify this request by number, for logging. */ unsigned int nr; @@ -82,7 +82,7 @@ struct msgb *msg; }; -struct osmo_gsup_req *osmo_gsup_req_new(void *ctx, const struct osmo_ipa_name *from_peer, struct msgb *msg, +struct osmo_gsup_req *osmo_gsup_req_new(void *ctx, const struct osmo_gsup_peer_id *from_peer, struct msgb *msg, osmo_gsup_req_send_response_t send_response_cb, void *cb_data, struct llist_head *add_to_list); void osmo_gsup_req_free(struct osmo_gsup_req *req); diff --git a/include/osmocom/gsupclient/ipa_name.h b/include/osmocom/gsupclient/ipa_name.h deleted file mode 100644 index 5016f48..0000000 --- a/include/osmocom/gsupclient/ipa_name.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#pragma once -#include -#include - -/*! IPA Name: Arbitrary length blob, not necessarily zero-terminated. - * In osmo-hlr, struct hlr_subscriber is mostly used as static reference and cannot serve as talloc context, which is - * why this is also implemented as a fixed-maximum-size buffer instead of a talloc'd arbitrary sized buffer. - * NOTE: The length of val may be extended in the future if it becomes necessary. - * At the time of writing, this holds IPA unit name strings of very limited length. - */ -struct osmo_ipa_name { - size_t len; - uint8_t val[128]; -}; - -int osmo_ipa_name_set(struct osmo_ipa_name *ipa_name, const uint8_t *val, size_t len); -int osmo_ipa_name_set_str(struct osmo_ipa_name *ipa_name, const char *str_fmt, ...); -int osmo_ipa_name_cmp(const struct osmo_ipa_name *a, const struct osmo_ipa_name *b); -const char *osmo_ipa_name_to_str(const struct osmo_ipa_name *ipa_name); diff --git a/include/osmocom/hlr/db.h b/include/osmocom/hlr/db.h index 5c627be..02ab7e2 100644 --- a/include/osmocom/hlr/db.h +++ b/include/osmocom/hlr/db.h @@ -3,7 +3,7 @@ #include #include -#include +#include struct hlr; diff --git a/include/osmocom/hlr/gsup_server.h b/include/osmocom/hlr/gsup_server.h index 149971a..0ecf42c 100644 --- a/include/osmocom/hlr/gsup_server.h +++ b/include/osmocom/hlr/gsup_server.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #ifndef OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN diff --git a/src/Makefile.am b/src/Makefile.am index bfbe775..7841d42 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -72,7 +72,7 @@ logging.c \ rand_urandom.c \ dbd_decode_binary.c \ - $(srcdir)/gsupclient/ipa_name.c \ + $(srcdir)/gsupclient/gsup_peer_id.c \ $(NULL) osmo_hlr_db_tool_LDADD = \ diff --git a/src/db_hlr.c b/src/db_hlr.c index fdac75f..ba13324 100644 --- a/src/db_hlr.c +++ b/src/db_hlr.c @@ -37,7 +37,7 @@ #include #include #include -#include +#include #define LOGHLR(imsi, level, fmt, args ...) LOGP(DAUC, level, "IMSI='%s': " fmt, imsi, ## args) diff --git a/src/gsup_server.c b/src/gsup_server.c index a6cca81..053151f 100644 --- a/src/gsup_server.c +++ b/src/gsup_server.c @@ -65,13 +65,21 @@ static void gsup_server_send_req_response(struct osmo_gsup_req *req, struct osmo_gsup_message *response) { struct osmo_gsup_server *server = req->cb_data; - struct osmo_gsup_conn *conn; + struct osmo_gsup_conn *conn = NULL; struct msgb *msg = osmo_gsup_msgb_alloc("GSUP Tx"); int rc; - conn = gsup_route_find_by_ipa_name(server, &req->source_name); + switch (req->source_name.type) { + case OSMO_GSUP_PEER_ID_IPA_NAME: + conn = gsup_route_find_by_ipa_name(server, &req->source_name.ipa_name); + break; + default: + LOG_GSUP_REQ(req, LOGL_ERROR, "GSUP peer id kind not supported: %s\n", + osmo_gsup_peer_id_type_name(req->source_name.type)); + break; + } if (!conn) { - LOG_GSUP_REQ(req, LOGL_ERROR, "GSUP client that sent this request was disconnected, cannot respond\n"); + LOG_GSUP_REQ(req, LOGL_ERROR, "GSUP client that sent this request not found, cannot respond\n"); msgb_free(msg); return; } @@ -91,19 +99,34 @@ struct osmo_gsup_req *osmo_gsup_conn_rx(struct osmo_gsup_conn *conn, struct msgb *msg) { - struct osmo_gsup_req *req = osmo_gsup_req_new(conn->server, &conn->peer_name, msg, gsup_server_send_req_response, - conn->server, NULL); + struct osmo_gsup_req *req; + struct osmo_gsup_peer_id gpi = { + .type = OSMO_GSUP_PEER_ID_IPA_NAME, + .ipa_name = conn->peer_name, + }; + + req = osmo_gsup_req_new(conn->server, &gpi, msg, gsup_server_send_req_response, conn->server, NULL); if (!req) return NULL; - if (req->via_proxy.len) { + if (!osmo_gsup_peer_id_is_empty(&req->via_proxy)) { + switch (req->via_proxy.type) { + case OSMO_GSUP_PEER_ID_IPA_NAME: + break; + default: + LOG_GSUP_REQ(req, LOGL_ERROR, "GSUP peer id kind not supported: %s\n", + osmo_gsup_peer_id_type_name(req->source_name.type)); + osmo_gsup_req_respond_msgt(req, OSMO_GSUP_MSGT_ROUTING_ERROR, true); + return NULL; + } + /* The source of the GSUP message is not the immediate GSUP peer, but that peer is our proxy for that * source. Add it to the routes for this conn (so we can route responses back). */ - if (gsup_route_add_ipa_name(conn, &req->source_name)) { + if (gsup_route_add_ipa_name(conn, &req->source_name.ipa_name)) { LOG_GSUP_REQ(req, LOGL_ERROR, "GSUP message received from %s via peer %s, but there already exists a" " different route to this source, message is not routable\n", - osmo_ipa_name_to_str(&req->source_name), + osmo_gsup_peer_id_to_str(&req->source_name), osmo_ipa_name_to_str(&conn->peer_name)); osmo_gsup_req_respond_msgt(req, OSMO_GSUP_MSGT_ROUTING_ERROR, true); return NULL; diff --git a/src/gsupclient/Makefile.am b/src/gsupclient/Makefile.am index 38b1582..a8674e4 100644 --- a/src/gsupclient/Makefile.am +++ b/src/gsupclient/Makefile.am @@ -9,7 +9,7 @@ lib_LTLIBRARIES = libosmo-gsup-client.la libosmo_gsup_client_la_SOURCES = \ - ipa_name.c \ + gsup_peer_id.c \ gsup_client.c \ gsup_req.c \ $(NULL) diff --git a/src/gsupclient/gsup_peer_id.c b/src/gsupclient/gsup_peer_id.c new file mode 100644 index 0000000..9ac3af9 --- /dev/null +++ b/src/gsupclient/gsup_peer_id.c @@ -0,0 +1,172 @@ +/* Copyright 2019 by sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include +#include +#include + +bool osmo_ipa_name_is_empty(struct osmo_ipa_name *ipa_name) +{ + return (!ipa_name) || (!ipa_name->len); +} + +int osmo_ipa_name_set(struct osmo_ipa_name *ipa_name, const uint8_t *val, size_t len) +{ + if (!val || !len) { + *ipa_name = (struct osmo_ipa_name){}; + return 0; + } + if (len > sizeof(ipa_name->val)) + return -ENOSPC; + ipa_name->len = len; + memcpy(ipa_name->val, val, len); + return 0; +} + +static int osmo_ipa_name_set_str_va(struct osmo_ipa_name *ipa_name, const char *str_fmt, va_list ap) +{ + if (!str_fmt) + return osmo_ipa_name_set(ipa_name, NULL, 0); + vsnprintf((char*)(ipa_name->val), sizeof(ipa_name->val), str_fmt, ap); + ipa_name->len = strlen((char*)(ipa_name->val))+1; + return 0; +} + +int osmo_ipa_name_set_str(struct osmo_ipa_name *ipa_name, const char *str_fmt, ...) +{ + va_list ap; + int rc; + va_start(ap, str_fmt); + rc = osmo_ipa_name_set_str_va(ipa_name, str_fmt, ap); + va_end(ap); + return rc; +} + +int osmo_ipa_name_cmp(const struct osmo_ipa_name *a, const struct osmo_ipa_name *b) +{ + int cmp; + if (a == b) + return 0; + if (!a) + return -1; + if (!b) + return 1; + if (!a->len && !b->len) + return 0; + if (!a->len && b->len) + return -1; + if (!b->len && a->len) + return 1; + + if (a->len == b->len) + return memcmp(a->val, b->val, a->len); + else if (a->len < b->len) { + cmp = memcmp(a->val, b->val, a->len); + if (!cmp) + cmp = -1; + return cmp; + } else { + /* a->len > b->len */ + cmp = memcmp(a->val, b->val, b->len); + if (!cmp) + cmp = 1; + return cmp; + } +} + +/* Return an unquoted string, not including the terminating zero. Used for writing VTY config. */ +const char *osmo_ipa_name_to_str(const struct osmo_ipa_name *ipa_name) +{ + size_t len = ipa_name->len; + if (!len) + return ""; + if (ipa_name->val[len-1] == '\0') + len--; + return osmo_escape_str_c(OTC_SELECT, (char*)ipa_name->val, len); +} + +bool osmo_gsup_peer_id_is_empty(struct osmo_gsup_peer_id *gsup_peer_id) +{ + if (!gsup_peer_id) + return true; + switch (gsup_peer_id->type) { + case OSMO_GSUP_PEER_ID_EMPTY: + return true; + case OSMO_GSUP_PEER_ID_IPA_NAME: + return osmo_ipa_name_is_empty(&gsup_peer_id->ipa_name); + default: + return false; + } +} +int osmo_gsup_peer_id_set(struct osmo_gsup_peer_id *gsup_peer_id, enum osmo_gsup_peer_id_type type, + const uint8_t *val, size_t len) +{ + gsup_peer_id->type = type; + switch (type) { + case OSMO_GSUP_PEER_ID_IPA_NAME: + return osmo_ipa_name_set(&gsup_peer_id->ipa_name, val, len); + default: + return -EINVAL; + } +} + +int osmo_gsup_peer_id_set_str(struct osmo_gsup_peer_id *gsup_peer_id, enum osmo_gsup_peer_id_type type, + const char *str_fmt, ...) +{ + va_list ap; + int rc; + + switch (type) { + case OSMO_GSUP_PEER_ID_IPA_NAME: + va_start(ap, str_fmt); + rc = osmo_ipa_name_set_str_va(&gsup_peer_id->ipa_name, str_fmt, ap); + va_end(ap); + return rc; + default: + return -EINVAL; + } +} + +int osmo_gsup_peer_id_cmp(const struct osmo_gsup_peer_id *a, const struct osmo_gsup_peer_id *b) +{ + if (a->type != b->type) + return OSMO_CMP(a->type, b->type); + switch (a->type) { + case OSMO_GSUP_PEER_ID_IPA_NAME: + return osmo_ipa_name_cmp(&a->ipa_name, &b->ipa_name); + default: + return -EINVAL; + } +} + +const struct value_string osmo_gsup_peer_id_type_names[] = { + { OSMO_GSUP_PEER_ID_IPA_NAME, "IPA-name" }, + {} +}; + +/* Return an unquoted string, not including the terminating zero. Used for writing VTY config. */ +const char *osmo_gsup_peer_id_to_str(const struct osmo_gsup_peer_id *gpi) +{ + switch (gpi->type) { + case OSMO_GSUP_PEER_ID_IPA_NAME: + return osmo_ipa_name_to_str(&gpi->ipa_name); + default: + return osmo_gsup_peer_id_type_name(gpi->type); + } +} diff --git a/src/gsupclient/gsup_req.c b/src/gsupclient/gsup_req.c index df834eb..7cefbdf 100644 --- a/src/gsupclient/gsup_req.c +++ b/src/gsupclient/gsup_req.c @@ -44,7 +44,7 @@ * \param[inout] add_to_list List to which to append this request, or NULL for no list. * \return a newly allocated osmo_gsup_req, or NULL on error. */ -struct osmo_gsup_req *osmo_gsup_req_new(void *ctx, const struct osmo_ipa_name *from_peer, struct msgb *msg, +struct osmo_gsup_req *osmo_gsup_req_new(void *ctx, const struct osmo_gsup_peer_id *from_peer, struct msgb *msg, osmo_gsup_req_send_response_t send_response_cb, void *cb_data, struct llist_head *add_to_list) { @@ -54,7 +54,7 @@ if (!msgb_l2(msg) || !msgb_l2len(msg)) { LOGP(DLGSUP, LOGL_ERROR, "Rx GSUP from %s: missing or empty L2 data\n", - osmo_ipa_name_to_str(from_peer)); + osmo_gsup_peer_id_to_str(from_peer)); msgb_free(msg); return NULL; } @@ -70,7 +70,7 @@ req->source_name = *from_peer; rc = osmo_gsup_decode(msgb_l2(req->msg), msgb_l2len(req->msg), (struct osmo_gsup_message*)&req->gsup); if (rc < 0) { - LOGP(DLGSUP, LOGL_ERROR, "Rx GSUP from %s: cannot decode (rc=%d)\n", osmo_ipa_name_to_str(from_peer), rc); + LOGP(DLGSUP, LOGL_ERROR, "Rx GSUP from %s: cannot decode (rc=%d)\n", osmo_gsup_peer_id_to_str(from_peer), rc); osmo_gsup_req_free(req); return NULL; } @@ -78,17 +78,18 @@ LOG_GSUP_REQ(req, LOGL_DEBUG, "new request: {%s}\n", osmo_gsup_message_to_str_c(OTC_SELECT, &req->gsup)); if (req->gsup.source_name_len) { - if (osmo_ipa_name_set(&req->source_name, req->gsup.source_name, req->gsup.source_name_len)) { + if (osmo_gsup_peer_id_set(&req->source_name, OSMO_GSUP_PEER_ID_IPA_NAME, + req->gsup.source_name, req->gsup.source_name_len)) { LOGP(DLGSUP, LOGL_ERROR, "Rx GSUP from %s: failed to decode source_name, message is not routable\n", - osmo_ipa_name_to_str(from_peer)); + osmo_gsup_peer_id_to_str(from_peer)); osmo_gsup_req_respond_msgt(req, OSMO_GSUP_MSGT_ROUTING_ERROR, true); return NULL; } /* The source of the GSUP message is not the immediate GSUP peer; the peer is our proxy for that source. */ - if (osmo_ipa_name_cmp(&req->source_name, from_peer)) + if (osmo_gsup_peer_id_cmp(&req->source_name, from_peer)) req->via_proxy = *from_peer; } diff --git a/src/gsupclient/ipa_name.c b/src/gsupclient/ipa_name.c deleted file mode 100644 index 716259e..0000000 --- a/src/gsupclient/ipa_name.c +++ /dev/null @@ -1,91 +0,0 @@ -/* Copyright 2019 by sysmocom s.f.m.c. GmbH - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#include -#include -#include -#include - -int osmo_ipa_name_set(struct osmo_ipa_name *ipa_name, const uint8_t *val, size_t len) -{ - if (!val || !len) { - *ipa_name = (struct osmo_ipa_name){}; - return 0; - } - if (len > sizeof(ipa_name->val)) - return -ENOSPC; - ipa_name->len = len; - memcpy(ipa_name->val, val, len); - return 0; -} - -int osmo_ipa_name_set_str(struct osmo_ipa_name *ipa_name, const char *str_fmt, ...) -{ - va_list ap; - if (!str_fmt) - return osmo_ipa_name_set(ipa_name, NULL, 0); - - va_start(ap, str_fmt); - vsnprintf((char*)(ipa_name->val), sizeof(ipa_name->val), str_fmt, ap); - va_end(ap); - ipa_name->len = strlen((char*)(ipa_name->val))+1; - return 0; -} - -int osmo_ipa_name_cmp(const struct osmo_ipa_name *a, const struct osmo_ipa_name *b) -{ - int cmp; - if (a == b) - return 0; - if (!a) - return -1; - if (!b) - return 1; - if (!a->len && !b->len) - return 0; - if (!a->len && b->len) - return -1; - if (!b->len && a->len) - return 1; - - if (a->len == b->len) - return memcmp(a->val, b->val, a->len); - else if (a->len < b->len) { - cmp = memcmp(a->val, b->val, a->len); - if (!cmp) - cmp = -1; - return cmp; - } else { - /* a->len > b->len */ - cmp = memcmp(a->val, b->val, b->len); - if (!cmp) - cmp = 1; - return cmp; - } -} - -/* Return an unquoted string, not including the terminating zero. Used for writing VTY config. */ -const char *osmo_ipa_name_to_str(const struct osmo_ipa_name *ipa_name) -{ - size_t len = ipa_name->len; - if (!len) - return ""; - if (ipa_name->val[len-1] == '\0') - len--; - return osmo_escape_str_c(OTC_SELECT, (char*)ipa_name->val, len); -} diff --git a/src/hlr.c b/src/hlr.c index 65da84e..512c10e 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/hlr_ussd.c b/src/hlr_ussd.c index 5203f26..1992e43 100644 --- a/src/hlr_ussd.c +++ b/src/hlr_ussd.c @@ -416,22 +416,24 @@ } /* is this GSUP connection an EUSE (true) or not (false)? */ -static bool peer_name_is_euse(const struct osmo_ipa_name *peer_name) +static bool peer_name_is_euse(const struct osmo_gsup_peer_id *peer_name) { - if (peer_name->len <= 5) + if (peer_name->type != OSMO_GSUP_PEER_ID_IPA_NAME) return false; - if (!strncmp((char *)(peer_name->val), "EUSE-", 5)) - return true; - else + if (peer_name->ipa_name.len <= 5) return false; + return strncmp((char *)(peer_name->ipa_name.val), "EUSE-", 5) == 0; } -static struct hlr_euse *euse_by_name(const struct osmo_ipa_name *peer_name) +static struct hlr_euse *euse_by_name(const struct osmo_gsup_peer_id *peer_name) { if (!peer_name_is_euse(peer_name)) return NULL; - return euse_find(g_hlr, (const char*)(peer_name->val)+5); + /* above peer_name_is_euse() ensures this: */ + OSMO_ASSERT(peer_name->type == OSMO_GSUP_PEER_ID_IPA_NAME); + + return euse_find(g_hlr, (const char*)(peer_name->ipa_name.val)+5); } static int handle_ss(struct ss_session *ss, bool is_euse_originated, const struct osmo_gsup_message *gsup, @@ -520,6 +522,14 @@ LOGP(DSS, LOGL_DEBUG, "%s/0x%08x: Process SS (%s)\n", gsup->imsi, gsup->session_id, osmo_gsup_session_state_name(gsup->session_state)); + if (gsup_req->source_name.type != OSMO_GSUP_PEER_ID_IPA_NAME) { + LOGP(DSS, LOGL_ERROR, "%s/0x%082x: Unable to process SS request: Unsupported GSUP peer id type%s\n", + gsup->imsi, gsup->session_id, + osmo_gsup_peer_id_type_name(gsup_req->source_name.type)); + osmo_gsup_req_respond_err(gsup_req, GMM_CAUSE_PROTO_ERR_UNSPEC, "error processing SS request"); + return; + } + /* decode and find out what kind of SS message it is */ if (gsup->ss_info && gsup->ss_info_len) { if (gsm0480_parse_facility_ie(gsup->ss_info, gsup->ss_info_len, &req)) { @@ -557,7 +567,8 @@ if (!is_euse_originated) { ss->initial_req_from_ms = gsup_req; free_gsup_req = NULL; - ss->vlr_name = gsup_req->source_name; + OSMO_ASSERT(gsup_req->source_name.type == OSMO_GSUP_PEER_ID_IPA_NAME); /* checked above */ + ss->vlr_name = gsup_req->source_name.ipa_name; } else { ss->initial_req_from_euse = gsup_req; free_gsup_req = NULL; diff --git a/src/lu_fsm.c b/src/lu_fsm.c index f430793..af3bed3 100644 --- a/src/lu_fsm.c +++ b/src/lu_fsm.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include @@ -52,11 +52,11 @@ bool is_ps; /* VLR requesting the LU. */ - struct osmo_ipa_name vlr_name; + struct osmo_gsup_peer_id vlr_name; /* If the LU request was received via a proxy and not immediately from a local VLR, this indicates the closest * peer that forwarded the GSUP message. */ - struct osmo_ipa_name via_proxy; + struct osmo_gsup_peer_id via_proxy; }; LLIST_HEAD(g_all_lu); @@ -130,7 +130,7 @@ osmo_fsm_inst_update_id_f_sanitize(fi, '_', "%s:IMSI-%s", lu->is_ps ? "PS" : "CS", update_location_req->gsup.imsi); - if (!lu->vlr_name.len) { + if (osmo_gsup_peer_id_is_empty(&lu->vlr_name)) { lu_failure(lu, GMM_CAUSE_NET_FAIL, "LU without a VLR"); return; } @@ -163,18 +163,30 @@ #endif /* Store the VLR / SGSN number with the subscriber, so we know where it was last seen. */ - if (lu->via_proxy.len) { + if (!osmo_gsup_peer_id_is_empty(&lu->via_proxy)) { LOG_GSUP_REQ(update_location_req, LOGL_DEBUG, "storing %s = %s, via proxy %s\n", lu->is_ps ? "SGSN number" : "VLR number", - osmo_ipa_name_to_str(&lu->vlr_name), - osmo_ipa_name_to_str(&lu->via_proxy)); + osmo_gsup_peer_id_to_str(&lu->vlr_name), + osmo_gsup_peer_id_to_str(&lu->via_proxy)); } else { LOG_GSUP_REQ(update_location_req, LOGL_DEBUG, "storing %s = %s\n", lu->is_ps ? "SGSN number" : "VLR number", - osmo_ipa_name_to_str(&lu->vlr_name)); + osmo_gsup_peer_id_to_str(&lu->vlr_name)); } - if (db_subscr_lu(g_hlr->dbc, lu->subscr.id, &lu->vlr_name, lu->is_ps, &lu->via_proxy)) { + if (osmo_gsup_peer_id_is_empty(&lu->vlr_name) + || (lu->vlr_name.type != OSMO_GSUP_PEER_ID_IPA_NAME)) { + lu_failure(lu, GMM_CAUSE_PROTO_ERR_UNSPEC, "Unsupported GSUP peer id type for vlr_name: %s", + osmo_gsup_peer_id_type_name(lu->vlr_name.type)); + return; + } + if (!osmo_gsup_peer_id_is_empty(&lu->via_proxy) && (lu->via_proxy.type != OSMO_GSUP_PEER_ID_IPA_NAME)) { + lu_failure(lu, GMM_CAUSE_PROTO_ERR_UNSPEC, "Unsupported GSUP peer id type for via_proxy: %s", + osmo_gsup_peer_id_type_name(lu->via_proxy.type)); + return; + } + if (db_subscr_lu(g_hlr->dbc, lu->subscr.id, &lu->vlr_name.ipa_name, lu->is_ps, + osmo_gsup_peer_id_is_empty(&lu->via_proxy)? NULL : &lu->via_proxy.ipa_name)) { lu_failure(lu, GMM_CAUSE_NET_FAIL, "Cannot update %s in the database", lu->is_ps ? "SGSN number" : "VLR number"); return; diff --git a/tests/db/Makefile.am b/tests/db/Makefile.am index 0194957..d1fdb48 100644 --- a/tests/db/Makefile.am +++ b/tests/db/Makefile.am @@ -30,7 +30,7 @@ $(top_builddir)/src/db_auc.o \ $(top_builddir)/src/db_hlr.o \ $(top_builddir)/src/db.o \ - $(top_builddir)/src/ipa_name.o \ + $(top_builddir)/src/gsup_peer_id.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOABIS_LIBS) \ diff --git a/tests/db/db_test.c b/tests/db/db_test.c index c53baed..4a0f3e8 100644 --- a/tests/db/db_test.c +++ b/tests/db/db_test.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include diff --git a/tests/gsup_server/Makefile.am b/tests/gsup_server/Makefile.am index 48fda88..6df538f 100644 --- a/tests/gsup_server/Makefile.am +++ b/tests/gsup_server/Makefile.am @@ -31,7 +31,7 @@ gsup_server_test_LDADD = \ $(top_srcdir)/src/gsup_server.c \ $(top_srcdir)/src/gsup_router.c \ - $(top_srcdir)/src/gsupclient/ipa_name.c \ + $(top_srcdir)/src/gsupclient/gsup_peer_id.c \ $(top_srcdir)/src/gsupclient/gsup_req.c \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ide9dcdca283ab989240cfc6e53e9211862a199c5 Gerrit-Change-Number: 16459 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 01:41:04 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 4 Dec 2019 01:41:04 +0000 Subject: Change in osmo-hlr[master]: test_nodes.vty: remove cruft References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16460 ) Change subject: test_nodes.vty: remove cruft ...................................................................... test_nodes.vty: remove cruft This stuff is not testing osmo-hlr specific nodes, remove. Change-Id: Ia11a209778b78ab02424e2abf3f9004fe97cf570 --- M tests/test_nodes.vty 1 file changed, 1 insertion(+), 64 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/60/16460/1 diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 610c610..38bb12f 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -11,81 +11,21 @@ logp Print a message on all log outputs; useful for placing markers in test logs subscriber Subscriber management commands OsmoHLR> list - show version - show online-help - list - exit - help - enable - terminal length <0-512> - terminal no length - who - show history - logging enable ... - show logging vty - show alarms - show talloc-context (application|all) (full|brief|DEPTH) - show talloc-context (application|all) (full|brief|DEPTH) tree ADDRESS - show talloc-context (application|all) (full|brief|DEPTH) filter REGEXP - show stats - show stats level (global|peer|subscriber) - show asciidoc counters - show rate-counters show gsup-connections subscriber (imsi|msisdn|id|imei) IDENT show show subscriber (imsi|msisdn|id|imei) IDENT OsmoHLR> enable OsmoHLR# ? - help Description of the interactive help system - list Print command list - write Write running configuration to memory, network, or terminal - show Show running system information - exit Exit current mode and down to previous mode - disable Turn off privileged mode command - configure Configuration from vty interface - copy Copy configuration - terminal Set terminal line parameters - who Display who is on vty - logging Configure logging - no Negate a command or set its defaults - logp Print a message on all log outputs; useful for placing markers in test logs +... subscriber Subscriber management commands -OsmoHLR# list - help -... - exit - disable - configure terminal - copy running-config startup-config - show startup-config - show version - show online-help - terminal length <0-512> - terminal no length - who - show history - terminal monitor - terminal no monitor - logging enable -... OsmoHLR# configure terminal OsmoHLR(config)# ? ... - banner Set banner string - service Set up miscellaneous service - line Configure a terminal line - ctrl Configure the Control Interface - log Configure logging sub-system - stats Configure stats sub-system hlr Configure the HLR OsmoHLR(config)# list - help -... - exit - end ... hlr @@ -99,10 +39,7 @@ store-imei Save the IMEI in the database when receiving Check IMEI requests. Note that an MSC does not necessarily send Check IMEI requests (for OsmoMSC, you may want to set 'check-imei-rqd 1'). subscriber-create-on-demand Make a new record when a subscriber is first seen. OsmoHLR(config-hlr)# list - help ... - exit - end gsup database PATH euse NAME -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16460 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ia11a209778b78ab02424e2abf3f9004fe97cf570 Gerrit-Change-Number: 16460 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 01:44:07 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 4 Dec 2019 01:44:07 +0000 Subject: Change in osmo-hlr[master]: vty: show subscriber: change format of 'last LU seen' In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15359 ) Change subject: vty: show subscriber: change format of 'last LU seen' ...................................................................... Patch Set 14: (1 comment) > Patch Set 13: > > (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/15359/13//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-hlr/+/15359/13//COMMIT_MSG at 2 PS13, Line 2: Author: Neels Hofmeyr > hold on, why did the author change to me? The original patch was by laforge. or was it. I'm confused now. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6731968f05050399f4dd43b241290186e0c59e1a Gerrit-Change-Number: 15359 Gerrit-PatchSet: 14 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Wed, 04 Dec 2019 01:44:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Dec 4 01:57:57 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 04 Dec 2019 01:57:57 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5de712ae7a2a8_28222aab93f7a60c3031a2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/xUbuntu_18.04/i586 Package network:osmocom:nightly/libosmo-sccp failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: [ 379s] File "/usr/bin/a2x", line 22, in [ 379s] import xml.dom.minidom [ 379s] ValueError: bad marshal data (unknown type code) [ 379s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:61: recipe for target 'osmostp-usermanual.pdf' failed [ 379s] make[4]: *** [osmostp-usermanual.pdf] Error 1 [ 379s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 379s] Makefile:377: recipe for target 'all-recursive' failed [ 379s] make[3]: *** [all-recursive] Error 1 [ 379s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 379s] Makefile:500: recipe for target 'all-recursive' failed [ 379s] make[2]: *** [all-recursive] Error 1 [ 379s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 379s] Makefile:395: recipe for target 'all' failed [ 379s] make[1]: *** [all] Error 2 [ 379s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 379s] dh_auto_build: make -j1 returned exit code 2 [ 379s] debian/rules:12: recipe for target 'build' failed [ 379s] make: *** [build] Error 2 [ 379s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 379s] [ 379s] lamb18 failed "build libosmo-sccp_1.1.0.66.ee6e.dsc" at Wed Dec 4 01:57:41 UTC 2019. [ 379s] [ 379s] ### VM INTERACTION START ### [ 382s] [ 366.165911] sysrq: SysRq : Power Off [ 382s] [ 366.187777] reboot: Power down [ 382s] ### VM INTERACTION END ### [ 382s] [ 382s] lamb18 failed "build libosmo-sccp_1.1.0.66.ee6e.dsc" at Wed Dec 4 01:57:45 UTC 2019. [ 382s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 4 02:09:40 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 04 Dec 2019 02:09:40 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5de715855377d_28222aab93f7a60c3048cb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_9.0/aarch64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 265s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc' [ 265s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 265s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 265s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 265s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 265s] make[4]: Nothing to be done for 'install-exec-am'. [ 265s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/aarch64-linux-gnu/pkgconfig' [ 265s] /usr/bin/install -c -m 644 libosmo-rspro.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/aarch64-linux-gnu/pkgconfig' [ 265s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 265s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 265s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 265s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 265s] dh_install -O--fail-missing [ 265s] dh_install: usr/lib/aarch64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 265s] dh_install: usr/lib/aarch64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 265s] dh_install: missing files, aborting [ 265s] debian/rules:12: recipe for target 'binary' failed [ 265s] make: *** [binary] Error 2 [ 265s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 265s] [ 265s] obs-arm-9 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:09:23 UTC 2019. [ 265s] [ 265s] ### VM INTERACTION START ### [ 268s] [ 256.937499] sysrq: Power Off [ 268s] [ 256.941201] reboot: Power down [ 269s] ### VM INTERACTION END ### [ 269s] [ 269s] obs-arm-9 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:09:27 UTC 2019. [ 269s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 4 02:09:57 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 04 Dec 2019 02:09:57 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5de71586c78c7_28222aab93f7a60c304984@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/xUbuntu_18.04/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 264s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 264s] dh_install -O--fail-missing [ 264s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 264s] dh_install: This feature will be removed in compat 12. [ 264s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 264s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 264s] dh_missing: missing files, aborting [ 264s] The following debhelper tools have reported what they installed (with files per package) [ 264s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 264s] If the missing files are installed by another tool, please file a bug against it. [ 264s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 264s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 264s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 264s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 264s] For a short-term work-around: Add the files to debian/not-installed [ 264s] dh_install: dh_missing --fail-missing returned exit code 2 [ 264s] debian/rules:12: recipe for target 'binary' failed [ 264s] make: *** [binary] Error 25 [ 264s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 264s] [ 264s] sheep84 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:09:36 UTC 2019. [ 264s] [ 264s] ### VM INTERACTION START ### [ 267s] [ 256.771569] sysrq: SysRq : Power Off [ 267s] [ 256.780791] reboot: Power down [ 267s] ### VM INTERACTION END ### [ 267s] [ 267s] sheep84 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:09:40 UTC 2019. [ 267s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 4 02:10:32 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 04 Dec 2019 02:10:32 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5de7159d8f352_28222aab93f7a60c30501c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/xUbuntu_18.10/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 318s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 318s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 318s] dh_install -O--fail-missing [ 318s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 318s] dh_install: This feature will be removed in compat 12. [ 318s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 318s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 318s] dh_missing: missing files, aborting [ 318s] The following debhelper tools have reported what they installed (with files per package) [ 318s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 318s] If the missing files are installed by another tool, please file a bug against it. [ 318s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 318s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 318s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 318s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 318s] For a short-term work-around: Add the files to debian/not-installed [ 318s] dh_install: dh_missing --fail-missing returned exit code 2 [ 318s] make: *** [debian/rules:12: binary] Error 25 [ 318s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 318s] [ 318s] lamb22 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:10:26 UTC 2019. [ 318s] [ 318s] ### VM INTERACTION START ### [ 321s] [ 306.207350] sysrq: SysRq : Power Off [ 321s] [ 306.213664] reboot: Power down [ 321s] ### VM INTERACTION END ### [ 321s] [ 321s] lamb22 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:10:30 UTC 2019. [ 321s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 4 02:11:40 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 04 Dec 2019 02:11:40 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5de715f5bb67b_28222aab93f7a60c305232@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_9.0/i586 Package network:osmocom:latest/osmo-remsim failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 325s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc' [ 325s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 325s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 325s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 325s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 325s] make[4]: Nothing to be done for 'install-exec-am'. [ 325s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/i386-linux-gnu/pkgconfig' [ 325s] /usr/bin/install -c -m 644 libosmo-rspro.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/i386-linux-gnu/pkgconfig' [ 325s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 325s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 325s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 325s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 325s] dh_install -O--fail-missing [ 325s] dh_install: usr/lib/i386-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 325s] dh_install: usr/lib/i386-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 325s] dh_install: missing files, aborting [ 325s] debian/rules:12: recipe for target 'binary' failed [ 325s] make: *** [binary] Error 2 [ 325s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 325s] [ 325s] lamb20 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:11:27 UTC 2019. [ 325s] [ 325s] ### VM INTERACTION START ### [ 328s] [ 313.904178] sysrq: SysRq : Power Off [ 328s] [ 313.910884] reboot: Power down [ 328s] ### VM INTERACTION END ### [ 328s] [ 328s] lamb20 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:11:30 UTC 2019. [ 328s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 4 02:11:40 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 04 Dec 2019 02:11:40 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5de715f613ab6_28222aab93f7a60c305323@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/xUbuntu_18.10/i586 Package network:osmocom:latest/osmo-remsim failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 345s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 345s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 345s] dh_install -O--fail-missing [ 346s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 346s] dh_install: This feature will be removed in compat 12. [ 346s] dh_missing: usr/lib/i386-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 346s] dh_missing: usr/lib/i386-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 346s] dh_missing: missing files, aborting [ 346s] The following debhelper tools have reported what they installed (with files per package) [ 346s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 346s] If the missing files are installed by another tool, please file a bug against it. [ 346s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 346s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 346s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 346s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 346s] For a short-term work-around: Add the files to debian/not-installed [ 346s] dh_install: dh_missing --fail-missing returned exit code 2 [ 346s] make: *** [debian/rules:12: binary] Error 25 [ 346s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 346s] [ 346s] build36 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:11:26 UTC 2019. [ 346s] [ 346s] ### VM INTERACTION START ### [ 349s] [ 332.075299] sysrq: SysRq : Power Off [ 349s] [ 332.086027] reboot: Power down [ 349s] ### VM INTERACTION END ### [ 349s] [ 349s] build36 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:11:30 UTC 2019. [ 349s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 4 02:11:40 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 04 Dec 2019 02:11:40 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5de715f66cb35_28222aab93f7a60c30542b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/xUbuntu_19.10/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 370s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 370s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 370s] dh_install -O--fail-missing [ 370s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 370s] dh_install: This feature will be removed in compat 12. [ 370s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 370s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 370s] dh_missing: missing files, aborting [ 370s] The following debhelper tools have reported what they installed (with files per package) [ 370s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 370s] If the missing files are installed by another tool, please file a bug against it. [ 370s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 370s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 370s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 370s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 370s] For a short-term work-around: Add the files to debian/not-installed [ 370s] dh_install: dh_missing --fail-missing returned exit code 255 [ 370s] make: *** [debian/rules:12: binary] Error 255 [ 370s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 370s] [ 370s] lamb23 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:11:29 UTC 2019. [ 370s] [ 370s] ### VM INTERACTION START ### [ 373s] [ 357.137446] sysrq: SysRq : Power Off [ 373s] [ 357.144752] reboot: Power down [ 373s] ### VM INTERACTION END ### [ 373s] [ 373s] lamb23 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:11:32 UTC 2019. [ 373s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 4 02:11:40 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 04 Dec 2019 02:11:40 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5de715f6b6e85_28222aab93f7a60c3055c2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_9.0/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 314s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc' [ 314s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 314s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 314s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 314s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 314s] make[4]: Nothing to be done for 'install-exec-am'. [ 314s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' [ 314s] /usr/bin/install -c -m 644 libosmo-rspro.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' [ 314s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 314s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 314s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 314s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 314s] dh_install -O--fail-missing [ 314s] dh_install: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 314s] dh_install: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 314s] dh_install: missing files, aborting [ 314s] debian/rules:12: recipe for target 'binary' failed [ 314s] make: *** [binary] Error 2 [ 314s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 314s] [ 314s] lamb20 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:11:30 UTC 2019. [ 314s] [ 314s] ### VM INTERACTION START ### [ 318s] [ 302.389461] sysrq: SysRq : Power Off [ 318s] [ 302.394669] reboot: Power down [ 318s] ### VM INTERACTION END ### [ 318s] [ 318s] lamb20 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:11:34 UTC 2019. [ 318s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 4 02:11:57 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 04 Dec 2019 02:11:57 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5de715f76f28c_28222aab93f7a60c30566f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/xUbuntu_18.04/i586 Package network:osmocom:latest/osmo-remsim failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 354s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 354s] dh_install -O--fail-missing [ 354s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 354s] dh_install: This feature will be removed in compat 12. [ 354s] dh_missing: usr/lib/i386-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 354s] dh_missing: usr/lib/i386-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 354s] dh_missing: missing files, aborting [ 354s] The following debhelper tools have reported what they installed (with files per package) [ 354s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 354s] If the missing files are installed by another tool, please file a bug against it. [ 354s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 354s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 354s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 354s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 354s] For a short-term work-around: Add the files to debian/not-installed [ 354s] dh_install: dh_missing --fail-missing returned exit code 2 [ 354s] debian/rules:12: recipe for target 'binary' failed [ 354s] make: *** [binary] Error 25 [ 354s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 354s] [ 354s] lamb52 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:11:41 UTC 2019. [ 354s] [ 354s] ### VM INTERACTION START ### [ 358s] [ 342.129367] sysrq: SysRq : Power Off [ 358s] [ 342.143801] reboot: Power down [ 358s] ### VM INTERACTION END ### [ 358s] [ 358s] lamb52 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:11:45 UTC 2019. [ 358s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 4 02:12:32 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 04 Dec 2019 02:12:32 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5de71611f396c_28222aab93f7a60c3057ab@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_10/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 386s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 386s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 386s] dh_install -O--fail-missing [ 387s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 387s] dh_install: This feature will be removed in compat 12. [ 387s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 387s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 387s] dh_missing: missing files, aborting [ 387s] The following debhelper tools have reported what they installed (with files per package) [ 387s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 387s] If the missing files are installed by another tool, please file a bug against it. [ 387s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 387s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 387s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 387s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 387s] For a short-term work-around: Add the files to debian/not-installed [ 387s] dh_install: dh_missing --fail-missing returned exit code 2 [ 387s] make: *** [debian/rules:12: binary] Error 25 [ 387s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 387s] [ 387s] lamb03 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:12:21 UTC 2019. [ 387s] [ 387s] ### VM INTERACTION START ### [ 390s] [ 371.524220] sysrq: SysRq : Power Off [ 390s] [ 371.539770] reboot: Power down [ 390s] ### VM INTERACTION END ### [ 390s] [ 390s] lamb03 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:12:25 UTC 2019. [ 390s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 4 02:12:49 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 04 Dec 2019 02:12:49 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_10/i586 In-Reply-To: References: Message-ID: <5de7163664472_28222aab93f7a60c3058a7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_10/i586 Package network:osmocom:latest/osmo-remsim failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 427s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 427s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 427s] dh_install -O--fail-missing [ 427s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 427s] dh_install: This feature will be removed in compat 12. [ 427s] dh_missing: usr/lib/i386-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 427s] dh_missing: usr/lib/i386-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 427s] dh_missing: missing files, aborting [ 427s] The following debhelper tools have reported what they installed (with files per package) [ 427s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 427s] If the missing files are installed by another tool, please file a bug against it. [ 427s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 427s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 427s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 427s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 427s] For a short-term work-around: Add the files to debian/not-installed [ 427s] dh_install: dh_missing --fail-missing returned exit code 2 [ 427s] make: *** [debian/rules:12: binary] Error 25 [ 427s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 427s] [ 427s] lamb56 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:12:44 UTC 2019. [ 427s] [ 427s] ### VM INTERACTION START ### [ 430s] [ 409.884971] sysrq: SysRq : Power Off [ 430s] [ 409.902121] reboot: Power down [ 430s] ### VM INTERACTION END ### [ 430s] [ 430s] lamb56 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:12:48 UTC 2019. [ 430s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 4 02:13:25 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 04 Dec 2019 02:13:25 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5de71650728da_28222aab93f7a60c3059a3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/xUbuntu_19.04/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 475s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 475s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 475s] dh_install -O--fail-missing [ 475s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 475s] dh_install: This feature will be removed in compat 12. [ 476s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 476s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 476s] dh_missing: missing files, aborting [ 476s] The following debhelper tools have reported what they installed (with files per package) [ 476s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 476s] If the missing files are installed by another tool, please file a bug against it. [ 476s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 476s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 476s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 476s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 476s] For a short-term work-around: Add the files to debian/not-installed [ 476s] dh_install: dh_missing --fail-missing returned exit code 2 [ 476s] make: *** [debian/rules:12: binary] Error 25 [ 476s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 476s] [ 476s] cloud120 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:13:18 UTC 2019. [ 476s] [ 476s] ### VM INTERACTION START ### [ 479s] [ 437.803195] sysrq: SysRq : Power Off [ 479s] [ 437.811766] reboot: Power down [ 480s] ### VM INTERACTION END ### [ 480s] [ 480s] cloud120 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:13:23 UTC 2019. [ 480s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 4 02:13:59 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 04 Dec 2019 02:13:59 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in xUbuntu_19.04/i586 In-Reply-To: References: Message-ID: <5de7166b8b4ef_28222aab93f7a60c30613d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/xUbuntu_19.04/i586 Package network:osmocom:latest/osmo-remsim failed to build in xUbuntu_19.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 440s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 440s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 440s] dh_install -O--fail-missing [ 440s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 440s] dh_install: This feature will be removed in compat 12. [ 440s] dh_missing: usr/lib/i386-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 440s] dh_missing: usr/lib/i386-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 440s] dh_missing: missing files, aborting [ 440s] The following debhelper tools have reported what they installed (with files per package) [ 440s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 440s] If the missing files are installed by another tool, please file a bug against it. [ 440s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 440s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 440s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 440s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 440s] For a short-term work-around: Add the files to debian/not-installed [ 440s] dh_install: dh_missing --fail-missing returned exit code 2 [ 440s] make: *** [debian/rules:12: binary] Error 25 [ 440s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 440s] [ 440s] cloud119 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:13:39 UTC 2019. [ 440s] [ 440s] ### VM INTERACTION START ### [ 443s] [ 404.558775] sysrq: SysRq : Power Off [ 443s] [ 404.566251] reboot: Power down [ 444s] ### VM INTERACTION END ### [ 444s] [ 444s] cloud119 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:13:43 UTC 2019. [ 444s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 4 02:15:58 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 04 Dec 2019 02:15:58 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_10/aarch64 In-Reply-To: References: Message-ID: <5de716ef5a85a_28222aab93f7a60c306438@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_10/aarch64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_10/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 640s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 640s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 640s] dh_install -O--fail-missing [ 640s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 640s] dh_install: This feature will be removed in compat 12. [ 640s] dh_missing: usr/lib/aarch64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 640s] dh_missing: usr/lib/aarch64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 640s] dh_missing: missing files, aborting [ 640s] The following debhelper tools have reported what they installed (with files per package) [ 640s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 640s] If the missing files are installed by another tool, please file a bug against it. [ 640s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 640s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 640s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 640s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 640s] For a short-term work-around: Add the files to debian/not-installed [ 640s] dh_install: dh_missing --fail-missing returned exit code 2 [ 640s] make: *** [debian/rules:12: binary] Error 25 [ 640s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 640s] [ 640s] obs-arm-1 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:15:40 UTC 2019. [ 640s] [ 640s] ### VM INTERACTION START ### [ 643s] [ 612.139392] sysrq: Power Off [ 643s] [ 612.144605] reboot: Power down [ 643s] ### VM INTERACTION END ### [ 643s] [ 643s] obs-arm-1 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:15:43 UTC 2019. [ 643s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 4 02:17:24 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 04 Dec 2019 02:17:24 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Raspbian_9.0/armv7l In-Reply-To: References: Message-ID: <5de71740adf0d_28222aab93f7a60c30698a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Raspbian_9.0/armv7l Package network:osmocom:latest/osmo-remsim failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 701s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc' [ 701s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 701s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 701s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 701s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 701s] make[4]: Nothing to be done for 'install-exec-am'. [ 701s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/arm-linux-gnueabihf/pkgconfig' [ 701s] /usr/bin/install -c -m 644 libosmo-rspro.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/arm-linux-gnueabihf/pkgconfig' [ 701s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 701s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 701s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 701s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 701s] dh_install -O--fail-missing [ 701s] dh_install: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 701s] dh_install: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 701s] dh_install: missing files, aborting [ 701s] debian/rules:12: recipe for target 'binary' failed [ 701s] make: *** [binary] Error 2 [ 701s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 702s] [ 702s] armbuild19 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:17:19 UTC 2019. [ 702s] [ 702s] ### VM INTERACTION START ### [ 705s] [ 659.639081] sysrq: SysRq : Power Off [ 705s] [ 659.641176] reboot: Power down [ 705s] ### VM INTERACTION END ### [ 705s] [ 705s] armbuild19 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:17:22 UTC 2019. [ 705s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 4 02:18:14 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 04 Dec 2019 02:18:14 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5de7177b1fa5f_28222aab93f7a60c3071fa@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Raspbian_10/armv7l Package network:osmocom:latest/osmo-remsim failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 772s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 772s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 772s] dh_install -O--fail-missing [ 772s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 772s] dh_install: This feature will be removed in compat 12. [ 773s] dh_missing: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 773s] dh_missing: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 773s] dh_missing: missing files, aborting [ 773s] The following debhelper tools have reported what they installed (with files per package) [ 773s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 773s] If the missing files are installed by another tool, please file a bug against it. [ 773s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 773s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 773s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 773s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 773s] For a short-term work-around: Add the files to debian/not-installed [ 773s] dh_install: dh_missing --fail-missing returned exit code 2 [ 773s] make: *** [debian/rules:12: binary] Error 25 [ 773s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 773s] [ 773s] armbuild18 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:17:55 UTC 2019. [ 773s] [ 773s] ### VM INTERACTION START ### [ 776s] [ 715.405017] sysrq: SysRq : Power Off [ 776s] [ 715.407305] reboot: Power down [ 776s] ### VM INTERACTION END ### [ 776s] [ 776s] armbuild18 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:17:58 UTC 2019. [ 776s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 4 02:26:14 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 04 Dec 2019 02:26:14 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5de7195c1f416_28222aab93f7a60c307727@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_9.0/armv7l Package network:osmocom:latest/osmo-remsim failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 692s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc' [ 692s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 692s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 692s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 692s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 692s] make[4]: Nothing to be done for 'install-exec-am'. [ 692s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/arm-linux-gnueabihf/pkgconfig' [ 692s] /usr/bin/install -c -m 644 libosmo-rspro.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/arm-linux-gnueabihf/pkgconfig' [ 692s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 692s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 692s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 692s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 692s] dh_install -O--fail-missing [ 692s] dh_install: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 692s] dh_install: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 692s] dh_install: missing files, aborting [ 692s] debian/rules:12: recipe for target 'binary' failed [ 692s] make: *** [binary] Error 2 [ 692s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 692s] [ 692s] obs-arm-5 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:26:07 UTC 2019. [ 692s] [ 692s] ### VM INTERACTION START ### [ 695s] [ 664.342394] sysrq: SysRq : Power Off [ 695s] [ 664.355138] reboot: Power down [ 697s] ### VM INTERACTION END ### [ 697s] [ 697s] obs-arm-5 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:26:12 UTC 2019. [ 697s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 4 02:43:23 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 04 Dec 2019 02:43:23 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_10/armv7l In-Reply-To: References: Message-ID: <5de71d5a35023_28222aab93f7a60c3103c6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_10/armv7l Package network:osmocom:latest/osmo-remsim failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 845s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 845s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 845s] dh_install -O--fail-missing [ 845s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 845s] dh_install: This feature will be removed in compat 12. [ 846s] dh_missing: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 846s] dh_missing: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 846s] dh_missing: missing files, aborting [ 846s] The following debhelper tools have reported what they installed (with files per package) [ 846s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 846s] If the missing files are installed by another tool, please file a bug against it. [ 846s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 846s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 846s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 846s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 846s] For a short-term work-around: Add the files to debian/not-installed [ 846s] dh_install: dh_missing --fail-missing returned exit code 2 [ 846s] make: *** [debian/rules:12: binary] Error 25 [ 846s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 846s] [ 846s] obs-arm-6 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:43:09 UTC 2019. [ 846s] [ 846s] ### VM INTERACTION START ### [ 849s] [ 814.760937] sysrq: SysRq : Power Off [ 849s] [ 814.764265] reboot: Power down [ 851s] ### VM INTERACTION END ### [ 851s] [ 851s] obs-arm-6 failed "build osmo-remsim_0.2.2.dsc" at Wed Dec 4 02:43:14 UTC 2019. [ 851s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Dec 4 07:23:43 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 4 Dec 2019 07:23:43 +0000 Subject: Change in osmo-hlr[master]: vty: show subscriber: change format of 'last LU seen' In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15359 ) Change subject: vty: show subscriber: change format of 'last LU seen' ...................................................................... Patch Set 14: (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/15359/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-hlr/+/15359/1//COMMIT_MSG at 2 PS1, Line 2: Author: Neels Hofmeyr First patchset lists Neels as author -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6731968f05050399f4dd43b241290186e0c59e1a Gerrit-Change-Number: 15359 Gerrit-PatchSet: 14 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Wed, 04 Dec 2019 07:23:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 09:53:29 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 4 Dec 2019 09:53:29 +0000 Subject: Change in osmo-ci[master]: Cosmetic: gerrit/master jobs: link to wiki References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16461 ) Change subject: Cosmetic: gerrit/master jobs: link to wiki ...................................................................... Cosmetic: gerrit/master jobs: link to wiki Place a link to the wiki page, that now documents all available environment variables. Related: OS#4243 Change-Id: I770360b671c64369cf6cdb4fb4222921cc6af58e --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/61/16461/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 5f4385a..308b265 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -21,6 +21,8 @@ sequential: false # most common build invocation # SYS_PTRACE is needed for ASAN (https://github.com/google/sanitizers/issues/764) + # Documentation for variables (keep in sync!): + # https://osmocom.org/projects/osmocom-servers/wiki/Jenkins_build_verification_jobs docker_run: | ARTIFACT_STORE="$HOME/jenkins_build_artifact_store" mkdir -p "$ARTIFACT_STORE" diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 0bd2de7..5b9a1da 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -19,8 +19,9 @@ combination_filter: '' sequential: false # most common build invocation - # PUBLISH=1 is for uploading manual PDFs # SYS_PTRACE is needed for ASAN (https://github.com/google/sanitizers/issues/764) + # Documentation for variables (keep in sync!): + # https://osmocom.org/projects/osmocom-servers/wiki/Jenkins_build_verification_jobs docker_run: | ARTIFACT_STORE="$HOME/jenkins_build_artifact_store" mkdir -p "$ARTIFACT_STORE" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16461 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I770360b671c64369cf6cdb4fb4222921cc6af58e Gerrit-Change-Number: 16461 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:04:45 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:04:45 +0000 Subject: Change in osmo-e1-recorder[master]: vty: don't store configurations for timeslots in mode NONE References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16462 ) Change subject: vty: don't store configurations for timeslots in mode NONE ...................................................................... vty: don't store configurations for timeslots in mode NONE This reflects what happens in libosmo-abis during 'show e1' and makes sure we don't attempt to write for more TS than exist (e.g. in the T1 case). Change-Id: Iaeac2d080ae3ddc27901cbc4be5220100e9820a8 --- M src/vty.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-recorder refs/changes/62/16462/1 diff --git a/src/vty.c b/src/vty.c index f0c8287..9dc548b 100644 --- a/src/vty.c +++ b/src/vty.c @@ -170,6 +170,9 @@ struct e1inp_ts *ts = &line->ts[i]; const char *mode_str; + if (ts->type == E1INP_TS_TYPE_NONE) + continue; + mode_str = get_value_string(e1inp_ts_type_names, ts->type); vty_out(vty, " line %u ts %u mode %s%s", -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16462 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: Iaeac2d080ae3ddc27901cbc4be5220100e9820a8 Gerrit-Change-Number: 16462 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:04:46 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:04:46 +0000 Subject: Change in osmo-e1-recorder[master]: tests: Add test_nodes.vty for VTY interface testing References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16463 ) Change subject: tests: Add test_nodes.vty for VTY interface testing ...................................................................... tests: Add test_nodes.vty for VTY interface testing Change-Id: I322e8857990f77246bcf4dbc0510f4b42527dc82 --- M tests/Makefile.am A tests/test_nodes.vty 2 files changed, 68 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-recorder refs/changes/63/16463/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 970df87..9f0552e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -7,9 +7,6 @@ $(MAKE) vty-test osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v - $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v - $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v - rm -f $(top_builddir)/sms.db $(top_builddir)/gsn_restart $(top_builddir)/gtphub_restart_count else python-tests: $(BUILT_SOURCES) echo "Not running python-based tests (determined at configure-time)" diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty new file mode 100644 index 0000000..ec52843 --- /dev/null +++ b/tests/test_nodes.vty @@ -0,0 +1,68 @@ +osmo-e1-recorder> show e1_line +E1 Line Number 0, Name , Driver dahdi +DAHDI Span 1 non-existant +E1 Line Number 1, Name , Driver dahdi +DAHDI Span 2 non-existant +osmo-e1-recorder> show e1_timeslot +E1 Timeslot 1 of Line 0 is Type RAW +E1 Timeslot 2 of Line 0 is Type RAW +E1 Timeslot 3 of Line 0 is Type RAW +E1 Timeslot 4 of Line 0 is Type RAW +E1 Timeslot 5 of Line 0 is Type RAW +E1 Timeslot 6 of Line 0 is Type RAW +E1 Timeslot 7 of Line 0 is Type RAW +E1 Timeslot 8 of Line 0 is Type RAW +E1 Timeslot 9 of Line 0 is Type RAW +E1 Timeslot 10 of Line 0 is Type RAW +E1 Timeslot 11 of Line 0 is Type RAW +E1 Timeslot 12 of Line 0 is Type RAW +E1 Timeslot 13 of Line 0 is Type RAW +E1 Timeslot 14 of Line 0 is Type RAW +E1 Timeslot 15 of Line 0 is Type RAW +E1 Timeslot 16 of Line 0 is Type RAW +E1 Timeslot 17 of Line 0 is Type RAW +E1 Timeslot 18 of Line 0 is Type RAW +E1 Timeslot 19 of Line 0 is Type RAW +E1 Timeslot 20 of Line 0 is Type RAW +E1 Timeslot 21 of Line 0 is Type RAW +E1 Timeslot 22 of Line 0 is Type RAW +E1 Timeslot 23 of Line 0 is Type RAW +E1 Timeslot 1 of Line 1 is Type RAW +E1 Timeslot 2 of Line 1 is Type RAW +E1 Timeslot 3 of Line 1 is Type RAW +E1 Timeslot 4 of Line 1 is Type RAW +E1 Timeslot 5 of Line 1 is Type RAW +E1 Timeslot 6 of Line 1 is Type RAW +E1 Timeslot 7 of Line 1 is Type RAW +E1 Timeslot 8 of Line 1 is Type RAW +E1 Timeslot 9 of Line 1 is Type RAW +E1 Timeslot 10 of Line 1 is Type RAW +E1 Timeslot 11 of Line 1 is Type RAW +E1 Timeslot 12 of Line 1 is Type RAW +E1 Timeslot 13 of Line 1 is Type RAW +E1 Timeslot 14 of Line 1 is Type RAW +E1 Timeslot 15 of Line 1 is Type RAW +E1 Timeslot 16 of Line 1 is Type RAW +E1 Timeslot 17 of Line 1 is Type RAW +E1 Timeslot 18 of Line 1 is Type RAW +E1 Timeslot 19 of Line 1 is Type RAW +E1 Timeslot 20 of Line 1 is Type RAW +E1 Timeslot 21 of Line 1 is Type RAW +E1 Timeslot 22 of Line 1 is Type RAW +E1 Timeslot 23 of Line 1 is Type RAW +osmo-e1-recorder> enable +osmo-e1-recorder# configure terminal +osmo-e1-recorder(config)# list +... + e1_input + recorder +... +osmo-e1-recorder(config)# recorder +osmo-e1-recorder(config-recorder)# list +... + line <0-255> ts <1-31> mode (none|hdlc|trau|raw) + line <0-255> mirror <0-255> + no line <0-255> mirror + storage-path PATH + file-size-mb <1-9999999> +... -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16463 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I322e8857990f77246bcf4dbc0510f4b42527dc82 Gerrit-Change-Number: 16463 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:04:46 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:04:46 +0000 Subject: Change in osmo-e1-recorder[master]: vty: Make sure to save timeslot mode in lowercase (as vty expects) References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16464 ) Change subject: vty: Make sure to save timeslot mode in lowercase (as vty expects) ...................................................................... vty: Make sure to save timeslot mode in lowercase (as vty expects) Change-Id: I9b11fbe3bf85b7096a3bd5f9b67168350e66a90a --- M src/vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-recorder refs/changes/64/16464/1 diff --git a/src/vty.c b/src/vty.c index 9dc548b..689aec7 100644 --- a/src/vty.c +++ b/src/vty.c @@ -176,7 +176,7 @@ mode_str = get_value_string(e1inp_ts_type_names, ts->type); vty_out(vty, " line %u ts %u mode %s%s", - lnr, ts->num, mode_str, VTY_NEWLINE); + lnr, ts->num, osmo_str_tolower(mode_str), VTY_NEWLINE); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16464 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I9b11fbe3bf85b7096a3bd5f9b67168350e66a90a Gerrit-Change-Number: 16464 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:04:46 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:04:46 +0000 Subject: Change in osmo-e1-recorder[master]: print error message when config file cannot be opened References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16465 ) Change subject: print error message when config file cannot be opened ...................................................................... print error message when config file cannot be opened Change-Id: I52514adf853c0d2dc5114864f0713e549733786d --- M src/e1_recorder.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-recorder refs/changes/65/16465/1 diff --git a/src/e1_recorder.c b/src/e1_recorder.c index d085ca5..07fd4a6 100644 --- a/src/e1_recorder.c +++ b/src/e1_recorder.c @@ -1,5 +1,6 @@ #include #include +#include #include #include @@ -150,8 +151,11 @@ handle_options(argc, argv); rc = vty_read_config_file(g_config_file, NULL); - if (rc < 0) + if (rc < 0) { + fprintf(stderr, "Cannot parse configuration file '%s': %s\n", g_config_file, + strerror(errno)); exit(1); + } /* start telne tafte reading config for vty_get_bind_adr() */ telnet_init_dynif(rec_tall_ctx, NULL, vty_get_bind_addr(), 4444); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16465 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I52514adf853c0d2dc5114864f0713e549733786d Gerrit-Change-Number: 16465 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:05:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:05:43 +0000 Subject: Change in osmo-ci[master]: Cosmetic: gerrit/master jobs: link to wiki In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16461 ) Change subject: Cosmetic: gerrit/master jobs: link to wiki ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16461 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I770360b671c64369cf6cdb4fb4222921cc6af58e Gerrit-Change-Number: 16461 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 11:05:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:05:44 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:05:44 +0000 Subject: Change in osmo-ci[master]: Cosmetic: gerrit/master jobs: link to wiki In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16461 ) Change subject: Cosmetic: gerrit/master jobs: link to wiki ...................................................................... Cosmetic: gerrit/master jobs: link to wiki Place a link to the wiki page, that now documents all available environment variables. Related: OS#4243 Change-Id: I770360b671c64369cf6cdb4fb4222921cc6af58e --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 5f4385a..308b265 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -21,6 +21,8 @@ sequential: false # most common build invocation # SYS_PTRACE is needed for ASAN (https://github.com/google/sanitizers/issues/764) + # Documentation for variables (keep in sync!): + # https://osmocom.org/projects/osmocom-servers/wiki/Jenkins_build_verification_jobs docker_run: | ARTIFACT_STORE="$HOME/jenkins_build_artifact_store" mkdir -p "$ARTIFACT_STORE" diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 0bd2de7..5b9a1da 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -19,8 +19,9 @@ combination_filter: '' sequential: false # most common build invocation - # PUBLISH=1 is for uploading manual PDFs # SYS_PTRACE is needed for ASAN (https://github.com/google/sanitizers/issues/764) + # Documentation for variables (keep in sync!): + # https://osmocom.org/projects/osmocom-servers/wiki/Jenkins_build_verification_jobs docker_run: | ARTIFACT_STORE="$HOME/jenkins_build_artifact_store" mkdir -p "$ARTIFACT_STORE" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16461 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I770360b671c64369cf6cdb4fb4222921cc6af58e Gerrit-Change-Number: 16461 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:06:00 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:06:00 +0000 Subject: Change in osmo-ci[master]: add gerrit-verifications for osmo-e1-recorder and osmo-cbc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16458 ) Change subject: add gerrit-verifications for osmo-e1-recorder and osmo-cbc ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1df28b4e7a7cbcf9151cd57a77001d88f1875415 Gerrit-Change-Number: 16458 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 11:06:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:06:05 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:06:05 +0000 Subject: Change in osmo-ci[master]: add gerrit-verifications for osmo-e1-recorder and osmo-cbc In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16458 ) Change subject: add gerrit-verifications for osmo-e1-recorder and osmo-cbc ...................................................................... add gerrit-verifications for osmo-e1-recorder and osmo-cbc Change-Id: I1df28b4e7a7cbcf9151cd57a77001d88f1875415 --- M jobs/gerrit-verifications.yml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 308b265..ee193d6 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -206,6 +206,8 @@ - osmo-asf4-dfu - osmo-ccid-firmware - osmo-e1d + - osmo-cbc + - osmo-e1-recorder - gapk - pysim: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1df28b4e7a7cbcf9151cd57a77001d88f1875415 Gerrit-Change-Number: 16458 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:06:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:06:18 +0000 Subject: Change in libosmocore[master]: osmo-arfcn: Fix '-h' option In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16444 ) Change subject: osmo-arfcn: Fix '-h' option ...................................................................... osmo-arfcn: Fix '-h' option Change-Id: I13decca25dcdb75191c1e78058704ae8efa69b33 --- M utils/osmo-arfcn.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/utils/osmo-arfcn.c b/utils/osmo-arfcn.c index aee132c..5087842 100644 --- a/utils/osmo-arfcn.c +++ b/utils/osmo-arfcn.c @@ -100,7 +100,7 @@ char *param; enum program_mode mode = MODE_NONE; - while ((opt = getopt(argc, argv, "pa:f:ud")) != -1) { + while ((opt = getopt(argc, argv, "pa:f:udh")) != -1) { switch (opt) { case 'p': pcs = 1; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16444 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I13decca25dcdb75191c1e78058704ae8efa69b33 Gerrit-Change-Number: 16444 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:08:45 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:08:45 +0000 Subject: Change in osmo-e1-recorder[master]: tests: Add test_nodes.vty for VTY interface testing In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16463 to look at the new patch set (#2). Change subject: tests: Add test_nodes.vty for VTY interface testing ...................................................................... tests: Add test_nodes.vty for VTY interface testing Change-Id: I322e8857990f77246bcf4dbc0510f4b42527dc82 --- M tests/Makefile.am A tests/test_nodes.vty 2 files changed, 71 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-recorder refs/changes/63/16463/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16463 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I322e8857990f77246bcf4dbc0510f4b42527dc82 Gerrit-Change-Number: 16463 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:09:28 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:09:28 +0000 Subject: Change in osmo-e1-recorder[master]: vty: don't store configurations for timeslots in mode NONE In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16462 ) Change subject: vty: don't store configurations for timeslots in mode NONE ...................................................................... Patch Set 1: Verified+1 Code-Review+2 this will not verify as it is part of a series of patches that make build verification pass for the first time. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16462 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: Iaeac2d080ae3ddc27901cbc4be5220100e9820a8 Gerrit-Change-Number: 16462 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 11:09:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:09:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:09:39 +0000 Subject: Change in osmo-e1-recorder[master]: tests: Add test_nodes.vty for VTY interface testing In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16463 ) Change subject: tests: Add test_nodes.vty for VTY interface testing ...................................................................... Patch Set 2: Verified+1 Code-Review+2 this will not verify as it is part of a series of patches that make build verification pass for the first time. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16463 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I322e8857990f77246bcf4dbc0510f4b42527dc82 Gerrit-Change-Number: 16463 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 11:09:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:10:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:10:51 +0000 Subject: Change in osmo-e1-recorder[master]: vty: Make sure to save timeslot mode in lowercase (as vty expects) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16464 ) Change subject: vty: Make sure to save timeslot mode in lowercase (as vty expects) ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16464 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I9b11fbe3bf85b7096a3bd5f9b67168350e66a90a Gerrit-Change-Number: 16464 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 11:10:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:10:55 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:10:55 +0000 Subject: Change in osmo-e1-recorder[master]: tests: Add test_nodes.vty for VTY interface testing In-Reply-To: References: Message-ID: laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16463 ) Change subject: tests: Add test_nodes.vty for VTY interface testing ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16463 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I322e8857990f77246bcf4dbc0510f4b42527dc82 Gerrit-Change-Number: 16463 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:10:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:10:57 +0000 Subject: Change in osmo-e1-recorder[master]: vty: don't store configurations for timeslots in mode NONE In-Reply-To: References: Message-ID: laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16462 ) Change subject: vty: don't store configurations for timeslots in mode NONE ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16462 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: Iaeac2d080ae3ddc27901cbc4be5220100e9820a8 Gerrit-Change-Number: 16462 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:10:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:10:59 +0000 Subject: Change in osmo-e1-recorder[master]: vty: don't store configurations for timeslots in mode NONE In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16462 ) Change subject: vty: don't store configurations for timeslots in mode NONE ...................................................................... vty: don't store configurations for timeslots in mode NONE This reflects what happens in libosmo-abis during 'show e1' and makes sure we don't attempt to write for more TS than exist (e.g. in the T1 case). Change-Id: Iaeac2d080ae3ddc27901cbc4be5220100e9820a8 --- M src/vty.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/src/vty.c b/src/vty.c index f0c8287..9dc548b 100644 --- a/src/vty.c +++ b/src/vty.c @@ -170,6 +170,9 @@ struct e1inp_ts *ts = &line->ts[i]; const char *mode_str; + if (ts->type == E1INP_TS_TYPE_NONE) + continue; + mode_str = get_value_string(e1inp_ts_type_names, ts->type); vty_out(vty, " line %u ts %u mode %s%s", -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16462 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: Iaeac2d080ae3ddc27901cbc4be5220100e9820a8 Gerrit-Change-Number: 16462 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:11:00 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:11:00 +0000 Subject: Change in osmo-e1-recorder[master]: tests: Add test_nodes.vty for VTY interface testing In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16463 ) Change subject: tests: Add test_nodes.vty for VTY interface testing ...................................................................... tests: Add test_nodes.vty for VTY interface testing Change-Id: I322e8857990f77246bcf4dbc0510f4b42527dc82 --- M tests/Makefile.am A tests/test_nodes.vty 2 files changed, 71 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/tests/Makefile.am b/tests/Makefile.am index 970df87..b55b605 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,14 +2,14 @@ atconfig \ $(NULL) +EXTRA_DIST = \ + test_nodes.vty + if ENABLE_EXT_TESTS python-tests: $(BUILT_SOURCES) $(MAKE) vty-test osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v - $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v - $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v - rm -f $(top_builddir)/sms.db $(top_builddir)/gsn_restart $(top_builddir)/gtphub_restart_count else python-tests: $(BUILT_SOURCES) echo "Not running python-based tests (determined at configure-time)" diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty new file mode 100644 index 0000000..ec52843 --- /dev/null +++ b/tests/test_nodes.vty @@ -0,0 +1,68 @@ +osmo-e1-recorder> show e1_line +E1 Line Number 0, Name , Driver dahdi +DAHDI Span 1 non-existant +E1 Line Number 1, Name , Driver dahdi +DAHDI Span 2 non-existant +osmo-e1-recorder> show e1_timeslot +E1 Timeslot 1 of Line 0 is Type RAW +E1 Timeslot 2 of Line 0 is Type RAW +E1 Timeslot 3 of Line 0 is Type RAW +E1 Timeslot 4 of Line 0 is Type RAW +E1 Timeslot 5 of Line 0 is Type RAW +E1 Timeslot 6 of Line 0 is Type RAW +E1 Timeslot 7 of Line 0 is Type RAW +E1 Timeslot 8 of Line 0 is Type RAW +E1 Timeslot 9 of Line 0 is Type RAW +E1 Timeslot 10 of Line 0 is Type RAW +E1 Timeslot 11 of Line 0 is Type RAW +E1 Timeslot 12 of Line 0 is Type RAW +E1 Timeslot 13 of Line 0 is Type RAW +E1 Timeslot 14 of Line 0 is Type RAW +E1 Timeslot 15 of Line 0 is Type RAW +E1 Timeslot 16 of Line 0 is Type RAW +E1 Timeslot 17 of Line 0 is Type RAW +E1 Timeslot 18 of Line 0 is Type RAW +E1 Timeslot 19 of Line 0 is Type RAW +E1 Timeslot 20 of Line 0 is Type RAW +E1 Timeslot 21 of Line 0 is Type RAW +E1 Timeslot 22 of Line 0 is Type RAW +E1 Timeslot 23 of Line 0 is Type RAW +E1 Timeslot 1 of Line 1 is Type RAW +E1 Timeslot 2 of Line 1 is Type RAW +E1 Timeslot 3 of Line 1 is Type RAW +E1 Timeslot 4 of Line 1 is Type RAW +E1 Timeslot 5 of Line 1 is Type RAW +E1 Timeslot 6 of Line 1 is Type RAW +E1 Timeslot 7 of Line 1 is Type RAW +E1 Timeslot 8 of Line 1 is Type RAW +E1 Timeslot 9 of Line 1 is Type RAW +E1 Timeslot 10 of Line 1 is Type RAW +E1 Timeslot 11 of Line 1 is Type RAW +E1 Timeslot 12 of Line 1 is Type RAW +E1 Timeslot 13 of Line 1 is Type RAW +E1 Timeslot 14 of Line 1 is Type RAW +E1 Timeslot 15 of Line 1 is Type RAW +E1 Timeslot 16 of Line 1 is Type RAW +E1 Timeslot 17 of Line 1 is Type RAW +E1 Timeslot 18 of Line 1 is Type RAW +E1 Timeslot 19 of Line 1 is Type RAW +E1 Timeslot 20 of Line 1 is Type RAW +E1 Timeslot 21 of Line 1 is Type RAW +E1 Timeslot 22 of Line 1 is Type RAW +E1 Timeslot 23 of Line 1 is Type RAW +osmo-e1-recorder> enable +osmo-e1-recorder# configure terminal +osmo-e1-recorder(config)# list +... + e1_input + recorder +... +osmo-e1-recorder(config)# recorder +osmo-e1-recorder(config-recorder)# list +... + line <0-255> ts <1-31> mode (none|hdlc|trau|raw) + line <0-255> mirror <0-255> + no line <0-255> mirror + storage-path PATH + file-size-mb <1-9999999> +... -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16463 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I322e8857990f77246bcf4dbc0510f4b42527dc82 Gerrit-Change-Number: 16463 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:11:00 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:11:00 +0000 Subject: Change in osmo-e1-recorder[master]: vty: Make sure to save timeslot mode in lowercase (as vty expects) In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16464 ) Change subject: vty: Make sure to save timeslot mode in lowercase (as vty expects) ...................................................................... vty: Make sure to save timeslot mode in lowercase (as vty expects) Change-Id: I9b11fbe3bf85b7096a3bd5f9b67168350e66a90a --- M src/vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/vty.c b/src/vty.c index 9dc548b..689aec7 100644 --- a/src/vty.c +++ b/src/vty.c @@ -176,7 +176,7 @@ mode_str = get_value_string(e1inp_ts_type_names, ts->type); vty_out(vty, " line %u ts %u mode %s%s", - lnr, ts->num, mode_str, VTY_NEWLINE); + lnr, ts->num, osmo_str_tolower(mode_str), VTY_NEWLINE); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16464 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I9b11fbe3bf85b7096a3bd5f9b67168350e66a90a Gerrit-Change-Number: 16464 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:18:49 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 11:18:49 +0000 Subject: Change in libosmocore[master]: utils: exit(2) on unsupported positional arguments on command line In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16445 ) Change subject: utils: exit(2) on unsupported positional arguments on command line ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16445 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icc76cae2225ec4e664b950176dd861fa15712f59 Gerrit-Change-Number: 16445 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 11:18:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:19:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:19:07 +0000 Subject: Change in osmo-cbc[master]: jenkins.sh: We cannot build libosmo-netif without libosmo-abis References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/16466 ) Change subject: jenkins.sh: We cannot build libosmo-netif without libosmo-abis ...................................................................... jenkins.sh: We cannot build libosmo-netif without libosmo-abis =============================== libosmo-netif =============================== ... configure: error: Package requirements (libosmoabis >= 0.6.0) were not met: ... Also, we don't need to build doxygen documentation for libosmo-netif Change-Id: Id24884b5242f0bb7ef3df3b7adc7d97ab8c0c64f --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/66/16466/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 0f7a5f9..e9b976b 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -30,7 +30,8 @@ export PATH="$inst/bin:$PATH" osmo-build-dep.sh libosmocore "" --disable-doxygen -osmo-build-dep.sh libosmo-netif +osmo-build-dep.sh libosmo-abis +osmo-build-dep.sh libosmo-netif "" --disable-doxygen # Additional configure options and depends CONFIG="" -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/16466 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Id24884b5242f0bb7ef3df3b7adc7d97ab8c0c64f Gerrit-Change-Number: 16466 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:19:46 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 11:19:46 +0000 Subject: Change in osmo-trx[master]: trx: exit() on unsupported positional arguments on command line In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16446 ) Change subject: trx: exit() on unsupported positional arguments on command line ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ifeea65a359e9ca307efb2c721fd0fb6f0959e976 Gerrit-Change-Number: 16446 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 11:19:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:20:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:20:47 +0000 Subject: Change in libosmocore[master]: utils: exit(2) on unsupported positional arguments on command line In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16445 ) Change subject: utils: exit(2) on unsupported positional arguments on command line ...................................................................... utils: exit(2) on unsupported positional arguments on command line Change-Id: Icc76cae2225ec4e664b950176dd861fa15712f59 --- M utils/osmo-arfcn.c M utils/osmo-auc-gen.c 2 files changed, 10 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/utils/osmo-arfcn.c b/utils/osmo-arfcn.c index 5087842..5f138f8 100644 --- a/utils/osmo-arfcn.c +++ b/utils/osmo-arfcn.c @@ -128,6 +128,11 @@ } } + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments in command line\n"); + exit(2); + } + switch (mode) { case MODE_NONE: help(argv[0]); diff --git a/utils/osmo-auc-gen.c b/utils/osmo-auc-gen.c index ec9bad8..65cfa31 100644 --- a/utils/osmo-auc-gen.c +++ b/utils/osmo-auc-gen.c @@ -247,6 +247,11 @@ } } + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments in command line\n"); + exit(2); + } + if (!rand_is_set) { rc = osmo_get_rand_id(_rand, 16); if (rc < 0) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16445 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icc76cae2225ec4e664b950176dd861fa15712f59 Gerrit-Change-Number: 16445 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:21:05 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:21:05 +0000 Subject: Change in osmo-trx[master]: trx: exit() on unsupported positional arguments on command line In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16446 ) Change subject: trx: exit() on unsupported positional arguments on command line ...................................................................... trx: exit() on unsupported positional arguments on command line Change-Id: Ifeea65a359e9ca307efb2c721fd0fb6f0959e976 --- M Transceiver52M/osmo-trx.cpp 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index 2346488..16047a9 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -381,6 +381,11 @@ } } + if (argc > optind) { + LOG(ERROR) << "Unsupported positional arguments on command line"; + goto bad_config; + } + /* Cmd line option specific validation & setup */ if (trx->cfg.num_chans > TRX_CHAN_MAX) { -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ifeea65a359e9ca307efb2c721fd0fb6f0959e976 Gerrit-Change-Number: 16446 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:21:22 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 11:21:22 +0000 Subject: Change in osmo-bsc[master]: exit(2) on unsupported positional arguments on command line In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16447 ) Change subject: exit(2) on unsupported positional arguments on command line ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3b8781e220326387f1c437c39aff8661326f1e0a Gerrit-Change-Number: 16447 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 11:21:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:21:29 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:21:29 +0000 Subject: Change in osmo-e1-recorder[master]: exit(2) on unsupported positional arguments on command line In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16453 ) Change subject: exit(2) on unsupported positional arguments on command line ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I6d4efa6ddef41607aecd5ceee78e400db821292f Gerrit-Change-Number: 16453 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 11:21:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:21:38 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:21:38 +0000 Subject: Change in osmo-e1-recorder[master]: print error message when config file cannot be opened In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16465 ) Change subject: print error message when config file cannot be opened ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16465 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I52514adf853c0d2dc5114864f0713e549733786d Gerrit-Change-Number: 16465 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 11:21:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:21:43 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 11:21:43 +0000 Subject: Change in osmo-mgw[master]: exit(2) on unsupported positional arguments on command line In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/16448 ) Change subject: exit(2) on unsupported positional arguments on command line ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/16448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I5398edac755280d2982285802516681aa5255470 Gerrit-Change-Number: 16448 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 11:21:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:21:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:21:51 +0000 Subject: Change in osmo-e1-recorder[master]: e1_recorder: Add --help and --version command line arguments In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16451 ) Change subject: e1_recorder: Add --help and --version command line arguments ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: Ie676466e5406243cf4205948cddd95426e2b8c10 Gerrit-Change-Number: 16451 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 11:21:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:22:01 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:22:01 +0000 Subject: Change in osmo-e1-recorder[master]: e1cap_dump: Add -h and -V to print help / version of program In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16452 ) Change subject: e1cap_dump: Add -h and -V to print help / version of program ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I621c1f15e1bdb38691ae1fc50c5190ae2701eb58 Gerrit-Change-Number: 16452 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 11:22:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:22:03 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 11:22:03 +0000 Subject: Change in osmo-iuh[master]: exit(2) on unsupported positional arguments on command line In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16449 ) Change subject: exit(2) on unsupported positional arguments on command line ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16449 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Id33caf93325074f9e5b2b322ac497b1c21c3f406 Gerrit-Change-Number: 16449 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 11:22:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:22:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:22:06 +0000 Subject: Change in osmo-e1-recorder[master]: exit(2) on unsupported positional arguments on command line In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16453 ) Change subject: exit(2) on unsupported positional arguments on command line ...................................................................... exit(2) on unsupported positional arguments on command line Change-Id: I6d4efa6ddef41607aecd5ceee78e400db821292f --- M src/e1_recorder.c M src/e1cap_dump.c 2 files changed, 10 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/e1_recorder.c b/src/e1_recorder.c index 9110ccb..d085ca5 100644 --- a/src/e1_recorder.c +++ b/src/e1_recorder.c @@ -123,6 +123,11 @@ break; } } + + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } } int main(int argc, char **argv) diff --git a/src/e1cap_dump.c b/src/e1cap_dump.c index c172b55..73be84b 100644 --- a/src/e1cap_dump.c +++ b/src/e1cap_dump.c @@ -275,6 +275,11 @@ exit(2); } + if (argc > optind+1) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } + f = osmo_e1cap_open(NULL, argv[optind++]); if (!f) { fprintf(stderr, "Unable to open input file\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I6d4efa6ddef41607aecd5ceee78e400db821292f Gerrit-Change-Number: 16453 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:22:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:22:07 +0000 Subject: Change in osmo-e1-recorder[master]: print error message when config file cannot be opened In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16465 ) Change subject: print error message when config file cannot be opened ...................................................................... print error message when config file cannot be opened Change-Id: I52514adf853c0d2dc5114864f0713e549733786d --- M src/e1_recorder.c 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/e1_recorder.c b/src/e1_recorder.c index d085ca5..07fd4a6 100644 --- a/src/e1_recorder.c +++ b/src/e1_recorder.c @@ -1,5 +1,6 @@ #include #include +#include #include #include @@ -150,8 +151,11 @@ handle_options(argc, argv); rc = vty_read_config_file(g_config_file, NULL); - if (rc < 0) + if (rc < 0) { + fprintf(stderr, "Cannot parse configuration file '%s': %s\n", g_config_file, + strerror(errno)); exit(1); + } /* start telne tafte reading config for vty_get_bind_adr() */ telnet_init_dynif(rec_tall_ctx, NULL, vty_get_bind_addr(), 4444); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16465 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I52514adf853c0d2dc5114864f0713e549733786d Gerrit-Change-Number: 16465 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:22:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:22:07 +0000 Subject: Change in osmo-e1-recorder[master]: e1_recorder: Add --help and --version command line arguments In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16451 ) Change subject: e1_recorder: Add --help and --version command line arguments ...................................................................... e1_recorder: Add --help and --version command line arguments Change-Id: Ie676466e5406243cf4205948cddd95426e2b8c10 --- M src/e1_recorder.c 1 file changed, 23 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/e1_recorder.c b/src/e1_recorder.c index 07fd4a6..d77c0ff 100644 --- a/src/e1_recorder.c +++ b/src/e1_recorder.c @@ -15,6 +15,8 @@ #include "storage.h" #include "recorder.h" +#include "config.h" + static enum osmo_e1cap_capture_mode ts2cap_mode(struct e1inp_ts *ts) { switch (ts->type) { @@ -84,8 +86,8 @@ struct vty_app_info vty_info = { .name = "osmo-e1-recorder", - .version = "0", - .copyright = "(C) 2016 by Harald Welte \n", + .version = PACKAGE_VERSION, + .copyright = "(C) 2016-2019 by Harald Welte \n", }; static void *rec_tall_ctx; @@ -104,16 +106,26 @@ } } +static void print_help(void) +{ + printf( " -h --help This help\n" + " -V --version Print version of the program\n" + " -c --config FILE Specify configuration file\n" + ); +} + static void handle_options(int argc, char **argv) { while (1) { int option_index = 0, c; static const struct option long_options[] = { { "config-file", 1, 0, 'c' }, + { "help", 0, 0, 'h' }, + { "version", 0, 0, 'V' }, { 0, 0, 0, 0 } }; - c = getopt_long(argc, argv, "c:", + c = getopt_long(argc, argv, "c:hV", long_options, &option_index); if (c == -1) break; @@ -122,6 +134,14 @@ case 'c': g_config_file = optarg; break; + case 'h': + print_help(); + exit(0); + break; + case 'V': + print_version(1); + exit(0); + break; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: Ie676466e5406243cf4205948cddd95426e2b8c10 Gerrit-Change-Number: 16451 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:22:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:22:07 +0000 Subject: Change in osmo-e1-recorder[master]: e1cap_dump: Add -h and -V to print help / version of program In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16452 ) Change subject: e1cap_dump: Add -h and -V to print help / version of program ...................................................................... e1cap_dump: Add -h and -V to print help / version of program Change-Id: I621c1f15e1bdb38691ae1fc50c5190ae2701eb58 --- M src/e1cap_dump.c 1 file changed, 23 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/e1cap_dump.c b/src/e1cap_dump.c index 73be84b..68460ab 100644 --- a/src/e1cap_dump.c +++ b/src/e1cap_dump.c @@ -19,6 +19,8 @@ #include "flip_bits.h" #include "hdlc.h" +#include "config.h" + struct e1_recorder g_recorder; enum mode { @@ -201,12 +203,32 @@ return 0; } +static void print_help(void) +{ + printf( " -h Print this message\n" + " -V Print version of the program\n" + " -l LINE_NR Filter on line number\n" + " -s SLOT_NR Filter on timeslot number\n" + " -b Raw binary output mode (for piping stdout)\n" + " -S Super-Channel mode\n" + " -u SUBSLOT_NR Filter on 16k sub-slot number\n" + " -p PCAP_FILE Write LAPD PCAP file\n" + ); +}; + static int handle_options(int argc, char **argv) { int opt; - while ((opt = getopt(argc, argv, "l:s:bSu:p:")) != -1) { + while ((opt = getopt(argc, argv, "hVl:s:bSu:p:")) != -1) { switch (opt) { + case 'h': + print_help(); + exit(0); + case 'V': + printf("%s version %s\n", PACKAGE_NAME, PACKAGE_VERSION); + exit(0); + break; case 'l': /* Filter on E1 Line Number */ g_filter_line = atoi(optarg); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I621c1f15e1bdb38691ae1fc50c5190ae2701eb58 Gerrit-Change-Number: 16452 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:22:26 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 11:22:26 +0000 Subject: Change in osmo-cbc[master]: exit(2) on unsupported positional arguments on command line In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/16450 ) Change subject: exit(2) on unsupported positional arguments on command line ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/16450 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I701e6bffbfdfc98ff09b1d824e7707ef5a8b8059 Gerrit-Change-Number: 16450 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 11:22:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:22:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:22:57 +0000 Subject: Change in osmo-bsc[master]: exit(2) on unsupported positional arguments on command line In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16447 ) Change subject: exit(2) on unsupported positional arguments on command line ...................................................................... exit(2) on unsupported positional arguments on command line Change-Id: I3b8781e220326387f1c437c39aff8661326f1e0a --- M src/ipaccess/ipaccess-proxy.c M src/osmo-bsc/osmo_bsc_main.c M src/utils/bs11_config.c 3 files changed, 13 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/ipaccess/ipaccess-proxy.c b/src/ipaccess/ipaccess-proxy.c index 3d5f301..f4d620b 100644 --- a/src/ipaccess/ipaccess-proxy.c +++ b/src/ipaccess/ipaccess-proxy.c @@ -1200,6 +1200,10 @@ break; } } + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } if ((options_mask & (IPA_PROXY_OPT_LISTEN_IP | IPA_PROXY_OPT_BSC_IP)) != (IPA_PROXY_OPT_LISTEN_IP | IPA_PROXY_OPT_BSC_IP)) { printf("ERROR: You have to specify `--listen' and `--bsc' " diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index b18172c..6b14279 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -171,6 +171,11 @@ break; } } + + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } } /* Callback function for NACK on the OML NM */ diff --git a/src/utils/bs11_config.c b/src/utils/bs11_config.c index 2a2340c..7cd4203 100644 --- a/src/utils/bs11_config.c +++ b/src/utils/bs11_config.c @@ -854,6 +854,10 @@ if (optind+1 < argc) value = argv[optind+1]; } + if (optind+2 < argc) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3b8781e220326387f1c437c39aff8661326f1e0a Gerrit-Change-Number: 16447 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:23:02 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:23:02 +0000 Subject: Change in osmo-mgw[master]: exit(2) on unsupported positional arguments on command line In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/16448 ) Change subject: exit(2) on unsupported positional arguments on command line ...................................................................... exit(2) on unsupported positional arguments on command line Change-Id: I5398edac755280d2982285802516681aa5255470 --- M src/osmo-mgw/mgw_main.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo-mgw/mgw_main.c b/src/osmo-mgw/mgw_main.c index adc1751..4168e0d 100644 --- a/src/osmo-mgw/mgw_main.c +++ b/src/osmo-mgw/mgw_main.c @@ -132,6 +132,10 @@ break; }; } + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } } /* Callback function to be called when the RSIP ("Reset in Progress") mgcp -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/16448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I5398edac755280d2982285802516681aa5255470 Gerrit-Change-Number: 16448 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:23:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:23:06 +0000 Subject: Change in osmo-iuh[master]: exit(2) on unsupported positional arguments on command line In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16449 ) Change subject: exit(2) on unsupported positional arguments on command line ...................................................................... exit(2) on unsupported positional arguments on command line Change-Id: Id33caf93325074f9e5b2b322ac497b1c21c3f406 --- M src/hnbgw.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/hnbgw.c b/src/hnbgw.c index 9dc67a2..0db04af 100644 --- a/src/hnbgw.c +++ b/src/hnbgw.c @@ -455,6 +455,11 @@ break; } } + + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } } CTRL_CMD_DEFINE_RO(hnb_info, "info"); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16449 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Id33caf93325074f9e5b2b322ac497b1c21c3f406 Gerrit-Change-Number: 16449 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:24:26 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 11:24:26 +0000 Subject: Change in osmo-msc[master]: msc: exit(2) on unsupported positional arguments on command line In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16455 ) Change subject: msc: exit(2) on unsupported positional arguments on command line ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iad858974e9d97ae14f3da6dc21267aafafcda0ef Gerrit-Change-Number: 16455 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 11:24:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:24:36 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 11:24:36 +0000 Subject: Change in osmo-hlr[master]: hlr: exit(2) on unsupported positional arguments on command line In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16454 ) Change subject: hlr: exit(2) on unsupported positional arguments on command line ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I0c2738d380a7e79622fb3db2062c17782555e82d Gerrit-Change-Number: 16454 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 11:24:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:24:57 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 11:24:57 +0000 Subject: Change in osmo-sgsn[master]: exit(2) on unsupported positional arguments on command line In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16456 ) Change subject: exit(2) on unsupported positional arguments on command line ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16456 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4f2d70d0b0f1b7bdb8604c930aba8fbb53d8bd54 Gerrit-Change-Number: 16456 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 11:24:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:25:09 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:25:09 +0000 Subject: Change in osmo-msc[master]: msc: exit(2) on unsupported positional arguments on command line In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16455 ) Change subject: msc: exit(2) on unsupported positional arguments on command line ...................................................................... msc: exit(2) on unsupported positional arguments on command line Change-Id: Iad858974e9d97ae14f3da6dc21267aafafcda0ef --- M src/osmo-msc/msc_main.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index e7570cd..cffdaef 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -198,6 +198,11 @@ exit(-1); } } + + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } } struct gsm_network *msc_network_alloc(void *ctx, -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iad858974e9d97ae14f3da6dc21267aafafcda0ef Gerrit-Change-Number: 16455 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:25:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:25:18 +0000 Subject: Change in osmo-hlr[master]: hlr: exit(2) on unsupported positional arguments on command line In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16454 ) Change subject: hlr: exit(2) on unsupported positional arguments on command line ...................................................................... hlr: exit(2) on unsupported positional arguments on command line Change-Id: I0c2738d380a7e79622fb3db2062c17782555e82d --- M src/hlr.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/hlr.c b/src/hlr.c index a71b7e1..c3737d5 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -792,6 +792,11 @@ break; } } + + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } } static void signal_hdlr(int signal) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I0c2738d380a7e79622fb3db2062c17782555e82d Gerrit-Change-Number: 16454 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:25:23 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 11:25:23 +0000 Subject: Change in osmo-sysmon[master]: exit(2) on unsupported positional arguments on command line In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sysmon/+/16457 ) Change subject: exit(2) on unsupported positional arguments on command line ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sysmon/+/16457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-Change-Id: I32f9565c649a149638878a7283ddd8407ddff1ed Gerrit-Change-Number: 16457 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 11:25:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:25:26 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:25:26 +0000 Subject: Change in osmo-sgsn[master]: exit(2) on unsupported positional arguments on command line In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16456 ) Change subject: exit(2) on unsupported positional arguments on command line ...................................................................... exit(2) on unsupported positional arguments on command line Change-Id: I4f2d70d0b0f1b7bdb8604c930aba8fbb53d8bd54 --- M src/gbproxy/gb_proxy_main.c M src/gtphub/gtphub_main.c M src/sgsn/sgsn_main.c 3 files changed, 15 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/gbproxy/gb_proxy_main.c b/src/gbproxy/gb_proxy_main.c index 4319fda..8c83980 100644 --- a/src/gbproxy/gb_proxy_main.c +++ b/src/gbproxy/gb_proxy_main.c @@ -196,6 +196,11 @@ break; } } + + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } } int gbproxy_vty_is_config_node(struct vty *vty, int node) diff --git a/src/gtphub/gtphub_main.c b/src/gtphub/gtphub_main.c index f693f09..664c801 100644 --- a/src/gtphub/gtphub_main.c +++ b/src/gtphub/gtphub_main.c @@ -322,6 +322,11 @@ break; } } + + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } } int main(int argc, char **argv) diff --git a/src/sgsn/sgsn_main.c b/src/sgsn/sgsn_main.c index 7d9a851..3b18b05 100644 --- a/src/sgsn/sgsn_main.c +++ b/src/sgsn/sgsn_main.c @@ -271,6 +271,11 @@ break; } } + + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } } /* default categories */ -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16456 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4f2d70d0b0f1b7bdb8604c930aba8fbb53d8bd54 Gerrit-Change-Number: 16456 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:25:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:25:32 +0000 Subject: Change in osmo-sysmon[master]: exit(2) on unsupported positional arguments on command line In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sysmon/+/16457 ) Change subject: exit(2) on unsupported positional arguments on command line ...................................................................... exit(2) on unsupported positional arguments on command line Change-Id: I32f9565c649a149638878a7283ddd8407ddff1ed --- M src/osysmon_main.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osysmon_main.c b/src/osysmon_main.c index 07a065e..206246c 100644 --- a/src/osysmon_main.c +++ b/src/osysmon_main.c @@ -197,6 +197,11 @@ break; } } + + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } } static struct osmo_timer_list print_timer; -- To view, visit https://gerrit.osmocom.org/c/osmo-sysmon/+/16457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-Change-Id: I32f9565c649a149638878a7283ddd8407ddff1ed Gerrit-Change-Number: 16457 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:25:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:25:47 +0000 Subject: =?UTF-8?Q?Change_in_osmo-remsim=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E1=2E10-35d9-dirty_=E2=86=92_0=2E2=2E2?= In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16443 ) Change subject: Bump version: 0.2.1.10-35d9-dirty ? 0.2.2 ...................................................................... Bump version: 0.2.1.10-35d9-dirty ? 0.2.2 Change-Id: I77c86455f9c36c16271bc8e7f8f3f72d682d23fd --- M debian/changelog M debian/control D debian/libosmo-rspro0.install M src/Makefile.am 4 files changed, 22 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index 5554597..0ff1dea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +osmo-remsim (0.2.2) unstable; urgency=medium + + [ Harald Welte ] + * rspro_client_fsm: Fix another memory leak + * remsim-apitool: Fix slotmap-create (integer needed, not string!) + * rspro_dec_msg: Simplify msgb ownership handling + * bankd_client_fsm: close IPA client connection before re-establishing it + * Check for osmo_fsm_register() error return value + * cosmetic: more comments; spelling fixes in comments + * bankd: send IPA CCM ID_ACK after receiving ID_ACK + + [ Joachim Steiger ] + * add contrib/remsim-apitool.py to control the REST-interface of osmo-remsim-server + + [ K?vin Redon ] + * remsim-apitool.py: pass IDs as integer + * client: fix help strings + + -- Harald Welte Tue, 03 Dec 2019 20:38:18 +0100 + osmo-remsim (0.2.1) unstable; urgency=medium * rspro_client_fsm/remsim_client: Fix double-free diff --git a/debian/control b/debian/control index c693fde..7638015 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Vcs-Git: git://git.osmocom.org/osmo-remsim Homepage: https://projects.osmocom.org/projects/osmo-remsim -Package: libosmo-rspro0 +Package: libosmo-rspro1 Section: libs Architecture: any Multi-Arch: same diff --git a/debian/libosmo-rspro0.install b/debian/libosmo-rspro0.install deleted file mode 100644 index 2b3a85d..0000000 --- a/debian/libosmo-rspro0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libosmo-rspro*.so.* diff --git a/src/Makefile.am b/src/Makefile.am index 165c3f7..fa0f732 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,7 +11,7 @@ $(PCSC_CFLAGS) $(USB_CFLAGS) $(OSMOSIM_CFLAGS) \ -I$(top_srcdir)/include/osmocom/rspro -RSPRO_LIBVERSION=0:0:0 +RSPRO_LIBVERSION=1:0:0 lib_LTLIBRARIES = libosmo-rspro.la libosmo_rspro_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(RSPRO_LIBVERSION) libosmo_rspro_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16443 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I77c86455f9c36c16271bc8e7f8f3f72d682d23fd Gerrit-Change-Number: 16443 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:26:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:26:43 +0000 Subject: Change in osmo-cbc[master]: jenkins.sh: We cannot build libosmo-netif without libosmo-abis In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/16466 ) Change subject: jenkins.sh: We cannot build libosmo-netif without libosmo-abis ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/16466 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Id24884b5242f0bb7ef3df3b7adc7d97ab8c0c64f Gerrit-Change-Number: 16466 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 11:26:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:26:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:26:48 +0000 Subject: Change in osmo-cbc[master]: jenkins.sh: We cannot build libosmo-netif without libosmo-abis In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/16466 ) Change subject: jenkins.sh: We cannot build libosmo-netif without libosmo-abis ...................................................................... jenkins.sh: We cannot build libosmo-netif without libosmo-abis =============================== libosmo-netif =============================== ... configure: error: Package requirements (libosmoabis >= 0.6.0) were not met: ... Also, we don't need to build doxygen documentation for libosmo-netif Change-Id: Id24884b5242f0bb7ef3df3b7adc7d97ab8c0c64f --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 0f7a5f9..e9b976b 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -30,7 +30,8 @@ export PATH="$inst/bin:$PATH" osmo-build-dep.sh libosmocore "" --disable-doxygen -osmo-build-dep.sh libosmo-netif +osmo-build-dep.sh libosmo-abis +osmo-build-dep.sh libosmo-netif "" --disable-doxygen # Additional configure options and depends CONFIG="" -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/16466 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Id24884b5242f0bb7ef3df3b7adc7d97ab8c0c64f Gerrit-Change-Number: 16466 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:27:17 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 11:27:17 +0000 Subject: Change in osmo-hlr[master]: test_nodes.vty: remove cruft In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16460 ) Change subject: test_nodes.vty: remove cruft ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16460 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ia11a209778b78ab02424e2abf3f9004fe97cf570 Gerrit-Change-Number: 16460 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 11:27:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:29:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:29:43 +0000 Subject: Change in osmo-cbc[master]: exit(2) on unsupported positional arguments on command line In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/16450 ) Change subject: exit(2) on unsupported positional arguments on command line ...................................................................... exit(2) on unsupported positional arguments on command line Change-Id: I701e6bffbfdfc98ff09b1d824e7707ef5a8b8059 --- M src/cbc_main.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/cbc_main.c b/src/cbc_main.c index d5d5296..d60621c 100644 --- a/src/cbc_main.c +++ b/src/cbc_main.c @@ -131,6 +131,11 @@ break; } } + + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } } static void signal_handler(int signal) -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/16450 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I701e6bffbfdfc98ff09b1d824e7707ef5a8b8059 Gerrit-Change-Number: 16450 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 11:32:17 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 11:32:17 +0000 Subject: Change in osmo-ci[master]: master-builds: add osmo-{cbc, e1d, e1-recorder} References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16467 ) Change subject: master-builds: add osmo-{cbc,e1d,e1-recorder} ...................................................................... master-builds: add osmo-{cbc,e1d,e1-recorder} Change-Id: Idfede8e9e79019b67b9aff4881d5cea97514aeba --- M jobs/master-builds.yml 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/67/16467/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 5b9a1da..55626ea 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -322,6 +322,9 @@ cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' email: gerrit-log at lists.osmocom.org laforge at gnumonks.org kredon at sysmocom.de + - osmo-e1d + - osmo-cbc + - osmo-e1-recorder - gapk - rtl-sdr: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16467 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Idfede8e9e79019b67b9aff4881d5cea97514aeba Gerrit-Change-Number: 16467 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 12:20:25 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 12:20:25 +0000 Subject: Change in osmo-bts[master]: l1sap.c: ensure ms power control loop is running In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16233 ) Change subject: l1sap.c: ensure ms power control loop is running ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/16233/3/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/16233/3/src/common/l1sap.c at 1244 PS3, Line 1244: le = &lchan->lapdm_ch.lapdm_acch; Please add here: LOGPGT(DL1P, LOGL_INFO, &g_time, "Lost SACCH block, faking meas reports and ms pwr\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4fb85754b1a69376b02da7f4b175c6e8ec9cc35c Gerrit-Change-Number: 16233 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 12:20:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 12:58:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 12:58:12 +0000 Subject: Change in osmo-e1-recorder[master]: jenkins.sh: disable 'publish' of manuals; we don't have any yet References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16468 ) Change subject: jenkins.sh: disable 'publish' of manuals; we don't have any yet ...................................................................... jenkins.sh: disable 'publish' of manuals; we don't have any yet Change-Id: Ib5fb783e4e7e5e327e474344220206f33c64a8bd --- M contrib/jenkins.sh 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-recorder refs/changes/68/16468/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 38bd1a9..b08865e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -59,9 +59,9 @@ $MAKE distcheck \ || cat-testlogs.sh -if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then - make -C "$base/doc/manuals" publish -fi +#if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then +# make -C "$base/doc/manuals" publish +#fi $MAKE maintainer-clean osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: Ib5fb783e4e7e5e327e474344220206f33c64a8bd Gerrit-Change-Number: 16468 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 12:59:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 12:59:06 +0000 Subject: Change in osmo-cbc[master]: disable 'publish' of manuals; we don't have any yet References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/16469 ) Change subject: disable 'publish' of manuals; we don't have any yet ...................................................................... disable 'publish' of manuals; we don't have any yet Change-Id: I6a90af2903ef50c1c747a3027bf6f63212810e30 --- M contrib/jenkins.sh 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/69/16469/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index e9b976b..ed73b09 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -55,8 +55,8 @@ $MAKE distcheck \ || cat-testlogs.sh -if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then - make -C "$base/doc/manuals" publish -fi +#if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then +# make -C "$base/doc/manuals" publish +#fi osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/16469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I6a90af2903ef50c1c747a3027bf6f63212810e30 Gerrit-Change-Number: 16469 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 12:59:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 12:59:59 +0000 Subject: Change in osmo-e1-recorder[master]: jenkins.sh: disable 'publish' of manuals; we don't have any yet In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16468 ) Change subject: jenkins.sh: disable 'publish' of manuals; we don't have any yet ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: Ib5fb783e4e7e5e327e474344220206f33c64a8bd Gerrit-Change-Number: 16468 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 04 Dec 2019 12:59:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 13:00:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 13:00:13 +0000 Subject: Change in osmo-e1-recorder[master]: jenkins.sh: disable 'publish' of manuals; we don't have any yet In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16468 ) Change subject: jenkins.sh: disable 'publish' of manuals; we don't have any yet ...................................................................... jenkins.sh: disable 'publish' of manuals; we don't have any yet Change-Id: Ib5fb783e4e7e5e327e474344220206f33c64a8bd --- M contrib/jenkins.sh 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 38bd1a9..b08865e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -59,9 +59,9 @@ $MAKE distcheck \ || cat-testlogs.sh -if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then - make -C "$base/doc/manuals" publish -fi +#if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then +# make -C "$base/doc/manuals" publish +#fi $MAKE maintainer-clean osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16468 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: Ib5fb783e4e7e5e327e474344220206f33c64a8bd Gerrit-Change-Number: 16468 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 13:00:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 13:00:35 +0000 Subject: Change in osmo-cbc[master]: jenkins.sh: disable 'publish' of manuals; we don't have any yet In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-cbc/+/16469 ) Change subject: jenkins.sh: disable 'publish' of manuals; we don't have any yet ...................................................................... jenkins.sh: disable 'publish' of manuals; we don't have any yet Change-Id: I6a90af2903ef50c1c747a3027bf6f63212810e30 --- M contrib/jenkins.sh 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/69/16469/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/16469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I6a90af2903ef50c1c747a3027bf6f63212810e30 Gerrit-Change-Number: 16469 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 13:00:46 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 13:00:46 +0000 Subject: Change in osmo-cbc[master]: jenkins.sh: disable 'publish' of manuals; we don't have any yet In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/16469 ) Change subject: jenkins.sh: disable 'publish' of manuals; we don't have any yet ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/16469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I6a90af2903ef50c1c747a3027bf6f63212810e30 Gerrit-Change-Number: 16469 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 04 Dec 2019 13:00:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 13:01:08 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 13:01:08 +0000 Subject: Change in osmo-cbc[master]: jenkins.sh: disable 'publish' of manuals; we don't have any yet In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/16469 ) Change subject: jenkins.sh: disable 'publish' of manuals; we don't have any yet ...................................................................... jenkins.sh: disable 'publish' of manuals; we don't have any yet Change-Id: I6a90af2903ef50c1c747a3027bf6f63212810e30 --- M contrib/jenkins.sh 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index e9b976b..ed73b09 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -55,8 +55,8 @@ $MAKE distcheck \ || cat-testlogs.sh -if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then - make -C "$base/doc/manuals" publish -fi +#if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then +# make -C "$base/doc/manuals" publish +#fi osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/16469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I6a90af2903ef50c1c747a3027bf6f63212810e30 Gerrit-Change-Number: 16469 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 13:11:42 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 13:11:42 +0000 Subject: Change in docker-playground[master]: ttcn3-bts: Mount trxcon dir so logs can be retrieved outside of docker References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16470 ) Change subject: ttcn3-bts: Mount trxcon dir so logs can be retrieved outside of docker ...................................................................... ttcn3-bts: Mount trxcon dir so logs can be retrieved outside of docker Change-Id: Icd243b62b8c80cdb2c2f09e1308f00565589c0e7 --- M ttcn3-bts-test/jenkins.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/70/16470/1 diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 194720b..4753383 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -56,6 +56,7 @@ echo Starting container with trxcon docker run --rm \ --network $NET_NAME --ip 172.18.9.22 \ + -v $VOL_BASE_DIR/trxcon:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-trxcon -d \ $REPO_USER/osmocom-bb-host-master \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Icd243b62b8c80cdb2c2f09e1308f00565589c0e7 Gerrit-Change-Number: 16470 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 13:15:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 13:15:53 +0000 Subject: Change in osmo-e1-recorder[master]: e1_recorder: Avoid deprecated osmo_init_logging() API References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16471 ) Change subject: e1_recorder: Avoid deprecated osmo_init_logging() API ...................................................................... e1_recorder: Avoid deprecated osmo_init_logging() API Change-Id: Ib0e7c90eb8049acd48d6b3cf32ec2fc2c7a2ef29 --- M src/e1_recorder.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-recorder refs/changes/71/16471/1 diff --git a/src/e1_recorder.c b/src/e1_recorder.c index d77c0ff..82558b2 100644 --- a/src/e1_recorder.c +++ b/src/e1_recorder.c @@ -157,7 +157,7 @@ rec_tall_ctx = talloc_named_const(NULL, 0, "recorder"); - osmo_init_logging(&info); + osmo_init_logging2(rec_tall_ctx, &info); vty_init(&vty_info); logging_vty_add_cmds(&info); osmo_signal_register_handler(SS_L_INPUT, inp_sig_cb, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16471 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: Ib0e7c90eb8049acd48d6b3cf32ec2fc2c7a2ef29 Gerrit-Change-Number: 16471 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 13:15:54 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 13:15:54 +0000 Subject: Change in osmo-e1-recorder[master]: e1cap_dump: Avoid deprecated osmo_init_logging() API References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16472 ) Change subject: e1cap_dump: Avoid deprecated osmo_init_logging() API ...................................................................... e1cap_dump: Avoid deprecated osmo_init_logging() API Change-Id: I7d9d88eb5615f6b323b6c36eceb4d847bae01d1d --- M src/e1cap_dump.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-recorder refs/changes/72/16472/1 diff --git a/src/e1cap_dump.c b/src/e1cap_dump.c index 68460ab..bcb4916 100644 --- a/src/e1cap_dump.c +++ b/src/e1cap_dump.c @@ -288,7 +288,7 @@ g_sc_state[i].hdlc.out_cb = handle_hdlc_frame_content; init_flip_bits(); - osmo_init_logging(&log_info); + osmo_init_logging2(NULL, &log_info); handle_options(argc, argv); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I7d9d88eb5615f6b323b6c36eceb4d847bae01d1d Gerrit-Change-Number: 16472 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 13:21:47 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 13:21:47 +0000 Subject: Change in osmo-e1-recorder[master]: e1_recorder: Avoid deprecated osmo_init_logging() API In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16471 ) Change subject: e1_recorder: Avoid deprecated osmo_init_logging() API ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16471 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: Ib0e7c90eb8049acd48d6b3cf32ec2fc2c7a2ef29 Gerrit-Change-Number: 16471 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 13:21:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 13:22:49 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 13:22:49 +0000 Subject: Change in osmo-e1-recorder[master]: e1cap_dump: Avoid deprecated osmo_init_logging() API In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16472 ) Change subject: e1cap_dump: Avoid deprecated osmo_init_logging() API ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16472/1/src/e1cap_dump.c File src/e1cap_dump.c: https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16472/1/src/e1cap_dump.c at 291 PS1, Line 291: osmo_init_logging2(NULL, &log_info); The idea is to avoid using talloc ctx NULL :) -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I7d9d88eb5615f6b323b6c36eceb4d847bae01d1d Gerrit-Change-Number: 16472 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 13:22:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 13:40:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 13:40:57 +0000 Subject: Change in libosmocore[master]: ecu_fr: Avoid using deprecated symbols References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16473 ) Change subject: ecu_fr: Avoid using deprecated symbols ...................................................................... ecu_fr: Avoid using deprecated symbols Avoid generating those annoying warnings during compilation: ecu_fr.c: In function ?ecu_fr_frame_in?: ecu_fr.c:203:2: warning: ?osmo_ecu_fr_reset? is deprecated: Use generic ECU abstraction layer instead [-Wdeprecated-declarations] 203 | osmo_ecu_fr_reset(fr, frame); | ^~~~~~~~~~~~~~~~~ ecu_fr.c:138:6: note: declared here 138 | void osmo_ecu_fr_reset(struct osmo_ecu_fr_state *state, const uint8_t *frame) | ^~~~~~~~~~~~~~~~~ ecu_fr.c: In function ?ecu_fr_frame_out?: ecu_fr.c:211:2: warning: ?osmo_ecu_fr_conceal? is deprecated: Use generic ECU abstraction layer instead [-Wdeprecated-declarations] 211 | if (osmo_ecu_fr_conceal(fr, frame_out) == 0) | ^~ ecu_fr.c:172:5: note: declared here 172 | int osmo_ecu_fr_conceal(struct osmo_ecu_fr_state *state, uint8_t *frame) | ^~~~~~~~~~~~~~~~~~~ Change-Id: Idf84c2efbd3e71f07d3801feb8c5e48a1b4a136d --- M src/codec/ecu_fr.c 1 file changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/73/16473/1 diff --git a/src/codec/ecu_fr.c b/src/codec/ecu_fr.c index 4545172..6e5aea8 100644 --- a/src/codec/ecu_fr.c +++ b/src/codec/ecu_fr.c @@ -130,11 +130,15 @@ * \param[in] state The state object for the ECU * \param[out] frame The valid frame (GSM_FR_BYTES bytes in RTP payload format) */ -void osmo_ecu_fr_reset(struct osmo_ecu_fr_state *state, const uint8_t *frame) +static void _osmo_ecu_fr_reset(struct osmo_ecu_fr_state *state, const uint8_t *frame) { state->subsequent_lost_frame = false; memcpy(state->frame_backup, frame, GSM_FR_BYTES); } +void osmo_ecu_fr_reset(struct osmo_ecu_fr_state *state, const uint8_t *frame) +{ + _osmo_ecu_fr_reset(state, frame); +} /*! * To be called when a bad frame is received. @@ -144,7 +148,7 @@ * \param[out] frame The buffer to fill with GSM_FR_BYTES of replacement frame * \returns 0 if the frame was sucessfully filled */ -int osmo_ecu_fr_conceal(struct osmo_ecu_fr_state *state, uint8_t *frame) +static int _osmo_ecu_fr_conceal(struct osmo_ecu_fr_state *state, uint8_t *frame) { int rc; @@ -164,6 +168,11 @@ return 0; } +/* legacy symbol */ +int osmo_ecu_fr_conceal(struct osmo_ecu_fr_state *state, uint8_t *frame) +{ + return _osmo_ecu_fr_conceal(state, frame); +} /*********************************************************************** * Integration with ECU core @@ -191,7 +200,7 @@ if (bfi) return 0; - osmo_ecu_fr_reset(fr, frame); + _osmo_ecu_fr_reset(fr, frame); return 0; } @@ -199,7 +208,7 @@ { struct osmo_ecu_fr_state *fr = (struct osmo_ecu_fr_state *) &st->data; - if (osmo_ecu_fr_conceal(fr, frame_out) == 0) + if (_osmo_ecu_fr_conceal(fr, frame_out) == 0) return GSM_FR_BYTES; else return -1; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16473 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idf84c2efbd3e71f07d3801feb8c5e48a1b4a136d Gerrit-Change-Number: 16473 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 13:40:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 13:40:58 +0000 Subject: Change in libosmocore[master]: gsm48_ie.c: Avoid compiler warnings about using deprecated API References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16474 ) Change subject: gsm48_ie.c: Avoid compiler warnings about using deprecated API ...................................................................... gsm48_ie.c: Avoid compiler warnings about using deprecated API We shouldn't use deprecated API even inside libosmocore. gsm48_ie.c: In function ?gsm48_decode_called?: gsm48_ie.c:411:2: warning: ?gsm48_decode_bcd_number? is deprecated: Use gsm48_decode_bcd_number2() for improved bounds checking [-Wdeprecated-declarations] 411 | gsm48_decode_bcd_number(called->number, sizeof(called->number), lv, 1); | ^~~~~~~~~~~~~~~~~~~~~~~ gsm48_ie.c:54:5: note: declared here 54 | int gsm48_decode_bcd_number(char *output, int output_len, | ^~~~~~~~~~~~~~~~~~~~~~~ gsm48_ie.c: In function ?gsm48_decode_callerid?: gsm48_ie.c:466:2: warning: ?gsm48_decode_bcd_number? is deprecated: Use gsm48_decode_bcd_number2() for improved bounds checking [-Wdeprecated-declarations] 466 | gsm48_decode_bcd_number(callerid->number, sizeof(callerid->number), lv, i); | ^~~~~~~~~~~~~~~~~~~~~~~ gsm48_ie.c:54:5: note: declared here 54 | int gsm48_decode_bcd_number(char *output, int output_len, | ^~~~~~~~~~~~~~~~~~~~~~~ Change-Id: I0e5cd06a70556e624bfed0d52405d232d8296dbc --- M src/gsm/gsm48_ie.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/74/16474/1 diff --git a/src/gsm/gsm48_ie.c b/src/gsm/gsm48_ie.c index 31028ba..fd96575 100644 --- a/src/gsm/gsm48_ie.c +++ b/src/gsm/gsm48_ie.c @@ -408,7 +408,7 @@ called->type = (lv[1] & 0x70) >> 4; /* octet 4..N */ - gsm48_decode_bcd_number(called->number, sizeof(called->number), lv, 1); + gsm48_decode_bcd_number2(called->number, sizeof(called->number), lv, in_len+1, 1); return 0; } @@ -463,7 +463,7 @@ } /* octet 4..N */ - gsm48_decode_bcd_number(callerid->number, sizeof(callerid->number), lv, i); + gsm48_decode_bcd_number2(callerid->number, sizeof(callerid->number), lv, in_len+1, i); return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0e5cd06a70556e624bfed0d52405d232d8296dbc Gerrit-Change-Number: 16474 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 13:42:39 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 13:42:39 +0000 Subject: Change in osmocom-bb[master]: trxcon: Use current MS Power on dummy meas reports References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16475 ) Change subject: trxcon: Use current MS Power on dummy meas reports ...................................................................... trxcon: Use current MS Power on dummy meas reports backpointers are added in order to access the TRX, as advised in the existing comment. Change-Id: I975cfc5f5d63eb32a7f8932a7f6a544c9a12233c --- M src/host/trxcon/sched_prim.c M src/host/trxcon/sched_trx.c M src/host/trxcon/sched_trx.h 3 files changed, 13 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/75/16475/1 diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c index 50dfd6e..fc0f05d 100644 --- a/src/host/trxcon/sched_prim.c +++ b/src/host/trxcon/sched_prim.c @@ -171,25 +171,18 @@ /* Compose a new Measurement Report primitive */ memcpy(prim->payload, mr_src_ptr, GSM_MACBLOCK_LEN); -#if 0 /** * Update the L1 SACCH pseudo-header (only for cached MRs) * - * FIXME: this would require having access to the trx_instance, - * what can be achieved either by chain-passing the pointer - * through sched_prim_dequeue(), or by adding some - * back-pointers to the logical channel state. - * * TODO: filling of the actual values into cached Measurement * Reports would break the distance spoofing feature. If it * were known whether the spoofing is enabled or not, we could * decide whether to update the cached L1 SACCH header here. */ if (!cached) { - prim->payload[0] = trx->tx_power; - prim->payload[1] = trx->ta; + prim->payload[0] = lchan->ts->trx->tx_power; + prim->payload[1] = lchan->ts->trx->ta; } -#endif /* Inform about the cache usage count */ if (cached && lchan->sacch.mr_cache_usage > 5) { diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index eb6f3dc..6bb662d 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -202,6 +202,9 @@ /* Allocate a new one */ trx->ts_list[tn] = talloc_zero(trx, struct trx_ts); + /* Add backpointer */ + trx->ts_list[tn]->trx = trx; + /* Assign TS index */ trx->ts_list[tn]->index = tn; @@ -287,6 +290,9 @@ if (!lchan) return -ENOMEM; + /* set backpointer */ + lchan->ts = ts; + /* Set channel type */ lchan->type = type; diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h index f2089e8..8718ed6 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -237,6 +237,9 @@ uint8_t key_len; uint8_t algo; } a5; + + /* TS that this lchan belongs to */ + struct trx_ts *ts; }; struct trx_ts { @@ -251,6 +254,8 @@ struct llist_head lchans; /*! \brief Queue primitives for TX */ struct llist_head tx_prims; + /* backpointer to its TRX */ + struct trx_instance *trx; }; /* Represents one TX primitive in the queue of trx_ts */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16475 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I975cfc5f5d63eb32a7f8932a7f6a544c9a12233c Gerrit-Change-Number: 16475 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 13:44:52 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 13:44:52 +0000 Subject: Change in libosmocore[master]: ecu_fr: Avoid using deprecated symbols In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16473 ) Change subject: ecu_fr: Avoid using deprecated symbols ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16473 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idf84c2efbd3e71f07d3801feb8c5e48a1b4a136d Gerrit-Change-Number: 16473 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 04 Dec 2019 13:44:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 13:45:19 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 13:45:19 +0000 Subject: Change in libosmocore[master]: gsm48_ie.c: Avoid compiler warnings about using deprecated API In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16474 ) Change subject: gsm48_ie.c: Avoid compiler warnings about using deprecated API ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0e5cd06a70556e624bfed0d52405d232d8296dbc Gerrit-Change-Number: 16474 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 04 Dec 2019 13:45:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 13:48:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 13:48:30 +0000 Subject: Change in osmo-bsc[master]: gsm_04_80: Avoid using deprecated API References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16476 ) Change subject: gsm_04_80: Avoid using deprecated API ...................................................................... gsm_04_80: Avoid using deprecated API gsm_04_80_utils.c: In function ?bsc_send_ussd_release_complete?: gsm_04_80_utils.c:37:9: warning: ?gsm0480_create_ussd_release_complete? is deprecated: Use gsm0480_create_release_complete() instead. [-Wdeprecated-declarations] 37 | struct msgb *msg = gsm0480_create_ussd_release_complete(); | ^~~~ CC gsm_data.o In file included from gsm_04_80_utils.c:22: /usr/local/include/osmocom/gsm/gsm0480.h:120:14: note: declared here 120 | struct msgb *gsm0480_create_ussd_release_complete(void) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The commit is not changing the existing logic/assumption: TID 0 should not be in use by anything else at the point the USSD is generated. Change-Id: I739158dec62cd5f0c2080fbb426af9c024baef87 --- M src/osmo-bsc/gsm_04_80_utils.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/76/16476/1 diff --git a/src/osmo-bsc/gsm_04_80_utils.c b/src/osmo-bsc/gsm_04_80_utils.c index 8de1262..5ac0226 100644 --- a/src/osmo-bsc/gsm_04_80_utils.c +++ b/src/osmo-bsc/gsm_04_80_utils.c @@ -34,7 +34,8 @@ int bsc_send_ussd_release_complete(struct gsm_subscriber_connection *conn) { - struct msgb *msg = gsm0480_create_ussd_release_complete(); + /* ugly: we obviously don't know if TID 0 is currently in user for the given subscriber... */ + struct msgb *msg = gsm0480_create_release_complete(0); if (!msg) return -1; gscon_submit_rsl_dtap(conn, msg, 0, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I739158dec62cd5f0c2080fbb426af9c024baef87 Gerrit-Change-Number: 16476 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 13:50:26 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 13:50:26 +0000 Subject: Change in osmo-bsc[master]: gsm_04_80: Avoid using deprecated API In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16476 ) Change subject: gsm_04_80: Avoid using deprecated API ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/16476/1/src/osmo-bsc/gsm_04_80_utils.c File src/osmo-bsc/gsm_04_80_utils.c: https://gerrit.osmocom.org/c/osmo-bsc/+/16476/1/src/osmo-bsc/gsm_04_80_utils.c at 37 PS1, Line 37: /* ugly: we obviously don't know if TID 0 is currently in user for the given subscriber... */ in use? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I739158dec62cd5f0c2080fbb426af9c024baef87 Gerrit-Change-Number: 16476 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-CC: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 13:50:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 13:51:30 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 13:51:30 +0000 Subject: Change in osmocom-bb[master]: trxcon: Use current MS Power on dummy meas reports In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16475 ) Change subject: trxcon: Use current MS Power on dummy meas reports ...................................................................... Patch Set 1: I tested with TTCN3 that after this patch is applied the MS power received by the BTS is the one configured through f_L1CTL_PARAM in f_TC_rsl_ms_pwr_dyn_max() (I wrote a patch to call the function when a new DL SACCH block is received with the requested MS power). -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16475 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I975cfc5f5d63eb32a7f8932a7f6a544c9a12233c Gerrit-Change-Number: 16475 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 13:51:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 14:08:27 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 14:08:27 +0000 Subject: Change in osmo-remsim[master]: bankd_main: Refactor code: bankd_srvc_remove_mapping() References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16477 ) Change subject: bankd_main: Refactor code: bankd_srvc_remove_mapping() ...................................................................... bankd_main: Refactor code: bankd_srvc_remove_mapping() Change-Id: Iceb1d015e0ea760cce2cd99bc22ae0149bdb42f1 --- M src/bankd/bankd_main.c 1 file changed, 21 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/77/16477/1 diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 9f99f83..7851a2b 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -125,6 +125,26 @@ static bool terminate = false; +/* Remove a mapping */ +static void bankd_srvc_remove_mapping(struct slot_mapping *map) +{ + struct bank_slot bs = map->bank; + + slotmap_del(g_bankd->slotmaps, map); + + /* kill/reset the respective worker, if any! */ + struct bankd_worker *worker; + pthread_mutex_lock(&g_bankd->workers_mutex); + llist_for_each_entry(worker, &g_bankd->workers, list) { + if (bs.bank_id == worker->slot.bank_id && + bs.slot_nr == worker->slot.slot_nr) { + pthread_kill(worker->thread, SIGMAPDEL); + break; + } + } + pthread_mutex_unlock(&g_bankd->workers_mutex); +} + /* handle incoming messages from server */ static int bankd_srvc_handle_rx(struct rspro_server_conn *srvc, const RsproPDU_t *pdu) { @@ -185,20 +205,8 @@ resp = rspro_gen_RemoveMappingRes(ResultCode_unknownSlotmap); } else { LOGPFSM(srvc->fi, "removing slotmap\n"); - slotmap_del(g_bankd->slotmaps, map); + bankd_srvc_remove_mapping(map); resp = rspro_gen_RemoveMappingRes(ResultCode_ok); - - /* kill/reset the respective worker, if any! */ - struct bankd_worker *worker; - pthread_mutex_lock(&g_bankd->workers_mutex); - llist_for_each_entry(worker, &g_bankd->workers, list) { - if (bs.bank_id == worker->slot.bank_id && - bs.slot_nr == worker->slot.slot_nr) { - pthread_kill(worker->thread, SIGMAPDEL); - break; - } - } - pthread_mutex_unlock(&g_bankd->workers_mutex); } } server_conn_send_rspro(srvc, resp); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16477 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Iceb1d015e0ea760cce2cd99bc22ae0149bdb42f1 Gerrit-Change-Number: 16477 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 14:08:27 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 14:08:27 +0000 Subject: Change in osmo-remsim[master]: bankd: createMapping should implicitly delete existing mappings References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16478 ) Change subject: bankd: createMapping should implicitly delete existing mappings ...................................................................... bankd: createMapping should implicitly delete existing mappings As explained in OS#4278, a remsim-bankd currently doesn't recover after a remsim-server resetart, since old mappings remain in the bankd, and the server has no chance of removing them. To avoid this problem, a createMapping now always implicitly removes any existing mapping that may exist for the given bankdSlot. Change-Id: I83e319d22896b881c0d882542842f500075aa546 Closes: OS#4278 --- M src/bankd/bankd_main.c 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/78/16478/1 diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 7851a2b..530ecf2 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -176,6 +176,18 @@ } else { rspro2bank_slot(&bs, &creq->bank); rspro2client_slot(&cs, &creq->client); + /* check if map exists */ + map = slotmap_by_bank(g_bankd->slotmaps, &bs); + if (map) { + if (client_slot_equals(&map->client, &cs)) { + LOGPFSML(srvc->fi, LOGL_ERROR, "ignoring identical slotmap\n"); + resp = rspro_gen_CreateMappingRes(ResultCode_ok); + break; + } else { + LOGPFSM(srvc->fi, "implicitly removing slotmap\n"); + bankd_srvc_remove_mapping(map); + } + } /* Add a new mapping */ map = slotmap_add(g_bankd->slotmaps, &bs, &cs); if (!map) { -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I83e319d22896b881c0d882542842f500075aa546 Gerrit-Change-Number: 16478 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 14:08:28 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 14:08:28 +0000 Subject: Change in osmo-remsim[master]: Add "--version" to all executables to print compile-time version info References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16479 ) Change subject: Add "--version" to all executables to print compile-time version info ...................................................................... Add "--version" to all executables to print compile-time version info Change-Id: I9ae504ff95beeefb9e90e02a576861351ea9e143 --- M src/bankd/bankd_main.c M src/server/remsim_server.c M src/simtrace2-remsim_client.c 3 files changed, 62 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/79/16479/1 diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 530ecf2..6a1ac5f 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -236,6 +236,7 @@ { printf( " -h --help Print this help message\n" +" -V --version Print the version of the program\n" " -i --server-host A.B.C.D remsim-server IP address (default: 127.0.0.1)\n" " -p --server-port <1-65535> remsim-server TCP port (default: 9998)\n" " -b --bank-id <1-65535> Bank Identifier of this SIM bank (default: 1)\n" @@ -256,6 +257,7 @@ int option_index = 0, c; static const struct option long_options[] = { { "help", 0, 0, 'h' }, + { "version", 0, 0, 'V' }, { "server-host", 1, 0, 'i' }, { "server-port", 1, 0, 'p' }, { "bank-id", 1, 0, 'b' }, @@ -266,7 +268,7 @@ { 0, 0, 0, 0 } }; - c = getopt_long(argc, argv, "hi:o:b:n:N:I:P:", long_options, &option_index); + c = getopt_long(argc, argv, "hVi:o:b:n:N:I:P:", long_options, &option_index); if (c == -1) break; @@ -275,6 +277,10 @@ printf_help(); exit(0); break; + case 'V': + printf("osmo-remsim-bankd version %s\n", VERSION); + exit(0); + break; case 'i': g_bankd->srvc.server_host = optarg; break; diff --git a/src/server/remsim_server.c b/src/server/remsim_server.c index 70cbedc..9d3268f 100644 --- a/src/server/remsim_server.c +++ b/src/server/remsim_server.c @@ -1,6 +1,9 @@ #include #include +#define _GNU_SOURCE +#include + #include #include @@ -25,6 +28,49 @@ talloc_report_full(g_tall_ctx, stderr); } +static void print_help() +{ + printf( " Some useful help...\n" + " -h --help This text\n" + " -V --version Print version of the program\n" + ); +} + +static void handle_options(int argc, char **argv) +{ + while (1) { + int option_index = 0, c; + static struct option long_options[] = { + { "help", 0, 0, 'h' }, + { "version", 0, 0, 'V' }, + {0, 0, 0, 0} + }; + + c = getopt_long(argc, argv, "hV", long_options, &option_index); + if (c == -1) + break; + + switch (c) { + case 'h': + print_help(); + exit(0); + break; + case 'V': + printf("osmo-resmim-server version %s\n", VERSION); + exit(0); + break; + default: + /* ignore */ + break; + } + } + + if (argc > optind) { + fprintf(stderr, "Unsupported extra positional arguments in command line\n"); + exit(2); + } +} + int main(int argc, char **argv) { void *talloc_rest_ctx; @@ -37,6 +83,8 @@ osmo_init_logging2(g_tall_ctx, &log_info); + handle_options(argc, argv); + g_rps = rspro_server_create(g_tall_ctx, "0.0.0.0", 9998); if (!g_rps) exit(1); diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index e97ed9d..69d6a04 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -696,6 +696,7 @@ "\t-c\t--client-id <0-65535>\n" "\t-n\t--client-slot <0-65535>\n" "\t-h\t--help\n" + "\t-v\t--version\n" "\t-i\t--gsmtap-ip\tA.B.C.D\n" "\t-k\t--keep-running\n" "\t-V\t--usb-vendor\tVENDOR_ID\n" @@ -716,6 +717,7 @@ { "client-id", 1, 0, 'c' }, { "client-slot", 1, 0, 'n' }, { "help", 0, 0, 'h' }, + { "version", 0, 0, 'v' }, { "gsmtap-ip", 1, 0, 'i' }, { "keep-running", 0, 0, 'k' }, { "usb-vendor", 1, 0, 'V' }, @@ -751,7 +753,7 @@ while (1) { int option_index = 0; - c = getopt_long(argc, argv, "s:p:c:n:hi:kV:P:C:I:S:A:H:a:", opts, &option_index); + c = getopt_long(argc, argv, "s:p:c:n:hvi:kV:P:C:I:S:A:H:a:", opts, &option_index); if (c == -1) break; switch (c) { @@ -771,6 +773,10 @@ print_help(); exit(0); break; + case 'v': + printf("osmo-remsim-client version %s\n", VERSION); + exit(0); + break; case 'i': gsmtap_host = optarg; break; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16479 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I9ae504ff95beeefb9e90e02a576861351ea9e143 Gerrit-Change-Number: 16479 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 14:59:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 14:59:06 +0000 Subject: Change in osmo-e1-recorder[master]: e1cap_dump: Avoid deprecated osmo_init_logging() API In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16472 ) Change subject: e1cap_dump: Avoid deprecated osmo_init_logging() API ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16472/1/src/e1cap_dump.c File src/e1cap_dump.c: https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16472/1/src/e1cap_dump.c at 291 PS1, Line 291: osmo_init_logging2(NULL, &log_info); > The idea is to avoid using talloc ctx NULL :) I kno,w but this small one-shot command line tool is not using talloc anywhere. It has no talloc contexts, nor does it have nay talloc reporting. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I7d9d88eb5615f6b323b6c36eceb4d847bae01d1d Gerrit-Change-Number: 16472 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 14:59:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 15:00:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 15:00:12 +0000 Subject: Change in osmocom-bb[master]: trxcon: Use current MS Power on dummy meas reports In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16475 ) Change subject: trxcon: Use current MS Power on dummy meas reports ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16475 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I975cfc5f5d63eb32a7f8932a7f6a544c9a12233c Gerrit-Change-Number: 16475 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 15:00:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 15:00:15 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 15:00:15 +0000 Subject: Change in osmo-e1-recorder[master]: e1cap_dump: Avoid deprecated osmo_init_logging() API In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16472 ) Change subject: e1cap_dump: Avoid deprecated osmo_init_logging() API ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I7d9d88eb5615f6b323b6c36eceb4d847bae01d1d Gerrit-Change-Number: 16472 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 15:00:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 15:00:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 15:00:51 +0000 Subject: Change in osmo-e1-recorder[master]: e1_recorder: Avoid deprecated osmo_init_logging() API In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16471 ) Change subject: e1_recorder: Avoid deprecated osmo_init_logging() API ...................................................................... e1_recorder: Avoid deprecated osmo_init_logging() API Change-Id: Ib0e7c90eb8049acd48d6b3cf32ec2fc2c7a2ef29 --- M src/e1_recorder.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/e1_recorder.c b/src/e1_recorder.c index d77c0ff..82558b2 100644 --- a/src/e1_recorder.c +++ b/src/e1_recorder.c @@ -157,7 +157,7 @@ rec_tall_ctx = talloc_named_const(NULL, 0, "recorder"); - osmo_init_logging(&info); + osmo_init_logging2(rec_tall_ctx, &info); vty_init(&vty_info); logging_vty_add_cmds(&info); osmo_signal_register_handler(SS_L_INPUT, inp_sig_cb, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16471 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: Ib0e7c90eb8049acd48d6b3cf32ec2fc2c7a2ef29 Gerrit-Change-Number: 16471 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 15:00:52 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 15:00:52 +0000 Subject: Change in osmo-e1-recorder[master]: e1cap_dump: Avoid deprecated osmo_init_logging() API In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16472 ) Change subject: e1cap_dump: Avoid deprecated osmo_init_logging() API ...................................................................... e1cap_dump: Avoid deprecated osmo_init_logging() API Change-Id: I7d9d88eb5615f6b323b6c36eceb4d847bae01d1d --- M src/e1cap_dump.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/e1cap_dump.c b/src/e1cap_dump.c index 68460ab..bcb4916 100644 --- a/src/e1cap_dump.c +++ b/src/e1cap_dump.c @@ -288,7 +288,7 @@ g_sc_state[i].hdlc.out_cb = handle_hdlc_frame_content; init_flip_bits(); - osmo_init_logging(&log_info); + osmo_init_logging2(NULL, &log_info); handle_options(argc, argv); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I7d9d88eb5615f6b323b6c36eceb4d847bae01d1d Gerrit-Change-Number: 16472 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 15:04:08 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 15:04:08 +0000 Subject: Change in osmo-remsim[master]: bankd: createMapping should implicitly delete existing mappings In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-remsim/+/16478 to look at the new patch set (#2). Change subject: bankd: createMapping should implicitly delete existing mappings ...................................................................... bankd: createMapping should implicitly delete existing mappings As explained in OS#4278, a remsim-bankd currently doesn't recover after a remsim-server resetart, since old mappings remain in the bankd, and the server has no chance of removing them. To avoid this problem, a createMapping now always implicitly removes any existing mapping that may exist for the given bankdSlot. Change-Id: I83e319d22896b881c0d882542842f500075aa546 Closes: OS#4278 --- M src/bankd/bankd_main.c 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/78/16478/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I83e319d22896b881c0d882542842f500075aa546 Gerrit-Change-Number: 16478 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 15:05:10 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 15:05:10 +0000 Subject: Change in osmo-remsim[master]: bankd_main: Refactor code: bankd_srvc_remove_mapping() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16477 ) Change subject: bankd_main: Refactor code: bankd_srvc_remove_mapping() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16477 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Iceb1d015e0ea760cce2cd99bc22ae0149bdb42f1 Gerrit-Change-Number: 16477 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 15:05:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 15:23:42 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 15:23:42 +0000 Subject: Change in osmo-remsim[master]: bankd_main: Refactor code: bankd_srvc_remove_mapping() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16477 ) Change subject: bankd_main: Refactor code: bankd_srvc_remove_mapping() ...................................................................... bankd_main: Refactor code: bankd_srvc_remove_mapping() Change-Id: Iceb1d015e0ea760cce2cd99bc22ae0149bdb42f1 --- M src/bankd/bankd_main.c 1 file changed, 21 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 9f99f83..7851a2b 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -125,6 +125,26 @@ static bool terminate = false; +/* Remove a mapping */ +static void bankd_srvc_remove_mapping(struct slot_mapping *map) +{ + struct bank_slot bs = map->bank; + + slotmap_del(g_bankd->slotmaps, map); + + /* kill/reset the respective worker, if any! */ + struct bankd_worker *worker; + pthread_mutex_lock(&g_bankd->workers_mutex); + llist_for_each_entry(worker, &g_bankd->workers, list) { + if (bs.bank_id == worker->slot.bank_id && + bs.slot_nr == worker->slot.slot_nr) { + pthread_kill(worker->thread, SIGMAPDEL); + break; + } + } + pthread_mutex_unlock(&g_bankd->workers_mutex); +} + /* handle incoming messages from server */ static int bankd_srvc_handle_rx(struct rspro_server_conn *srvc, const RsproPDU_t *pdu) { @@ -185,20 +205,8 @@ resp = rspro_gen_RemoveMappingRes(ResultCode_unknownSlotmap); } else { LOGPFSM(srvc->fi, "removing slotmap\n"); - slotmap_del(g_bankd->slotmaps, map); + bankd_srvc_remove_mapping(map); resp = rspro_gen_RemoveMappingRes(ResultCode_ok); - - /* kill/reset the respective worker, if any! */ - struct bankd_worker *worker; - pthread_mutex_lock(&g_bankd->workers_mutex); - llist_for_each_entry(worker, &g_bankd->workers, list) { - if (bs.bank_id == worker->slot.bank_id && - bs.slot_nr == worker->slot.slot_nr) { - pthread_kill(worker->thread, SIGMAPDEL); - break; - } - } - pthread_mutex_unlock(&g_bankd->workers_mutex); } } server_conn_send_rspro(srvc, resp); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16477 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Iceb1d015e0ea760cce2cd99bc22ae0149bdb42f1 Gerrit-Change-Number: 16477 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 15:28:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 15:28:48 +0000 Subject: Change in docker-playground[master]: ttcn3-bts: Mount trxcon dir so logs can be retrieved outside of docker In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16470 ) Change subject: ttcn3-bts: Mount trxcon dir so logs can be retrieved outside of docker ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Icd243b62b8c80cdb2c2f09e1308f00565589c0e7 Gerrit-Change-Number: 16470 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 15:28:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 15:30:27 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 15:30:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Update transmitted MS power as requested by BTS References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16480 ) Change subject: bts: Update transmitted MS power as requested by BTS ...................................................................... bts: Update transmitted MS power as requested by BTS New generic ms power loop algo takes into account the MS Power sent by MS over L1 SACCH Header. As a result, the test infra must now update its transmitted value according to what is requested by the BTS as if it was a real MS in order for algo to output expected results. Change-Id: I287761202093fbc1064f9868efe6f7f6155253ca --- M bts/BTS_Tests.ttcn 1 file changed, 23 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/80/16480/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 779f7c3..4ba8f55 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2016,9 +2016,11 @@ T2.start; alt { [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl { - if( not(oct2int(l1_dl.payload.data_ind.payload[0]) > (pwr_var+6))){ + /* Update sent MS power to follow what BTS requests */ + f_L1CTL_PARAM(L1CTL, g_pars.l1_pars.ms_actual_ta, oct2int(l1_dl.payload.data_ind.payload[0])); + if (oct2int(l1_dl.payload.data_ind.payload[0]) < (pwr_var + 6)) { repeat; - } + } T2.stop; } [] L1CTL.receive { repeat; } @@ -2035,9 +2037,11 @@ T4.start; alt { [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl { - if( not(oct2int(l1_dl.payload.data_ind.payload[0]) <= (pwr_var))){ + /* Update sent MS power to follow what BTS requests */ + f_L1CTL_PARAM(L1CTL, g_pars.l1_pars.ms_actual_ta, oct2int(l1_dl.payload.data_ind.payload[0])); + if (oct2int(l1_dl.payload.data_ind.payload[0]) > pwr_var) { repeat; - } + } T4.stop; setverdict(pass, "Power level in L1 decreased/increased as expected"); } @@ -2077,7 +2081,11 @@ timer T1 := 10.0; T1.start; alt { - [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl { repeat; } + [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl { + /* Update sent MS power to follow what BTS requests */ + f_L1CTL_PARAM(L1CTL, g_pars.l1_pars.ms_actual_ta, oct2int(l1_dl.payload.data_ind.payload[0])); + repeat; + } [] L1CTL.receive { repeat; } [] T1.timeout { if( oct2int(l1_dl.payload.data_ind.payload[0]) != pwr_var){ @@ -2119,7 +2127,11 @@ timer T1 := 10.0; T1.start; alt { - [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl { repeat; } + [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl { + /* Update sent MS power to follow what BTS requests */ + f_L1CTL_PARAM(L1CTL, g_pars.l1_pars.ms_actual_ta, oct2int(l1_dl.payload.data_ind.payload[0])); + repeat; + } [] L1CTL.receive { repeat; } [] T1.timeout { var int8_t rcv := oct2int(l1_dl.payload.data_ind.payload[0]); @@ -2166,7 +2178,11 @@ timer T1 := 10.0; T1.start; alt { - [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl { repeat; } + [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl { + /* Update sent MS power to follow what BTS requests */ + f_L1CTL_PARAM(L1CTL, g_pars.l1_pars.ms_actual_ta, oct2int(l1_dl.payload.data_ind.payload[0])); + repeat; + } [] L1CTL.receive { repeat; } [] T1.timeout { if( f_power_level_is_lowest_dbm(oct2int(l1_dl.payload.data_ind.payload[0])) ){ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I287761202093fbc1064f9868efe6f7f6155253ca Gerrit-Change-Number: 16480 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 15:30:44 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 15:30:44 +0000 Subject: Change in docker-playground[master]: ttcn3-bts: Mount trxcon dir so logs can be retrieved outside of docker In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16470 ) Change subject: ttcn3-bts: Mount trxcon dir so logs can be retrieved outside of docker ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Icd243b62b8c80cdb2c2f09e1308f00565589c0e7 Gerrit-Change-Number: 16470 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 15:30:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 15:30:48 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 15:30:48 +0000 Subject: Change in docker-playground[master]: ttcn3-bts: Mount trxcon dir so logs can be retrieved outside of docker In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16470 ) Change subject: ttcn3-bts: Mount trxcon dir so logs can be retrieved outside of docker ...................................................................... ttcn3-bts: Mount trxcon dir so logs can be retrieved outside of docker Change-Id: Icd243b62b8c80cdb2c2f09e1308f00565589c0e7 --- M ttcn3-bts-test/jenkins.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Verified diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 194720b..4753383 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -56,6 +56,7 @@ echo Starting container with trxcon docker run --rm \ --network $NET_NAME --ip 172.18.9.22 \ + -v $VOL_BASE_DIR/trxcon:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-trxcon -d \ $REPO_USER/osmocom-bb-host-master \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Icd243b62b8c80cdb2c2f09e1308f00565589c0e7 Gerrit-Change-Number: 16470 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 15:31:10 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 15:31:10 +0000 Subject: Change in osmo-ci[master]: master-builds: add osmo-{cbc, e1d, e1-recorder} In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16467 ) Change subject: master-builds: add osmo-{cbc,e1d,e1-recorder} ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16467 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Idfede8e9e79019b67b9aff4881d5cea97514aeba Gerrit-Change-Number: 16467 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 15:31:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 15:31:11 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 15:31:11 +0000 Subject: Change in osmo-ci[master]: master-builds: add osmo-{cbc, e1d, e1-recorder} In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16467 ) Change subject: master-builds: add osmo-{cbc,e1d,e1-recorder} ...................................................................... master-builds: add osmo-{cbc,e1d,e1-recorder} Change-Id: Idfede8e9e79019b67b9aff4881d5cea97514aeba --- M jobs/master-builds.yml 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 5b9a1da..55626ea 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -322,6 +322,9 @@ cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' email: gerrit-log at lists.osmocom.org laforge at gnumonks.org kredon at sysmocom.de + - osmo-e1d + - osmo-cbc + - osmo-e1-recorder - gapk - rtl-sdr: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16467 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Idfede8e9e79019b67b9aff4881d5cea97514aeba Gerrit-Change-Number: 16467 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 15:33:25 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 15:33:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Update transmitted MS power as requested by BTS In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16480 to look at the new patch set (#2). Change subject: bts: Update transmitted MS power as requested by BTS ...................................................................... bts: Update transmitted MS power as requested by BTS New generic ms power loop algo takes into account the MS Power sent by MS over L1 SACCH Header. As a result, the test infra must now update its transmitted value according to what is requested by the BTS as if it was a real MS in order for algo to output expected results. Requires osmocom-bb I975cfc5f5d63eb32a7f8932a7f6a544c9a12233c to have transmitted MS power values for dummy Meas Results updated as requested over L1CTL. Change-Id: I287761202093fbc1064f9868efe6f7f6155253ca --- M bts/BTS_Tests.ttcn 1 file changed, 23 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/80/16480/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I287761202093fbc1064f9868efe6f7f6155253ca Gerrit-Change-Number: 16480 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 15:40:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 15:40:37 +0000 Subject: Change in osmo-bts[master]: rach_pass_filter(): Add information about channel type References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/16481 ) Change subject: rach_pass_filter(): Add information about channel type ...................................................................... rach_pass_filter(): Add information about channel type When logging about filtering access bursts, let's indicate if this is on a CCCH, PDCH or handover related. Change-Id: I03f21f2b54cbe5aad36ac71a614d5df98867df80 --- M src/common/l1sap.c 1 file changed, 11 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/81/16481/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index e640ce9..213099d 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1337,14 +1337,15 @@ #define RACH_MIN_TOA256 -2 * 256 -static bool rach_pass_filter(struct ph_rach_ind_param *rach_ind, struct gsm_bts *bts) +static bool rach_pass_filter(struct ph_rach_ind_param *rach_ind, struct gsm_bts *bts, + const char *chan_name) { int16_t toa256 = rach_ind->acc_delay_256bits; /* Check for RACH exceeding BER threshold (ghost RACH) */ if (rach_ind->ber10k > bts->max_ber10k_rach) { - LOGPFN(DL1C, LOGL_INFO, rach_ind->fn, "Ignoring an Access Burst: " - "BER10k(%u) > BER10k_MAX(%u)\n", + LOGPFN(DL1C, LOGL_INFO, rach_ind->fn, "Ignoring an Access Burst on %s: " + "BER10k(%u) > BER10k_MAX(%u)\n", chan_name, rach_ind->ber10k, bts->max_ber10k_rach); return false; } @@ -1355,16 +1356,16 @@ * according to maximal allowed Timing Advance value. */ if (toa256 < RACH_MIN_TOA256 || toa256 > bts->max_ta * 256) { - LOGPFN(DL1C, LOGL_INFO, rach_ind->fn, "Ignoring an Access Burst: " - "ToA(%d) exceeds the allowed range (%d..%d)\n", + LOGPFN(DL1C, LOGL_INFO, rach_ind->fn, "Ignoring an Access Burst on %s: " + "ToA(%d) exceeds the allowed range (%d..%d)\n", chan_name, toa256, RACH_MIN_TOA256, bts->max_ta * 256); return false; } /* Link quality defined by C/I (Carrier-to-Interference ratio) */ if (rach_ind->lqual_cb < bts->min_qual_rach) { - LOGPFN(DL1C, LOGL_INFO, rach_ind->fn, "Ignoring an Access Burst: " - "link quality (%d) below the minimum (%d)\n", + LOGPFN(DL1C, LOGL_INFO, rach_ind->fn, "Ignoring an Access Burst on %s: " + "link quality (%d) below the minimum (%d)\n", chan_name, rach_ind->lqual_cb, bts->min_qual_rach); return false; } @@ -1376,7 +1377,7 @@ static int l1sap_handover_rach(struct gsm_bts_trx *trx, struct ph_rach_ind_param *rach_ind) { /* Filter out noise / interference / ghosts */ - if (!rach_pass_filter(rach_ind, trx->bts)) { + if (!rach_pass_filter(rach_ind, trx->bts, "handover")) { rate_ctr_inc2(trx->bts->ctrs, BTS_CTR_RACH_DROP); return 0; } @@ -1392,7 +1393,7 @@ static int l1sap_pdch_rach(struct gsm_bts_trx *trx, struct ph_rach_ind_param *rach_ind) { /* Filter out noise / interference / ghosts */ - if (!rach_pass_filter(rach_ind, trx->bts)) + if (!rach_pass_filter(rach_ind, trx->bts, "PDCH")) return -EAGAIN; /* PTCCH/U (Packet Timing Advance Control Channel) */ @@ -1444,7 +1445,7 @@ bts->load.rach.busy++; /* Filter out noise / interference / ghosts */ - if (!rach_pass_filter(rach_ind, bts)) { + if (!rach_pass_filter(rach_ind, bts, "CCCH")) { rate_ctr_inc2(trx->bts->ctrs, BTS_CTR_RACH_DROP); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I03f21f2b54cbe5aad36ac71a614d5df98867df80 Gerrit-Change-Number: 16481 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 15:43:14 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 15:43:14 +0000 Subject: Change in osmo-bts[master]: rach_pass_filter(): Add information about channel type In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16481 ) Change subject: rach_pass_filter(): Add information about channel type ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I03f21f2b54cbe5aad36ac71a614d5df98867df80 Gerrit-Change-Number: 16481 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 04 Dec 2019 15:43:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 16:04:29 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 16:04:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library: VTY: Allow hyphens in VTY prompt References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16482 ) Change subject: library: VTY: Allow hyphens in VTY prompt ...................................................................... library: VTY: Allow hyphens in VTY prompt Old versions of osmo-pcu print "Osmo-PCU" as VTY prompt. This commit allows supporting this kind of prompt. Change-Id: Ia5acbbe5828901726f7f15c4a99d596e94914c4b --- M library/Osmocom_VTY_Functions.ttcn 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/82/16482/1 diff --git a/library/Osmocom_VTY_Functions.ttcn b/library/Osmocom_VTY_Functions.ttcn index b61a655..a1724e9 100644 --- a/library/Osmocom_VTY_Functions.ttcn +++ b/library/Osmocom_VTY_Functions.ttcn @@ -63,9 +63,9 @@ T.start; alt { - [] pt.receive(pattern "\w+" & VTY_VIEW_SUFFIX) { }; - [] pt.receive(pattern "\w+\# ") { }; - [] pt.receive(pattern "\w+\(*\)\# ") { }; + [] pt.receive(pattern "[\w-]+" & VTY_VIEW_SUFFIX) { }; + [] pt.receive(pattern "[\w-]+\# ") { }; + [] pt.receive(pattern "[\w-]+\(*\)\# ") { }; [] pt.receive(t_vty_unknown) { testcase.stop(fail, "VTY: Unknown Command"); }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16482 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia5acbbe5828901726f7f15c4a99d596e94914c4b Gerrit-Change-Number: 16482 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 16:18:19 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 16:18:19 +0000 Subject: Change in docker-playground[master]: ttcn3-cpu: Support VTY prompt used in older versions of osmo-pcu References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16483 ) Change subject: ttcn3-cpu: Support VTY prompt used in older versions of osmo-pcu ...................................................................... ttcn3-cpu: Support VTY prompt used in older versions of osmo-pcu Change-Id: I8cec3da889623915ca46b5eb1b51bc81195accf9 --- M ttcn3-pcu-test/PCU_Tests.cfg M ttcn3-pcu-test/jenkins.sh 2 files changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/83/16483/1 diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg index 2502fd2..9520775 100644 --- a/ttcn3-pcu-test/PCU_Tests.cfg +++ b/ttcn3-pcu-test/PCU_Tests.cfg @@ -6,6 +6,7 @@ [TESTPORT_PARAMETERS] *.PCUVTY.CTRL_HOSTNAME := "172.18.13.101" +*.PCUVTY.PROMPT1 := "OsmoPCU> " [MODULE_PARAMETERS] PCU_Tests_RAW.mp_pcu_sock_path := "/data/unix/pcu_bts" @@ -17,6 +18,7 @@ nsvci := 1234, nsei := 1234 } +Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU"; [MAIN_CONTROLLER] diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index d4e8be0..4305a8d 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -13,6 +13,11 @@ mkdir $VOL_BASE_DIR/pcu-tester mkdir $VOL_BASE_DIR/pcu-tester/unix cp PCU_Tests.cfg $VOL_BASE_DIR/pcu-tester/ +# Latest release of osmo-pcu (0.7.0) has prompt "Osmo-PCU", while master uses more +# usual osmocom form "OsmoPCU". This can be removed once a new osmo-pcu version is released +if [ "$IMAGE_SUFFIX" = "latest" ]; then + sed "s/OsmoPCU/Osmo-PCU/g" -i $VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg +fi mkdir $VOL_BASE_DIR/pcu mkdir $VOL_BASE_DIR/pcu/unix -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16483 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8cec3da889623915ca46b5eb1b51bc81195accf9 Gerrit-Change-Number: 16483 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 16:33:26 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 16:33:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: TC_mo_ping_pong: Check DL block is sent and ACK it In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16409 ) Change subject: pcu: TC_mo_ping_pong: Check DL block is sent and ACK it ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icf66dd5c07690368722c586632c38fb7e770053c Gerrit-Change-Number: 16409 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 16:33:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 16:33:31 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 16:33:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: TC_mo_ping_pong: Check DL block is sent and ACK it In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16409 ) Change subject: pcu: TC_mo_ping_pong: Check DL block is sent and ACK it ...................................................................... pcu: TC_mo_ping_pong: Check DL block is sent and ACK it Function f_rx_rlcmac_dl_block_exp_data() still misses proper verification of data. Apparently the received message has 2 blocks, first with expected 10 bytes, but next one contains 18 bytes with 4 actual bytes and other bits are padding. Last DL ACK/NACK sent is not yet working correctly. osmo-pcu seems to be unable to match it against sent DL block (I think due to non-matching FN), and instead drops it and schedules after timeout an IMM ASS to try to send DL block again. Change-Id: Icf66dd5c07690368722c586632c38fb7e770053c --- M library/RLCMAC_CSN1_Types.ttcn M library/RLCMAC_Types.ttcn M pcu/PCU_Tests_RAW.ttcn 3 files changed, 55 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index 29ec07b..a2f9a92 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -643,11 +643,11 @@ } } - private const ILevel iNone := { + const ILevel iNone := { presence := '0'B, i_level := omit } - private const ChannelQualityReport c_ChQualRep_default := { + const ChannelQualityReport c_ChQualRep_default := { c_value := 0, rxqual := 0, sign_var := 0, diff --git a/library/RLCMAC_Types.ttcn b/library/RLCMAC_Types.ttcn index b0dac35..8e6942e 100644 --- a/library/RLCMAC_Types.ttcn +++ b/library/RLCMAC_Types.ttcn @@ -256,7 +256,30 @@ } } - /* Template fro uplink Data block */ + /* Send Template for Downlink ACK/NACK */ + template RlcmacUlBlock ts_RLCMAC_DL_ACK_NACK(template uint5_t tfi, AckNackDescription andesc, boolean retry := false) := { + ctrl := { + mac_hdr := { + payload_type := MAC_PT_RLCMAC_NO_OPT, + spare := '00000'B, + retry := retry + }, + payload := { + msg_type := PACKET_DL_ACK_NACK, + u := { + dl_ack_nack := { + dl_tfi := tfi, + ack_nack_desc := andesc, + chreq_desc_presence := '0'B, + chreq_desc := omit, + ch_qual_rep := c_ChQualRep_default + } + } + } + } + } + + /* Template for uplink Data block */ template RlcmacUlBlock t_RLCMAC_UL_DATA(template uint5_t tfi, template uint4_t cv, template uint7_t bsn, template LlcBlocks blocks := {}, template boolean stall := false) := { data := { diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index 4a6f54a..410dc31 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -46,6 +46,8 @@ modulepar { charstring mp_pcu_sock_path := PCU_SOCK_DEFAULT; + + float X2002 := 0.2; /* Timer -2002, IMM ASSIGN confirm delay */ } type component RAW_NS_CT { @@ -753,6 +755,19 @@ } } +private function f_rx_rlcmac_dl_block_exp_data(out RlcmacDlBlock dl_block, octetstring data) +runs on RAW_PCU_Test_CT { + var template RlcmacDlBlock dl_template := tr_RLCMAC_DATA_RRBP; + dl_template.data.blocks := ?; + /* TODO: match data correctly: { valueof(t_RLCMAC_LLCBLOCK(data)) }; */ + + f_rx_rlcmac_dl_block(dl_block); + if (not match(dl_block, dl_template)) { + setverdict(fail, "Failed to match Packet data: ", dl_block, " vs ", dl_template); + mtc.stop; + } +} + testcase TC_pcuif_suspend() runs on RAW_PCU_Test_CT { var octetstring ra_id := enc_RoutingAreaIdentification(mp_gb_cfg.cell_id.ra_id); var GprsTlli tlli := 'FFFFFFFF'O; @@ -1320,9 +1335,15 @@ var PacketDlAssign dl_tbf_ass; var RlcmacDlBlock dl_block; var PCUIF_Message pcu_msg; - var octetstring data; + var octetstring data := f_rnd_octstring(10); var boolean ok; var OCT4 tlli := '00000001'O; + var AckNackDescription ack_nack_desc; + + ack_nack_desc.final_ack := '0'B; + ack_nack_desc.starting_seq_nr := 0; + ack_nack_desc.receive_block_bitmap := '0000000000000000000000000000000000000000000000000000000000000000'B; + /* Initialize NS/BSSGP side */ f_init_bssgp(); @@ -1354,7 +1375,7 @@ BSSGP[0].receive(tr_BSSGP_UL_UD(tlli, mp_gb_cfg.cell_id)); /* Now SGSN sends some DL data, PCU will page on CCCH (PCH) */ - BSSGP[0].send(ts_BSSGP_DL_UD(tlli, f_rnd_octstring(10))); + BSSGP[0].send(ts_BSSGP_DL_UD(tlli, data)); f_pcuif_rx_pch_imm_tbf_ass(rr_imm_ass); ok := f_imm_ass_verify_dl_tbf_ass(rr_imm_ass, dl_tbf_ass); @@ -1363,7 +1384,12 @@ mtc.stop; } - /* TODO: ACK the assignment and the DL block somehow? */ + /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ + f_sleep(X2002); + f_rx_rlcmac_dl_block_exp_data(dl_block, data); + + /* ACK the DL block */ + f_tx_rlcmac_ul_block(ts_RLCMAC_DL_ACK_NACK(dl_block.data.mac_hdr.hdr_ext.tfi, ack_nack_desc)); } control { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icf66dd5c07690368722c586632c38fb7e770053c Gerrit-Change-Number: 16409 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 16:39:48 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 4 Dec 2019 16:39:48 +0000 Subject: Change in osmocom-bb[master]: trxcon: Use current MS Power on dummy meas reports In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16475 ) Change subject: trxcon: Use current MS Power on dummy meas reports ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16475 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I975cfc5f5d63eb32a7f8932a7f6a544c9a12233c Gerrit-Change-Number: 16475 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 16:39:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 17:03:44 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 4 Dec 2019 17:03:44 +0000 Subject: Change in libosmocore[master]: ecu_fr: Avoid using deprecated symbols In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16473 ) Change subject: ecu_fr: Avoid using deprecated symbols ...................................................................... Patch Set 1: Code-Review-1 TBH, I don't like this approach... adding wrapper functions to avoid deprecation warnings. I would rather go this way: https://gerrit.osmocom.org/c/libosmocore/+/14864. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16473 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idf84c2efbd3e71f07d3801feb8c5e48a1b4a136d Gerrit-Change-Number: 16473 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 17:03:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 17:06:29 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 4 Dec 2019 17:06:29 +0000 Subject: Change in libosmocore[master]: gsm48_ie.c: Avoid compiler warnings about using deprecated API In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16474 ) Change subject: gsm48_ie.c: Avoid compiler warnings about using deprecated API ...................................................................... Patch Set 1: Same here. I think it's fine to use the old gsm48_decode_bcd_number() inside libosmocore, given that this is just a wrapper around gsm48_decode_bcd_number2() nowdays. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0e5cd06a70556e624bfed0d52405d232d8296dbc Gerrit-Change-Number: 16474 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 04 Dec 2019 17:06:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 17:11:13 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 4 Dec 2019 17:11:13 +0000 Subject: Change in osmo-bsc[master]: gsm_04_80: Avoid using deprecated API In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16476 ) Change subject: gsm_04_80: Avoid using deprecated API ...................................................................... Patch Set 1: (1 comment) I am wondering why do we have SS/USSD code in OsmoBSC, given that transaction management and so on is up to OsmoMSC... Maybe we should rather get rid of this "feature"? https://gerrit.osmocom.org/c/osmo-bsc/+/16476/1/src/osmo-bsc/gsm_04_80_utils.c File src/osmo-bsc/gsm_04_80_utils.c: https://gerrit.osmocom.org/c/osmo-bsc/+/16476/1/src/osmo-bsc/gsm_04_80_utils.c at 37 PS1, Line 37: /* ugly: we obviously don't know if TID 0 is currently in user for the given subscriber... */ > in use? In case of MT USSD notification, we're sending RELEASE COMPLETE immediately after sending the notification message itself. Otherwise a connection would be kept unless the user confirms notification (pressing OK button). Thus TID for this message shall match TID of the USSD Notify message. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I739158dec62cd5f0c2080fbb426af9c024baef87 Gerrit-Change-Number: 16476 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 17:11:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 17:11:56 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 17:11:56 +0000 Subject: Change in osmo-pcu[master]: tbf_dl.cpp: Fix typo in log line References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16484 ) Change subject: tbf_dl.cpp: Fix typo in log line ...................................................................... tbf_dl.cpp: Fix typo in log line Change-Id: I9fdea4246c95897f3e72604981597db828a219a3 --- M src/tbf_dl.cpp M tests/tbf/TbfTest.err 2 files changed, 125 insertions(+), 125 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/84/16484/1 diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index 4efb5a4..e3c1ff4 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -846,7 +846,7 @@ need_poll) { if (m_dl_ack_requested) { LOGPTBFDL(this, LOGL_DEBUG, - "Scheduling Ack/Nack polling, because is was requested explicitly " + "Scheduling Ack/Nack polling, because it was requested explicitly " "(e.g. first final block sent).\n"); } else if (need_poll) { LOGPTBFDL(this, LOGL_DEBUG, diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 8ec3e80..1adc8f7 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -425,7 +425,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) need_padding 0 spb_status 0 spb 0 (BSN1 20 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Copying data unit 0 (BSN 20) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) msg block (BSN 20, CS-1): 07 00 28 0a 41 c6 c7 43 c0 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) downlink acknowledge @@ -441,7 +441,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) need_padding 0 spb_status 0 spb 0 (BSN1 21 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Copying data unit 0 (BSN 21) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) msg block (BSN 21, CS-1): 07 00 2a 4d 43 c0 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) downlink acknowledge @@ -458,7 +458,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FINISHED) need_padding 0 spb_status 0 spb 0 (BSN1 22 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FINISHED) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FINISHED) Copying data unit 0 (BSN 22) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FINISHED) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FINISHED) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FINISHED) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FINISHED) msg block (BSN 22, CS-1): 07 01 2c 4d 43 c0 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FINISHED) downlink acknowledge @@ -1435,7 +1435,7 @@ TBF(TFI=0 TLLI=0xc0123456 DIR=DL STATE=FINISHED) need_padding 0 spb_status 0 spb 0 (BSN1 2 BSN2 -1) TBF(TFI=0 TLLI=0xc0123456 DIR=DL STATE=FINISHED) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xc0123456 DIR=DL STATE=FINISHED) Copying data unit 0 (BSN 2) -TBF(TFI=0 TLLI=0xc0123456 DIR=DL STATE=FINISHED) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xc0123456 DIR=DL STATE=FINISHED) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xc0123456 DIR=DL STATE=FINISHED) Polling cannot be scheduled in this TS 7 (first control TS 4) TBF(TFI=0 TLLI=0xc0123456 DIR=DL STATE=FINISHED) msg block (BSN 2, CS-1): 07 01 04 4d 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 MSG = 07 01 04 4d 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 @@ -1709,7 +1709,7 @@ TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) need_padding 0 spb_status 0 spb 0 (BSN1 0 BSN2 -1) TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Copying data unit 0 (BSN 0) -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduled DL Acknowledgement polling on PACCH (FN=2654292, TS=7) TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) starting timer T3191 [final block (DL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduled Ack/Nack polling on FN=2654292, TS=7 @@ -2783,7 +2783,7 @@ TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) need_padding 0 spb_status 0 spb 0 (BSN1 27 BSN2 -1) TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Copying data unit 0 (BSN 27) -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Polling is already scheduled TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) msg block (BSN 27, CS-1): 07 01 36 16 35 45 54 20 33 38 4c 4c 43 20 50 41 43 4b 45 54 20 33 39 TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) appending 21 bytes @@ -3046,7 +3046,7 @@ TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) need_padding 0 spb_status 0 spb 0 (BSN1 10 BSN2 -1) TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Copying 1 RLC blocks, 1 BSNs TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Copying data unit 0 (BSN 10) -TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduled DL Acknowledgement polling on PACCH (FN=2654461, TS=7) TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) starting timer T3191 [final block (DL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduled Ack/Nack polling on FN=2654461, TS=7 @@ -3497,7 +3497,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 0 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-1): 07 00 00 16 28 2a 02 02 02 02 02 02 02 02 02 02 86 80 03 56 56 56 56 56 56 56 00 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 512 bytes @@ -3510,7 +3510,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 1 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 1, MCS-1): 07 40 00 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3520,7 +3520,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 2 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 2) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 2, MCS-1): 07 80 00 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3530,7 +3530,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 3 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 3) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 3, MCS-1): 07 c0 00 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3540,7 +3540,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 4 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 4) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 4, MCS-1): 07 00 01 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3550,7 +3550,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 5 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 5) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 5, MCS-1): 07 40 01 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3560,7 +3560,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 6 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 6) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 6, MCS-1): 07 80 01 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3570,7 +3570,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 7 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 7) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 7, MCS-1): 07 c0 01 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3580,7 +3580,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 8 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 8) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 8, MCS-1): 07 00 02 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3590,7 +3590,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 9 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 9) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 9, MCS-1): 07 40 02 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3600,7 +3600,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 10 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 10) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 10, MCS-1): 07 80 02 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3610,7 +3610,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 11 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 11) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 11, MCS-1): 07 c0 02 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3620,7 +3620,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 12 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 12) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 12, MCS-1): 07 00 03 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3630,7 +3630,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 13 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 13) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 13, MCS-1): 07 40 03 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3640,7 +3640,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 14 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 14) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 14, MCS-1): 07 80 03 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3650,7 +3650,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 15 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 15) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 15, MCS-1): 07 c0 03 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3660,7 +3660,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 16 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 16) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 16, MCS-1): 07 00 04 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3670,7 +3670,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 17 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 17) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 17, MCS-1): 07 40 04 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3680,7 +3680,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 18 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 18) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 18, MCS-1): 07 80 04 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3690,7 +3690,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 19 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 19) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 19, MCS-1): 07 c0 04 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3700,7 +3700,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 20 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 20) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 20, MCS-1): 07 00 05 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3710,7 +3710,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 21 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 21) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 21, MCS-1): 07 40 05 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3720,7 +3720,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 22 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 22) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 22, MCS-1): 07 80 05 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3730,7 +3730,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 23 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 23) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 23, MCS-1): 07 c0 05 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3743,7 +3743,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 24 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 24) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 24, MCS-1): 07 00 06 16 18 3a 02 02 02 02 02 02 86 80 03 56 56 56 56 56 56 56 56 56 56 56 00 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink acknowledge @@ -3804,7 +3804,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 0 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-2): 07 00 00 12 28 42 02 02 02 02 02 02 02 02 02 02 86 80 03 56 56 56 56 56 56 56 56 56 56 56 56 56 00 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 512 bytes @@ -3817,7 +3817,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 1 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 1, MCS-2): 07 40 00 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3827,7 +3827,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 2 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 2) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 2, MCS-2): 07 80 00 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3837,7 +3837,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 3 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 3) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 3, MCS-2): 07 c0 00 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3847,7 +3847,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 4 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 4) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 4, MCS-2): 07 00 01 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3857,7 +3857,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 5 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 5) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 5, MCS-2): 07 40 01 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3867,7 +3867,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 6 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 6) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 6, MCS-2): 07 80 01 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3877,7 +3877,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 7 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 7) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 7, MCS-2): 07 c0 01 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3887,7 +3887,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 8 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 8) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 8, MCS-2): 07 00 02 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3897,7 +3897,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 9 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 9) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 9, MCS-2): 07 40 02 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3907,7 +3907,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 10 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 10) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 10, MCS-2): 07 80 02 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3917,7 +3917,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 11 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 11) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 11, MCS-2): 07 c0 02 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3927,7 +3927,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 12 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 12) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 12, MCS-2): 07 00 03 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3937,7 +3937,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 13 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 13) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 13, MCS-2): 07 40 03 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3947,7 +3947,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 14 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 14) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 14, MCS-2): 07 80 03 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3957,7 +3957,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 15 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 15) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 15, MCS-2): 07 c0 03 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3967,7 +3967,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 16 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 16) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 16, MCS-2): 07 00 04 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3977,7 +3977,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 17 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 17) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 17, MCS-2): 07 40 04 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3987,7 +3987,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 18 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 18) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 18, MCS-2): 07 80 04 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -4000,7 +4000,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 19 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 19) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 19, MCS-2): 07 c0 04 12 20 4a 02 02 02 02 02 02 02 02 86 80 03 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 00 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink acknowledge @@ -4061,7 +4061,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 0 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-3): 07 00 00 06 28 66 02 02 02 02 02 02 02 02 02 02 86 80 03 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 00 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 512 bytes @@ -4074,7 +4074,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 1 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 1, MCS-3): 07 40 00 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4084,7 +4084,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 2 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 2) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 2, MCS-3): 07 80 00 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4094,7 +4094,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 3 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 3) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 3, MCS-3): 07 c0 00 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4104,7 +4104,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 4 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 4) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 4, MCS-3): 07 00 01 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4114,7 +4114,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 5 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 5) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 5, MCS-3): 07 40 01 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4124,7 +4124,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 6 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 6) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 6, MCS-3): 07 80 01 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4134,7 +4134,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 7 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 7) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 7, MCS-3): 07 c0 01 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4144,7 +4144,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 8 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 8) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 8, MCS-3): 07 00 02 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4154,7 +4154,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 9 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 9) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 9, MCS-3): 07 40 02 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4164,7 +4164,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 10 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 10) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 10, MCS-3): 07 80 02 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -4174,7 +4174,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 11 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 11) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 11, MCS-3): 07 c0 02 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -4184,7 +4184,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 12 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 12) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 12, MCS-3): 07 00 03 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -4194,7 +4194,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 13 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 13) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 13, MCS-3): 07 40 03 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -4206,7 +4206,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 14 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 14) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 14, MCS-3): 07 80 03 06 7e 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 86 80 03 56 56 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -4219,7 +4219,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 15 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 15) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 15, MCS-3): 07 c0 03 06 04 8a 56 86 80 03 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 00 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink acknowledge @@ -4280,7 +4280,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 0 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-4): 07 00 00 00 28 82 02 02 02 02 02 02 02 02 02 02 86 80 03 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 00 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 512 bytes @@ -4293,7 +4293,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 1 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 1, MCS-4): 07 40 00 80 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4303,7 +4303,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 2 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 2) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 2, MCS-4): 07 80 00 80 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4313,7 +4313,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 3 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 3) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 3, MCS-4): 07 c0 00 80 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4323,7 +4323,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 4 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 4) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 4, MCS-4): 07 00 01 80 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4333,7 +4333,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 5 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 5) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 5, MCS-4): 07 40 01 80 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4343,7 +4343,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 6 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 6) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 6, MCS-4): 07 80 01 80 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4353,7 +4353,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 7 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 7) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 7, MCS-4): 07 c0 01 80 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4363,7 +4363,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 8 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 8) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 8, MCS-4): 07 00 02 80 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4373,7 +4373,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 9 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 9) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 9, MCS-4): 07 40 02 80 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4383,7 +4383,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 10 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 10) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 10, MCS-4): 07 80 02 80 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -4393,7 +4393,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 11 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 11) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 11, MCS-4): 07 c0 02 80 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -4406,7 +4406,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 12 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 12) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 12, MCS-4): 07 00 03 00 70 3a 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 86 80 03 56 56 56 56 56 56 56 56 56 56 56 00 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink acknowledge @@ -4467,7 +4467,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 0 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-5): 07 00 00 08 45 56 40 40 40 40 40 40 40 40 40 c0 10 70 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 512 bytes @@ -4480,7 +4480,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 1 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 1, MCS-5): 07 40 00 58 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4490,7 +4490,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 2 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 2) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 2, MCS-5): 07 80 00 58 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4500,7 +4500,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 3 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 3) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 3, MCS-5): 07 c0 00 58 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4510,7 +4510,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 4 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 4) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 4, MCS-5): 07 00 01 58 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4520,7 +4520,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 5 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 5) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 5, MCS-5): 07 40 01 58 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4530,7 +4530,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 6 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 6) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 6, MCS-5): 07 80 01 58 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4540,7 +4540,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 7 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 7) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 7, MCS-5): 07 c0 01 58 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4550,7 +4550,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 8 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 8) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 8, MCS-5): 07 00 02 58 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4560,7 +4560,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 9 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 9) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 9, MCS-5): 07 40 02 58 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4573,7 +4573,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 10 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 10) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 10, MCS-5): 07 80 02 08 44 57 40 40 40 40 40 40 40 c0 10 70 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink acknowledge @@ -4634,7 +4634,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 0 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-6): 07 00 00 00 45 5f 40 40 40 40 40 40 40 40 40 c0 10 70 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 512 bytes @@ -4647,7 +4647,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 1 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 1, MCS-6): 07 40 00 50 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4657,7 +4657,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 2 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 2) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 2, MCS-6): 07 80 00 50 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4667,7 +4667,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 3 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 3) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 3, MCS-6): 07 c0 00 50 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4677,7 +4677,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 4 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 4) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 4, MCS-6): 07 00 01 50 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4687,7 +4687,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 5 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 5) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 5, MCS-6): 07 40 01 50 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4697,7 +4697,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 6 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 6) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 6, MCS-6): 07 80 01 50 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4709,7 +4709,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 7 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 7) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 7, MCS-6): 07 c0 01 40 62 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 c0 10 70 c0 ca 0a Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4722,7 +4722,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 8 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 8) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 8, MCS-6): 07 00 02 80 c0 e3 ca 10 70 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink acknowledge @@ -4784,7 +4784,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 0 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-5): 07 00 00 08 45 56 40 40 40 40 40 40 40 40 40 c0 10 70 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 512 bytes @@ -4800,7 +4800,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-7): 07 00 00 02 b8 50 64 05 04 04 04 04 04 04 04 04 04 0c 01 07 ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac 14 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4813,7 +4813,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 2) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 3) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 2, MCS-7): 07 80 00 02 a0 05 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 14 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4826,7 +4826,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 4) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 5) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 4, MCS-7): 07 00 01 02 a0 05 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 14 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4839,7 +4839,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 6) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 7) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 6, MCS-7): 07 80 01 02 a0 05 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 14 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4852,7 +4852,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 8) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 9) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 8, MCS-7): 07 00 02 02 a0 05 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 14 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4866,7 +4866,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 10 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 10) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 10, MCS-5): 07 80 02 08 44 57 40 40 40 40 40 40 40 c0 10 70 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink acknowledge @@ -4929,7 +4929,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 0) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-8): 07 00 00 00 60 50 c4 05 04 04 04 04 04 04 04 04 04 0c 01 07 ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac 40 11 17 10 10 10 10 10 10 10 10 10 30 04 1c b0 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 02 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 512 bytes @@ -4945,7 +4945,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-8): 07 00 00 02 88 50 c4 05 04 04 04 04 04 04 04 04 04 0c 01 07 ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac 14 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4958,7 +4958,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 2) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 3) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 2, MCS-8): 07 80 00 02 58 05 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 14 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4971,7 +4971,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 4) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 5) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 4, MCS-8): 07 00 01 02 58 05 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 14 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4984,7 +4984,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 6) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 7) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 6, MCS-8): 07 80 01 02 58 05 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 14 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4999,7 +4999,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 8) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 8) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 8, MCS-8): 07 00 02 00 60 20 f5 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 0c 01 07 ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac 80 d4 13 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 30 04 1c b0 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 02 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink acknowledge @@ -5061,7 +5061,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 0 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-6): 07 00 00 00 45 5f 40 40 40 40 40 40 40 40 40 c0 10 70 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 512 bytes @@ -5077,7 +5077,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-9): 07 00 00 02 20 50 f4 05 04 04 04 04 04 04 04 04 04 0c 01 07 ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac 14 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -5090,7 +5090,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 2) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 3) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 2, MCS-9): 07 80 00 02 00 05 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 14 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -5103,7 +5103,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 4) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 5) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 4, MCS-9): 07 00 01 02 00 05 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 14 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -5118,7 +5118,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 6) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 7) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 6, MCS-9): 07 80 01 02 00 05 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 90 18 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 30 04 1c b0 b2 02 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -5132,7 +5132,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 8 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 8) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 8, MCS-6): 07 00 02 80 c0 e3 ca 10 70 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink acknowledge @@ -5363,7 +5363,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 1 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduled DL Acknowledgement polling on UNKNOWN (FN=21, TS=4) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduled Ack/Nack polling on FN=21, TS=4 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 1, MCS-5): 0f 40 00 08 56 05 4e 8e ce 0e 4f 8f cf 0f 50 90 d0 10 51 91 d1 11 52 92 d2 12 53 93 d3 13 54 94 d4 14 55 95 d5 15 56 96 d6 16 57 97 d7 17 58 98 d8 d8 10 70 c0 ca ca ca ca ca ca 0a @@ -5435,7 +5435,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 1 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduled DL Acknowledgement polling on UNKNOWN (FN=21, TS=4) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduled Ack/Nack polling on FN=21, TS=4 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 1, MCS-6): 0f 40 00 00 4d 97 d2 12 53 93 d3 13 54 94 d4 14 55 95 d5 15 56 96 d6 16 57 97 d7 17 58 98 d8 d8 10 70 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a @@ -5503,7 +5503,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduled DL Acknowledgement polling on UNKNOWN (FN=17, TS=4) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduled Ack/Nack polling on FN=17, TS=4 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-7): 0f 00 00 02 a0 01 04 08 0c 10 14 18 1c 20 24 28 2c 30 34 38 3c 40 44 48 4c 50 54 58 5c 60 64 68 6c 70 74 78 7c 80 84 88 8c 90 94 98 9c a0 a4 a8 ac b0 b4 b8 bc c0 c4 c8 cc d0 d4 d8 dc 80 55 81 93 a3 b3 c3 d3 e3 f3 03 14 24 34 44 54 64 74 84 94 a4 b4 c4 d4 e4 f4 04 15 25 35 45 55 65 75 85 95 a5 b5 c5 d5 e5 f5 05 16 26 36 36 04 1c b0 b2 b2 b2 b2 b2 b2 02 @@ -5575,7 +5575,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduled DL Acknowledgement polling on UNKNOWN (FN=17, TS=4) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduled Ack/Nack polling on FN=17, TS=4 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-9): 0f 00 00 02 00 01 04 08 0c 10 14 18 1c 20 24 28 2c 30 34 38 3c 40 44 48 4c 50 54 58 5c 60 64 68 6c 70 74 78 7c 80 84 88 8c 90 94 98 9c a0 a4 a8 ac b0 b4 b8 bc c0 c4 c8 cc d0 d4 d8 dc e0 e4 e8 ec f0 f4 f8 fc 00 05 09 0d 11 15 19 1d 21 25 41 d3 a5 b4 c4 d4 e4 f4 04 15 25 35 45 55 65 75 85 95 a5 b5 c5 d5 e5 f5 05 16 26 36 36 04 1c b0 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 02 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9fdea4246c95897f3e72604981597db828a219a3 Gerrit-Change-Number: 16484 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 17:14:36 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 4 Dec 2019 17:14:36 +0000 Subject: Change in osmo-bts[master]: rach_pass_filter(): Add information about channel type In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16481 ) Change subject: rach_pass_filter(): Add information about channel type ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I03f21f2b54cbe5aad36ac71a614d5df98867df80 Gerrit-Change-Number: 16481 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 17:14:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 17:16:09 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 4 Dec 2019 17:16:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Update transmitted MS power as requested by BTS In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16480 ) Change subject: bts: Update transmitted MS power as requested by BTS ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I287761202093fbc1064f9868efe6f7f6155253ca Gerrit-Change-Number: 16480 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 17:16:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 17:17:09 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 4 Dec 2019 17:17:09 +0000 Subject: Change in osmo-pcu[master]: tbf_dl.cpp: Fix typo in log line In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16484 ) Change subject: tbf_dl.cpp: Fix typo in log line ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9fdea4246c95897f3e72604981597db828a219a3 Gerrit-Change-Number: 16484 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 04 Dec 2019 17:17:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 17:29:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 17:29:33 +0000 Subject: Change in osmo-pcu[master]: tbf_dl.cpp: Fix typo in log line In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16484 ) Change subject: tbf_dl.cpp: Fix typo in log line ...................................................................... tbf_dl.cpp: Fix typo in log line Change-Id: I9fdea4246c95897f3e72604981597db828a219a3 --- M src/tbf_dl.cpp M tests/tbf/TbfTest.err 2 files changed, 125 insertions(+), 125 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index 4efb5a4..e3c1ff4 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -846,7 +846,7 @@ need_poll) { if (m_dl_ack_requested) { LOGPTBFDL(this, LOGL_DEBUG, - "Scheduling Ack/Nack polling, because is was requested explicitly " + "Scheduling Ack/Nack polling, because it was requested explicitly " "(e.g. first final block sent).\n"); } else if (need_poll) { LOGPTBFDL(this, LOGL_DEBUG, diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 8ec3e80..1adc8f7 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -425,7 +425,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) need_padding 0 spb_status 0 spb 0 (BSN1 20 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Copying data unit 0 (BSN 20) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) msg block (BSN 20, CS-1): 07 00 28 0a 41 c6 c7 43 c0 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) downlink acknowledge @@ -441,7 +441,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) need_padding 0 spb_status 0 spb 0 (BSN1 21 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Copying data unit 0 (BSN 21) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) msg block (BSN 21, CS-1): 07 00 2a 4d 43 c0 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) downlink acknowledge @@ -458,7 +458,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FINISHED) need_padding 0 spb_status 0 spb 0 (BSN1 22 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FINISHED) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FINISHED) Copying data unit 0 (BSN 22) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FINISHED) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FINISHED) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FINISHED) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FINISHED) msg block (BSN 22, CS-1): 07 01 2c 4d 43 c0 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FINISHED) downlink acknowledge @@ -1435,7 +1435,7 @@ TBF(TFI=0 TLLI=0xc0123456 DIR=DL STATE=FINISHED) need_padding 0 spb_status 0 spb 0 (BSN1 2 BSN2 -1) TBF(TFI=0 TLLI=0xc0123456 DIR=DL STATE=FINISHED) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xc0123456 DIR=DL STATE=FINISHED) Copying data unit 0 (BSN 2) -TBF(TFI=0 TLLI=0xc0123456 DIR=DL STATE=FINISHED) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xc0123456 DIR=DL STATE=FINISHED) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xc0123456 DIR=DL STATE=FINISHED) Polling cannot be scheduled in this TS 7 (first control TS 4) TBF(TFI=0 TLLI=0xc0123456 DIR=DL STATE=FINISHED) msg block (BSN 2, CS-1): 07 01 04 4d 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 MSG = 07 01 04 4d 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 @@ -1709,7 +1709,7 @@ TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) need_padding 0 spb_status 0 spb 0 (BSN1 0 BSN2 -1) TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Copying data unit 0 (BSN 0) -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduled DL Acknowledgement polling on PACCH (FN=2654292, TS=7) TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) starting timer T3191 [final block (DL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduled Ack/Nack polling on FN=2654292, TS=7 @@ -2783,7 +2783,7 @@ TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) need_padding 0 spb_status 0 spb 0 (BSN1 27 BSN2 -1) TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Copying data unit 0 (BSN 27) -TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Polling is already scheduled TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) msg block (BSN 27, CS-1): 07 01 36 16 35 45 54 20 33 38 4c 4c 43 20 50 41 43 4b 45 54 20 33 39 TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) appending 21 bytes @@ -3046,7 +3046,7 @@ TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) need_padding 0 spb_status 0 spb 0 (BSN1 10 BSN2 -1) TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Copying 1 RLC blocks, 1 BSNs TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Copying data unit 0 (BSN 10) -TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduled DL Acknowledgement polling on PACCH (FN=2654461, TS=7) TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) starting timer T3191 [final block (DL-TBF)] with 5 sec. 0 microsec, cur_fn=0 TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduled Ack/Nack polling on FN=2654461, TS=7 @@ -3497,7 +3497,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 0 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-1): 07 00 00 16 28 2a 02 02 02 02 02 02 02 02 02 02 86 80 03 56 56 56 56 56 56 56 00 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 512 bytes @@ -3510,7 +3510,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 1 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 1, MCS-1): 07 40 00 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3520,7 +3520,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 2 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 2) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 2, MCS-1): 07 80 00 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3530,7 +3530,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 3 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 3) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 3, MCS-1): 07 c0 00 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3540,7 +3540,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 4 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 4) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 4, MCS-1): 07 00 01 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3550,7 +3550,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 5 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 5) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 5, MCS-1): 07 40 01 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3560,7 +3560,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 6 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 6) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 6, MCS-1): 07 80 01 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3570,7 +3570,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 7 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 7) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 7, MCS-1): 07 c0 01 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3580,7 +3580,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 8 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 8) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 8, MCS-1): 07 00 02 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3590,7 +3590,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 9 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 9) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 9, MCS-1): 07 40 02 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3600,7 +3600,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 10 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 10) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 10, MCS-1): 07 80 02 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3610,7 +3610,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 11 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 11) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 11, MCS-1): 07 c0 02 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3620,7 +3620,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 12 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 12) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 12, MCS-1): 07 00 03 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3630,7 +3630,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 13 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 13) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 13, MCS-1): 07 40 03 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3640,7 +3640,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 14 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 14) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 14, MCS-1): 07 80 03 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3650,7 +3650,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 15 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 15) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 15, MCS-1): 07 c0 03 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3660,7 +3660,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 16 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 16) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 16, MCS-1): 07 00 04 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3670,7 +3670,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 17 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 17) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 17, MCS-1): 07 40 04 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3680,7 +3680,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 18 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 18) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 18, MCS-1): 07 80 04 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3690,7 +3690,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 19 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 19) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 19, MCS-1): 07 c0 04 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3700,7 +3700,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 20 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 20) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 20, MCS-1): 07 00 05 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3710,7 +3710,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 21 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 21) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 21, MCS-1): 07 40 05 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3720,7 +3720,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 22 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 22) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 22, MCS-1): 07 80 05 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3730,7 +3730,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 23 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 23) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 23, MCS-1): 07 c0 05 96 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3743,7 +3743,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 24 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 24) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 24, MCS-1): 07 00 06 16 18 3a 02 02 02 02 02 02 86 80 03 56 56 56 56 56 56 56 56 56 56 56 00 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink acknowledge @@ -3804,7 +3804,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 0 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-2): 07 00 00 12 28 42 02 02 02 02 02 02 02 02 02 02 86 80 03 56 56 56 56 56 56 56 56 56 56 56 56 56 00 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 512 bytes @@ -3817,7 +3817,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 1 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 1, MCS-2): 07 40 00 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3827,7 +3827,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 2 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 2) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 2, MCS-2): 07 80 00 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3837,7 +3837,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 3 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 3) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 3, MCS-2): 07 c0 00 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3847,7 +3847,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 4 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 4) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 4, MCS-2): 07 00 01 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3857,7 +3857,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 5 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 5) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 5, MCS-2): 07 40 01 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3867,7 +3867,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 6 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 6) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 6, MCS-2): 07 80 01 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3877,7 +3877,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 7 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 7) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 7, MCS-2): 07 c0 01 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3887,7 +3887,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 8 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 8) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 8, MCS-2): 07 00 02 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3897,7 +3897,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 9 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 9) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 9, MCS-2): 07 40 02 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -3907,7 +3907,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 10 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 10) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 10, MCS-2): 07 80 02 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3917,7 +3917,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 11 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 11) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 11, MCS-2): 07 c0 02 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3927,7 +3927,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 12 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 12) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 12, MCS-2): 07 00 03 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3937,7 +3937,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 13 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 13) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 13, MCS-2): 07 40 03 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3947,7 +3947,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 14 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 14) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 14, MCS-2): 07 80 03 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3957,7 +3957,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 15 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 15) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 15, MCS-2): 07 c0 03 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3967,7 +3967,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 16 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 16) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 16, MCS-2): 07 00 04 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3977,7 +3977,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 17 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 17) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 17, MCS-2): 07 40 04 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -3987,7 +3987,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 18 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 18) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 18, MCS-2): 07 80 04 92 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -4000,7 +4000,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 19 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 19) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 19, MCS-2): 07 c0 04 12 20 4a 02 02 02 02 02 02 02 02 86 80 03 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 00 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink acknowledge @@ -4061,7 +4061,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 0 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-3): 07 00 00 06 28 66 02 02 02 02 02 02 02 02 02 02 86 80 03 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 00 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 512 bytes @@ -4074,7 +4074,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 1 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 1, MCS-3): 07 40 00 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4084,7 +4084,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 2 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 2) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 2, MCS-3): 07 80 00 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4094,7 +4094,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 3 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 3) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 3, MCS-3): 07 c0 00 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4104,7 +4104,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 4 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 4) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 4, MCS-3): 07 00 01 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4114,7 +4114,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 5 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 5) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 5, MCS-3): 07 40 01 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4124,7 +4124,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 6 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 6) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 6, MCS-3): 07 80 01 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4134,7 +4134,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 7 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 7) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 7, MCS-3): 07 c0 01 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4144,7 +4144,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 8 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 8) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 8, MCS-3): 07 00 02 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4154,7 +4154,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 9 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 9) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 9, MCS-3): 07 40 02 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4164,7 +4164,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 10 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 10) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 10, MCS-3): 07 80 02 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -4174,7 +4174,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 11 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 11) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 11, MCS-3): 07 c0 02 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -4184,7 +4184,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 12 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 12) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 12, MCS-3): 07 00 03 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -4194,7 +4194,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 13 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 13) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 13, MCS-3): 07 40 03 86 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -4206,7 +4206,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 14 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 14) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 14, MCS-3): 07 80 03 06 7e 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 86 80 03 56 56 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -4219,7 +4219,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 15 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 15) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 15, MCS-3): 07 c0 03 06 04 8a 56 86 80 03 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 00 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink acknowledge @@ -4280,7 +4280,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 0 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-4): 07 00 00 00 28 82 02 02 02 02 02 02 02 02 02 02 86 80 03 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 00 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 512 bytes @@ -4293,7 +4293,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 1 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 1, MCS-4): 07 40 00 80 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4303,7 +4303,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 2 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 2) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 2, MCS-4): 07 80 00 80 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4313,7 +4313,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 3 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 3) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 3, MCS-4): 07 c0 00 80 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4323,7 +4323,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 4 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 4) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 4, MCS-4): 07 00 01 80 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4333,7 +4333,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 5 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 5) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 5, MCS-4): 07 40 01 80 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4343,7 +4343,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 6 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 6) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 6, MCS-4): 07 80 01 80 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4353,7 +4353,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 7 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 7) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 7, MCS-4): 07 c0 01 80 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4363,7 +4363,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 8 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 8) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 8, MCS-4): 07 00 02 80 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4373,7 +4373,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 9 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 9) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 9, MCS-4): 07 40 02 80 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4383,7 +4383,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 10 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 10) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 10, MCS-4): 07 80 02 80 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -4393,7 +4393,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 11 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 11) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 11, MCS-4): 07 c0 02 80 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 @@ -4406,7 +4406,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 12 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 12) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 12, MCS-4): 07 00 03 00 70 3a 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 86 80 03 56 56 56 56 56 56 56 56 56 56 56 00 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink acknowledge @@ -4467,7 +4467,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 0 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-5): 07 00 00 08 45 56 40 40 40 40 40 40 40 40 40 c0 10 70 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 512 bytes @@ -4480,7 +4480,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 1 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 1, MCS-5): 07 40 00 58 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4490,7 +4490,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 2 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 2) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 2, MCS-5): 07 80 00 58 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4500,7 +4500,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 3 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 3) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 3, MCS-5): 07 c0 00 58 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4510,7 +4510,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 4 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 4) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 4, MCS-5): 07 00 01 58 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4520,7 +4520,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 5 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 5) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 5, MCS-5): 07 40 01 58 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4530,7 +4530,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 6 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 6) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 6, MCS-5): 07 80 01 58 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4540,7 +4540,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 7 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 7) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 7, MCS-5): 07 c0 01 58 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4550,7 +4550,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 8 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 8) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 8, MCS-5): 07 00 02 58 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4560,7 +4560,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 9 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 9) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 9, MCS-5): 07 40 02 58 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4573,7 +4573,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 10 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 10) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 10, MCS-5): 07 80 02 08 44 57 40 40 40 40 40 40 40 c0 10 70 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink acknowledge @@ -4634,7 +4634,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 0 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-6): 07 00 00 00 45 5f 40 40 40 40 40 40 40 40 40 c0 10 70 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 512 bytes @@ -4647,7 +4647,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 1 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 1, MCS-6): 07 40 00 50 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4657,7 +4657,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 2 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 2) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 2, MCS-6): 07 80 00 50 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4667,7 +4667,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 3 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 3) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 3, MCS-6): 07 c0 00 50 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4677,7 +4677,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 4 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 4) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 4, MCS-6): 07 00 01 50 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4687,7 +4687,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 5 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 5) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 5, MCS-6): 07 40 01 50 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4697,7 +4697,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 6 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 6) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 6, MCS-6): 07 80 01 50 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4709,7 +4709,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 7 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 7) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 7, MCS-6): 07 c0 01 40 62 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 c0 10 70 c0 ca 0a Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4722,7 +4722,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 8 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 8) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 8, MCS-6): 07 00 02 80 c0 e3 ca 10 70 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink acknowledge @@ -4784,7 +4784,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 0 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-5): 07 00 00 08 45 56 40 40 40 40 40 40 40 40 40 c0 10 70 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 512 bytes @@ -4800,7 +4800,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-7): 07 00 00 02 b8 50 64 05 04 04 04 04 04 04 04 04 04 0c 01 07 ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac 14 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4813,7 +4813,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 2) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 3) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 2, MCS-7): 07 80 00 02 a0 05 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 14 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4826,7 +4826,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 4) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 5) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 4, MCS-7): 07 00 01 02 a0 05 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 14 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4839,7 +4839,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 6) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 7) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 6, MCS-7): 07 80 01 02 a0 05 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 14 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4852,7 +4852,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 8) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 9) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 8, MCS-7): 07 00 02 02 a0 05 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 14 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4866,7 +4866,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 10 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 10) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 10, MCS-5): 07 80 02 08 44 57 40 40 40 40 40 40 40 c0 10 70 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink acknowledge @@ -4929,7 +4929,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 0) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-8): 07 00 00 00 60 50 c4 05 04 04 04 04 04 04 04 04 04 0c 01 07 ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac 40 11 17 10 10 10 10 10 10 10 10 10 30 04 1c b0 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 02 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 512 bytes @@ -4945,7 +4945,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-8): 07 00 00 02 88 50 c4 05 04 04 04 04 04 04 04 04 04 0c 01 07 ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac 14 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4958,7 +4958,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 2) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 3) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 2, MCS-8): 07 80 00 02 58 05 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 14 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4971,7 +4971,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 4) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 5) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 4, MCS-8): 07 00 01 02 58 05 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 14 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4984,7 +4984,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 6) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 7) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 6, MCS-8): 07 80 01 02 58 05 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 14 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -4999,7 +4999,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 8) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 8) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 8, MCS-8): 07 00 02 00 60 20 f5 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 0c 01 07 ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac 80 d4 13 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 30 04 1c b0 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 02 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink acknowledge @@ -5061,7 +5061,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 0 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-6): 07 00 00 00 45 5f 40 40 40 40 40 40 40 40 40 c0 10 70 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 512 bytes @@ -5077,7 +5077,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-9): 07 00 00 02 20 50 f4 05 04 04 04 04 04 04 04 04 04 0c 01 07 ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac 14 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -5090,7 +5090,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 2) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 3) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 2, MCS-9): 07 80 00 02 00 05 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 14 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -5103,7 +5103,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 4) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 5) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 4, MCS-9): 07 00 01 02 00 05 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 14 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 00 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -5118,7 +5118,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 6) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 7) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 6, MCS-9): 07 80 01 02 00 05 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 90 18 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 30 04 1c b0 b2 02 Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=3 @@ -5132,7 +5132,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 8 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 8) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Polling is already scheduled TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 8, MCS-6): 07 00 02 80 c0 e3 ca 10 70 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink acknowledge @@ -5363,7 +5363,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 1 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduled DL Acknowledgement polling on UNKNOWN (FN=21, TS=4) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduled Ack/Nack polling on FN=21, TS=4 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 1, MCS-5): 0f 40 00 08 56 05 4e 8e ce 0e 4f 8f cf 0f 50 90 d0 10 51 91 d1 11 52 92 d2 12 53 93 d3 13 54 94 d4 14 55 95 d5 15 56 96 d6 16 57 97 d7 17 58 98 d8 d8 10 70 c0 ca ca ca ca ca ca 0a @@ -5435,7 +5435,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 1 BSN2 -1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 1 RLC blocks, 1 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduled DL Acknowledgement polling on UNKNOWN (FN=21, TS=4) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduled Ack/Nack polling on FN=21, TS=4 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 1, MCS-6): 0f 40 00 00 4d 97 d2 12 53 93 d3 13 54 94 d4 14 55 95 d5 15 56 96 d6 16 57 97 d7 17 58 98 d8 d8 10 70 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a @@ -5503,7 +5503,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduled DL Acknowledgement polling on UNKNOWN (FN=17, TS=4) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduled Ack/Nack polling on FN=17, TS=4 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-7): 0f 00 00 02 a0 01 04 08 0c 10 14 18 1c 20 24 28 2c 30 34 38 3c 40 44 48 4c 50 54 58 5c 60 64 68 6c 70 74 78 7c 80 84 88 8c 90 94 98 9c a0 a4 a8 ac b0 b4 b8 bc c0 c4 c8 cc d0 d4 d8 dc 80 55 81 93 a3 b3 c3 d3 e3 f3 03 14 24 34 44 54 64 74 84 94 a4 b4 c4 d4 e4 f4 04 15 25 35 45 55 65 75 85 95 a5 b5 c5 d5 e5 f5 05 16 26 36 36 04 1c b0 b2 b2 b2 b2 b2 b2 02 @@ -5575,7 +5575,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying 2 RLC blocks, 2 BSNs TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 0) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 1) -TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because is was requested explicitly (e.g. first final block sent). +TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduling Ack/Nack polling, because it was requested explicitly (e.g. first final block sent). TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduled DL Acknowledgement polling on UNKNOWN (FN=17, TS=4) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Scheduled Ack/Nack polling on FN=17, TS=4 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-9): 0f 00 00 02 00 01 04 08 0c 10 14 18 1c 20 24 28 2c 30 34 38 3c 40 44 48 4c 50 54 58 5c 60 64 68 6c 70 74 78 7c 80 84 88 8c 90 94 98 9c a0 a4 a8 ac b0 b4 b8 bc c0 c4 c8 cc d0 d4 d8 dc e0 e4 e8 ec f0 f4 f8 fc 00 05 09 0d 11 15 19 1d 21 25 41 d3 a5 b4 c4 d4 e4 f4 04 15 25 35 45 55 65 75 85 95 a5 b5 c5 d5 e5 f5 05 16 26 36 36 04 1c b0 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 02 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9fdea4246c95897f3e72604981597db828a219a3 Gerrit-Change-Number: 16484 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 17:52:00 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 17:52:00 +0000 Subject: Change in osmo-bts[master]: rach_pass_filter(): Add information about channel type In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16481 ) Change subject: rach_pass_filter(): Add information about channel type ...................................................................... rach_pass_filter(): Add information about channel type When logging about filtering access bursts, let's indicate if this is on a CCCH, PDCH or handover related. Change-Id: I03f21f2b54cbe5aad36ac71a614d5df98867df80 --- M src/common/l1sap.c 1 file changed, 11 insertions(+), 10 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/l1sap.c b/src/common/l1sap.c index e640ce9..213099d 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1337,14 +1337,15 @@ #define RACH_MIN_TOA256 -2 * 256 -static bool rach_pass_filter(struct ph_rach_ind_param *rach_ind, struct gsm_bts *bts) +static bool rach_pass_filter(struct ph_rach_ind_param *rach_ind, struct gsm_bts *bts, + const char *chan_name) { int16_t toa256 = rach_ind->acc_delay_256bits; /* Check for RACH exceeding BER threshold (ghost RACH) */ if (rach_ind->ber10k > bts->max_ber10k_rach) { - LOGPFN(DL1C, LOGL_INFO, rach_ind->fn, "Ignoring an Access Burst: " - "BER10k(%u) > BER10k_MAX(%u)\n", + LOGPFN(DL1C, LOGL_INFO, rach_ind->fn, "Ignoring an Access Burst on %s: " + "BER10k(%u) > BER10k_MAX(%u)\n", chan_name, rach_ind->ber10k, bts->max_ber10k_rach); return false; } @@ -1355,16 +1356,16 @@ * according to maximal allowed Timing Advance value. */ if (toa256 < RACH_MIN_TOA256 || toa256 > bts->max_ta * 256) { - LOGPFN(DL1C, LOGL_INFO, rach_ind->fn, "Ignoring an Access Burst: " - "ToA(%d) exceeds the allowed range (%d..%d)\n", + LOGPFN(DL1C, LOGL_INFO, rach_ind->fn, "Ignoring an Access Burst on %s: " + "ToA(%d) exceeds the allowed range (%d..%d)\n", chan_name, toa256, RACH_MIN_TOA256, bts->max_ta * 256); return false; } /* Link quality defined by C/I (Carrier-to-Interference ratio) */ if (rach_ind->lqual_cb < bts->min_qual_rach) { - LOGPFN(DL1C, LOGL_INFO, rach_ind->fn, "Ignoring an Access Burst: " - "link quality (%d) below the minimum (%d)\n", + LOGPFN(DL1C, LOGL_INFO, rach_ind->fn, "Ignoring an Access Burst on %s: " + "link quality (%d) below the minimum (%d)\n", chan_name, rach_ind->lqual_cb, bts->min_qual_rach); return false; } @@ -1376,7 +1377,7 @@ static int l1sap_handover_rach(struct gsm_bts_trx *trx, struct ph_rach_ind_param *rach_ind) { /* Filter out noise / interference / ghosts */ - if (!rach_pass_filter(rach_ind, trx->bts)) { + if (!rach_pass_filter(rach_ind, trx->bts, "handover")) { rate_ctr_inc2(trx->bts->ctrs, BTS_CTR_RACH_DROP); return 0; } @@ -1392,7 +1393,7 @@ static int l1sap_pdch_rach(struct gsm_bts_trx *trx, struct ph_rach_ind_param *rach_ind) { /* Filter out noise / interference / ghosts */ - if (!rach_pass_filter(rach_ind, trx->bts)) + if (!rach_pass_filter(rach_ind, trx->bts, "PDCH")) return -EAGAIN; /* PTCCH/U (Packet Timing Advance Control Channel) */ @@ -1444,7 +1445,7 @@ bts->load.rach.busy++; /* Filter out noise / interference / ghosts */ - if (!rach_pass_filter(rach_ind, bts)) { + if (!rach_pass_filter(rach_ind, bts, "CCCH")) { rate_ctr_inc2(trx->bts->ctrs, BTS_CTR_RACH_DROP); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I03f21f2b54cbe5aad36ac71a614d5df98867df80 Gerrit-Change-Number: 16481 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 17:52:36 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 17:52:36 +0000 Subject: Change in docker-playground[master]: ttcn3-cpu: Support VTY prompt used in older versions of osmo-pcu In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16483 ) Change subject: ttcn3-cpu: Support VTY prompt used in older versions of osmo-pcu ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16483 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8cec3da889623915ca46b5eb1b51bc81195accf9 Gerrit-Change-Number: 16483 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 17:52:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 17:53:44 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 17:53:44 +0000 Subject: Change in osmo-bsc[master]: gsm_04_80: Avoid using deprecated API In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16476 ) Change subject: gsm_04_80: Avoid using deprecated API ...................................................................... Patch Set 1: > (1 comment) > > I am wondering why do we have SS/USSD code in OsmoBSC, given that > transaction management and so on is up to OsmoMSC... imagine you are a BTS+BSC on a vessel and you lost your back-haul to the MSC. Then you want to notify all phones (or those attempting to make new calls) about that loss of signal? > Maybe we should rather get rid of this "feature"? not an option, sorry. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I739158dec62cd5f0c2080fbb426af9c024baef87 Gerrit-Change-Number: 16476 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 17:53:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 18:24:24 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 18:24:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Verify contents of data dl blocks originated from emulated SGSN References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16485 ) Change subject: pcu: Verify contents of data dl blocks originated from emulated SGSN ...................................................................... pcu: Verify contents of data dl blocks originated from emulated SGSN Change-Id: I4fe79572094038cbb26d5195c0544846ca2550b5 --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 22 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/85/16485/1 diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index 410dc31..cddf9f6 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -759,13 +759,34 @@ runs on RAW_PCU_Test_CT { var template RlcmacDlBlock dl_template := tr_RLCMAC_DATA_RRBP; dl_template.data.blocks := ?; - /* TODO: match data correctly: { valueof(t_RLCMAC_LLCBLOCK(data)) }; */ f_rx_rlcmac_dl_block(dl_block); if (not match(dl_block, dl_template)) { setverdict(fail, "Failed to match Packet data: ", dl_block, " vs ", dl_template); mtc.stop; } + + if (lengthof(dl_block.data.blocks) < 1) { + setverdict(fail, "DL block has no LLC payload: ", dl_block); + mtc.stop; + } + + if (ispresent(dl_block.data.blocks[0].hdr) and dl_block.data.blocks[0].hdr.length_ind != lengthof(data)) { + setverdict(fail, "DL block has LLC header with wrong expected size: ", + dl_block.data.blocks[0].hdr.length_ind, " vs ", lengthof(data)); + mtc.stop; + } + + if (dl_block.data.blocks[0].payload != data) { + setverdict(fail, "Failed to match content of LLC payload in DL Block: ", dl_block, " vs ", data); + mtc.stop; + } + + /* Check next data blocks contain dummy frames */ + if (lengthof(dl_block.data.blocks) > 1 and substr(dl_block.data.blocks[1].payload, 0, 3) != '43C001'O) { + setverdict(fail, "Second data payload is not a dummy frame: ", dl_block.data.blocks[1].payload); + mtc.stop; + } } testcase TC_pcuif_suspend() runs on RAW_PCU_Test_CT { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4fe79572094038cbb26d5195c0544846ca2550b5 Gerrit-Change-Number: 16485 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 19:29:00 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 4 Dec 2019 19:29:00 +0000 Subject: Change in osmo-bsc[master]: gsm_04_80: Avoid using deprecated API In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16476 ) Change subject: gsm_04_80: Avoid using deprecated API ...................................................................... Patch Set 1: Code-Review+1 > imagine you are a BTS+BSC on a vessel and you lost your back-haul to the MSC. > Then you want to notify all phones (or those attempting to make new calls) > about that loss of signal? Ok, did not know about this application of USSD in the BSC. Makes sense. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I739158dec62cd5f0c2080fbb426af9c024baef87 Gerrit-Change-Number: 16476 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 19:29:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 20:41:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 20:41:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix incorrect FN being send over PCUIF to PCU References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16486 ) Change subject: pcu: Fix incorrect FN being send over PCUIF to PCU ...................................................................... pcu: Fix incorrect FN being send over PCUIF to PCU The event FN contains the current FN, but the message should contain the FN of the first burst of the block. Change-Id: Iba0b1d1a3d7d875c5443a7bcaff399f9681624ad --- M pcu/PCUIF_RAW_Components.ttcn 1 file changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/16486/1 diff --git a/pcu/PCUIF_RAW_Components.ttcn b/pcu/PCUIF_RAW_Components.ttcn index 6d29404..0f28839 100644 --- a/pcu/PCUIF_RAW_Components.ttcn +++ b/pcu/PCUIF_RAW_Components.ttcn @@ -278,6 +278,7 @@ runs on RAW_PCU_BTS_CT { var PCUIF_Message pcu_msg; var RAW_PCU_Event event; + var integer ev_begin_fn; [] CLCK.receive(tr_RAW_PCU_EV(TDMA_EV_PDTCH_BLOCK_BEG)) -> value event { /* If the RTS queue for PDTCH is not empty, send a message */ @@ -296,23 +297,27 @@ repeat; } [lengthof(pdtch_data_queue) > 0] CLCK.receive(tr_RAW_PCU_EV(TDMA_EV_PDTCH_BLOCK_END)) -> value event { + /* FN matching the beginning of current block: */ + ev_begin_fn := event.data.tdma_fn - 3; /* Dequeue a DATA.ind message */ f_PCUIF_MsgQueue_dequeue(pdtch_data_queue, pcu_msg); /* Patch TDMA frame / block number */ - pcu_msg.u.data_ind.fn := event.data.tdma_fn; + pcu_msg.u.data_ind.fn := ev_begin_fn; pcu_msg.u.data_ind.block_nr := 0; /* FIXME! */ PCUIF.send(pcu_msg); /* Send to the PCU and notify the TC */ - TC.send(ts_RAW_PCU_CLCK_EV(TDMA_EV_PDTCH_BLOCK_SENT, event.data.tdma_fn)); + TC.send(ts_RAW_PCU_CLCK_EV(TDMA_EV_PDTCH_BLOCK_SENT, ev_begin_fn)); repeat; } [lengthof(ptcch_rts_queue) > 0] CLCK.receive(tr_RAW_PCU_EV(TDMA_EV_PTCCH_DL_BLOCK)) -> value event { + /* FN matching the beginning of current block: */ + ev_begin_fn := event.data.tdma_fn - 3; /* Dequeue an RTS.req message for PTCCH */ f_PCUIF_MsgQueue_dequeue(ptcch_rts_queue, pcu_msg); /* Patch TDMA frame / block number and send */ - pcu_msg.u.rts_req.fn := event.data.tdma_fn; + pcu_msg.u.rts_req.fn := ev_begin_fn; pcu_msg.u.rts_req.block_nr := 0; /* FIXME! */ PCUIF.send(pcu_msg); repeat; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iba0b1d1a3d7d875c5443a7bcaff399f9681624ad Gerrit-Change-Number: 16486 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 20:51:05 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 20:51:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Verify contents of data dl blocks originated from emulated SGSN In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16485 ) Change subject: pcu: Verify contents of data dl blocks originated from emulated SGSN ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4fe79572094038cbb26d5195c0544846ca2550b5 Gerrit-Change-Number: 16485 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 20:51:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 20:53:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 20:53:13 +0000 Subject: Change in osmo-remsim[master]: bankd: Fix log print during removeMapping References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16488 ) Change subject: bankd: Fix log print during removeMapping ...................................................................... bankd: Fix log print during removeMapping We need to dereference 'rreq' nor 'creq' in the remove handling. Change-Id: I04e9e2447336f7d1aaeb932928a79bb705aa0c5a --- M src/bankd/bankd_main.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/88/16488/1 diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 7851a2b..7b50a73 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -190,11 +190,11 @@ rreq = &pdu->msg.choice.removeMappingReq; if (rreq->bank.bankId != g_bankd->srvc.bankd.bank_id) { LOGPFSML(srvc->fi, LOGL_ERROR, "removeMapping specifies invalid Bank ID %lu " - "(we are %u)\n", creq->bank.bankId, g_bankd->srvc.bankd.bank_id); + "(we are %u)\n", rreq->bank.bankId, g_bankd->srvc.bankd.bank_id); resp = rspro_gen_RemoveMappingRes(ResultCode_illegalBankId); } else if (rreq->bank.slotNr >= g_bankd->srvc.bankd.num_slots) { LOGPFSML(srvc->fi, LOGL_ERROR, "removeMapping specifies invalid Slot Nr %lu " - "(we have %u)\n", creq->bank.slotNr, g_bankd->srvc.bankd.num_slots); + "(we have %u)\n", rreq->bank.slotNr, g_bankd->srvc.bankd.num_slots); resp = rspro_gen_RemoveMappingRes(ResultCode_illegalSlotId); } else { rspro2bank_slot(&bs, &rreq->bank); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I04e9e2447336f7d1aaeb932928a79bb705aa0c5a Gerrit-Change-Number: 16488 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 20:53:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 20:53:13 +0000 Subject: Change in osmo-remsim[master]: bankd: Reject removeSlotmap when ClientID doesn't match References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16489 ) Change subject: bankd: Reject removeSlotmap when ClientID doesn't match ...................................................................... bankd: Reject removeSlotmap when ClientID doesn't match It's a bit of a matter of taste whether we should simply log + ignore if the Client of a removeMappingReq doesn't match what the bankd currently has configured. I chose to reject it, as a new createMapping for the same bandk+slot will overwrite any existing mapping anyway, at least as of I83e319d22896b881c0d882542842f500075aa546 Change-Id: I892282821f4650614d1d08ed4bdf11eaabf947c0 --- M src/bankd/bankd_main.c 1 file changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/89/16489/1 diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 03101fb..94227e3 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -217,9 +217,15 @@ LOGPFSML(srvc->fi, LOGL_ERROR, "could not find to-be-deleted slotmap\n"); resp = rspro_gen_RemoveMappingRes(ResultCode_unknownSlotmap); } else { - LOGPFSM(srvc->fi, "removing slotmap\n"); - bankd_srvc_remove_mapping(map); - resp = rspro_gen_RemoveMappingRes(ResultCode_ok); + rspro2client_slot(&cs, &rreq->client); + if (!client_slot_equals(&map->client, &cs)) { + LOGPFSM(srvc->fi, "ClientId in removeMappingReq != map\n"); + resp = rspro_gen_RemoveMappingRes(ResultCode_unknownSlotmap); + } else { + LOGPFSM(srvc->fi, "removing slotmap\n"); + bankd_srvc_remove_mapping(map); + resp = rspro_gen_RemoveMappingRes(ResultCode_ok); + } } } server_conn_send_rspro(srvc, resp); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I892282821f4650614d1d08ed4bdf11eaabf947c0 Gerrit-Change-Number: 16489 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 20:53:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 20:53:13 +0000 Subject: Change in osmo-remsim[master]: bankd: initialize bank_id/slot_nr to 0xffff for unmapped workers References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16490 ) Change subject: bankd: initialize bank_id/slot_nr to 0xffff for unmapped workers ...................................................................... bankd: initialize bank_id/slot_nr to 0xffff for unmapped workers Otherwise the loop for SIGMAPDEL delivery code will match any unused worker for bank_id=0/slot_nr=0, which is not what we want. This also makes repeated RemsimBankd_Tests.TC_removeMapping_connected runs work reliably. Change-Id: I6976eb96feae6a3b66bacf787e436a2df29f9ce0 --- M src/bankd/bankd_main.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/90/16490/1 diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 94227e3..09a9e1d 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -411,6 +411,8 @@ { LOGW(g_worker, "SIGMAPDEL received: Main thread informs us our map is gone\n"); OSMO_ASSERT(sig == SIGMAPDEL); + g_worker->slot.bank_id = 0xffff; + g_worker->slot.slot_nr = 0xffff; worker_set_state(g_worker, BW_ST_CONN_CLIENT_UNMAPPED); } @@ -852,6 +854,9 @@ /* push cleanup helper */ pthread_cleanup_push(&worker_cleanup, g_worker); + g_worker->slot.bank_id = 0xffff; + g_worker->slot.slot_nr = 0xffff; + /* we continuously perform the same loop here, recycling the worker thread * once the client connection is gone or we have some trouble with the card/reader */ while (1) { -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I6976eb96feae6a3b66bacf787e436a2df29f9ce0 Gerrit-Change-Number: 16490 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 20:53:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 20:53:13 +0000 Subject: Change in osmo-remsim[master]: RSPRO: Add new ResetState{Req,Res} References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16491 ) Change subject: RSPRO: Add new ResetState{Req,Res} ...................................................................... RSPRO: Add new ResetState{Req,Res} These commands are introduced to enable the server to request the full reset of all state in a client or bankd. This is particularly useful in TTCN-3 tests, where we typically want to reset the state between tests. Change-Id: I442bab523486bbdf2faa8028f8972cd0af795303 --- M asn1/RSPRO.asn M include/osmocom/rspro/Makefile.am A include/osmocom/rspro/ResetStateReq.h A include/osmocom/rspro/ResetStateRes.h M include/osmocom/rspro/RsproPDUchoice.h M src/rspro/ConfigClientBankReq.c M src/rspro/ConfigClientBankRes.c M src/rspro/ConfigClientIdReq.c M src/rspro/ConfigClientIdRes.c M src/rspro/Makefile.am A src/rspro/ResetStateReq.c A src/rspro/ResetStateRes.c M src/rspro/RsproPDUchoice.c M src/rspro_util.c M src/rspro_util.h 15 files changed, 269 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/91/16491/1 diff --git a/asn1/RSPRO.asn b/asn1/RSPRO.asn index 65152ec..1b1be6d 100644 --- a/asn1/RSPRO.asn +++ b/asn1/RSPRO.asn @@ -308,6 +308,17 @@ ... } +-- SERVER->*: request reset of all state on peer side +ResetStateReq ::= SEQUENCE { + ... +} + +-- *->SERVER: confirm reset of all state on peer side +ResetStateRes ::= SEQUENCE { + result ResultCode, + ... +} + ---------------------------------------------------------------------- -- PDU @@ -328,6 +339,8 @@ configClientBankReq [17] ConfigClientBankReq, configClientBankRes [18] ConfigClientBankRes, errorInd [16] ErrorInd, + resetStateReq [19] ResetStateReq, + resetStateRes [20] ResetStateRes, -- APDUs etc. setAtrReq [10] SetAtrReq, setAtrRes [11] SetAtrRes, diff --git a/include/osmocom/rspro/Makefile.am b/include/osmocom/rspro/Makefile.am index 4ffaa32..7549ffb 100644 --- a/include/osmocom/rspro/Makefile.am +++ b/include/osmocom/rspro/Makefile.am @@ -31,6 +31,8 @@ PortNumber.h \ RemoveMappingReq.h \ RemoveMappingRes.h \ + ResetStateReq.h \ + ResetStateRes.h \ ResultCode.h \ RsproPDU.h \ RsproPDUchoice.h \ diff --git a/include/osmocom/rspro/ResetStateReq.h b/include/osmocom/rspro/ResetStateReq.h new file mode 100644 index 0000000..b56fe43 --- /dev/null +++ b/include/osmocom/rspro/ResetStateReq.h @@ -0,0 +1,39 @@ +/* + * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) + * From ASN.1 module "RSPRO" + * found in "../../asn1/RSPRO.asn" + */ + +#ifndef _ResetStateReq_H_ +#define _ResetStateReq_H_ + + +#include + +/* Including external dependencies */ +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/* ResetStateReq */ +typedef struct ResetStateReq { + /* + * This type is extensible, + * possible extensions are below. + */ + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; +} ResetStateReq_t; + +/* Implementation */ +extern asn_TYPE_descriptor_t asn_DEF_ResetStateReq; + +#ifdef __cplusplus +} +#endif + +#endif /* _ResetStateReq_H_ */ +#include diff --git a/include/osmocom/rspro/ResetStateRes.h b/include/osmocom/rspro/ResetStateRes.h new file mode 100644 index 0000000..622375e --- /dev/null +++ b/include/osmocom/rspro/ResetStateRes.h @@ -0,0 +1,41 @@ +/* + * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) + * From ASN.1 module "RSPRO" + * found in "../../asn1/RSPRO.asn" + */ + +#ifndef _ResetStateRes_H_ +#define _ResetStateRes_H_ + + +#include + +/* Including external dependencies */ +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/* ResetStateRes */ +typedef struct ResetStateRes { + ResultCode_t result; + /* + * This type is extensible, + * possible extensions are below. + */ + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; +} ResetStateRes_t; + +/* Implementation */ +extern asn_TYPE_descriptor_t asn_DEF_ResetStateRes; + +#ifdef __cplusplus +} +#endif + +#endif /* _ResetStateRes_H_ */ +#include diff --git a/include/osmocom/rspro/RsproPDUchoice.h b/include/osmocom/rspro/RsproPDUchoice.h index d603fa1..ebb2971 100644 --- a/include/osmocom/rspro/RsproPDUchoice.h +++ b/include/osmocom/rspro/RsproPDUchoice.h @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include #include #include @@ -52,6 +54,8 @@ RsproPDUchoice_PR_configClientBankReq, RsproPDUchoice_PR_configClientBankRes, RsproPDUchoice_PR_errorInd, + RsproPDUchoice_PR_resetStateReq, + RsproPDUchoice_PR_resetStateRes, RsproPDUchoice_PR_setAtrReq, RsproPDUchoice_PR_setAtrRes, RsproPDUchoice_PR_tpduModemToCard, @@ -79,6 +83,8 @@ ConfigClientBankReq_t configClientBankReq; ConfigClientBankRes_t configClientBankRes; ErrorInd_t errorInd; + ResetStateReq_t resetStateReq; + ResetStateRes_t resetStateRes; SetAtrReq_t setAtrReq; SetAtrRes_t setAtrRes; TpduModemToCard_t tpduModemToCard; diff --git a/src/rspro/ConfigClientBankReq.c b/src/rspro/ConfigClientBankReq.c index f19c9ee..a4cd21e 100644 --- a/src/rspro/ConfigClientBankReq.c +++ b/src/rspro/ConfigClientBankReq.c @@ -4,7 +4,7 @@ * found in "../../asn1/RSPRO.asn" */ -#include "ConfigClientBankReq.h" +#include static asn_TYPE_member_t asn_MBR_ConfigClientBankReq_1[] = { { ATF_NOFLAGS, 0, offsetof(struct ConfigClientBankReq, bankSlot), diff --git a/src/rspro/ConfigClientBankRes.c b/src/rspro/ConfigClientBankRes.c index 4b3c18a..877100b 100644 --- a/src/rspro/ConfigClientBankRes.c +++ b/src/rspro/ConfigClientBankRes.c @@ -4,7 +4,7 @@ * found in "../../asn1/RSPRO.asn" */ -#include "ConfigClientBankRes.h" +#include static asn_TYPE_member_t asn_MBR_ConfigClientBankRes_1[] = { { ATF_NOFLAGS, 0, offsetof(struct ConfigClientBankRes, result), diff --git a/src/rspro/ConfigClientIdReq.c b/src/rspro/ConfigClientIdReq.c index 570013a..548035c 100644 --- a/src/rspro/ConfigClientIdReq.c +++ b/src/rspro/ConfigClientIdReq.c @@ -4,7 +4,7 @@ * found in "../../asn1/RSPRO.asn" */ -#include "ConfigClientIdReq.h" +#include static asn_TYPE_member_t asn_MBR_ConfigClientIdReq_1[] = { { ATF_NOFLAGS, 0, offsetof(struct ConfigClientIdReq, clientSlot), diff --git a/src/rspro/ConfigClientIdRes.c b/src/rspro/ConfigClientIdRes.c index a8b0691..23f2699 100644 --- a/src/rspro/ConfigClientIdRes.c +++ b/src/rspro/ConfigClientIdRes.c @@ -4,7 +4,7 @@ * found in "../../asn1/RSPRO.asn" */ -#include "ConfigClientIdRes.h" +#include static asn_TYPE_member_t asn_MBR_ConfigClientIdRes_1[] = { { ATF_NOFLAGS, 0, offsetof(struct ConfigClientIdRes, result), diff --git a/src/rspro/Makefile.am b/src/rspro/Makefile.am index 91f0f35..df3ccf4 100644 --- a/src/rspro/Makefile.am +++ b/src/rspro/Makefile.am @@ -31,6 +31,8 @@ PortNumber.c \ RemoveMappingReq.c \ RemoveMappingRes.c \ + ResetStateReq.c \ + ResetStateRes.c \ ResultCode.c \ RsproPDU.c \ RsproPDUchoice.c \ @@ -76,6 +78,8 @@ PortNumber.h \ RemoveMappingReq.h \ RemoveMappingRes.h \ + ResetStateReq.h \ + ResetStateRes.h \ ResultCode.h \ RsproPDU.h \ RsproPDUchoice.h \ diff --git a/src/rspro/ResetStateReq.c b/src/rspro/ResetStateReq.c new file mode 100644 index 0000000..538a18c --- /dev/null +++ b/src/rspro/ResetStateReq.c @@ -0,0 +1,44 @@ +/* + * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) + * From ASN.1 module "RSPRO" + * found in "../../asn1/RSPRO.asn" + */ + +#include "ResetStateReq.h" + +static const ber_tlv_tag_t asn_DEF_ResetStateReq_tags_1[] = { + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static asn_SEQUENCE_specifics_t asn_SPC_ResetStateReq_specs_1 = { + sizeof(struct ResetStateReq), + offsetof(struct ResetStateReq, _asn_ctx), + 0, /* No top level tags */ + 0, /* No tags in the map */ + 0, 0, 0, /* Optional elements (not needed) */ + -1, /* Start extensions */ + -1 /* Stop extensions */ +}; +asn_TYPE_descriptor_t asn_DEF_ResetStateReq = { + "ResetStateReq", + "ResetStateReq", + SEQUENCE_free, + SEQUENCE_print, + SEQUENCE_constraint, + SEQUENCE_decode_ber, + SEQUENCE_encode_der, + SEQUENCE_decode_xer, + SEQUENCE_encode_xer, + 0, 0, /* No UPER support, use "-gen-PER" to enable */ + 0, 0, /* No APER support, use "-gen-PER" to enable */ + 0, /* Use generic outmost tag fetcher */ + asn_DEF_ResetStateReq_tags_1, + sizeof(asn_DEF_ResetStateReq_tags_1) + /sizeof(asn_DEF_ResetStateReq_tags_1[0]), /* 1 */ + asn_DEF_ResetStateReq_tags_1, /* Same as above */ + sizeof(asn_DEF_ResetStateReq_tags_1) + /sizeof(asn_DEF_ResetStateReq_tags_1[0]), /* 1 */ + 0, /* No PER visible constraints */ + 0, 0, /* No members */ + &asn_SPC_ResetStateReq_specs_1 /* Additional specs */ +}; + diff --git a/src/rspro/ResetStateRes.c b/src/rspro/ResetStateRes.c new file mode 100644 index 0000000..551dcc4 --- /dev/null +++ b/src/rspro/ResetStateRes.c @@ -0,0 +1,59 @@ +/* + * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) + * From ASN.1 module "RSPRO" + * found in "../../asn1/RSPRO.asn" + */ + +#include "ResetStateRes.h" + +static asn_TYPE_member_t asn_MBR_ResetStateRes_1[] = { + { ATF_NOFLAGS, 0, offsetof(struct ResetStateRes, result), + (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), + 0, + &asn_DEF_ResultCode, + 0, /* Defer constraints checking to the member type */ + 0, /* PER is not compiled, use -gen-PER */ + 0, + "result" + }, +}; +static const ber_tlv_tag_t asn_DEF_ResetStateRes_tags_1[] = { + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static const asn_TYPE_tag2member_t asn_MAP_ResetStateRes_tag2el_1[] = { + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* result */ +}; +static asn_SEQUENCE_specifics_t asn_SPC_ResetStateRes_specs_1 = { + sizeof(struct ResetStateRes), + offsetof(struct ResetStateRes, _asn_ctx), + asn_MAP_ResetStateRes_tag2el_1, + 1, /* Count of tags in the map */ + 0, 0, 0, /* Optional elements (not needed) */ + 0, /* Start extensions */ + 2 /* Stop extensions */ +}; +asn_TYPE_descriptor_t asn_DEF_ResetStateRes = { + "ResetStateRes", + "ResetStateRes", + SEQUENCE_free, + SEQUENCE_print, + SEQUENCE_constraint, + SEQUENCE_decode_ber, + SEQUENCE_encode_der, + SEQUENCE_decode_xer, + SEQUENCE_encode_xer, + 0, 0, /* No UPER support, use "-gen-PER" to enable */ + 0, 0, /* No APER support, use "-gen-PER" to enable */ + 0, /* Use generic outmost tag fetcher */ + asn_DEF_ResetStateRes_tags_1, + sizeof(asn_DEF_ResetStateRes_tags_1) + /sizeof(asn_DEF_ResetStateRes_tags_1[0]), /* 1 */ + asn_DEF_ResetStateRes_tags_1, /* Same as above */ + sizeof(asn_DEF_ResetStateRes_tags_1) + /sizeof(asn_DEF_ResetStateRes_tags_1[0]), /* 1 */ + 0, /* No PER visible constraints */ + asn_MBR_ResetStateRes_1, + 1, /* Elements count */ + &asn_SPC_ResetStateRes_specs_1 /* Additional specs */ +}; + diff --git a/src/rspro/RsproPDUchoice.c b/src/rspro/RsproPDUchoice.c index a5f7161..0d19180 100644 --- a/src/rspro/RsproPDUchoice.c +++ b/src/rspro/RsproPDUchoice.c @@ -124,6 +124,24 @@ 0, "errorInd" }, + { ATF_NOFLAGS, 0, offsetof(struct RsproPDUchoice, choice.resetStateReq), + (ASN_TAG_CLASS_CONTEXT | (19 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_ResetStateReq, + 0, /* Defer constraints checking to the member type */ + 0, /* PER is not compiled, use -gen-PER */ + 0, + "resetStateReq" + }, + { ATF_NOFLAGS, 0, offsetof(struct RsproPDUchoice, choice.resetStateRes), + (ASN_TAG_CLASS_CONTEXT | (20 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_ResetStateRes, + 0, /* Defer constraints checking to the member type */ + 0, /* PER is not compiled, use -gen-PER */ + 0, + "resetStateRes" + }, { ATF_NOFLAGS, 0, offsetof(struct RsproPDUchoice, choice.setAtrReq), (ASN_TAG_CLASS_CONTEXT | (10 << 2)), -1, /* IMPLICIT tag at current level */ @@ -190,15 +208,17 @@ { (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 7, 0, 0 }, /* removeMappingRes */ { (ASN_TAG_CLASS_CONTEXT | (8 << 2)), 8, 0, 0 }, /* configClientIdReq */ { (ASN_TAG_CLASS_CONTEXT | (9 << 2)), 9, 0, 0 }, /* configClientIdRes */ - { (ASN_TAG_CLASS_CONTEXT | (10 << 2)), 13, 0, 0 }, /* setAtrReq */ - { (ASN_TAG_CLASS_CONTEXT | (11 << 2)), 14, 0, 0 }, /* setAtrRes */ - { (ASN_TAG_CLASS_CONTEXT | (12 << 2)), 15, 0, 0 }, /* tpduModemToCard */ - { (ASN_TAG_CLASS_CONTEXT | (13 << 2)), 16, 0, 0 }, /* tpduCardToModem */ - { (ASN_TAG_CLASS_CONTEXT | (14 << 2)), 17, 0, 0 }, /* clientSlotStatusInd */ - { (ASN_TAG_CLASS_CONTEXT | (15 << 2)), 18, 0, 0 }, /* bankSlotStatusInd */ + { (ASN_TAG_CLASS_CONTEXT | (10 << 2)), 15, 0, 0 }, /* setAtrReq */ + { (ASN_TAG_CLASS_CONTEXT | (11 << 2)), 16, 0, 0 }, /* setAtrRes */ + { (ASN_TAG_CLASS_CONTEXT | (12 << 2)), 17, 0, 0 }, /* tpduModemToCard */ + { (ASN_TAG_CLASS_CONTEXT | (13 << 2)), 18, 0, 0 }, /* tpduCardToModem */ + { (ASN_TAG_CLASS_CONTEXT | (14 << 2)), 19, 0, 0 }, /* clientSlotStatusInd */ + { (ASN_TAG_CLASS_CONTEXT | (15 << 2)), 20, 0, 0 }, /* bankSlotStatusInd */ { (ASN_TAG_CLASS_CONTEXT | (16 << 2)), 12, 0, 0 }, /* errorInd */ { (ASN_TAG_CLASS_CONTEXT | (17 << 2)), 10, 0, 0 }, /* configClientBankReq */ - { (ASN_TAG_CLASS_CONTEXT | (18 << 2)), 11, 0, 0 } /* configClientBankRes */ + { (ASN_TAG_CLASS_CONTEXT | (18 << 2)), 11, 0, 0 }, /* configClientBankRes */ + { (ASN_TAG_CLASS_CONTEXT | (19 << 2)), 13, 0, 0 }, /* resetStateReq */ + { (ASN_TAG_CLASS_CONTEXT | (20 << 2)), 14, 0, 0 } /* resetStateRes */ }; static asn_CHOICE_specifics_t asn_SPC_RsproPDUchoice_specs_1 = { sizeof(struct RsproPDUchoice), @@ -206,9 +226,9 @@ offsetof(struct RsproPDUchoice, present), sizeof(((struct RsproPDUchoice *)0)->present), asn_MAP_RsproPDUchoice_tag2el_1, - 19, /* Count of tags in the map */ + 21, /* Count of tags in the map */ 0, - 19 /* Extensions start */ + 21 /* Extensions start */ }; asn_TYPE_descriptor_t asn_DEF_RsproPDUchoice = { "RsproPDUchoice", @@ -229,7 +249,7 @@ 0, /* No tags (count) */ 0, /* No PER visible constraints */ asn_MBR_RsproPDUchoice_1, - 19, /* Elements count */ + 21, /* Elements count */ &asn_SPC_RsproPDUchoice_specs_1 /* Additional specs */ }; diff --git a/src/rspro_util.c b/src/rspro_util.c index 5c78b60..422aef4 100644 --- a/src/rspro_util.c +++ b/src/rspro_util.c @@ -385,6 +385,29 @@ return pdu; } +RsproPDU_t *rspro_gen_ResetStateReq(void) +{ + RsproPDU_t *pdu = CALLOC(1, sizeof(*pdu)); + if (!pdu) + return NULL; + pdu->version = 2; + pdu->msg.present = RsproPDUchoice_PR_resetStateReq; + + return pdu; +} + +RsproPDU_t *rspro_gen_ResetStateRes(e_ResultCode res) +{ + RsproPDU_t *pdu = CALLOC(1, sizeof(*pdu)); + if (!pdu) + return NULL; + pdu->version = 2; + pdu->msg.present = RsproPDUchoice_PR_resetStateRes; + pdu->msg.choice.resetStateRes.result = res; + + return pdu; +} + e_ResultCode rspro_get_result(const RsproPDU_t *pdu) { switch (pdu->msg.present) { @@ -402,6 +425,8 @@ return pdu->msg.choice.configClientBankRes.result; case RsproPDUchoice_PR_setAtrRes: return pdu->msg.choice.setAtrRes.result; + case RsproPDUchoice_PR_resetStateRes: + return pdu->msg.choice.resetStateRes.result; default: OSMO_ASSERT(0); } diff --git a/src/rspro_util.h b/src/rspro_util.h index 444d34a..8c6ae3b 100644 --- a/src/rspro_util.h +++ b/src/rspro_util.h @@ -42,6 +42,8 @@ const uint8_t *tpdu, unsigned int tpdu_len); RsproPDU_t *rspro_gen_TpduCard2Modem(const BankSlot_t *bank, const ClientSlot_t *client, const uint8_t *tpdu, unsigned int tpdu_len); +RsproPDU_t *rspro_gen_ResetStateReq(void); +RsproPDU_t *rspro_gen_ResetStateRes(e_ResultCode res); e_ResultCode rspro_get_result(const RsproPDU_t *pdu); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16491 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I442bab523486bbdf2faa8028f8972cd0af795303 Gerrit-Change-Number: 16491 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 20:53:14 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 20:53:14 +0000 Subject: Change in osmo-remsim[master]: bankd: Implement new ResetStateReq References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16492 ) Change subject: bankd: Implement new ResetStateReq ...................................................................... bankd: Implement new ResetStateReq Change-Id: Ib794e605162903a2b2c4f4516887ec91fc8d139a --- M src/bankd/bankd_main.c M src/slotmap.c M src/slotmap.h 3 files changed, 30 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/92/16492/1 diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 09a9e1d..5137635 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -150,6 +150,7 @@ { const CreateMappingReq_t *creq = NULL; const RemoveMappingReq_t *rreq = NULL; + struct bankd_worker *worker; struct slot_mapping *map; struct bank_slot bs; struct client_slot cs; @@ -230,6 +231,19 @@ } server_conn_send_rspro(srvc, resp); break; + case RsproPDUchoice_PR_resetStateReq: + /* delete all slotmaps */ + slotmap_del_all(g_bankd->slotmaps); + /* notify all workers about maps having disappeared */ + pthread_mutex_lock(&g_bankd->workers_mutex); + llist_for_each_entry(worker, &g_bankd->workers, list) { + pthread_kill(worker->thread, SIGMAPDEL); + } + pthread_mutex_unlock(&g_bankd->workers_mutex); + /* send response to server */ + resp = rspro_gen_ResetStateRes(ResultCode_ok); + server_conn_send_rspro(srvc, resp); + break; default: LOGPFSML(srvc->fi, LOGL_ERROR, "Unknown/Unsupported RSPRO PDU type: %u\n", pdu->msg.present); diff --git a/src/slotmap.c b/src/slotmap.c index b4a8e6f..b837f01 100644 --- a/src/slotmap.c +++ b/src/slotmap.c @@ -159,6 +159,19 @@ slotmaps_unlock(maps); } + +/* thread-safe removal of all bank<->client maps */ +void slotmap_del_all(struct slotmaps *maps) +{ + struct slot_mapping *map, *map2; + + slotmaps_wrlock(maps); + llist_for_each_entry_safe(map, map2, &maps->mappings, list) { + _slotmap_del(maps, map); + } + slotmaps_unlock(maps); +} + struct slotmaps *slotmap_init(void *ctx) { struct slotmaps *sm = talloc_zero(ctx, struct slotmaps); diff --git a/src/slotmap.h b/src/slotmap.h index bf18e04..3d07c8d 100644 --- a/src/slotmap.h +++ b/src/slotmap.h @@ -83,6 +83,9 @@ void slotmap_del(struct slotmaps *maps, struct slot_mapping *map); void _slotmap_del(struct slotmaps *maps, struct slot_mapping *map); +/* thread-safe removal of all bank<->client maps */ +void slotmap_del_all(struct slotmaps *maps); + /* initialize the entire map collection */ struct slotmaps *slotmap_init(void *ctx); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16492 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ib794e605162903a2b2c4f4516887ec91fc8d139a Gerrit-Change-Number: 16492 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 20:55:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 20:55:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: remsim: Update RSPRO for ResetState{Req, Res} messages References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16493 ) Change subject: remsim: Update RSPRO for ResetState{Req,Res} messages ...................................................................... remsim: Update RSPRO for ResetState{Req,Res} messages Change-Id: Ia9520b50c4ec2e703cc876cc7f79f3aeda90dba3 --- M remsim/RSPRO.asn M remsim/RSPRO_Server.ttcn M remsim/RSPRO_Types.ttcn 3 files changed, 42 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/93/16493/1 diff --git a/remsim/RSPRO.asn b/remsim/RSPRO.asn index aaafb96..ce29003 100644 --- a/remsim/RSPRO.asn +++ b/remsim/RSPRO.asn @@ -310,6 +310,17 @@ ... } +-- SERVER->*: request reset of all state on peer side +ResetStateReq ::= SEQUENCE { + ... +} + +-- *->SERVER: confirm reset of all state on peer side +ResetStateRes ::= SEQUENCE { + result ResultCode, + ... +} + ---------------------------------------------------------------------- -- PDU @@ -330,6 +341,8 @@ configClientBankReq [17] ConfigClientBankReq, configClientBankRes [18] ConfigClientBankRes, errorInd [16] ErrorInd, + resetStateReq [19] ResetStateReq, + resetStateRes [20] ResetStateRes, -- APDUs etc. setAtrReq [10] SetAtrReq, setAtrRes [11] SetAtrRes, diff --git a/remsim/RSPRO_Server.ttcn b/remsim/RSPRO_Server.ttcn index 977e7c6..5c9051c 100644 --- a/remsim/RSPRO_Server.ttcn +++ b/remsim/RSPRO_Server.ttcn @@ -147,6 +147,12 @@ f_rspro_srv_exp(tr_RSPRO_ConfigClientBankRes(exp_res)); } +function f_rspro_srv_reset_state(template ResultCode exp_res := ok, integer i := 0) +runs on rspro_server_CT +{ + RSPRO_SRV[i].send(ts_RSPRO_ResetStateReq); + f_rspro_srv_exp(tr_RSPRO_ResetStateRes(exp_res)); +} altstep as_connectBankReq(template ComponentIdentity comp_id := tr_CompId(remsimBankd, ?, "remsim-bankd", ?), diff --git a/remsim/RSPRO_Types.ttcn b/remsim/RSPRO_Types.ttcn index 1eb84bd..44b80f6 100644 --- a/remsim/RSPRO_Types.ttcn +++ b/remsim/RSPRO_Types.ttcn @@ -371,5 +371,28 @@ } }); +template (value) RsproPDU ts_RSPRO_ResetStateReq := + ts_RSPRO(RsproPDUchoice: { + resetStateReq := {} + }); +template RsproPDU tr_RSPRO_ResetStateReq := + tr_RSPRO(RsproPDUchoice: { + resetStateReq := {} + }); + +template (value) RsproPDU ts_RSPRO_ResetStateRes(template (value) ResultCode res) := + ts_RSPRO(RsproPDUchoice:{ + resetStateRes := { + result := res + } + }); +template RsproPDU tr_RSPRO_ResetStateRes(template ResultCode res) := + tr_RSPRO(RsproPDUchoice:{ + resetStateRes := { + result := res + } + }); + + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia9520b50c4ec2e703cc876cc7f79f3aeda90dba3 Gerrit-Change-Number: 16493 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 20:55:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 20:55:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: remsim: Reset the bankd-side state at start of test References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16494 ) Change subject: remsim: Reset the bankd-side state at start of test ...................................................................... remsim: Reset the bankd-side state at start of test In general we don't want that bankd retains state from one test case to another. Let's issue the new RSPRO ResetStateReq at the start of each relevant test Change-Id: If810ccbbc848dd2448a4eaea20c80f60f15a2e84 --- M remsim/RemsimBankd_Tests.ttcn 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/94/16494/1 diff --git a/remsim/RemsimBankd_Tests.ttcn b/remsim/RemsimBankd_Tests.ttcn index bbdea6d..4e87024 100644 --- a/remsim/RemsimBankd_Tests.ttcn +++ b/remsim/RemsimBankd_Tests.ttcn @@ -81,6 +81,7 @@ testcase TC_createMapping() runs on bankd_test_CT { f_init(); as_connectBankReq(bid := mp_bank_id, nslots := mp_num_slots); + f_rspro_srv_reset_state(ok); var BankSlot bs := { bankId := mp_bank_id, slotNr := 0 }; var ClientSlot cs := { clientId := 23, slotNr := 42 }; f_rspro_srv_create_slotmap(cs, bs); @@ -91,6 +92,7 @@ testcase TC_createMapping_busySlot() runs on bankd_test_CT { f_init(); as_connectBankReq(bid := mp_bank_id, nslots := mp_num_slots); + f_rspro_srv_reset_state(ok); var BankSlot bs := { bankId := mp_bank_id, slotNr := 0 }; var ClientSlot cs := { clientId := 23, slotNr := 42 }; f_rspro_srv_create_slotmap(cs, bs); @@ -102,6 +104,7 @@ testcase TC_createMapping_invalidSlot() runs on bankd_test_CT { f_init(); as_connectBankReq(bid := mp_bank_id, nslots := mp_num_slots); + f_rspro_srv_reset_state(ok); var BankSlot bs := { bankId := mp_bank_id, slotNr := 200 }; var ClientSlot cs := { clientId := 23, slotNr := 42 }; f_rspro_srv_create_slotmap(cs, bs, exp_res := illegalSlotId); @@ -112,6 +115,7 @@ testcase TC_createMapping_invalidBank() runs on bankd_test_CT { f_init(); as_connectBankReq(bid := mp_bank_id, nslots := mp_num_slots); + f_rspro_srv_reset_state(ok); var BankSlot bs := { bankId := 200, slotNr := 0 }; var ClientSlot cs := { clientId := 23, slotNr := 42 }; f_rspro_srv_create_slotmap(cs, bs, exp_res := illegalBankId); @@ -122,6 +126,7 @@ testcase TC_removeMapping_unknownMap() runs on bankd_test_CT { f_init(); as_connectBankReq(bid := mp_bank_id, nslots := mp_num_slots); + f_rspro_srv_reset_state(ok); var BankSlot bs := { bankId := mp_bank_id, slotNr := 0 }; var ClientSlot cs := { clientId := 23, slotNr := 42 }; f_rspro_srv_remove_slotmap(cs, bs, exp_res := unknownSlotmap); @@ -132,6 +137,7 @@ testcase TC_removeMapping() runs on bankd_test_CT { f_init(); as_connectBankReq(bid := mp_bank_id, nslots := mp_num_slots); + f_rspro_srv_reset_state(ok); var BankSlot bs := { bankId := mp_bank_id, slotNr := 0 }; var ClientSlot cs := { clientId := 23, slotNr := 42 }; f_rspro_srv_create_slotmap(cs, bs); @@ -180,6 +186,7 @@ f_init(); as_connectBankReq(bid := mp_bank_id, nslots := mp_num_slots); + f_rspro_srv_reset_state(ok); var BankSlot bs := { bankId := mp_bank_id, slotNr := 0 }; f_rspro_srv_create_slotmap(rspro[0].rspro_client_slot, bs); @@ -201,6 +208,7 @@ f_init(); as_connectBankReq(bid := mp_bank_id, nslots := mp_num_slots); + f_rspro_srv_reset_state(ok); var BankSlot bs := { bankId := mp_bank_id, slotNr := 0 }; f_rspro_srv_create_slotmap(rspro[0].rspro_client_slot, bs); @@ -248,6 +256,7 @@ f_init(); as_connectBankReq(bid := mp_bank_id, nslots := mp_num_slots); + f_rspro_srv_reset_state(ok); var BankSlot bs := { bankId := mp_bank_id, slotNr := 0 }; f_rspro_srv_create_slotmap(rspro[0].rspro_client_slot, bs); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16494 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If810ccbbc848dd2448a4eaea20c80f60f15a2e84 Gerrit-Change-Number: 16494 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 20:55:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 20:55:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: resmim: Adjust TC_createMapping_busySlot to current bankd code References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16495 ) Change subject: resmim: Adjust TC_createMapping_busySlot to current bankd code ...................................................................... resmim: Adjust TC_createMapping_busySlot to current bankd code Since osmo-remsim Change-Id I83e319d22896b881c0d882542842f500075aa546 createMapping will overwrite any existing mappings that may already exist for that bank-slot. We need to adjust our test expectations accordingly. Change-Id: Ia8de9edd7edb0437cd783b7d045571ff69820c42 --- M remsim/RemsimBankd_Tests.ttcn 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/95/16495/1 diff --git a/remsim/RemsimBankd_Tests.ttcn b/remsim/RemsimBankd_Tests.ttcn index 4e87024..e86dc16 100644 --- a/remsim/RemsimBankd_Tests.ttcn +++ b/remsim/RemsimBankd_Tests.ttcn @@ -95,8 +95,10 @@ f_rspro_srv_reset_state(ok); var BankSlot bs := { bankId := mp_bank_id, slotNr := 0 }; var ClientSlot cs := { clientId := 23, slotNr := 42 }; + /* create the mapping the first time */ f_rspro_srv_create_slotmap(cs, bs); - f_rspro_srv_create_slotmap(cs, bs, exp_res := illegalSlotId); + /* re-create the mapping a second time */ + f_rspro_srv_create_slotmap(cs, bs); Misc_Helpers.f_shutdown(__BFILE__, __LINE__, pass); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16495 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia8de9edd7edb0437cd783b7d045571ff69820c42 Gerrit-Change-Number: 16495 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:05:26 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 4 Dec 2019 21:05:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix incorrect FN being send over PCUIF to PCU In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16486 ) Change subject: pcu: Fix incorrect FN being send over PCUIF to PCU ...................................................................... Patch Set 1: Code-Review-1 (1 comment) Fine in general, but breaks PTCCH/D... https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16486/1/pcu/PCUIF_RAW_Components.ttcn File pcu/PCUIF_RAW_Components.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16486/1/pcu/PCUIF_RAW_Components.ttcn at 315 PS1, Line 315: event.data.tdma_fn - 3 This formula is not applicable for PTCCH :/ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iba0b1d1a3d7d875c5443a7bcaff399f9681624ad Gerrit-Change-Number: 16486 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 04 Dec 2019 21:05:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:11:04 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:11:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: resmim: Adjust TC_createMapping_busySlot to current bankd code In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16495 to look at the new patch set (#2). Change subject: resmim: Adjust TC_createMapping_busySlot to current bankd code ...................................................................... resmim: Adjust TC_createMapping_busySlot to current bankd code Since osmo-remsim Change-Id I83e319d22896b881c0d882542842f500075aa546 createMapping will overwrite any existing mappings that may already exist for that bank-slot. We need to adjust our test expectations accordingly. Change-Id: Ia8de9edd7edb0437cd783b7d045571ff69820c42 Related: OS#4278 --- M remsim/RemsimBankd_Tests.ttcn 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/95/16495/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16495 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia8de9edd7edb0437cd783b7d045571ff69820c42 Gerrit-Change-Number: 16495 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:11:05 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:11:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: remsim: Two new bankd test cases about slotmap re-creation References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16496 ) Change subject: remsim: Two new bankd test cases about slotmap re-creation ...................................................................... remsim: Two new bankd test cases about slotmap re-creation If a slotmap is re-created with identical client+bankd, we expect no change and the client-bankd connection to persist. If a slotmap is overwritten with a create for a different client than the currently connected one, we expect the client connection to be closed. Change-Id: If81e1511521fe478d2367104cd1c7eba254d6450 Related: OS#4278 --- M remsim/RemsimBankd_Tests.ttcn 1 file changed, 84 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/16496/1 diff --git a/remsim/RemsimBankd_Tests.ttcn b/remsim/RemsimBankd_Tests.ttcn index e86dc16..e9e3b31 100644 --- a/remsim/RemsimBankd_Tests.ttcn +++ b/remsim/RemsimBankd_Tests.ttcn @@ -201,6 +201,87 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, pass); } +/* first add mapping, then connect client, then change mapping (expect disconnect) */ +testcase TC_createMapping_connectClient_changeMapping() runs on bankd_test_CT { + /* FIXME: this would only be done in f_init_client(), but we need it before */ + rspro[0].rspro_client_slot := { clientId := 23+0, slotNr := 0 }; + + f_init(); + as_connectBankReq(bid := mp_bank_id, nslots := mp_num_slots); + f_rspro_srv_reset_state(ok); + + /* create slotmap */ + var BankSlot bs := { bankId := mp_bank_id, slotNr := 0 }; + f_rspro_srv_create_slotmap(rspro[0].rspro_client_slot, bs); + + f_sleep(1.0); + + /* connect client */ + f_init_client(0); + f_rspro_connect_client(0, tr_Status_ok_or_nocard); + /* FIXME: how to determine that bank correctly mapped us */ + + /* create another mapping for the same bank-slot */ + var ClientSlot cs := { clientId := 987, slotNr := 654 }; + f_rspro_srv_create_slotmap(cs, bs); + + /* expect client to be disconnected */ + timer T := 5.0; + T.start; + alt { + [] RSPRO[0].receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_DOWN}) { + setverdict(pass); + } + [] RSPRO[0].receive { + setverdict(fail, "Unexpected RSPRO on client connection"); + } + [] T.timeout { + setverdict(fail, "Timeout waiting for client being disconnected"); + } + } + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, pass); +} + +/* first add mapping, then connect client, then re-crete mapping (expect no disconnect) */ +testcase TC_createMapping_connectClient_recreateMapping() runs on bankd_test_CT { + /* FIXME: this would only be done in f_init_client(), but we need it before */ + rspro[0].rspro_client_slot := { clientId := 23+0, slotNr := 0 }; + + f_init(); + as_connectBankReq(bid := mp_bank_id, nslots := mp_num_slots); + f_rspro_srv_reset_state(ok); + + /* create slotmap */ + var BankSlot bs := { bankId := mp_bank_id, slotNr := 0 }; + f_rspro_srv_create_slotmap(rspro[0].rspro_client_slot, bs); + + f_sleep(1.0); + + /* connect client */ + f_init_client(0); + f_rspro_connect_client(0, tr_Status_ok_or_nocard); + /* FIXME: how to determine that bank correctly mapped us */ + + /* re-create same mapping for the same bank-slot */ + f_rspro_srv_create_slotmap(rspro[0].rspro_client_slot, bs); + + /* expect client not to be disconnected */ + timer T := 5.0; + T.start; + alt { + [] RSPRO[0].receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_DOWN}) { + setverdict(fail, "Unexpected client disconnect"); + } + [] RSPRO[0].receive { + repeat; + } + [] T.timeout { + setverdict(pass); + } + } + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, pass); +} + /* add mapping, connect matching client, disconnect + reconnect */ @@ -299,6 +380,9 @@ execute( TC_createMapping_clientReconnect() ); execute( TC_removeMapping_connected() ); + execute( TC_createMapping_connectClient_changeMapping() ); + execute( TC_createMapping_connectClient_recreateMapping() ); + execute( TC_createMapping_exchangeTPDU() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If81e1511521fe478d2367104cd1c7eba254d6450 Gerrit-Change-Number: 16496 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:11:28 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:11:28 +0000 Subject: Change in osmo-remsim[master]: bankd: Fix log print during removeMapping In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16488 ) Change subject: bankd: Fix log print during removeMapping ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I04e9e2447336f7d1aaeb932928a79bb705aa0c5a Gerrit-Change-Number: 16488 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 21:11:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:12:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:12:07 +0000 Subject: Change in osmo-remsim[master]: bankd: createMapping should implicitly delete existing mappings In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16478 ) Change subject: bankd: createMapping should implicitly delete existing mappings ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I83e319d22896b881c0d882542842f500075aa546 Gerrit-Change-Number: 16478 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 21:12:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:12:27 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:12:27 +0000 Subject: Change in osmo-remsim[master]: bankd: Reject removeSlotmap when ClientID doesn't match In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16489 ) Change subject: bankd: Reject removeSlotmap when ClientID doesn't match ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I892282821f4650614d1d08ed4bdf11eaabf947c0 Gerrit-Change-Number: 16489 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 21:12:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:12:41 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:12:41 +0000 Subject: Change in osmo-remsim[master]: bankd: initialize bank_id/slot_nr to 0xffff for unmapped workers In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16490 ) Change subject: bankd: initialize bank_id/slot_nr to 0xffff for unmapped workers ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I6976eb96feae6a3b66bacf787e436a2df29f9ce0 Gerrit-Change-Number: 16490 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 21:12:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:13:02 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:13:02 +0000 Subject: Change in osmo-remsim[master]: RSPRO: Add new ResetState{Req,Res} In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16491 ) Change subject: RSPRO: Add new ResetState{Req,Res} ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16491 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I442bab523486bbdf2faa8028f8972cd0af795303 Gerrit-Change-Number: 16491 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 21:13:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:13:17 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:13:17 +0000 Subject: Change in osmo-remsim[master]: bankd: Fix log print during removeMapping In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16488 ) Change subject: bankd: Fix log print during removeMapping ...................................................................... bankd: Fix log print during removeMapping We need to dereference 'rreq' nor 'creq' in the remove handling. Change-Id: I04e9e2447336f7d1aaeb932928a79bb705aa0c5a --- M src/bankd/bankd_main.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 7851a2b..7b50a73 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -190,11 +190,11 @@ rreq = &pdu->msg.choice.removeMappingReq; if (rreq->bank.bankId != g_bankd->srvc.bankd.bank_id) { LOGPFSML(srvc->fi, LOGL_ERROR, "removeMapping specifies invalid Bank ID %lu " - "(we are %u)\n", creq->bank.bankId, g_bankd->srvc.bankd.bank_id); + "(we are %u)\n", rreq->bank.bankId, g_bankd->srvc.bankd.bank_id); resp = rspro_gen_RemoveMappingRes(ResultCode_illegalBankId); } else if (rreq->bank.slotNr >= g_bankd->srvc.bankd.num_slots) { LOGPFSML(srvc->fi, LOGL_ERROR, "removeMapping specifies invalid Slot Nr %lu " - "(we have %u)\n", creq->bank.slotNr, g_bankd->srvc.bankd.num_slots); + "(we have %u)\n", rreq->bank.slotNr, g_bankd->srvc.bankd.num_slots); resp = rspro_gen_RemoveMappingRes(ResultCode_illegalSlotId); } else { rspro2bank_slot(&bs, &rreq->bank); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I04e9e2447336f7d1aaeb932928a79bb705aa0c5a Gerrit-Change-Number: 16488 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:13:17 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:13:17 +0000 Subject: Change in osmo-remsim[master]: bankd: createMapping should implicitly delete existing mappings In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16478 ) Change subject: bankd: createMapping should implicitly delete existing mappings ...................................................................... bankd: createMapping should implicitly delete existing mappings As explained in OS#4278, a remsim-bankd currently doesn't recover after a remsim-server resetart, since old mappings remain in the bankd, and the server has no chance of removing them. To avoid this problem, a createMapping now always implicitly removes any existing mapping that may exist for the given bankdSlot. Change-Id: I83e319d22896b881c0d882542842f500075aa546 Closes: OS#4278 --- M src/bankd/bankd_main.c 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 7b50a73..03101fb 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -176,6 +176,18 @@ } else { rspro2bank_slot(&bs, &creq->bank); rspro2client_slot(&cs, &creq->client); + /* check if map exists */ + map = slotmap_by_bank(g_bankd->slotmaps, &bs); + if (map) { + if (client_slot_equals(&map->client, &cs)) { + LOGPFSML(srvc->fi, LOGL_ERROR, "ignoring identical slotmap\n"); + resp = rspro_gen_CreateMappingRes(ResultCode_ok); + goto send_resp; + } else { + LOGPFSM(srvc->fi, "implicitly removing slotmap\n"); + bankd_srvc_remove_mapping(map); + } + } /* Add a new mapping */ map = slotmap_add(g_bankd->slotmaps, &bs, &cs); if (!map) { @@ -184,6 +196,7 @@ } else resp = rspro_gen_CreateMappingRes(ResultCode_ok); } +send_resp: server_conn_send_rspro(srvc, resp); break; case RsproPDUchoice_PR_removeMappingReq: -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I83e319d22896b881c0d882542842f500075aa546 Gerrit-Change-Number: 16478 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:13:17 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:13:17 +0000 Subject: Change in osmo-remsim[master]: bankd: Reject removeSlotmap when ClientID doesn't match In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16489 ) Change subject: bankd: Reject removeSlotmap when ClientID doesn't match ...................................................................... bankd: Reject removeSlotmap when ClientID doesn't match It's a bit of a matter of taste whether we should simply log + ignore if the Client of a removeMappingReq doesn't match what the bankd currently has configured. I chose to reject it, as a new createMapping for the same bandk+slot will overwrite any existing mapping anyway, at least as of I83e319d22896b881c0d882542842f500075aa546 Change-Id: I892282821f4650614d1d08ed4bdf11eaabf947c0 --- M src/bankd/bankd_main.c 1 file changed, 9 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 03101fb..94227e3 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -217,9 +217,15 @@ LOGPFSML(srvc->fi, LOGL_ERROR, "could not find to-be-deleted slotmap\n"); resp = rspro_gen_RemoveMappingRes(ResultCode_unknownSlotmap); } else { - LOGPFSM(srvc->fi, "removing slotmap\n"); - bankd_srvc_remove_mapping(map); - resp = rspro_gen_RemoveMappingRes(ResultCode_ok); + rspro2client_slot(&cs, &rreq->client); + if (!client_slot_equals(&map->client, &cs)) { + LOGPFSM(srvc->fi, "ClientId in removeMappingReq != map\n"); + resp = rspro_gen_RemoveMappingRes(ResultCode_unknownSlotmap); + } else { + LOGPFSM(srvc->fi, "removing slotmap\n"); + bankd_srvc_remove_mapping(map); + resp = rspro_gen_RemoveMappingRes(ResultCode_ok); + } } } server_conn_send_rspro(srvc, resp); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I892282821f4650614d1d08ed4bdf11eaabf947c0 Gerrit-Change-Number: 16489 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:13:17 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:13:17 +0000 Subject: Change in osmo-remsim[master]: bankd: initialize bank_id/slot_nr to 0xffff for unmapped workers In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16490 ) Change subject: bankd: initialize bank_id/slot_nr to 0xffff for unmapped workers ...................................................................... bankd: initialize bank_id/slot_nr to 0xffff for unmapped workers Otherwise the loop for SIGMAPDEL delivery code will match any unused worker for bank_id=0/slot_nr=0, which is not what we want. This also makes repeated RemsimBankd_Tests.TC_removeMapping_connected runs work reliably. Change-Id: I6976eb96feae6a3b66bacf787e436a2df29f9ce0 --- M src/bankd/bankd_main.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 94227e3..09a9e1d 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -411,6 +411,8 @@ { LOGW(g_worker, "SIGMAPDEL received: Main thread informs us our map is gone\n"); OSMO_ASSERT(sig == SIGMAPDEL); + g_worker->slot.bank_id = 0xffff; + g_worker->slot.slot_nr = 0xffff; worker_set_state(g_worker, BW_ST_CONN_CLIENT_UNMAPPED); } @@ -852,6 +854,9 @@ /* push cleanup helper */ pthread_cleanup_push(&worker_cleanup, g_worker); + g_worker->slot.bank_id = 0xffff; + g_worker->slot.slot_nr = 0xffff; + /* we continuously perform the same loop here, recycling the worker thread * once the client connection is gone or we have some trouble with the card/reader */ while (1) { -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I6976eb96feae6a3b66bacf787e436a2df29f9ce0 Gerrit-Change-Number: 16490 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:13:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:13:18 +0000 Subject: Change in osmo-remsim[master]: RSPRO: Add new ResetState{Req,Res} In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16491 ) Change subject: RSPRO: Add new ResetState{Req,Res} ...................................................................... RSPRO: Add new ResetState{Req,Res} These commands are introduced to enable the server to request the full reset of all state in a client or bankd. This is particularly useful in TTCN-3 tests, where we typically want to reset the state between tests. Change-Id: I442bab523486bbdf2faa8028f8972cd0af795303 --- M asn1/RSPRO.asn M include/osmocom/rspro/Makefile.am A include/osmocom/rspro/ResetStateReq.h A include/osmocom/rspro/ResetStateRes.h M include/osmocom/rspro/RsproPDUchoice.h M src/rspro/ConfigClientBankReq.c M src/rspro/ConfigClientBankRes.c M src/rspro/ConfigClientIdReq.c M src/rspro/ConfigClientIdRes.c M src/rspro/Makefile.am A src/rspro/ResetStateReq.c A src/rspro/ResetStateRes.c M src/rspro/RsproPDUchoice.c M src/rspro_util.c M src/rspro_util.h 15 files changed, 269 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/asn1/RSPRO.asn b/asn1/RSPRO.asn index 65152ec..1b1be6d 100644 --- a/asn1/RSPRO.asn +++ b/asn1/RSPRO.asn @@ -308,6 +308,17 @@ ... } +-- SERVER->*: request reset of all state on peer side +ResetStateReq ::= SEQUENCE { + ... +} + +-- *->SERVER: confirm reset of all state on peer side +ResetStateRes ::= SEQUENCE { + result ResultCode, + ... +} + ---------------------------------------------------------------------- -- PDU @@ -328,6 +339,8 @@ configClientBankReq [17] ConfigClientBankReq, configClientBankRes [18] ConfigClientBankRes, errorInd [16] ErrorInd, + resetStateReq [19] ResetStateReq, + resetStateRes [20] ResetStateRes, -- APDUs etc. setAtrReq [10] SetAtrReq, setAtrRes [11] SetAtrRes, diff --git a/include/osmocom/rspro/Makefile.am b/include/osmocom/rspro/Makefile.am index 4ffaa32..7549ffb 100644 --- a/include/osmocom/rspro/Makefile.am +++ b/include/osmocom/rspro/Makefile.am @@ -31,6 +31,8 @@ PortNumber.h \ RemoveMappingReq.h \ RemoveMappingRes.h \ + ResetStateReq.h \ + ResetStateRes.h \ ResultCode.h \ RsproPDU.h \ RsproPDUchoice.h \ diff --git a/include/osmocom/rspro/ResetStateReq.h b/include/osmocom/rspro/ResetStateReq.h new file mode 100644 index 0000000..b56fe43 --- /dev/null +++ b/include/osmocom/rspro/ResetStateReq.h @@ -0,0 +1,39 @@ +/* + * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) + * From ASN.1 module "RSPRO" + * found in "../../asn1/RSPRO.asn" + */ + +#ifndef _ResetStateReq_H_ +#define _ResetStateReq_H_ + + +#include + +/* Including external dependencies */ +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/* ResetStateReq */ +typedef struct ResetStateReq { + /* + * This type is extensible, + * possible extensions are below. + */ + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; +} ResetStateReq_t; + +/* Implementation */ +extern asn_TYPE_descriptor_t asn_DEF_ResetStateReq; + +#ifdef __cplusplus +} +#endif + +#endif /* _ResetStateReq_H_ */ +#include diff --git a/include/osmocom/rspro/ResetStateRes.h b/include/osmocom/rspro/ResetStateRes.h new file mode 100644 index 0000000..622375e --- /dev/null +++ b/include/osmocom/rspro/ResetStateRes.h @@ -0,0 +1,41 @@ +/* + * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) + * From ASN.1 module "RSPRO" + * found in "../../asn1/RSPRO.asn" + */ + +#ifndef _ResetStateRes_H_ +#define _ResetStateRes_H_ + + +#include + +/* Including external dependencies */ +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/* ResetStateRes */ +typedef struct ResetStateRes { + ResultCode_t result; + /* + * This type is extensible, + * possible extensions are below. + */ + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; +} ResetStateRes_t; + +/* Implementation */ +extern asn_TYPE_descriptor_t asn_DEF_ResetStateRes; + +#ifdef __cplusplus +} +#endif + +#endif /* _ResetStateRes_H_ */ +#include diff --git a/include/osmocom/rspro/RsproPDUchoice.h b/include/osmocom/rspro/RsproPDUchoice.h index d603fa1..ebb2971 100644 --- a/include/osmocom/rspro/RsproPDUchoice.h +++ b/include/osmocom/rspro/RsproPDUchoice.h @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include #include #include @@ -52,6 +54,8 @@ RsproPDUchoice_PR_configClientBankReq, RsproPDUchoice_PR_configClientBankRes, RsproPDUchoice_PR_errorInd, + RsproPDUchoice_PR_resetStateReq, + RsproPDUchoice_PR_resetStateRes, RsproPDUchoice_PR_setAtrReq, RsproPDUchoice_PR_setAtrRes, RsproPDUchoice_PR_tpduModemToCard, @@ -79,6 +83,8 @@ ConfigClientBankReq_t configClientBankReq; ConfigClientBankRes_t configClientBankRes; ErrorInd_t errorInd; + ResetStateReq_t resetStateReq; + ResetStateRes_t resetStateRes; SetAtrReq_t setAtrReq; SetAtrRes_t setAtrRes; TpduModemToCard_t tpduModemToCard; diff --git a/src/rspro/ConfigClientBankReq.c b/src/rspro/ConfigClientBankReq.c index f19c9ee..a4cd21e 100644 --- a/src/rspro/ConfigClientBankReq.c +++ b/src/rspro/ConfigClientBankReq.c @@ -4,7 +4,7 @@ * found in "../../asn1/RSPRO.asn" */ -#include "ConfigClientBankReq.h" +#include static asn_TYPE_member_t asn_MBR_ConfigClientBankReq_1[] = { { ATF_NOFLAGS, 0, offsetof(struct ConfigClientBankReq, bankSlot), diff --git a/src/rspro/ConfigClientBankRes.c b/src/rspro/ConfigClientBankRes.c index 4b3c18a..877100b 100644 --- a/src/rspro/ConfigClientBankRes.c +++ b/src/rspro/ConfigClientBankRes.c @@ -4,7 +4,7 @@ * found in "../../asn1/RSPRO.asn" */ -#include "ConfigClientBankRes.h" +#include static asn_TYPE_member_t asn_MBR_ConfigClientBankRes_1[] = { { ATF_NOFLAGS, 0, offsetof(struct ConfigClientBankRes, result), diff --git a/src/rspro/ConfigClientIdReq.c b/src/rspro/ConfigClientIdReq.c index 570013a..548035c 100644 --- a/src/rspro/ConfigClientIdReq.c +++ b/src/rspro/ConfigClientIdReq.c @@ -4,7 +4,7 @@ * found in "../../asn1/RSPRO.asn" */ -#include "ConfigClientIdReq.h" +#include static asn_TYPE_member_t asn_MBR_ConfigClientIdReq_1[] = { { ATF_NOFLAGS, 0, offsetof(struct ConfigClientIdReq, clientSlot), diff --git a/src/rspro/ConfigClientIdRes.c b/src/rspro/ConfigClientIdRes.c index a8b0691..23f2699 100644 --- a/src/rspro/ConfigClientIdRes.c +++ b/src/rspro/ConfigClientIdRes.c @@ -4,7 +4,7 @@ * found in "../../asn1/RSPRO.asn" */ -#include "ConfigClientIdRes.h" +#include static asn_TYPE_member_t asn_MBR_ConfigClientIdRes_1[] = { { ATF_NOFLAGS, 0, offsetof(struct ConfigClientIdRes, result), diff --git a/src/rspro/Makefile.am b/src/rspro/Makefile.am index 91f0f35..df3ccf4 100644 --- a/src/rspro/Makefile.am +++ b/src/rspro/Makefile.am @@ -31,6 +31,8 @@ PortNumber.c \ RemoveMappingReq.c \ RemoveMappingRes.c \ + ResetStateReq.c \ + ResetStateRes.c \ ResultCode.c \ RsproPDU.c \ RsproPDUchoice.c \ @@ -76,6 +78,8 @@ PortNumber.h \ RemoveMappingReq.h \ RemoveMappingRes.h \ + ResetStateReq.h \ + ResetStateRes.h \ ResultCode.h \ RsproPDU.h \ RsproPDUchoice.h \ diff --git a/src/rspro/ResetStateReq.c b/src/rspro/ResetStateReq.c new file mode 100644 index 0000000..538a18c --- /dev/null +++ b/src/rspro/ResetStateReq.c @@ -0,0 +1,44 @@ +/* + * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) + * From ASN.1 module "RSPRO" + * found in "../../asn1/RSPRO.asn" + */ + +#include "ResetStateReq.h" + +static const ber_tlv_tag_t asn_DEF_ResetStateReq_tags_1[] = { + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static asn_SEQUENCE_specifics_t asn_SPC_ResetStateReq_specs_1 = { + sizeof(struct ResetStateReq), + offsetof(struct ResetStateReq, _asn_ctx), + 0, /* No top level tags */ + 0, /* No tags in the map */ + 0, 0, 0, /* Optional elements (not needed) */ + -1, /* Start extensions */ + -1 /* Stop extensions */ +}; +asn_TYPE_descriptor_t asn_DEF_ResetStateReq = { + "ResetStateReq", + "ResetStateReq", + SEQUENCE_free, + SEQUENCE_print, + SEQUENCE_constraint, + SEQUENCE_decode_ber, + SEQUENCE_encode_der, + SEQUENCE_decode_xer, + SEQUENCE_encode_xer, + 0, 0, /* No UPER support, use "-gen-PER" to enable */ + 0, 0, /* No APER support, use "-gen-PER" to enable */ + 0, /* Use generic outmost tag fetcher */ + asn_DEF_ResetStateReq_tags_1, + sizeof(asn_DEF_ResetStateReq_tags_1) + /sizeof(asn_DEF_ResetStateReq_tags_1[0]), /* 1 */ + asn_DEF_ResetStateReq_tags_1, /* Same as above */ + sizeof(asn_DEF_ResetStateReq_tags_1) + /sizeof(asn_DEF_ResetStateReq_tags_1[0]), /* 1 */ + 0, /* No PER visible constraints */ + 0, 0, /* No members */ + &asn_SPC_ResetStateReq_specs_1 /* Additional specs */ +}; + diff --git a/src/rspro/ResetStateRes.c b/src/rspro/ResetStateRes.c new file mode 100644 index 0000000..551dcc4 --- /dev/null +++ b/src/rspro/ResetStateRes.c @@ -0,0 +1,59 @@ +/* + * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) + * From ASN.1 module "RSPRO" + * found in "../../asn1/RSPRO.asn" + */ + +#include "ResetStateRes.h" + +static asn_TYPE_member_t asn_MBR_ResetStateRes_1[] = { + { ATF_NOFLAGS, 0, offsetof(struct ResetStateRes, result), + (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), + 0, + &asn_DEF_ResultCode, + 0, /* Defer constraints checking to the member type */ + 0, /* PER is not compiled, use -gen-PER */ + 0, + "result" + }, +}; +static const ber_tlv_tag_t asn_DEF_ResetStateRes_tags_1[] = { + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static const asn_TYPE_tag2member_t asn_MAP_ResetStateRes_tag2el_1[] = { + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* result */ +}; +static asn_SEQUENCE_specifics_t asn_SPC_ResetStateRes_specs_1 = { + sizeof(struct ResetStateRes), + offsetof(struct ResetStateRes, _asn_ctx), + asn_MAP_ResetStateRes_tag2el_1, + 1, /* Count of tags in the map */ + 0, 0, 0, /* Optional elements (not needed) */ + 0, /* Start extensions */ + 2 /* Stop extensions */ +}; +asn_TYPE_descriptor_t asn_DEF_ResetStateRes = { + "ResetStateRes", + "ResetStateRes", + SEQUENCE_free, + SEQUENCE_print, + SEQUENCE_constraint, + SEQUENCE_decode_ber, + SEQUENCE_encode_der, + SEQUENCE_decode_xer, + SEQUENCE_encode_xer, + 0, 0, /* No UPER support, use "-gen-PER" to enable */ + 0, 0, /* No APER support, use "-gen-PER" to enable */ + 0, /* Use generic outmost tag fetcher */ + asn_DEF_ResetStateRes_tags_1, + sizeof(asn_DEF_ResetStateRes_tags_1) + /sizeof(asn_DEF_ResetStateRes_tags_1[0]), /* 1 */ + asn_DEF_ResetStateRes_tags_1, /* Same as above */ + sizeof(asn_DEF_ResetStateRes_tags_1) + /sizeof(asn_DEF_ResetStateRes_tags_1[0]), /* 1 */ + 0, /* No PER visible constraints */ + asn_MBR_ResetStateRes_1, + 1, /* Elements count */ + &asn_SPC_ResetStateRes_specs_1 /* Additional specs */ +}; + diff --git a/src/rspro/RsproPDUchoice.c b/src/rspro/RsproPDUchoice.c index a5f7161..0d19180 100644 --- a/src/rspro/RsproPDUchoice.c +++ b/src/rspro/RsproPDUchoice.c @@ -124,6 +124,24 @@ 0, "errorInd" }, + { ATF_NOFLAGS, 0, offsetof(struct RsproPDUchoice, choice.resetStateReq), + (ASN_TAG_CLASS_CONTEXT | (19 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_ResetStateReq, + 0, /* Defer constraints checking to the member type */ + 0, /* PER is not compiled, use -gen-PER */ + 0, + "resetStateReq" + }, + { ATF_NOFLAGS, 0, offsetof(struct RsproPDUchoice, choice.resetStateRes), + (ASN_TAG_CLASS_CONTEXT | (20 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_ResetStateRes, + 0, /* Defer constraints checking to the member type */ + 0, /* PER is not compiled, use -gen-PER */ + 0, + "resetStateRes" + }, { ATF_NOFLAGS, 0, offsetof(struct RsproPDUchoice, choice.setAtrReq), (ASN_TAG_CLASS_CONTEXT | (10 << 2)), -1, /* IMPLICIT tag at current level */ @@ -190,15 +208,17 @@ { (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 7, 0, 0 }, /* removeMappingRes */ { (ASN_TAG_CLASS_CONTEXT | (8 << 2)), 8, 0, 0 }, /* configClientIdReq */ { (ASN_TAG_CLASS_CONTEXT | (9 << 2)), 9, 0, 0 }, /* configClientIdRes */ - { (ASN_TAG_CLASS_CONTEXT | (10 << 2)), 13, 0, 0 }, /* setAtrReq */ - { (ASN_TAG_CLASS_CONTEXT | (11 << 2)), 14, 0, 0 }, /* setAtrRes */ - { (ASN_TAG_CLASS_CONTEXT | (12 << 2)), 15, 0, 0 }, /* tpduModemToCard */ - { (ASN_TAG_CLASS_CONTEXT | (13 << 2)), 16, 0, 0 }, /* tpduCardToModem */ - { (ASN_TAG_CLASS_CONTEXT | (14 << 2)), 17, 0, 0 }, /* clientSlotStatusInd */ - { (ASN_TAG_CLASS_CONTEXT | (15 << 2)), 18, 0, 0 }, /* bankSlotStatusInd */ + { (ASN_TAG_CLASS_CONTEXT | (10 << 2)), 15, 0, 0 }, /* setAtrReq */ + { (ASN_TAG_CLASS_CONTEXT | (11 << 2)), 16, 0, 0 }, /* setAtrRes */ + { (ASN_TAG_CLASS_CONTEXT | (12 << 2)), 17, 0, 0 }, /* tpduModemToCard */ + { (ASN_TAG_CLASS_CONTEXT | (13 << 2)), 18, 0, 0 }, /* tpduCardToModem */ + { (ASN_TAG_CLASS_CONTEXT | (14 << 2)), 19, 0, 0 }, /* clientSlotStatusInd */ + { (ASN_TAG_CLASS_CONTEXT | (15 << 2)), 20, 0, 0 }, /* bankSlotStatusInd */ { (ASN_TAG_CLASS_CONTEXT | (16 << 2)), 12, 0, 0 }, /* errorInd */ { (ASN_TAG_CLASS_CONTEXT | (17 << 2)), 10, 0, 0 }, /* configClientBankReq */ - { (ASN_TAG_CLASS_CONTEXT | (18 << 2)), 11, 0, 0 } /* configClientBankRes */ + { (ASN_TAG_CLASS_CONTEXT | (18 << 2)), 11, 0, 0 }, /* configClientBankRes */ + { (ASN_TAG_CLASS_CONTEXT | (19 << 2)), 13, 0, 0 }, /* resetStateReq */ + { (ASN_TAG_CLASS_CONTEXT | (20 << 2)), 14, 0, 0 } /* resetStateRes */ }; static asn_CHOICE_specifics_t asn_SPC_RsproPDUchoice_specs_1 = { sizeof(struct RsproPDUchoice), @@ -206,9 +226,9 @@ offsetof(struct RsproPDUchoice, present), sizeof(((struct RsproPDUchoice *)0)->present), asn_MAP_RsproPDUchoice_tag2el_1, - 19, /* Count of tags in the map */ + 21, /* Count of tags in the map */ 0, - 19 /* Extensions start */ + 21 /* Extensions start */ }; asn_TYPE_descriptor_t asn_DEF_RsproPDUchoice = { "RsproPDUchoice", @@ -229,7 +249,7 @@ 0, /* No tags (count) */ 0, /* No PER visible constraints */ asn_MBR_RsproPDUchoice_1, - 19, /* Elements count */ + 21, /* Elements count */ &asn_SPC_RsproPDUchoice_specs_1 /* Additional specs */ }; diff --git a/src/rspro_util.c b/src/rspro_util.c index 5c78b60..422aef4 100644 --- a/src/rspro_util.c +++ b/src/rspro_util.c @@ -385,6 +385,29 @@ return pdu; } +RsproPDU_t *rspro_gen_ResetStateReq(void) +{ + RsproPDU_t *pdu = CALLOC(1, sizeof(*pdu)); + if (!pdu) + return NULL; + pdu->version = 2; + pdu->msg.present = RsproPDUchoice_PR_resetStateReq; + + return pdu; +} + +RsproPDU_t *rspro_gen_ResetStateRes(e_ResultCode res) +{ + RsproPDU_t *pdu = CALLOC(1, sizeof(*pdu)); + if (!pdu) + return NULL; + pdu->version = 2; + pdu->msg.present = RsproPDUchoice_PR_resetStateRes; + pdu->msg.choice.resetStateRes.result = res; + + return pdu; +} + e_ResultCode rspro_get_result(const RsproPDU_t *pdu) { switch (pdu->msg.present) { @@ -402,6 +425,8 @@ return pdu->msg.choice.configClientBankRes.result; case RsproPDUchoice_PR_setAtrRes: return pdu->msg.choice.setAtrRes.result; + case RsproPDUchoice_PR_resetStateRes: + return pdu->msg.choice.resetStateRes.result; default: OSMO_ASSERT(0); } diff --git a/src/rspro_util.h b/src/rspro_util.h index 444d34a..8c6ae3b 100644 --- a/src/rspro_util.h +++ b/src/rspro_util.h @@ -42,6 +42,8 @@ const uint8_t *tpdu, unsigned int tpdu_len); RsproPDU_t *rspro_gen_TpduCard2Modem(const BankSlot_t *bank, const ClientSlot_t *client, const uint8_t *tpdu, unsigned int tpdu_len); +RsproPDU_t *rspro_gen_ResetStateReq(void); +RsproPDU_t *rspro_gen_ResetStateRes(e_ResultCode res); e_ResultCode rspro_get_result(const RsproPDU_t *pdu); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16491 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I442bab523486bbdf2faa8028f8972cd0af795303 Gerrit-Change-Number: 16491 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:13:28 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:13:28 +0000 Subject: Change in osmo-remsim[master]: Add "--version" to all executables to print compile-time version info In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16479 ) Change subject: Add "--version" to all executables to print compile-time version info ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16479 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I9ae504ff95beeefb9e90e02a576861351ea9e143 Gerrit-Change-Number: 16479 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 21:13:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:13:42 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:13:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: remsim: Update RSPRO for ResetState{Req, Res} messages In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16493 ) Change subject: remsim: Update RSPRO for ResetState{Req,Res} messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia9520b50c4ec2e703cc876cc7f79f3aeda90dba3 Gerrit-Change-Number: 16493 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 21:13:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:13:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:13:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: remsim: Update RSPRO for ResetState{Req, Res} messages In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16493 ) Change subject: remsim: Update RSPRO for ResetState{Req,Res} messages ...................................................................... remsim: Update RSPRO for ResetState{Req,Res} messages Change-Id: Ia9520b50c4ec2e703cc876cc7f79f3aeda90dba3 --- M remsim/RSPRO.asn M remsim/RSPRO_Server.ttcn M remsim/RSPRO_Types.ttcn 3 files changed, 42 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/remsim/RSPRO.asn b/remsim/RSPRO.asn index aaafb96..ce29003 100644 --- a/remsim/RSPRO.asn +++ b/remsim/RSPRO.asn @@ -310,6 +310,17 @@ ... } +-- SERVER->*: request reset of all state on peer side +ResetStateReq ::= SEQUENCE { + ... +} + +-- *->SERVER: confirm reset of all state on peer side +ResetStateRes ::= SEQUENCE { + result ResultCode, + ... +} + ---------------------------------------------------------------------- -- PDU @@ -330,6 +341,8 @@ configClientBankReq [17] ConfigClientBankReq, configClientBankRes [18] ConfigClientBankRes, errorInd [16] ErrorInd, + resetStateReq [19] ResetStateReq, + resetStateRes [20] ResetStateRes, -- APDUs etc. setAtrReq [10] SetAtrReq, setAtrRes [11] SetAtrRes, diff --git a/remsim/RSPRO_Server.ttcn b/remsim/RSPRO_Server.ttcn index 977e7c6..5c9051c 100644 --- a/remsim/RSPRO_Server.ttcn +++ b/remsim/RSPRO_Server.ttcn @@ -147,6 +147,12 @@ f_rspro_srv_exp(tr_RSPRO_ConfigClientBankRes(exp_res)); } +function f_rspro_srv_reset_state(template ResultCode exp_res := ok, integer i := 0) +runs on rspro_server_CT +{ + RSPRO_SRV[i].send(ts_RSPRO_ResetStateReq); + f_rspro_srv_exp(tr_RSPRO_ResetStateRes(exp_res)); +} altstep as_connectBankReq(template ComponentIdentity comp_id := tr_CompId(remsimBankd, ?, "remsim-bankd", ?), diff --git a/remsim/RSPRO_Types.ttcn b/remsim/RSPRO_Types.ttcn index 1eb84bd..44b80f6 100644 --- a/remsim/RSPRO_Types.ttcn +++ b/remsim/RSPRO_Types.ttcn @@ -371,5 +371,28 @@ } }); +template (value) RsproPDU ts_RSPRO_ResetStateReq := + ts_RSPRO(RsproPDUchoice: { + resetStateReq := {} + }); +template RsproPDU tr_RSPRO_ResetStateReq := + tr_RSPRO(RsproPDUchoice: { + resetStateReq := {} + }); + +template (value) RsproPDU ts_RSPRO_ResetStateRes(template (value) ResultCode res) := + ts_RSPRO(RsproPDUchoice:{ + resetStateRes := { + result := res + } + }); +template RsproPDU tr_RSPRO_ResetStateRes(template ResultCode res) := + tr_RSPRO(RsproPDUchoice:{ + resetStateRes := { + result := res + } + }); + + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia9520b50c4ec2e703cc876cc7f79f3aeda90dba3 Gerrit-Change-Number: 16493 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:25:09 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:25:09 +0000 Subject: Change in osmo-remsim[master]: Add "--version" to all executables to print compile-time version info In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16479 ) Change subject: Add "--version" to all executables to print compile-time version info ...................................................................... Add "--version" to all executables to print compile-time version info Change-Id: I9ae504ff95beeefb9e90e02a576861351ea9e143 --- M src/bankd/bankd_main.c M src/server/remsim_server.c M src/simtrace2-remsim_client.c 3 files changed, 62 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 09a9e1d..82ed8c0 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -243,6 +243,7 @@ { printf( " -h --help Print this help message\n" +" -V --version Print the version of the program\n" " -i --server-host A.B.C.D remsim-server IP address (default: 127.0.0.1)\n" " -p --server-port <1-65535> remsim-server TCP port (default: 9998)\n" " -b --bank-id <1-65535> Bank Identifier of this SIM bank (default: 1)\n" @@ -263,6 +264,7 @@ int option_index = 0, c; static const struct option long_options[] = { { "help", 0, 0, 'h' }, + { "version", 0, 0, 'V' }, { "server-host", 1, 0, 'i' }, { "server-port", 1, 0, 'p' }, { "bank-id", 1, 0, 'b' }, @@ -273,7 +275,7 @@ { 0, 0, 0, 0 } }; - c = getopt_long(argc, argv, "hi:o:b:n:N:I:P:", long_options, &option_index); + c = getopt_long(argc, argv, "hVi:o:b:n:N:I:P:", long_options, &option_index); if (c == -1) break; @@ -282,6 +284,10 @@ printf_help(); exit(0); break; + case 'V': + printf("osmo-remsim-bankd version %s\n", VERSION); + exit(0); + break; case 'i': g_bankd->srvc.server_host = optarg; break; diff --git a/src/server/remsim_server.c b/src/server/remsim_server.c index 70cbedc..9d3268f 100644 --- a/src/server/remsim_server.c +++ b/src/server/remsim_server.c @@ -1,6 +1,9 @@ #include #include +#define _GNU_SOURCE +#include + #include #include @@ -25,6 +28,49 @@ talloc_report_full(g_tall_ctx, stderr); } +static void print_help() +{ + printf( " Some useful help...\n" + " -h --help This text\n" + " -V --version Print version of the program\n" + ); +} + +static void handle_options(int argc, char **argv) +{ + while (1) { + int option_index = 0, c; + static struct option long_options[] = { + { "help", 0, 0, 'h' }, + { "version", 0, 0, 'V' }, + {0, 0, 0, 0} + }; + + c = getopt_long(argc, argv, "hV", long_options, &option_index); + if (c == -1) + break; + + switch (c) { + case 'h': + print_help(); + exit(0); + break; + case 'V': + printf("osmo-resmim-server version %s\n", VERSION); + exit(0); + break; + default: + /* ignore */ + break; + } + } + + if (argc > optind) { + fprintf(stderr, "Unsupported extra positional arguments in command line\n"); + exit(2); + } +} + int main(int argc, char **argv) { void *talloc_rest_ctx; @@ -37,6 +83,8 @@ osmo_init_logging2(g_tall_ctx, &log_info); + handle_options(argc, argv); + g_rps = rspro_server_create(g_tall_ctx, "0.0.0.0", 9998); if (!g_rps) exit(1); diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index e97ed9d..69d6a04 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -696,6 +696,7 @@ "\t-c\t--client-id <0-65535>\n" "\t-n\t--client-slot <0-65535>\n" "\t-h\t--help\n" + "\t-v\t--version\n" "\t-i\t--gsmtap-ip\tA.B.C.D\n" "\t-k\t--keep-running\n" "\t-V\t--usb-vendor\tVENDOR_ID\n" @@ -716,6 +717,7 @@ { "client-id", 1, 0, 'c' }, { "client-slot", 1, 0, 'n' }, { "help", 0, 0, 'h' }, + { "version", 0, 0, 'v' }, { "gsmtap-ip", 1, 0, 'i' }, { "keep-running", 0, 0, 'k' }, { "usb-vendor", 1, 0, 'V' }, @@ -751,7 +753,7 @@ while (1) { int option_index = 0; - c = getopt_long(argc, argv, "s:p:c:n:hi:kV:P:C:I:S:A:H:a:", opts, &option_index); + c = getopt_long(argc, argv, "s:p:c:n:hvi:kV:P:C:I:S:A:H:a:", opts, &option_index); if (c == -1) break; switch (c) { @@ -771,6 +773,10 @@ print_help(); exit(0); break; + case 'v': + printf("osmo-remsim-client version %s\n", VERSION); + exit(0); + break; case 'i': gsmtap_host = optarg; break; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16479 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I9ae504ff95beeefb9e90e02a576861351ea9e143 Gerrit-Change-Number: 16479 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:26:04 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:26:04 +0000 Subject: Change in osmo-remsim[master]: bankd: No need to handle SIGMAPDEL if we're not mapped yet References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16497 ) Change subject: bankd: No need to handle SIGMAPDEL if we're not mapped yet ...................................................................... bankd: No need to handle SIGMAPDEL if we're not mapped yet Change-Id: I187b833a9b7ec3d3763e21b5c88a3fa39ba0c4c7 --- M src/bankd/bankd_main.c 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/97/16497/1 diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index d6e643b..a204be5 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -431,9 +431,11 @@ { LOGW(g_worker, "SIGMAPDEL received: Main thread informs us our map is gone\n"); OSMO_ASSERT(sig == SIGMAPDEL); - g_worker->slot.bank_id = 0xffff; - g_worker->slot.slot_nr = 0xffff; - worker_set_state(g_worker, BW_ST_CONN_CLIENT_UNMAPPED); + if (g_worker->state >= BW_ST_CONN_CLIENT_MAPPED) { + g_worker->slot.bank_id = 0xffff; + g_worker->slot.slot_nr = 0xffff; + worker_set_state(g_worker, BW_ST_CONN_CLIENT_UNMAPPED); + } } static void handle_sig_usr1(int sig) -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16497 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I187b833a9b7ec3d3763e21b5c88a3fa39ba0c4c7 Gerrit-Change-Number: 16497 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:26:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:26:12 +0000 Subject: Change in osmo-remsim[master]: bankd: Implement new ResetStateReq In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16492 ) Change subject: bankd: Implement new ResetStateReq ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16492 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ib794e605162903a2b2c4f4516887ec91fc8d139a Gerrit-Change-Number: 16492 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 21:26:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:26:21 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:26:21 +0000 Subject: Change in osmo-remsim[master]: bankd: No need to handle SIGMAPDEL if we're not mapped yet In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16497 ) Change subject: bankd: No need to handle SIGMAPDEL if we're not mapped yet ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16497 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I187b833a9b7ec3d3763e21b5c88a3fa39ba0c4c7 Gerrit-Change-Number: 16497 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 04 Dec 2019 21:26:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:26:36 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:26:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: remsim: Reset the bankd-side state at start of test In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16494 ) Change subject: remsim: Reset the bankd-side state at start of test ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16494 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If810ccbbc848dd2448a4eaea20c80f60f15a2e84 Gerrit-Change-Number: 16494 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 21:26:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:26:38 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:26:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: resmim: Adjust TC_createMapping_busySlot to current bankd code In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16495 ) Change subject: resmim: Adjust TC_createMapping_busySlot to current bankd code ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16495 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia8de9edd7edb0437cd783b7d045571ff69820c42 Gerrit-Change-Number: 16495 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 21:26:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:26:40 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:26:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: remsim: Two new bankd test cases about slotmap re-creation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16496 ) Change subject: remsim: Two new bankd test cases about slotmap re-creation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If81e1511521fe478d2367104cd1c7eba254d6450 Gerrit-Change-Number: 16496 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 21:26:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:26:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:26:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: remsim: Two new bankd test cases about slotmap re-creation In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16496 ) Change subject: remsim: Two new bankd test cases about slotmap re-creation ...................................................................... remsim: Two new bankd test cases about slotmap re-creation If a slotmap is re-created with identical client+bankd, we expect no change and the client-bankd connection to persist. If a slotmap is overwritten with a create for a different client than the currently connected one, we expect the client connection to be closed. Change-Id: If81e1511521fe478d2367104cd1c7eba254d6450 Related: OS#4278 --- M remsim/RemsimBankd_Tests.ttcn 1 file changed, 84 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/remsim/RemsimBankd_Tests.ttcn b/remsim/RemsimBankd_Tests.ttcn index e86dc16..e9e3b31 100644 --- a/remsim/RemsimBankd_Tests.ttcn +++ b/remsim/RemsimBankd_Tests.ttcn @@ -201,6 +201,87 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, pass); } +/* first add mapping, then connect client, then change mapping (expect disconnect) */ +testcase TC_createMapping_connectClient_changeMapping() runs on bankd_test_CT { + /* FIXME: this would only be done in f_init_client(), but we need it before */ + rspro[0].rspro_client_slot := { clientId := 23+0, slotNr := 0 }; + + f_init(); + as_connectBankReq(bid := mp_bank_id, nslots := mp_num_slots); + f_rspro_srv_reset_state(ok); + + /* create slotmap */ + var BankSlot bs := { bankId := mp_bank_id, slotNr := 0 }; + f_rspro_srv_create_slotmap(rspro[0].rspro_client_slot, bs); + + f_sleep(1.0); + + /* connect client */ + f_init_client(0); + f_rspro_connect_client(0, tr_Status_ok_or_nocard); + /* FIXME: how to determine that bank correctly mapped us */ + + /* create another mapping for the same bank-slot */ + var ClientSlot cs := { clientId := 987, slotNr := 654 }; + f_rspro_srv_create_slotmap(cs, bs); + + /* expect client to be disconnected */ + timer T := 5.0; + T.start; + alt { + [] RSPRO[0].receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_DOWN}) { + setverdict(pass); + } + [] RSPRO[0].receive { + setverdict(fail, "Unexpected RSPRO on client connection"); + } + [] T.timeout { + setverdict(fail, "Timeout waiting for client being disconnected"); + } + } + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, pass); +} + +/* first add mapping, then connect client, then re-crete mapping (expect no disconnect) */ +testcase TC_createMapping_connectClient_recreateMapping() runs on bankd_test_CT { + /* FIXME: this would only be done in f_init_client(), but we need it before */ + rspro[0].rspro_client_slot := { clientId := 23+0, slotNr := 0 }; + + f_init(); + as_connectBankReq(bid := mp_bank_id, nslots := mp_num_slots); + f_rspro_srv_reset_state(ok); + + /* create slotmap */ + var BankSlot bs := { bankId := mp_bank_id, slotNr := 0 }; + f_rspro_srv_create_slotmap(rspro[0].rspro_client_slot, bs); + + f_sleep(1.0); + + /* connect client */ + f_init_client(0); + f_rspro_connect_client(0, tr_Status_ok_or_nocard); + /* FIXME: how to determine that bank correctly mapped us */ + + /* re-create same mapping for the same bank-slot */ + f_rspro_srv_create_slotmap(rspro[0].rspro_client_slot, bs); + + /* expect client not to be disconnected */ + timer T := 5.0; + T.start; + alt { + [] RSPRO[0].receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_DOWN}) { + setverdict(fail, "Unexpected client disconnect"); + } + [] RSPRO[0].receive { + repeat; + } + [] T.timeout { + setverdict(pass); + } + } + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, pass); +} + /* add mapping, connect matching client, disconnect + reconnect */ @@ -299,6 +380,9 @@ execute( TC_createMapping_clientReconnect() ); execute( TC_removeMapping_connected() ); + execute( TC_createMapping_connectClient_changeMapping() ); + execute( TC_createMapping_connectClient_recreateMapping() ); + execute( TC_createMapping_exchangeTPDU() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If81e1511521fe478d2367104cd1c7eba254d6450 Gerrit-Change-Number: 16496 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:26:42 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:26:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: remsim: Reset the bankd-side state at start of test In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16494 ) Change subject: remsim: Reset the bankd-side state at start of test ...................................................................... remsim: Reset the bankd-side state at start of test In general we don't want that bankd retains state from one test case to another. Let's issue the new RSPRO ResetStateReq at the start of each relevant test Change-Id: If810ccbbc848dd2448a4eaea20c80f60f15a2e84 --- M remsim/RemsimBankd_Tests.ttcn 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/remsim/RemsimBankd_Tests.ttcn b/remsim/RemsimBankd_Tests.ttcn index bbdea6d..4e87024 100644 --- a/remsim/RemsimBankd_Tests.ttcn +++ b/remsim/RemsimBankd_Tests.ttcn @@ -81,6 +81,7 @@ testcase TC_createMapping() runs on bankd_test_CT { f_init(); as_connectBankReq(bid := mp_bank_id, nslots := mp_num_slots); + f_rspro_srv_reset_state(ok); var BankSlot bs := { bankId := mp_bank_id, slotNr := 0 }; var ClientSlot cs := { clientId := 23, slotNr := 42 }; f_rspro_srv_create_slotmap(cs, bs); @@ -91,6 +92,7 @@ testcase TC_createMapping_busySlot() runs on bankd_test_CT { f_init(); as_connectBankReq(bid := mp_bank_id, nslots := mp_num_slots); + f_rspro_srv_reset_state(ok); var BankSlot bs := { bankId := mp_bank_id, slotNr := 0 }; var ClientSlot cs := { clientId := 23, slotNr := 42 }; f_rspro_srv_create_slotmap(cs, bs); @@ -102,6 +104,7 @@ testcase TC_createMapping_invalidSlot() runs on bankd_test_CT { f_init(); as_connectBankReq(bid := mp_bank_id, nslots := mp_num_slots); + f_rspro_srv_reset_state(ok); var BankSlot bs := { bankId := mp_bank_id, slotNr := 200 }; var ClientSlot cs := { clientId := 23, slotNr := 42 }; f_rspro_srv_create_slotmap(cs, bs, exp_res := illegalSlotId); @@ -112,6 +115,7 @@ testcase TC_createMapping_invalidBank() runs on bankd_test_CT { f_init(); as_connectBankReq(bid := mp_bank_id, nslots := mp_num_slots); + f_rspro_srv_reset_state(ok); var BankSlot bs := { bankId := 200, slotNr := 0 }; var ClientSlot cs := { clientId := 23, slotNr := 42 }; f_rspro_srv_create_slotmap(cs, bs, exp_res := illegalBankId); @@ -122,6 +126,7 @@ testcase TC_removeMapping_unknownMap() runs on bankd_test_CT { f_init(); as_connectBankReq(bid := mp_bank_id, nslots := mp_num_slots); + f_rspro_srv_reset_state(ok); var BankSlot bs := { bankId := mp_bank_id, slotNr := 0 }; var ClientSlot cs := { clientId := 23, slotNr := 42 }; f_rspro_srv_remove_slotmap(cs, bs, exp_res := unknownSlotmap); @@ -132,6 +137,7 @@ testcase TC_removeMapping() runs on bankd_test_CT { f_init(); as_connectBankReq(bid := mp_bank_id, nslots := mp_num_slots); + f_rspro_srv_reset_state(ok); var BankSlot bs := { bankId := mp_bank_id, slotNr := 0 }; var ClientSlot cs := { clientId := 23, slotNr := 42 }; f_rspro_srv_create_slotmap(cs, bs); @@ -180,6 +186,7 @@ f_init(); as_connectBankReq(bid := mp_bank_id, nslots := mp_num_slots); + f_rspro_srv_reset_state(ok); var BankSlot bs := { bankId := mp_bank_id, slotNr := 0 }; f_rspro_srv_create_slotmap(rspro[0].rspro_client_slot, bs); @@ -201,6 +208,7 @@ f_init(); as_connectBankReq(bid := mp_bank_id, nslots := mp_num_slots); + f_rspro_srv_reset_state(ok); var BankSlot bs := { bankId := mp_bank_id, slotNr := 0 }; f_rspro_srv_create_slotmap(rspro[0].rspro_client_slot, bs); @@ -248,6 +256,7 @@ f_init(); as_connectBankReq(bid := mp_bank_id, nslots := mp_num_slots); + f_rspro_srv_reset_state(ok); var BankSlot bs := { bankId := mp_bank_id, slotNr := 0 }; f_rspro_srv_create_slotmap(rspro[0].rspro_client_slot, bs); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16494 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If810ccbbc848dd2448a4eaea20c80f60f15a2e84 Gerrit-Change-Number: 16494 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 21:26:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 21:26:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: resmim: Adjust TC_createMapping_busySlot to current bankd code In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16495 ) Change subject: resmim: Adjust TC_createMapping_busySlot to current bankd code ...................................................................... resmim: Adjust TC_createMapping_busySlot to current bankd code Since osmo-remsim Change-Id I83e319d22896b881c0d882542842f500075aa546 createMapping will overwrite any existing mappings that may already exist for that bank-slot. We need to adjust our test expectations accordingly. Change-Id: Ia8de9edd7edb0437cd783b7d045571ff69820c42 Related: OS#4278 --- M remsim/RemsimBankd_Tests.ttcn 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/remsim/RemsimBankd_Tests.ttcn b/remsim/RemsimBankd_Tests.ttcn index 4e87024..e86dc16 100644 --- a/remsim/RemsimBankd_Tests.ttcn +++ b/remsim/RemsimBankd_Tests.ttcn @@ -95,8 +95,10 @@ f_rspro_srv_reset_state(ok); var BankSlot bs := { bankId := mp_bank_id, slotNr := 0 }; var ClientSlot cs := { clientId := 23, slotNr := 42 }; + /* create the mapping the first time */ f_rspro_srv_create_slotmap(cs, bs); - f_rspro_srv_create_slotmap(cs, bs, exp_res := illegalSlotId); + /* re-create the mapping a second time */ + f_rspro_srv_create_slotmap(cs, bs); Misc_Helpers.f_shutdown(__BFILE__, __LINE__, pass); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16495 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia8de9edd7edb0437cd783b7d045571ff69820c42 Gerrit-Change-Number: 16495 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 22:23:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 22:23:32 +0000 Subject: Change in osmo-remsim[master]: bankd: Implement new ResetStateReq In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16492 ) Change subject: bankd: Implement new ResetStateReq ...................................................................... bankd: Implement new ResetStateReq Change-Id: Ib794e605162903a2b2c4f4516887ec91fc8d139a --- M src/bankd/bankd_main.c M src/slotmap.c M src/slotmap.h 3 files changed, 30 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 82ed8c0..d6e643b 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -150,6 +150,7 @@ { const CreateMappingReq_t *creq = NULL; const RemoveMappingReq_t *rreq = NULL; + struct bankd_worker *worker; struct slot_mapping *map; struct bank_slot bs; struct client_slot cs; @@ -230,6 +231,19 @@ } server_conn_send_rspro(srvc, resp); break; + case RsproPDUchoice_PR_resetStateReq: + /* delete all slotmaps */ + slotmap_del_all(g_bankd->slotmaps); + /* notify all workers about maps having disappeared */ + pthread_mutex_lock(&g_bankd->workers_mutex); + llist_for_each_entry(worker, &g_bankd->workers, list) { + pthread_kill(worker->thread, SIGMAPDEL); + } + pthread_mutex_unlock(&g_bankd->workers_mutex); + /* send response to server */ + resp = rspro_gen_ResetStateRes(ResultCode_ok); + server_conn_send_rspro(srvc, resp); + break; default: LOGPFSML(srvc->fi, LOGL_ERROR, "Unknown/Unsupported RSPRO PDU type: %u\n", pdu->msg.present); diff --git a/src/slotmap.c b/src/slotmap.c index b4a8e6f..b837f01 100644 --- a/src/slotmap.c +++ b/src/slotmap.c @@ -159,6 +159,19 @@ slotmaps_unlock(maps); } + +/* thread-safe removal of all bank<->client maps */ +void slotmap_del_all(struct slotmaps *maps) +{ + struct slot_mapping *map, *map2; + + slotmaps_wrlock(maps); + llist_for_each_entry_safe(map, map2, &maps->mappings, list) { + _slotmap_del(maps, map); + } + slotmaps_unlock(maps); +} + struct slotmaps *slotmap_init(void *ctx) { struct slotmaps *sm = talloc_zero(ctx, struct slotmaps); diff --git a/src/slotmap.h b/src/slotmap.h index bf18e04..3d07c8d 100644 --- a/src/slotmap.h +++ b/src/slotmap.h @@ -83,6 +83,9 @@ void slotmap_del(struct slotmaps *maps, struct slot_mapping *map); void _slotmap_del(struct slotmaps *maps, struct slot_mapping *map); +/* thread-safe removal of all bank<->client maps */ +void slotmap_del_all(struct slotmaps *maps); + /* initialize the entire map collection */ struct slotmaps *slotmap_init(void *ctx); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16492 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ib794e605162903a2b2c4f4516887ec91fc8d139a Gerrit-Change-Number: 16492 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 22:23:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 22:23:32 +0000 Subject: Change in osmo-remsim[master]: bankd: No need to handle SIGMAPDEL if we're not mapped yet In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16497 ) Change subject: bankd: No need to handle SIGMAPDEL if we're not mapped yet ...................................................................... bankd: No need to handle SIGMAPDEL if we're not mapped yet Change-Id: I187b833a9b7ec3d3763e21b5c88a3fa39ba0c4c7 --- M src/bankd/bankd_main.c 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index d6e643b..a204be5 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -431,9 +431,11 @@ { LOGW(g_worker, "SIGMAPDEL received: Main thread informs us our map is gone\n"); OSMO_ASSERT(sig == SIGMAPDEL); - g_worker->slot.bank_id = 0xffff; - g_worker->slot.slot_nr = 0xffff; - worker_set_state(g_worker, BW_ST_CONN_CLIENT_UNMAPPED); + if (g_worker->state >= BW_ST_CONN_CLIENT_MAPPED) { + g_worker->slot.bank_id = 0xffff; + g_worker->slot.slot_nr = 0xffff; + worker_set_state(g_worker, BW_ST_CONN_CLIENT_UNMAPPED); + } } static void handle_sig_usr1(int sig) -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16497 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I187b833a9b7ec3d3763e21b5c88a3fa39ba0c4c7 Gerrit-Change-Number: 16497 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 22:26:31 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 22:26:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library: VTY: Allow hyphens in VTY prompt In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16482 ) Change subject: library: VTY: Allow hyphens in VTY prompt ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16482 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia5acbbe5828901726f7f15c4a99d596e94914c4b Gerrit-Change-Number: 16482 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Dec 2019 22:26:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 22:26:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 4 Dec 2019 22:26:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library: VTY: Allow hyphens in VTY prompt In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16482 ) Change subject: library: VTY: Allow hyphens in VTY prompt ...................................................................... library: VTY: Allow hyphens in VTY prompt Old versions of osmo-pcu print "Osmo-PCU" as VTY prompt. This commit allows supporting this kind of prompt. Change-Id: Ia5acbbe5828901726f7f15c4a99d596e94914c4b --- M library/Osmocom_VTY_Functions.ttcn 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/Osmocom_VTY_Functions.ttcn b/library/Osmocom_VTY_Functions.ttcn index b61a655..a1724e9 100644 --- a/library/Osmocom_VTY_Functions.ttcn +++ b/library/Osmocom_VTY_Functions.ttcn @@ -63,9 +63,9 @@ T.start; alt { - [] pt.receive(pattern "\w+" & VTY_VIEW_SUFFIX) { }; - [] pt.receive(pattern "\w+\# ") { }; - [] pt.receive(pattern "\w+\(*\)\# ") { }; + [] pt.receive(pattern "[\w-]+" & VTY_VIEW_SUFFIX) { }; + [] pt.receive(pattern "[\w-]+\# ") { }; + [] pt.receive(pattern "[\w-]+\(*\)\# ") { }; [] pt.receive(t_vty_unknown) { testcase.stop(fail, "VTY: Unknown Command"); }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16482 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia5acbbe5828901726f7f15c4a99d596e94914c4b Gerrit-Change-Number: 16482 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 22:43:25 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 22:43:25 +0000 Subject: Change in docker-playground[master]: ttcn3-cpu: Support VTY prompt used in older versions of osmo-pcu In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16483 ) Change subject: ttcn3-cpu: Support VTY prompt used in older versions of osmo-pcu ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16483 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8cec3da889623915ca46b5eb1b51bc81195accf9 Gerrit-Change-Number: 16483 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 22:43:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 22:43:28 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 22:43:28 +0000 Subject: Change in docker-playground[master]: ttcn3-cpu: Support VTY prompt used in older versions of osmo-pcu In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16483 ) Change subject: ttcn3-cpu: Support VTY prompt used in older versions of osmo-pcu ...................................................................... ttcn3-cpu: Support VTY prompt used in older versions of osmo-pcu Change-Id: I8cec3da889623915ca46b5eb1b51bc81195accf9 --- M ttcn3-pcu-test/PCU_Tests.cfg M ttcn3-pcu-test/jenkins.sh 2 files changed, 7 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Verified diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg index 2502fd2..9520775 100644 --- a/ttcn3-pcu-test/PCU_Tests.cfg +++ b/ttcn3-pcu-test/PCU_Tests.cfg @@ -6,6 +6,7 @@ [TESTPORT_PARAMETERS] *.PCUVTY.CTRL_HOSTNAME := "172.18.13.101" +*.PCUVTY.PROMPT1 := "OsmoPCU> " [MODULE_PARAMETERS] PCU_Tests_RAW.mp_pcu_sock_path := "/data/unix/pcu_bts" @@ -17,6 +18,7 @@ nsvci := 1234, nsei := 1234 } +Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU"; [MAIN_CONTROLLER] diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index d4e8be0..4305a8d 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -13,6 +13,11 @@ mkdir $VOL_BASE_DIR/pcu-tester mkdir $VOL_BASE_DIR/pcu-tester/unix cp PCU_Tests.cfg $VOL_BASE_DIR/pcu-tester/ +# Latest release of osmo-pcu (0.7.0) has prompt "Osmo-PCU", while master uses more +# usual osmocom form "OsmoPCU". This can be removed once a new osmo-pcu version is released +if [ "$IMAGE_SUFFIX" = "latest" ]; then + sed "s/OsmoPCU/Osmo-PCU/g" -i $VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg +fi mkdir $VOL_BASE_DIR/pcu mkdir $VOL_BASE_DIR/pcu/unix -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16483 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8cec3da889623915ca46b5eb1b51bc81195accf9 Gerrit-Change-Number: 16483 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 4 22:44:13 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 4 Dec 2019 22:44:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix incorrect FN being send over PCUIF to PCU In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16486 ) Change subject: pcu: Fix incorrect FN being send over PCUIF to PCU ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16486/1/pcu/PCUIF_RAW_Components.ttcn File pcu/PCUIF_RAW_Components.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16486/1/pcu/PCUIF_RAW_Components.ttcn at 315 PS1, Line 315: event.data.tdma_fn - 3 > This formula is not applicable for PTCCH :/ Why? can you extend your comment please? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iba0b1d1a3d7d875c5443a7bcaff399f9681624ad Gerrit-Change-Number: 16486 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Dec 2019 22:44:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Dec 5 01:47:47 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 05 Dec 2019 01:47:47 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_10/aarch64 In-Reply-To: References: Message-ID: <5de861d7dba74_6ce52ac86cf385f42175fe@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_10/aarch64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_10/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 312s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 312s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 312s] dh_install -O--fail-missing [ 312s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 312s] dh_install: This feature will be removed in compat 12. [ 312s] dh_missing: usr/lib/aarch64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 312s] dh_missing: usr/lib/aarch64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 312s] dh_missing: missing files, aborting [ 312s] The following debhelper tools have reported what they installed (with files per package) [ 312s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 312s] If the missing files are installed by another tool, please file a bug against it. [ 312s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 312s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 312s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 312s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 312s] For a short-term work-around: Add the files to debian/not-installed [ 312s] dh_install: dh_missing --fail-missing returned exit code 2 [ 312s] make: *** [debian/rules:12: binary] Error 25 [ 312s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 312s] [ 312s] obs-arm-9 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 01:47:36 UTC 2019. [ 312s] [ 312s] ### VM INTERACTION START ### [ 315s] [ 300.375683] sysrq: Power Off [ 315s] [ 300.421047] reboot: Power down [ 316s] ### VM INTERACTION END ### [ 316s] [ 316s] obs-arm-9 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 01:47:40 UTC 2019. [ 316s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Dec 5 01:51:13 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 05 Dec 2019 01:51:13 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5de862aa7af17_6ce52ac86cf385f4218030@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 524s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc' [ 524s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 524s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 524s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 524s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 524s] make[4]: Nothing to be done for 'install-exec-am'. [ 524s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/aarch64-linux-gnu/pkgconfig' [ 524s] /usr/bin/install -c -m 644 libosmo-rspro.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/aarch64-linux-gnu/pkgconfig' [ 524s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 524s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 524s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 524s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 524s] dh_install -O--fail-missing [ 524s] dh_install: usr/lib/aarch64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 524s] dh_install: usr/lib/aarch64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 524s] dh_install: missing files, aborting [ 524s] debian/rules:12: recipe for target 'binary' failed [ 524s] make: *** [binary] Error 2 [ 524s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 524s] [ 524s] obs-arm-4 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 01:51:02 UTC 2019. [ 524s] [ 524s] ### VM INTERACTION START ### [ 527s] [ 498.131150] sysrq: SysRq : Power Off [ 527s] [ 498.134252] reboot: Power down [ 527s] ### VM INTERACTION END ### [ 527s] [ 527s] obs-arm-4 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 01:51:05 UTC 2019. [ 527s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Dec 5 01:52:56 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 05 Dec 2019 01:52:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5de86304a99e6_6ce52ac86cf385f4218153@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_9.0/i586 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 521s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc' [ 521s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 521s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 521s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 521s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 521s] make[4]: Nothing to be done for 'install-exec-am'. [ 521s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/i386-linux-gnu/pkgconfig' [ 521s] /usr/bin/install -c -m 644 libosmo-rspro.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/i386-linux-gnu/pkgconfig' [ 521s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 521s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 521s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 521s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 521s] dh_install -O--fail-missing [ 521s] dh_install: usr/lib/i386-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 521s] dh_install: usr/lib/i386-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 521s] dh_install: missing files, aborting [ 521s] debian/rules:12: recipe for target 'binary' failed [ 521s] make: *** [binary] Error 2 [ 521s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 521s] [ 521s] lamb03 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 01:52:51 UTC 2019. [ 521s] [ 521s] ### VM INTERACTION START ### [ 524s] [ 492.275735] sysrq: SysRq : Power Off [ 524s] [ 492.310222] reboot: Power down [ 524s] ### VM INTERACTION END ### [ 524s] [ 524s] lamb03 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 01:52:55 UTC 2019. [ 524s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Dec 5 01:54:56 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 05 Dec 2019 01:54:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5de8637f97152_6ce52ac86cf385f42183f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-remsim failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 352s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 352s] dh_install -O--fail-missing [ 352s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 352s] dh_install: This feature will be removed in compat 12. [ 352s] dh_missing: usr/lib/i386-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 352s] dh_missing: usr/lib/i386-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 352s] dh_missing: missing files, aborting [ 352s] The following debhelper tools have reported what they installed (with files per package) [ 352s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 352s] If the missing files are installed by another tool, please file a bug against it. [ 352s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 352s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 352s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 352s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 352s] For a short-term work-around: Add the files to debian/not-installed [ 352s] dh_install: dh_missing --fail-missing returned exit code 2 [ 352s] debian/rules:12: recipe for target 'binary' failed [ 352s] make: *** [binary] Error 25 [ 352s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 352s] [ 352s] lamb13 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 01:54:49 UTC 2019. [ 352s] [ 352s] ### VM INTERACTION START ### [ 356s] [ 340.830837] sysrq: SysRq : Power Off [ 356s] [ 340.837329] reboot: Power down [ 356s] ### VM INTERACTION END ### [ 356s] [ 356s] lamb13 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 01:54:53 UTC 2019. [ 356s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Dec 5 01:55:30 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 05 Dec 2019 01:55:30 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_10/i586 In-Reply-To: References: Message-ID: <5de8639abe37d_6ce52ac86cf385f42184f2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_10/i586 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 656s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 656s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 656s] dh_install -O--fail-missing [ 656s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 656s] dh_install: This feature will be removed in compat 12. [ 656s] dh_missing: usr/lib/i386-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 656s] dh_missing: usr/lib/i386-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 657s] dh_missing: missing files, aborting [ 657s] The following debhelper tools have reported what they installed (with files per package) [ 657s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 657s] If the missing files are installed by another tool, please file a bug against it. [ 657s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 657s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 657s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 657s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 657s] For a short-term work-around: Add the files to debian/not-installed [ 657s] dh_install: dh_missing --fail-missing returned exit code 2 [ 657s] make: *** [debian/rules:12: binary] Error 25 [ 657s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 657s] [ 657s] lamb56 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 01:55:20 UTC 2019. [ 657s] [ 657s] ### VM INTERACTION START ### [ 660s] [ 639.077766] sysrq: SysRq : Power Off [ 660s] [ 639.095357] reboot: Power down [ 660s] ### VM INTERACTION END ### [ 660s] [ 660s] lamb56 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 01:55:24 UTC 2019. [ 660s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Dec 5 01:56:05 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 05 Dec 2019 01:56:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5de863bc26b4f_6ce52ac86cf385f4218776@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-remsim failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 436s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 436s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 436s] dh_install -O--fail-missing [ 436s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 436s] dh_install: This feature will be removed in compat 12. [ 436s] dh_missing: usr/lib/i386-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 436s] dh_missing: usr/lib/i386-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 436s] dh_missing: missing files, aborting [ 436s] The following debhelper tools have reported what they installed (with files per package) [ 436s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 436s] If the missing files are installed by another tool, please file a bug against it. [ 436s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 436s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 436s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 436s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 436s] For a short-term work-around: Add the files to debian/not-installed [ 436s] dh_install: dh_missing --fail-missing returned exit code 2 [ 436s] make: *** [debian/rules:12: binary] Error 25 [ 436s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 436s] [ 436s] lamb54 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 01:55:57 UTC 2019. [ 436s] [ 436s] ### VM INTERACTION START ### [ 439s] [ 421.818832] sysrq: SysRq : Power Off [ 439s] [ 421.827315] reboot: Power down [ 439s] ### VM INTERACTION END ### [ 439s] [ 439s] lamb54 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 01:56:01 UTC 2019. [ 439s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Dec 5 01:56:39 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 05 Dec 2019 01:56:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5de863f55faef_6ce52ac86cf385f421883a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 264s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc' [ 264s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 264s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 264s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 264s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 264s] make[4]: Nothing to be done for 'install-exec-am'. [ 264s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' [ 264s] /usr/bin/install -c -m 644 libosmo-rspro.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig' [ 264s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 264s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 264s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 264s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 264s] dh_install -O--fail-missing [ 264s] dh_install: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 264s] dh_install: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 264s] dh_install: missing files, aborting [ 264s] debian/rules:12: recipe for target 'binary' failed [ 264s] make: *** [binary] Error 2 [ 264s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 264s] [ 264s] lamb07 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 01:56:32 UTC 2019. [ 264s] [ 264s] ### VM INTERACTION START ### [ 267s] [ 253.314536] sysrq: SysRq : Power Off [ 267s] [ 253.334356] reboot: Power down [ 267s] ### VM INTERACTION END ### [ 267s] [ 267s] lamb07 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 01:56:36 UTC 2019. [ 267s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Dec 5 01:57:47 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 05 Dec 2019 01:57:47 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5de8642db6ab2_6ce52ac86cf385f42191f1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 411s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 411s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 411s] dh_install -O--fail-missing [ 411s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 411s] dh_install: This feature will be removed in compat 12. [ 412s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 412s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 412s] dh_missing: missing files, aborting [ 412s] The following debhelper tools have reported what they installed (with files per package) [ 412s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 412s] If the missing files are installed by another tool, please file a bug against it. [ 412s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 412s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 412s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 412s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 412s] For a short-term work-around: Add the files to debian/not-installed [ 412s] dh_install: dh_missing --fail-missing returned exit code 255 [ 412s] make: *** [debian/rules:12: binary] Error 255 [ 412s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 412s] [ 412s] lamb27 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 01:57:31 UTC 2019. [ 412s] [ 412s] ### VM INTERACTION START ### [ 415s] [ 396.867701] sysrq: SysRq : Power Off [ 415s] [ 396.874517] reboot: Power down [ 415s] ### VM INTERACTION END ### [ 415s] [ 415s] lamb27 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 01:57:35 UTC 2019. [ 415s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Dec 5 02:00:39 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 05 Dec 2019 02:00:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5de864e2a53f3_6ce52ac86cf385f42195d0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 337s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 337s] dh_install -O--fail-missing [ 337s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 337s] dh_install: This feature will be removed in compat 12. [ 337s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 337s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 337s] dh_missing: missing files, aborting [ 337s] The following debhelper tools have reported what they installed (with files per package) [ 337s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 337s] If the missing files are installed by another tool, please file a bug against it. [ 337s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 337s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 337s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 337s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 337s] For a short-term work-around: Add the files to debian/not-installed [ 337s] dh_install: dh_missing --fail-missing returned exit code 2 [ 337s] debian/rules:12: recipe for target 'binary' failed [ 337s] make: *** [binary] Error 25 [ 337s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 337s] [ 337s] lamb13 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 02:00:28 UTC 2019. [ 337s] [ 337s] ### VM INTERACTION START ### [ 340s] [ 325.618262] sysrq: SysRq : Power Off [ 340s] [ 325.627702] reboot: Power down [ 340s] ### VM INTERACTION END ### [ 340s] [ 340s] lamb13 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 02:00:31 UTC 2019. [ 340s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Dec 5 02:01:13 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 05 Dec 2019 02:01:13 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5de865023f23e_6ce52ac86cf385f4219719@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 534s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 534s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 534s] dh_install -O--fail-missing [ 534s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 534s] dh_install: This feature will be removed in compat 12. [ 535s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 535s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 535s] dh_missing: missing files, aborting [ 535s] The following debhelper tools have reported what they installed (with files per package) [ 535s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 535s] If the missing files are installed by another tool, please file a bug against it. [ 535s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 535s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 535s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 535s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 535s] For a short-term work-around: Add the files to debian/not-installed [ 535s] dh_install: dh_missing --fail-missing returned exit code 255 [ 535s] make: *** [debian/rules:12: binary] Error 255 [ 535s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 535s] [ 535s] lamb12 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 02:01:08 UTC 2019. [ 535s] [ 535s] ### VM INTERACTION START ### [ 538s] [ 520.848444] sysrq: SysRq : Power Off [ 538s] [ 520.856856] reboot: Power down [ 538s] ### VM INTERACTION END ### [ 538s] [ 538s] lamb12 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 02:01:12 UTC 2019. [ 538s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Dec 5 02:01:13 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 05 Dec 2019 02:01:13 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5de8650342c71_6ce52ac86cf385f421985a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_10/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 505s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 505s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 505s] dh_install -O--fail-missing [ 505s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 505s] dh_install: This feature will be removed in compat 12. [ 505s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 505s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 505s] dh_missing: missing files, aborting [ 505s] The following debhelper tools have reported what they installed (with files per package) [ 505s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 505s] If the missing files are installed by another tool, please file a bug against it. [ 505s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 505s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 505s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 505s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 505s] For a short-term work-around: Add the files to debian/not-installed [ 505s] dh_install: dh_missing --fail-missing returned exit code 2 [ 505s] make: *** [debian/rules:12: binary] Error 25 [ 505s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 505s] [ 505s] lamb12 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 02:01:06 UTC 2019. [ 505s] [ 505s] ### VM INTERACTION START ### [ 509s] [ 484.680880] sysrq: SysRq : Power Off [ 509s] [ 484.688355] reboot: Power down [ 509s] ### VM INTERACTION END ### [ 509s] [ 509s] lamb12 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 02:01:10 UTC 2019. [ 509s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Dec 5 02:02:39 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 05 Dec 2019 02:02:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5de8655c97ee2_6ce52ac86cf385f4219940@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 821s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 821s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 821s] dh_install -O--fail-missing [ 821s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 821s] dh_install: This feature will be removed in compat 12. [ 822s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 822s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 822s] dh_missing: missing files, aborting [ 822s] The following debhelper tools have reported what they installed (with files per package) [ 822s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 822s] If the missing files are installed by another tool, please file a bug against it. [ 822s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 822s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 822s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 822s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 822s] For a short-term work-around: Add the files to debian/not-installed [ 822s] dh_install: dh_missing --fail-missing returned exit code 2 [ 822s] make: *** [debian/rules:12: binary] Error 25 [ 822s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 822s] [ 822s] lamb16 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 02:02:20 UTC 2019. [ 822s] [ 822s] ### VM INTERACTION START ### [ 825s] [ 778.864994] sysrq: SysRq : Power Off [ 825s] [ 778.872361] reboot: Power down [ 825s] ### VM INTERACTION END ### [ 825s] [ 825s] lamb16 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 02:02:25 UTC 2019. [ 825s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Dec 5 02:04:22 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 05 Dec 2019 02:04:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5de865b727b10_6ce52ac86cf385f4220446@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 804s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 804s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 804s] dh_install -O--fail-missing [ 804s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 804s] dh_install: This feature will be removed in compat 12. [ 804s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 804s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 804s] dh_missing: missing files, aborting [ 804s] The following debhelper tools have reported what they installed (with files per package) [ 804s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 804s] If the missing files are installed by another tool, please file a bug against it. [ 804s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 804s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 804s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 804s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 804s] For a short-term work-around: Add the files to debian/not-installed [ 804s] dh_install: dh_missing --fail-missing returned exit code 255 [ 804s] make: *** [debian/rules:12: binary] Error 255 [ 804s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 804s] [ 804s] lamb16 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 02:04:13 UTC 2019. [ 804s] [ 804s] ### VM INTERACTION START ### [ 807s] [ 771.554602] sysrq: SysRq : Power Off [ 807s] [ 771.563959] reboot: Power down [ 807s] ### VM INTERACTION END ### [ 807s] [ 807s] lamb16 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 02:04:17 UTC 2019. [ 807s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Dec 5 02:17:31 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 05 Dec 2019 02:17:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5de868c6e3467_6ce52ac86cf385f42227f9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 448s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 448s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 448s] dh_install -O--fail-missing [ 448s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 448s] dh_install: This feature will be removed in compat 12. [ 448s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 448s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 448s] dh_missing: missing files, aborting [ 448s] The following debhelper tools have reported what they installed (with files per package) [ 448s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 448s] If the missing files are installed by another tool, please file a bug against it. [ 448s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 448s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 448s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 448s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 448s] For a short-term work-around: Add the files to debian/not-installed [ 448s] dh_install: dh_missing --fail-missing returned exit code 2 [ 448s] make: *** [debian/rules:12: binary] Error 25 [ 448s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 448s] [ 448s] cloud106 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 02:17:18 UTC 2019. [ 448s] [ 448s] ### VM INTERACTION START ### [ 451s] [ 418.678032] sysrq: SysRq : Power Off [ 451s] [ 418.686991] reboot: Power down [ 453s] ### VM INTERACTION END ### [ 453s] [ 453s] cloud106 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 02:17:24 UTC 2019. [ 453s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Dec 5 03:48:22 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 05 Dec 2019 03:48:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_10/armv7l In-Reply-To: References: Message-ID: <5de87e1839a7d_6ce52ac86cf385f42406ae@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_10/armv7l Package network:osmocom:nightly/osmo-remsim failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 655s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 655s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 655s] dh_install -O--fail-missing [ 655s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 655s] dh_install: This feature will be removed in compat 12. [ 655s] dh_missing: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 655s] dh_missing: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 655s] dh_missing: missing files, aborting [ 655s] The following debhelper tools have reported what they installed (with files per package) [ 655s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 655s] If the missing files are installed by another tool, please file a bug against it. [ 655s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 655s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 655s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 655s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 655s] For a short-term work-around: Add the files to debian/not-installed [ 655s] dh_install: dh_missing --fail-missing returned exit code 2 [ 655s] make: *** [debian/rules:12: binary] Error 25 [ 655s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 655s] [ 655s] obs-arm-6 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 03:48:09 UTC 2019. [ 655s] [ 655s] ### VM INTERACTION START ### [ 658s] [ 619.031320] sysrq: SysRq : Power Off [ 658s] [ 619.033352] reboot: Power down [ 659s] ### VM INTERACTION END ### [ 659s] [ 659s] obs-arm-6 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 03:48:14 UTC 2019. [ 659s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Dec 5 04:09:30 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 05 Dec 2019 04:09:30 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5de883002e3ee_6ce52ac86cf385f4245398@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Raspbian_10/armv7l Package network:osmocom:nightly/osmo-remsim failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 818s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 818s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 818s] dh_install -O--fail-missing [ 818s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 818s] dh_install: This feature will be removed in compat 12. [ 818s] dh_missing: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 818s] dh_missing: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 818s] dh_missing: missing files, aborting [ 818s] The following debhelper tools have reported what they installed (with files per package) [ 818s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 818s] If the missing files are installed by another tool, please file a bug against it. [ 818s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 818s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 818s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 818s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 818s] For a short-term work-around: Add the files to debian/not-installed [ 818s] dh_install: dh_missing --fail-missing returned exit code 2 [ 818s] make: *** [debian/rules:12: binary] Error 25 [ 818s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 818s] [ 818s] obs-arm-6 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 04:09:15 UTC 2019. [ 818s] [ 819s] ### VM INTERACTION START ### [ 822s] [ 780.089416] sysrq: SysRq : Power Off [ 822s] [ 780.095930] reboot: Power down [ 823s] ### VM INTERACTION END ### [ 823s] [ 823s] obs-arm-6 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 04:09:20 UTC 2019. [ 823s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Dec 5 04:46:56 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 05 Dec 2019 04:46:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5de88bce1982e_6ce52ac86cf385f42480d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-remsim failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 735s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc' [ 735s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 735s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 735s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 735s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 735s] make[4]: Nothing to be done for 'install-exec-am'. [ 735s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/arm-linux-gnueabihf/pkgconfig' [ 735s] /usr/bin/install -c -m 644 libosmo-rspro.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/arm-linux-gnueabihf/pkgconfig' [ 735s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 735s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 735s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 735s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 735s] dh_install -O--fail-missing [ 736s] dh_install: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 736s] dh_install: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 736s] dh_install: missing files, aborting [ 736s] debian/rules:12: recipe for target 'binary' failed [ 736s] make: *** [binary] Error 2 [ 736s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 736s] [ 736s] armbuild14 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 04:46:37 UTC 2019. [ 736s] [ 736s] ### VM INTERACTION START ### [ 739s] [ 680.931599] sysrq: SysRq : Power Off [ 739s] [ 680.933612] reboot: Power down [ 739s] ### VM INTERACTION END ### [ 739s] [ 739s] armbuild14 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 04:46:41 UTC 2019. [ 739s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Dec 5 06:14:30 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 5 Dec 2019 06:14:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix incorrect FN being send over PCUIF to PCU In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16486 ) Change subject: pcu: Fix incorrect FN being send over PCUIF to PCU ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16486/1/pcu/PCUIF_RAW_Components.ttcn File pcu/PCUIF_RAW_Components.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16486/1/pcu/PCUIF_RAW_Components.ttcn at 315 PS1, Line 315: event.data.tdma_fn - 3 > Why? can you extend your comment please? Because PTCCH is interleaved over 4 _non-consecutive_ bursts, so you cannot just do -4. See 3GPP TS 145.002, or https://git.osmocom.org/osmocom-bb/tree/src/host/trxcon/sched_mframe.c#n1811. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iba0b1d1a3d7d875c5443a7bcaff399f9681624ad Gerrit-Change-Number: 16486 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 05 Dec 2019 06:14:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 07:56:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 5 Dec 2019 07:56:53 +0000 Subject: Change in osmo-remsim[master]: add missing debian/libosmo-rspro1.install References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16498 ) Change subject: add missing debian/libosmo-rspro1.install ...................................................................... add missing debian/libosmo-rspro1.install In Change-Id I77c86455f9c36c16271bc8e7f8f3f72d682d23fd for some reason libosmo-rspro0.install was not renamed/moved but deleted, causing failures to build debian packages Change-Id: I825d70abbbd067955d7038377692beea87545ce0 --- A debian/libosmo-rspro1.install 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/98/16498/1 diff --git a/debian/libosmo-rspro1.install b/debian/libosmo-rspro1.install new file mode 100644 index 0000000..2b3a85d --- /dev/null +++ b/debian/libosmo-rspro1.install @@ -0,0 +1 @@ +usr/lib/*/libosmo-rspro*.so.* -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16498 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I825d70abbbd067955d7038377692beea87545ce0 Gerrit-Change-Number: 16498 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 07:56:54 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 5 Dec 2019 07:56:54 +0000 Subject: Change in osmo-remsim[master]: rspro_client_fsm: Disable automatic connect on FSM allocation References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16499 ) Change subject: rspro_client_fsm: Disable automatic connect on FSM allocation ...................................................................... rspro_client_fsm: Disable automatic connect on FSM allocation So far, the rspor_client_fsm immediately attempted to establish a TCP connection to the RSPRO server when calling server_conn_fsm_alloc(). Let's make this implicit auto-connect an explicit request to connect using the newly-introduced SRVC_E_ESTABLISH. Let's also change all three existing users of server_conn_fsm_alloc() to send SRVC_E_ESTABLISH after calling it. The rationale of this change is to use the same rspro_client_fsm also for the client->bankd RSPRO connection, where we don't want to automatically connect at startup, but connect only at a later point, after the server a has told us to do so. Change-Id: Icd882405f2ef54e10a66054829c089e4985f1d1f --- M src/bankd/bankd_main.c M src/remsim_client.c M src/rspro_client_fsm.c M src/rspro_client_fsm.h M src/simtrace2-remsim_client.c 5 files changed, 52 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/99/16499/1 diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index a204be5..194baef 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -363,6 +363,7 @@ fprintf(stderr, "Unable to create Server conn FSM: %s\n", strerror(errno)); exit(1); } + osmo_fsm_inst_dispatch(srvc->fi, SRVC_E_ESTABLISH, NULL); /* create listening socket for inbound client connections */ rc = osmo_sock_init(AF_INET, SOCK_STREAM, IPPROTO_TCP, g_bind_ip, g_bind_port, OSMO_SOCK_F_BIND); diff --git a/src/remsim_client.c b/src/remsim_client.c index 0bfc0a4..ca6143e 100644 --- a/src/remsim_client.c +++ b/src/remsim_client.c @@ -255,6 +255,7 @@ fprintf(stderr, "Unable to create Server conn FSM: %s\n", strerror(errno)); exit(1); } + osmo_fsm_inst_dispatch(srvc->fi, SRVC_E_ESTABLISH, NULL); asn_debug = 0; diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index 7045778..9f2d7c0 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -100,6 +100,7 @@ }; static const struct value_string server_conn_fsm_event_names[] = { + OSMO_VALUE_STRING(SRVC_E_ESTABLISH), OSMO_VALUE_STRING(SRVC_E_TCP_UP), OSMO_VALUE_STRING(SRVC_E_TCP_DOWN), OSMO_VALUE_STRING(SRVC_E_KA_TIMEOUT), @@ -180,52 +181,10 @@ .wait_for_resp = 10, }; -static void srvc_st_init_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) -{ - struct rspro_server_conn *srvc = (struct rspro_server_conn *) fi->priv; - int rc; - - srvc->conn = ipa_client_conn_create(fi, NULL, 0, srvc->server_host, srvc->server_port, - srvc_updown_cb, srvc_read_cb, NULL, srvc); - if (!srvc->conn) { - LOGPFSM(fi, "Unable to create socket: %s\n", strerror(errno)); - goto out_fi; - } - - srvc->keepalive_fi = ipa_client_conn_alloc_keepalive_fsm(srvc->conn, &ka_params, fi->id); - if (!srvc->keepalive_fi) { - LOGPFSM(fi, "Unable to create keepalive FSM\n"); - goto out_conn; - } - /* ensure parent is notified once keepalive FSM instance is dying */ - osmo_fsm_inst_change_parent(srvc->keepalive_fi, srvc->fi, SRVC_E_KA_TIMEOUT); - - /* Attempt to connect TCP socket */ - rc = ipa_client_conn_open(srvc->conn); - if (rc < 0) { - LOGPFSML(fi, LOGL_NOTICE, "Unable to connect: %s\n", strerror(errno)); - goto out_ka; - } - - return; - -out_ka: - osmo_fsm_inst_term(srvc->keepalive_fi, OSMO_FSM_TERM_ERROR, NULL); -out_conn: - ipa_client_conn_destroy(srvc->conn); -out_fi: - osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); -} - static void srvc_st_init(struct osmo_fsm_inst *fi, uint32_t event, void *data) { switch (event) { - case SRVC_E_TCP_UP: - osmo_fsm_inst_state_chg(fi, SRVC_ST_ESTABLISHED, T1_WAIT_CLIENT_CONN_RES, 1); - break; - case SRVC_E_TCP_DOWN: - osmo_fsm_inst_state_chg(fi, SRVC_ST_REESTABLISH, T2_RECONNECT, 2); - break; + case SRVC_E_ESTABLISH: default: OSMO_ASSERT(0); } @@ -290,12 +249,39 @@ struct rspro_server_conn *srvc = (struct rspro_server_conn *) fi->priv; int rc; - ipa_keepalive_fsm_stop(srvc->keepalive_fi); + if (srvc->keepalive_fi) { + ipa_keepalive_fsm_stop(srvc->keepalive_fi); + osmo_fsm_inst_term(srvc->keepalive_fi, OSMO_FSM_TERM_REGULAR, NULL); + srvc->keepalive_fi = NULL; + } + + if (srvc->conn) { + LOGPFSML(fi, LOGL_INFO, "Destroying existing connection to server\n"); + ipa_client_conn_close(srvc->conn); + ipa_client_conn_destroy(srvc->conn); + srvc->conn = NULL; + } + LOGPFSML(fi, LOGL_INFO, "Creating TCP connection to server at %s:%u\n", + srvc->server_host, srvc->server_port); + srvc->conn = ipa_client_conn_create(fi, NULL, 0, srvc->server_host, srvc->server_port, + srvc_updown_cb, srvc_read_cb, NULL, srvc); + if (!srvc->conn) { + LOGPFSML(fi, LOGL_FATAL, "Unable to create socket: %s\n", strerror(errno)); + exit(1); + } + + srvc->keepalive_fi = ipa_client_conn_alloc_keepalive_fsm(srvc->conn, &ka_params, fi->id); + if (!srvc->keepalive_fi) { + LOGPFSM(fi, "Unable to create keepalive FSM\n"); + exit(1); + } + /* ensure parent is notified once keepalive FSM instance is dying */ + osmo_fsm_inst_change_parent(srvc->keepalive_fi, srvc->fi, SRVC_E_KA_TIMEOUT); /* Attempt to connect TCP socket */ rc = ipa_client_conn_open(srvc->conn); if (rc < 0) { - LOGPFSM(fi, "Unable to connect RSPRO to %s:%d - %s\n", + LOGPFSML(fi, LOGL_FATAL, "Unable to connect RSPRO to %s:%u - %s\n", srvc->server_host, srvc->server_port, strerror(errno)); /* FIXME: retry? Timer? Abort? */ OSMO_ASSERT(0); @@ -316,16 +302,28 @@ } } +static void srvc_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch (event) { + case SRVC_E_ESTABLISH: + osmo_fsm_inst_state_chg(fi, SRVC_ST_REESTABLISH, T2_RECONNECT, 2); + break; + default: + OSMO_ASSERT(0); + } +} + static int server_conn_fsm_timer_cb(struct osmo_fsm_inst *fi) { struct rspro_server_conn *srvc = (struct rspro_server_conn *) fi->priv; switch (fi->T) { case 2: + /* TCP reconnect failed: retry */ osmo_fsm_inst_state_chg(fi, SRVC_ST_REESTABLISH, T2_RECONNECT, 2); break; case 1: - /* close connection and re-start connection attempt */ + /* no ClientConnectRes received: disconnect + reconnect */ ipa_client_conn_close(srvc->conn); osmo_fsm_inst_dispatch(fi, SRVC_E_TCP_DOWN, NULL); break; @@ -339,10 +337,9 @@ static const struct osmo_fsm_state server_conn_fsm_states[] = { [SRVC_ST_INIT] = { .name = "INIT", - .in_event_mask = S(SRVC_E_TCP_UP) | S(SRVC_E_TCP_DOWN), - .out_state_mask = S(SRVC_ST_ESTABLISHED) | S(SRVC_ST_REESTABLISH), + .in_event_mask = 0, /* S(SRVC_E_ESTABLISH) via allstate */ + .out_state_mask = S(SRVC_ST_REESTABLISH), .action = srvc_st_init, - .onenter = srvc_st_init_onenter, }, [SRVC_ST_ESTABLISHED] = { .name = "ESTABLISHED", @@ -370,6 +367,8 @@ .name = "RSPRO_CLIENT", .states = server_conn_fsm_states, .num_states = ARRAY_SIZE(server_conn_fsm_states), + .allstate_event_mask = S(SRVC_E_ESTABLISH), + .allstate_action = srvc_allstate_action, .timer_cb = server_conn_fsm_timer_cb, .log_subsys = DMAIN, .event_names = server_conn_fsm_event_names, @@ -384,8 +383,6 @@ return -1; srvc->fi = fi; - /* onenter of the initial state is not automatically executed by osmo_fsm :( */ - srvc_st_init_onenter(fi, 0); return 0; } diff --git a/src/rspro_client_fsm.h b/src/rspro_client_fsm.h index 8e7f58c..c11e260 100644 --- a/src/rspro_client_fsm.h +++ b/src/rspro_client_fsm.h @@ -5,6 +5,7 @@ #include enum server_conn_fsm_event { + SRVC_E_ESTABLISH, /* instruct SRVC to (re)etablish TCP connection to bankd */ SRVC_E_TCP_UP, SRVC_E_TCP_DOWN, SRVC_E_KA_TIMEOUT, diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index 69d6a04..19f84a3 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -868,6 +868,7 @@ fprintf(stderr, "Unable to create Server conn FSM: %s\n", strerror(errno)); exit(1); } + osmo_fsm_inst_dispatch(srvc->fi, SRVC_E_ESTABLISH, NULL); asn_debug = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16499 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Icd882405f2ef54e10a66054829c089e4985f1d1f Gerrit-Change-Number: 16499 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 07:58:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 5 Dec 2019 07:58:33 +0000 Subject: Change in osmo-remsim[master]: add missing debian/libosmo-rspro1.install In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16498 ) Change subject: add missing debian/libosmo-rspro1.install ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16498 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I825d70abbbd067955d7038377692beea87545ce0 Gerrit-Change-Number: 16498 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 05 Dec 2019 07:58:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 07:59:52 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 5 Dec 2019 07:59:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Verify contents of data dl blocks originated from emulated SGSN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16485 ) Change subject: pcu: Verify contents of data dl blocks originated from emulated SGSN ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4fe79572094038cbb26d5195c0544846ca2550b5 Gerrit-Change-Number: 16485 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 05 Dec 2019 07:59:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 08:02:04 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 5 Dec 2019 08:02:04 +0000 Subject: Change in osmo-remsim[master]: add missing debian/libosmo-rspro1.install In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16498 ) Change subject: add missing debian/libosmo-rspro1.install ...................................................................... add missing debian/libosmo-rspro1.install In Change-Id I77c86455f9c36c16271bc8e7f8f3f72d682d23fd for some reason libosmo-rspro0.install was not renamed/moved but deleted, causing failures to build debian packages Change-Id: I825d70abbbd067955d7038377692beea87545ce0 --- A debian/libosmo-rspro1.install 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/libosmo-rspro1.install b/debian/libosmo-rspro1.install new file mode 100644 index 0000000..2b3a85d --- /dev/null +++ b/debian/libosmo-rspro1.install @@ -0,0 +1 @@ +usr/lib/*/libosmo-rspro*.so.* -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16498 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I825d70abbbd067955d7038377692beea87545ce0 Gerrit-Change-Number: 16498 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 11:16:04 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 5 Dec 2019 11:16:04 +0000 Subject: Change in osmo-bts[master]: rsl: Clarify when autnonoums MS Power Ctrl Loop is used In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16438 ) Change subject: rsl: Clarify when autnonoums MS Power Ctrl Loop is used ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/16438/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/16438/1//COMMIT_MSG at 7 PS1, Line 7: rsl: Clarify when autnonoums MS Power Ctrl Loop is used (autonomous) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id6b444a33ab062f6dab11a0ce62d8aecaea87591 Gerrit-Change-Number: 16438 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 05 Dec 2019 11:16:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 11:22:10 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 5 Dec 2019 11:22:10 +0000 Subject: Change in osmo-bts[master]: power_control.c: Log maximum allowed MS Power Level In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16439 ) Change subject: power_control.c: Log maximum allowed MS Power Level ...................................................................... power_control.c: Log maximum allowed MS Power Level Change-Id: I983ff824ef6f54f1e800819d622158d5e2a51f04 --- M src/common/power_control.c 1 file changed, 10 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/power_control.c b/src/common/power_control.c index d2a6c1d..f6138d6 100644 --- a/src/common/power_control.c +++ b/src/common/power_control.c @@ -104,16 +104,20 @@ if (lchan->ms_power_ctrl.current == new_power) { LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "Keeping MS power at control level %d, %d dBm " - "(rx-ms-pwr-lvl %" PRIu8 ", rx-current %d dBm, rx-target %d dBm)\n", - new_power, ms_pwr_dbm(band, new_power), ms_power, rxLevel, bts->ul_power_target); + "(rx-ms-pwr-lvl %" PRIu8 ", max-ms-pwr-lvl %" PRIu8 ", rx-current %d dBm, rx-target %d dBm)\n", + new_power, ms_pwr_dbm(band, new_power), + ms_power, lchan->ms_power_ctrl.max, + rxLevel, bts->ul_power_target); return 0; } LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "%s MS power from control level %d (%d dBm) to %d, %d dBm " - "(rx-ms-pwr-lvl %" PRIu8 ", rx-current %d dBm, rx-target %d dBm)\n", - (diff > 0) ? "Raising" : "Lowering", - lchan->ms_power_ctrl.current, ms_pwr_dbm(band, lchan->ms_power_ctrl.current), - new_power, ms_pwr_dbm(band, new_power), ms_power, rxLevel, bts->ul_power_target); + "(rx-ms-pwr-lvl %" PRIu8 ", max-ms-pwr-lvl %" PRIu8 ", rx-current %d dBm, rx-target %d dBm)\n", + (diff > 0) ? "Raising" : "Lowering", + lchan->ms_power_ctrl.current, ms_pwr_dbm(band, lchan->ms_power_ctrl.current), + new_power, ms_pwr_dbm(band, new_power), + ms_power, lchan->ms_power_ctrl.max, + rxLevel, bts->ul_power_target); /* store the resulting new MS power level in the lchan */ lchan->ms_power_ctrl.current = new_power; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I983ff824ef6f54f1e800819d622158d5e2a51f04 Gerrit-Change-Number: 16439 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 11:22:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 5 Dec 2019 11:22:09 +0000 Subject: Change in osmo-bts[master]: rsl: Clarify when autnonoums MS Power Ctrl Loop is used In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16438 ) Change subject: rsl: Clarify when autnonoums MS Power Ctrl Loop is used ...................................................................... rsl: Clarify when autnonoums MS Power Ctrl Loop is used Simplify when the fixed field is set in rsl_rx_chan_activ. Comment talks about enabling autonoumous control loop, but it is actually describing it when disabling it, which is confusing. Change-Id: Id6b444a33ab062f6dab11a0ce62d8aecaea87591 --- M src/common/rsl.c 1 file changed, 6 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/rsl.c b/src/common/rsl.c index 67eb622..b315d30 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1100,7 +1100,7 @@ /* Initialize channel defaults */ lchan->ms_power_ctrl.max = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, 0); lchan->ms_power_ctrl.current = lchan->ms_power_ctrl.max; - lchan->ms_power_ctrl.fixed = false; + lchan->ms_power_ctrl.fixed = true; rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg)); @@ -1152,7 +1152,6 @@ if (TLVP_PRES_LEN(&tp, RSL_IE_MS_POWER, 1)) { lchan->ms_power_ctrl.max = *TLVP_VAL(&tp, RSL_IE_MS_POWER) & 0x1F; lchan->ms_power_ctrl.current = lchan->ms_power_ctrl.max; - lchan->ms_power_ctrl.fixed = false; } /* 9.3.24 Timing Advance */ if (TLVP_PRES_LEN(&tp, RSL_IE_TIMING_ADVANCE, 1)) @@ -1160,13 +1159,11 @@ /* 9.3.32 BS Power Parameters */ /* 9.3.31 MS Power Parameters */ - if (TLVP_PRESENT(&tp, RSL_IE_MS_POWER_PARAM)) - lchan->ms_power_ctrl.fixed = false; - else { + if (TLVP_PRESENT(&tp, RSL_IE_MS_POWER_PARAM)) { /* Spec explicitly states BTS should only perform * autonomous MS power control loop in BTS if 'MS Power * Parameters' IE is present! */ - lchan->ms_power_ctrl.fixed = true; + lchan->ms_power_ctrl.fixed = false; } /* 9.3.16 Physical Context */ @@ -1637,12 +1634,12 @@ LOGPLCHAN(lchan, DRSL, LOGL_INFO, "Rx MS POWER CONTROL %" PRIu8 "\n", pwr); /* 9.3.31 MS Power Parameters (O) */ - if (TLVP_PRESENT(&tp, RSL_IE_MS_POWER_PARAM)) - lchan->ms_power_ctrl.fixed = false; - else { + if (TLVP_PRESENT(&tp, RSL_IE_MS_POWER_PARAM)) { /* Spec explicitly states BTS should only perform * autonomous MS power control loop in BTS if 'MS Power * Parameters' IE is present! */ + lchan->ms_power_ctrl.fixed = false; + } else { lchan->ms_power_ctrl.fixed = true; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id6b444a33ab062f6dab11a0ce62d8aecaea87591 Gerrit-Change-Number: 16438 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 11:31:36 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 5 Dec 2019 11:31:36 +0000 Subject: Change in osmo-bts[master]: power_control.c: Clarify loop algo vars and use correct ones during log In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16440 ) Change subject: power_control.c: Clarify loop algo vars and use correct ones during log ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/16440/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/16440/1//COMMIT_MSG at 16 PS1, Line 16: Now that variables are more clear, it also becomes clear that old "diff > : 0" condition, apart from difficult, was currently wrong, since in order : to print the raise/low verb we want to compare between old and new : values, not between received and new values. >From reading this, it was not clear to me, that the condition is fixed with this patch. Looking at the code, it is - so maybe state that explicitly? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4e279a6b93fbcc5da25bf8c9213310939fd493ce Gerrit-Change-Number: 16440 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 05 Dec 2019 11:31:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 11:58:22 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 5 Dec 2019 11:58:22 +0000 Subject: Change in osmo-bts[master]: power_control.c: Clarify loop algo vars and use correct ones during log In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/16440 to look at the new patch set (#2). Change subject: power_control.c: Clarify loop algo vars and use correct ones during log ...................................................................... power_control.c: Clarify loop algo vars and use correct ones during log Rename some variables so that: * Variables containing power control levels end up with "_lvl". * Variables containing power levels end up with _dbm. * Move old current_dbm var to be ms_dbm, to match its power control level counterpart ms_power_lvl, and add current_dbm to match its counterpart ns_power_ctrl.current. Now that variables are more clear, it also becomes clear that old "diff > 0" condition, apart from difficult, was currently wrong, since in order to print the raise/low verb we want to compare between old and new values, not between received and new values. Let's fix that in this same commit. Change-Id: I4e279a6b93fbcc5da25bf8c9213310939fd493ce --- M src/common/power_control.c 1 file changed, 18 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/40/16440/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4e279a6b93fbcc5da25bf8c9213310939fd493ce Gerrit-Change-Number: 16440 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 12:46:18 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 5 Dec 2019 12:46:18 +0000 Subject: Change in ...osmo-python-tests[master]: Drop python2 support References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16500 ) Change subject: Drop python2 support ...................................................................... Drop python2 support Remove all compatibility code for python2. All scripts are already python 3 compatible since I80e5850a8978d78cda793e2192ef4bd3fd54a121 and I1b4a629f12863c498a8681b555f57b4e255cebfb. dpkg-buildpackage shows that it is still invoking setup.py with python in addition to python3, on debian stretch. But after spending quite some time on trying to convince it to not care about python2 without success (trying different variables, overrides, --without python2 flags etc.), I'm leaving it as is. The resulting package is the python3 package, which is what we want. Related: OS#2819 Change-Id: Iabda95073faa2191fd117e9637e0858c589e9d9e --- M contrib/jenkins.sh M debian/control M debian/rules M osmopy/__init__.py M osmopy/obscvty.py M osmopy/osmo_interact/__init__.py M osmopy/osmo_interact/common.py M osmopy/osmoutil.py M scripts/osmodumpdoc.py M scripts/osmotestconfig.py M scripts/osmotestvty.py M setup.py D tests/test_py2.py 13 files changed, 22 insertions(+), 71 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/00/16500/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 08908a4..9b219f9 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -4,16 +4,6 @@ COM_FLAGS='-m compileall' -# FIXME: remove once python 2 support is deprecated -PY2=python2 -PY2_LIST="osmopy scripts/osmodumpdoc.py scripts/osmotestvty.py scripts/osmotestconfig.py" -$PY2 ./setup.py install -$PY2 tests/test_py2.py -for f in $PY2_LIST -do - $PY2 $COM_FLAGS $f -done - rm -rf ./build PY3=python3 PY3_LIST="osmopy scripts/osmo_ctrl.py scripts/osmo_rate_ctr2csv.py scripts/osmodumpdoc.py scripts/osmotestvty.py scripts/osmotestconfig.py scripts/osmo_interact_ctrl.py scripts/osmo_interact_vty.py scripts/osmo_verify_transcript_ctrl.py scripts/osmo_verify_transcript_vty.py scripts/soap.py scripts/twisted_ipa.py" diff --git a/debian/control b/debian/control index 52b614c..1ad871d 100644 --- a/debian/control +++ b/debian/control @@ -2,26 +2,12 @@ Section: python Priority: optional Maintainer: Harald Welte -Build-Depends: debhelper (>= 9), python, dh-python, python-setuptools, python3, python3-setuptools +Build-Depends: debhelper (>= 9), dh-python, python3, python3-setuptools Standards-Version: 3.9.8 Homepage: http://git.osmocom.org/python/osmo-python-tests/ Vcs-Git: git://git.osmocom.org/python/osmo-python-tests Vcs-Browser: http://git.osmocom.org/python/osmo-python-tests/ -Package: python2-osmopy-libs -Architecture: all -Depends: ${python:Depends}, ${misc:Depends} -Description: Python code (not only) for testing of Osmocom programs - . - This package contains the Python 2 version of osmopy libraries. - -Package: python2-osmopy-utils -Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, python2-osmopy-libs -Description: Python code (not only) for testing of Osmocom programs - . - This package contains the Python 2 version of osmopy utils. - Package: python3-osmopy-libs Architecture: all Depends: ${python3:Depends}, ${misc:Depends} diff --git a/debian/rules b/debian/rules index 04b59f6..d0817c3 100755 --- a/debian/rules +++ b/debian/rules @@ -1,13 +1,9 @@ #!/usr/bin/make -f %: - dh $@ --with python2,python3 + dh $@ --with python3 override_dh_auto_install: - python2 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python2-osmopy-libs - rm -rf $(CURDIR)/debian/python2-osmopy-libs/usr/bin - python2 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python2-osmopy-utils - rm -rf $(CURDIR)/debian/python2-osmopy-utils/usr/lib python3 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python3-osmopy-libs rm -rf $(CURDIR)/debian/python3-osmopy-libs/usr/bin python3 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python3-osmopy-utils diff --git a/osmopy/__init__.py b/osmopy/__init__.py index ce78caf..18362ec 100644 --- a/osmopy/__init__.py +++ b/osmopy/__init__.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 __version__ = '0.1.0' __all__ = ['obscvty', 'osmoutil', 'osmo_ipa', 'osmo_interact', 'trap_helper', 'twisted_ipa'] diff --git a/osmopy/obscvty.py b/osmopy/obscvty.py index d39d3da..ab280c0 100755 --- a/osmopy/obscvty.py +++ b/osmopy/obscvty.py @@ -16,7 +16,6 @@ # # VTY helper code for OpenBSC # -from __future__ import print_function import re import socket import sys, subprocess diff --git a/osmopy/osmo_interact/__init__.py b/osmopy/osmo_interact/__init__.py index 4fc4fac..036238a 100644 --- a/osmopy/osmo_interact/__init__.py +++ b/osmopy/osmo_interact/__init__.py @@ -1,2 +1,2 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 __all__ = ['common', 'vty', 'ctrl'] diff --git a/osmopy/osmo_interact/common.py b/osmopy/osmo_interact/common.py index cc7e190..87eca6a 100644 --- a/osmopy/osmo_interact/common.py +++ b/osmopy/osmo_interact/common.py @@ -24,11 +24,6 @@ vty.py and ctrl.py plug VTY and CTRL interface specific bits. ''' -# Our setup.py currently wants everything to be parsable by both py2 and py3. -# IMHO that is not a good idea, but until that changes, let's just keep this -# py2 legacy shim in here so we can syntax-check this py3 module with py2. -from __future__ import print_function - import argparse import sys import os diff --git a/osmopy/osmoutil.py b/osmopy/osmoutil.py index 54a3456..ec9c8c3 100755 --- a/osmopy/osmoutil.py +++ b/osmopy/osmoutil.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify @@ -14,7 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from __future__ import print_function import subprocess import os import sys diff --git a/scripts/osmodumpdoc.py b/scripts/osmodumpdoc.py index d71edc8..64b088f 100755 --- a/scripts/osmodumpdoc.py +++ b/scripts/osmodumpdoc.py @@ -1,10 +1,9 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Make sure this code is in sync with the BTS directory. # Fixes may need to be applied to both. """Start the process and dump the documentation to the doc dir.""" -from __future__ import print_function import subprocess import time import os diff --git a/scripts/osmotestconfig.py b/scripts/osmotestconfig.py index f227504..70a32a4 100755 --- a/scripts/osmotestconfig.py +++ b/scripts/osmotestconfig.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify @@ -13,7 +13,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from __future__ import print_function import os import os.path import time diff --git a/scripts/osmotestvty.py b/scripts/osmotestvty.py index 55017a5..600860f 100755 --- a/scripts/osmotestvty.py +++ b/scripts/osmotestvty.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify @@ -13,7 +13,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from __future__ import print_function import os import time import unittest diff --git a/setup.py b/setup.py index 69e18b0..ab604ce 100755 --- a/setup.py +++ b/setup.py @@ -19,24 +19,20 @@ from osmopy import __version__ import sys -if sys.version_info.major == 2: - scripts = [ - "scripts/osmodumpdoc.py", - "scripts/osmotestconfig.py", - "scripts/osmotestvty.py", - ] -elif sys.version_info.major == 3: - scripts = [ - "scripts/osmo_ctrl.py", - "scripts/osmo_rate_ctr2csv.py", - "scripts/soap.py", - "scripts/ctrl2cgi.py", - "scripts/osmo_trap2cgi.py", - "scripts/osmo_interact_vty.py", - "scripts/osmo_interact_ctrl.py", - "scripts/osmo_verify_transcript_vty.py", - "scripts/osmo_verify_transcript_ctrl.py", - ] +scripts = [ + "scripts/osmodumpdoc.py", + "scripts/osmotestvty.py", + "scripts/osmotestconfig.py", + "scripts/osmo_ctrl.py", + "scripts/osmo_rate_ctr2csv.py", + "scripts/soap.py", + "scripts/ctrl2cgi.py", + "scripts/osmo_trap2cgi.py", + "scripts/osmo_interact_vty.py", + "scripts/osmo_interact_ctrl.py", + "scripts/osmo_verify_transcript_vty.py", + "scripts/osmo_verify_transcript_ctrl.py", + ] setup( name = 'osmopython', diff --git a/tests/test_py2.py b/tests/test_py2.py deleted file mode 100644 index cac5261..0000000 --- a/tests/test_py2.py +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env python2 - -# just import a smoke test for osmopy - -import osmopy - -print '[Python2] Smoke test PASSED.' -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16500 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Iabda95073faa2191fd117e9637e0858c589e9d9e Gerrit-Change-Number: 16500 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 13:09:34 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 5 Dec 2019 13:09:34 +0000 Subject: Change in ...osmo-python-tests[master]: Drop python2 support In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16500 ) Change subject: Drop python2 support ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16500 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Iabda95073faa2191fd117e9637e0858c589e9d9e Gerrit-Change-Number: 16500 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 05 Dec 2019 13:09:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 13:42:55 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 5 Dec 2019 13:42:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix incorrect FN being send over PCUIF to PCU In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16486 to look at the new patch set (#2). Change subject: pcu: Fix incorrect FN being send over PCUIF to PCU ...................................................................... pcu: Fix incorrect FN being send over PCUIF to PCU The event FN contains the current FN, but the message should contain the FN of the first burst of the block. Change-Id: Iba0b1d1a3d7d875c5443a7bcaff399f9681624ad --- M pcu/PCUIF_RAW_Components.ttcn 1 file changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/16486/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iba0b1d1a3d7d875c5443a7bcaff399f9681624ad Gerrit-Change-Number: 16486 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 13:42:56 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 5 Dec 2019 13:42:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: send UL CONTROL ACK triggered by DL ACK/NACK References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16501 ) Change subject: pcu: send UL CONTROL ACK triggered by DL ACK/NACK ...................................................................... pcu: send UL CONTROL ACK triggered by DL ACK/NACK Change-Id: Ib409394257427cfc62da08fe06ce6c001dcf608a --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 17 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/16501/1 diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index e4b03c1..7bfcbd0 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -741,7 +741,7 @@ dl_fn := pcu_msg.u.data_req.fn; } -private function f_rx_rlcmac_dl_block_exp_ack_nack(out RlcmacDlBlock dl_block) +private function f_rx_rlcmac_dl_block_exp_ack_nack(out RlcmacDlBlock dl_block, out uint32_t poll_fn) runs on RAW_PCU_Test_CT { var uint32_t dl_fn; @@ -750,6 +750,8 @@ setverdict(fail, "Failed to match Packet Uplink ACK / NACK"); mtc.stop; } + + poll_fn := dl_fn + f_rrbp_fn_delay(dl_block.ctrl.mac_hdr.rrbp); } private function f_rx_rlcmac_dl_block_exp_dummy(out RlcmacDlBlock dl_block) @@ -1084,6 +1086,7 @@ var PCUIF_Message pcu_msg; var octetstring data; var boolean ok; + var uint32_t unused_fn; /* Initialize the PCU interface abstraction */ f_init_raw(testcasename()); @@ -1135,7 +1138,7 @@ f_tx_rlcmac_ul_block(ul_data, lqual * 10); /* Enqueue RTS.req, expect DATA.req with UL ACK from the PCU */ - f_rx_rlcmac_dl_block_exp_ack_nack(dl_block); + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, unused_fn); log("Rx Packet Uplink ACK / NACK with Channel Coding Command: ", dl_block.ctrl.payload.u.ul_ack_nack.gprs.ch_coding_cmd); @@ -1167,6 +1170,7 @@ var boolean ok; var integer lqual_cb; var ChCodingCommand last_ch_coding; + var uint32_t unused_fn; /* Initialize the PCU interface abstraction */ f_init_raw(testcasename()); @@ -1211,7 +1215,7 @@ f_tx_rlcmac_ul_block(ul_data, lqual_cb); /* Enqueue RTS.req, expect DATA.req with UL ACK from the PCU */ - f_rx_rlcmac_dl_block_exp_ack_nack(dl_block); + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, unused_fn); last_ch_coding := dl_block.ctrl.payload.u.ul_ack_nack.gprs.ch_coding_cmd; } @@ -1235,7 +1239,7 @@ f_tx_rlcmac_ul_block(ul_data, 0); /* 0 dB, make sure we downgrade CS */ /* Enqueue RTS.req, expect DATA.req with UL ACK from the PCU */ - f_rx_rlcmac_dl_block_exp_ack_nack(dl_block); + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, unused_fn); last_ch_coding := dl_block.ctrl.payload.u.ul_ack_nack.gprs.ch_coding_cmd; } @@ -1254,6 +1258,7 @@ var RlcmacDlBlock dl_block; var boolean ok; var ChCodingCommand last_ch_coding; + var uint32_t unused_fn; /* Initialize the PCU interface abstraction */ f_init_raw(testcasename()); @@ -1295,7 +1300,7 @@ f_tx_rlcmac_ul_block(ul_data, 40*10); /* 40 dB */ /* Enqueue RTS.req, expect DATA.req with UL ACK from the PCU */ - f_rx_rlcmac_dl_block_exp_ack_nack(dl_block); + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, unused_fn); last_ch_coding := dl_block.ctrl.payload.u.ul_ack_nack.gprs.ch_coding_cmd; } @@ -1316,6 +1321,7 @@ var PCUIF_Message pcu_msg; var octetstring data; var boolean ok; + var uint32_t unused_fn; var OCT4 tlli := '00000001'O; /* Initialize NS/BSSGP side */ @@ -1347,7 +1353,7 @@ /* Send one UL block and make sure it is ACKED fine */ f_tx_rlcmac_ul_n_blocks(ul_tbf_ass, 1); - f_rx_rlcmac_dl_block_exp_ack_nack(dl_block); + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, unused_fn); /* UL block should be received in SGSN */ BSSGP[0].receive(tr_BSSGP_UL_UD(tlli, mp_gb_cfg.cell_id)); @@ -1403,7 +1409,9 @@ /* Send one UL block and make sure it is ACKED fine */ f_tx_rlcmac_ul_n_blocks(ul_tbf_ass, 1); - f_rx_rlcmac_dl_block_exp_ack_nack(dl_block); + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn); + /* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + f_tx_rlcmac_ul_block(ts_RLCMAC_CTRL_ACK(tlli), 0, sched_fn); /* UL block should be received in SGSN */ BSSGP[0].receive(tr_BSSGP_UL_UD(tlli, mp_gb_cfg.cell_id)); @@ -1424,6 +1432,8 @@ /* ACK the DL block */ f_tx_rlcmac_ul_block(ts_RLCMAC_DL_ACK_NACK(dl_block.data.mac_hdr.hdr_ext.tfi, ack_nack_desc), 0, sched_fn); + + f_sleep(3.0); } control { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16501 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib409394257427cfc62da08fe06ce6c001dcf608a Gerrit-Change-Number: 16501 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 13:42:56 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 5 Dec 2019 13:42:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce helpers to update AckNackDescription References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502 ) Change subject: pcu: Introduce helpers to update AckNackDescription ...................................................................... pcu: Introduce helpers to update AckNackDescription Change-Id: Ic62ab9e4a854239b95c434068543d95c5352f1c6 --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 42 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/02/16502/1 diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index 7bfcbd0..12f1c8e 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -765,7 +765,7 @@ } } -private function f_rx_rlcmac_dl_block_exp_data(out RlcmacDlBlock dl_block, out uint32_t ack_fn, octetstring data) +private function f_rx_rlcmac_dl_block_exp_data(out RlcmacDlBlock dl_block, out uint32_t ack_fn, octetstring data, uint7_t exp_bsn := 0) runs on RAW_PCU_Test_CT { var PCUIF_Message pcu_msg; var uint32_t dl_fn; @@ -780,6 +780,11 @@ ack_fn := dl_fn + f_rrbp_fn_delay(dl_block.data.mac_hdr.mac_hdr.rrbp); + if (dl_block.data.mac_hdr.hdr_ext.bsn != exp_bsn) { + setverdict(fail, "DL block BSN doesn't match: ", + dl_block.data.blocks[0].hdr.length_ind, " vs exp ", exp_bsn); + } + if (lengthof(dl_block.data.blocks) < 1) { setverdict(fail, "DL block has no LLC payload: ", dl_block); mtc.stop; @@ -1365,6 +1370,39 @@ f_rx_rlcmac_dl_block_exp_dummy(dl_block); } +private function f_acknackdesc_init(inout AckNackDescription desc) +{ + desc.final_ack := '0'B; + desc.starting_seq_nr := 0; + desc.receive_block_bitmap := '0000000000000000000000000000000000000000000000000000000000000000'B; +} + +/* TS 44.060 sec 12.3 Ack/Nack Description */ +private function f_acknackdesc_ack_block(inout AckNackDescription desc, uint7_t bsn, BIT1 final_ack := '0'B) +{ + var integer i; + var integer inc := bsn - desc.starting_seq_nr + 1; + /* Filling hole? */ + if (bsn < desc.starting_seq_nr) { + desc.receive_block_bitmap[lengthof(desc.receive_block_bitmap) - (desc.starting_seq_nr - bsn)] := int2bit(1, 1); + return; + } + + /* SSN is increased, and so RBB values need to be moved */ + for (i := 0; i < lengthof(desc.receive_block_bitmap) - inc; i := i+1) { + desc.receive_block_bitmap[i] := desc.receive_block_bitmap[i + inc]; + } + for (i := lengthof(desc.receive_block_bitmap) - inc; i < lengthof(desc.receive_block_bitmap) - 1; i := i+1) { + desc.receive_block_bitmap[i] := int2bit(0, 1); + } + /* Now we can set current bit and update SSN */ + desc.starting_seq_nr := bsn + 1; + desc.receive_block_bitmap[lengthof(desc.receive_block_bitmap) - 1] := int2bit(1, 1); + + /* Finally update the final_ack bit as requested: */ + desc.final_ack := final_ack; +} + /* Test scenario where MS wants to send some data on PDCH against SGSN and it is * answered, so TBFs for uplink and later for downlink are created. */ @@ -1380,10 +1418,7 @@ var OCT4 tlli := '00000001'O; var AckNackDescription ack_nack_desc; - ack_nack_desc.final_ack := '0'B; - ack_nack_desc.starting_seq_nr := 0; - ack_nack_desc.receive_block_bitmap := '0000000000000000000000000000000000000000000000000000000000000000'B; - + f_acknackdesc_init(ack_nack_desc); /* Initialize NS/BSSGP side */ f_init_bssgp(); @@ -1428,9 +1463,10 @@ /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ f_sleep(X2002); - f_rx_rlcmac_dl_block_exp_data(dl_block, sched_fn, data); + f_rx_rlcmac_dl_block_exp_data(dl_block, sched_fn, data, 0); /* ACK the DL block */ + f_acknackdesc_ack_block(ack_nack_desc, dl_block.data.mac_hdr.hdr_ext.bsn, '1'B) f_tx_rlcmac_ul_block(ts_RLCMAC_DL_ACK_NACK(dl_block.data.mac_hdr.hdr_ext.tfi, ack_nack_desc), 0, sched_fn); f_sleep(3.0); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic62ab9e4a854239b95c434068543d95c5352f1c6 Gerrit-Change-Number: 16502 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 13:53:32 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 5 Dec 2019 13:53:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: send UL CONTROL ACK triggered by DL ACK/NACK In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16501 to look at the new patch set (#2). Change subject: pcu: send UL CONTROL ACK triggered by DL ACK/NACK ...................................................................... pcu: send UL CONTROL ACK triggered by DL ACK/NACK Change-Id: Ib409394257427cfc62da08fe06ce6c001dcf608a --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 15 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/16501/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16501 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib409394257427cfc62da08fe06ce6c001dcf608a Gerrit-Change-Number: 16501 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 13:53:32 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 5 Dec 2019 13:53:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce helpers to update AckNackDescription In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502 to look at the new patch set (#2). Change subject: pcu: Introduce helpers to update AckNackDescription ...................................................................... pcu: Introduce helpers to update AckNackDescription Change-Id: Ic62ab9e4a854239b95c434068543d95c5352f1c6 --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 42 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/02/16502/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic62ab9e4a854239b95c434068543d95c5352f1c6 Gerrit-Change-Number: 16502 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 13:53:43 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 5 Dec 2019 13:53:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Support sending message to PCU at specific FN In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16487 ) Change subject: pcu: Support sending message to PCU at specific FN ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I81a29b4885f3fc6b753a1612d5fd369cd18f5dc6 Gerrit-Change-Number: 16487 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 05 Dec 2019 13:53:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 14:35:38 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 5 Dec 2019 14:35:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix incorrect FN being send over PCUIF to PCU In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16486 ) Change subject: pcu: Fix incorrect FN being send over PCUIF to PCU ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iba0b1d1a3d7d875c5443a7bcaff399f9681624ad Gerrit-Change-Number: 16486 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 05 Dec 2019 14:35:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 14:40:09 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 5 Dec 2019 14:40:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Verify contents of data dl blocks originated from emulated SGSN In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16485 ) Change subject: pcu: Verify contents of data dl blocks originated from emulated SGSN ...................................................................... Patch Set 3: Code-Review+1 Would the new restrictions you're introducing to f_rx_rlcmac_dl_block_exp_data() apply to the other (further) test cases? Is it common for DL DATA messages to contain only one block? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4fe79572094038cbb26d5195c0544846ca2550b5 Gerrit-Change-Number: 16485 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 05 Dec 2019 14:40:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 15:29:21 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 5 Dec 2019 15:29:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Verify contents of data dl blocks originated from emulated SGSN In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16485 ) Change subject: pcu: Verify contents of data dl blocks originated from emulated SGSN ...................................................................... Patch Set 3: > Patch Set 3: Code-Review+1 > > Would the new restrictions you're introducing to f_rx_rlcmac_dl_block_exp_data() apply to the other (further) test cases? Is it common for DL DATA messages to contain only one block? Perhaps. I'll simply extend functionalities as soon as I see I need them for next tests. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4fe79572094038cbb26d5195c0544846ca2550b5 Gerrit-Change-Number: 16485 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 05 Dec 2019 15:29:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 15:42:24 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 5 Dec 2019 15:42:24 +0000 Subject: Change in osmo-bsc[master]: doc: osmux: use generated svg instead of pychart References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16503 ) Change subject: doc: osmux: use generated svg instead of pychart ...................................................................... doc: osmux: use generated svg instead of pychart Replace python 2 code using pychart to draw a graph in osmux-reference.adoc with the generated svg file. The upstream of pychart is dead, there is no python 3 version, and python 2 is EOL at the end of 2019. This is the only time we ever made use of pychart in osmo-gsm-manuals, so with this change, we can just drop the dependency. I've generated the chart by saving the python code in chart.py, then: $ ./chart.py --format=svg --font-size=3 > chart.svg Related: OS#2819, OS#4193 Change-Id: I36b721f895caee9766528e14d854b6aa2a2fac85 --- A doc/manuals/images/osmux-expected-traffic-savings.svg M doc/manuals/osmux-reference.adoc 2 files changed, 824 insertions(+), 45 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/03/16503/1 diff --git a/doc/manuals/images/osmux-expected-traffic-savings.svg b/doc/manuals/images/osmux-expected-traffic-savings.svg new file mode 100644 index 0000000..2031c66 --- /dev/null +++ b/doc/manuals/images/osmux-expected-traffic-savings.svg @@ -0,0 +1,822 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + 2 + + 3 + + 4 + + 5 + + 6 + + 7 + + 8 + Concurrent calls + + + + + + + + + 10% + + 20% + + 30% + + 40% + + 50% + + 60% + + 70% + Traffic Saving + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bfactor 1 + + + + + + + bfactor 2 + + + + + + + bfactor 3 + + + + + + + bfactor 4 + + + + + + + bfactor 5 + + + + + + + bfactor 6 + + + + + + + bfactor 7 + + + + + + + bfactor 8 + + + + + + + + + + + diff --git a/doc/manuals/osmux-reference.adoc b/doc/manuals/osmux-reference.adoc index e28347a..a6c4085 100644 --- a/doc/manuals/osmux-reference.adoc +++ b/doc/manuals/osmux-reference.adoc @@ -503,51 +503,8 @@ number of concurrent numbers of callings for a given set of batching factor values: -["python2"] ----- -from pychart import * -theme.get_options() -theme.scale_factor = 5 -theme.use_color = 1 -theme.reinitialize() - -IP_HEADER=20 -UDP_HEADER=8 -RTP_HEADER=12 -OSMUX_HEADER=4 -AMR59_PAYLOAD=17 - -def osmux_get_size(calls, payloads): - return IP_HEADER + UDP_HEADER + (OSMUX_HEADER + AMR59_PAYLOAD * payloads) * calls - -def rtp_get_size(calls, payloads): - return calls * payloads * (IP_HEADER + UDP_HEADER + RTP_HEADER + AMR59_PAYLOAD) - -def calc_traffic_saving(calls, payloads): - return 100 - 100.0 * osmux_get_size(calls, payloads) / rtp_get_size(calls, payloads) - -# The first value in each tuple is the X value, and subsequent values are Y values for different lines. -def gen_table(): - data = [] - for calls in range(1, 9): - col = (calls,) - for factor in range(1, 9): - col += (calc_traffic_saving(calls, factor),) - data.append(col) - return data - -def do_plot(data): - xaxis = axis.X(format="/hL%d", tic_interval = 1, label="Concurrent calls") - yaxis = axis.Y(format="%d%%", tic_interval = 10, label="Traffic Saving") - ar = area.T(x_axis=xaxis, y_axis=yaxis, y_range=(None,None), x_grid_interval=1, x_grid_style=line_style.gray70_dash3) - for y in range(1, len(data[0])): - plot = line_plot.T(label="bfactor "+str(y), data=data, ycol=y, tick_mark=tick_mark.circle1) - ar.add_plot(plot) - ar.draw() - -data = gen_table() -do_plot(data) ----- +// Original python2 pychart code replaced with generated svg in I36b721f895caee9766528e14d854b6aa2a2fac85 +image::images/osmux-expected-traffic-savings.svg[] The results show a saving of 15.79% with only one concurrent call and with batching disabled (bfactor 1), that quickly improves with more concurrent calls -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16503 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I36b721f895caee9766528e14d854b6aa2a2fac85 Gerrit-Change-Number: 16503 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 15:42:35 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 5 Dec 2019 15:42:35 +0000 Subject: Change in osmo-gsm-manuals[master]: Drop python2 and pychart dependencies References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16504 ) Change subject: Drop python2 and pychart dependencies ...................................................................... Drop python2 and pychart dependencies Python 2 is EOL at the end of 2019, so don't depend on it anymore. Remove pychart support, because upstream is dead and there is no python3 version. We were only using it for one graph, and that has been replaced in osmo-bsc I36b721f895caee9766528e14d854b6aa2a2fac85. Depends: osmo-bsc I36b721f895caee9766528e14d854b6aa2a2fac85 Related: OS#2819 Change-Id: I57522e57e39682d6d123af4584785d327361e5a3 --- M INSTALL.txt M build/Makefile.asciidoc.inc M build/filter-wrapper.py D build/python2-filter.conf M build/unix-time-to-fmt.py M check-depends.sh M debian/control 7 files changed, 4 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/04/16504/1 diff --git a/INSTALL.txt b/INSTALL.txt index 3f4ef9f..d241fd2 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -9,7 +9,6 @@ docbook5-xml \ mscgen \ graphviz \ - python-pychart \ python3-nwdiag (Note that asciidoc-dblatex is required from debian 9 on and did not exist before.) diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 7cb660f..54969fc 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -37,7 +37,7 @@ CLEAN_FILES += $(ASCIIDOC_PDF) $(ASCIIDOC_NAME:%=%.html) UPLOAD_FILES += $(ASCIIDOC_PDF) -ASCIIDOC_OPTS := -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf -f $(BUILDDIR)/docinfo-releaseinfo.conf -f $(BUILDDIR)/python2-filter.conf -a srcdir='$(srcdir)' -a commondir='$(COMMONDIR)' +ASCIIDOC_OPTS := -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf -f $(BUILDDIR)/docinfo-releaseinfo.conf -a srcdir='$(srcdir)' -a commondir='$(COMMONDIR)' DBLATEX_OPTS := -s $(ASCIIDOCSTYLE) -P draft.mode=yes -P draft.watermark=0 ifeq (,$(BUILD_RELEASE)) diff --git a/build/filter-wrapper.py b/build/filter-wrapper.py index 82fec1b..83db291 100755 --- a/build/filter-wrapper.py +++ b/build/filter-wrapper.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/env python3 """Simple wrapper for filter programs which ensures that a blank is returned as output. The purpose is to silence the AsciiDoc warning "no output from filter". diff --git a/build/python2-filter.conf b/build/python2-filter.conf deleted file mode 100644 index 812c7c2..0000000 --- a/build/python2-filter.conf +++ /dev/null @@ -1,22 +0,0 @@ -# -# AsciiDoc mscgen filter configuration file. -# ${OSMO_GSM_MANUALS}/build is symlinked to ./build when building. -# - -[python2-filter-style] -python2-style=template="python2-block",subs=(),posattrs=("style","target"),filter='./build/filter-wrapper.py python2 - --output="{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}"' - -[blockdef-listing] -template::[python2-filter-style] - -[paradef-default] -template::[python2-filter-style] - -[python2-block] -template::[filter-image-pngsvg-blockmacro] - -[filter-image-pngsvg-blockmacro] -{target%}{counter2:target-number} -{target%}{set2:target:{docname}__{target-number}.{format={basebackend-docbook!png}{basebackend-docbook?png}}} -| -template::[image-blockmacro] diff --git a/build/unix-time-to-fmt.py b/build/unix-time-to-fmt.py index 72ece26..9e5e141 100755 --- a/build/unix-time-to-fmt.py +++ b/build/unix-time-to-fmt.py @@ -1,11 +1,11 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Usage: unix-time-to-fmt.py 1234567 [%Y-%m-%d[...]] Convert unix timestamp to a string of the given format in UTC, according to - https://docs.python.org/2/library/time.html + https://docs.python.org/3/library/time.html Default is '%Y-%b-%d' --> 2016-Jan-01 """ diff --git a/check-depends.sh b/check-depends.sh index d640abf..c841086 100755 --- a/check-depends.sh +++ b/check-depends.sh @@ -8,14 +8,6 @@ fi } -# $1: module name, $2: package name -check_dep_python2_module() { - if ! echo "import $1" | python2 - >/dev/null 2>&1; then - echo "Failed to import '$1' module, please install $2." - exit 1 - fi -} - check_dep_bin mscgen mscgen check_dep_bin xsltproc libxslt check_dep_bin a2x asciidoc @@ -23,7 +15,5 @@ check_dep_bin dblatex dblatex check_dep_bin packetdiag3 python3-nwdiag check_dep_bin dot graphviz -check_dep_bin python2 python2 -check_dep_python2_module pychart python2-pychart echo "All dependencies installed!" diff --git a/debian/control b/debian/control index afd09a3..fa44525 100644 --- a/debian/control +++ b/debian/control @@ -14,9 +14,7 @@ graphviz, libxml2-utils, mscgen, - python, python3-nwdiag, - python-pychart, xsltproc Standards-Version: 3.9.8 Homepage: https://git.osmocom.org/osmo-gsm-manuals/ @@ -31,9 +29,7 @@ graphviz, libxml2-utils, mscgen, - python, python3-nwdiag, - python-pychart, xsltproc Description: Osmocom manuals shared code All Osomocom repositories require this package to build their manuals. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I57522e57e39682d6d123af4584785d327361e5a3 Gerrit-Change-Number: 16504 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 15:42:44 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 5 Dec 2019 15:42:44 +0000 Subject: Change in osmo-ci[master]: docker: drop python2 References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16505 ) Change subject: docker: drop python2 ...................................................................... docker: drop python2 Depends: osmo-python-tests Iabda95073faa2191fd117e9637e0858c589e9d9e Depends: osmo-gsm-manuals I57522e57e39682d6d123af4584785d327361e5a3 Related: OS#2819 Change-Id: Iacace670bdb949e67227e0faa1765e36bba42018 --- M docker/Dockerfile_osmocom_jenkins.amd64 1 file changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/05/16505/1 diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64 index 18402f3..8db962c 100644 --- a/docker/Dockerfile_osmocom_jenkins.amd64 +++ b/docker/Dockerfile_osmocom_jenkins.amd64 @@ -84,7 +84,6 @@ osc \ patchelf \ pkg-config \ - python \ python3 \ python3-gi \ python3-mako \ @@ -94,10 +93,6 @@ python3-setuptools \ python3-usb \ python3-yaml \ - python-minimal \ - python-pip \ - python-pychart \ - python-setuptools \ rsync \ sdcc \ sqlite3 \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16505 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iacace670bdb949e67227e0faa1765e36bba42018 Gerrit-Change-Number: 16505 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 15:52:32 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 5 Dec 2019 15:52:32 +0000 Subject: Change in osmo-bsc[master]: doc: osmux: use generated svg instead of pychart In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16503 ) Change subject: doc: osmux: use generated svg instead of pychart ...................................................................... Patch Set 1: Looks like inkscape is missing in the docker container. I'm reproducing it locally and then preparing a patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16503 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I36b721f895caee9766528e14d854b6aa2a2fac85 Gerrit-Change-Number: 16503 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 05 Dec 2019 15:52:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 15:58:06 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 5 Dec 2019 15:58:06 +0000 Subject: Change in osmo-gsm-manuals[master]: Drop python2 and pychart dependencies In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16504 ) Change subject: Drop python2 and pychart dependencies ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I57522e57e39682d6d123af4584785d327361e5a3 Gerrit-Change-Number: 16504 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 05 Dec 2019 15:58:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 15:58:26 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 5 Dec 2019 15:58:26 +0000 Subject: Change in osmo-ci[master]: docker: drop python2 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16505 ) Change subject: docker: drop python2 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16505 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iacace670bdb949e67227e0faa1765e36bba42018 Gerrit-Change-Number: 16505 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 05 Dec 2019 15:58:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 16:54:37 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 5 Dec 2019 16:54:37 +0000 Subject: Change in osmo-ci[master]: docker: install inkscape References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16506 ) Change subject: docker: install inkscape ...................................................................... docker: install inkscape Needed by osmo-gsm-manuals to add svg graphics to the manuals. Change-Id: I754b133d77743582bd84c33c74ecc9eb9ca4c0ef --- M docker/Dockerfile_osmocom_jenkins.amd64 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/06/16506/1 diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64 index 18402f3..2209fc6 100644 --- a/docker/Dockerfile_osmocom_jenkins.amd64 +++ b/docker/Dockerfile_osmocom_jenkins.amd64 @@ -40,6 +40,7 @@ git-buildpackage \ graphviz \ htop \ + inkscape \ lcov \ libaio-dev \ libasound2-dev \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I754b133d77743582bd84c33c74ecc9eb9ca4c0ef Gerrit-Change-Number: 16506 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 16:54:44 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 5 Dec 2019 16:54:44 +0000 Subject: Change in osmo-bsc[master]: doc: osmux: use generated svg instead of pychart In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/16503 to look at the new patch set (#2). Change subject: doc: osmux: use generated svg instead of pychart ...................................................................... doc: osmux: use generated svg instead of pychart Replace python 2 code using pychart to draw a graph in osmux-reference.adoc with the generated svg file. The upstream of pychart is dead, there is no python 3 version, and python 2 is EOL at the end of 2019. This is the only time we ever made use of pychart in osmo-gsm-manuals, so with this change, we can just drop the dependency. I've generated the chart by saving the python code in chart.py, then: $ ./chart.py --format=svg --font-size=3 > chart.svg Related: OS#2819, OS#4193 Depends: osmo-ci I754b133d77743582bd84c33c74ecc9eb9ca4c0ef Change-Id: I36b721f895caee9766528e14d854b6aa2a2fac85 --- A doc/manuals/images/osmux-expected-traffic-savings.svg M doc/manuals/osmux-reference.adoc 2 files changed, 824 insertions(+), 45 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/03/16503/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16503 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I36b721f895caee9766528e14d854b6aa2a2fac85 Gerrit-Change-Number: 16503 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 16:56:00 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 5 Dec 2019 16:56:00 +0000 Subject: Change in osmo-ci[master]: docker: install inkscape In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16506 ) Change subject: docker: install inkscape ...................................................................... Patch Set 1: Verified+1 Reproduced the failure in https://jenkins.osmocom.org/jenkins/job/gerrit-osmo-bsc/a1=default,a2=default,a3=default,a4=default,label=osmocom-gerrit-debian9/2328/console and tested that this commit makes it work. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I754b133d77743582bd84c33c74ecc9eb9ca4c0ef Gerrit-Change-Number: 16506 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 05 Dec 2019 16:56:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 16:56:28 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 5 Dec 2019 16:56:28 +0000 Subject: Change in osmo-bsc[master]: doc: osmux: use generated svg instead of pychart In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16503 ) Change subject: doc: osmux: use generated svg instead of pychart ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16503 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I36b721f895caee9766528e14d854b6aa2a2fac85 Gerrit-Change-Number: 16503 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 05 Dec 2019 16:56:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 17:34:48 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 5 Dec 2019 17:34:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Support sending message to PCU at specific FN In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16487 ) Change subject: pcu: Support sending message to PCU at specific FN ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16487/3/pcu/PCUIF_RAW_Components.ttcn File pcu/PCUIF_RAW_Components.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16487/3/pcu/PCUIF_RAW_Components.ttcn at 266 PS3, Line 266: its their -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I81a29b4885f3fc6b753a1612d5fd369cd18f5dc6 Gerrit-Change-Number: 16487 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 05 Dec 2019 17:34:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 17:47:54 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 5 Dec 2019 17:47:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Support sending message to PCU at specific FN In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16487 to look at the new patch set (#4). Change subject: pcu: Support sending message to PCU at specific FN ...................................................................... pcu: Support sending message to PCU at specific FN Change-Id: I81a29b4885f3fc6b753a1612d5fd369cd18f5dc6 --- M library/RLCMAC_Types.ttcn M pcu/PCUIF_RAW_Components.ttcn M pcu/PCU_Tests_RAW.ttcn 3 files changed, 65 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/87/16487/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I81a29b4885f3fc6b753a1612d5fd369cd18f5dc6 Gerrit-Change-Number: 16487 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 17:47:54 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 5 Dec 2019 17:47:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce helpers to update AckNackDescription In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502 to look at the new patch set (#3). Change subject: pcu: Introduce helpers to update AckNackDescription ...................................................................... pcu: Introduce helpers to update AckNackDescription Change-Id: Ic62ab9e4a854239b95c434068543d95c5352f1c6 --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 42 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/02/16502/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic62ab9e4a854239b95c434068543d95c5352f1c6 Gerrit-Change-Number: 16502 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 17:47:56 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 5 Dec 2019 17:47:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_imm_ass_dl_block_retrans References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16507 ) Change subject: pcu: Introduce test TC_imm_ass_dl_block_retrans ...................................................................... pcu: Introduce test TC_imm_ass_dl_block_retrans Change-Id: Icc60cebb8583c9dc97b658def69f17e6efced384 --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 57 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/07/16507/1 diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index 90c1b62..452266b 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -1470,6 +1470,62 @@ f_tx_rlcmac_ul_block(ts_RLCMAC_DL_ACK_NACK(dl_block.data.mac_hdr.hdr_ext.tfi, ack_nack_desc), 0, sched_fn); } +/* Verify that if PCU doesn't get an ACK for first DL block after IMM ASS, it + * will retry by retransmitting both the IMM ASS + DL block after poll (ack) + * timeout occurs (specified by sent RRBP on DL block). */ +testcase TC_imm_ass_dl_block_retrans() runs on RAW_PCU_Test_CT { + var GsmRrMessage rr_imm_ass; + var PacketDlAssign dl_tbf_ass; + var RlcmacDlBlock dl_block; + var octetstring data := f_rnd_octstring(10); + var boolean ok; + var uint32_t sched_fn; + var OCT4 tlli := '00000001'O; + var AckNackDescription ack_nack_desc; + + f_acknackdesc_init(ack_nack_desc); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename()); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign('FFFFFFFF'O, tlli); + + /* SGSN sends some DL data, PCU will page on CCCH (PCH) */ + BSSGP[0].send(ts_BSSGP_DL_UD(tlli, data)); + f_pcuif_rx_pch_imm_tbf_ass(rr_imm_ass); + ok := f_imm_ass_verify_dl_tbf_ass(rr_imm_ass, dl_tbf_ass); + if (not ok) { + setverdict(fail, "Immediate Assignment not a Downlink TBF"); + mtc.stop; + } + + /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ + f_sleep(X2002); + f_rx_rlcmac_dl_block_exp_data(dl_block, sched_fn, data, 0); + + /* Now we don't ack the dl block (emulate MS failed receiveing IMM ASS + * or GPRS DL, or DL ACK was lost for some reason). As a result, PCU + * should retrigger IMM ASS + GPRS DL procedure after poll timeout. */ + f_pcuif_rx_pch_imm_tbf_ass(rr_imm_ass); + ok := f_imm_ass_verify_dl_tbf_ass(rr_imm_ass, dl_tbf_ass); + if (not ok) { + setverdict(fail, "Immediate Assignment not a Downlink TBF"); + mtc.stop; + } + /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ + f_sleep(X2002); + f_rx_rlcmac_dl_block_exp_data(dl_block, sched_fn, data, 0); + + /* ACK the DL block */ + f_acknackdesc_ack_block(ack_nack_desc, dl_block.data.mac_hdr.hdr_ext.bsn, '1'B); + f_tx_rlcmac_ul_block(ts_RLCMAC_DL_ACK_NACK(dl_block.data.mac_hdr.hdr_ext.tfi, ack_nack_desc), 0, sched_fn); +} + control { execute( TC_ns_reset() ); execute( TC_ns_reset_retrans() ); @@ -1489,6 +1545,7 @@ execute( TC_cs_max_ul() ); execute( TC_t3169() ); execute( TC_mo_ping_pong() ); + execute( TC_imm_ass_dl_block_retrans() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16507 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icc60cebb8583c9dc97b658def69f17e6efced384 Gerrit-Change-Number: 16507 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 17:47:58 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 5 Dec 2019 17:47:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_t3193 References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16508 ) Change subject: pcu: Introduce test TC_t3193 ...................................................................... pcu: Introduce test TC_t3193 Change-Id: Ib11cd1793d985ff609b10b0e60bddadd5fcfa6d2 --- M library/RLCMAC_Types.ttcn M pcu/PCU_Tests_RAW.ttcn 2 files changed, 93 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/08/16508/1 diff --git a/library/RLCMAC_Types.ttcn b/library/RLCMAC_Types.ttcn index 3a1ecb1..7043785 100644 --- a/library/RLCMAC_Types.ttcn +++ b/library/RLCMAC_Types.ttcn @@ -361,6 +361,29 @@ } } + template RlcmacDlBlock tr_RLCMAC_DL_PACKET_ASS(template uint3_t usf := ?) := { + ctrl := { + mac_hdr := { + payload_type := (MAC_PT_RLCMAC_NO_OPT, MAC_PT_RLCMAC_OPT), + rrbp:= ?, + rrbp_valid := ?, + usf := usf + }, + opt := *, + payload := { + msg_type := PACKET_DL_ASSIGNMENT, + u := { + dl_assignment := { + page_mode := ?, + pres1 := ?, + persistence_levels := *, + tfi_or_tlli := ? + } + } + } + } + } + /* Receive Template for Uplink ACK/NACK */ template RlcmacDlBlock tr_RLCMAC_UL_ACK_NACK(template uint5_t ul_tfi, template GprsTlli tlli := ?) := { ctrl := { diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index 452266b..1a8da3e 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -798,6 +798,19 @@ } } +private function f_rx_rlcmac_dl_block_exp_pkt_ass(out RlcmacDlBlock dl_block, out uint32_t poll_fn) +runs on RAW_PCU_Test_CT { + var uint32_t dl_fn; + + f_rx_rlcmac_dl_block(dl_block, dl_fn); + if (not match(dl_block, tr_RLCMAC_DL_PACKET_ASS())) { + setverdict(fail, "Failed to match Packet Downlink Assignment"); + mtc.stop; + } + + poll_fn := dl_fn + f_rrbp_fn_delay(dl_block.ctrl.mac_hdr.rrbp); +} + private function f_rx_rlcmac_dl_block_exp_data(out RlcmacDlBlock dl_block, out uint32_t ack_fn, octetstring data, uint7_t exp_bsn := 0) runs on RAW_PCU_Test_CT { var PCUIF_Message pcu_msg; @@ -1403,6 +1416,62 @@ f_rx_rlcmac_dl_block_exp_dummy(dl_block); } +/* Verify that a Downlink TBF can be assigned using PACCH shortly after the + * release of prev DL TBF due to MS staying in PDCH for a while (T3192, in PCU + * T3193) after DL TBF release */ +testcase TC_t3193() runs on RAW_PCU_Test_CT { + var GsmRrMessage rr_imm_ass; + var PacketDlAssign dl_tbf_ass; + var RlcmacDlBlock dl_block; + var octetstring data := f_rnd_octstring(10); + var boolean ok; + var uint32_t sched_fn; + var OCT4 tlli := '00000001'O; + var AckNackDescription ack_nack_desc; + + f_acknackdesc_init(ack_nack_desc); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename()); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign('FFFFFFFF'O, tlli); + + /* SGSN sends some DL data, PCU will page on CCCH (PCH) */ + BSSGP[0].send(ts_BSSGP_DL_UD(tlli, data)); + f_pcuif_rx_pch_imm_tbf_ass(rr_imm_ass); + ok := f_imm_ass_verify_dl_tbf_ass(rr_imm_ass, dl_tbf_ass); + if (not ok) { + setverdict(fail, "Immediate Assignment not a Downlink TBF"); + mtc.stop; + } + /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ + f_sleep(X2002); + f_rx_rlcmac_dl_block_exp_data(dl_block, sched_fn, data, 0); + + /* ACK the DL block */ + f_acknackdesc_ack_block(ack_nack_desc, dl_block.data.mac_hdr.hdr_ext.bsn, '1'B); + f_tx_rlcmac_ul_block(ts_RLCMAC_DL_ACK_NACK(dl_block.data.mac_hdr.hdr_ext.tfi, ack_nack_desc), 0, sched_fn); + /* we are done with the DL-TBF here so far, let's clean up our local state: */ + f_acknackdesc_init(ack_nack_desc); + + /* Now that final DL block is ACKED and TBF is released, T3193 in PCU + (T3192 in MS) was started and until it fires the MS will be abailable + on PDCH in case new data arrives from SGSN. Let's verify it: */ + BSSGP[0].send(ts_BSSGP_DL_UD(tlli, data)); + f_rx_rlcmac_dl_block_exp_pkt_ass(dl_block, sched_fn); + f_tx_rlcmac_ul_block(ts_RLCMAC_CTRL_ACK(tlli), 0, sched_fn); + + /* Now that we confirmed the new assignment in the dl-tbf, lets receive the data and ack it */ + f_rx_rlcmac_dl_block_exp_data(dl_block, sched_fn, data, 0); + f_acknackdesc_ack_block(ack_nack_desc, dl_block.data.mac_hdr.hdr_ext.bsn, '1'B); + f_tx_rlcmac_ul_block(ts_RLCMAC_DL_ACK_NACK(dl_block.data.mac_hdr.hdr_ext.tfi, ack_nack_desc), 0, sched_fn); +} + /* Test scenario where MS wants to send some data on PDCH against SGSN and it is * answered, so TBFs for uplink and later for downlink are created. */ @@ -1544,6 +1613,7 @@ execute( TC_cs_initial_ul() ); execute( TC_cs_max_ul() ); execute( TC_t3169() ); + execute( TC_t3193() ); execute( TC_mo_ping_pong() ); execute( TC_imm_ass_dl_block_retrans() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16508 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib11cd1793d985ff609b10b0e60bddadd5fcfa6d2 Gerrit-Change-Number: 16508 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 17:48:04 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 5 Dec 2019 17:48:04 +0000 Subject: Change in osmo-ggsn[master]: manuals/configuration.adoc: fix Network Address without prefix length References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/16509 ) Change subject: manuals/configuration.adoc: fix Network Address without prefix length ...................................................................... manuals/configuration.adoc: fix Network Address without prefix length "An address '192.168.7.1' is specified without prefix length. The behavior of parsing addresses without prefix length will be changed in the future release. Please specify prefix length explicitly." Change-Id: I51777c6344191182fb87bae6f0048ce422802541 --- M doc/manuals/chapters/configuration.adoc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/09/16509/1 diff --git a/doc/manuals/chapters/configuration.adoc b/doc/manuals/chapters/configuration.adoc index 657a014..5ba51eb 100644 --- a/doc/manuals/chapters/configuration.adoc +++ b/doc/manuals/chapters/configuration.adoc @@ -299,7 +299,7 @@ Name=apn0 <1> [Network] -Address=192.168.7.1 <2> +Address=192.168.7.1/24 <2> IPMasquerade=yes <3> ---- <1> The netowrk device name, which must match the one in the apn0.netdev unit file above -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/16509 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I51777c6344191182fb87bae6f0048ce422802541 Gerrit-Change-Number: 16509 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 17:48:05 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 5 Dec 2019 17:48:05 +0000 Subject: Change in osmo-ggsn[master]: manuals/configuration.adoc: fix IPv4 address mismatch in < Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/16510 ) Change subject: manuals/configuration.adoc: fix IPv4 address mismatch in <> ...................................................................... manuals/configuration.adoc: fix IPv4 address mismatch in <> Change-Id: Ide9465a01857dbe5ec7f5bc1d09468153865156f --- M doc/manuals/chapters/configuration.adoc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/10/16510/1 diff --git a/doc/manuals/chapters/configuration.adoc b/doc/manuals/chapters/configuration.adoc index 5ba51eb..c5d4283 100644 --- a/doc/manuals/chapters/configuration.adoc +++ b/doc/manuals/chapters/configuration.adoc @@ -270,7 +270,7 @@ to match the `ip prefix dynamic` config item, and activate the link, for example: ---- -# ip addr add 192.168.7.0/24 dev apn0 +# ip addr add 192.168.7.1/24 dev apn0 # ip link set apn0 up ---- -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/16510 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ide9465a01857dbe5ec7f5bc1d09468153865156f Gerrit-Change-Number: 16510 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 17:48:05 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 5 Dec 2019 17:48:05 +0000 Subject: Change in osmo-ggsn[master]: contrib/systemd: add systemd-networkd examples from manuals References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/16511 ) Change subject: contrib/systemd: add systemd-networkd examples from manuals ...................................................................... contrib/systemd: add systemd-networkd examples from manuals Change-Id: I265637f39dd16dd43992f33149e512e34ed83252 --- M contrib/systemd/Makefile.am A contrib/systemd/apn0.netdev A contrib/systemd/ggsn.network 3 files changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/11/16511/1 diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index fbb553f..cbf0a97 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,4 +1,8 @@ -EXTRA_DIST = osmo-ggsn.service +EXTRA_DIST = \ + osmo-ggsn.service \ + ggsn.network \ + apn0.netdev \ + $(NULL) if HAVE_SYSTEMD systemdsystemunit_DATA = \ diff --git a/contrib/systemd/apn0.netdev b/contrib/systemd/apn0.netdev new file mode 100644 index 0000000..b8db5e1 --- /dev/null +++ b/contrib/systemd/apn0.netdev @@ -0,0 +1,7 @@ +[NetDev] +Name=apn0 +Kind=tun + +[Tun] +User=username +Group=username diff --git a/contrib/systemd/ggsn.network b/contrib/systemd/ggsn.network new file mode 100644 index 0000000..f1694fa --- /dev/null +++ b/contrib/systemd/ggsn.network @@ -0,0 +1,6 @@ +[Match] +Name=apn0 + +[Network] +Address=192.168.7.1/24 +IPMasquerade=yes -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/16511 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I265637f39dd16dd43992f33149e512e34ed83252 Gerrit-Change-Number: 16511 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 17:50:21 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 5 Dec 2019 17:50:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Support sending message to PCU at specific FN In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16487 ) Change subject: pcu: Support sending message to PCU at specific FN ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I81a29b4885f3fc6b753a1612d5fd369cd18f5dc6 Gerrit-Change-Number: 16487 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 05 Dec 2019 17:50:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 18:00:02 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 5 Dec 2019 18:00:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: send UL CONTROL ACK triggered by DL ACK/NACK In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16501 ) Change subject: pcu: send UL CONTROL ACK triggered by DL ACK/NACK ...................................................................... Patch Set 3: Code-Review-1 (1 comment) Sorry, I don't like this approach. It basically makes 1/10 use cases look shorter, while the rest 9/10 ones have to use a dummy variable. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16501/3/pcu/PCU_Tests_RAW.ttcn File pcu/PCU_Tests_RAW.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16501/3/pcu/PCU_Tests_RAW.ttcn at 744 PS3, Line 744: dl_block You've already exposed the whole RlcmacDlBlock, so the callers access dl_block.ctrl.mac_hdr.rrbp themselves if they need it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16501 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib409394257427cfc62da08fe06ce6c001dcf608a Gerrit-Change-Number: 16501 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 05 Dec 2019 18:00:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 18:02:33 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 5 Dec 2019 18:02:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: send UL CONTROL ACK triggered by DL ACK/NACK In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16501 ) Change subject: pcu: send UL CONTROL ACK triggered by DL ACK/NACK ...................................................................... Patch Set 3: > Patch Set 3: Code-Review-1 > > (1 comment) > > Sorry, I don't like this approach. It basically makes 1/10 use cases look shorter, while the rest 9/10 ones have to use a dummy variable. That's 9/10 of the specific simple scenarios we have NOW. Believe this is useful in more "usual MS" scenarios like the ones I submit after this one. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16501 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib409394257427cfc62da08fe06ce6c001dcf608a Gerrit-Change-Number: 16501 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 05 Dec 2019 18:02:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 18:08:39 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 5 Dec 2019 18:08:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: send UL CONTROL ACK triggered by DL ACK/NACK In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16501 ) Change subject: pcu: send UL CONTROL ACK triggered by DL ACK/NACK ...................................................................... Patch Set 3: > Patch Set 3: > > > Patch Set 3: Code-Review-1 > > > > (1 comment) > > > > Sorry, I don't like this approach. It basically makes 1/10 use cases look shorter, while the rest 9/10 ones have to use a dummy variable. > > That's 9/10 of the specific simple scenarios we have NOW. Believe this is useful in more "usual MS" scenarios like the ones I submit after this one. Ok, but still, you can just access that field directly since it's already exposed as a part of the record. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16501 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib409394257427cfc62da08fe06ce6c001dcf608a Gerrit-Change-Number: 16501 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 05 Dec 2019 18:08:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 18:18:45 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 5 Dec 2019 18:18:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: send UL CONTROL ACK triggered by DL ACK/NACK In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16501 ) Change subject: pcu: send UL CONTROL ACK triggered by DL ACK/NACK ...................................................................... Patch Set 3: > Patch Set 3: > > > Patch Set 3: > > > > > Patch Set 3: Code-Review-1 > > > > > > (1 comment) > > > > > > Sorry, I don't like this approach. It basically makes 1/10 use cases look shorter, while the rest 9/10 ones have to use a dummy variable. > > > > That's 9/10 of the specific simple scenarios we have NOW. Believe this is useful in more "usual MS" scenarios like the ones I submit after this one. > > Ok, but still, you can just access that field directly since it's already exposed as a part of the record. Yes for that part but not the req_fn from pcu_msg. And in most cases the interesting information is the calculated poll_fn so it can simply be passed over in forthcoming tests like I'm already doing. I'm not saying it should stay like this forever, but for now it proves useful for next tests. If at some point we add more complexity we can also move this around as we think fits better. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16501 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib409394257427cfc62da08fe06ce6c001dcf608a Gerrit-Change-Number: 16501 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 05 Dec 2019 18:18:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 18:24:39 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 5 Dec 2019 18:24:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce helpers to update AckNackDescription In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502 ) Change subject: pcu: Introduce helpers to update AckNackDescription ...................................................................... Patch Set 3: (4 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502/3/pcu/PCU_Tests_RAW.ttcn File pcu/PCU_Tests_RAW.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502/3/pcu/PCU_Tests_RAW.ttcn at 577 PS3, Line 577: f_acknackdesc_init Rather use a template instead of this imperative approach. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502/3/pcu/PCU_Tests_RAW.ttcn at 801 PS3, Line 801: uint7_t exp_bsn := 0 Feel free to use a template (present) here with default := ?. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502/3/pcu/PCU_Tests_RAW.ttcn at 816 PS3, Line 816: if (dl_block.data.mac_hdr.hdr_ext.bsn != exp_bsn) { ... so than here you could just use match(). https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502/3/pcu/PCU_Tests_RAW.ttcn at 1466 PS3, Line 1466: 0 It's 0 by default in the function definition. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic62ab9e4a854239b95c434068543d95c5352f1c6 Gerrit-Change-Number: 16502 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 05 Dec 2019 18:24:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 5 19:01:57 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 5 Dec 2019 19:01:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_imm_ass_dl_block_retrans In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16507 ) Change subject: pcu: Introduce test TC_imm_ass_dl_block_retrans ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16507 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icc60cebb8583c9dc97b658def69f17e6efced384 Gerrit-Change-Number: 16507 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 05 Dec 2019 19:01:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Dec 5 22:16:47 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 05 Dec 2019 22:16:47 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5de981dde39bd_4c752ad9473ec600271988@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 287s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 287s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 287s] dh_install -O--fail-missing [ 287s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 287s] dh_install: This feature will be removed in compat 12. [ 288s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 288s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 288s] dh_missing: missing files, aborting [ 288s] The following debhelper tools have reported what they installed (with files per package) [ 288s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 288s] If the missing files are installed by another tool, please file a bug against it. [ 288s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 288s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 288s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 288s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 288s] For a short-term work-around: Add the files to debian/not-installed [ 288s] dh_install: dh_missing --fail-missing returned exit code 255 [ 288s] make: *** [debian/rules:12: binary] Error 255 [ 288s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 288s] [ 288s] sheep81 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 22:16:31 UTC 2019. [ 288s] [ 288s] ### VM INTERACTION START ### [ 291s] [ 279.591726] sysrq: SysRq : Power Off [ 291s] [ 279.602352] reboot: Power down [ 291s] ### VM INTERACTION END ### [ 291s] [ 291s] sheep81 failed "build osmo-remsim_0.2.2.9.a8d9.dsc" at Thu Dec 5 22:16:35 UTC 2019. [ 291s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Dec 6 01:38:47 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 06 Dec 2019 01:38:47 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5de9b13499a2e_4c752ad9473ec6002857d6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_10/x86_64 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 357s] pdflatex failed [ 357s] test-usermanual.tex:3933: pdfTeX error (ext4): \pdfendlink ended up in different nesting level than \pdfstartlink. [ 357s] test-usermanual.tex:3933: leading text: \end{longtable} [ 357s] [ 357s] A possible reason for [ 304.137877] serial8250: too much work for irq4 [ 357s] transformation failure is invalid DocBook [ 357s] (as reported by xmllint) [ 357s] [ 357s] Error: pdflatex compilation failed [ 357s] [ 357s] make[3]: *** [../build/Makefile.asciidoc.inc:69: test-usermanual.pdf] Error 1 [ 357s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 357s] make[2]: *** [Makefile:438: all-recursive] Error 1 [ 357s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 357s] make[1]: *** [Makefile:362: all] Error 2 [ 357s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 357s] dh_auto_build: make -j1 returned exit code 2 [ 357s] make: *** [debian/rules:5: binary] Error 2 [ 357s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 357s] [ 357s] cloud127 failed "build osmo-gsm-manuals-dev_0.2.0.12.33d3.dsc" at Fri Dec 6 01:38:40 UTC 2019. [ 357s] [ 357s] ### VM INTERACTION START ### [ 360s] [ 307.272828] sysrq: SysRq : Power Off [ 360s] [ 307.278026] reboot: Power down [ 362s] ### VM INTERACTION END ### [ 362s] [ 362s] cloud127 failed "build osmo-gsm-manuals-dev_0.2.0.12.33d3.dsc" at Fri Dec 6 01:38:45 UTC 2019. [ 362s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Dec 6 09:50:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 09:50:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Verify contents of data dl blocks originated from emulated SGSN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16485 ) Change subject: pcu: Verify contents of data dl blocks originated from emulated SGSN ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4fe79572094038cbb26d5195c0544846ca2550b5 Gerrit-Change-Number: 16485 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Dec 2019 09:50:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 09:51:27 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 09:51:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Support sending message to PCU at specific FN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16487 ) Change subject: pcu: Support sending message to PCU at specific FN ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I81a29b4885f3fc6b753a1612d5fd369cd18f5dc6 Gerrit-Change-Number: 16487 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Dec 2019 09:51:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 09:51:31 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 09:51:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Verify contents of data dl blocks originated from emulated SGSN In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16485 ) Change subject: pcu: Verify contents of data dl blocks originated from emulated SGSN ...................................................................... pcu: Verify contents of data dl blocks originated from emulated SGSN Change-Id: I4fe79572094038cbb26d5195c0544846ca2550b5 --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 22 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index 410dc31..cddf9f6 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -759,13 +759,34 @@ runs on RAW_PCU_Test_CT { var template RlcmacDlBlock dl_template := tr_RLCMAC_DATA_RRBP; dl_template.data.blocks := ?; - /* TODO: match data correctly: { valueof(t_RLCMAC_LLCBLOCK(data)) }; */ f_rx_rlcmac_dl_block(dl_block); if (not match(dl_block, dl_template)) { setverdict(fail, "Failed to match Packet data: ", dl_block, " vs ", dl_template); mtc.stop; } + + if (lengthof(dl_block.data.blocks) < 1) { + setverdict(fail, "DL block has no LLC payload: ", dl_block); + mtc.stop; + } + + if (ispresent(dl_block.data.blocks[0].hdr) and dl_block.data.blocks[0].hdr.length_ind != lengthof(data)) { + setverdict(fail, "DL block has LLC header with wrong expected size: ", + dl_block.data.blocks[0].hdr.length_ind, " vs ", lengthof(data)); + mtc.stop; + } + + if (dl_block.data.blocks[0].payload != data) { + setverdict(fail, "Failed to match content of LLC payload in DL Block: ", dl_block, " vs ", data); + mtc.stop; + } + + /* Check next data blocks contain dummy frames */ + if (lengthof(dl_block.data.blocks) > 1 and substr(dl_block.data.blocks[1].payload, 0, 3) != '43C001'O) { + setverdict(fail, "Second data payload is not a dummy frame: ", dl_block.data.blocks[1].payload); + mtc.stop; + } } testcase TC_pcuif_suspend() runs on RAW_PCU_Test_CT { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4fe79572094038cbb26d5195c0544846ca2550b5 Gerrit-Change-Number: 16485 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 09:51:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 09:51:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix incorrect FN being send over PCUIF to PCU In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16486 ) Change subject: pcu: Fix incorrect FN being send over PCUIF to PCU ...................................................................... pcu: Fix incorrect FN being send over PCUIF to PCU The event FN contains the current FN, but the message should contain the FN of the first burst of the block. Change-Id: Iba0b1d1a3d7d875c5443a7bcaff399f9681624ad --- M pcu/PCUIF_RAW_Components.ttcn 1 file changed, 8 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/PCUIF_RAW_Components.ttcn b/pcu/PCUIF_RAW_Components.ttcn index 6d29404..5516d83 100644 --- a/pcu/PCUIF_RAW_Components.ttcn +++ b/pcu/PCUIF_RAW_Components.ttcn @@ -278,6 +278,7 @@ runs on RAW_PCU_BTS_CT { var PCUIF_Message pcu_msg; var RAW_PCU_Event event; + var integer ev_begin_fn; [] CLCK.receive(tr_RAW_PCU_EV(TDMA_EV_PDTCH_BLOCK_BEG)) -> value event { /* If the RTS queue for PDTCH is not empty, send a message */ @@ -296,23 +297,27 @@ repeat; } [lengthof(pdtch_data_queue) > 0] CLCK.receive(tr_RAW_PCU_EV(TDMA_EV_PDTCH_BLOCK_END)) -> value event { + /* FN matching the beginning of current block: */ + ev_begin_fn := event.data.tdma_fn - 3; /* Dequeue a DATA.ind message */ f_PCUIF_MsgQueue_dequeue(pdtch_data_queue, pcu_msg); /* Patch TDMA frame / block number */ - pcu_msg.u.data_ind.fn := event.data.tdma_fn; + pcu_msg.u.data_ind.fn := ev_begin_fn; pcu_msg.u.data_ind.block_nr := 0; /* FIXME! */ PCUIF.send(pcu_msg); /* Send to the PCU and notify the TC */ - TC.send(ts_RAW_PCU_CLCK_EV(TDMA_EV_PDTCH_BLOCK_SENT, event.data.tdma_fn)); + TC.send(ts_RAW_PCU_CLCK_EV(TDMA_EV_PDTCH_BLOCK_SENT, ev_begin_fn)); repeat; } [lengthof(ptcch_rts_queue) > 0] CLCK.receive(tr_RAW_PCU_EV(TDMA_EV_PTCCH_DL_BLOCK)) -> value event { + /* FN matching the beginning of current block (PTCCH is interleaved over 4 non-consecutive bursts): */ + ev_begin_fn := event.data.tdma_fn - 78; /* Dequeue an RTS.req message for PTCCH */ f_PCUIF_MsgQueue_dequeue(ptcch_rts_queue, pcu_msg); /* Patch TDMA frame / block number and send */ - pcu_msg.u.rts_req.fn := event.data.tdma_fn; + pcu_msg.u.rts_req.fn := ev_begin_fn; pcu_msg.u.rts_req.block_nr := 0; /* FIXME! */ PCUIF.send(pcu_msg); repeat; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iba0b1d1a3d7d875c5443a7bcaff399f9681624ad Gerrit-Change-Number: 16486 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 09:51:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 09:51:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Support sending message to PCU at specific FN In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16487 ) Change subject: pcu: Support sending message to PCU at specific FN ...................................................................... pcu: Support sending message to PCU at specific FN Change-Id: I81a29b4885f3fc6b753a1612d5fd369cd18f5dc6 --- M library/RLCMAC_Types.ttcn M pcu/PCUIF_RAW_Components.ttcn M pcu/PCU_Tests_RAW.ttcn 3 files changed, 65 insertions(+), 13 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/RLCMAC_Types.ttcn b/library/RLCMAC_Types.ttcn index 8e6942e..3a1ecb1 100644 --- a/library/RLCMAC_Types.ttcn +++ b/library/RLCMAC_Types.ttcn @@ -31,6 +31,16 @@ RRBP_Nplus26_mod_2715648 ('11'B) } with { variant "FIELDLENGTH(2)" }; + function f_rrbp_fn_delay(MacRrbp rrbp) return uint32_t { + select (rrbp) { + case (RRBP_Nplus13_mod_2715648) { return 13; } + case (RRBP_Nplus17_or_18_mod_2715648) { return 17; } + case (RRBP_Nplus21_or_22_mod_2715648) { return 21; } + case (RRBP_Nplus26_mod_2715648) { return 26; } + } + return 0; + } + /* Partof DL RLC data block and DL RLC/MAC ctrl block */ type record DlMacHeader { MacPayloadType payload_type, diff --git a/pcu/PCUIF_RAW_Components.ttcn b/pcu/PCUIF_RAW_Components.ttcn index 5516d83..4ed57e5 100644 --- a/pcu/PCUIF_RAW_Components.ttcn +++ b/pcu/PCUIF_RAW_Components.ttcn @@ -228,6 +228,18 @@ } } +/* Get first message from queue. true if non-empty, false otherwise */ +private function f_PCUIF_MsgQueue_first(inout PCUIF_MsgQueue queue, + out PCUIF_Message msg) return boolean +{ + if (lengthof(queue) == 0) { + return false; + } + + msg := queue[0]; + return true; +} + /* Multiple base stations can be connected to the PCU. This component * represents one BTS with an associated TDMA clock generator. */ type component RAW_PCU_BTS_CT { @@ -250,6 +262,9 @@ var boolean cfg_ptcch_burst_fwd := false; } +/* Queue received messages from Test Case, they will eventually be scheduled and + * sent according to their FN. FN value of 0 has the special meaning of "schedule + * as soon as possible". */ private altstep as_BTS_CT_MsgQueue(integer bts_nr) runs on RAW_PCU_BTS_CT { var PCUIF_Message pcu_msg; @@ -274,11 +289,14 @@ } } +/* Handle schedule events and manage actions: Send msgs over PCUIF to PCU, + * advertise Test Case about sent messages, etc. */ private altstep as_BTS_CT_TDMASched(integer bts_nr) runs on RAW_PCU_BTS_CT { var PCUIF_Message pcu_msg; var RAW_PCU_Event event; var integer ev_begin_fn; + var integer next_fn; [] CLCK.receive(tr_RAW_PCU_EV(TDMA_EV_PDTCH_BLOCK_BEG)) -> value event { /* If the RTS queue for PDTCH is not empty, send a message */ @@ -299,6 +317,17 @@ [lengthof(pdtch_data_queue) > 0] CLCK.receive(tr_RAW_PCU_EV(TDMA_EV_PDTCH_BLOCK_END)) -> value event { /* FN matching the beginning of current block: */ ev_begin_fn := event.data.tdma_fn - 3; + + /* Check if we reached time to serve the first DATA.ind message in the queue: */ + f_PCUIF_MsgQueue_first(pdtch_data_queue, pcu_msg); + next_fn := pcu_msg.u.data_ind.fn; + if (next_fn != 0 and next_fn != ev_begin_fn) { + if (next_fn < ev_begin_fn) { + setverdict(fail, "We are late scheduling the block! ", next_fn, " < ", ev_begin_fn); + mtc.stop; + } + repeat; + } /* Dequeue a DATA.ind message */ f_PCUIF_MsgQueue_dequeue(pdtch_data_queue, pcu_msg); diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index cddf9f6..e4b03c1 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -663,13 +663,16 @@ } /* Enqueue DATA.ind (both TDMA frame and block numbers to be patched) */ -private function f_pcuif_tx_data_ind(octetstring data, int16_t lqual_cb := 0) +private function f_pcuif_tx_data_ind(octetstring data, int16_t lqual_cb := 0, uint32_t fn := 0) runs on RAW_PCU_Test_CT { - + var template RAW_PCU_EventParam ev_param := {tdma_fn := ? }; BTS.send(ts_PCUIF_DATA_IND(bts_nr := 0, trx_nr := 0, ts_nr := 7, block_nr := 0, sapi := PCU_IF_SAPI_PDTCH, data := data, - fn := 0, arfcn := 871, lqual_cb := lqual_cb)); - BTS.receive(tr_RAW_PCU_EV(TDMA_EV_PDTCH_BLOCK_SENT)); + fn := fn, arfcn := 871, lqual_cb := lqual_cb)); + if (fn != 0) { + ev_param := {tdma_fn := fn }; + } + BTS.receive(tr_RAW_PCU_EV(TDMA_EV_PDTCH_BLOCK_SENT, ev_param)); } /* Enqueue RTS.req, expect DATA.req with UL ACK from the PCU */ @@ -700,7 +703,7 @@ fn := 0, arfcn := 871, sapi := PCU_IF_SAPI_PCH, data := macblock)); } -private function f_tx_rlcmac_ul_block(template (value) RlcmacUlBlock ul_data, int16_t lqual_cb := 0) +private function f_tx_rlcmac_ul_block(template (value) RlcmacUlBlock ul_data, int16_t lqual_cb := 0, uint32_t fn := 0) runs on RAW_PCU_Test_CT { var octetstring data; /* Encode the payload of DATA.ind */ @@ -708,7 +711,7 @@ data := f_pad_oct(data, 23, '00'O); /* CS-1 */ /* Enqueue DATA.ind (both TDMA frame and block numbers to be patched) */ - f_pcuif_tx_data_ind(data, lqual_cb); + f_pcuif_tx_data_ind(data, lqual_cb, fn); } private function f_tx_rlcmac_ul_n_blocks(PacketUlAssign ul_tbf_ass, integer num_blocks := 1) @@ -730,16 +733,19 @@ } } -private function f_rx_rlcmac_dl_block(out RlcmacDlBlock dl_block) +private function f_rx_rlcmac_dl_block(out RlcmacDlBlock dl_block, out uint32_t dl_fn) runs on RAW_PCU_Test_CT { var PCUIF_Message pcu_msg; f_pcuif_rx_data_req(pcu_msg); dl_block := dec_RlcmacDlBlock(pcu_msg.u.data_req.data); + dl_fn := pcu_msg.u.data_req.fn; } private function f_rx_rlcmac_dl_block_exp_ack_nack(out RlcmacDlBlock dl_block) runs on RAW_PCU_Test_CT { - f_rx_rlcmac_dl_block(dl_block); + var uint32_t dl_fn; + + f_rx_rlcmac_dl_block(dl_block, dl_fn); if (not match(dl_block, tr_RLCMAC_UL_ACK_NACK(ul_tfi := ?, tlli := ?))) { setverdict(fail, "Failed to match Packet Uplink ACK / NACK"); mtc.stop; @@ -748,24 +754,30 @@ private function f_rx_rlcmac_dl_block_exp_dummy(out RlcmacDlBlock dl_block) runs on RAW_PCU_Test_CT { - f_rx_rlcmac_dl_block(dl_block); + var uint32_t dl_fn; + + f_rx_rlcmac_dl_block(dl_block, dl_fn); if (not match(dl_block, tr_RLCMAC_DUMMY_CTRL())) { setverdict(fail, "Failed to match Packet DUMMY DL"); mtc.stop; } } -private function f_rx_rlcmac_dl_block_exp_data(out RlcmacDlBlock dl_block, octetstring data) +private function f_rx_rlcmac_dl_block_exp_data(out RlcmacDlBlock dl_block, out uint32_t ack_fn, octetstring data) runs on RAW_PCU_Test_CT { + var PCUIF_Message pcu_msg; + var uint32_t dl_fn; var template RlcmacDlBlock dl_template := tr_RLCMAC_DATA_RRBP; dl_template.data.blocks := ?; - f_rx_rlcmac_dl_block(dl_block); + f_rx_rlcmac_dl_block(dl_block, dl_fn); if (not match(dl_block, dl_template)) { setverdict(fail, "Failed to match Packet data: ", dl_block, " vs ", dl_template); mtc.stop; } + ack_fn := dl_fn + f_rrbp_fn_delay(dl_block.data.mac_hdr.mac_hdr.rrbp); + if (lengthof(dl_block.data.blocks) < 1) { setverdict(fail, "DL block has no LLC payload: ", dl_block); mtc.stop; @@ -1358,6 +1370,7 @@ var PCUIF_Message pcu_msg; var octetstring data := f_rnd_octstring(10); var boolean ok; + var uint32_t sched_fn; var OCT4 tlli := '00000001'O; var AckNackDescription ack_nack_desc; @@ -1407,10 +1420,10 @@ /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ f_sleep(X2002); - f_rx_rlcmac_dl_block_exp_data(dl_block, data); + f_rx_rlcmac_dl_block_exp_data(dl_block, sched_fn, data); /* ACK the DL block */ - f_tx_rlcmac_ul_block(ts_RLCMAC_DL_ACK_NACK(dl_block.data.mac_hdr.hdr_ext.tfi, ack_nack_desc)); + f_tx_rlcmac_ul_block(ts_RLCMAC_DL_ACK_NACK(dl_block.data.mac_hdr.hdr_ext.tfi, ack_nack_desc), 0, sched_fn); } control { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I81a29b4885f3fc6b753a1612d5fd369cd18f5dc6 Gerrit-Change-Number: 16487 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 09:53:24 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 09:53:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce helpers to update AckNackDescription In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502 ) Change subject: pcu: Introduce helpers to update AckNackDescription ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502/3/pcu/PCU_Tests_RAW.ttcn File pcu/PCU_Tests_RAW.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502/3/pcu/PCU_Tests_RAW.ttcn at 577 PS3, Line 577: f_acknackdesc_init > Rather use a template instead of this imperative approach. I don't think a template can be 'inout', it's all pass-by-value (well, templates are no values, but I guess you know what I mean). I guess this function is changing just some member variables of AckNackDesc, and not all of them. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic62ab9e4a854239b95c434068543d95c5352f1c6 Gerrit-Change-Number: 16502 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 06 Dec 2019 09:53:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 09:53:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 09:53:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_imm_ass_dl_block_retrans In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16507 ) Change subject: pcu: Introduce test TC_imm_ass_dl_block_retrans ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16507 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icc60cebb8583c9dc97b658def69f17e6efced384 Gerrit-Change-Number: 16507 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Dec 2019 09:53:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 09:53:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 09:53:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_t3193 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16508 ) Change subject: pcu: Introduce test TC_t3193 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16508 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib11cd1793d985ff609b10b0e60bddadd5fcfa6d2 Gerrit-Change-Number: 16508 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Dec 2019 09:53:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 09:54:17 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 09:54:17 +0000 Subject: Change in osmo-ggsn[master]: manuals/configuration.adoc: fix Network Address without prefix length In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/16509 ) Change subject: manuals/configuration.adoc: fix Network Address without prefix length ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/16509 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I51777c6344191182fb87bae6f0048ce422802541 Gerrit-Change-Number: 16509 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Dec 2019 09:54:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 09:54:29 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 09:54:29 +0000 Subject: Change in osmo-ggsn[master]: manuals/configuration.adoc: fix IPv4 address mismatch in < References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/16510 ) Change subject: manuals/configuration.adoc: fix IPv4 address mismatch in <> ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/16510 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ide9465a01857dbe5ec7f5bc1d09468153865156f Gerrit-Change-Number: 16510 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Dec 2019 09:54:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 09:54:41 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 09:54:41 +0000 Subject: Change in osmo-ggsn[master]: contrib/systemd: add systemd-networkd examples from manuals In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/16511 ) Change subject: contrib/systemd: add systemd-networkd examples from manuals ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/16511 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I265637f39dd16dd43992f33149e512e34ed83252 Gerrit-Change-Number: 16511 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Dec 2019 09:54:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 09:54:42 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 09:54:42 +0000 Subject: Change in osmo-ggsn[master]: manuals/configuration.adoc: fix Network Address without prefix length In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/16509 ) Change subject: manuals/configuration.adoc: fix Network Address without prefix length ...................................................................... manuals/configuration.adoc: fix Network Address without prefix length "An address '192.168.7.1' is specified without prefix length. The behavior of parsing addresses without prefix length will be changed in the future release. Please specify prefix length explicitly." Change-Id: I51777c6344191182fb87bae6f0048ce422802541 --- M doc/manuals/chapters/configuration.adoc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/chapters/configuration.adoc b/doc/manuals/chapters/configuration.adoc index 657a014..5ba51eb 100644 --- a/doc/manuals/chapters/configuration.adoc +++ b/doc/manuals/chapters/configuration.adoc @@ -299,7 +299,7 @@ Name=apn0 <1> [Network] -Address=192.168.7.1 <2> +Address=192.168.7.1/24 <2> IPMasquerade=yes <3> ---- <1> The netowrk device name, which must match the one in the apn0.netdev unit file above -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/16509 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I51777c6344191182fb87bae6f0048ce422802541 Gerrit-Change-Number: 16509 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 09:54:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 09:54:43 +0000 Subject: Change in osmo-ggsn[master]: manuals/configuration.adoc: fix IPv4 address mismatch in < References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/16510 ) Change subject: manuals/configuration.adoc: fix IPv4 address mismatch in <> ...................................................................... manuals/configuration.adoc: fix IPv4 address mismatch in <> Change-Id: Ide9465a01857dbe5ec7f5bc1d09468153865156f --- M doc/manuals/chapters/configuration.adoc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/chapters/configuration.adoc b/doc/manuals/chapters/configuration.adoc index 5ba51eb..c5d4283 100644 --- a/doc/manuals/chapters/configuration.adoc +++ b/doc/manuals/chapters/configuration.adoc @@ -270,7 +270,7 @@ to match the `ip prefix dynamic` config item, and activate the link, for example: ---- -# ip addr add 192.168.7.0/24 dev apn0 +# ip addr add 192.168.7.1/24 dev apn0 # ip link set apn0 up ---- -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/16510 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ide9465a01857dbe5ec7f5bc1d09468153865156f Gerrit-Change-Number: 16510 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 09:54:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 09:54:43 +0000 Subject: Change in osmo-ggsn[master]: contrib/systemd: add systemd-networkd examples from manuals In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/16511 ) Change subject: contrib/systemd: add systemd-networkd examples from manuals ...................................................................... contrib/systemd: add systemd-networkd examples from manuals Change-Id: I265637f39dd16dd43992f33149e512e34ed83252 --- M contrib/systemd/Makefile.am A contrib/systemd/apn0.netdev A contrib/systemd/ggsn.network 3 files changed, 18 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am index fbb553f..cbf0a97 100644 --- a/contrib/systemd/Makefile.am +++ b/contrib/systemd/Makefile.am @@ -1,4 +1,8 @@ -EXTRA_DIST = osmo-ggsn.service +EXTRA_DIST = \ + osmo-ggsn.service \ + ggsn.network \ + apn0.netdev \ + $(NULL) if HAVE_SYSTEMD systemdsystemunit_DATA = \ diff --git a/contrib/systemd/apn0.netdev b/contrib/systemd/apn0.netdev new file mode 100644 index 0000000..b8db5e1 --- /dev/null +++ b/contrib/systemd/apn0.netdev @@ -0,0 +1,7 @@ +[NetDev] +Name=apn0 +Kind=tun + +[Tun] +User=username +Group=username diff --git a/contrib/systemd/ggsn.network b/contrib/systemd/ggsn.network new file mode 100644 index 0000000..f1694fa --- /dev/null +++ b/contrib/systemd/ggsn.network @@ -0,0 +1,6 @@ +[Match] +Name=apn0 + +[Network] +Address=192.168.7.1/24 +IPMasquerade=yes -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/16511 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I265637f39dd16dd43992f33149e512e34ed83252 Gerrit-Change-Number: 16511 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 09:55:27 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 09:55:27 +0000 Subject: Change in osmo-gsm-manuals[master]: Drop python2 and pychart dependencies In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16504 ) Change subject: Drop python2 and pychart dependencies ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I57522e57e39682d6d123af4584785d327361e5a3 Gerrit-Change-Number: 16504 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Dec 2019 09:55:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 09:56:04 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 09:56:04 +0000 Subject: Change in ...osmo-python-tests[master]: Drop python2 support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16500 ) Change subject: Drop python2 support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16500 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Iabda95073faa2191fd117e9637e0858c589e9d9e Gerrit-Change-Number: 16500 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Dec 2019 09:56:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 09:56:16 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 09:56:16 +0000 Subject: Change in osmo-ci[master]: docker: drop python2 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16505 ) Change subject: docker: drop python2 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16505 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iacace670bdb949e67227e0faa1765e36bba42018 Gerrit-Change-Number: 16505 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Dec 2019 09:56:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 09:56:31 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 09:56:31 +0000 Subject: Change in osmo-ci[master]: docker: install inkscape In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16506 ) Change subject: docker: install inkscape ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I754b133d77743582bd84c33c74ecc9eb9ca4c0ef Gerrit-Change-Number: 16506 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 06 Dec 2019 09:56:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 09:56:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 09:56:50 +0000 Subject: Change in osmo-bsc[master]: doc: osmux: use generated svg instead of pychart In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16503 ) Change subject: doc: osmux: use generated svg instead of pychart ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16503 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I36b721f895caee9766528e14d854b6aa2a2fac85 Gerrit-Change-Number: 16503 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Dec 2019 09:56:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 09:57:56 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 6 Dec 2019 09:57:56 +0000 Subject: Change in osmo-ci[master]: docker: install inkscape In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16506 ) Change subject: docker: install inkscape ...................................................................... docker: install inkscape Needed by osmo-gsm-manuals to add svg graphics to the manuals. Change-Id: I754b133d77743582bd84c33c74ecc9eb9ca4c0ef --- M docker/Dockerfile_osmocom_jenkins.amd64 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: osmith: Verified laforge: Looks good to me, approved diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64 index 18402f3..2209fc6 100644 --- a/docker/Dockerfile_osmocom_jenkins.amd64 +++ b/docker/Dockerfile_osmocom_jenkins.amd64 @@ -40,6 +40,7 @@ git-buildpackage \ graphviz \ htop \ + inkscape \ lcov \ libaio-dev \ libasound2-dev \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I754b133d77743582bd84c33c74ecc9eb9ca4c0ef Gerrit-Change-Number: 16506 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 12:53:24 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 6 Dec 2019 12:53:24 +0000 Subject: Change in ...osmo-python-tests[master]: Drop python2 support In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16500 ) Change subject: Drop python2 support ...................................................................... Drop python2 support Remove all compatibility code for python2. All scripts are already python 3 compatible since I80e5850a8978d78cda793e2192ef4bd3fd54a121 and I1b4a629f12863c498a8681b555f57b4e255cebfb. dpkg-buildpackage shows that it is still invoking setup.py with python in addition to python3, on debian stretch. But after spending quite some time on trying to convince it to not care about python2 without success (trying different variables, overrides, --without python2 flags etc.), I'm leaving it as is. The resulting package is the python3 package, which is what we want. Related: OS#2819 Change-Id: Iabda95073faa2191fd117e9637e0858c589e9d9e --- M contrib/jenkins.sh M debian/control M debian/rules M osmopy/__init__.py M osmopy/obscvty.py M osmopy/osmo_interact/__init__.py M osmopy/osmo_interact/common.py M osmopy/osmoutil.py M scripts/osmodumpdoc.py M scripts/osmotestconfig.py M scripts/osmotestvty.py M setup.py D tests/test_py2.py 13 files changed, 22 insertions(+), 71 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 08908a4..9b219f9 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -4,16 +4,6 @@ COM_FLAGS='-m compileall' -# FIXME: remove once python 2 support is deprecated -PY2=python2 -PY2_LIST="osmopy scripts/osmodumpdoc.py scripts/osmotestvty.py scripts/osmotestconfig.py" -$PY2 ./setup.py install -$PY2 tests/test_py2.py -for f in $PY2_LIST -do - $PY2 $COM_FLAGS $f -done - rm -rf ./build PY3=python3 PY3_LIST="osmopy scripts/osmo_ctrl.py scripts/osmo_rate_ctr2csv.py scripts/osmodumpdoc.py scripts/osmotestvty.py scripts/osmotestconfig.py scripts/osmo_interact_ctrl.py scripts/osmo_interact_vty.py scripts/osmo_verify_transcript_ctrl.py scripts/osmo_verify_transcript_vty.py scripts/soap.py scripts/twisted_ipa.py" diff --git a/debian/control b/debian/control index 52b614c..1ad871d 100644 --- a/debian/control +++ b/debian/control @@ -2,26 +2,12 @@ Section: python Priority: optional Maintainer: Harald Welte -Build-Depends: debhelper (>= 9), python, dh-python, python-setuptools, python3, python3-setuptools +Build-Depends: debhelper (>= 9), dh-python, python3, python3-setuptools Standards-Version: 3.9.8 Homepage: http://git.osmocom.org/python/osmo-python-tests/ Vcs-Git: git://git.osmocom.org/python/osmo-python-tests Vcs-Browser: http://git.osmocom.org/python/osmo-python-tests/ -Package: python2-osmopy-libs -Architecture: all -Depends: ${python:Depends}, ${misc:Depends} -Description: Python code (not only) for testing of Osmocom programs - . - This package contains the Python 2 version of osmopy libraries. - -Package: python2-osmopy-utils -Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, python2-osmopy-libs -Description: Python code (not only) for testing of Osmocom programs - . - This package contains the Python 2 version of osmopy utils. - Package: python3-osmopy-libs Architecture: all Depends: ${python3:Depends}, ${misc:Depends} diff --git a/debian/rules b/debian/rules index 04b59f6..d0817c3 100755 --- a/debian/rules +++ b/debian/rules @@ -1,13 +1,9 @@ #!/usr/bin/make -f %: - dh $@ --with python2,python3 + dh $@ --with python3 override_dh_auto_install: - python2 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python2-osmopy-libs - rm -rf $(CURDIR)/debian/python2-osmopy-libs/usr/bin - python2 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python2-osmopy-utils - rm -rf $(CURDIR)/debian/python2-osmopy-utils/usr/lib python3 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python3-osmopy-libs rm -rf $(CURDIR)/debian/python3-osmopy-libs/usr/bin python3 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python3-osmopy-utils diff --git a/osmopy/__init__.py b/osmopy/__init__.py index ce78caf..18362ec 100644 --- a/osmopy/__init__.py +++ b/osmopy/__init__.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 __version__ = '0.1.0' __all__ = ['obscvty', 'osmoutil', 'osmo_ipa', 'osmo_interact', 'trap_helper', 'twisted_ipa'] diff --git a/osmopy/obscvty.py b/osmopy/obscvty.py index d39d3da..ab280c0 100755 --- a/osmopy/obscvty.py +++ b/osmopy/obscvty.py @@ -16,7 +16,6 @@ # # VTY helper code for OpenBSC # -from __future__ import print_function import re import socket import sys, subprocess diff --git a/osmopy/osmo_interact/__init__.py b/osmopy/osmo_interact/__init__.py index 4fc4fac..036238a 100644 --- a/osmopy/osmo_interact/__init__.py +++ b/osmopy/osmo_interact/__init__.py @@ -1,2 +1,2 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 __all__ = ['common', 'vty', 'ctrl'] diff --git a/osmopy/osmo_interact/common.py b/osmopy/osmo_interact/common.py index cc7e190..87eca6a 100644 --- a/osmopy/osmo_interact/common.py +++ b/osmopy/osmo_interact/common.py @@ -24,11 +24,6 @@ vty.py and ctrl.py plug VTY and CTRL interface specific bits. ''' -# Our setup.py currently wants everything to be parsable by both py2 and py3. -# IMHO that is not a good idea, but until that changes, let's just keep this -# py2 legacy shim in here so we can syntax-check this py3 module with py2. -from __future__ import print_function - import argparse import sys import os diff --git a/osmopy/osmoutil.py b/osmopy/osmoutil.py index 54a3456..ec9c8c3 100755 --- a/osmopy/osmoutil.py +++ b/osmopy/osmoutil.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify @@ -14,7 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from __future__ import print_function import subprocess import os import sys diff --git a/scripts/osmodumpdoc.py b/scripts/osmodumpdoc.py index d71edc8..64b088f 100755 --- a/scripts/osmodumpdoc.py +++ b/scripts/osmodumpdoc.py @@ -1,10 +1,9 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Make sure this code is in sync with the BTS directory. # Fixes may need to be applied to both. """Start the process and dump the documentation to the doc dir.""" -from __future__ import print_function import subprocess import time import os diff --git a/scripts/osmotestconfig.py b/scripts/osmotestconfig.py index f227504..70a32a4 100755 --- a/scripts/osmotestconfig.py +++ b/scripts/osmotestconfig.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify @@ -13,7 +13,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from __future__ import print_function import os import os.path import time diff --git a/scripts/osmotestvty.py b/scripts/osmotestvty.py index 55017a5..600860f 100755 --- a/scripts/osmotestvty.py +++ b/scripts/osmotestvty.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify @@ -13,7 +13,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from __future__ import print_function import os import time import unittest diff --git a/setup.py b/setup.py index 69e18b0..ab604ce 100755 --- a/setup.py +++ b/setup.py @@ -19,24 +19,20 @@ from osmopy import __version__ import sys -if sys.version_info.major == 2: - scripts = [ - "scripts/osmodumpdoc.py", - "scripts/osmotestconfig.py", - "scripts/osmotestvty.py", - ] -elif sys.version_info.major == 3: - scripts = [ - "scripts/osmo_ctrl.py", - "scripts/osmo_rate_ctr2csv.py", - "scripts/soap.py", - "scripts/ctrl2cgi.py", - "scripts/osmo_trap2cgi.py", - "scripts/osmo_interact_vty.py", - "scripts/osmo_interact_ctrl.py", - "scripts/osmo_verify_transcript_vty.py", - "scripts/osmo_verify_transcript_ctrl.py", - ] +scripts = [ + "scripts/osmodumpdoc.py", + "scripts/osmotestvty.py", + "scripts/osmotestconfig.py", + "scripts/osmo_ctrl.py", + "scripts/osmo_rate_ctr2csv.py", + "scripts/soap.py", + "scripts/ctrl2cgi.py", + "scripts/osmo_trap2cgi.py", + "scripts/osmo_interact_vty.py", + "scripts/osmo_interact_ctrl.py", + "scripts/osmo_verify_transcript_vty.py", + "scripts/osmo_verify_transcript_ctrl.py", + ] setup( name = 'osmopython', diff --git a/tests/test_py2.py b/tests/test_py2.py deleted file mode 100644 index cac5261..0000000 --- a/tests/test_py2.py +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env python2 - -# just import a smoke test for osmopy - -import osmopy - -print '[Python2] Smoke test PASSED.' -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16500 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Iabda95073faa2191fd117e9637e0858c589e9d9e Gerrit-Change-Number: 16500 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 13:18:27 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 6 Dec 2019 13:18:27 +0000 Subject: Change in osmo-bsc[master]: doc: osmux: use generated svg instead of pychart In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16503 ) Change subject: doc: osmux: use generated svg instead of pychart ...................................................................... doc: osmux: use generated svg instead of pychart Replace python 2 code using pychart to draw a graph in osmux-reference.adoc with the generated svg file. The upstream of pychart is dead, there is no python 3 version, and python 2 is EOL at the end of 2019. This is the only time we ever made use of pychart in osmo-gsm-manuals, so with this change, we can just drop the dependency. I've generated the chart by saving the python code in chart.py, then: $ ./chart.py --format=svg --font-size=3 > chart.svg Related: OS#2819, OS#4193 Depends: osmo-ci I754b133d77743582bd84c33c74ecc9eb9ca4c0ef Change-Id: I36b721f895caee9766528e14d854b6aa2a2fac85 --- A doc/manuals/images/osmux-expected-traffic-savings.svg M doc/manuals/osmux-reference.adoc 2 files changed, 824 insertions(+), 45 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/manuals/images/osmux-expected-traffic-savings.svg b/doc/manuals/images/osmux-expected-traffic-savings.svg new file mode 100644 index 0000000..2031c66 --- /dev/null +++ b/doc/manuals/images/osmux-expected-traffic-savings.svg @@ -0,0 +1,822 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + 2 + + 3 + + 4 + + 5 + + 6 + + 7 + + 8 + Concurrent calls + + + + + + + + + 10% + + 20% + + 30% + + 40% + + 50% + + 60% + + 70% + Traffic Saving + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bfactor 1 + + + + + + + bfactor 2 + + + + + + + bfactor 3 + + + + + + + bfactor 4 + + + + + + + bfactor 5 + + + + + + + bfactor 6 + + + + + + + bfactor 7 + + + + + + + bfactor 8 + + + + + + + + + + + diff --git a/doc/manuals/osmux-reference.adoc b/doc/manuals/osmux-reference.adoc index e28347a..a6c4085 100644 --- a/doc/manuals/osmux-reference.adoc +++ b/doc/manuals/osmux-reference.adoc @@ -503,51 +503,8 @@ number of concurrent numbers of callings for a given set of batching factor values: -["python2"] ----- -from pychart import * -theme.get_options() -theme.scale_factor = 5 -theme.use_color = 1 -theme.reinitialize() - -IP_HEADER=20 -UDP_HEADER=8 -RTP_HEADER=12 -OSMUX_HEADER=4 -AMR59_PAYLOAD=17 - -def osmux_get_size(calls, payloads): - return IP_HEADER + UDP_HEADER + (OSMUX_HEADER + AMR59_PAYLOAD * payloads) * calls - -def rtp_get_size(calls, payloads): - return calls * payloads * (IP_HEADER + UDP_HEADER + RTP_HEADER + AMR59_PAYLOAD) - -def calc_traffic_saving(calls, payloads): - return 100 - 100.0 * osmux_get_size(calls, payloads) / rtp_get_size(calls, payloads) - -# The first value in each tuple is the X value, and subsequent values are Y values for different lines. -def gen_table(): - data = [] - for calls in range(1, 9): - col = (calls,) - for factor in range(1, 9): - col += (calc_traffic_saving(calls, factor),) - data.append(col) - return data - -def do_plot(data): - xaxis = axis.X(format="/hL%d", tic_interval = 1, label="Concurrent calls") - yaxis = axis.Y(format="%d%%", tic_interval = 10, label="Traffic Saving") - ar = area.T(x_axis=xaxis, y_axis=yaxis, y_range=(None,None), x_grid_interval=1, x_grid_style=line_style.gray70_dash3) - for y in range(1, len(data[0])): - plot = line_plot.T(label="bfactor "+str(y), data=data, ycol=y, tick_mark=tick_mark.circle1) - ar.add_plot(plot) - ar.draw() - -data = gen_table() -do_plot(data) ----- +// Original python2 pychart code replaced with generated svg in I36b721f895caee9766528e14d854b6aa2a2fac85 +image::images/osmux-expected-traffic-savings.svg[] The results show a saving of 15.79% with only one concurrent call and with batching disabled (bfactor 1), that quickly improves with more concurrent calls -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16503 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I36b721f895caee9766528e14d854b6aa2a2fac85 Gerrit-Change-Number: 16503 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 13:19:19 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 6 Dec 2019 13:19:19 +0000 Subject: Change in osmo-gsm-manuals[master]: Drop python2 and pychart dependencies In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16504 ) Change subject: Drop python2 and pychart dependencies ...................................................................... Drop python2 and pychart dependencies Python 2 is EOL at the end of 2019, so don't depend on it anymore. Remove pychart support, because upstream is dead and there is no python3 version. We were only using it for one graph, and that has been replaced in osmo-bsc I36b721f895caee9766528e14d854b6aa2a2fac85. Depends: osmo-bsc I36b721f895caee9766528e14d854b6aa2a2fac85 Related: OS#2819 Change-Id: I57522e57e39682d6d123af4584785d327361e5a3 --- M INSTALL.txt M build/Makefile.asciidoc.inc M build/filter-wrapper.py D build/python2-filter.conf M build/unix-time-to-fmt.py M check-depends.sh M debian/control 7 files changed, 4 insertions(+), 41 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/INSTALL.txt b/INSTALL.txt index 3f4ef9f..d241fd2 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -9,7 +9,6 @@ docbook5-xml \ mscgen \ graphviz \ - python-pychart \ python3-nwdiag (Note that asciidoc-dblatex is required from debian 9 on and did not exist before.) diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 7cb660f..54969fc 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -37,7 +37,7 @@ CLEAN_FILES += $(ASCIIDOC_PDF) $(ASCIIDOC_NAME:%=%.html) UPLOAD_FILES += $(ASCIIDOC_PDF) -ASCIIDOC_OPTS := -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf -f $(BUILDDIR)/docinfo-releaseinfo.conf -f $(BUILDDIR)/python2-filter.conf -a srcdir='$(srcdir)' -a commondir='$(COMMONDIR)' +ASCIIDOC_OPTS := -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf -f $(BUILDDIR)/docinfo-releaseinfo.conf -a srcdir='$(srcdir)' -a commondir='$(COMMONDIR)' DBLATEX_OPTS := -s $(ASCIIDOCSTYLE) -P draft.mode=yes -P draft.watermark=0 ifeq (,$(BUILD_RELEASE)) diff --git a/build/filter-wrapper.py b/build/filter-wrapper.py index 82fec1b..83db291 100755 --- a/build/filter-wrapper.py +++ b/build/filter-wrapper.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/env python3 """Simple wrapper for filter programs which ensures that a blank is returned as output. The purpose is to silence the AsciiDoc warning "no output from filter". diff --git a/build/python2-filter.conf b/build/python2-filter.conf deleted file mode 100644 index 812c7c2..0000000 --- a/build/python2-filter.conf +++ /dev/null @@ -1,22 +0,0 @@ -# -# AsciiDoc mscgen filter configuration file. -# ${OSMO_GSM_MANUALS}/build is symlinked to ./build when building. -# - -[python2-filter-style] -python2-style=template="python2-block",subs=(),posattrs=("style","target"),filter='./build/filter-wrapper.py python2 - --output="{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}"' - -[blockdef-listing] -template::[python2-filter-style] - -[paradef-default] -template::[python2-filter-style] - -[python2-block] -template::[filter-image-pngsvg-blockmacro] - -[filter-image-pngsvg-blockmacro] -{target%}{counter2:target-number} -{target%}{set2:target:{docname}__{target-number}.{format={basebackend-docbook!png}{basebackend-docbook?png}}} -| -template::[image-blockmacro] diff --git a/build/unix-time-to-fmt.py b/build/unix-time-to-fmt.py index 72ece26..9e5e141 100755 --- a/build/unix-time-to-fmt.py +++ b/build/unix-time-to-fmt.py @@ -1,11 +1,11 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Usage: unix-time-to-fmt.py 1234567 [%Y-%m-%d[...]] Convert unix timestamp to a string of the given format in UTC, according to - https://docs.python.org/2/library/time.html + https://docs.python.org/3/library/time.html Default is '%Y-%b-%d' --> 2016-Jan-01 """ diff --git a/check-depends.sh b/check-depends.sh index d640abf..c841086 100755 --- a/check-depends.sh +++ b/check-depends.sh @@ -8,14 +8,6 @@ fi } -# $1: module name, $2: package name -check_dep_python2_module() { - if ! echo "import $1" | python2 - >/dev/null 2>&1; then - echo "Failed to import '$1' module, please install $2." - exit 1 - fi -} - check_dep_bin mscgen mscgen check_dep_bin xsltproc libxslt check_dep_bin a2x asciidoc @@ -23,7 +15,5 @@ check_dep_bin dblatex dblatex check_dep_bin packetdiag3 python3-nwdiag check_dep_bin dot graphviz -check_dep_bin python2 python2 -check_dep_python2_module pychart python2-pychart echo "All dependencies installed!" diff --git a/debian/control b/debian/control index afd09a3..fa44525 100644 --- a/debian/control +++ b/debian/control @@ -14,9 +14,7 @@ graphviz, libxml2-utils, mscgen, - python, python3-nwdiag, - python-pychart, xsltproc Standards-Version: 3.9.8 Homepage: https://git.osmocom.org/osmo-gsm-manuals/ @@ -31,9 +29,7 @@ graphviz, libxml2-utils, mscgen, - python, python3-nwdiag, - python-pychart, xsltproc Description: Osmocom manuals shared code All Osomocom repositories require this package to build their manuals. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I57522e57e39682d6d123af4584785d327361e5a3 Gerrit-Change-Number: 16504 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 13:19:28 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 6 Dec 2019 13:19:28 +0000 Subject: Change in osmo-ci[master]: docker: drop python2 In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16505 ) Change subject: docker: drop python2 ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16505 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iacace670bdb949e67227e0faa1765e36bba42018 Gerrit-Change-Number: 16505 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 06 Dec 2019 13:19:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 13:19:36 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 6 Dec 2019 13:19:36 +0000 Subject: Change in osmo-ci[master]: docker: drop python2 In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16505 ) Change subject: docker: drop python2 ...................................................................... docker: drop python2 Depends: osmo-python-tests Iabda95073faa2191fd117e9637e0858c589e9d9e Depends: osmo-gsm-manuals I57522e57e39682d6d123af4584785d327361e5a3 Related: OS#2819 Change-Id: Iacace670bdb949e67227e0faa1765e36bba42018 --- M docker/Dockerfile_osmocom_jenkins.amd64 1 file changed, 0 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Verified diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64 index 2209fc6..63b6e74 100644 --- a/docker/Dockerfile_osmocom_jenkins.amd64 +++ b/docker/Dockerfile_osmocom_jenkins.amd64 @@ -85,7 +85,6 @@ osc \ patchelf \ pkg-config \ - python \ python3 \ python3-gi \ python3-mako \ @@ -95,10 +94,6 @@ python3-setuptools \ python3-usb \ python3-yaml \ - python-minimal \ - python-pip \ - python-pychart \ - python-setuptools \ rsync \ sdcc \ sqlite3 \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16505 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iacace670bdb949e67227e0faa1765e36bba42018 Gerrit-Change-Number: 16505 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 14:04:20 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 14:04:20 +0000 Subject: Change in osmo-bsc[master]: gsm_04_80: Avoid using deprecated API In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16476 ) Change subject: gsm_04_80: Avoid using deprecated API ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I739158dec62cd5f0c2080fbb426af9c024baef87 Gerrit-Change-Number: 16476 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 06 Dec 2019 14:04:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 14:04:23 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 14:04:23 +0000 Subject: Change in osmo-bsc[master]: gsm_04_80: Avoid using deprecated API In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16476 ) Change subject: gsm_04_80: Avoid using deprecated API ...................................................................... gsm_04_80: Avoid using deprecated API gsm_04_80_utils.c: In function ?bsc_send_ussd_release_complete?: gsm_04_80_utils.c:37:9: warning: ?gsm0480_create_ussd_release_complete? is deprecated: Use gsm0480_create_release_complete() instead. [-Wdeprecated-declarations] 37 | struct msgb *msg = gsm0480_create_ussd_release_complete(); | ^~~~ CC gsm_data.o In file included from gsm_04_80_utils.c:22: /usr/local/include/osmocom/gsm/gsm0480.h:120:14: note: declared here 120 | struct msgb *gsm0480_create_ussd_release_complete(void) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The commit is not changing the existing logic/assumption: TID 0 should not be in use by anything else at the point the USSD is generated. Change-Id: I739158dec62cd5f0c2080fbb426af9c024baef87 --- M src/osmo-bsc/gsm_04_80_utils.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/gsm_04_80_utils.c b/src/osmo-bsc/gsm_04_80_utils.c index 8de1262..5ac0226 100644 --- a/src/osmo-bsc/gsm_04_80_utils.c +++ b/src/osmo-bsc/gsm_04_80_utils.c @@ -34,7 +34,8 @@ int bsc_send_ussd_release_complete(struct gsm_subscriber_connection *conn) { - struct msgb *msg = gsm0480_create_ussd_release_complete(); + /* ugly: we obviously don't know if TID 0 is currently in user for the given subscriber... */ + struct msgb *msg = gsm0480_create_release_complete(0); if (!msg) return -1; gscon_submit_rsl_dtap(conn, msg, 0, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I739158dec62cd5f0c2080fbb426af9c024baef87 Gerrit-Change-Number: 16476 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 14:32:27 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 6 Dec 2019 14:32:27 +0000 Subject: Change in osmo-hlr[master]: D-GSM 3/n: implement roaming by mslookup in osmo-hlr In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16258 ) Change subject: D-GSM 3/n: implement roaming by mslookup in osmo-hlr ...................................................................... Patch Set 12: Code-Review-2 (2 comments) the handling of a remote hlr being up is ugly, because it is 1:1 plugged to the proxy code. At least for SMS over GSUP delivery in D-GSM, it would be required to take a different action when a remote HLR is resolved. So this should be a generalized cb into which the proxy code plugs. implementing now... https://gerrit.osmocom.org/c/osmo-hlr/+/16258/12/src/remote_hlr.c File src/remote_hlr.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16258/12/src/remote_hlr.c at 104 PS12, Line 104: static bool remote_hlr_up_yield(struct proxy *proxy, const struct proxy_subscr *proxy_subscr, void *data) this cb directly ties to the proxy implementation https://gerrit.osmocom.org/c/osmo-hlr/+/16258/12/src/remote_hlr.c at 121 PS12, Line 121: proxy_subscrs_get_by_remote_hlr(g_hlr->gs->proxy, &remote_hlr->addr, remote_hlr_up_yield, remote_hlr); and here -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa Gerrit-Change-Number: 16258 Gerrit-PatchSet: 12 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 06 Dec 2019 14:32:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 14:58:38 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 6 Dec 2019 14:58:38 +0000 Subject: Change in ...osmo-python-tests[master]: Revert "Drop python2 support" References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16512 ) Change subject: Revert "Drop python2 support" ...................................................................... Revert "Drop python2 support" This reverts commit fb1dc7c405f6114687338382149bfc775597935a. I was under the impression, that all previous scripts were already working with python 3. But as it turns out, this isn't true. Reverting, so I can properly post follow-up patches, that fix the issues before we apply this "drop python2" patch again. Note that the explicit installation of python2 in the docker image we use for jenkins master/gerrit builds was removed in osmo-ci.git Iacace670bdb949e67227e0faa1765e36bba42018. However, it is still implictly installed, so reverting just this one patch for a few days until this is sorted out, should be enough. Related: OS#2819 Change-Id: Ic1559d1a9f7839fa86a841d62a04b22e1caed466 --- M contrib/jenkins.sh M debian/control M debian/rules M osmopy/__init__.py M osmopy/obscvty.py M osmopy/osmo_interact/__init__.py M osmopy/osmo_interact/common.py M osmopy/osmoutil.py M scripts/osmodumpdoc.py M scripts/osmotestconfig.py M scripts/osmotestvty.py M setup.py A tests/test_py2.py 13 files changed, 71 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/12/16512/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 9b219f9..08908a4 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -4,6 +4,16 @@ COM_FLAGS='-m compileall' +# FIXME: remove once python 2 support is deprecated +PY2=python2 +PY2_LIST="osmopy scripts/osmodumpdoc.py scripts/osmotestvty.py scripts/osmotestconfig.py" +$PY2 ./setup.py install +$PY2 tests/test_py2.py +for f in $PY2_LIST +do + $PY2 $COM_FLAGS $f +done + rm -rf ./build PY3=python3 PY3_LIST="osmopy scripts/osmo_ctrl.py scripts/osmo_rate_ctr2csv.py scripts/osmodumpdoc.py scripts/osmotestvty.py scripts/osmotestconfig.py scripts/osmo_interact_ctrl.py scripts/osmo_interact_vty.py scripts/osmo_verify_transcript_ctrl.py scripts/osmo_verify_transcript_vty.py scripts/soap.py scripts/twisted_ipa.py" diff --git a/debian/control b/debian/control index 1ad871d..52b614c 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,26 @@ Section: python Priority: optional Maintainer: Harald Welte -Build-Depends: debhelper (>= 9), dh-python, python3, python3-setuptools +Build-Depends: debhelper (>= 9), python, dh-python, python-setuptools, python3, python3-setuptools Standards-Version: 3.9.8 Homepage: http://git.osmocom.org/python/osmo-python-tests/ Vcs-Git: git://git.osmocom.org/python/osmo-python-tests Vcs-Browser: http://git.osmocom.org/python/osmo-python-tests/ +Package: python2-osmopy-libs +Architecture: all +Depends: ${python:Depends}, ${misc:Depends} +Description: Python code (not only) for testing of Osmocom programs + . + This package contains the Python 2 version of osmopy libraries. + +Package: python2-osmopy-utils +Architecture: all +Depends: ${python:Depends}, ${misc:Depends}, python2-osmopy-libs +Description: Python code (not only) for testing of Osmocom programs + . + This package contains the Python 2 version of osmopy utils. + Package: python3-osmopy-libs Architecture: all Depends: ${python3:Depends}, ${misc:Depends} diff --git a/debian/rules b/debian/rules index d0817c3..04b59f6 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,13 @@ #!/usr/bin/make -f %: - dh $@ --with python3 + dh $@ --with python2,python3 override_dh_auto_install: + python2 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python2-osmopy-libs + rm -rf $(CURDIR)/debian/python2-osmopy-libs/usr/bin + python2 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python2-osmopy-utils + rm -rf $(CURDIR)/debian/python2-osmopy-utils/usr/lib python3 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python3-osmopy-libs rm -rf $(CURDIR)/debian/python3-osmopy-libs/usr/bin python3 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python3-osmopy-utils diff --git a/osmopy/__init__.py b/osmopy/__init__.py index 18362ec..ce78caf 100644 --- a/osmopy/__init__.py +++ b/osmopy/__init__.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python __version__ = '0.1.0' __all__ = ['obscvty', 'osmoutil', 'osmo_ipa', 'osmo_interact', 'trap_helper', 'twisted_ipa'] diff --git a/osmopy/obscvty.py b/osmopy/obscvty.py index ab280c0..d39d3da 100755 --- a/osmopy/obscvty.py +++ b/osmopy/obscvty.py @@ -16,6 +16,7 @@ # # VTY helper code for OpenBSC # +from __future__ import print_function import re import socket import sys, subprocess diff --git a/osmopy/osmo_interact/__init__.py b/osmopy/osmo_interact/__init__.py index 036238a..4fc4fac 100644 --- a/osmopy/osmo_interact/__init__.py +++ b/osmopy/osmo_interact/__init__.py @@ -1,2 +1,2 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python __all__ = ['common', 'vty', 'ctrl'] diff --git a/osmopy/osmo_interact/common.py b/osmopy/osmo_interact/common.py index 87eca6a..cc7e190 100644 --- a/osmopy/osmo_interact/common.py +++ b/osmopy/osmo_interact/common.py @@ -24,6 +24,11 @@ vty.py and ctrl.py plug VTY and CTRL interface specific bits. ''' +# Our setup.py currently wants everything to be parsable by both py2 and py3. +# IMHO that is not a good idea, but until that changes, let's just keep this +# py2 legacy shim in here so we can syntax-check this py3 module with py2. +from __future__ import print_function + import argparse import sys import os diff --git a/osmopy/osmoutil.py b/osmopy/osmoutil.py index ec9c8c3..54a3456 100755 --- a/osmopy/osmoutil.py +++ b/osmopy/osmoutil.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify @@ -14,6 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +from __future__ import print_function import subprocess import os import sys diff --git a/scripts/osmodumpdoc.py b/scripts/osmodumpdoc.py index 64b088f..d71edc8 100755 --- a/scripts/osmodumpdoc.py +++ b/scripts/osmodumpdoc.py @@ -1,9 +1,10 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # Make sure this code is in sync with the BTS directory. # Fixes may need to be applied to both. """Start the process and dump the documentation to the doc dir.""" +from __future__ import print_function import subprocess import time import os diff --git a/scripts/osmotestconfig.py b/scripts/osmotestconfig.py index 70a32a4..f227504 100755 --- a/scripts/osmotestconfig.py +++ b/scripts/osmotestconfig.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify @@ -13,6 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +from __future__ import print_function import os import os.path import time diff --git a/scripts/osmotestvty.py b/scripts/osmotestvty.py index 600860f..55017a5 100755 --- a/scripts/osmotestvty.py +++ b/scripts/osmotestvty.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify @@ -13,6 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +from __future__ import print_function import os import time import unittest diff --git a/setup.py b/setup.py index ab604ce..69e18b0 100755 --- a/setup.py +++ b/setup.py @@ -19,20 +19,24 @@ from osmopy import __version__ import sys -scripts = [ - "scripts/osmodumpdoc.py", - "scripts/osmotestvty.py", - "scripts/osmotestconfig.py", - "scripts/osmo_ctrl.py", - "scripts/osmo_rate_ctr2csv.py", - "scripts/soap.py", - "scripts/ctrl2cgi.py", - "scripts/osmo_trap2cgi.py", - "scripts/osmo_interact_vty.py", - "scripts/osmo_interact_ctrl.py", - "scripts/osmo_verify_transcript_vty.py", - "scripts/osmo_verify_transcript_ctrl.py", - ] +if sys.version_info.major == 2: + scripts = [ + "scripts/osmodumpdoc.py", + "scripts/osmotestconfig.py", + "scripts/osmotestvty.py", + ] +elif sys.version_info.major == 3: + scripts = [ + "scripts/osmo_ctrl.py", + "scripts/osmo_rate_ctr2csv.py", + "scripts/soap.py", + "scripts/ctrl2cgi.py", + "scripts/osmo_trap2cgi.py", + "scripts/osmo_interact_vty.py", + "scripts/osmo_interact_ctrl.py", + "scripts/osmo_verify_transcript_vty.py", + "scripts/osmo_verify_transcript_ctrl.py", + ] setup( name = 'osmopython', diff --git a/tests/test_py2.py b/tests/test_py2.py new file mode 100644 index 0000000..cac5261 --- /dev/null +++ b/tests/test_py2.py @@ -0,0 +1,7 @@ +#!/usr/bin/env python2 + +# just import a smoke test for osmopy + +import osmopy + +print '[Python2] Smoke test PASSED.' -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16512 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Ic1559d1a9f7839fa86a841d62a04b22e1caed466 Gerrit-Change-Number: 16512 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 15:05:16 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 6 Dec 2019 15:05:16 +0000 Subject: Change in osmo-ci[master]: Revert "docker: drop python2" References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16513 ) Change subject: Revert "docker: drop python2" ...................................................................... Revert "docker: drop python2" This reverts commit 9097082be5f335cc5e15e7c30b352d1b9a9d0b1c. I was under the impression, that all previous scripts in osmo-python-tests were already working with python 3. But as it turns out, this isn't true. Reverting, so I can properly post follow-up patches, that fix the issues before we apply this "drop python2" patch again. Related: OS#2819 Change-Id: Iab7768a77a55fd0465244460bd7488858dd69b60 --- M docker/Dockerfile_osmocom_jenkins.amd64 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/13/16513/1 diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64 index 63b6e74..2209fc6 100644 --- a/docker/Dockerfile_osmocom_jenkins.amd64 +++ b/docker/Dockerfile_osmocom_jenkins.amd64 @@ -85,6 +85,7 @@ osc \ patchelf \ pkg-config \ + python \ python3 \ python3-gi \ python3-mako \ @@ -94,6 +95,10 @@ python3-setuptools \ python3-usb \ python3-yaml \ + python-minimal \ + python-pip \ + python-pychart \ + python-setuptools \ rsync \ sdcc \ sqlite3 \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16513 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iab7768a77a55fd0465244460bd7488858dd69b60 Gerrit-Change-Number: 16513 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 15:05:49 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 6 Dec 2019 15:05:49 +0000 Subject: Change in osmo-ci[master]: Revert "docker: drop python2" In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16513 ) Change subject: Revert "docker: drop python2" ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16513 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iab7768a77a55fd0465244460bd7488858dd69b60 Gerrit-Change-Number: 16513 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 06 Dec 2019 15:05:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 15:05:56 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 6 Dec 2019 15:05:56 +0000 Subject: Change in osmo-ci[master]: Revert "docker: drop python2" In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16513 ) Change subject: Revert "docker: drop python2" ...................................................................... Revert "docker: drop python2" This reverts commit 9097082be5f335cc5e15e7c30b352d1b9a9d0b1c. I was under the impression, that all previous scripts in osmo-python-tests were already working with python 3. But as it turns out, this isn't true. Reverting, so I can properly post follow-up patches, that fix the issues before we apply this "drop python2" patch again. Related: OS#2819 Change-Id: Iab7768a77a55fd0465244460bd7488858dd69b60 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved; Verified -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16513 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iab7768a77a55fd0465244460bd7488858dd69b60 Gerrit-Change-Number: 16513 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 15:12:58 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 6 Dec 2019 15:12:58 +0000 Subject: Change in ...osmo-python-tests[master]: Revert "Drop python2 support" In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16512 to look at the new patch set (#2). Change subject: Revert "Drop python2 support" ...................................................................... Revert "Drop python2 support" This reverts commit fb1dc7c405f6114687338382149bfc775597935a. I was under the impression, that all previous scripts were already working with python 3. But as it turns out, this isn't true. Reverting, so I can properly post follow-up patches, that fix the issues before we apply this "drop python2" patch again. Related: OS#2819 Change-Id: Ic1559d1a9f7839fa86a841d62a04b22e1caed466 --- M contrib/jenkins.sh M debian/control M debian/rules M osmopy/__init__.py M osmopy/obscvty.py M osmopy/osmo_interact/__init__.py M osmopy/osmo_interact/common.py M osmopy/osmoutil.py M scripts/osmodumpdoc.py M scripts/osmotestconfig.py M scripts/osmotestvty.py M setup.py A tests/test_py2.py 13 files changed, 71 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/12/16512/2 -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16512 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Ic1559d1a9f7839fa86a841d62a04b22e1caed466 Gerrit-Change-Number: 16512 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 15:13:36 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 6 Dec 2019 15:13:36 +0000 Subject: Change in ...osmo-python-tests[master]: Revert "Drop python2 support" In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16512 ) Change subject: Revert "Drop python2 support" ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16512 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Ic1559d1a9f7839fa86a841d62a04b22e1caed466 Gerrit-Change-Number: 16512 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 06 Dec 2019 15:13:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 15:13:43 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 6 Dec 2019 15:13:43 +0000 Subject: Change in ...osmo-python-tests[master]: Revert "Drop python2 support" In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16512 ) Change subject: Revert "Drop python2 support" ...................................................................... Revert "Drop python2 support" This reverts commit fb1dc7c405f6114687338382149bfc775597935a. I was under the impression, that all previous scripts were already working with python 3. But as it turns out, this isn't true. Reverting, so I can properly post follow-up patches, that fix the issues before we apply this "drop python2" patch again. Related: OS#2819 Change-Id: Ic1559d1a9f7839fa86a841d62a04b22e1caed466 --- M contrib/jenkins.sh M debian/control M debian/rules M osmopy/__init__.py M osmopy/obscvty.py M osmopy/osmo_interact/__init__.py M osmopy/osmo_interact/common.py M osmopy/osmoutil.py M scripts/osmodumpdoc.py M scripts/osmotestconfig.py M scripts/osmotestvty.py M setup.py A tests/test_py2.py 13 files changed, 71 insertions(+), 22 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 9b219f9..08908a4 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -4,6 +4,16 @@ COM_FLAGS='-m compileall' +# FIXME: remove once python 2 support is deprecated +PY2=python2 +PY2_LIST="osmopy scripts/osmodumpdoc.py scripts/osmotestvty.py scripts/osmotestconfig.py" +$PY2 ./setup.py install +$PY2 tests/test_py2.py +for f in $PY2_LIST +do + $PY2 $COM_FLAGS $f +done + rm -rf ./build PY3=python3 PY3_LIST="osmopy scripts/osmo_ctrl.py scripts/osmo_rate_ctr2csv.py scripts/osmodumpdoc.py scripts/osmotestvty.py scripts/osmotestconfig.py scripts/osmo_interact_ctrl.py scripts/osmo_interact_vty.py scripts/osmo_verify_transcript_ctrl.py scripts/osmo_verify_transcript_vty.py scripts/soap.py scripts/twisted_ipa.py" diff --git a/debian/control b/debian/control index 1ad871d..52b614c 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,26 @@ Section: python Priority: optional Maintainer: Harald Welte -Build-Depends: debhelper (>= 9), dh-python, python3, python3-setuptools +Build-Depends: debhelper (>= 9), python, dh-python, python-setuptools, python3, python3-setuptools Standards-Version: 3.9.8 Homepage: http://git.osmocom.org/python/osmo-python-tests/ Vcs-Git: git://git.osmocom.org/python/osmo-python-tests Vcs-Browser: http://git.osmocom.org/python/osmo-python-tests/ +Package: python2-osmopy-libs +Architecture: all +Depends: ${python:Depends}, ${misc:Depends} +Description: Python code (not only) for testing of Osmocom programs + . + This package contains the Python 2 version of osmopy libraries. + +Package: python2-osmopy-utils +Architecture: all +Depends: ${python:Depends}, ${misc:Depends}, python2-osmopy-libs +Description: Python code (not only) for testing of Osmocom programs + . + This package contains the Python 2 version of osmopy utils. + Package: python3-osmopy-libs Architecture: all Depends: ${python3:Depends}, ${misc:Depends} diff --git a/debian/rules b/debian/rules index d0817c3..04b59f6 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,13 @@ #!/usr/bin/make -f %: - dh $@ --with python3 + dh $@ --with python2,python3 override_dh_auto_install: + python2 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python2-osmopy-libs + rm -rf $(CURDIR)/debian/python2-osmopy-libs/usr/bin + python2 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python2-osmopy-utils + rm -rf $(CURDIR)/debian/python2-osmopy-utils/usr/lib python3 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python3-osmopy-libs rm -rf $(CURDIR)/debian/python3-osmopy-libs/usr/bin python3 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python3-osmopy-utils diff --git a/osmopy/__init__.py b/osmopy/__init__.py index 18362ec..ce78caf 100644 --- a/osmopy/__init__.py +++ b/osmopy/__init__.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python __version__ = '0.1.0' __all__ = ['obscvty', 'osmoutil', 'osmo_ipa', 'osmo_interact', 'trap_helper', 'twisted_ipa'] diff --git a/osmopy/obscvty.py b/osmopy/obscvty.py index ab280c0..d39d3da 100755 --- a/osmopy/obscvty.py +++ b/osmopy/obscvty.py @@ -16,6 +16,7 @@ # # VTY helper code for OpenBSC # +from __future__ import print_function import re import socket import sys, subprocess diff --git a/osmopy/osmo_interact/__init__.py b/osmopy/osmo_interact/__init__.py index 036238a..4fc4fac 100644 --- a/osmopy/osmo_interact/__init__.py +++ b/osmopy/osmo_interact/__init__.py @@ -1,2 +1,2 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python __all__ = ['common', 'vty', 'ctrl'] diff --git a/osmopy/osmo_interact/common.py b/osmopy/osmo_interact/common.py index 87eca6a..cc7e190 100644 --- a/osmopy/osmo_interact/common.py +++ b/osmopy/osmo_interact/common.py @@ -24,6 +24,11 @@ vty.py and ctrl.py plug VTY and CTRL interface specific bits. ''' +# Our setup.py currently wants everything to be parsable by both py2 and py3. +# IMHO that is not a good idea, but until that changes, let's just keep this +# py2 legacy shim in here so we can syntax-check this py3 module with py2. +from __future__ import print_function + import argparse import sys import os diff --git a/osmopy/osmoutil.py b/osmopy/osmoutil.py index ec9c8c3..54a3456 100755 --- a/osmopy/osmoutil.py +++ b/osmopy/osmoutil.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify @@ -14,6 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +from __future__ import print_function import subprocess import os import sys diff --git a/scripts/osmodumpdoc.py b/scripts/osmodumpdoc.py index 64b088f..d71edc8 100755 --- a/scripts/osmodumpdoc.py +++ b/scripts/osmodumpdoc.py @@ -1,9 +1,10 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # Make sure this code is in sync with the BTS directory. # Fixes may need to be applied to both. """Start the process and dump the documentation to the doc dir.""" +from __future__ import print_function import subprocess import time import os diff --git a/scripts/osmotestconfig.py b/scripts/osmotestconfig.py index 70a32a4..f227504 100755 --- a/scripts/osmotestconfig.py +++ b/scripts/osmotestconfig.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify @@ -13,6 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +from __future__ import print_function import os import os.path import time diff --git a/scripts/osmotestvty.py b/scripts/osmotestvty.py index 600860f..55017a5 100755 --- a/scripts/osmotestvty.py +++ b/scripts/osmotestvty.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify @@ -13,6 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +from __future__ import print_function import os import time import unittest diff --git a/setup.py b/setup.py index ab604ce..69e18b0 100755 --- a/setup.py +++ b/setup.py @@ -19,20 +19,24 @@ from osmopy import __version__ import sys -scripts = [ - "scripts/osmodumpdoc.py", - "scripts/osmotestvty.py", - "scripts/osmotestconfig.py", - "scripts/osmo_ctrl.py", - "scripts/osmo_rate_ctr2csv.py", - "scripts/soap.py", - "scripts/ctrl2cgi.py", - "scripts/osmo_trap2cgi.py", - "scripts/osmo_interact_vty.py", - "scripts/osmo_interact_ctrl.py", - "scripts/osmo_verify_transcript_vty.py", - "scripts/osmo_verify_transcript_ctrl.py", - ] +if sys.version_info.major == 2: + scripts = [ + "scripts/osmodumpdoc.py", + "scripts/osmotestconfig.py", + "scripts/osmotestvty.py", + ] +elif sys.version_info.major == 3: + scripts = [ + "scripts/osmo_ctrl.py", + "scripts/osmo_rate_ctr2csv.py", + "scripts/soap.py", + "scripts/ctrl2cgi.py", + "scripts/osmo_trap2cgi.py", + "scripts/osmo_interact_vty.py", + "scripts/osmo_interact_ctrl.py", + "scripts/osmo_verify_transcript_vty.py", + "scripts/osmo_verify_transcript_ctrl.py", + ] setup( name = 'osmopython', diff --git a/tests/test_py2.py b/tests/test_py2.py new file mode 100644 index 0000000..cac5261 --- /dev/null +++ b/tests/test_py2.py @@ -0,0 +1,7 @@ +#!/usr/bin/env python2 + +# just import a smoke test for osmopy + +import osmopy + +print '[Python2] Smoke test PASSED.' -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16512 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Ic1559d1a9f7839fa86a841d62a04b22e1caed466 Gerrit-Change-Number: 16512 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 17:48:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 17:48:18 +0000 Subject: Change in simtrace2[master]: qmod DFU: Don't overwrite memory beyond end of usb_strings[] References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16514 ) Change subject: qmod DFU: Don't overwrite memory beyond end of usb_strings[] ...................................................................... qmod DFU: Don't overwrite memory beyond end of usb_strings[] The code in board_main_top() for QMOD blindly re-assigned some members of the usb_strings[] array, writing to index 7 and 8. However, that array only has those entries in the main firmware, while in DFU that array has only 6 entries. Depending on whatever the linker has decided to put in the next memory location after that array, we would overwrite that very early during boot-up. Change-Id: I59e4e1a54e819808d5a8259a6d14f4b970a90020 Related: OS#4302 --- M firmware/libboard/qmod/source/board_qmod.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/14/16514/1 diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c index 0565c92..0b03180 100644 --- a/firmware/libboard/qmod/source/board_qmod.c +++ b/firmware/libboard/qmod/source/board_qmod.c @@ -332,11 +332,13 @@ TRACE_INFO("Detected Quad-Modem ST12\n\r"); } else { TRACE_INFO("Detected Quad-Modem ST34\n\r"); +#ifndef APPLICATION_dfu /* make sure we use the second set of USB Strings * calling the interfaces "Modem 3" and "Modem 4" rather * than 1+2 */ usb_strings[7] = usb_strings[9]; usb_strings[8] = usb_strings[10]; +#endif } /* Obtain the circuit board version (currently just prints voltage */ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16514 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I59e4e1a54e819808d5a8259a6d14f4b970a90020 Gerrit-Change-Number: 16514 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 17:59:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 17:59:59 +0000 Subject: Change in simtrace2[master]: qmod DFU: Don't overwrite memory beyond end of usb_strings[] In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16514 ) Change subject: qmod DFU: Don't overwrite memory beyond end of usb_strings[] ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16514 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I59e4e1a54e819808d5a8259a6d14f4b970a90020 Gerrit-Change-Number: 16514 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Dec 2019 17:59:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 18:00:02 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 18:00:02 +0000 Subject: Change in simtrace2[master]: qmod DFU: Don't overwrite memory beyond end of usb_strings[] In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16514 ) Change subject: qmod DFU: Don't overwrite memory beyond end of usb_strings[] ...................................................................... qmod DFU: Don't overwrite memory beyond end of usb_strings[] The code in board_main_top() for QMOD blindly re-assigned some members of the usb_strings[] array, writing to index 7 and 8. However, that array only has those entries in the main firmware, while in DFU that array has only 6 entries. Depending on whatever the linker has decided to put in the next memory location after that array, we would overwrite that very early during boot-up. Change-Id: I59e4e1a54e819808d5a8259a6d14f4b970a90020 Related: OS#4302 --- M firmware/libboard/qmod/source/board_qmod.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c index 0565c92..0b03180 100644 --- a/firmware/libboard/qmod/source/board_qmod.c +++ b/firmware/libboard/qmod/source/board_qmod.c @@ -332,11 +332,13 @@ TRACE_INFO("Detected Quad-Modem ST12\n\r"); } else { TRACE_INFO("Detected Quad-Modem ST34\n\r"); +#ifndef APPLICATION_dfu /* make sure we use the second set of USB Strings * calling the interfaces "Modem 3" and "Modem 4" rather * than 1+2 */ usb_strings[7] = usb_strings[9]; usb_strings[8] = usb_strings[10]; +#endif } /* Obtain the circuit board version (currently just prints voltage */ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16514 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I59e4e1a54e819808d5a8259a6d14f4b970a90020 Gerrit-Change-Number: 16514 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 18:20:21 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 18:20:21 +0000 Subject: Change in simtrace2[master]: usb_strings.txt: s/SIMtrace Phone/SIMtrace Card Emulation/ References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16515 ) Change subject: usb_strings.txt: s/SIMtrace Phone/SIMtrace Card Emulation/ ...................................................................... usb_strings.txt: s/SIMtrace Phone/SIMtrace Card Emulation/ This string dates back to some very early naming; let's reflect how we have been calling this in reality for quite some time now. Change-Id: I5a7497188385706a1e924784073c619fa9bfdd60 --- M firmware/apps/cardem/usb_strings.txt M firmware/apps/freq_ctr/usb_strings.txt M firmware/apps/gpio_test/usb_strings.txt M firmware/apps/trace/usb_strings.txt 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/15/16515/1 diff --git a/firmware/apps/cardem/usb_strings.txt b/firmware/apps/cardem/usb_strings.txt index 0e797ac..f0cd24c 100644 --- a/firmware/apps/cardem/usb_strings.txt +++ b/firmware/apps/cardem/usb_strings.txt @@ -2,7 +2,7 @@ SIMtrace 2 compatible device SIMtrace Sniffer SIMtrace CCID -SIMtrace Phone +SIMtrace Card Emulation SIMtrace MITM CardEmulator Modem 1 CardEmulator Modem 2 diff --git a/firmware/apps/freq_ctr/usb_strings.txt b/firmware/apps/freq_ctr/usb_strings.txt index 0e797ac..f0cd24c 100644 --- a/firmware/apps/freq_ctr/usb_strings.txt +++ b/firmware/apps/freq_ctr/usb_strings.txt @@ -2,7 +2,7 @@ SIMtrace 2 compatible device SIMtrace Sniffer SIMtrace CCID -SIMtrace Phone +SIMtrace Card Emulation SIMtrace MITM CardEmulator Modem 1 CardEmulator Modem 2 diff --git a/firmware/apps/gpio_test/usb_strings.txt b/firmware/apps/gpio_test/usb_strings.txt index 0e797ac..f0cd24c 100644 --- a/firmware/apps/gpio_test/usb_strings.txt +++ b/firmware/apps/gpio_test/usb_strings.txt @@ -2,7 +2,7 @@ SIMtrace 2 compatible device SIMtrace Sniffer SIMtrace CCID -SIMtrace Phone +SIMtrace Card Emulation SIMtrace MITM CardEmulator Modem 1 CardEmulator Modem 2 diff --git a/firmware/apps/trace/usb_strings.txt b/firmware/apps/trace/usb_strings.txt index 0e797ac..f0cd24c 100644 --- a/firmware/apps/trace/usb_strings.txt +++ b/firmware/apps/trace/usb_strings.txt @@ -2,7 +2,7 @@ SIMtrace 2 compatible device SIMtrace Sniffer SIMtrace CCID -SIMtrace Phone +SIMtrace Card Emulation SIMtrace MITM CardEmulator Modem 1 CardEmulator Modem 2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16515 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I5a7497188385706a1e924784073c619fa9bfdd60 Gerrit-Change-Number: 16515 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 18:20:22 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 18:20:22 +0000 Subject: Change in simtrace2[master]: Patch actual board name into the USB iProduct string descriptor References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16516 ) Change subject: Patch actual board name into the USB iProduct string descriptor ...................................................................... Patch actual board name into the USB iProduct string descriptor "SIMtrace 2 compatible device" is pretty generic. Let's have the actual board name inside the string descriptors, giving a more user friendly experience in case users are issuing 'lsusb' and the like. Change-Id: Ibcc338b504bd2a1605e31d7f5eadb7161f547c6a --- M firmware/Makefile M firmware/apps/cardem/usb_strings.txt M firmware/apps/dfu/usb_strings.txt M firmware/apps/freq_ctr/usb_strings.txt M firmware/apps/gpio_test/usb_strings.txt M firmware/apps/trace/usb_strings.txt A firmware/libboard/octsimtest/product_string.txt A firmware/libboard/owhw/product_string.txt A firmware/libboard/qmod/product_string.txt A firmware/libboard/simtrace/product_string.txt 10 files changed, 15 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/16/16516/1 diff --git a/firmware/Makefile b/firmware/Makefile index 4318e2d..a684424 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -195,7 +195,11 @@ usbstring/usbstring: usbstring/usbstring.c gcc $^ -o $@ -apps/$(APP)/usb_strings_generated.h: apps/$(APP)/usb_strings.txt usbstring/usbstring +.PHONY: apps/$(APP)/usb_strings.txt.patched +apps/$(APP)/usb_strings.txt.patched: apps/$(APP)/usb_strings.txt + sed "s/PRODUCT_STRING/$(shell cat libboard/$(BOARD)/product_string.txt)/" $< > $@ + +apps/$(APP)/usb_strings_generated.h: apps/$(APP)/usb_strings.txt.patched usbstring/usbstring cat $< | usbstring/usbstring > $@ define RULES @@ -235,6 +239,7 @@ lsof $(SERIAL) && echo "log is already opened" || ( sed -u "s/\r//" $(SERIAL) | ts ) clean: + -rm -f apps/$(APP)/usb_strings.txt.patched -rm -fR $(OBJ)/*.o $(BIN)/*.bin $(BIN)/*.elf $(BIN)/*.elf.txt $(BIN)/*.map $(BIN)/*.lst `find . -name \*.p` install: diff --git a/firmware/apps/cardem/usb_strings.txt b/firmware/apps/cardem/usb_strings.txt index f0cd24c..3a1bcc3 100644 --- a/firmware/apps/cardem/usb_strings.txt +++ b/firmware/apps/cardem/usb_strings.txt @@ -1,5 +1,5 @@ sysmocom - s.f.m.c. GmbH -SIMtrace 2 compatible device +PRODUCT_STRING SIMtrace Sniffer SIMtrace CCID SIMtrace Card Emulation diff --git a/firmware/apps/dfu/usb_strings.txt b/firmware/apps/dfu/usb_strings.txt index 8a4facb..f1c79bc 100644 --- a/firmware/apps/dfu/usb_strings.txt +++ b/firmware/apps/dfu/usb_strings.txt @@ -1,5 +1,5 @@ sysmocom - s.f.m.c. GmbH -SIMtrace 2 compatible device +PRODUCT_STRING DFU (Device Firmware Upgrade) RAM Flash (Application Partition) diff --git a/firmware/apps/freq_ctr/usb_strings.txt b/firmware/apps/freq_ctr/usb_strings.txt index f0cd24c..3a1bcc3 100644 --- a/firmware/apps/freq_ctr/usb_strings.txt +++ b/firmware/apps/freq_ctr/usb_strings.txt @@ -1,5 +1,5 @@ sysmocom - s.f.m.c. GmbH -SIMtrace 2 compatible device +PRODUCT_STRING SIMtrace Sniffer SIMtrace CCID SIMtrace Card Emulation diff --git a/firmware/apps/gpio_test/usb_strings.txt b/firmware/apps/gpio_test/usb_strings.txt index f0cd24c..3a1bcc3 100644 --- a/firmware/apps/gpio_test/usb_strings.txt +++ b/firmware/apps/gpio_test/usb_strings.txt @@ -1,5 +1,5 @@ sysmocom - s.f.m.c. GmbH -SIMtrace 2 compatible device +PRODUCT_STRING SIMtrace Sniffer SIMtrace CCID SIMtrace Card Emulation diff --git a/firmware/apps/trace/usb_strings.txt b/firmware/apps/trace/usb_strings.txt index f0cd24c..3a1bcc3 100644 --- a/firmware/apps/trace/usb_strings.txt +++ b/firmware/apps/trace/usb_strings.txt @@ -1,5 +1,5 @@ sysmocom - s.f.m.c. GmbH -SIMtrace 2 compatible device +PRODUCT_STRING SIMtrace Sniffer SIMtrace CCID SIMtrace Card Emulation diff --git a/firmware/libboard/octsimtest/product_string.txt b/firmware/libboard/octsimtest/product_string.txt new file mode 100644 index 0000000..83cbcf5 --- /dev/null +++ b/firmware/libboard/octsimtest/product_string.txt @@ -0,0 +1 @@ +sysmoOCTSIM-Tester diff --git a/firmware/libboard/owhw/product_string.txt b/firmware/libboard/owhw/product_string.txt new file mode 100644 index 0000000..77c3b1b --- /dev/null +++ b/firmware/libboard/owhw/product_string.txt @@ -0,0 +1 @@ +OWHW diff --git a/firmware/libboard/qmod/product_string.txt b/firmware/libboard/qmod/product_string.txt new file mode 100644 index 0000000..2407b9d --- /dev/null +++ b/firmware/libboard/qmod/product_string.txt @@ -0,0 +1 @@ +sysmoQMOD (Quad Modem) diff --git a/firmware/libboard/simtrace/product_string.txt b/firmware/libboard/simtrace/product_string.txt new file mode 100644 index 0000000..5634f3a --- /dev/null +++ b/firmware/libboard/simtrace/product_string.txt @@ -0,0 +1 @@ +SIMtrace 2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ibcc338b504bd2a1605e31d7f5eadb7161f547c6a Gerrit-Change-Number: 16516 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 18:48:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 18:48:12 +0000 Subject: Change in simtrace2[master]: usb_strings.txt: s/SIMtrace Phone/SIMtrace Card Emulation/ In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16515 ) Change subject: usb_strings.txt: s/SIMtrace Phone/SIMtrace Card Emulation/ ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16515 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I5a7497188385706a1e924784073c619fa9bfdd60 Gerrit-Change-Number: 16515 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Dec 2019 18:48:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 18:48:14 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 18:48:14 +0000 Subject: Change in simtrace2[master]: Patch actual board name into the USB iProduct string descriptor In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16516 ) Change subject: Patch actual board name into the USB iProduct string descriptor ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ibcc338b504bd2a1605e31d7f5eadb7161f547c6a Gerrit-Change-Number: 16516 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Dec 2019 18:48:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 18:48:15 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 18:48:15 +0000 Subject: Change in simtrace2[master]: usb_strings.txt: s/SIMtrace Phone/SIMtrace Card Emulation/ In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16515 ) Change subject: usb_strings.txt: s/SIMtrace Phone/SIMtrace Card Emulation/ ...................................................................... usb_strings.txt: s/SIMtrace Phone/SIMtrace Card Emulation/ This string dates back to some very early naming; let's reflect how we have been calling this in reality for quite some time now. Change-Id: I5a7497188385706a1e924784073c619fa9bfdd60 --- M firmware/apps/cardem/usb_strings.txt M firmware/apps/freq_ctr/usb_strings.txt M firmware/apps/gpio_test/usb_strings.txt M firmware/apps/trace/usb_strings.txt 4 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/apps/cardem/usb_strings.txt b/firmware/apps/cardem/usb_strings.txt index 0e797ac..f0cd24c 100644 --- a/firmware/apps/cardem/usb_strings.txt +++ b/firmware/apps/cardem/usb_strings.txt @@ -2,7 +2,7 @@ SIMtrace 2 compatible device SIMtrace Sniffer SIMtrace CCID -SIMtrace Phone +SIMtrace Card Emulation SIMtrace MITM CardEmulator Modem 1 CardEmulator Modem 2 diff --git a/firmware/apps/freq_ctr/usb_strings.txt b/firmware/apps/freq_ctr/usb_strings.txt index 0e797ac..f0cd24c 100644 --- a/firmware/apps/freq_ctr/usb_strings.txt +++ b/firmware/apps/freq_ctr/usb_strings.txt @@ -2,7 +2,7 @@ SIMtrace 2 compatible device SIMtrace Sniffer SIMtrace CCID -SIMtrace Phone +SIMtrace Card Emulation SIMtrace MITM CardEmulator Modem 1 CardEmulator Modem 2 diff --git a/firmware/apps/gpio_test/usb_strings.txt b/firmware/apps/gpio_test/usb_strings.txt index 0e797ac..f0cd24c 100644 --- a/firmware/apps/gpio_test/usb_strings.txt +++ b/firmware/apps/gpio_test/usb_strings.txt @@ -2,7 +2,7 @@ SIMtrace 2 compatible device SIMtrace Sniffer SIMtrace CCID -SIMtrace Phone +SIMtrace Card Emulation SIMtrace MITM CardEmulator Modem 1 CardEmulator Modem 2 diff --git a/firmware/apps/trace/usb_strings.txt b/firmware/apps/trace/usb_strings.txt index 0e797ac..f0cd24c 100644 --- a/firmware/apps/trace/usb_strings.txt +++ b/firmware/apps/trace/usb_strings.txt @@ -2,7 +2,7 @@ SIMtrace 2 compatible device SIMtrace Sniffer SIMtrace CCID -SIMtrace Phone +SIMtrace Card Emulation SIMtrace MITM CardEmulator Modem 1 CardEmulator Modem 2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16515 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I5a7497188385706a1e924784073c619fa9bfdd60 Gerrit-Change-Number: 16515 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 18:48:15 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 18:48:15 +0000 Subject: Change in simtrace2[master]: Patch actual board name into the USB iProduct string descriptor In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16516 ) Change subject: Patch actual board name into the USB iProduct string descriptor ...................................................................... Patch actual board name into the USB iProduct string descriptor "SIMtrace 2 compatible device" is pretty generic. Let's have the actual board name inside the string descriptors, giving a more user friendly experience in case users are issuing 'lsusb' and the like. Change-Id: Ibcc338b504bd2a1605e31d7f5eadb7161f547c6a --- M firmware/Makefile M firmware/apps/cardem/usb_strings.txt M firmware/apps/dfu/usb_strings.txt M firmware/apps/freq_ctr/usb_strings.txt M firmware/apps/gpio_test/usb_strings.txt M firmware/apps/trace/usb_strings.txt A firmware/libboard/octsimtest/product_string.txt A firmware/libboard/owhw/product_string.txt A firmware/libboard/qmod/product_string.txt A firmware/libboard/simtrace/product_string.txt 10 files changed, 15 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/Makefile b/firmware/Makefile index 4318e2d..a684424 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -195,7 +195,11 @@ usbstring/usbstring: usbstring/usbstring.c gcc $^ -o $@ -apps/$(APP)/usb_strings_generated.h: apps/$(APP)/usb_strings.txt usbstring/usbstring +.PHONY: apps/$(APP)/usb_strings.txt.patched +apps/$(APP)/usb_strings.txt.patched: apps/$(APP)/usb_strings.txt + sed "s/PRODUCT_STRING/$(shell cat libboard/$(BOARD)/product_string.txt)/" $< > $@ + +apps/$(APP)/usb_strings_generated.h: apps/$(APP)/usb_strings.txt.patched usbstring/usbstring cat $< | usbstring/usbstring > $@ define RULES @@ -235,6 +239,7 @@ lsof $(SERIAL) && echo "log is already opened" || ( sed -u "s/\r//" $(SERIAL) | ts ) clean: + -rm -f apps/$(APP)/usb_strings.txt.patched -rm -fR $(OBJ)/*.o $(BIN)/*.bin $(BIN)/*.elf $(BIN)/*.elf.txt $(BIN)/*.map $(BIN)/*.lst `find . -name \*.p` install: diff --git a/firmware/apps/cardem/usb_strings.txt b/firmware/apps/cardem/usb_strings.txt index f0cd24c..3a1bcc3 100644 --- a/firmware/apps/cardem/usb_strings.txt +++ b/firmware/apps/cardem/usb_strings.txt @@ -1,5 +1,5 @@ sysmocom - s.f.m.c. GmbH -SIMtrace 2 compatible device +PRODUCT_STRING SIMtrace Sniffer SIMtrace CCID SIMtrace Card Emulation diff --git a/firmware/apps/dfu/usb_strings.txt b/firmware/apps/dfu/usb_strings.txt index 8a4facb..f1c79bc 100644 --- a/firmware/apps/dfu/usb_strings.txt +++ b/firmware/apps/dfu/usb_strings.txt @@ -1,5 +1,5 @@ sysmocom - s.f.m.c. GmbH -SIMtrace 2 compatible device +PRODUCT_STRING DFU (Device Firmware Upgrade) RAM Flash (Application Partition) diff --git a/firmware/apps/freq_ctr/usb_strings.txt b/firmware/apps/freq_ctr/usb_strings.txt index f0cd24c..3a1bcc3 100644 --- a/firmware/apps/freq_ctr/usb_strings.txt +++ b/firmware/apps/freq_ctr/usb_strings.txt @@ -1,5 +1,5 @@ sysmocom - s.f.m.c. GmbH -SIMtrace 2 compatible device +PRODUCT_STRING SIMtrace Sniffer SIMtrace CCID SIMtrace Card Emulation diff --git a/firmware/apps/gpio_test/usb_strings.txt b/firmware/apps/gpio_test/usb_strings.txt index f0cd24c..3a1bcc3 100644 --- a/firmware/apps/gpio_test/usb_strings.txt +++ b/firmware/apps/gpio_test/usb_strings.txt @@ -1,5 +1,5 @@ sysmocom - s.f.m.c. GmbH -SIMtrace 2 compatible device +PRODUCT_STRING SIMtrace Sniffer SIMtrace CCID SIMtrace Card Emulation diff --git a/firmware/apps/trace/usb_strings.txt b/firmware/apps/trace/usb_strings.txt index f0cd24c..3a1bcc3 100644 --- a/firmware/apps/trace/usb_strings.txt +++ b/firmware/apps/trace/usb_strings.txt @@ -1,5 +1,5 @@ sysmocom - s.f.m.c. GmbH -SIMtrace 2 compatible device +PRODUCT_STRING SIMtrace Sniffer SIMtrace CCID SIMtrace Card Emulation diff --git a/firmware/libboard/octsimtest/product_string.txt b/firmware/libboard/octsimtest/product_string.txt new file mode 100644 index 0000000..83cbcf5 --- /dev/null +++ b/firmware/libboard/octsimtest/product_string.txt @@ -0,0 +1 @@ +sysmoOCTSIM-Tester diff --git a/firmware/libboard/owhw/product_string.txt b/firmware/libboard/owhw/product_string.txt new file mode 100644 index 0000000..77c3b1b --- /dev/null +++ b/firmware/libboard/owhw/product_string.txt @@ -0,0 +1 @@ +OWHW diff --git a/firmware/libboard/qmod/product_string.txt b/firmware/libboard/qmod/product_string.txt new file mode 100644 index 0000000..2407b9d --- /dev/null +++ b/firmware/libboard/qmod/product_string.txt @@ -0,0 +1 @@ +sysmoQMOD (Quad Modem) diff --git a/firmware/libboard/simtrace/product_string.txt b/firmware/libboard/simtrace/product_string.txt new file mode 100644 index 0000000..5634f3a --- /dev/null +++ b/firmware/libboard/simtrace/product_string.txt @@ -0,0 +1 @@ +SIMtrace 2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ibcc338b504bd2a1605e31d7f5eadb7161f547c6a Gerrit-Change-Number: 16516 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 19:08:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 19:08:43 +0000 Subject: Change in simtrace2[master]: Build only 'reasonable' combinations of APP/MEMORY References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16517 ) Change subject: Build only 'reasonable' combinations of APP/MEMORY ...................................................................... Build only 'reasonable' combinations of APP/MEMORY There's no point in building a DFU loeader that is to be flashed via DFU - nor is there really any need for regular cardem/trace that can be flahsed directly without DFU. If anyone needs those, they can still build them - but let's not confuse the average other user. Change-Id: I0abe86c6a942a59e5b2417d0532dffae654d7a18 Closes: OS#4087 --- M firmware/Makefile 1 file changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/17/16517/1 diff --git a/firmware/Makefile b/firmware/Makefile index a684424..79e9a31 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -37,12 +37,14 @@ # (can be overriden by adding CHIP=chip and BOARD=board to the command-line) CHIP ?= sam3s4 BOARD ?= qmod +APP ?= dfu # Defines which are the available memory targets for the SAM3S-EK board. -MEMORIES ?= flash dfu - -# Output file basename -APP ?= dfu +ifeq ($(APP), dfu) +MEMORIES ?= flash +else +MEMORIES ?= dfu +endif # Output directories and filename OUTPUT = $(BOARD)-$(APP) -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16517 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I0abe86c6a942a59e5b2417d0532dffae654d7a18 Gerrit-Change-Number: 16517 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 19:14:25 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 19:14:25 +0000 Subject: Change in simtrace2[master]: Build only 'reasonable' combinations of APP/MEMORY In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16517 ) Change subject: Build only 'reasonable' combinations of APP/MEMORY ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16517 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I0abe86c6a942a59e5b2417d0532dffae654d7a18 Gerrit-Change-Number: 16517 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Dec 2019 19:14:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 19:14:26 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 19:14:26 +0000 Subject: Change in simtrace2[master]: Build only 'reasonable' combinations of APP/MEMORY In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16517 ) Change subject: Build only 'reasonable' combinations of APP/MEMORY ...................................................................... Build only 'reasonable' combinations of APP/MEMORY There's no point in building a DFU loeader that is to be flashed via DFU - nor is there really any need for regular cardem/trace that can be flahsed directly without DFU. If anyone needs those, they can still build them - but let's not confuse the average other user. Change-Id: I0abe86c6a942a59e5b2417d0532dffae654d7a18 Closes: OS#4087 --- M firmware/Makefile 1 file changed, 6 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/Makefile b/firmware/Makefile index a684424..79e9a31 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -37,12 +37,14 @@ # (can be overriden by adding CHIP=chip and BOARD=board to the command-line) CHIP ?= sam3s4 BOARD ?= qmod +APP ?= dfu # Defines which are the available memory targets for the SAM3S-EK board. -MEMORIES ?= flash dfu - -# Output file basename -APP ?= dfu +ifeq ($(APP), dfu) +MEMORIES ?= flash +else +MEMORIES ?= dfu +endif # Output directories and filename OUTPUT = $(BOARD)-$(APP) -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16517 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I0abe86c6a942a59e5b2417d0532dffae654d7a18 Gerrit-Change-Number: 16517 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 21:16:28 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 21:16:28 +0000 Subject: Change in osmo-asf4-dfu[master]: jenkins.sh: Introduce 'make clean' between different board builds References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16518 ) Change subject: jenkins.sh: Introduce 'make clean' between different board builds ...................................................................... jenkins.sh: Introduce 'make clean' between different board builds Change-Id: I907c9d7ec805ee7f1d7383a23941d338bcd89dfd --- M contrib/jenkins.sh 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/18/16518/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index a3700eb..2471deb 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -23,7 +23,10 @@ cd gcc $MAKE mrproper +# build for EVK $MAKE $PARALLEL_MAKE +$MAKE clean +# build for sysmoOCTSIM $MAKE $PARALLEL_MAKE BOARD=SYSMOOCTSIM if [ "x$publish" = "x--publish" ]; then -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16518 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I907c9d7ec805ee7f1d7383a23941d338bcd89dfd Gerrit-Change-Number: 16518 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 22:04:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 22:04:06 +0000 Subject: Change in osmo-asf4-dfu[master]: update iManufacturer strings (full sysmocom company name, ...) References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16519 ) Change subject: update iManufacturer strings (full sysmocom company name, ...) ...................................................................... update iManufacturer strings (full sysmocom company name, ...) this ensures the iManufacturer string is identical across different products. Change-Id: I45ce8b6d182d6e2d9f1fefa4928f85860b68d2fb --- M config/usbd_config.h 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/19/16519/1 diff --git a/config/usbd_config.h b/config/usbd_config.h index 6133596..f82934c 100644 --- a/config/usbd_config.h +++ b/config/usbd_config.h @@ -112,17 +112,18 @@ // usb_dfud_imanufact_str #ifndef CONF_USB_DFUD_IMANUFACT_STR #if defined(SYSMOOCTSIM) -#define CONF_USB_DFUD_IMANUFACT_STR "sysmocom" +#define CONF_USB_DFUD_IMANUFACT_STR "sysmocom - s.f.m.c. GmbH" #else -#define CONF_USB_DFUD_IMANUFACT_STR "osmocom" +#define CONF_USB_DFUD_IMANUFACT_STR "Osmocom" #endif #endif #ifndef CONF_USB_DFUD_IMANUFACT_STR_DESC #if defined(SYSMOOCTSIM) -#define CONF_USB_DFUD_IMANUFACT_STR_DESC 18, 0x03, 's', 0x00, 'y', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'c', 0x00, 'o', 0x00, 'm', 0x00, +#define CONF_USB_DFUD_IMANUFACT_STR_DESC 50, 0x03, 's',0, 'y',0, 's',0, 'm',0, 'o',0, 'c',0, 'o',0, 'm',0, ' ',0, '-',0, ' ',0, \ + 's',0, '.',0, 'f',0, '.',0, 'm',0, '.',0, 'c',0, '.',0, ' ',0, 'G',0, 'm',0, 'b',0, 'H',0, #else -#define CONF_USB_DFUD_IMANUFACT_STR_DESC 16, 0x03, 'o', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'c', 0x00, 'o', 0x00, 'm', 0x00, +#define CONF_USB_DFUD_IMANUFACT_STR_DESC 16, 0x03, 'O', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'c', 0x00, 'o', 0x00, 'm', 0x00, #endif #endif -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I45ce8b6d182d6e2d9f1fefa4928f85860b68d2fb Gerrit-Change-Number: 16519 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 22:47:17 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 22:47:17 +0000 Subject: Change in osmo-ccid-firmware[master]: change iManufacturer to full sysmocom company name References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16520 ) Change subject: change iManufacturer to full sysmocom company name ...................................................................... change iManufacturer to full sysmocom company name ... like in USB descriptors of other products Change-Id: I3227c3bb42f67aa166256e0c3f512087e0146e9d --- M sysmoOCTSIM/atmel_start_config.atstart M sysmoOCTSIM/config/usbd_config.h M sysmoOCTSIM/usb_descriptors.c M sysmoOCTSIM/usb_descriptors.h 4 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/20/16520/1 diff --git a/sysmoOCTSIM/atmel_start_config.atstart b/sysmoOCTSIM/atmel_start_config.atstart index 926fe33..73ad9bd 100644 --- a/sysmoOCTSIM/atmel_start_config.atstart +++ b/sysmoOCTSIM/atmel_start_config.atstart @@ -69,7 +69,7 @@ usb_cdcd_acm_idproduct: 24897 usb_cdcd_acm_idvender: 7504 usb_cdcd_acm_imanufact_en: true - usb_cdcd_acm_imanufact_str: sysmocom + usb_cdcd_acm_imanufact_str: sysmocom - s.f.m.c. GmbH usb_cdcd_acm_iproduct_en: true usb_cdcd_acm_iproduct_str: sysmoOCTSIM usb_cdcd_acm_iserialnum_en: false diff --git a/sysmoOCTSIM/config/usbd_config.h b/sysmoOCTSIM/config/usbd_config.h index a8861dd..b44d14c 100644 --- a/sysmoOCTSIM/config/usbd_config.h +++ b/sysmoOCTSIM/config/usbd_config.h @@ -84,12 +84,12 @@ // Unicode string of iManufact // usb_cdcd_acm_imanufact_str #ifndef CONF_USB_CDCD_ACM_IMANUFACT_STR -#define CONF_USB_CDCD_ACM_IMANUFACT_STR "sysmocom" +#define CONF_USB_CDCD_ACM_IMANUFACT_STR "sysmocom - s.f.m.c. GmbH" #endif #ifndef CONF_USB_CDCD_ACM_IMANUFACT_STR_DESC -#define CONF_USB_CDCD_ACM_IMANUFACT_STR_DESC \ - 18, 0x03, 's', 0x00, 'y', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'c', 0x00, 'o', 0x00, 'm', 0x00, +#define CONF_USB_DFUD_IMANUFACT_STR_DESC 50, 0x03, 's',0, 'y',0, 's',0, 'm',0, 'o',0, 'c',0, 'o',0, 'm',0, ' ',0, '-',0, ' ',0, \ + 's',0, '.',0, 'f',0, '.',0, 'm',0, '.',0, 'c',0, '.',0, ' ',0, 'G',0, 'm',0, 'b',0, 'H',0, #endif // diff --git a/sysmoOCTSIM/usb_descriptors.c b/sysmoOCTSIM/usb_descriptors.c index beb1633..2b41390 100644 --- a/sysmoOCTSIM/usb_descriptors.c +++ b/sysmoOCTSIM/usb_descriptors.c @@ -212,7 +212,7 @@ CDCD_ACM_STR_DESCES #else 4, 3, 0x09, 0x04, - 18, 3, 's',0, 'y',0, 's',0, 'm',0, 'o',0, 'c',0, 'o',0, 'm',0, + 50, 3, 's',0, 'y',0, 's',0, 'm',0, 'o',0, 'c',0, 'o',0, 'm',0, ' ',0, '-',0, ' ',0, 's',0, '.',0, 'f',0, '.',0, 'm',0, '.',0, 'c',0, '.',0, ' ',0, 'G',0, 'm',0, 'b',0, 'H',0, 24, 3, 's',0, 'y',0, 's',0, 'm',0, 'o',0, 'O',0, 'C',0, 'T',0, 'S',0, 'I',0, 'M',0, 4, 3, 'A', 0, 22, 3, 'd',0, 'e',0, 'b',0, 'u',0, 'g',0, ' ',0, 'U',0, 'A',0, 'R',0, 'T',0, diff --git a/sysmoOCTSIM/usb_descriptors.h b/sysmoOCTSIM/usb_descriptors.h index 94a4212..adf6405 100644 --- a/sysmoOCTSIM/usb_descriptors.h +++ b/sysmoOCTSIM/usb_descriptors.h @@ -61,7 +61,7 @@ struct usb_ccid_class_descriptor class; struct usb_ep_desc ep[3]; } ccid; - uint8_t str[116]; + uint8_t str[148]; } __attribute__((packed)); #endif /* USB_DESCRIPTORS_H_ */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16520 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I3227c3bb42f67aa166256e0c3f512087e0146e9d Gerrit-Change-Number: 16520 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 22:47:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 22:47:18 +0000 Subject: Change in osmo-ccid-firmware[master]: Implement serial number string descriptor in CTRL EP callback References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16521 ) Change subject: Implement serial number string descriptor in CTRL EP callback ...................................................................... Implement serial number string descriptor in CTRL EP callback Change-Id: I428972df2cd35c4a5d9774c8ca8ece5109927fa9 --- M sysmoOCTSIM/main.c M sysmoOCTSIM/usb_descriptors.h M sysmoOCTSIM/usb_start.c 3 files changed, 83 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/21/16521/1 diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c index 07c5af8..3db67d9 100644 --- a/sysmoOCTSIM/main.c +++ b/sysmoOCTSIM/main.c @@ -436,11 +436,15 @@ //####################### #define NUM_OUT_BUF 16 +char sernr_buf[16*2+1]; +//unicode for descriptor +uint8_t sernr_buf_descr[1+1+16*2*2]; + + +char rstcause_buf[RSTCAUSE_STR_SIZE]; int main(void) { - char sernr_buf[16*2+1]; - char rstcause_buf[RSTCAUSE_STR_SIZE]; #if 0 CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk ; //| /* tracing*/ @@ -469,6 +473,11 @@ get_chip_unique_serial_str(sernr_buf, sizeof(sernr_buf)); get_rstcause_str(rstcause_buf); + sernr_buf_descr[0] = sizeof(sernr_buf_descr); + sernr_buf_descr[1] = 0x3; + for(int i= 2; i < sizeof(sernr_buf_descr); i+=2) + sernr_buf_descr[i] = sernr_buf[i >> 1]; + usb_start(); board_init(); diff --git a/sysmoOCTSIM/usb_descriptors.h b/sysmoOCTSIM/usb_descriptors.h index adf6405..df072c2 100644 --- a/sysmoOCTSIM/usb_descriptors.h +++ b/sysmoOCTSIM/usb_descriptors.h @@ -19,6 +19,8 @@ #ifndef USB_DESCRIPTORS_H_ #define USB_DESCRIPTORS_H_ +#include "ccid_device.h" + #define CCID_NUM_CLK_SUPPORTED 4 /* aggregate descriptors for the combined CDC-ACM + CCID device that we expose diff --git a/sysmoOCTSIM/usb_start.c b/sysmoOCTSIM/usb_start.c index c6d9fe9..1c1672c 100644 --- a/sysmoOCTSIM/usb_start.c +++ b/sysmoOCTSIM/usb_start.c @@ -7,6 +7,7 @@ */ #include "atmel_start.h" #include "usb_start.h" +#include "usb_descriptors.h" #define CDCD_ECHO_BUF_SIZ CONF_USB_CDCD_ACM_DATA_BULKIN_MAXPKSZ @@ -58,6 +59,73 @@ extern const struct usbd_descriptors usb_descs[]; +/* transmit given string descriptor */ +static bool send_str_desc(uint8_t ep, const struct usb_req *req, enum usb_ctrl_stage stage, + const uint8_t *desc) +{ + uint16_t len_req = LE16(req->wLength); + uint16_t len_desc = desc[0]; + uint16_t len_tx; + bool need_zlp = !(len_req & (CONF_USB_CDCD_ACM_BMAXPKSZ0 - 1)); + + if (len_req <= len_desc) { + need_zlp = false; + len_tx = len_req; + } else { + len_tx = len_desc; + } + + printf("Sending string %u from callback: ", req->wValue & 0x00ff); + printf("ep=0x%02x len_req=%u len_desc=%u, len_tx=%u, zlp=%u\r\n", + ep, len_req, len_desc, len_tx, need_zlp); + + if (ERR_NONE != usbdc_xfer(ep, (uint8_t *)desc, len_tx, need_zlp)) { + printf("returning false\r\n"); + return true; + } + + printf("returning true\r\n"); + return false; +} + +extern uint8_t sernr_buf_descr[]; +/* call-back for every control EP request */ +static int32_t string_req_cb(uint8_t ep, struct usb_req *req, enum usb_ctrl_stage stage) +{ + uint8_t index, type; + + if (stage != USB_SETUP_STAGE) + return ERR_NOT_FOUND; + + if ((req->bmRequestType & (USB_REQT_TYPE_MASK | USB_REQT_DIR_IN)) != + (USB_REQT_TYPE_STANDARD | USB_REQT_DIR_IN)) + return ERR_NOT_FOUND; + + /* abort if it's not a GET DESCRIPTOR request */ + if (req->bRequest != USB_REQ_GET_DESC) + return ERR_NOT_FOUND; + + /* abort if it's not about a string descriptor */ + type = req->wValue >> 8; + if (type != USB_DT_STRING) + return ERR_NOT_FOUND; +#if 0 + printf("ep=%02x, bmReqT=%04x, bReq=%02x, wValue=%04x, stage=%d\r\n", + ep, req->bmRequestType, req->bRequest, req->wValue, stage); +#endif + /* abort if it's not a standard GET request */ + index = req->wValue & 0x00FF; + switch (index) { + case STR_DESC_SERIAL: + return send_str_desc(ep, req, stage, sernr_buf_descr); + default: + return ERR_NOT_FOUND; + } +} + + +static struct usbdc_handler string_req_h = {NULL, (FUNC_PTR)string_req_cb}; + /** * \brief CDC ACM Init */ @@ -65,10 +133,12 @@ { /* usb stack init */ usbdc_init(ctrl_buffer); + usbdc_register_handler(USBDC_HDL_REQ, &string_req_h); /* usbdc_register_funcion inside */ cdcdf_acm_init(); + printf("usb_descs_size=%u\r\n", usb_descs[0].eod - usb_descs[0].sod); usbdc_start((struct usbd_descriptors *) usb_descs); usbdc_attach(); } @@ -87,7 +157,6 @@ void usb_init(void) { - cdc_device_acm_init(); ccid_df_init(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I428972df2cd35c4a5d9774c8ca8ece5109927fa9 Gerrit-Change-Number: 16521 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 22:51:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 22:51:18 +0000 Subject: Change in osmo-ccid-firmware[master]: change iManufacturer to full sysmocom company name In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16520 ) Change subject: change iManufacturer to full sysmocom company name ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16520 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I3227c3bb42f67aa166256e0c3f512087e0146e9d Gerrit-Change-Number: 16520 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Dec 2019 22:51:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 22:51:26 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 22:51:26 +0000 Subject: Change in osmo-ccid-firmware[master]: change iManufacturer to full sysmocom company name In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16520 ) Change subject: change iManufacturer to full sysmocom company name ...................................................................... change iManufacturer to full sysmocom company name ... like in USB descriptors of other products Change-Id: I3227c3bb42f67aa166256e0c3f512087e0146e9d --- M sysmoOCTSIM/atmel_start_config.atstart M sysmoOCTSIM/config/usbd_config.h M sysmoOCTSIM/usb_descriptors.c M sysmoOCTSIM/usb_descriptors.h 4 files changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sysmoOCTSIM/atmel_start_config.atstart b/sysmoOCTSIM/atmel_start_config.atstart index 926fe33..73ad9bd 100644 --- a/sysmoOCTSIM/atmel_start_config.atstart +++ b/sysmoOCTSIM/atmel_start_config.atstart @@ -69,7 +69,7 @@ usb_cdcd_acm_idproduct: 24897 usb_cdcd_acm_idvender: 7504 usb_cdcd_acm_imanufact_en: true - usb_cdcd_acm_imanufact_str: sysmocom + usb_cdcd_acm_imanufact_str: sysmocom - s.f.m.c. GmbH usb_cdcd_acm_iproduct_en: true usb_cdcd_acm_iproduct_str: sysmoOCTSIM usb_cdcd_acm_iserialnum_en: false diff --git a/sysmoOCTSIM/config/usbd_config.h b/sysmoOCTSIM/config/usbd_config.h index a8861dd..b44d14c 100644 --- a/sysmoOCTSIM/config/usbd_config.h +++ b/sysmoOCTSIM/config/usbd_config.h @@ -84,12 +84,12 @@ // Unicode string of iManufact // usb_cdcd_acm_imanufact_str #ifndef CONF_USB_CDCD_ACM_IMANUFACT_STR -#define CONF_USB_CDCD_ACM_IMANUFACT_STR "sysmocom" +#define CONF_USB_CDCD_ACM_IMANUFACT_STR "sysmocom - s.f.m.c. GmbH" #endif #ifndef CONF_USB_CDCD_ACM_IMANUFACT_STR_DESC -#define CONF_USB_CDCD_ACM_IMANUFACT_STR_DESC \ - 18, 0x03, 's', 0x00, 'y', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'c', 0x00, 'o', 0x00, 'm', 0x00, +#define CONF_USB_DFUD_IMANUFACT_STR_DESC 50, 0x03, 's',0, 'y',0, 's',0, 'm',0, 'o',0, 'c',0, 'o',0, 'm',0, ' ',0, '-',0, ' ',0, \ + 's',0, '.',0, 'f',0, '.',0, 'm',0, '.',0, 'c',0, '.',0, ' ',0, 'G',0, 'm',0, 'b',0, 'H',0, #endif // diff --git a/sysmoOCTSIM/usb_descriptors.c b/sysmoOCTSIM/usb_descriptors.c index beb1633..2b41390 100644 --- a/sysmoOCTSIM/usb_descriptors.c +++ b/sysmoOCTSIM/usb_descriptors.c @@ -212,7 +212,7 @@ CDCD_ACM_STR_DESCES #else 4, 3, 0x09, 0x04, - 18, 3, 's',0, 'y',0, 's',0, 'm',0, 'o',0, 'c',0, 'o',0, 'm',0, + 50, 3, 's',0, 'y',0, 's',0, 'm',0, 'o',0, 'c',0, 'o',0, 'm',0, ' ',0, '-',0, ' ',0, 's',0, '.',0, 'f',0, '.',0, 'm',0, '.',0, 'c',0, '.',0, ' ',0, 'G',0, 'm',0, 'b',0, 'H',0, 24, 3, 's',0, 'y',0, 's',0, 'm',0, 'o',0, 'O',0, 'C',0, 'T',0, 'S',0, 'I',0, 'M',0, 4, 3, 'A', 0, 22, 3, 'd',0, 'e',0, 'b',0, 'u',0, 'g',0, ' ',0, 'U',0, 'A',0, 'R',0, 'T',0, diff --git a/sysmoOCTSIM/usb_descriptors.h b/sysmoOCTSIM/usb_descriptors.h index 94a4212..adf6405 100644 --- a/sysmoOCTSIM/usb_descriptors.h +++ b/sysmoOCTSIM/usb_descriptors.h @@ -61,7 +61,7 @@ struct usb_ccid_class_descriptor class; struct usb_ep_desc ep[3]; } ccid; - uint8_t str[116]; + uint8_t str[148]; } __attribute__((packed)); #endif /* USB_DESCRIPTORS_H_ */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16520 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I3227c3bb42f67aa166256e0c3f512087e0146e9d Gerrit-Change-Number: 16520 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 22:51:44 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 22:51:44 +0000 Subject: Change in osmo-asf4-dfu[master]: jenkins.sh: Introduce 'make clean' between different board builds In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16518 ) Change subject: jenkins.sh: Introduce 'make clean' between different board builds ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16518 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I907c9d7ec805ee7f1d7383a23941d338bcd89dfd Gerrit-Change-Number: 16518 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Dec 2019 22:51:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 22:51:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 22:51:53 +0000 Subject: Change in osmo-asf4-dfu[master]: update iManufacturer strings (full sysmocom company name, ...) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16519 ) Change subject: update iManufacturer strings (full sysmocom company name, ...) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I45ce8b6d182d6e2d9f1fefa4928f85860b68d2fb Gerrit-Change-Number: 16519 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Dec 2019 22:51:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 22:51:54 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 22:51:54 +0000 Subject: Change in osmo-asf4-dfu[master]: jenkins.sh: Introduce 'make clean' between different board builds In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16518 ) Change subject: jenkins.sh: Introduce 'make clean' between different board builds ...................................................................... jenkins.sh: Introduce 'make clean' between different board builds Change-Id: I907c9d7ec805ee7f1d7383a23941d338bcd89dfd --- M contrib/jenkins.sh 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index a3700eb..2471deb 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -23,7 +23,10 @@ cd gcc $MAKE mrproper +# build for EVK $MAKE $PARALLEL_MAKE +$MAKE clean +# build for sysmoOCTSIM $MAKE $PARALLEL_MAKE BOARD=SYSMOOCTSIM if [ "x$publish" = "x--publish" ]; then -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16518 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I907c9d7ec805ee7f1d7383a23941d338bcd89dfd Gerrit-Change-Number: 16518 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 6 22:51:54 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 6 Dec 2019 22:51:54 +0000 Subject: Change in osmo-asf4-dfu[master]: update iManufacturer strings (full sysmocom company name, ...) In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16519 ) Change subject: update iManufacturer strings (full sysmocom company name, ...) ...................................................................... update iManufacturer strings (full sysmocom company name, ...) this ensures the iManufacturer string is identical across different products. Change-Id: I45ce8b6d182d6e2d9f1fefa4928f85860b68d2fb --- M config/usbd_config.h 1 file changed, 5 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/config/usbd_config.h b/config/usbd_config.h index 6133596..f82934c 100644 --- a/config/usbd_config.h +++ b/config/usbd_config.h @@ -112,17 +112,18 @@ // usb_dfud_imanufact_str #ifndef CONF_USB_DFUD_IMANUFACT_STR #if defined(SYSMOOCTSIM) -#define CONF_USB_DFUD_IMANUFACT_STR "sysmocom" +#define CONF_USB_DFUD_IMANUFACT_STR "sysmocom - s.f.m.c. GmbH" #else -#define CONF_USB_DFUD_IMANUFACT_STR "osmocom" +#define CONF_USB_DFUD_IMANUFACT_STR "Osmocom" #endif #endif #ifndef CONF_USB_DFUD_IMANUFACT_STR_DESC #if defined(SYSMOOCTSIM) -#define CONF_USB_DFUD_IMANUFACT_STR_DESC 18, 0x03, 's', 0x00, 'y', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'c', 0x00, 'o', 0x00, 'm', 0x00, +#define CONF_USB_DFUD_IMANUFACT_STR_DESC 50, 0x03, 's',0, 'y',0, 's',0, 'm',0, 'o',0, 'c',0, 'o',0, 'm',0, ' ',0, '-',0, ' ',0, \ + 's',0, '.',0, 'f',0, '.',0, 'm',0, '.',0, 'c',0, '.',0, ' ',0, 'G',0, 'm',0, 'b',0, 'H',0, #else -#define CONF_USB_DFUD_IMANUFACT_STR_DESC 16, 0x03, 'o', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'c', 0x00, 'o', 0x00, 'm', 0x00, +#define CONF_USB_DFUD_IMANUFACT_STR_DESC 16, 0x03, 'O', 0x00, 's', 0x00, 'm', 0x00, 'o', 0x00, 'c', 0x00, 'o', 0x00, 'm', 0x00, #endif #endif -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/16519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I45ce8b6d182d6e2d9f1fefa4928f85860b68d2fb Gerrit-Change-Number: 16519 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Dec 7 01:49:36 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 01:49:36 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5deb054a6e34e_653f2ad8858225fc199731@build.opensuse.org> 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: [ 216s] [ 216s] Error: [Errno 2] No such file or directory [ 216s] [ 216s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:61: recipe for target 'osmux-reference.pdf' failed [ 216s] make[4]: *** [osmux-reference.pdf] Error 1 [ 216s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 216s] Makefile:387: recipe for target 'all-recursive' failed [ 216s] make[3]: *** [all-recursive] Error 1 [ 216s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 216s] Makefile:448: recipe for target 'all-recursive' failed [ 216s] make[2]: *** [all-recursive] Error 1 [ 216s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 216s] Makefile:380: recipe for target 'all' failed [ 216s] make[1]: *** [all] Error 2 [ 216s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 216s] dh_auto_build: make -j1 returned exit code 2 [ 216s] debian/rules:45: recipe for target 'build' failed [ 216s] make: *** [build] Error 2 [ 216s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 216s] [ 216s] lamb17 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 01:49:30 UTC 2019. [ 216s] [ 216s] ### VM INTERACTION START ### [ 219s] [ 205.441551] sysrq: SysRq : Power Off [ 219s] [ 205.450139] reboot: Power down [ 219s] ### VM INTERACTION END ### [ 219s] [ 219s] lamb17 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 01:49:33 UTC 2019. [ 219s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 01:51:01 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 01:51:01 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5deb058bd66c8_653f2ad8858225fc199850@build.opensuse.org> 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: [ 278s] [ 278s] Error: "The cache has no package named 'inkscape'" [ 278s] [ 278s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:61: recipe for target 'osmux-reference.pdf' failed [ 278s] make[4]: *** [osmux-reference.pdf] Error 1 [ 278s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 278s] Makefile:387: recipe for target 'all-recursive' failed [ 278s] make[3]: *** [all-recursive] Error 1 [ 278s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 278s] Makefile:448: recipe for target 'all-recursive' failed [ 278s] make[2]: *** [all-recursive] Error 1 [ 278s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 278s] Makefile:380: recipe for target 'all' failed [ 278s] make[1]: *** [all] Error 2 [ 278s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 278s] dh_auto_build: make -j1 returned exit code 2 [ 278s] debian/rules:45: recipe for target 'build' failed [ 278s] make: *** [build] Error 2 [ 278s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 278s] [ 278s] cloud129 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 01:50:46 UTC 2019. [ 278s] [ 278s] ### VM INTERACTION START ### [ 281s] [ 252.680052] sysrq: SysRq : Power Off [ 281s] [ 252.750669] reboot: Power down [ 282s] ### VM INTERACTION END ### [ 282s] [ 282s] cloud129 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 01:50:51 UTC 2019. [ 282s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 01:52:44 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 01:52:44 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5deb06007d034_653f2ad8858225fc1999df@build.opensuse.org> 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: [ 153s] [ 153s] Error: "The cache has no package named 'inkscape'" [ 153s] [ 153s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:61: recipe for target 'osmux-reference.pdf' failed [ 153s] make[4]: *** [osmux-reference.pdf] Error 1 [ 153s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 153s] Makefile:387: recipe for target 'all-recursive' failed [ 153s] make[3]: *** [all-recursive] Error 1 [ 153s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 153s] Makefile:448: recipe for target 'all-recursive' failed [ 153s] make[2]: *** [all-recursive] Error 1 [ 153s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 153s] Makefile:380: recipe for target 'all' failed [ 153s] make[1]: *** [all] Error 2 [ 153s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 153s] dh_auto_build: make -j1 returned exit code 2 [ 153s] debian/rules:45: recipe for target 'build' failed [ 153s] make: *** [build] Error 2 [ 153s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 153s] [ 153s] sheep82 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 01:52:38 UTC 2019. [ 153s] [ 153s] ### VM INTERACTION START ### [ 156s] [ 146.663728] sysrq: SysRq : Power Off [ 156s] [ 146.673380] reboot: Power down [ 156s] ### VM INTERACTION END ### [ 156s] [ 156s] sheep82 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 01:52:42 UTC 2019. [ 156s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 01:54:09 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 01:54:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5deb065b78382_653f2ad8858225fc2001b9@build.opensuse.org> 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: [ 225s] [ 225s] Error: [Errno 2] No such file or directory [ 225s] [ 225s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:61: recipe for target 'osmux-reference.pdf' failed [ 225s] make[4]: *** [osmux-reference.pdf] Error 1 [ 225s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 225s] Makefile:387: recipe for target 'all-recursive' failed [ 225s] make[3]: *** [all-recursive] Error 1 [ 225s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 225s] Makefile:448: recipe for target 'all-recursive' failed [ 225s] make[2]: *** [all-recursive] Error 1 [ 225s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 225s] Makefile:380: recipe for target 'all' failed [ 225s] make[1]: *** [all] Error 2 [ 225s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 225s] dh_auto_build: make -j1 returned exit code 2 [ 225s] debian/rules:45: recipe for target 'build' failed [ 225s] make: *** [build] Error 2 [ 225s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 225s] [ 225s] lamb56 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 01:53:50 UTC 2019. [ 225s] [ 225s] ### VM INTERACTION START ### [ 228s] [ 213.433131] sysrq: SysRq : Power Off [ 228s] [ 213.438360] reboot: Power down [ 228s] ### VM INTERACTION END ### [ 228s] [ 228s] lamb56 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 01:53:54 UTC 2019. [ 228s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 01:56:43 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 01:56:43 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5deb06eea9e54_653f2ad8858225fc2002ed@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 305s] Cannot convert 'osmux-reference__7.png' to pdf [ 305s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 305s] [ 305s] A possible reason for transformation failure is invalid DocBook [ 305s] (as reported by xmllint) [ 305s] [ 305s] Error: [Errno 2] No such file or directory [ 305s] [ 305s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 305s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 305s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 305s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 305s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 305s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 305s] make[1]: *** [Makefile:380: all] Error 2 [ 305s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 305s] dh_auto_build: make -j1 returned exit code 2 [ 305s] make: *** [debian/rules:45: build] Error 2 [ 305s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 305s] [ 305s] cloud116 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 01:56:24 UTC 2019. [ 305s] [ 305s] ### VM INTERACTION START ### [ 308s] [ 275.769816] sysrq: SysRq : Power Off [ 308s] [ 275.776902] reboot: Power down [ 308s] ### VM INTERACTION END ### [ 308s] [ 308s] cloud116 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 01:56:28 UTC 2019. [ 308s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 01:56:43 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 01:56:43 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5deb06ef2af5b_653f2ad8858225fc200351@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 252s] Cannot convert 'osmux-reference__7.png' to pdf [ 252s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 252s] [ 252s] A possible reason for transformation failure is invalid DocBook [ 252s] (as reported by xmllint) [ 252s] [ 252s] Error: [Errno 2] No such file or directory [ 252s] [ 252s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 252s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 252s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 252s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 252s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 252s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 252s] make[1]: *** [Makefile:380: all] Error 2 [ 252s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 252s] dh_auto_build: make -j1 returned exit code 2 [ 252s] make: *** [debian/rules:45: build] Error 2 [ 252s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 252s] [ 252s] sheep83 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 01:56:27 UTC 2019. [ 252s] [ 252s] ### VM INTERACTION START ### [ 255s] [ 244.571540] sysrq: SysRq : Power Off [ 255s] [ 244.579953] reboot: Power down [ 255s] ### VM INTERACTION END ### [ 255s] [ 255s] sheep83 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 01:56:31 UTC 2019. [ 255s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 01:57:18 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 01:57:18 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5deb070f96cf2_653f2ad8858225fc20059b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_10/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 192s] Cannot convert 'osmux-reference__7.png' to pdf [ 192s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 192s] [ 192s] A possible reason for transformation failure is invalid DocBook [ 192s] (as reported by xmllint) [ 192s] [ 192s] Error: [Errno 2] No such file or directory [ 192s] [ 192s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 192s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 192s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 192s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 192s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 192s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 192s] make[1]: *** [Makefile:380: all] Error 2 [ 192s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 192s] dh_auto_build: make -j1 returned exit code 2 [ 192s] make: *** [debian/rules:45: build] Error 2 [ 192s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 192s] [ 192s] build75 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 01:56:57 UTC 2019. [ 192s] [ 192s] ### VM INTERACTION START ### [ 195s] [ 181.873533] sysrq: SysRq : Power Off [ 195s] [ 181.875597] reboot: Power down [ 195s] ### VM INTERACTION END ### [ 195s] [ 195s] build75 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 01:57:02 UTC 2019. [ 195s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 01:58:09 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 01:58:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5deb074b3d120_653f2ad8858225fc200725@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 228s] Cannot convert 'osmux-reference__7.png' to pdf [ 228s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 228s] [ 228s] A possible reason for transformation failure is invalid DocBook [ 228s] (as reported by xmllint) [ 228s] [ 228s] Error: [Errno 2] No such file or directory [ 228s] [ 228s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 228s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 228s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 228s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 228s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 228s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 228s] make[1]: *** [Makefile:380: all] Error 2 [ 228s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 228s] dh_auto_build: make -j1 returned exit code 2 [ 228s] make: *** [debian/rules:45: build] Error 2 [ 228s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 228s] [ 228s] sheep81 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 01:57:55 UTC 2019. [ 228s] [ 228s] ### VM INTERACTION START ### [ 231s] [ 221.353622] sysrq: SysRq : Power Off [ 231s] [ 221.360534] reboot: Power down [ 231s] ### VM INTERACTION END ### [ 231s] [ 231s] sheep81 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 01:57:58 UTC 2019. [ 231s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 01:59:35 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 01:59:35 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5deb07a186136_653f2ad8858225fc2008da@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 455s] [ 455s] Error: [Errno 2] No such file or directory [ 455s] [ 455s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:61: recipe for target 'osmux-reference.pdf' failed [ 455s] make[4]: *** [osmux-reference.pdf] Error 1 [ 455s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 455s] Makefile:387: recipe for target 'all-recursive' failed [ 455s] make[3]: *** [all-recursive] Error 1 [ 455s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 455s] Makefile:448: recipe for target 'all-recursive' failed [ 455s] make[2]: *** [all-recursive] Error 1 [ 455s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 455s] Makefile:380: recipe for target 'all' failed [ 455s] make[1]: *** [all] Error 2 [ 455s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 455s] dh_auto_build: make -j1 returned exit code 2 [ 455s] debian/rules:45: recipe for target 'build' failed [ 455s] make: *** [build] Error 2 [ 455s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 455s] [ 455s] cloud121 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 01:59:22 UTC 2019. [ 455s] [ 455s] ### VM INTERACTION START ### [ 459s] [ 412.138665] sysrq: SysRq : Power Off [ 459s] [ 412.177298] reboot: Power down [ 460s] ### VM INTERACTION END ### [ 460s] [ 460s] cloud121 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 01:59:27 UTC 2019. [ 460s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 01:59:52 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 01:59:52 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5deb07a3a8b2a_653f2ad8858225fc200922@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 333s] Cannot convert 'osmux-reference__7.png' to pdf [ 333s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 333s] [ 333s] A possible reason for transformation failure is invalid DocBook [ 333s] (as reported by xmllint) [ 333s] [ 333s] Error: [Errno 2] No such file or directory [ 333s] [ 333s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 333s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 333s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 333s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 333s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 333s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 333s] make[1]: *** [Makefile:380: all] Error 2 [ 333s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 333s] dh_auto_build: make -j1 returned exit code 2 [ 333s] make: *** [debian/rules:45: build] Error 255 [ 333s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 333s] [ 333s] lamb20 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 01:59:33 UTC 2019. [ 333s] [ 333s] ### VM INTERACTION START ### [ 336s] [ 318.600327] sysrq: SysRq : Power Off [ 336s] [ 318.606065] reboot: Power down [ 336s] ### VM INTERACTION END ### [ 336s] [ 336s] lamb20 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 01:59:36 UTC 2019. [ 336s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 02:00:26 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 02:00:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5deb07c345306_653f2ad8858225fc20109c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 336s] [ 336s] Error: [Errno 2] No such file or directory [ 336s] [ 336s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:61: recipe for target 'osmux-reference.pdf' failed [ 336s] make[4]: *** [osmux-reference.pdf] Error 1 [ 336s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 336s] Makefile:387: recipe for target 'all-recursive' failed [ 336s] make[3]: *** [all-recursive] Error 1 [ 336s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 336s] Makefile:448: recipe for target 'all-recursive' failed [ 336s] make[2]: *** [all-recursive] Error 1 [ 336s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 336s] Makefile:380: recipe for target 'all' failed [ 336s] make[1]: *** [all] Error 2 [ 336s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 336s] dh_auto_build: make -j1 returned exit code 2 [ 336s] debian/rules:45: recipe for target 'build' failed [ 336s] make: *** [build] Error 2 [ 336s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 336s] [ 336s] lamb03 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 02:00:14 UTC 2019. [ 336s] [ 336s] ### VM INTERACTION START ### [ 339s] [ 320.008407] sysrq: SysRq : Power Off [ 339s] [ 320.014074] reboot: Power down [ 339s] ### VM INTERACTION END ### [ 339s] [ 339s] lamb03 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 02:00:16 UTC 2019. [ 339s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 02:01:52 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 02:01:52 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_10/i586 In-Reply-To: References: Message-ID: <5deb081a638f1_653f2ad8858225fc2014cf@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_10/i586 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 428s] Cannot convert 'osmux-reference__7.png' to pdf [ 428s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 428s] [ 428s] A possible reason for transformation failure is invalid DocBook [ 428s] (as reported by xmllint) [ 428s] [ 428s] Error: [Errno 2] No such file or directory [ 428s] [ 428s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 428s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 428s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 428s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 428s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 428s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 428s] make[1]: *** [Makefile:380: all] Error 2 [ 428s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 428s] dh_auto_build: make -j1 returned exit code 2 [ 428s] make: *** [debian/rules:45: build] Error 2 [ 428s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 428s] [ 428s] cloud133 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 02:01:35 UTC 2019. [ 428s] [ 428s] ### VM INTERACTION START ### [ 432s] [ 371.566392] sysrq: SysRq : Power Off [ 432s] [ 371.576498] reboot: Power down [ 432s] ### VM INTERACTION END ### [ 433s] [ 433s] cloud133 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 02:01:40 UTC 2019. [ 433s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 02:04:09 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 02:04:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5deb08afbe3a2_653f2ad8858225fc2017df@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 384s] Cannot convert 'osmux-reference__7.png' to pdf [ 384s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 384s] [ 384s] A possible reason for transformation failure is invalid DocBook [ 384s] (as reported by xmllint) [ 384s] [ 384s] Error: [Errno 2] No such file or directory [ 384s] [ 384s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 384s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 384s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 384s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 384s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 384s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 384s] make[1]: *** [Makefile:380: all] Error 2 [ 384s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 384s] dh_auto_build: make -j1 returned exit code 2 [ 384s] make: *** [debian/rules:45: build] Error 255 [ 385s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 385s] [ 385s] cloud105 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 02:04:05 UTC 2019. [ 385s] [ 385s] ### VM INTERACTION START ### [ 388s] [ 366.396847] sysrq: SysRq : Power Off [ 388s] [ 366.402298] reboot: Power down [ 388s] ### VM INTERACTION END ### [ 388s] [ 388s] cloud105 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 02:04:08 UTC 2019. [ 388s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 02:06:26 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 02:06:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb092c2583c_653f2ad8858225fc2018ef@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 685s] Cannot convert 'osmux-reference__7.png' to pdf [ 685s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 685s] [ 685s] A possible reason for transformation failure is invalid DocBook [ 685s] (as reported by xmllint) [ 685s] [ 685s] Error: [Errno 2] No such file or directory [ 685s] [ 685s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 685s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 685s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 685s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 685s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 685s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 685s] make[1]: *** [Makefile:380: all] Error 2 [ 685s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 685s] dh_auto_build: make -j1 returned exit code 2 [ 685s] make: *** [debian/rules:45: build] Error 255 [ 685s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 685s] [ 685s] lamb04 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 02:06:13 UTC 2019. [ 685s] [ 685s] ### VM INTERACTION START ### [ 688s] [ 668.436888] sysrq: SysRq : Power Off [ 688s] [ 668.443699] reboot: Power down [ 688s] ### VM INTERACTION END ### [ 688s] [ 688s] lamb04 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 02:06:17 UTC 2019. [ 688s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 02:25:01 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 02:25:01 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5deb0d9f2d3ce_653f2ad8858225fc2028d@build.opensuse.org> 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: [ 526s] [ 526s] Error: [Errno 2] No such file or directory [ 526s] [ 526s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:61: recipe for target 'osmux-reference.pdf' failed [ 526s] make[4]: *** [osmux-reference.pdf] Error 1 [ 526s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 526s] Makefile:387: recipe for target 'all-recursive' failed [ 526s] make[3]: *** [all-recursive] Error 1 [ 526s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 526s] Makefile:448: recipe for target 'all-recursive' failed [ 526s] make[2]: *** [all-recursive] Error 1 [ 526s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 526s] Makefile:380: recipe for target 'all' failed [ 526s] make[1]: *** [all] Error 2 [ 526s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 526s] dh_auto_build: make -j1 returned exit code 2 [ 526s] debian/rules:45: recipe for target 'build' failed [ 526s] make: *** [build] Error 2 [ 526s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 526s] [ 526s] obs-arm-4 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 02:24:44 UTC 2019. [ 526s] [ 526s] ### VM INTERACTION START ### [ 529s] [ 498.986201] sysrq: SysRq : Power Off [ 529s] [ 499.012203] reboot: Power down [ 529s] ### VM INTERACTION END ### [ 529s] [ 529s] obs-arm-4 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 02:24:47 UTC 2019. [ 529s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 02:28:09 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 02:28:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_10/aarch64 In-Reply-To: References: Message-ID: <5deb0e4fd4a1f_653f2ad8858225fc203084@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_10/aarch64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_10/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 664s] Cannot convert 'osmux-reference__7.png' to pdf [ 664s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 664s] [ 664s] A possible reason for transformation failure is invalid DocBook [ 664s] (as reported by xmllint) [ 664s] [ 664s] Error: [Errno 2] No such file or directory [ 664s] [ 664s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 664s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 664s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 664s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 664s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 664s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 664s] make[1]: *** [Makefile:380: all] Error 2 [ 664s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 664s] dh_auto_build: make -j1 returned exit code 2 [ 664s] make: *** [debian/rules:45: build] Error 2 [ 664s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 664s] [ 664s] obs-arm-3 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 02:28:02 UTC 2019. [ 664s] [ 664s] ### VM INTERACTION START ### [ 667s] [ 627.311288] sysrq: SysRq : Power Off [ 667s] [ 627.352538] reboot: Power down [ 667s] ### VM INTERACTION END ### [ 667s] [ 667s] obs-arm-3 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 02:28:05 UTC 2019. [ 667s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:03:52 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:03:52 +0000 Subject: Build failure of network:osmocom:nightly/osmo-python-tests in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb24b66e4fd_653f2ad8858225fc2153b9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-python-tests/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-python-tests failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-python-tests Last lines of build log: [ 11s] WARNING: udev not running, creating extra device nodes [ 11s] logging output to //.build.log... [ 11s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] processing recipe /.build-srcdir/osmo-python-tests_0.0.9.20191207.dsc ... [ 11s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-python-tests_0.0.9.20191207.dsc build ... [ 11s] running base-passwd preinstall script [ 11s] running base-passwd postinstall script [ 11s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] running user-setup postinstall script [ 11s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] running base-files postinstall script [ 11s] running gawk postinstall script [ 11s] querying package ids... [ 11s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] [1/220] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] installing [ 12s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] exit ... [ 12s] [ 12s] build70 failed "build osmo-python-tests_0.0.9.20191207.dsc" at Sat Dec 7 04:03:48 UTC 2019. [ 12s] [ 12s] ### VM INTERACTION START ### [ 15s] [ 5.604786] sysrq: SysRq : Power Off [ 15s] [ 5.606808] reboot: Power down [ 15s] ### VM INTERACTION END ### [ 15s] [ 15s] build70 failed "build osmo-python-tests_0.0.9.20191207.dsc" at Sat Dec 7 04:03:51 UTC 2019. [ 15s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:03:52 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:03:52 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb24b6252fc_653f2ad8858225fc215215@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/Debian_Unstable/x86_64 Package network:osmocom:nightly/libsmpp34 failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ 11s] WARNING: udev not running, creating extra device nodes [ 11s] logging output to //.build.log... [ 11s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] processing recipe /.build-srcdir/libsmpp34_1.14.0.dsc ... [ 11s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libsmpp34_1.14.0.dsc build ... [ 11s] running base-passwd preinstall script [ 11s] running base-passwd postinstall script [ 11s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] running user-setup postinstall script [ 11s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] running base-files postinstall script [ 11s] running gawk postinstall script [ 11s] querying package ids... [ 11s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] [1/221] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] installing [ 12s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] exit ... [ 12s] [ 12s] build75 failed "build libsmpp34_1.14.0.dsc" at Sat Dec 7 04:03:48 UTC 2019. [ 12s] [ 12s] ### VM INTERACTION START ### [ 15s] [ 5.597587] sysrq: SysRq : Power Off [ 15s] [ 5.599786] reboot: Power down [ 15s] ### VM INTERACTION END ### [ 15s] [ 15s] build75 failed "build libsmpp34_1.14.0.dsc" at Sat Dec 7 04:03:51 UTC 2019. [ 15s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:04:09 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:04:09 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb24d0d584e_653f2ad8858225fc2156b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/Debian_Unstable/x86_64 Package network:osmocom:nightly/libgtpnl failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 12s] WARNING: udev not running, creating extra device nodes [ 12s] logging output to //.build.log... [ 12s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] processing recipe /.build-srcdir/libgtpnl_1.2.1.dsc ... [ 12s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libgtpnl_1.2.1.dsc build ... [ 12s] running base-passwd preinstall script [ 12s] running base-passwd postinstall script [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] running user-setup postinstall script [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] running base-files postinstall script [ 12s] running gawk postinstall script [ 12s] querying package ids... [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] [1/220] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] installing [ 12s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] exit ... [ 12s] [ 12s] build85 failed "build libgtpnl_1.2.1.dsc" at Sat Dec 7 04:03:48 UTC 2019. [ 12s] [ 12s] ### VM INTERACTION START ### [ 16s] [ 6.116637] sysrq: SysRq : Power Off [ 16s] [ 6.118995] reboot: Power down [ 16s] ### VM INTERACTION END ### [ 16s] [ 16s] build85 failed "build libgtpnl_1.2.1.dsc" at Sat Dec 7 04:03:52 UTC 2019. [ 16s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:04:09 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:04:09 +0000 Subject: Build failure of network:osmocom:latest/osmocom-latest in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb24d13d635_653f2ad8858225fc215724@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmocom-latest/Debian_Unstable/x86_64 Package network:osmocom:latest/osmocom-latest failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmocom-latest Last lines of build log: [ 16s] WARNING: udev not running, creating extra device nodes [ 16s] logging output to //.build.log... [ 16s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] processing recipe /.build-srcdir/osmocom-latest_0.0.0.dsc ... [ 16s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmocom-latest_0.0.0.dsc build ... [ 16s] running base-passwd preinstall script [ 16s] running base-passwd postinstall script [ 16s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] running user-setup postinstall script [ 16s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] running base-files postinstall script [ 16s] running gawk postinstall script [ 17s] querying package ids... [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] [1/192] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] installing [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] exit ... [ 17s] [ 17s] lamb51 failed "build osmocom-latest_0.0.0.dsc" at Sat Dec 7 04:03:49 UTC 2019. [ 17s] [ 17s] ### VM INTERACTION START ### [ 20s] [ 7.278680] sysrq: SysRq : Power Off [ 20s] [ 7.285438] reboot: Power down [ 20s] ### VM INTERACTION END ### [ 20s] [ 20s] lamb51 failed "build osmocom-latest_0.0.0.dsc" at Sat Dec 7 04:03:53 UTC 2019. [ 20s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:04:09 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:04:09 +0000 Subject: Build failure of network:osmocom:latest/libsmpp34 in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb24d229d26_653f2ad8858225fc215959@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libsmpp34/Debian_Unstable/x86_64 Package network:osmocom:latest/libsmpp34 failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libsmpp34 Last lines of build log: [ 17s] WARNING: udev not running, creating extra device nodes [ 17s] logging output to //.build.log... [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/libsmpp34_1.14.0.dsc ... [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libsmpp34_1.14.0.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/221] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb10 failed "build libsmpp34_1.14.0.dsc" at Sat Dec 7 04:03:57 UTC 2019. [ 18s] [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.580996] sysrq: SysRq : Power Off [ 21s] [ 7.589936] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb10 failed "build libsmpp34_1.14.0.dsc" at Sat Dec 7 04:04:00 UTC 2019. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:04:09 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:04:09 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb24d1bb534_653f2ad8858225fc2158a2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmocore failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 19s] WARNING: udev not running, creating extra device nodes [ 19s] logging output to //.build.log... [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/libosmocore_1.2.0.dsc ... [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmocore_1.2.0.dsc build ... [ 19s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running user-setup postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running base-files postinstall script [ 20s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] [1/252] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] installing [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] exit ... [ 21s] [ 21s] lamb62 failed "build libosmocore_1.2.0.dsc" at Sat Dec 7 04:03:54 UTC 2019. [ 21s] [ 21s] ### VM INTERACTION START ### [ 24s] [ 7.955005] sysrq: SysRq : Power Off [ 24s] [ 7.960078] reboot: Power down [ 24s] ### VM INTERACTION END ### [ 24s] [ 24s] lamb62 failed "build libosmocore_1.2.0.dsc" at Sat Dec 7 04:03:58 UTC 2019. [ 24s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:04:09 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:04:09 +0000 Subject: Build failure of network:osmocom:nightly/osmocom-nightly in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb24d270e69_653f2ad8858225fc216057@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmocom-nightly/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmocom-nightly failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmocom-nightly Last lines of build log: [ 17s] WARNING: udev not running, creating extra device nodes [ 17s] logging output to //.build.log... [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/osmocom-nightly_0.0.0.20191207.dsc ... [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmocom-nightly_0.0.0.20191207.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 17s] querying package ids... [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/192] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb16 failed "build osmocom-nightly_0.0.0.20191207.dsc" at Sat Dec 7 04:03:58 UTC 2019. [ 18s] [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.588492] sysrq: SysRq : Power Off [ 21s] [ 7.595752] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb16 failed "build osmocom-nightly_0.0.0.20191207.dsc" at Sat Dec 7 04:04:01 UTC 2019. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:04:09 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:04:09 +0000 Subject: Build failure of network:osmocom:nightly/orcania in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb24d2b4aa4_653f2ad8858225fc2161f1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/orcania/Debian_Unstable/x86_64 Package network:osmocom:nightly/orcania failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly orcania Last lines of build log: [ 17s] WARNING: udev not running, creating extra device nodes [ 17s] logging output to //.build.log... [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/orcania_1.2.9-5.dsc ... [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/orcania_1.2.9-5.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/249] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb11 failed "build orcania_1.2.9-5.dsc" at Sat Dec 7 04:03:58 UTC 2019. [ 18s] [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.477578] sysrq: SysRq : Power Off [ 21s] [ 7.486294] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb11 failed "build orcania_1.2.9-5.dsc" at Sat Dec 7 04:04:01 UTC 2019. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:04:09 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:04:09 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-dsp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb24d32726b_653f2ad8858225fc21628b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-dsp/Debian_Unstable/x86_64 Package network:osmocom:nightly/libosmo-dsp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-dsp Last lines of build log: [ 17s] WARNING: udev not running, creating extra device nodes [ 17s] logging output to //.build.log... [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/libosmodsp_0.4.0.dsc ... [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmodsp_0.4.0.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/230] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb04 failed "build libosmodsp_0.4.0.dsc" at Sat Dec 7 04:03:58 UTC 2019. [ 18s] [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.506478] sysrq: SysRq : Power Off [ 21s] [ 7.513238] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb04 failed "build libosmodsp_0.4.0.dsc" at Sat Dec 7 04:04:02 UTC 2019. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:04:09 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:04:09 +0000 Subject: Build failure of network:osmocom:latest/libgtpnl in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb24d3b1ca4_653f2ad8858225fc2164de@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libgtpnl/Debian_Unstable/x86_64 Package network:osmocom:latest/libgtpnl failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libgtpnl Last lines of build log: [ 18s] WARNING: udev not running, creating extra device nodes [ 18s] logging output to //.build.log... [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/libgtpnl_1.2.1.dsc ... [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libgtpnl_1.2.1.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/220] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb60 failed "build libgtpnl_1.2.1.dsc" at Sat Dec 7 04:04:00 UTC 2019. [ 19s] [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.418667] sysrq: SysRq : Power Off [ 22s] [ 7.427460] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb60 failed "build libgtpnl_1.2.1.dsc" at Sat Dec 7 04:04:03 UTC 2019. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:04:09 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:04:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-fl2k in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb24d4e8_653f2ad8858225fc2165c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-fl2k/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-fl2k failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-fl2k Last lines of build log: [ 17s] WARNING: udev not running, creating extra device nodes [ 17s] logging output to //.build.log... [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/osmo-fl2k_0.1.1.18.c196.dsc ... [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-fl2k_0.1.1.18.c196.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 17s] querying package ids... [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/224] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb12 failed "build osmo-fl2k_0.1.1.18.c196.dsc" at Sat Dec 7 04:04:00 UTC 2019. [ 18s] [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.586885] sysrq: SysRq : Power Off [ 21s] [ 7.593817] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb12 failed "build osmo-fl2k_0.1.1.18.c196.dsc" at Sat Dec 7 04:04:03 UTC 2019. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:04:09 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:04:09 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb24d479def_653f2ad8858225fc216650@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_Unstable/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 17s] WARNING: udev not running, creating extra device nodes [ 18s] logging output to //.build.log... [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/libosmocore_1.2.0.99.278a6.dsc ... [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmocore_1.2.0.99.278a6.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/254] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb59 failed "build libosmocore_1.2.0.99.278a6.dsc" at Sat Dec 7 04:04:01 UTC 2019. [ 19s] [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.457348] sysrq: SysRq : Power Off [ 22s] [ 7.463526] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb59 failed "build libosmocore_1.2.0.99.278a6.dsc" at Sat Dec 7 04:04:04 UTC 2019. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:04:26 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:04:26 +0000 Subject: Build failure of network:osmocom:nightly/rtl-sdr in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb24d51f36d_653f2ad8858225fc2167bb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/rtl-sdr/Debian_Unstable/x86_64 Package network:osmocom:nightly/rtl-sdr failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly rtl-sdr Last lines of build log: [ 17s] WARNING: udev not running, creating extra device nodes [ 17s] logging output to //.build.log... [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/rtl-sdr_0.5.4.21.b5af.dsc ... [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/rtl-sdr_0.5.4.21.b5af.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/223] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb72 failed "build rtl-sdr_0.5.4.21.b5af.dsc" at Sat Dec 7 04:04:08 UTC 2019. [ 18s] [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.388330] sysrq: SysRq : Power Off [ 21s] [ 7.396948] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb72 failed "build rtl-sdr_0.5.4.21.b5af.dsc" at Sat Dec 7 04:04:11 UTC 2019. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:04:26 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:04:26 +0000 Subject: Build failure of network:osmocom:latest/libosmo-dsp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb24d582282_653f2ad8858225fc21689d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-dsp/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-dsp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-dsp Last lines of build log: [ 27s] WARNING: udev not running, creating extra device nodes [ 27s] logging output to //.build.log... [ 28s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 28s] processing recipe /.build-srcdir/libosmodsp_0.4.0.dsc ... [ 28s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmodsp_0.4.0.dsc build ... [ 28s] running base-passwd preinstall script [ 28s] running base-passwd postinstall script [ 28s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 28s] running user-setup postinstall script [ 28s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 28s] running base-files postinstall script [ 28s] running gawk postinstall script [ 28s] querying package ids... [ 28s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 28s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] [1/230] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] installing [ 29s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] exit ... [ 29s] [ 29s] cloud105 failed "build libosmodsp_0.4.0.dsc" at Sat Dec 7 04:04:09 UTC 2019. [ 29s] [ 29s] ### VM INTERACTION START ### [ 32s] [ 14.261119] sysrq: SysRq : Power Off [ 32s] [ 14.266647] reboot: Power down [ 32s] ### VM INTERACTION END ### [ 32s] [ 32s] cloud105 failed "build libosmodsp_0.4.0.dsc" at Sat Dec 7 04:04:13 UTC 2019. [ 32s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:04:26 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:04:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb24d5dbb31_653f2ad8858225fc2169dd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 20s] WARNING: udev not running, creating extra device nodes [ 20s] logging output to //.build.log... [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/osmo-gsm-manuals-dev_0.2.0.13.0999.dsc ... [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-gsm-manuals-dev_0.2.0.13.0999.dsc build ... [ 20s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running user-setup postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running base-files postinstall script [ 20s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] [1/370] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] installing [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] exit ... [ 21s] [ 21s] lamb69 failed "build osmo-gsm-manuals-dev_0.2.0.13.0999.dsc" at Sat Dec 7 04:04:12 UTC 2019. [ 21s] [ 21s] ### VM INTERACTION START ### [ 24s] [ 7.484176] sysrq: SysRq : Power Off [ 24s] [ 7.492750] reboot: Power down [ 24s] ### VM INTERACTION END ### [ 24s] [ 24s] lamb69 failed "build osmo-gsm-manuals-dev_0.2.0.13.0999.dsc" at Sat Dec 7 04:04:15 UTC 2019. [ 24s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:04:26 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:04:26 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb24d637db7_653f2ad8858225fc2170e4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_Unstable/x86_64 Package network:osmocom:nightly/libasn1c failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 33s] WARNING: udev not running, creating extra device nodes [ 33s] logging output to //.build.log... [ 33s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 33s] processing recipe /.build-srcdir/libasn1c_0.9.32.dsc ... [ 33s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libasn1c_0.9.32.dsc build ... [ 33s] running base-passwd preinstall script [ 33s] running base-passwd postinstall script [ 33s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 33s] running user-setup postinstall script [ 33s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 33s] running base-files postinstall script [ 33s] running gawk postinstall script [ 33s] querying package ids... [ 33s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 33s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] [1/195] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] installing [ 34s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] exit ... [ 34s] [ 34s] cloud103 failed "build libasn1c_0.9.32.dsc" at Sat Dec 7 04:04:12 UTC 2019. [ 34s] [ 34s] ### VM INTERACTION START ### [ 37s] [ 13.775972] sysrq: SysRq : Power Off [ 37s] [ 13.780291] reboot: Power down [ 37s] ### VM INTERACTION END ### [ 37s] [ 37s] cloud103 failed "build libasn1c_0.9.32.dsc" at Sat Dec 7 04:04:16 UTC 2019. [ 37s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:04:26 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:04:26 +0000 Subject: Build failure of network:osmocom:latest/orcania in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb24d6c28bb_653f2ad8858225fc21712@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/orcania/Debian_Unstable/x86_64 Package network:osmocom:latest/orcania failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest orcania Last lines of build log: [ 32s] WARNING: udev not running, creating extra device nodes [ 32s] logging output to //.build.log... [ 32s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 32s] processing recipe /.build-srcdir/orcania_1.2.9-5.dsc ... [ 32s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/orcania_1.2.9-5.dsc build ... [ 32s] running base-passwd preinstall script [ 32s] running base-passwd postinstall script [ 32s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 32s] running user-setup postinstall script [ 32s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 32s] running base-files postinstall script [ 33s] running gawk postinstall script [ 33s] querying package ids... [ 33s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 33s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] [1/249] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] installing [ 34s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] exit ... [ 34s] [ 34s] wildcard2 failed "build orcania_1.2.9-5.dsc" at Sat Dec 7 04:04:14 UTC 2019. [ 34s] [ 34s] ### VM INTERACTION START ### [ 37s] [ 9.284927] sysrq: SysRq : Power Off [ 37s] [ 9.288795] reboot: Power down [ 37s] ### VM INTERACTION END ### [ 37s] [ 37s] wildcard2 failed "build orcania_1.2.9-5.dsc" at Sat Dec 7 04:04:18 UTC 2019. [ 37s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:04:26 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:04:26 +0000 Subject: Build failure of network:osmocom:latest/eclipse-titan in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb24d824f4e_653f2ad8858225fc21720@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/eclipse-titan/Debian_Unstable/x86_64 Package network:osmocom:latest/eclipse-titan failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest eclipse-titan Last lines of build log: [ 19s] WARNING: udev not running, creating extra device nodes [ 19s] logging output to //.build.log... [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/eclipse-titan_6.5.0-1.dsc ... [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/eclipse-titan_6.5.0-1.dsc build ... [ 19s] running base-passwd preinstall script [ 19s] running base-passwd postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running user-setup postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running base-files postinstall script [ 19s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] [1/284] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] installing [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] exit ... [ 20s] [ 20s] lamb53 failed "build eclipse-titan_6.5.0-1.dsc" at Sat Dec 7 04:04:19 UTC 2019. [ 20s] [ 20s] ### VM INTERACTION START ### [ 23s] [ 7.557729] sysrq: SysRq : Power Off [ 23s] [ 7.566629] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] lamb53 failed "build eclipse-titan_6.5.0-1.dsc" at Sat Dec 7 04:04:22 UTC 2019. [ 23s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:04:43 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:04:43 +0000 Subject: Build failure of network:osmocom:latest/libasn1c in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb24eea5ffa_653f2ad8858225fc2177ef@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libasn1c/Debian_Unstable/x86_64 Package network:osmocom:latest/libasn1c failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libasn1c Last lines of build log: [ 17s] WARNING: udev not running, creating extra device nodes [ 17s] logging output to //.build.log... [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/libasn1c_0.9.32.dsc ... [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libasn1c_0.9.32.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/195] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb01 failed "build libasn1c_0.9.32.dsc" at Sat Dec 7 04:04:32 UTC 2019. [ 18s] [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.406499] sysrq: SysRq : Power Off [ 21s] [ 7.414430] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb01 failed "build libasn1c_0.9.32.dsc" at Sat Dec 7 04:04:35 UTC 2019. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:05:01 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:05:01 +0000 Subject: Build failure of network:osmocom:latest/osmo-pcap in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb250e9dae8_653f2ad8858225fc21791@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-pcap/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-pcap failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-pcap Last lines of build log: [ 11s] WARNING: udev not running, creating extra device nodes [ 11s] logging output to //.build.log... [ 11s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] processing recipe /.build-srcdir/osmo-pcap_0.1.1.dsc ... [ 11s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-pcap_0.1.1.dsc build ... [ 11s] running base-passwd preinstall script [ 11s] running base-passwd postinstall script [ 11s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] running user-setup postinstall script [ 11s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 11s] running base-files postinstall script [ 11s] running gawk postinstall script [ 12s] querying package ids... [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] [1/247] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] installing [ 12s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] exit ... [ 12s] [ 12s] build83 failed "build osmo-pcap_0.1.1.dsc" at Sat Dec 7 04:04:46 UTC 2019. [ 12s] [ 12s] ### VM INTERACTION START ### [ 15s] [ 5.598684] sysrq: SysRq : Power Off [ 15s] [ 5.600586] reboot: Power down [ 15s] ### VM INTERACTION END ### [ 15s] [ 15s] build83 failed "build osmo-pcap_0.1.1.dsc" at Sat Dec 7 04:04:49 UTC 2019. [ 15s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:05:18 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:05:18 +0000 Subject: Build failure of network:osmocom:nightly/yder in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb250f4d8f6_653f2ad8858225fc218049@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/yder/Debian_Unstable/x86_64 Package network:osmocom:nightly/yder failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly yder Last lines of build log: [ 32s] WARNING: udev not running, creating extra device nodes [ 32s] logging output to //.build.log... [ 32s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 32s] processing recipe /.build-srcdir/yder_1.4.4-4.1.dsc ... [ 32s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/yder_1.4.4-4.1.dsc build ... [ 32s] running base-passwd preinstall script [ 32s] running base-passwd postinstall script [ 32s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 32s] running user-setup postinstall script [ 32s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 32s] running base-files postinstall script [ 32s] running gawk postinstall script [ 32s] querying package ids... [ 32s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 32s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 33s] [1/252] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 33s] installing [ 33s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 33s] exit ... [ 33s] [ 33s] cloud111 failed "build yder_1.4.4-4.1.dsc" at Sat Dec 7 04:05:08 UTC 2019. [ 33s] [ 33s] ### VM INTERACTION START ### [ 36s] [ 13.432510] sysrq: SysRq : Power Off [ 36s] [ 13.449236] reboot: Power down [ 36s] ### VM INTERACTION END ### [ 36s] [ 36s] cloud111 failed "build yder_1.4.4-4.1.dsc" at Sat Dec 7 04:05:12 UTC 2019. [ 36s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:05:35 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:05:35 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb252f1d484_653f2ad8858225fc21852d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_Unstable/x86_64 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: [ 18s] WARNING: udev not running, creating extra device nodes [ 18s] logging output to //.build.log... [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/libosmo-abis_0.7.0.7.d4be.dsc ... [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-abis_0.7.0.7.d4be.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/244] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb04 failed "build libosmo-abis_0.7.0.7.d4be.dsc" at Sat Dec 7 04:05:15 UTC 2019. [ 19s] [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.562213] sysrq: SysRq : Power Off [ 22s] [ 7.569688] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb04 failed "build libosmo-abis_0.7.0.7.d4be.dsc" at Sat Dec 7 04:05:18 UTC 2019. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:05:35 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:05:35 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb252f7093f_653f2ad8858225fc218653@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-pcap failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: [ 17s] WARNING: udev not running, creating extra device nodes [ 17s] logging output to //.build.log... [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/osmo-pcap_0.1.1.dsc ... [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-pcap_0.1.1.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/248] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb17 failed "build osmo-pcap_0.1.1.dsc" at Sat Dec 7 04:05:15 UTC 2019. [ 18s] [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.545256] sysrq: SysRq : Power Off [ 21s] [ 7.551666] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 22s] lamb17 failed "build osmo-pcap_0.1.1.dsc" at Sat Dec 7 04:05:19 UTC 2019. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:05:35 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:05:35 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb252faeb50_653f2ad8858225fc218797@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_Unstable/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 17s] WARNING: udev not running, creating extra device nodes [ 17s] logging output to //.build.log... [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/simtrace2_0.7.0.dsc ... [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/simtrace2_0.7.0.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/240] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb15 failed "build simtrace2_0.7.0.dsc" at Sat Dec 7 04:05:16 UTC 2019. [ 19s] [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.616760] sysrq: SysRq : Power Off [ 22s] [ 7.624321] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb15 failed "build simtrace2_0.7.0.dsc" at Sat Dec 7 04:05:19 UTC 2019. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:05:35 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:05:35 +0000 Subject: Build failure of network:osmocom:latest/yder in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb252ff382b_653f2ad8858225fc2188af@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/yder/Debian_Unstable/x86_64 Package network:osmocom:latest/yder failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest yder Last lines of build log: [ 19s] WARNING: udev not running, creating extra device nodes [ 19s] logging output to //.build.log... [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/yder_1.4.4-4.1.dsc ... [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/yder_1.4.4-4.1.dsc build ... [ 19s] running base-passwd preinstall script [ 19s] running base-passwd postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running user-setup postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running base-files postinstall script [ 19s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] [1/252] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] installing [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] exit ... [ 20s] [ 20s] lamb12 failed "build yder_1.4.4-4.1.dsc" at Sat Dec 7 04:05:16 UTC 2019. [ 20s] [ 20s] ### VM INTERACTION START ### [ 23s] [ 7.843322] sysrq: SysRq : Power Off [ 23s] [ 7.850279] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] lamb12 failed "build yder_1.4.4-4.1.dsc" at Sat Dec 7 04:05:19 UTC 2019. [ 23s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:05:35 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:05:35 +0000 Subject: Build failure of network:osmocom:latest/libosmo-abis in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb253048e62_653f2ad8858225fc218953@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-abis/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-abis failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-abis Last lines of build log: [ 17s] WARNING: udev not running, creating extra device nodes [ 17s] logging output to //.build.log... [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/libosmo-abis_0.7.0.dsc ... [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-abis_0.7.0.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/239] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb64 failed "build libosmo-abis_0.7.0.dsc" at Sat Dec 7 04:05:16 UTC 2019. [ 18s] [ 18s] ### VM INTERACTION START ### [ 22s] [ 7.581209] sysrq: SysRq : Power Off [ 22s] [ 7.588156] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb64 failed "build libosmo-abis_0.7.0.dsc" at Sat Dec 7 04:05:20 UTC 2019. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:05:52 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:05:52 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb2530a1035_653f2ad8858225fc21904c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 20s] WARNING: udev not running, creating extra device nodes [ 20s] logging output to //.build.log... [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/osmo-ggsn_1.4.0.32.bd8f.dsc ... [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-ggsn_1.4.0.32.bd8f.dsc build ... [ 20s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running user-setup postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running base-files postinstall script [ 20s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] [1/400] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] installing [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] exit ... [ 21s] [ 21s] lamb19 failed "build osmo-ggsn_1.4.0.32.bd8f.dsc" at Sat Dec 7 04:05:33 UTC 2019. [ 21s] [ 21s] ### VM INTERACTION START ### [ 24s] [ 7.806519] sysrq: SysRq : Power Off [ 24s] [ 7.812958] reboot: Power down [ 24s] ### VM INTERACTION END ### [ 24s] [ 24s] lamb19 failed "build osmo-ggsn_1.4.0.32.bd8f.dsc" at Sat Dec 7 04:05:36 UTC 2019. [ 24s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:06:09 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:06:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb254b671b3_653f2ad8858225fc2193a4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: [ 19s] WARNING: udev not running, creating extra device nodes [ 19s] logging output to //.build.log... [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/osmo-sip-connector_1.3.0.6.2e2d.dsc ... [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sip-connector_1.3.0.6.2e2d.dsc build ... [ 20s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running user-setup postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running base-files postinstall script [ 20s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] [1/412] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] installing [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] exit ... [ 21s] [ 21s] lamb09 failed "build osmo-sip-connector_1.3.0.6.2e2d.dsc" at Sat Dec 7 04:05:56 UTC 2019. [ 21s] [ 21s] ### VM INTERACTION START ### [ 24s] [ 7.576141] sysrq: SysRq : Power Off [ 24s] [ 7.584930] reboot: Power down [ 24s] ### VM INTERACTION END ### [ 24s] [ 24s] lamb09 failed "build osmo-sip-connector_1.3.0.6.2e2d.dsc" at Sat Dec 7 04:05:59 UTC 2019. [ 24s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:06:09 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:06:09 +0000 Subject: Build failure of network:osmocom:latest/simtrace2 in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb254c4decb_653f2ad8858225fc2195b7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/simtrace2/Debian_Unstable/x86_64 Package network:osmocom:latest/simtrace2 failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest simtrace2 Last lines of build log: [ 17s] WARNING: udev not running, creating extra device nodes [ 17s] logging output to //.build.log... [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/simtrace2_0.5.2.dsc ... [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/simtrace2_0.5.2.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/239] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb72 failed "build simtrace2_0.5.2.dsc" at Sat Dec 7 04:06:02 UTC 2019. [ 18s] [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.569603] sysrq: SysRq : Power Off [ 21s] [ 7.576568] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb72 failed "build simtrace2_0.5.2.dsc" at Sat Dec 7 04:06:05 UTC 2019. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:06:09 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:06:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb254ca4068_653f2ad8858225fc2196ad@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: [ 36s] WARNING: udev not running, creating extra device nodes [ 36s] logging output to //.build.log... [ 36s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 36s] processing recipe /.build-srcdir/osmo-pcu_0.7.0.56.30f6.dsc ... [ 36s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-pcu_0.7.0.56.30f6.dsc build ... [ 37s] running base-passwd preinstall script [ 37s] running base-passwd postinstall script [ 37s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 37s] running user-setup postinstall script [ 37s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 37s] running base-files postinstall script [ 38s] running gawk postinstall script [ 39s] querying package ids... [ 39s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 39s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 40s] [1/387] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 40s] installing [ 40s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 40s] exit ... [ 40s] [ 40s] wildcard2 failed "build osmo-pcu_0.7.0.56.30f6.dsc" at Sat Dec 7 04:06:00 UTC 2019. [ 40s] [ 40s] ### VM INTERACTION START ### [ 43s] [ 15.657535] sysrq: SysRq : Power Off [ 43s] [ 15.659949] reboot: Power down [ 45s] ### VM INTERACTION END ### [ 45s] [ 45s] wildcard2 failed "build osmo-pcu_0.7.0.56.30f6.dsc" at Sat Dec 7 04:06:06 UTC 2019. [ 45s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:06:26 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:06:26 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb254d69b68_653f2ad8858225fc219763@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_Unstable/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 14s] WARNING: udev not running, creating extra device nodes [ 14s] logging output to //.build.log... [ 14s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] processing recipe /.build-srcdir/libosmo-netif_0.6.0.16.6413.dsc ... [ 14s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-netif_0.6.0.16.6413.dsc build ... [ 14s] running base-passwd preinstall script [ 14s] running base-passwd postinstall script [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] running user-setup postinstall script [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] running base-files postinstall script [ 14s] running gawk postinstall script [ 15s] querying package ids... [ 15s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] [1/252] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] installing [ 15s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] exit ... [ 15s] [ 15s] sheep82 failed "build libosmo-netif_0.6.0.16.6413.dsc" at Sat Dec 7 04:06:07 UTC 2019. [ 15s] [ 15s] ### VM INTERACTION START ### [ 18s] [ 7.762725] sysrq: SysRq : Power Off [ 18s] [ 7.772924] reboot: Power down [ 18s] ### VM INTERACTION END ### [ 18s] [ 18s] sheep82 failed "build libosmo-netif_0.6.0.16.6413.dsc" at Sat Dec 7 04:06:11 UTC 2019. [ 18s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:06:26 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:06:26 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb254dc1bee_653f2ad8858225fc2198ec@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Unstable/x86_64 Package network:osmocom:nightly/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 13s] WARNING: udev not running, creating extra device nodes [ 13s] logging output to //.build.log... [ 13s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] processing recipe /.build-srcdir/ulfius_2.5.2-4.1.dsc ... [ 13s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/ulfius_2.5.2-4.1.dsc build ... [ 13s] running base-passwd preinstall script [ 14s] running base-passwd postinstall script [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] running user-setup postinstall script [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] running base-files postinstall script [ 14s] running gawk postinstall script [ 14s] querying package ids... [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] [1/260] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] installing [ 14s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] exit ... [ 14s] [ 14s] sheep84 failed "build ulfius_2.5.2-4.1.dsc" at Sat Dec 7 04:06:08 UTC 2019. [ 14s] [ 14s] ### VM INTERACTION START ### [ 17s] [ 7.803426] sysrq: SysRq : Power Off [ 17s] [ 7.813744] reboot: Power down [ 17s] ### VM INTERACTION END ### [ 17s] [ 17s] sheep84 failed "build ulfius_2.5.2-4.1.dsc" at Sat Dec 7 04:06:12 UTC 2019. [ 17s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:06:26 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:06:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb254e8dfe9_653f2ad8858225fc21996f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: [ 20s] WARNING: udev not running, creating extra device nodes [ 20s] logging output to //.build.log... [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/osmo-bts_1.1.0.90.99ba.dsc ... [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-bts_1.1.0.90.99ba.dsc build ... [ 20s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running user-setup postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running base-files postinstall script [ 20s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] [1/399] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] installing [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] exit ... [ 21s] [ 21s] lamb15 failed "build osmo-bts_1.1.0.90.99ba.dsc" at Sat Dec 7 04:06:19 UTC 2019. [ 21s] [ 21s] ### VM INTERACTION START ### [ 24s] [ 7.790203] sysrq: SysRq : Power Off [ 24s] [ 7.798705] reboot: Power down [ 24s] ### VM INTERACTION END ### [ 24s] [ 24s] lamb15 failed "build osmo-bts_1.1.0.90.99ba.dsc" at Sat Dec 7 04:06:22 UTC 2019. [ 24s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:06:43 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:06:43 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb256853cb6_653f2ad8858225fc220195@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 17s] WARNING: udev not running, creating extra device nodes [ 17s] logging output to //.build.log... [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/ulfius_2.5.2-4.1.dsc ... [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/ulfius_2.5.2-4.1.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/260] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb64 failed "build ulfius_2.5.2-4.1.dsc" at Sat Dec 7 04:06:23 UTC 2019. [ 18s] [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.643613] sysrq: SysRq : Power Off [ 21s] [ 7.652110] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb64 failed "build ulfius_2.5.2-4.1.dsc" at Sat Dec 7 04:06:26 UTC 2019. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:07:18 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:07:18 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sysmon in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb2587bbb92_653f2ad8858225fc220253@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sysmon/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-sysmon failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sysmon Last lines of build log: [ 17s] WARNING: udev not running, creating extra device nodes [ 17s] logging output to //.build.log... [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/osmo-sysmon_0.2.0.4.8984.dsc ... [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sysmon_0.2.0.4.8984.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 17s] querying package ids... [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/214] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb21 failed "build osmo-sysmon_0.2.0.4.8984.dsc" at Sat Dec 7 04:07:06 UTC 2019. [ 18s] [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.519766] sysrq: SysRq : Power Off [ 21s] [ 7.528410] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb21 failed "build osmo-sysmon_0.2.0.4.8984.dsc" at Sat Dec 7 04:07:09 UTC 2019. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:07:18 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:07:18 +0000 Subject: Build failure of network:osmocom:latest/libosmo-netif in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb25881e73d_653f2ad8858225fc2203b6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-netif/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-netif failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-netif Last lines of build log: [ 17s] WARNING: udev not running, creating extra device nodes [ 17s] logging output to //.build.log... [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/libosmo-netif_0.6.0.dsc ... [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-netif_0.6.0.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/252] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb09 failed "build libosmo-netif_0.6.0.dsc" at Sat Dec 7 04:07:09 UTC 2019. [ 18s] [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.376496] sysrq: SysRq : Power Off [ 21s] [ 7.384947] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb09 failed "build libosmo-netif_0.6.0.dsc" at Sat Dec 7 04:07:11 UTC 2019. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:07:18 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:07:18 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb2588635cf_653f2ad8858225fc22046@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_Unstable/x86_64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: [ 20s] WARNING: udev not running, creating extra device nodes [ 20s] logging output to //.build.log... [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/libosmo-sccp_1.1.0.66.ee6e.dsc ... [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-sccp_1.1.0.66.ee6e.dsc build ... [ 20s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running user-setup postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running base-files postinstall script [ 20s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] [1/409] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] installing [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] exit ... [ 21s] [ 21s] lamb15 failed "build libosmo-sccp_1.1.0.66.ee6e.dsc" at Sat Dec 7 04:07:08 UTC 2019. [ 21s] [ 22s] ### VM INTERACTION START ### [ 25s] [ 7.905832] sysrq: SysRq : Power Off [ 25s] [ 7.917072] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb15 failed "build libosmo-sccp_1.1.0.66.ee6e.dsc" at Sat Dec 7 04:07:12 UTC 2019. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:07:35 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:07:35 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb25a1ce3dc_653f2ad8858225fc22052@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 20s] WARNING: udev not running, creating extra device nodes [ 20s] logging output to //.build.log... [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/osmo-hlr_1.1.0.25.80dc.dsc ... [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-hlr_1.1.0.25.80dc.dsc build ... [ 20s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running user-setup postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running base-files postinstall script [ 20s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] [1/399] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] installing [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] exit ... [ 21s] [ 21s] lamb53 failed "build osmo-hlr_1.1.0.25.80dc.dsc" at Sat Dec 7 04:07:14 UTC 2019. [ 21s] [ 21s] ### VM INTERACTION START ### [ 25s] [ 7.811350] sysrq: SysRq : Power Off [ 25s] [ 7.821554] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb53 failed "build osmo-hlr_1.1.0.25.80dc.dsc" at Sat Dec 7 04:07:18 UTC 2019. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:07:35 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:07:35 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb25a2237d1_653f2ad8858225fc22061c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 21s] WARNING: udev not running, creating extra device nodes [ 21s] logging output to //.build.log... [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] processing recipe /.build-srcdir/osmo-mgw_1.6.0.29.73f9c.dsc ... [ 21s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-mgw_1.6.0.29.73f9c.dsc build ... [ 21s] running base-passwd preinstall script [ 22s] running base-passwd postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running user-setup postinstall script [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] running base-files postinstall script [ 22s] running gawk postinstall script [ 22s] querying package ids... [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/388] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 23s] exit ... [ 23s] [ 23s] lamb61 failed "build osmo-mgw_1.6.0.29.73f9c.dsc" at Sat Dec 7 04:07:15 UTC 2019. [ 23s] [ 23s] ### VM INTERACTION START ### [ 26s] [ 7.822053] sysrq: SysRq : Power Off [ 26s] [ 7.828949] reboot: Power down [ 26s] ### VM INTERACTION END ### [ 26s] [ 26s] lamb61 failed "build osmo-mgw_1.6.0.29.73f9c.dsc" at Sat Dec 7 04:07:19 UTC 2019. [ 26s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:07:35 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:07:35 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb25a26576d_653f2ad8858225fc2207d9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 20s] WARNING: udev not running, creating extra device nodes [ 20s] logging output to //.build.log... [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/osmo-remsim_0.2.2.10.4b75.dsc ... [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-remsim_0.2.2.10.4b75.dsc build ... [ 20s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running user-setup postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running base-files postinstall script [ 21s] running gawk postinstall script [ 21s] querying package ids... [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] [1/446] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] installing [ 22s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 22s] exit ... [ 22s] [ 22s] lamb25 failed "build osmo-remsim_0.2.2.10.4b75.dsc" at Sat Dec 7 04:07:15 UTC 2019. [ 22s] [ 22s] ### VM INTERACTION START ### [ 25s] [ 7.932996] sysrq: SysRq : Power Off [ 25s] [ 7.939911] reboot: Power down [ 25s] ### VM INTERACTION END ### [ 25s] [ 25s] lamb25 failed "build osmo-remsim_0.2.2.10.4b75.dsc" at Sat Dec 7 04:07:19 UTC 2019. [ 25s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:08:09 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:08:09 +0000 Subject: Build failure of network:osmocom:latest/osmo-sysmon in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb25c199868_653f2ad8858225fc2208bb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sysmon/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-sysmon failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sysmon Last lines of build log: [ 17s] WARNING: udev not running, creating extra device nodes [ 17s] logging output to //.build.log... [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/osmo-sysmon_0.2.0.dsc ... [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sysmon_0.2.0.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 17s] querying package ids... [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/214] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb18 failed "build osmo-sysmon_0.2.0.dsc" at Sat Dec 7 04:07:59 UTC 2019. [ 18s] [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.415609] sysrq: SysRq : Power Off [ 21s] [ 7.423007] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb18 failed "build osmo-sysmon_0.2.0.dsc" at Sat Dec 7 04:08:03 UTC 2019. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:08:09 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:08:09 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb25c1f30b8_653f2ad8858225fc2209fb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_Unstable/x86_64 Package network:osmocom:latest/openbsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 17s] WARNING: udev not running, creating extra device nodes [ 17s] logging output to //.build.log... [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/openbsc_1.3.1.dsc ... [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/openbsc_1.3.1.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 17s] querying package ids... [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/230] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb16 failed "build openbsc_1.3.1.dsc" at Sat Dec 7 04:08:01 UTC 2019. [ 18s] [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.430639] sysrq: SysRq : Power Off [ 21s] [ 7.439753] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb16 failed "build openbsc_1.3.1.dsc" at Sat Dec 7 04:08:04 UTC 2019. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:08:09 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:08:09 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb25c250471_653f2ad8858225fc22109b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-iuh failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 17s] WARNING: udev not running, creating extra device nodes [ 17s] logging output to //.build.log... [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/osmo-iuh_0.5.0.dsc ... [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-iuh_0.5.0.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/252] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb17 failed "build osmo-iuh_0.5.0.dsc" at Sat Dec 7 04:08:01 UTC 2019. [ 18s] [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.466961] sysrq: SysRq : Power Off [ 21s] [ 7.474623] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb17 failed "build osmo-iuh_0.5.0.dsc" at Sat Dec 7 04:08:04 UTC 2019. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:08:26 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:08:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb25c2c47df_653f2ad8858225fc2211e8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 20s] WARNING: udev not running, creating extra device nodes [ 20s] logging output to //.build.log... [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/osmo-bsc_1.5.0.42.01a3c.dsc ... [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-bsc_1.5.0.42.01a3c.dsc build ... [ 20s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running user-setup postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running base-files postinstall script [ 20s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] [1/404] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] installing [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] exit ... [ 21s] [ 21s] lamb05 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 04:08:22 UTC 2019. [ 21s] [ 21s] ### VM INTERACTION START ### [ 24s] [ 7.694048] sysrq: SysRq : Power Off [ 24s] [ 7.702216] reboot: Power down [ 24s] ### VM INTERACTION END ### [ 24s] [ 24s] lamb05 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 04:08:25 UTC 2019. [ 24s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:08:26 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:08:26 +0000 Subject: Build failure of network:osmocom:nightly/openbsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb25c3455ee_653f2ad8858225fc221273@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/Debian_Unstable/x86_64 Package network:osmocom:nightly/openbsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 18s] WARNING: udev not running, creating extra device nodes [ 18s] logging output to //.build.log... [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/openbsc_1.3.1.20191207.dsc ... [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/openbsc_1.3.1.20191207.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/230] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb19 failed "build openbsc_1.3.1.20191207.dsc" at Sat Dec 7 04:08:16 UTC 2019. [ 19s] [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.744660] sysrq: SysRq : Power Off [ 22s] [ 7.753199] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb19 failed "build openbsc_1.3.1.20191207.dsc" at Sat Dec 7 04:08:19 UTC 2019. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:08:26 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:08:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb25c397309_653f2ad8858225fc2213f7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 17s] WARNING: udev not running, creating extra device nodes [ 17s] logging output to //.build.log... [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/osmo-iuh_0.5.0.20.cc09.dsc ... [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-iuh_0.5.0.20.cc09.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/252] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb58 failed "build osmo-iuh_0.5.0.20.cc09.dsc" at Sat Dec 7 04:08:17 UTC 2019. [ 18s] [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.423765] sysrq: SysRq : Power Off [ 21s] [ 7.431878] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb58 failed "build osmo-iuh_0.5.0.20.cc09.dsc" at Sat Dec 7 04:08:20 UTC 2019. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:09:18 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:09:18 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb25fc56245_653f2ad8858225fc22157b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 20s] WARNING: udev not running, creating extra device nodes [ 20s] logging output to //.build.log... [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/osmo-msc_1.5.0.66.abbdb.dsc ... [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-msc_1.5.0.66.abbdb.dsc build ... [ 20s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running user-setup postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running base-files postinstall script [ 20s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] [1/413] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] installing [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] exit ... [ 21s] [ 21s] lamb09 failed "build osmo-msc_1.5.0.66.abbdb.dsc" at Sat Dec 7 04:09:06 UTC 2019. [ 21s] [ 21s] ### VM INTERACTION START ### [ 24s] [ 7.794761] sysrq: SysRq : Power Off [ 24s] [ 7.803712] reboot: Power down [ 24s] ### VM INTERACTION END ### [ 24s] [ 24s] lamb09 failed "build osmo-msc_1.5.0.66.abbdb.dsc" at Sat Dec 7 04:09:09 UTC 2019. [ 24s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 04:09:18 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 04:09:18 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deb25fcb7b2_653f2ad8858225fc2214ad@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 20s] WARNING: udev not running, creating extra device nodes [ 20s] logging output to //.build.log... [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] processing recipe /.build-srcdir/osmo-sgsn_1.5.0.90.de67c.dsc ... [ 20s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sgsn_1.5.0.90.de67c.dsc build ... [ 20s] running base-passwd preinstall script [ 20s] running base-passwd postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running user-setup postinstall script [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] running base-files postinstall script [ 20s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] [1/410] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] installing [ 21s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 21s] exit ... [ 21s] [ 21s] lamb15 failed "build osmo-sgsn_1.5.0.90.de67c.dsc" at Sat Dec 7 04:09:06 UTC 2019. [ 21s] [ 21s] ### VM INTERACTION START ### [ 24s] [ 7.659842] sysrq: SysRq : Power Off [ 24s] [ 7.667133] reboot: Power down [ 24s] ### VM INTERACTION END ### [ 24s] [ 24s] lamb15 failed "build osmo-sgsn_1.5.0.90.de67c.dsc" at Sat Dec 7 04:09:09 UTC 2019. [ 24s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 13:09:22 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 13:09:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5deba48ea6855_653f2ad8858225fc2849fe@build.opensuse.org> 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: [ 382s] [ 382s] Error: [Errno 2] No such file or directory [ 382s] [ 382s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:61: recipe for target 'osmux-reference.pdf' failed [ 382s] make[4]: *** [osmux-reference.pdf] Error 1 [ 382s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 382s] Makefile:387: recipe for target 'all-recursive' failed [ 382s] make[3]: *** [all-recursive] Error 1 [ 382s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 382s] Makefile:448: recipe for target 'all-recursive' failed [ 382s] make[2]: *** [all-recursive] Error 1 [ 382s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 382s] Makefile:380: recipe for target 'all' failed [ 382s] make[1]: *** [all] Error 2 [ 382s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 382s] dh_auto_build: make -j1 returned exit code 2 [ 382s] debian/rules:45: recipe for target 'build' failed [ 382s] make: *** [build] Error 2 [ 382s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 382s] [ 382s] obs-arm-5 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 13:09:17 UTC 2019. [ 382s] [ 382s] ### VM INTERACTION START ### [ 385s] [ 356.470972] sysrq: SysRq : Power Off [ 385s] [ 356.473612] reboot: Power down [ 386s] ### VM INTERACTION END ### [ 386s] [ 386s] obs-arm-5 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 13:09:21 UTC 2019. [ 386s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 14:16:37 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 14:16:37 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_10/armv7l In-Reply-To: References: Message-ID: <5debb46b36f2b_653f2ad8858225fc3096eb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_10/armv7l Package network:osmocom:nightly/osmo-bsc failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 832s] Cannot convert 'osmux-reference__7.png' to pdf [ 832s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 832s] [ 832s] A possible reason for transformation failure is invalid DocBook [ 832s] (as reported by xmllint) [ 832s] [ 832s] Error: [Errno 2] No such file or directory [ 832s] [ 832s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 832s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 832s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 832s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 832s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 832s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 832s] make[1]: *** [Makefile:380: all] Error 2 [ 832s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 832s] dh_auto_build: make -j1 returned exit code 2 [ 832s] make: *** [debian/rules:45: build] Error 2 [ 832s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 832s] [ 832s] armbuild19 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 14:16:18 UTC 2019. [ 832s] [ 832s] ### VM INTERACTION START ### [ 836s] [ 724.071561] sysrq: SysRq : Power Off [ 836s] [ 724.073656] reboot: Power down [ 837s] ### VM INTERACTION END ### [ 837s] [ 837s] armbuild19 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 14:16:23 UTC 2019. [ 837s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 14:56:43 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 14:56:43 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5debbdbfd11e0_653f2ad8858225fc3228b8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Raspbian_10/armv7l Package network:osmocom:nightly/osmo-bsc failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 893s] Cannot convert 'osmux-reference__7.png' to pdf [ 893s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 893s] [ 893s] A possible reason for transformation failure is invalid DocBook [ 893s] (as reported by xmllint) [ 893s] [ 893s] Error: [Errno 2] No such file or directory [ 893s] [ 893s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 893s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 893s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 893s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 893s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 893s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 893s] make[1]: *** [Makefile:380: all] Error 2 [ 893s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 893s] dh_auto_build: make -j1 returned exit code 2 [ 893s] make: *** [debian/rules:45: build] Error 2 [ 893s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 893s] [ 893s] obs-arm-6 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 14:56:23 UTC 2019. [ 893s] [ 893s] ### VM INTERACTION START ### [ 896s] [ 851.148535] sysrq: SysRq : Power Off [ 896s] [ 851.162553] reboot: Power down [ 898s] ### VM INTERACTION END ### [ 898s] [ 898s] obs-arm-6 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 14:56:28 UTC 2019. [ 898s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 7 22:27:07 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 07 Dec 2019 22:27:07 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5dec2756c3ee7_653f2ad8858225fc4051dd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 471s] Cannot convert 'osmux-reference__7.png' to pdf [ 471s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 471s] [ 471s] A possible reason for transformation failure is invalid DocBook [ 471s] (as reported by xmllint) [ 471s] [ 471s] Error: [Errno 2] No such file or directory [ 471s] [ 471s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 471s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 471s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 471s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 471s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 471s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 471s] make[1]: *** [Makefile:380: all] Error 2 [ 471s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 471s] dh_auto_build: make -j1 returned exit code 2 [ 471s] make: *** [debian/rules:45: build] Error 255 [ 471s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 471s] [ 471s] lamb09 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 22:27:01 UTC 2019. [ 471s] [ 471s] ### VM INTERACTION START ### [ 474s] [ 455.622981] sysrq: SysRq : Power Off [ 474s] [ 455.631987] reboot: Power down [ 474s] ### VM INTERACTION END ### [ 474s] [ 474s] lamb09 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sat Dec 7 22:27:05 UTC 2019. [ 474s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 01:04:32 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 01:04:32 +0000 Subject: Build failure of network:osmocom:latest/osmocom-latest in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5dec4c2470f65_653f2ad8858225fc457315@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmocom-latest/Debian_Unstable/x86_64 Package network:osmocom:latest/osmocom-latest failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmocom-latest Last lines of build log: [ 12s] WARNING: udev not running, creating extra device nodes [ 13s] logging output to //.build.log... [ 13s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] processing recipe /.build-srcdir/osmocom-latest_0.0.0.dsc ... [ 13s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmocom-latest_0.0.0.dsc build ... [ 13s] running base-passwd preinstall script [ 13s] running base-passwd postinstall script [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] running user-setup postinstall script [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] running base-files postinstall script [ 13s] running gawk postinstall script [ 13s] querying package ids... [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] [1/192] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] installing [ 13s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] exit ... [ 13s] [ 13s] build84 failed "build osmocom-latest_0.0.0.dsc" at Sun Dec 8 01:04:23 UTC 2019. [ 13s] [ 13s] ### VM INTERACTION START ### [ 16s] [ 5.748956] sysrq: SysRq : Power Off [ 16s] [ 5.751145] reboot: Power down [ 16s] ### VM INTERACTION END ### [ 16s] [ 16s] build84 failed "build osmocom-latest_0.0.0.dsc" at Sun Dec 8 01:04:26 UTC 2019. [ 16s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 01:04:32 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 01:04:32 +0000 Subject: Build failure of network:osmocom:latest/libasn1c in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5dec4c24cffe9_653f2ad8858225fc4574bb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libasn1c/Debian_Unstable/x86_64 Package network:osmocom:latest/libasn1c failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libasn1c Last lines of build log: [ 14s] WARNING: udev not running, creating extra device nodes [ 14s] logging output to //.build.log... [ 14s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] processing recipe /.build-srcdir/libasn1c_0.9.32.dsc ... [ 14s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libasn1c_0.9.32.dsc build ... [ 14s] running base-passwd preinstall script [ 14s] running base-passwd postinstall script [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] running user-setup postinstall script [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] running base-files postinstall script [ 14s] running gawk postinstall script [ 14s] querying package ids... [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] [1/195] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] installing [ 14s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] exit ... [ 15s] [ 15s] build82 failed "build libasn1c_0.9.32.dsc" at Sun Dec 8 01:04:24 UTC 2019. [ 15s] [ 15s] ### VM INTERACTION START ### [ 18s] [ 6.448309] sysrq: SysRq : Power Off [ 18s] [ 6.451637] reboot: Power down [ 18s] ### VM INTERACTION END ### [ 18s] [ 18s] build82 failed "build libasn1c_0.9.32.dsc" at Sun Dec 8 01:04:28 UTC 2019. [ 18s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 01:04:32 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 01:04:32 +0000 Subject: Build failure of network:osmocom:latest/orcania in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5dec4c24243ab_653f2ad8858225fc4572dd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/orcania/Debian_Unstable/x86_64 Package network:osmocom:latest/orcania failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest orcania Last lines of build log: [ 17s] WARNING: udev not running, creating extra device nodes [ 17s] logging output to //.build.log... [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/orcania_1.2.9-5.dsc ... [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/orcania_1.2.9-5.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/249] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] build83 failed "build orcania_1.2.9-5.dsc" at Sun Dec 8 01:04:22 UTC 2019. [ 18s] [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.629063] sysrq: SysRq : Power Off [ 21s] [ 7.632308] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] build83 failed "build orcania_1.2.9-5.dsc" at Sun Dec 8 01:04:26 UTC 2019. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 01:04:49 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 01:04:49 +0000 Subject: Build failure of network:osmocom:latest/libosmo-dsp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5dec4c3f76cc9_653f2ad8858225fc45769a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-dsp/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-dsp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-dsp Last lines of build log: [ 24s] WARNING: udev not running, creating extra device nodes [ 24s] logging output to //.build.log... [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] processing recipe /.build-srcdir/libosmodsp_0.4.0.dsc ... [ 24s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmodsp_0.4.0.dsc build ... [ 25s] running base-passwd preinstall script [ 25s] running base-passwd postinstall script [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] running user-setup postinstall script [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 25s] running base-files postinstall script [ 25s] running gawk postinstall script [ 25s] querying package ids... [ 25s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] [1/230] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] installing [ 26s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] exit ... [ 26s] [ 26s] build34 failed "build libosmodsp_0.4.0.dsc" at Sun Dec 8 01:04:34 UTC 2019. [ 26s] [ 26s] ### VM INTERACTION START ### [ 29s] [ 10.611047] sysrq: SysRq : Power Off [ 29s] [ 10.666131] reboot: Power down [ 29s] ### VM INTERACTION END ### [ 29s] [ 29s] build34 failed "build libosmodsp_0.4.0.dsc" at Sun Dec 8 01:04:37 UTC 2019. [ 29s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 01:05:06 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 01:05:06 +0000 Subject: Build failure of network:osmocom:latest/eclipse-titan in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5dec4c5e99a6e_653f2ad8858225fc457852@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/eclipse-titan/Debian_Unstable/x86_64 Package network:osmocom:latest/eclipse-titan failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest eclipse-titan Last lines of build log: [ 34s] WARNING: udev not running, creating extra device nodes [ 34s] logging output to //.build.log... [ 34s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] processing recipe /.build-srcdir/eclipse-titan_6.5.0-1.dsc ... [ 34s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/eclipse-titan_6.5.0-1.dsc build ... [ 34s] running base-passwd preinstall script [ 34s] running base-passwd postinstall script [ 34s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] running user-setup postinstall script [ 34s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] running base-files postinstall script [ 34s] running gawk postinstall script [ 35s] querying package ids... [ 35s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 35s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 36s] [1/284] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 36s] installing [ 36s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 36s] exit ... [ 36s] [ 36s] cloud112 failed "build eclipse-titan_6.5.0-1.dsc" at Sun Dec 8 01:04:58 UTC 2019. [ 36s] [ 36s] ### VM INTERACTION START ### [ 39s] [ 18.270151] sysrq: SysRq : Power Off [ 39s] [ 18.306060] reboot: Power down [ 39s] ### VM INTERACTION END ### [ 39s] [ 39s] cloud112 failed "build eclipse-titan_6.5.0-1.dsc" at Sun Dec 8 01:05:02 UTC 2019. [ 39s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 01:05:06 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 01:05:06 +0000 Subject: Build failure of network:osmocom:latest/libsmpp34 in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5dec4c5f31cb0_653f2ad8858225fc4579b8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libsmpp34/Debian_Unstable/x86_64 Package network:osmocom:latest/libsmpp34 failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libsmpp34 Last lines of build log: [ 29s] WARNING: udev not running, creating extra device nodes [ 29s] logging output to //.build.log... [ 29s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] processing recipe /.build-srcdir/libsmpp34_1.14.0.dsc ... [ 29s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libsmpp34_1.14.0.dsc build ... [ 29s] running base-passwd preinstall script [ 29s] running base-passwd postinstall script [ 29s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] running user-setup postinstall script [ 29s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 29s] running base-files postinstall script [ 29s] running gawk postinstall script [ 30s] querying package ids... [ 30s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 30s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 30s] [1/221] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 30s] installing [ 30s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 30s] exit ... [ 30s] [ 30s] cloud116 failed "build libsmpp34_1.14.0.dsc" at Sun Dec 8 01:04:46 UTC 2019. [ 30s] [ 30s] ### VM INTERACTION START ### [ 33s] [ 14.002097] sysrq: SysRq : Power Off [ 33s] [ 14.008413] reboot: Power down [ 33s] ### VM INTERACTION END ### [ 33s] [ 33s] cloud116 failed "build libsmpp34_1.14.0.dsc" at Sun Dec 8 01:04:50 UTC 2019. [ 33s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 01:05:06 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 01:05:06 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5dec4c5fe301c_653f2ad8858225fc4580d9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmocore failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 34s] WARNING: udev not running, creating extra device nodes [ 34s] logging output to //.build.log... [ 34s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 34s] processing recipe /.build-srcdir/libosmocore_1.2.0.dsc ... [ 34s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmocore_1.2.0.dsc build ... [ 35s] running base-passwd preinstall script [ 35s] running base-passwd postinstall script [ 35s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 35s] running user-setup postinstall script [ 35s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 35s] running base-files postinstall script [ 35s] running gawk postinstall script [ 36s] querying package ids... [ 36s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 36s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 36s] [1/252] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 36s] installing [ 36s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 36s] exit ... [ 36s] [ 36s] build32 failed "build libosmocore_1.2.0.dsc" at Sun Dec 8 01:04:55 UTC 2019. [ 36s] [ 36s] ### VM INTERACTION START ### [ 40s] [ 11.272303] sysrq: SysRq : Power Off [ 40s] [ 11.303496] reboot: Power down [ 40s] ### VM INTERACTION END ### [ 40s] [ 40s] build32 failed "build libosmocore_1.2.0.dsc" at Sun Dec 8 01:04:59 UTC 2019. [ 40s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 01:05:23 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 01:05:23 +0000 Subject: Build failure of network:osmocom:latest/libgtpnl in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5dec4c60e0629_653f2ad8858225fc4582da@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libgtpnl/Debian_Unstable/x86_64 Package network:osmocom:latest/libgtpnl failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libgtpnl Last lines of build log: [ 51s] WARNING: udev not running, creating extra device nodes [ 51s] logging output to //.build.log... [ 51s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 51s] processing recipe /.build-srcdir/libgtpnl_1.2.1.dsc ... [ 51s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libgtpnl_1.2.1.dsc build ... [ 51s] running base-passwd preinstall script [ 51s] running base-passwd postinstall script [ 51s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 51s] running user-setup postinstall script [ 51s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 51s] running base-files postinstall script [ 51s] running gawk postinstall script [ 52s] querying package ids... [ 52s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 52s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 52s] [1/220] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 52s] installing [ 52s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 52s] exit ... [ 52s] [ 52s] cloud109 failed "build libgtpnl_1.2.1.dsc" at Sun Dec 8 01:05:03 UTC 2019. [ 52s] [ 52s] ### VM INTERACTION START ### [ 56s] [ 33.221978] sysrq: SysRq : Power Off [ 56s] [ 33.227577] reboot: Power down [ 56s] ### VM INTERACTION END ### [ 56s] [ 56s] cloud109 failed "build libgtpnl_1.2.1.dsc" at Sun Dec 8 01:05:07 UTC 2019. [ 56s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 01:05:57 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 01:05:57 +0000 Subject: Build failure of network:osmocom:latest/simtrace2 in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5dec4c7c45372_653f2ad8858225fc4583ad@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/simtrace2/Debian_Unstable/x86_64 Package network:osmocom:latest/simtrace2 failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest simtrace2 Last lines of build log: [ 19s] WARNING: udev not running, creating extra device nodes [ 19s] logging output to //.build.log... [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/simtrace2_0.5.2.dsc ... [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/simtrace2_0.5.2.dsc build ... [ 19s] running base-passwd preinstall script [ 19s] running base-passwd postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running user-setup postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running base-files postinstall script [ 19s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] [1/239] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] installing [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] exit ... [ 20s] [ 20s] lamb11 failed "build simtrace2_0.5.2.dsc" at Sun Dec 8 01:05:50 UTC 2019. [ 20s] [ 20s] ### VM INTERACTION START ### [ 23s] [ 7.782272] sysrq: SysRq : Power Off [ 23s] [ 7.793818] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] lamb11 failed "build simtrace2_0.5.2.dsc" at Sun Dec 8 01:05:53 UTC 2019. [ 23s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 01:05:57 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 01:05:57 +0000 Subject: Build failure of network:osmocom:latest/libosmo-abis in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5dec4c7d3d2a6_653f2ad8858225fc4585d0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-abis/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-abis failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-abis Last lines of build log: [ 13s] WARNING: udev not running, creating extra device nodes [ 13s] logging output to //.build.log... [ 13s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] processing recipe /.build-srcdir/libosmo-abis_0.7.0.dsc ... [ 13s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-abis_0.7.0.dsc build ... [ 13s] running base-passwd preinstall script [ 13s] running base-passwd postinstall script [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] running user-setup postinstall script [ 13s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] running base-files postinstall script [ 13s] running gawk postinstall script [ 14s] querying package ids... [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] [1/239] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] installing [ 14s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] exit ... [ 14s] [ 14s] sheep83 failed "build libosmo-abis_0.7.0.dsc" at Sun Dec 8 01:05:39 UTC 2019. [ 14s] [ 14s] ### VM INTERACTION START ### [ 17s] [ 7.829049] sysrq: SysRq : Power Off [ 17s] [ 7.838799] reboot: Power down [ 17s] ### VM INTERACTION END ### [ 17s] [ 17s] sheep83 failed "build libosmo-abis_0.7.0.dsc" at Sun Dec 8 01:05:43 UTC 2019. [ 17s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 01:05:57 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 01:05:57 +0000 Subject: Build failure of network:osmocom:latest/osmo-pcap in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5dec4c7d872ac_653f2ad8858225fc4586b7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-pcap/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-pcap failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-pcap Last lines of build log: [ 14s] WARNING: udev not running, creating extra device nodes [ 14s] logging output to //.build.log... [ 14s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] processing recipe /.build-srcdir/osmo-pcap_0.1.1.dsc ... [ 14s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-pcap_0.1.1.dsc build ... [ 14s] running base-passwd preinstall script [ 14s] running base-passwd postinstall script [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] running user-setup postinstall script [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] running base-files postinstall script [ 14s] running gawk postinstall script [ 14s] querying package ids... [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 14s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] [1/247] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] installing [ 15s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] exit ... [ 15s] [ 15s] sheep82 failed "build osmo-pcap_0.1.1.dsc" at Sun Dec 8 01:05:40 UTC 2019. [ 15s] [ 15s] ### VM INTERACTION START ### [ 18s] [ 7.718579] sysrq: SysRq : Power Off [ 18s] [ 7.727020] reboot: Power down [ 18s] ### VM INTERACTION END ### [ 18s] [ 18s] sheep82 failed "build osmo-pcap_0.1.1.dsc" at Sun Dec 8 01:05:44 UTC 2019. [ 18s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 01:05:57 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 01:05:57 +0000 Subject: Build failure of network:osmocom:latest/yder in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5dec4c7e14a54_653f2ad8858225fc4587e9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/yder/Debian_Unstable/x86_64 Package network:osmocom:latest/yder failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest yder Last lines of build log: [ 48s] WARNING: udev not running, creating extra device nodes [ 48s] logging output to //.build.log... [ 48s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 48s] processing recipe /.build-srcdir/yder_1.4.4-4.1.dsc ... [ 48s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/yder_1.4.4-4.1.dsc build ... [ 48s] running base-passwd preinstall script [ 48s] running base-passwd postinstall script [ 48s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 48s] running user-setup postinstall script [ 48s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 48s] running base-files postinstall script [ 48s] running gawk postinstall script [ 49s] querying package ids... [ 49s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 49s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 49s] [1/252] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 49s] installing [ 49s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 49s] exit ... [ 49s] [ 49s] cloud117 failed "build yder_1.4.4-4.1.dsc" at Sun Dec 8 01:05:43 UTC 2019. [ 49s] [ 49s] ### VM INTERACTION START ### [ 53s] [ 14.275187] sysrq: SysRq : Power Off [ 53s] [ 14.280216] reboot: Power down [ 53s] ### VM INTERACTION END ### [ 53s] [ 53s] cloud117 failed "build yder_1.4.4-4.1.dsc" at Sun Dec 8 01:05:47 UTC 2019. [ 53s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 01:08:14 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 01:08:14 +0000 Subject: Build failure of network:osmocom:latest/libosmo-netif in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5dec4d13a33a3_653f2ad8858225fc45961c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-netif/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-netif failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-netif Last lines of build log: [ 39s] WARNING: udev not running, creating extra device nodes [ 39s] logging output to //.build.log... [ 39s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 39s] processing recipe /.build-srcdir/libosmo-netif_0.6.0.dsc ... [ 39s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-netif_0.6.0.dsc build ... [ 39s] running base-passwd preinstall script [ 39s] running base-passwd postinstall script [ 39s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 39s] running user-setup postinstall script [ 39s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 39s] running base-files postinstall script [ 39s] running gawk postinstall script [ 40s] querying package ids... [ 40s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 40s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 40s] [1/252] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 40s] installing [ 40s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 40s] exit ... [ 40s] [ 40s] cloud111 failed "build libosmo-netif_0.6.0.dsc" at Sun Dec 8 01:08:03 UTC 2019. [ 40s] [ 40s] ### VM INTERACTION START ### [ 43s] [ 14.723182] sysrq: SysRq : Power Off [ 43s] [ 14.745293] reboot: Power down [ 43s] ### VM INTERACTION END ### [ 43s] [ 43s] cloud111 failed "build libosmo-netif_0.6.0.dsc" at Sun Dec 8 01:08:06 UTC 2019. [ 43s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 01:08:14 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 01:08:14 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5dec4d141b827_653f2ad8858225fc459743@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 39s] WARNING: udev not running, creating extra device nodes [ 39s] logging output to //.build.log... [ 39s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 39s] processing recipe /.build-srcdir/ulfius_2.5.2-4.1.dsc ... [ 39s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/ulfius_2.5.2-4.1.dsc build ... [ 39s] running base-passwd preinstall script [ 39s] running base-passwd postinstall script [ 39s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 39s] running user-setup postinstall script [ 39s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 39s] running base-files postinstall script [ 39s] running gawk postinstall script [ 40s] querying package ids... [ 40s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 40s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 40s] [1/260] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 40s] installing [ 40s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 40s] exit ... [ 40s] [ 40s] cloud109 failed "build ulfius_2.5.2-4.1.dsc" at Sun Dec 8 01:08:06 UTC 2019. [ 40s] [ 40s] ### VM INTERACTION START ### [ 43s] [ 15.213377] sysrq: SysRq : Power Off [ 43s] [ 15.217413] reboot: Power down [ 43s] ### VM INTERACTION END ### [ 43s] [ 43s] cloud109 failed "build ulfius_2.5.2-4.1.dsc" at Sun Dec 8 01:08:10 UTC 2019. [ 43s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 01:14:32 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 01:14:32 +0000 Subject: Build failure of network:osmocom:latest/osmo-sysmon in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5dec4e7dc7c16_653f2ad8858225fc4606ce@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sysmon/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-sysmon failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sysmon Last lines of build log: [ 15s] WARNING: udev not running, creating extra device nodes [ 15s] logging output to //.build.log... [ 15s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] processing recipe /.build-srcdir/osmo-sysmon_0.2.0.dsc ... [ 15s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sysmon_0.2.0.dsc build ... [ 15s] running base-passwd preinstall script [ 15s] running base-passwd postinstall script [ 15s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] running user-setup postinstall script [ 15s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 15s] running base-files postinstall script [ 15s] running gawk postinstall script [ 16s] querying package ids... [ 16s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] [1/214] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] installing [ 16s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 16s] exit ... [ 16s] [ 16s] build70 failed "build osmo-sysmon_0.2.0.dsc" at Sun Dec 8 01:14:27 UTC 2019. [ 16s] [ 16s] ### VM INTERACTION START ### [ 19s] [ 7.749441] sysrq: SysRq : Power Off [ 19s] [ 7.765682] reboot: Power down [ 19s] ### VM INTERACTION END ### [ 19s] [ 19s] build70 failed "build osmo-sysmon_0.2.0.dsc" at Sun Dec 8 01:14:31 UTC 2019. [ 19s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 01:15:23 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 01:15:23 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5dec4eb8479d5_653f2ad8858225fc4608b6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-iuh failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 47s] WARNING: udev not running, creating extra device nodes [ 47s] logging output to //.build.log... [ 47s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 47s] processing recipe /.build-srcdir/osmo-iuh_0.5.0.dsc ... [ 48s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-iuh_0.5.0.dsc build ... [ 48s] running base-passwd preinstall script [ 48s] running base-passwd postinstall script [ 48s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 48s] running user-setup postinstall script [ 48s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 48s] running base-files postinstall script [ 49s] running gawk postinstall script [ 51s] querying package ids... [ 51s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 51s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 52s] [1/252] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 52s] installing [ 52s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 52s] exit ... [ 52s] [ 52s] cloud120 failed "build osmo-iuh_0.5.0.dsc" at Sun Dec 8 01:15:15 UTC 2019. [ 52s] [ 52s] ### VM INTERACTION START ### [ 55s] [ 18.086338] sysrq: SysRq : Power Off [ 55s] [ 18.103461] reboot: Power down [ 56s] ### VM INTERACTION END ### [ 56s] [ 56s] cloud120 failed "build osmo-iuh_0.5.0.dsc" at Sun Dec 8 01:15:20 UTC 2019. [ 56s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 01:15:23 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 01:15:23 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5dec4eb8c9a60_653f2ad8858225fc460963@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_Unstable/x86_64 Package network:osmocom:latest/openbsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 38s] WARNING: udev not running, creating extra device nodes [ 38s] logging output to //.build.log... [ 39s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 39s] processing recipe /.build-srcdir/openbsc_1.3.1.dsc ... [ 39s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/openbsc_1.3.1.dsc build ... [ 39s] running base-passwd preinstall script [ 39s] running base-passwd postinstall script [ 39s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 39s] running user-setup postinstall script [ 39s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 39s] running base-files postinstall script [ 40s] running gawk postinstall script [ 41s] querying package ids... [ 41s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 41s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 41s] [1/230] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 41s] installing [ 41s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 41s] exit ... [ 41s] [ 41s] cloud125 failed "build openbsc_1.3.1.dsc" at Sun Dec 8 01:15:07 UTC 2019. [ 41s] [ 41s] ### VM INTERACTION START ### [ 45s] [ 13.206584] sysrq: SysRq : Power Off [ 45s] [ 13.212221] reboot: Power down [ 45s] ### VM INTERACTION END ### [ 45s] [ 45s] cloud125 failed "build openbsc_1.3.1.dsc" at Sun Dec 8 01:15:11 UTC 2019. [ 45s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 01:52:49 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 01:52:49 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5dec577f6cd64_653f2ad8858225fc4802ca@build.opensuse.org> 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: [ 352s] [ 352s] Error: "The cache has no package named 'inkscape'" [ 352s] [ 352s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:61: recipe for target 'osmux-reference.pdf' failed [ 352s] make[4]: *** [osmux-reference.pdf] Error 1 [ 352s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 352s] Makefile:387: recipe for target 'all-recursive' failed [ 352s] make[3]: *** [all-recursive] Error 1 [ 352s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 352s] Makefile:448: recipe for target 'all-recursive' failed [ 352s] make[2]: *** [all-recursive] Error 1 [ 352s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 352s] Makefile:380: recipe for target 'all' failed [ 352s] make[1]: *** [all] Error 2 [ 352s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 352s] dh_auto_build: make -j1 returned exit code 2 [ 352s] debian/rules:45: recipe for target 'build' failed [ 352s] make: *** [build] Error 2 [ 352s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 352s] [ 352s] lamb03 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 01:52:31 UTC 2019. [ 352s] [ 352s] ### VM INTERACTION START ### [ 356s] [ 324.003142] sysrq: SysRq : Power Off [ 356s] [ 324.019039] reboot: Power down [ 356s] ### VM INTERACTION END ### [ 356s] [ 356s] lamb03 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 01:52:36 UTC 2019. [ 356s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 01:54:14 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 01:54:14 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5dec57da2ccd5_653f2ad8858225fc4804e5@build.opensuse.org> 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: [ 235s] [ 235s] Error: "The cache has no package named 'inkscape'" [ 235s] [ 235s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:61: recipe for target 'osmux-reference.pdf' failed [ 235s] make[4]: *** [osmux-reference.pdf] Error 1 [ 235s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 235s] Makefile:387: recipe for target 'all-recursive' failed [ 235s] make[3]: *** [all-recursive] Error 1 [ 235s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 235s] Makefile:448: recipe for target 'all-recursive' failed [ 235s] make[2]: *** [all-recursive] Error 1 [ 235s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 235s] Makefile:380: recipe for target 'all' failed [ 235s] make[1]: *** [all] Error 2 [ 235s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 235s] dh_auto_build: make -j1 returned exit code 2 [ 235s] debian/rules:45: recipe for target 'build' failed [ 235s] make: *** [build] Error 2 [ 235s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 235s] [ 235s] cloud116 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 01:54:07 UTC 2019. [ 235s] [ 235s] ### VM INTERACTION START ### [ 238s] [ 217.898754] sysrq: SysRq : Power Off [ 238s] [ 217.903441] reboot: Power down [ 238s] ### VM INTERACTION END ### [ 238s] [ 238s] cloud116 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 01:54:10 UTC 2019. [ 238s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 01:58:32 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 01:58:32 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5dec58cf75b7d_653f2ad8858225fc48091b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 203s] Cannot convert 'osmux-reference__7.png' to pdf [ 203s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 203s] [ 203s] A possible reason for transformation failure is invalid DocBook [ 203s] (as reported by xmllint) [ 203s] [ 203s] Error: [Errno 2] No such file or directory [ 203s] [ 203s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 203s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 203s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 203s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 203s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 203s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 203s] make[1]: *** [Makefile:380: all] Error 2 [ 203s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 203s] dh_auto_build: make -j1 returned exit code 2 [ 203s] make: *** [debian/rules:45: build] Error 2 [ 203s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 203s] [ 203s] build72 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 01:58:23 UTC 2019. [ 203s] [ 203s] ### VM INTERACTION START ### [ 206s] [ 195.156264] sysrq: SysRq : Power Off [ 206s] [ 195.158206] reboot: Power down [ 206s] ### VM INTERACTION END ### [ 206s] [ 206s] build72 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 01:58:27 UTC 2019. [ 206s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 02:03:57 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 02:03:57 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5dec5a14cd5f2_653f2ad8858225fc48177f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 277s] Cannot convert 'osmux-reference__7.png' to pdf [ 277s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 277s] [ 277s] A possible reason for transformation failure is invalid DocBook [ 277s] (as reported by xmllint) [ 277s] [ 277s] Error: [Errno 2] No such file or directory [ 277s] [ 277s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 277s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 277s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 277s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 277s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 277s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 277s] make[1]: *** [Makefile:380: all] Error 2 [ 277s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 277s] dh_auto_build: make -j1 returned exit code 2 [ 277s] make: *** [debian/rules:45: build] Error 255 [ 277s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 277s] [ 277s] wildcard2 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 02:03:38 UTC 2019. [ 277s] [ 277s] ### VM INTERACTION START ### [ 280s] [ 249.648988] sysrq: SysRq : Power Off [ 280s] [ 249.651731] reboot: Power down [ 281s] ### VM INTERACTION END ### [ 281s] [ 281s] wildcard2 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 02:03:43 UTC 2019. [ 281s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 02:04:14 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 02:04:14 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5dec5a342b2e5_653f2ad8858225fc48196a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 404s] [ 404s] Error: [Errno 2] No such file or directory [ 404s] [ 404s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:61: recipe for target 'osmux-reference.pdf' failed [ 404s] make[4]: *** [osmux-reference.pdf] Error 1 [ 404s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 404s] Makefile:387: recipe for target 'all-recursive' failed [ 404s] make[3]: *** [all-recursive] Error 1 [ 404s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 404s] Makefile:448: recipe for target 'all-recursive' failed [ 404s] make[2]: *** [all-recursive] Error 1 [ 404s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 404s] Makefile:380: recipe for target 'all' failed [ 404s] make[1]: *** [all] Error 2 [ 404s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 404s] dh_auto_build: make -j1 returned exit code 2 [ 404s] debian/rules:45: recipe for target 'build' failed [ 404s] make: *** [build] Error 2 [ 404s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 404s] [ 404s] cloud118 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 02:03:53 UTC 2019. [ 404s] [ 404s] ### VM INTERACTION START ### [ 407s] [ 386.943229] sysrq: SysRq : Power Off [ 407s] [ 386.947774] reboot: Power down [ 407s] ### VM INTERACTION END ### [ 407s] [ 407s] cloud118 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 02:03:57 UTC 2019. [ 407s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 02:05:40 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 02:05:40 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5dec5a8d8e208_653f2ad8858225fc48207a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 402s] Cannot convert 'osmux-reference__7.png' to pdf [ 402s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 402s] [ 402s] A possible reason for transformation failure is invalid DocBook [ 402s] (as reported by xmllint) [ 402s] [ 402s] Error: [Errno 2] No such file or directory [ 402s] [ 402s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 402s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 402s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 402s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 402s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 402s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 402s] make[1]: *** [Makefile:380: all] Error 2 [ 402s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 402s] dh_auto_build: make -j1 returned exit code 2 [ 402s] make: *** [debian/rules:45: build] Error 255 [ 402s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 402s] [ 402s] cloud104 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 02:05:33 UTC 2019. [ 402s] [ 402s] ### VM INTERACTION START ### [ 405s] [ 382.170135] sysrq: SysRq : Power Off [ 405s] [ 382.175093] reboot: Power down [ 405s] ### VM INTERACTION END ### [ 405s] [ 405s] cloud104 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 02:05:37 UTC 2019. [ 405s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 02:06:14 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 02:06:14 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5dec5aa97460d_653f2ad8858225fc48214b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 287s] [ 287s] Error: [Errno 2] No such file or directory [ 287s] [ 287s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:61: recipe for target 'osmux-reference.pdf' failed [ 287s] make[4]: *** [osmux-reference.pdf] Error 1 [ 287s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 287s] Makefile:387: recipe for target 'all-recursive' failed [ 287s] make[3]: *** [all-recursive] Error 1 [ 287s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 287s] Makefile:448: recipe for target 'all-recursive' failed [ 287s] make[2]: *** [all-recursive] Error 1 [ 287s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 287s] Makefile:380: recipe for target 'all' failed [ 287s] make[1]: *** [all] Error 2 [ 287s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 287s] dh_auto_build: make -j1 returned exit code 2 [ 287s] debian/rules:45: recipe for target 'build' failed [ 287s] make: *** [build] Error 2 [ 287s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 287s] [ 287s] lamb75 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 02:05:58 UTC 2019. [ 287s] [ 287s] ### VM INTERACTION START ### [ 290s] [ 276.362626] sysrq: SysRq : Power Off [ 290s] [ 276.374834] reboot: Power down [ 290s] ### VM INTERACTION END ### [ 290s] [ 290s] lamb75 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 02:06:02 UTC 2019. [ 290s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 02:07:40 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 02:07:40 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5dec5b033cc1b_653f2ad8858225fc4822c7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 584s] Cannot convert 'osmux-reference__7.png' to pdf [ 584s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 584s] [ 584s] A possible reason for transformation failure is invalid DocBook [ 584s] (as reported by xmllint) [ 584s] [ 584s] Error: [Errno 2] No such file or directory [ 584s] [ 584s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 584s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 584s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 584s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 584s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 584s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 584s] make[1]: *** [Makefile:380: all] Error 2 [ 584s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 584s] dh_auto_build: make -j1 returned exit code 2 [ 584s] make: *** [debian/rules:45: build] Error 2 [ 584s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 584s] [ 584s] lamb02 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 02:07:29 UTC 2019. [ 584s] [ 584s] ### VM INTERACTION START ### [ 587s] [ 563.282175] sysrq: SysRq : Power Off [ 587s] [ 563.288957] reboot: Power down [ 587s] ### VM INTERACTION END ### [ 587s] [ 587s] lamb02 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 02:07:32 UTC 2019. [ 587s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 02:09:06 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 02:09:06 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5dec5b5cf2196_653f2ad8858225fc4823d1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 280s] Cannot convert 'osmux-reference__7.png' to pdf [ 280s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 280s] [ 280s] A possible reason for transformation failure is invalid DocBook [ 280s] (as reported by xmllint) [ 280s] [ 280s] Error: [Errno 2] No such file or directory [ 280s] [ 280s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 280s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 280s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 280s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 280s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 280s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 280s] make[1]: *** [Makefile:380: all] Error 2 [ 280s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 280s] dh_auto_build: make -j1 returned exit code 2 [ 280s] make: *** [debian/rules:45: build] Error 255 [ 280s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 280s] [ 280s] build84 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 02:08:59 UTC 2019. [ 280s] [ 280s] ### VM INTERACTION START ### [ 283s] [ 268.799258] sysrq: SysRq : Power Off [ 283s] [ 268.805969] reboot: Power down [ 283s] ### VM INTERACTION END ### [ 283s] [ 283s] build84 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 02:09:03 UTC 2019. [ 283s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 02:16:32 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 02:16:32 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5dec5d03bcbd3_653f2ad8858225fc483832@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 637s] Cannot convert 'osmux-reference__7.png' to pdf [ 637s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 637s] [ 637s] A possible reason for transformation failure is invalid DocBook [ 637s] (as reported by xmllint) [ 637s] [ 637s] Error: [Errno 2] No such file or directory [ 637s] [ 637s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 637s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 637s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 637s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 637s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 637s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 637s] make[1]: *** [Makefile:380: all] Error 2 [ 637s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 637s] dh_auto_build: make -j1 returned exit code 2 [ 637s] make: *** [debian/rules:45: build] Error 2 [ 637s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 637s] [ 637s] build34 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 02:16:17 UTC 2019. [ 637s] [ 637s] ### VM INTERACTION START ### [ 640s] [ 623.859422] sysrq: SysRq : Power Off [ 640s] [ 623.883791] reboot: Power down [ 641s] ### VM INTERACTION END ### [ 641s] [ 641s] build34 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 02:16:21 UTC 2019. [ 641s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 04:18:34 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 04:18:34 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5dec79b4b0d66_653f2ad8858225fc496621@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 366s] Cannot convert 'osmux-reference__7.png' to pdf [ 366s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 366s] [ 366s] A possible reason for transformation failure is invalid DocBook [ 366s] (as reported by xmllint) [ 366s] [ 366s] Error: [Errno 2] No such file or directory [ 366s] [ 366s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 366s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 366s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 366s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 366s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 366s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 366s] make[1]: *** [Makefile:380: all] Error 2 [ 366s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 366s] dh_auto_build: make -j1 returned exit code 2 [ 366s] make: *** [debian/rules:45: build] Error 255 [ 366s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 366s] [ 366s] lamb13 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 04:18:14 UTC 2019. [ 366s] [ 366s] ### VM INTERACTION START ### [ 369s] [ 351.910072] sysrq: SysRq : Power Off [ 369s] [ 351.915944] reboot: Power down [ 369s] ### VM INTERACTION END ### [ 369s] [ 369s] lamb13 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 04:18:18 UTC 2019. [ 369s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 08:57:07 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 08:57:07 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5decbb00f1e78_653f2ad8858225fc533584@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Raspbian_10/armv7l Package network:osmocom:nightly/osmo-bsc failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 3354s] Cannot convert 'osmux-reference__7.png' to pdf [ 3354s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 3354s] [ 3354s] A possible reason for transformation failure is invalid DocBook [ 3354s] (as reported by xmllint) [ 3354s] [ 3354s] Error: [Errno 2] No such file or directory [ 3354s] [ 3354s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 3354s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 3354s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 3354s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 3354s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 3354s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 3354s] make[1]: *** [Makefile:380: all] Error 2 [ 3354s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 3354s] dh_auto_build: make -j1 returned exit code 2 [ 3354s] make: *** [debian/rules:45: build] Error 2 [ 3354s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 3354s] [ 3354s] armbuild01 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 08:56:54 UTC 2019. [ 3354s] [ 3354s] ### VM INTERACTION START ### [ 3357s] [ 3215.146667] sysrq: SysRq : Power Off [ 3357s] [ 3215.190641] reboot: Power down [ 3357s] ### VM INTERACTION END ### [ 3357s] [ 3358s] armbuild01 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 08:56:58 UTC 2019. [ 3358s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 10:12:33 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 10:12:33 +0000 Subject: Build failure of network:osmocom:latest/libsmpp34 in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deccca1c6c03_653f2ad8858225fc549727@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libsmpp34/Debian_Unstable/x86_64 Package network:osmocom:latest/libsmpp34 failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libsmpp34 Last lines of build log: [ 12s] WARNING: udev not running, creating extra device nodes [ 12s] logging output to //.build.log... [ 12s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] processing recipe /.build-srcdir/libsmpp34_1.14.0.dsc ... [ 12s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libsmpp34_1.14.0.dsc build ... [ 12s] running base-passwd preinstall script [ 12s] running base-passwd postinstall script [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] running user-setup postinstall script [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] running base-files postinstall script [ 12s] running gawk postinstall script [ 12s] querying package ids... [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 12s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] [1/221] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] installing [ 13s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 13s] exit ... [ 13s] [ 13s] build83 failed "build libsmpp34_1.14.0.dsc" at Sun Dec 8 10:12:27 UTC 2019. [ 13s] [ 13s] ### VM INTERACTION START ### [ 16s] [ 6.012500] sysrq: SysRq : Power Off [ 16s] [ 6.014401] reboot: Power down [ 16s] ### VM INTERACTION END ### [ 16s] [ 16s] build83 failed "build libsmpp34_1.14.0.dsc" at Sun Dec 8 10:12:31 UTC 2019. [ 16s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 10:12:57 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 10:12:57 +0000 Subject: Build failure of network:osmocom:latest/osmocom-latest in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5decccc5aba09_653f2ad8858225fc550031@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmocom-latest/Debian_Unstable/x86_64 Package network:osmocom:latest/osmocom-latest failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmocom-latest Last lines of build log: [ 17s] WARNING: udev not running, creating extra device nodes [ 17s] logging output to //.build.log... [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/osmocom-latest_0.0.0.dsc ... [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmocom-latest_0.0.0.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 17s] querying package ids... [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/192] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb06 failed "build osmocom-latest_0.0.0.dsc" at Sun Dec 8 10:12:37 UTC 2019. [ 18s] [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.532182] sysrq: SysRq : Power Off [ 21s] [ 7.540214] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb06 failed "build osmocom-latest_0.0.0.dsc" at Sun Dec 8 10:12:40 UTC 2019. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 10:12:57 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 10:12:57 +0000 Subject: Build failure of network:osmocom:latest/libasn1c in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5decccc764130_653f2ad8858225fc550143@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libasn1c/Debian_Unstable/x86_64 Package network:osmocom:latest/libasn1c failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libasn1c Last lines of build log: [ 18s] WARNING: udev not running, creating extra device nodes [ 18s] logging output to //.build.log... [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/libasn1c_0.9.32.dsc ... [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libasn1c_0.9.32.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 19s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/195] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb55 failed "build libasn1c_0.9.32.dsc" at Sun Dec 8 10:12:41 UTC 2019. [ 19s] [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.647928] sysrq: SysRq : Power Off [ 22s] [ 7.654820] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb55 failed "build libasn1c_0.9.32.dsc" at Sun Dec 8 10:12:44 UTC 2019. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 10:12:57 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 10:12:57 +0000 Subject: Build failure of network:osmocom:latest/orcania in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5decccc84d7c5_653f2ad8858225fc550283@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/orcania/Debian_Unstable/x86_64 Package network:osmocom:latest/orcania failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest orcania Last lines of build log: [ 18s] WARNING: udev not running, creating extra device nodes [ 18s] logging output to //.build.log... [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/orcania_1.2.9-5.dsc ... [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/orcania_1.2.9-5.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 19s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/249] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb56 failed "build orcania_1.2.9-5.dsc" at Sun Dec 8 10:12:41 UTC 2019. [ 19s] [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.577779] sysrq: SysRq : Power Off [ 22s] [ 7.586225] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb56 failed "build orcania_1.2.9-5.dsc" at Sun Dec 8 10:12:44 UTC 2019. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 10:12:57 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 10:12:57 +0000 Subject: Build failure of network:osmocom:latest/libosmo-dsp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5decccc8e9026_653f2ad8858225fc55037e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-dsp/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-dsp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-dsp Last lines of build log: [ 18s] WARNING: udev not running, creating extra device nodes [ 18s] logging output to //.build.log... [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/libosmodsp_0.4.0.dsc ... [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmodsp_0.4.0.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/230] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb20 failed "build libosmodsp_0.4.0.dsc" at Sun Dec 8 10:12:42 UTC 2019. [ 19s] [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.556400] sysrq: SysRq : Power Off [ 22s] [ 7.562631] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb20 failed "build libosmodsp_0.4.0.dsc" at Sun Dec 8 10:12:45 UTC 2019. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 10:13:16 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 10:13:16 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5decccd0a0c71_653f2ad8858225fc5506fe@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmocore failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 18s] WARNING: udev not running, creating extra device nodes [ 18s] logging output to //.build.log... [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/libosmocore_1.2.0.dsc ... [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmocore_1.2.0.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/252] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb28 failed "build libosmocore_1.2.0.dsc" at Sun Dec 8 10:12:46 UTC 2019. [ 19s] [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.684449] sysrq: SysRq : Power Off [ 22s] [ 7.691040] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb28 failed "build libosmocore_1.2.0.dsc" at Sun Dec 8 10:12:50 UTC 2019. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 10:13:16 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 10:13:16 +0000 Subject: Build failure of network:osmocom:latest/libgtpnl in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5decccd163199_653f2ad8858225fc5508e6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libgtpnl/Debian_Unstable/x86_64 Package network:osmocom:latest/libgtpnl failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libgtpnl Last lines of build log: [ 17s] WARNING: udev not running, creating extra device nodes [ 17s] logging output to //.build.log... [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/libgtpnl_1.2.1.dsc ... [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libgtpnl_1.2.1.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 17s] querying package ids... [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/220] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb65 failed "build libgtpnl_1.2.1.dsc" at Sun Dec 8 10:12:48 UTC 2019. [ 18s] [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.482135] sysrq: SysRq : Power Off [ 21s] [ 7.489005] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb65 failed "build libgtpnl_1.2.1.dsc" at Sun Dec 8 10:12:52 UTC 2019. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 10:13:16 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 10:13:16 +0000 Subject: Build failure of network:osmocom:latest/eclipse-titan in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5decccd2282c1_653f2ad8858225fc55104@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/eclipse-titan/Debian_Unstable/x86_64 Package network:osmocom:latest/eclipse-titan failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest eclipse-titan Last lines of build log: [ 19s] WARNING: udev not running, creating extra device nodes [ 19s] logging output to //.build.log... [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/eclipse-titan_6.5.0-1.dsc ... [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/eclipse-titan_6.5.0-1.dsc build ... [ 19s] running base-passwd preinstall script [ 19s] running base-passwd postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running user-setup postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running base-files postinstall script [ 19s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] [1/284] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] installing [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] exit ... [ 20s] [ 20s] lamb59 failed "build eclipse-titan_6.5.0-1.dsc" at Sun Dec 8 10:12:52 UTC 2019. [ 20s] [ 20s] ### VM INTERACTION START ### [ 23s] [ 7.835239] sysrq: SysRq : Power Off [ 23s] [ 7.842361] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] lamb59 failed "build eclipse-titan_6.5.0-1.dsc" at Sun Dec 8 10:12:56 UTC 2019. [ 23s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 10:14:01 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 10:14:01 +0000 Subject: Build failure of network:osmocom:latest/yder in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5decccf018b65_653f2ad8858225fc55165b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/yder/Debian_Unstable/x86_64 Package network:osmocom:latest/yder failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest yder Last lines of build log: [ 19s] WARNING: udev not running, creating extra device nodes [ 19s] logging output to //.build.log... [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/yder_1.4.4-4.1.dsc ... [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/yder_1.4.4-4.1.dsc build ... [ 19s] running base-passwd preinstall script [ 19s] running base-passwd postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running user-setup postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running base-files postinstall script [ 19s] running gawk postinstall script [ 20s] querying package ids... [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] [1/252] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] installing [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] exit ... [ 20s] [ 20s] lamb24 failed "build yder_1.4.4-4.1.dsc" at Sun Dec 8 10:13:55 UTC 2019. [ 20s] [ 20s] ### VM INTERACTION START ### [ 24s] [ 8.338248] sysrq: SysRq : Power Off [ 24s] [ 8.344895] reboot: Power down [ 24s] ### VM INTERACTION END ### [ 24s] [ 24s] lamb24 failed "build yder_1.4.4-4.1.dsc" at Sun Dec 8 10:13:59 UTC 2019. [ 24s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 10:14:18 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 10:14:18 +0000 Subject: Build failure of network:osmocom:latest/osmo-pcap in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deccd0ab7fa6_653f2ad8858225fc55189d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-pcap/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-pcap failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-pcap Last lines of build log: [ 17s] WARNING: udev not running, creating extra device nodes [ 17s] logging output to //.build.log... [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/osmo-pcap_0.1.1.dsc ... [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-pcap_0.1.1.dsc build ... [ 17s] running base-passwd preinstall script [ 17s] running base-passwd postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running user-setup postinstall script [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] running base-files postinstall script [ 17s] running gawk postinstall script [ 17s] querying package ids... [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] [1/247] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] installing [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] exit ... [ 18s] [ 18s] lamb19 failed "build osmo-pcap_0.1.1.dsc" at Sun Dec 8 10:13:58 UTC 2019. [ 18s] [ 18s] ### VM INTERACTION START ### [ 21s] [ 7.507949] sysrq: SysRq : Power Off [ 21s] [ 7.516858] reboot: Power down [ 21s] ### VM INTERACTION END ### [ 21s] [ 21s] lamb19 failed "build osmo-pcap_0.1.1.dsc" at Sun Dec 8 10:14:01 UTC 2019. [ 21s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 10:14:18 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 10:14:18 +0000 Subject: Build failure of network:osmocom:latest/simtrace2 in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deccd0b4dee8_653f2ad8858225fc55195f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/simtrace2/Debian_Unstable/x86_64 Package network:osmocom:latest/simtrace2 failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest simtrace2 Last lines of build log: [ 19s] WARNING: udev not running, creating extra device nodes [ 19s] logging output to //.build.log... [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] processing recipe /.build-srcdir/simtrace2_0.5.2.dsc ... [ 19s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/simtrace2_0.5.2.dsc build ... [ 19s] running base-passwd preinstall script [ 19s] running base-passwd postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running user-setup postinstall script [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] running base-files postinstall script [ 19s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] [1/239] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] installing [ 20s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 20s] exit ... [ 20s] [ 20s] lamb60 failed "build simtrace2_0.5.2.dsc" at Sun Dec 8 10:14:03 UTC 2019. [ 20s] [ 20s] ### VM INTERACTION START ### [ 23s] [ 7.609050] sysrq: SysRq : Power Off [ 23s] [ 7.619477] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] lamb60 failed "build simtrace2_0.5.2.dsc" at Sun Dec 8 10:14:06 UTC 2019. [ 23s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 10:14:18 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 10:14:18 +0000 Subject: Build failure of network:osmocom:latest/libosmo-abis in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deccd0ba65d6_653f2ad8858225fc5520d2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-abis/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-abis failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-abis Last lines of build log: [ 17s] WARNING: udev not running, creating extra device nodes [ 17s] logging output to //.build.log... [ 17s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 17s] processing recipe /.build-srcdir/libosmo-abis_0.7.0.dsc ... [ 17s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-abis_0.7.0.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/239] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb76 failed "build libosmo-abis_0.7.0.dsc" at Sun Dec 8 10:14:07 UTC 2019. [ 19s] [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.530026] sysrq: SysRq : Power Off [ 22s] [ 7.538606] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb76 failed "build libosmo-abis_0.7.0.dsc" at Sun Dec 8 10:14:10 UTC 2019. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 10:15:09 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 10:15:09 +0000 Subject: Build failure of network:osmocom:latest/libosmo-netif in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deccd46491de_653f2ad8858225fc55251d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-netif/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-netif failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-netif Last lines of build log: [ 18s] WARNING: udev not running, creating extra device nodes [ 18s] logging output to //.build.log... [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/libosmo-netif_0.6.0.dsc ... [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/libosmo-netif_0.6.0.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/252] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb56 failed "build libosmo-netif_0.6.0.dsc" at Sun Dec 8 10:14:56 UTC 2019. [ 19s] [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.788782] sysrq: SysRq : Power Off [ 22s] [ 7.795362] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb56 failed "build libosmo-netif_0.6.0.dsc" at Sun Dec 8 10:14:59 UTC 2019. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 10:15:09 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 10:15:09 +0000 Subject: Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deccd46b827c_653f2ad8858225fc5526ac@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 18s] WARNING: udev not running, creating extra device nodes [ 18s] logging output to //.build.log... [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/ulfius_2.5.2-4.1.dsc ... [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/ulfius_2.5.2-4.1.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/260] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb53 failed "build ulfius_2.5.2-4.1.dsc" at Sun Dec 8 10:14:58 UTC 2019. [ 19s] [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.590302] sysrq: SysRq : Power Off [ 22s] [ 7.606762] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb53 failed "build ulfius_2.5.2-4.1.dsc" at Sun Dec 8 10:15:01 UTC 2019. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 10:16:00 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 10:16:00 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deccd668a140_653f2ad8858225fc552899@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-iuh failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 18s] WARNING: udev not running, creating extra device nodes [ 18s] logging output to //.build.log... [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/osmo-iuh_0.5.0.dsc ... [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-iuh_0.5.0.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 18s] running gawk postinstall script [ 18s] querying package ids... [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/252] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb11 failed "build osmo-iuh_0.5.0.dsc" at Sun Dec 8 10:15:40 UTC 2019. [ 19s] [ 19s] ### VM INTERACTION START ### [ 22s] [ 7.544440] sysrq: SysRq : Power Off [ 22s] [ 7.553072] reboot: Power down [ 22s] ### VM INTERACTION END ### [ 22s] [ 22s] lamb11 failed "build osmo-iuh_0.5.0.dsc" at Sun Dec 8 10:15:43 UTC 2019. [ 22s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 10:16:00 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 10:16:00 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deccd67264f1_653f2ad8858225fc5529bf@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_Unstable/x86_64 Package network:osmocom:latest/openbsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 18s] WARNING: udev not running, creating extra device nodes [ 18s] logging output to //.build.log... [ 18s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] processing recipe /.build-srcdir/openbsc_1.3.1.dsc ... [ 18s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/openbsc_1.3.1.dsc build ... [ 18s] running base-passwd preinstall script [ 18s] running base-passwd postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running user-setup postinstall script [ 18s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 18s] running base-files postinstall script [ 19s] running gawk postinstall script [ 19s] querying package ids... [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] [1/230] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] installing [ 19s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 19s] exit ... [ 19s] [ 19s] lamb55 failed "build openbsc_1.3.1.dsc" at Sun Dec 8 10:15:44 UTC 2019. [ 19s] [ 19s] ### VM INTERACTION START ### [ 23s] [ 7.673274] sysrq: SysRq : Power Off [ 23s] [ 7.679044] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] lamb55 failed "build openbsc_1.3.1.dsc" at Sun Dec 8 10:15:48 UTC 2019. [ 23s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 10:16:00 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 10:16:00 +0000 Subject: Build failure of network:osmocom:latest/osmo-sysmon in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5deccd6817b5_653f2ad8858225fc5531cb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sysmon/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-sysmon failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sysmon Last lines of build log: [ 24s] WARNING: udev not running, creating extra device nodes [ 24s] logging output to //.build.log... [ 24s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] processing recipe /.build-srcdir/osmo-sysmon_0.2.0.dsc ... [ 24s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/osmo-sysmon_0.2.0.dsc build ... [ 24s] running base-passwd preinstall script [ 24s] running base-passwd postinstall script [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] running user-setup postinstall script [ 24s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 24s] running base-files postinstall script [ 25s] running gawk postinstall script [ 26s] querying package ids... [ 26s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 26s] /usr/bin/perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 27s] [1/214] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 27s] installing [ 27s] perl: error while loading shared libraries: libcrypt.so.1: cannot open shared object file: No such file or directory [ 27s] exit ... [ 27s] [ 27s] lamb22 failed "build osmo-sysmon_0.2.0.dsc" at Sun Dec 8 10:15:50 UTC 2019. [ 27s] [ 27s] ### VM INTERACTION START ### [ 30s] [ 13.151405] sysrq: SysRq : Power Off [ 30s] [ 13.203939] reboot: Power down [ 30s] ### VM INTERACTION END ### [ 30s] [ 30s] lamb22 failed "build osmo-sysmon_0.2.0.dsc" at Sun Dec 8 10:15:54 UTC 2019. [ 30s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 10:37:07 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 10:37:07 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5decd26ee1984_653f2ad8858225fc5563d3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 357s] Cannot convert 'osmux-reference__7.png' to pdf [ 357s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 357s] [ 357s] A possible reason for transformation failure is invalid DocBook [ 357s] (as reported by xmllint) [ 357s] [ 357s] Error: [Errno 2] No such file or directory [ 357s] [ 357s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 357s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 357s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 357s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 357s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 357s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 357s] make[1]: *** [Makefile:380: all] Error 2 [ 357s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 357s] dh_auto_build: make -j1 returned exit code 2 [ 357s] make: *** [debian/rules:45: build] Error 255 [ 357s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 357s] [ 357s] lamb23 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 10:36:54 UTC 2019. [ 357s] [ 357s] ### VM INTERACTION START ### [ 360s] [ 343.008647] sysrq: SysRq : Power Off [ 360s] [ 343.015460] reboot: Power down [ 360s] ### VM INTERACTION END ### [ 360s] [ 360s] lamb23 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 10:36:57 UTC 2019. [ 360s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 8 16:17:41 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 08 Dec 2019 16:17:41 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5ded223e988da_653f2ad8858225fc59243d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 329s] Cannot convert 'osmux-reference__7.png' to pdf [ 329s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 329s] [ 329s] A possible reason for transformation failure is invalid DocBook [ 329s] (as reported by xmllint) [ 329s] [ 329s] Error: [Errno 2] No such file or directory [ 329s] [ 329s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 329s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 329s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 329s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 329s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 329s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 329s] make[1]: *** [Makefile:380: all] Error 2 [ 329s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 329s] dh_auto_build: make -j1 returned exit code 2 [ 329s] make: *** [debian/rules:45: build] Error 255 [ 329s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 329s] [ 329s] lamb10 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 16:17:35 UTC 2019. [ 329s] [ 329s] ### VM INTERACTION START ### [ 332s] [ 315.719691] sysrq: SysRq : Power Off [ 332s] [ 315.727877] reboot: Power down [ 332s] ### VM INTERACTION END ### [ 332s] [ 332s] lamb10 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Sun Dec 8 16:17:38 UTC 2019. [ 332s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Dec 9 01:50:36 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 09 Dec 2019 01:50:36 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5deda881b3d1e_653f2ad8858225fc6258d8@build.opensuse.org> 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: [ 175s] [ 175s] Error: "The cache has no package named 'inkscape'" [ 175s] [ 175s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:61: recipe for target 'osmux-reference.pdf' failed [ 175s] make[4]: *** [osmux-reference.pdf] Error 1 [ 175s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 175s] Makefile:387: recipe for target 'all-recursive' failed [ 175s] make[3]: *** [all-recursive] Error 1 [ 175s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 175s] Makefile:448: recipe for target 'all-recursive' failed [ 175s] make[2]: *** [all-recursive] Error 1 [ 175s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 175s] Makefile:380: recipe for target 'all' failed [ 175s] make[1]: *** [all] Error 2 [ 175s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 175s] dh_auto_build: make -j1 returned exit code 2 [ 175s] debian/rules:45: recipe for target 'build' failed [ 175s] make: *** [build] Error 2 [ 175s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 176s] [ 176s] lamb56 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 01:50:23 UTC 2019. [ 176s] [ 176s] ### VM INTERACTION START ### [ 179s] [ 167.751674] sysrq: SysRq : Power Off [ 179s] [ 167.757703] reboot: Power down [ 179s] ### VM INTERACTION END ### [ 179s] [ 179s] lamb56 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 01:50:27 UTC 2019. [ 179s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Dec 9 01:52:19 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 09 Dec 2019 01:52:19 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5deda8dd4c3c0_653f2ad8858225fc6259bb@build.opensuse.org> 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: [ 188s] [ 188s] Error: "The cache has no package named 'inkscape'" [ 188s] [ 188s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:61: recipe for target 'osmux-reference.pdf' failed [ 188s] make[4]: *** [osmux-reference.pdf] Error 1 [ 188s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 188s] Makefile:387: recipe for target 'all-recursive' failed [ 188s] make[3]: *** [all-recursive] Error 1 [ 188s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 188s] Makefile:448: recipe for target 'all-recursive' failed [ 188s] make[2]: *** [all-recursive] Error 1 [ 188s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 188s] Makefile:380: recipe for target 'all' failed [ 188s] make[1]: *** [all] Error 2 [ 188s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 188s] dh_auto_build: make -j1 returned exit code 2 [ 188s] debian/rules:45: recipe for target 'build' failed [ 188s] make: *** [build] Error 2 [ 188s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 188s] [ 188s] lamb24 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 01:52:00 UTC 2019. [ 188s] [ 188s] ### VM INTERACTION START ### [ 191s] [ 179.305042] sysrq: SysRq : Power Off [ 191s] [ 179.313262] reboot: Power down [ 191s] ### VM INTERACTION END ### [ 191s] [ 191s] lamb24 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 01:52:04 UTC 2019. [ 191s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Dec 9 01:57:10 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 09 Dec 2019 01:57:10 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5dedaa088f99c_653f2ad8858225fc6262df@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 281s] Cannot convert 'osmux-reference__7.png' to pdf [ 281s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 281s] [ 281s] A possible reason for transformation failure is invalid DocBook [ 281s] (as reported by xmllint) [ 281s] [ 281s] Error: [Errno 2] No such file or directory [ 281s] [ 281s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 281s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 281s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 281s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 281s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 281s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 281s] make[1]: *** [Makefile:380: all] Error 2 [ 281s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 281s] dh_auto_build: make -j1 returned exit code 2 [ 281s] make: *** [debian/rules:45: build] Error 2 [ 281s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 281s] [ 281s] lamb21 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 01:56:52 UTC 2019. [ 281s] [ 281s] ### VM INTERACTION START ### [ 284s] [ 269.311494] sysrq: SysRq : Power Off [ 284s] [ 269.320277] reboot: Power down [ 284s] ### VM INTERACTION END ### [ 284s] [ 284s] lamb21 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 01:56:56 UTC 2019. [ 284s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Dec 9 01:57:28 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 09 Dec 2019 01:57:28 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5dedaa08d0cec_653f2ad8858225fc6263e8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 321s] Cannot convert 'osmux-reference__7.png' to pdf [ 321s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 321s] [ 321s] A possible reason for transformation failure is invalid DocBook [ 321s] (as reported by xmllint) [ 321s] [ 321s] Error: [Errno 2] No such file or directory [ 321s] [ 321s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 321s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 321s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 321s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 321s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 321s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 321s] make[1]: *** [Makefile:380: all] Error 2 [ 321s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 321s] dh_auto_build: make -j1 returned exit code 2 [ 321s] make: *** [debian/rules:45: build] Error 2 [ 321s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 321s] [ 321s] cloud106 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 01:57:06 UTC 2019. [ 321s] [ 321s] ### VM INTERACTION START ### [ 324s] [ 306.194816] sysrq: SysRq : Power Off [ 324s] [ 306.200580] reboot: Power down [ 324s] ### VM INTERACTION END ### [ 324s] [ 324s] cloud106 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 01:57:10 UTC 2019. [ 324s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Dec 9 01:57:28 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 09 Dec 2019 01:57:28 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5dedaa092335f_653f2ad8858225fc6264bc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 275s] Cannot convert 'osmux-reference__7.png' to pdf [ 275s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 275s] [ 275s] A possible reason for transformation failure is invalid DocBook [ 275s] (as reported by xmllint) [ 275s] [ 275s] Error: [Errno 2] No such file or directory [ 275s] [ 275s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 275s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 275s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 275s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 275s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 275s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 275s] make[1]: *** [Makefile:380: all] Error 2 [ 275s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 275s] dh_auto_build: make -j1 returned exit code 2 [ 275s] make: *** [debian/rules:45: build] Error 2 [ 275s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 275s] [ 275s] lamb06 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 01:57:08 UTC 2019. [ 275s] [ 275s] ### VM INTERACTION START ### [ 278s] [ 263.573635] sysrq: SysRq : Power Off [ 278s] [ 263.582014] reboot: Power down [ 278s] ### VM INTERACTION END ### [ 278s] [ 278s] lamb06 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 01:57:11 UTC 2019. [ 278s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Dec 9 01:57:45 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 09 Dec 2019 01:57:45 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5dedaa27864a6_653f2ad8858225fc626547@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 291s] [ 291s] Error: [Errno 2] No such file or directory [ 291s] [ 291s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:61: recipe for target 'osmux-reference.pdf' failed [ 291s] make[4]: *** [osmux-reference.pdf] Error 1 [ 291s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 291s] Makefile:387: recipe for target 'all-recursive' failed [ 291s] make[3]: *** [all-recursive] Error 1 [ 291s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 291s] Makefile:448: recipe for target 'all-recursive' failed [ 291s] make[2]: *** [all-recursive] Error 1 [ 291s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 291s] Makefile:380: recipe for target 'all' failed [ 291s] make[1]: *** [all] Error 2 [ 291s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 291s] dh_auto_build: make -j1 returned exit code 2 [ 291s] debian/rules:45: recipe for target 'build' failed [ 291s] make: *** [build] Error 2 [ 291s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 291s] [ 291s] lamb26 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 01:57:24 UTC 2019. [ 291s] [ 291s] ### VM INTERACTION START ### [ 294s] [ 280.249780] sysrq: SysRq : Power Off [ 294s] [ 280.259001] reboot: Power down [ 294s] ### VM INTERACTION END ### [ 294s] [ 294s] lamb26 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 01:57:28 UTC 2019. [ 294s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Dec 9 01:58:02 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 09 Dec 2019 01:58:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5dedaa464a509_653f2ad8858225fc62668e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 355s] Cannot convert 'osmux-reference__7.png' to pdf [ 355s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 355s] [ 355s] A possible reason for transformation failure is invalid DocBook [ 355s] (as reported by xmllint) [ 355s] [ 355s] Error: [Errno 2] No such file or directory [ 355s] [ 355s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 355s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 355s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 355s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 355s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 355s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 355s] make[1]: *** [Makefile:380: all] Error 2 [ 355s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 355s] dh_auto_build: make -j1 returned exit code 2 [ 355s] make: *** [debian/rules:45: build] Error 255 [ 355s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 355s] [ 355s] cloud124 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 01:57:44 UTC 2019. [ 355s] [ 355s] ### VM INTERACTION START ### [ 358s] [ 324.801211] sysrq: SysRq : Power Off [ 358s] [ 324.806580] reboot: Power down [ 359s] ### VM INTERACTION END ### [ 359s] [ 359s] cloud124 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 01:57:49 UTC 2019. [ 359s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Dec 9 01:58:19 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 09 Dec 2019 01:58:19 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5dedaa474a87a_653f2ad8858225fc6267a2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 330s] Cannot convert 'osmux-reference__7.png' to pdf [ 330s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 330s] [ 330s] A possible reason for transformation failure is invalid DocBook [ 330s] (as reported by xmllint) [ 330s] [ 330s] Error: [Errno 2] No such file or directory [ 330s] [ 330s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 330s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 330s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 330s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 330s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 330s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 330s] make[1]: *** [Makefile:380: all] Error 2 [ 330s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 330s] dh_auto_build: make -j1 returned exit code 2 [ 330s] make: *** [debian/rules:45: build] Error 255 [ 330s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 330s] [ 330s] lamb13 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 01:57:58 UTC 2019. [ 330s] [ 330s] ### VM INTERACTION START ### [ 333s] [ 316.142167] sysrq: SysRq : Power Off [ 333s] [ 316.150684] reboot: Power down [ 333s] ### VM INTERACTION END ### [ 333s] [ 333s] lamb13 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 01:58:02 UTC 2019. [ 333s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Dec 9 01:58:36 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 09 Dec 2019 01:58:36 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5dedaa66b4a1d_653f2ad8858225fc62682a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 336s] Cannot convert 'osmux-reference__7.png' to pdf [ 336s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 336s] [ 336s] A possible reason for transformation failure is invalid DocBook [ 336s] (as reported by xmllint) [ 336s] [ 336s] Error: [Errno 2] No such file or directory [ 336s] [ 336s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 336s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 336s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 336s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 336s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 336s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 336s] make[1]: *** [Makefile:380: all] Error 2 [ 336s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 336s] dh_auto_build: make -j1 returned exit code 2 [ 336s] make: *** [debian/rules:45: build] Error 255 [ 336s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 336s] [ 336s] cloud118 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 01:58:26 UTC 2019. [ 336s] [ 336s] ### VM INTERACTION START ### [ 339s] [ 317.072691] sysrq: SysRq : Power Off [ 339s] [ 317.078166] reboot: Power down [ 339s] ### VM INTERACTION END ### [ 339s] [ 339s] cloud118 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 01:58:30 UTC 2019. [ 339s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Dec 9 02:00:36 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 09 Dec 2019 02:00:36 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5dedaadb42745_653f2ad8858225fc62695e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 340s] [ 340s] Error: [Errno 2] No such file or directory [ 340s] [ 340s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:61: recipe for target 'osmux-reference.pdf' failed [ 340s] make[4]: *** [osmux-reference.pdf] Error 1 [ 340s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 340s] Makefile:387: recipe for target 'all-recursive' failed [ 340s] make[3]: *** [all-recursive] Error 1 [ 340s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 340s] Makefile:448: recipe for target 'all-recursive' failed [ 340s] make[2]: *** [all-recursive] Error 1 [ 340s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 340s] Makefile:380: recipe for target 'all' failed [ 340s] make[1]: *** [all] Error 2 [ 340s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 340s] dh_auto_build: make -j1 returned exit code 2 [ 340s] debian/rules:45: recipe for target 'build' failed [ 340s] make: *** [build] Error 2 [ 340s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 340s] [ 340s] cloud131 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 02:00:19 UTC 2019. [ 340s] [ 340s] ### VM INTERACTION START ### [ 343s] [ 311.234550] sysrq: SysRq : Power Off [ 343s] [ 311.248099] reboot: Power down [ 344s] ### VM INTERACTION END ### [ 344s] [ 344s] cloud131 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 02:00:24 UTC 2019. [ 344s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Dec 9 03:57:46 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 09 Dec 2019 03:57:46 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5dedc64cb8b27_653f2ad8858225fc6308e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Raspbian_10/armv7l Package network:osmocom:nightly/osmo-bsc failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 593s] Cannot convert 'osmux-reference__7.png' to pdf [ 593s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 593s] [ 593s] A possible reason for transformation failure is invalid DocBook [ 593s] (as reported by xmllint) [ 593s] [ 593s] Error: [Errno 2] No such file or directory [ 593s] [ 593s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 593s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 593s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 593s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 593s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 593s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 593s] make[1]: *** [Makefile:380: all] Error 2 [ 593s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 593s] dh_auto_build: make -j1 returned exit code 2 [ 593s] make: *** [debian/rules:45: build] Error 2 [ 593s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 593s] [ 594s] armbuild22 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 03:57:30 UTC 2019. [ 594s] [ 594s] ### VM INTERACTION START ### [ 597s] [ 572.130473] sysrq: SysRq : Power Off [ 597s] [ 572.172083] reboot: Power down [ 597s] ### VM INTERACTION END ### [ 597s] [ 597s] armbuild22 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 03:57:34 UTC 2019. [ 597s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Dec 9 04:06:04 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 09 Dec 2019 04:06:04 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5dedc82f34102_653f2ad8858225fc6309a9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 192s] Cannot convert 'osmux-reference__7.png' to pdf [ 192s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 192s] [ 192s] A possible reason for transformation failure is invalid DocBook [ 192s] (as reported by xmllint) [ 192s] [ 192s] Error: [Errno 2] No such file or directory [ 192s] [ 192s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 192s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 192s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 192s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 192s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 192s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 192s] make[1]: *** [Makefile:380: all] Error 2 [ 192s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 192s] dh_auto_build: make -j1 returned exit code 2 [ 192s] make: *** [debian/rules:45: build] Error 255 [ 192s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 192s] [ 192s] build79 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 04:06:00 UTC 2019. [ 192s] [ 192s] ### VM INTERACTION START ### [ 195s] [ 184.814031] sysrq: SysRq : Power Off [ 195s] [ 184.815818] reboot: Power down [ 195s] ### VM INTERACTION END ### [ 195s] [ 195s] build79 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 04:06:03 UTC 2019. [ 195s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Dec 9 07:50:57 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 9 Dec 2019 07:50:57 +0000 Subject: Change in osmo-gsm-manuals[master]: debian/check-depends.sh: add inkscape to depends References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16522 ) Change subject: debian/check-depends.sh: add inkscape to depends ...................................................................... debian/check-depends.sh: add inkscape to depends Related: OS#4314 Change-Id: I83864af60ccb1ae4170c2cec90ce3f388cc305ae --- M check-depends.sh M debian/control 2 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/22/16522/1 diff --git a/check-depends.sh b/check-depends.sh index c841086..f072fd8 100755 --- a/check-depends.sh +++ b/check-depends.sh @@ -15,5 +15,6 @@ check_dep_bin dblatex dblatex check_dep_bin packetdiag3 python3-nwdiag check_dep_bin dot graphviz +check_dep_bin inkscape inkscape echo "All dependencies installed!" diff --git a/debian/control b/debian/control index fa44525..bf46840 100644 --- a/debian/control +++ b/debian/control @@ -12,6 +12,7 @@ dblatex, docbook5-xml, graphviz, + inkscape, libxml2-utils, mscgen, python3-nwdiag, @@ -27,6 +28,7 @@ dblatex, docbook5-xml, graphviz, + inkscape, libxml2-utils, mscgen, python3-nwdiag, -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16522 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I83864af60ccb1ae4170c2cec90ce3f388cc305ae Gerrit-Change-Number: 16522 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Dec 9 08:51:29 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 09 Dec 2019 08:51:29 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5dee0b16ba14f_653f2ad8858225fc6878a5@build.opensuse.org> 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: [ 184s] [ 184s] Error: [Errno 2] No such file or directory [ 184s] [ 184s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:61: recipe for target 'osmux-reference.pdf' failed [ 184s] make[4]: *** [osmux-reference.pdf] Error 1 [ 184s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 184s] Makefile:387: recipe for target 'all-recursive' failed [ 184s] make[3]: *** [all-recursive] Error 1 [ 184s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 184s] Makefile:448: recipe for target 'all-recursive' failed [ 184s] make[2]: *** [all-recursive] Error 1 [ 184s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 184s] Makefile:380: recipe for target 'all' failed [ 184s] make[1]: *** [all] Error 2 [ 184s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 184s] dh_auto_build: make -j1 returned exit code 2 [ 184s] debian/rules:45: recipe for target 'build' failed [ 184s] make: *** [build] Error 2 [ 184s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 184s] [ 184s] sheep84 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 08:51:14 UTC 2019. [ 184s] [ 184s] ### VM INTERACTION START ### [ 187s] [ 177.946627] sysrq: SysRq : Power Off [ 187s] [ 177.956374] reboot: Power down [ 187s] ### VM INTERACTION END ### [ 187s] [ 187s] sheep84 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 08:51:18 UTC 2019. [ 187s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Dec 9 08:52:21 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 09 Dec 2019 08:52:21 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_10/i586 In-Reply-To: References: Message-ID: <5dee0b53b7b62_653f2ad8858225fc68790@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_10/i586 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 302s] Cannot convert 'osmux-reference__7.png' to pdf [ 302s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 302s] [ 302s] A possible reason for transformation failure is invalid DocBook [ 302s] (as reported by xmllint) [ 302s] [ 302s] Error: [Errno 2] No such file or directory [ 302s] [ 302s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 302s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 302s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 302s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 302s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 302s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 302s] make[1]: *** [Makefile:380: all] Error 2 [ 302s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 302s] dh_auto_build: make -j1 returned exit code 2 [ 302s] make: *** [debian/rules:45: build] Error 2 [ 302s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 302s] [ 302s] lamb55 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 08:52:11 UTC 2019. [ 302s] [ 302s] ### VM INTERACTION START ### [ 305s] [ 288.631530] sysrq: SysRq : Power Off [ 305s] [ 288.645893] reboot: Power down [ 305s] ### VM INTERACTION END ### [ 305s] [ 305s] lamb55 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 08:52:14 UTC 2019. [ 305s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Dec 9 08:54:04 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 09 Dec 2019 08:54:04 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5dee0bb049cdc_653f2ad8858225fc6880dc@build.opensuse.org> 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: [ 197s] [ 197s] Error: [Errno 2] No such file or directory [ 197s] [ 197s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:61: recipe for target 'osmux-reference.pdf' failed [ 197s] make[4]: *** [osmux-reference.pdf] Error 1 [ 197s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 197s] Makefile:387: recipe for target 'all-recursive' failed [ 197s] make[3]: *** [all-recursive] Error 1 [ 197s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 197s] Makefile:448: recipe for target 'all-recursive' failed [ 197s] make[2]: *** [all-recursive] Error 1 [ 197s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 197s] Makefile:380: recipe for target 'all' failed [ 197s] make[1]: *** [all] Error 2 [ 197s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 197s] dh_auto_build: make -j1 returned exit code 2 [ 197s] debian/rules:45: recipe for target 'build' failed [ 197s] make: *** [build] Error 2 [ 197s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 197s] [ 197s] lamb17 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 08:53:57 UTC 2019. [ 197s] [ 197s] ### VM INTERACTION START ### [ 200s] [ 186.928360] sysrq: SysRq : Power Off [ 200s] [ 186.941911] reboot: Power down [ 200s] ### VM INTERACTION END ### [ 200s] [ 200s] lamb17 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 08:54:00 UTC 2019. [ 200s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Dec 9 08:59:46 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 09 Dec 2019 08:59:46 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_10/aarch64 In-Reply-To: References: Message-ID: <5dee0d16bf9c9_653f2ad8858225fc688296@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_10/aarch64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_10/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 292s] Cannot convert 'osmux-reference__7.png' to pdf [ 292s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 292s] [ 292s] A possible reason for transformation failure is invalid DocBook [ 292s] (as reported by xmllint) [ 292s] [ 292s] Error: [Errno 2] No such file or directory [ 292s] [ 292s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 292s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 292s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 292s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 292s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 292s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 292s] make[1]: *** [Makefile:380: all] Error 2 [ 292s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 292s] dh_auto_build: make -j1 returned exit code 2 [ 292s] make: *** [debian/rules:45: build] Error 2 [ 292s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 292s] [ 292s] obs-arm-9 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 08:59:25 UTC 2019. [ 292s] [ 292s] ### VM INTERACTION START ### [ 296s] [ 281.023358] sysrq: Power Off [ 296s] [ 281.027803] reboot: Power down [ 296s] ### VM INTERACTION END ### [ 296s] [ 296s] obs-arm-9 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 08:59:29 UTC 2019. [ 296s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Dec 9 09:01:36 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 9 Dec 2019 09:01:36 +0000 Subject: Change in osmo-ci[master]: osmocom_build_deps.yml: add inkscape References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16523 ) Change subject: osmocom_build_deps.yml: add inkscape ...................................................................... osmocom_build_deps.yml: add inkscape osmo-gsm-manuals needs inkscape to handle svgs. Not all osmo-* projects are building in docker, so make sure it is also installed on the build slaves directly. Related: OS#4314 Change-Id: I63460336d2c4a7594ec9c5c9b60a3d43f0d157aa --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/23/16523/1 diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml index 7863176..daec1f6 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -42,6 +42,7 @@ # by gsm-manuals - python3-nwdiag - python-pychart + - inkscape # by gapk - libasound-dev - libopencore-amrnb-dev -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16523 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I63460336d2c4a7594ec9c5c9b60a3d43f0d157aa Gerrit-Change-Number: 16523 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Dec 9 09:01:46 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 09 Dec 2019 09:01:46 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5dee0d8d3b448_653f2ad8858225fc68852a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_10/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 287s] Cannot convert 'osmux-reference__7.png' to pdf [ 287s] inkscape -z -D --export-pdf=fig0.pdf /usr/src/packages/BUILD/doc/manuals/images/osmux-expected-traffic-savings.svg [ 287s] [ 287s] A possible reason for transformation failure is invalid DocBook [ 287s] (as reported by xmllint) [ 287s] [ 287s] Error: [Errno 2] No such file or directory [ 287s] [ 287s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:69: osmux-reference.pdf] Error 1 [ 287s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 287s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 287s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 287s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 287s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 287s] make[1]: *** [Makefile:380: all] Error 2 [ 287s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 287s] dh_auto_build: make -j1 returned exit code 2 [ 287s] make: *** [debian/rules:45: build] Error 2 [ 287s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 287s] [ 287s] lamb62 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 09:01:38 UTC 2019. [ 287s] [ 287s] ### VM INTERACTION START ### [ 290s] [ 272.983674] sysrq: SysRq : Power Off [ 290s] [ 272.990229] reboot: Power down [ 290s] ### VM INTERACTION END ### [ 290s] [ 290s] lamb62 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 09:01:41 UTC 2019. [ 290s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Dec 9 09:06:04 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 09 Dec 2019 09:06:04 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5dee0e9d21930_653f2ad8858225fc68915@build.opensuse.org> 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: [ 268s] [ 268s] Error: [Errno 2] No such file or directory [ 268s] [ 268s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:61: recipe for target 'osmux-reference.pdf' failed [ 268s] make[4]: *** [osmux-reference.pdf] Error 1 [ 268s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 268s] Makefile:387: recipe for target 'all-recursive' failed [ 268s] make[3]: *** [all-recursive] Error 1 [ 268s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 268s] Makefile:448: recipe for target 'all-recursive' failed [ 268s] make[2]: *** [all-recursive] Error 1 [ 268s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 268s] Makefile:380: recipe for target 'all' failed [ 268s] make[1]: *** [all] Error 2 [ 268s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 268s] dh_auto_build: make -j1 returned exit code 2 [ 268s] debian/rules:45: recipe for target 'build' failed [ 268s] make: *** [build] Error 2 [ 268s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 268s] [ 268s] obs-arm-9 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 09:05:50 UTC 2019. [ 268s] [ 268s] ### VM INTERACTION START ### [ 271s] [ 258.912634] sysrq: Power Off [ 271s] [ 258.927822] reboot: Power down [ 271s] ### VM INTERACTION END ### [ 271s] [ 271s] obs-arm-9 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 09:05:53 UTC 2019. [ 271s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Dec 9 09:49:18 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 9 Dec 2019 09:49:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: add TC_paging_cs_from_bts In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623 ) Change subject: pcu: add TC_paging_cs_from_bts ...................................................................... Patch Set 2: > Patch Set 2: > > can we still try to get this cleaned up and merged eventually? I've made a note to look into this again in the future. Right now I have lots of other tasks with higher priority. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia3ad503c243c9b3b162e204683fa4fa5447bbab3 Gerrit-Change-Number: 15623 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Assignee: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 09 Dec 2019 09:49:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 10:21:43 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 9 Dec 2019 10:21:43 +0000 Subject: Change in osmo-gsm-manuals[master]: debian/check-depends.sh: add inkscape to depends In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16522 ) Change subject: debian/check-depends.sh: add inkscape to depends ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16522 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I83864af60ccb1ae4170c2cec90ce3f388cc305ae Gerrit-Change-Number: 16522 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 09 Dec 2019 10:21:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 10:22:14 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 9 Dec 2019 10:22:14 +0000 Subject: Change in osmo-ci[master]: osmocom_build_deps.yml: add inkscape In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16523 ) Change subject: osmocom_build_deps.yml: add inkscape ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16523 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I63460336d2c4a7594ec9c5c9b60a3d43f0d157aa Gerrit-Change-Number: 16523 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 09 Dec 2019 10:22:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 10:49:34 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 9 Dec 2019 10:49:34 +0000 Subject: Change in osmo-ci[master]: osmocom_build_deps.yml: add inkscape In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16523 ) Change subject: osmocom_build_deps.yml: add inkscape ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16523 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I63460336d2c4a7594ec9c5c9b60a3d43f0d157aa Gerrit-Change-Number: 16523 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 09 Dec 2019 10:49:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 10:49:36 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 9 Dec 2019 10:49:36 +0000 Subject: Change in osmo-ci[master]: osmocom_build_deps.yml: add inkscape In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16523 ) Change subject: osmocom_build_deps.yml: add inkscape ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16523 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I63460336d2c4a7594ec9c5c9b60a3d43f0d157aa Gerrit-Change-Number: 16523 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 09 Dec 2019 10:49:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 10:49:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 9 Dec 2019 10:49:37 +0000 Subject: Change in osmo-ci[master]: osmocom_build_deps.yml: add inkscape In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16523 ) Change subject: osmocom_build_deps.yml: add inkscape ...................................................................... osmocom_build_deps.yml: add inkscape osmo-gsm-manuals needs inkscape to handle svgs. Not all osmo-* projects are building in docker, so make sure it is also installed on the build slaves directly. Related: OS#4314 Change-Id: I63460336d2c4a7594ec9c5c9b60a3d43f0d157aa --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved; Verified diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml index 7863176..daec1f6 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -42,6 +42,7 @@ # by gsm-manuals - python3-nwdiag - python-pychart + - inkscape # by gapk - libasound-dev - libopencore-amrnb-dev -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16523 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I63460336d2c4a7594ec9c5c9b60a3d43f0d157aa Gerrit-Change-Number: 16523 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 10:49:55 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 9 Dec 2019 10:49:55 +0000 Subject: Change in osmo-gsm-manuals[master]: debian/check-depends.sh: add inkscape to depends In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16522 ) Change subject: debian/check-depends.sh: add inkscape to depends ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16522 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I83864af60ccb1ae4170c2cec90ce3f388cc305ae Gerrit-Change-Number: 16522 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 09 Dec 2019 10:49:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 10:49:56 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 9 Dec 2019 10:49:56 +0000 Subject: Change in osmo-gsm-manuals[master]: debian/check-depends.sh: add inkscape to depends In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16522 ) Change subject: debian/check-depends.sh: add inkscape to depends ...................................................................... debian/check-depends.sh: add inkscape to depends Related: OS#4314 Change-Id: I83864af60ccb1ae4170c2cec90ce3f388cc305ae --- M check-depends.sh M debian/control 2 files changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/check-depends.sh b/check-depends.sh index c841086..f072fd8 100755 --- a/check-depends.sh +++ b/check-depends.sh @@ -15,5 +15,6 @@ check_dep_bin dblatex dblatex check_dep_bin packetdiag3 python3-nwdiag check_dep_bin dot graphviz +check_dep_bin inkscape inkscape echo "All dependencies installed!" diff --git a/debian/control b/debian/control index fa44525..bf46840 100644 --- a/debian/control +++ b/debian/control @@ -12,6 +12,7 @@ dblatex, docbook5-xml, graphviz, + inkscape, libxml2-utils, mscgen, python3-nwdiag, @@ -27,6 +28,7 @@ dblatex, docbook5-xml, graphviz, + inkscape, libxml2-utils, mscgen, python3-nwdiag, -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16522 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I83864af60ccb1ae4170c2cec90ce3f388cc305ae Gerrit-Change-Number: 16522 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 10:50:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 9 Dec 2019 10:50:51 +0000 Subject: Change in osmo-bts[master]: power_control.c: Clarify loop algo vars and use correct ones during log In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16440 ) Change subject: power_control.c: Clarify loop algo vars and use correct ones during log ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4e279a6b93fbcc5da25bf8c9213310939fd493ce Gerrit-Change-Number: 16440 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 09 Dec 2019 10:50:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 10:51:23 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 9 Dec 2019 10:51:23 +0000 Subject: Change in docker-playground[master]: ttcn3-bts: Fix trxcon docker volume dir created as root References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16524 ) Change subject: ttcn3-bts: Fix trxcon docker volume dir created as root ...................................................................... ttcn3-bts: Fix trxcon docker volume dir created as root If directory is not created beforehand by the user, docker (root) will create the directory before binding it to the container. Related: OS#4313 Fixes: a66f6ebb23716a157ea68d78d6f7b827581dc5ed Change-Id: I3f02faef1aa5846c48a3776191c3862bac913d10 --- M ttcn3-bts-test/jenkins.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/24/16524/1 diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 4753383..325e564 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -101,6 +101,7 @@ mkdir $VOL_BASE_DIR/unix mkdir $VOL_BASE_DIR/fake_trx +mkdir $VOL_BASE_DIR/trxcon # 1) classic test suite with BSC for OML and trxcon+fake_trx start_bsc -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3f02faef1aa5846c48a3776191c3862bac913d10 Gerrit-Change-Number: 16524 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 10:53:52 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 9 Dec 2019 10:53:52 +0000 Subject: Change in libosmocore[master]: gsup: Introduce OSMO_GSUP_NUM_VECTORS_REQ_IE In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15321 ) Change subject: gsup: Introduce OSMO_GSUP_NUM_VECTORS_REQ_IE ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iaecc47280f8ce54f3e3a888c1cfc160735483d0f Gerrit-Change-Number: 15321 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Mon, 09 Dec 2019 10:53:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 10:54:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 9 Dec 2019 10:54:30 +0000 Subject: Change in libosmocore[master]: gsup: Introduce OSMO_GSUP_NUM_VECTORS_REQ_IE In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15321 ) Change subject: gsup: Introduce OSMO_GSUP_NUM_VECTORS_REQ_IE ...................................................................... gsup: Introduce OSMO_GSUP_NUM_VECTORS_REQ_IE This is a bit of a hack, as we want to maintain binary compatibility without breaking existing users of libosmocore. To do so, we use the 'num_auth_vectors' field in two ways now: * In the existing use case as part of SEND_AUTH_INFO_RESPONSE, it indicates the number of vectors stored in the 'auth_vectors' field * In the new use case as part of SEND_AUTH_INFO_REQUEST, it indicates the number of vectors actually requested by the MSC/SGSN/MME. Change-Id: Iaecc47280f8ce54f3e3a888c1cfc160735483d0f --- M include/osmocom/gsm/gsup.h M src/gsm/gsup.c M tests/gsup/gsup_test.c M tests/gsup/gsup_test.err M tests/gsup/gsup_test.ok 5 files changed, 33 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index 285bc0c..56d7a30 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -107,6 +107,7 @@ OSMO_GSUP_IMEI_IE = 0x50, OSMO_GSUP_IMEI_RESULT_IE = 0x51, + OSMO_GSUP_NUM_VECTORS_REQ_IE = 0x52, /* Inter-MSC handover related */ OSMO_GSUP_SOURCE_NAME_IE = 0x60, diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c index ad7a2a4..ef33ed0 100644 --- a/src/gsm/gsup.c +++ b/src/gsm/gsup.c @@ -569,6 +569,11 @@ gsup_msg->cause_sm = value[0]; break; + case OSMO_GSUP_NUM_VECTORS_REQ_IE: + if (gsup_msg->message_type == OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST) + gsup_msg->num_auth_vectors = value[0]; + break; + default: LOGP(DLGSUP, LOGL_NOTICE, "GSUP IE type %d unknown\n", iei); @@ -753,12 +758,18 @@ } } - for (idx = 0; idx < gsup_msg->num_auth_vectors; idx++) { - const struct osmo_auth_vector *auth_vector; + if (gsup_msg->message_type == OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST) { + uint8_t num = gsup_msg->num_auth_vectors; + if (num != 0) + msgb_tlv_put(msg, OSMO_GSUP_NUM_VECTORS_REQ_IE, 1, &num); + } else { + for (idx = 0; idx < gsup_msg->num_auth_vectors; idx++) { + const struct osmo_auth_vector *auth_vector; - auth_vector = &gsup_msg->auth_vectors[idx]; + auth_vector = &gsup_msg->auth_vectors[idx]; - encode_auth_info(msg, OSMO_GSUP_AUTH_TUPLE_IE, auth_vector); + encode_auth_info(msg, OSMO_GSUP_AUTH_TUPLE_IE, auth_vector); + } } if (gsup_msg->auts) diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c index b84c88f..f34ac7a 100644 --- a/tests/gsup/gsup_test.c +++ b/tests/gsup/gsup_test.c @@ -19,6 +19,7 @@ #define TEST_AN_APDU_IE 0x62, 0x05, 0x01, 0x42, 0x42, 0x42, 0x42 #define TEST_SOURCE_NAME_IE 0x60, 0x05, 'M', 'S', 'C', '-', 'A' #define TEST_DESTINATION_NAME_IE 0x61, 0x05, 'M', 'S', 'C', '-', 'B' +#define TEST_NUM_VEC_IE(x) 0x52, 1, x static void test_gsup_messages_dec_enc(void) { @@ -32,6 +33,13 @@ TEST_CLASS_SUBSCR_IE }; + static const uint8_t send_auth_info_req10[] = { + 0x08, + TEST_IMSI_IE, + TEST_NUM_VEC_IE(10), + TEST_CLASS_SUBSCR_IE + }; + static const uint8_t send_auth_info_err[] = { 0x09, TEST_IMSI_IE, @@ -612,6 +620,8 @@ send_e_abort, sizeof(send_e_abort)}, {"E Routing Error", send_e_routing_error, sizeof(send_e_routing_error)}, + {"Send Authentication Info Request (10 Vectors)", + send_auth_info_req10, sizeof(send_auth_info_req10)}, }; printf("Test GSUP message decoding/encoding\n"); diff --git a/tests/gsup/gsup_test.err b/tests/gsup/gsup_test.err index 1da3964..7b2fda9 100644 --- a/tests/gsup/gsup_test.err +++ b/tests/gsup/gsup_test.err @@ -115,6 +115,9 @@ generated message: 4e 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 0a 01 04 60 05 4d 53 43 2d 41 61 05 4d 53 43 2d 42 original message: 4e 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 0a 01 04 60 05 4d 53 43 2d 41 61 05 4d 53 43 2d 42 IMSI: 123456789012345 + generated message: 08 01 08 21 43 65 87 09 21 43 f5 52 01 0a 0a 01 01 + original message: 08 01 08 21 43 65 87 09 21 43 f5 52 01 0a 0a 01 01 + IMSI: 123456789012345 message 0: tested 14 truncations, 13 parse failures message 1: tested 14 truncations, 13 parse failures message 2: tested 83 truncations, 81 parse failures @@ -154,6 +157,7 @@ message 36: tested 37 truncations, 32 parse failures message 37: tested 26 truncations, 22 parse failures message 38: tested 37 truncations, 32 parse failures + message 39: tested 17 truncations, 15 parse failures DLGSUP Stopping DLGSUP logging message 0: tested 3584 modifications, 771 parse failures message 1: tested 3584 modifications, 770 parse failures @@ -194,3 +198,4 @@ message 36: tested 9472 modifications, 1803 parse failures message 37: tested 6656 modifications, 1546 parse failures message 38: tested 9472 modifications, 1803 parse failures + message 39: tested 4352 modifications, 1030 parse failures diff --git a/tests/gsup/gsup_test.ok b/tests/gsup/gsup_test.ok index db8bc2f..ef2aec6 100644 --- a/tests/gsup/gsup_test.ok +++ b/tests/gsup/gsup_test.ok @@ -77,4 +77,6 @@ E Abort OK Testing E Routing Error E Routing Error OK + Testing Send Authentication Info Request (10 Vectors) + Send Authentication Info Request (10 Vectors) OK Done. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iaecc47280f8ce54f3e3a888c1cfc160735483d0f Gerrit-Change-Number: 15321 Gerrit-PatchSet: 7 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 10:55:19 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 9 Dec 2019 10:55:19 +0000 Subject: Change in docker-playground[master]: ttcn3-bts: Fix trxcon docker volume dir created as root In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16524 ) Change subject: ttcn3-bts: Fix trxcon docker volume dir created as root ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3f02faef1aa5846c48a3776191c3862bac913d10 Gerrit-Change-Number: 16524 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 09 Dec 2019 10:55:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 11:38:36 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 9 Dec 2019 11:38:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce helpers to update AckNackDescription In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502 to look at the new patch set (#4). Change subject: pcu: Introduce helpers to update AckNackDescription ...................................................................... pcu: Introduce helpers to update AckNackDescription Change-Id: Ic62ab9e4a854239b95c434068543d95c5352f1c6 --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 41 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/02/16502/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic62ab9e4a854239b95c434068543d95c5352f1c6 Gerrit-Change-Number: 16502 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 11:38:36 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 9 Dec 2019 11:38:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_imm_ass_dl_block_retrans In-Reply-To: References: Message-ID: Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16507 to look at the new patch set (#2). Change subject: pcu: Introduce test TC_imm_ass_dl_block_retrans ...................................................................... pcu: Introduce test TC_imm_ass_dl_block_retrans Change-Id: Icc60cebb8583c9dc97b658def69f17e6efced384 --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 55 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/07/16507/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16507 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icc60cebb8583c9dc97b658def69f17e6efced384 Gerrit-Change-Number: 16507 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 11:38:36 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 9 Dec 2019 11:38:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_t3193 In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16508 to look at the new patch set (#2). Change subject: pcu: Introduce test TC_t3193 ...................................................................... pcu: Introduce test TC_t3193 Change-Id: Ib11cd1793d985ff609b10b0e60bddadd5fcfa6d2 --- M library/RLCMAC_Types.ttcn M pcu/PCU_Tests_RAW.ttcn 2 files changed, 91 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/08/16508/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16508 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib11cd1793d985ff609b10b0e60bddadd5fcfa6d2 Gerrit-Change-Number: 16508 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 11:49:38 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 9 Dec 2019 11:49:38 +0000 Subject: Change in osmo-bts[master]: power_control.c: Clarify loop algo vars and use correct ones during log In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16440 ) Change subject: power_control.c: Clarify loop algo vars and use correct ones during log ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4e279a6b93fbcc5da25bf8c9213310939fd493ce Gerrit-Change-Number: 16440 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 09 Dec 2019 11:49:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 11:50:42 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 9 Dec 2019 11:50:42 +0000 Subject: Change in osmo-bts[master]: power_control.c: Clarify loop algo vars and use correct ones during log In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16440 ) Change subject: power_control.c: Clarify loop algo vars and use correct ones during log ...................................................................... power_control.c: Clarify loop algo vars and use correct ones during log Rename some variables so that: * Variables containing power control levels end up with "_lvl". * Variables containing power levels end up with _dbm. * Move old current_dbm var to be ms_dbm, to match its power control level counterpart ms_power_lvl, and add current_dbm to match its counterpart ns_power_ctrl.current. Now that variables are more clear, it also becomes clear that old "diff > 0" condition, apart from difficult, was currently wrong, since in order to print the raise/low verb we want to compare between old and new values, not between received and new values. Let's fix that in this same commit. Change-Id: I4e279a6b93fbcc5da25bf8c9213310939fd493ce --- M src/common/power_control.c 1 file changed, 18 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/src/common/power_control.c b/src/common/power_control.c index f6138d6..e9215fc 100644 --- a/src/common/power_control.c +++ b/src/common/power_control.c @@ -38,29 +38,29 @@ /*! compute the new MS POWER LEVEL communicated to the MS and store it in lchan. * \param lchan logical channel for which to compute (and in which to store) new power value. - * \param[in] ms_power MS Power Level received from Uplink L1 SACCH Header in SACCH block. + * \param[in] ms_power_lvl MS Power Level received from Uplink L1 SACCH Header in SACCH block. * \param[in] rxLevel Signal level of the received SACCH block, in dBm. */ int lchan_ms_pwr_ctrl(struct gsm_lchan *lchan, - const uint8_t ms_power, const int rxLevel) + const uint8_t ms_power_lvl, const int rxLevel) { int diff; struct gsm_bts_trx *trx = lchan->ts->trx; struct gsm_bts *bts = trx->bts; enum gsm_band band = bts->band; - int8_t new_power; /* TS 05.05 power level */ - int8_t new_dbm, current_dbm, bsc_max_dbm; + int8_t new_power_lvl; /* TS 05.05 power level */ + int8_t ms_dbm, new_dbm, current_dbm, bsc_max_dbm; if (!trx_ms_pwr_ctrl_is_osmo(lchan->ts->trx)) return 0; if (lchan->ms_power_ctrl.fixed) return 0; - current_dbm = ms_pwr_dbm(band, ms_power); - if (current_dbm < 0) { + ms_dbm = ms_pwr_dbm(band, ms_power_lvl); + if (ms_dbm < 0) { LOGPLCHAN(lchan, DLOOP, LOGL_NOTICE, "Failed to calculate dBm for power ctl level %" PRIu8 " on band %s\n", - ms_power, gsm_band_name(band)); + ms_power_lvl, gsm_band_name(band)); return 0; } bsc_max_dbm = ms_pwr_dbm(band, lchan->ms_power_ctrl.max); @@ -83,7 +83,7 @@ else if (diff < -MS_LOWER_MAX_DB) diff = -MS_LOWER_MAX_DB; - new_dbm = current_dbm + diff; + new_dbm = ms_dbm + diff; /* Make sure new_dbm is never negative. ms_pwr_ctl_lvl() can later on cope with any unsigned dbm value, regardless of band minimal value. */ @@ -94,33 +94,33 @@ if (new_dbm > bsc_max_dbm) new_dbm = bsc_max_dbm; - new_power = ms_pwr_ctl_lvl(band, new_dbm); - if (new_power < 0) { + new_power_lvl = ms_pwr_ctl_lvl(band, new_dbm); + if (new_power_lvl < 0) { LOGPLCHAN(lchan, DLOOP, LOGL_NOTICE, "Failed to retrieve power level for %" PRId8 " dBm on band %d\n", new_dbm, band); return 0; } - if (lchan->ms_power_ctrl.current == new_power) { + if (lchan->ms_power_ctrl.current == new_power_lvl) { LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "Keeping MS power at control level %d, %d dBm " "(rx-ms-pwr-lvl %" PRIu8 ", max-ms-pwr-lvl %" PRIu8 ", rx-current %d dBm, rx-target %d dBm)\n", - new_power, ms_pwr_dbm(band, new_power), - ms_power, lchan->ms_power_ctrl.max, + new_power_lvl, new_dbm, + ms_power_lvl, lchan->ms_power_ctrl.max, rxLevel, bts->ul_power_target); return 0; } + current_dbm = ms_pwr_dbm(band, lchan->ms_power_ctrl.current); LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "%s MS power from control level %d (%d dBm) to %d, %d dBm " "(rx-ms-pwr-lvl %" PRIu8 ", max-ms-pwr-lvl %" PRIu8 ", rx-current %d dBm, rx-target %d dBm)\n", - (diff > 0) ? "Raising" : "Lowering", - lchan->ms_power_ctrl.current, ms_pwr_dbm(band, lchan->ms_power_ctrl.current), - new_power, ms_pwr_dbm(band, new_power), - ms_power, lchan->ms_power_ctrl.max, + (new_dbm > current_dbm) ? "Raising" : "Lowering", + lchan->ms_power_ctrl.current, current_dbm, new_power_lvl, new_dbm, + ms_power_lvl, lchan->ms_power_ctrl.max, rxLevel, bts->ul_power_target); /* store the resulting new MS power level in the lchan */ - lchan->ms_power_ctrl.current = new_power; + lchan->ms_power_ctrl.current = new_power_lvl; bts_model_adjst_ms_pwr(lchan); return 1; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4e279a6b93fbcc5da25bf8c9213310939fd493ce Gerrit-Change-Number: 16440 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 11:51:03 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 9 Dec 2019 11:51:03 +0000 Subject: Change in osmocom-bb[master]: trxcon: Use current MS Power on dummy meas reports In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16475 ) Change subject: trxcon: Use current MS Power on dummy meas reports ...................................................................... trxcon: Use current MS Power on dummy meas reports backpointers are added in order to access the TRX, as advised in the existing comment. Change-Id: I975cfc5f5d63eb32a7f8932a7f6a544c9a12233c --- M src/host/trxcon/sched_prim.c M src/host/trxcon/sched_trx.c M src/host/trxcon/sched_trx.h 3 files changed, 13 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c index 50dfd6e..fc0f05d 100644 --- a/src/host/trxcon/sched_prim.c +++ b/src/host/trxcon/sched_prim.c @@ -171,25 +171,18 @@ /* Compose a new Measurement Report primitive */ memcpy(prim->payload, mr_src_ptr, GSM_MACBLOCK_LEN); -#if 0 /** * Update the L1 SACCH pseudo-header (only for cached MRs) * - * FIXME: this would require having access to the trx_instance, - * what can be achieved either by chain-passing the pointer - * through sched_prim_dequeue(), or by adding some - * back-pointers to the logical channel state. - * * TODO: filling of the actual values into cached Measurement * Reports would break the distance spoofing feature. If it * were known whether the spoofing is enabled or not, we could * decide whether to update the cached L1 SACCH header here. */ if (!cached) { - prim->payload[0] = trx->tx_power; - prim->payload[1] = trx->ta; + prim->payload[0] = lchan->ts->trx->tx_power; + prim->payload[1] = lchan->ts->trx->ta; } -#endif /* Inform about the cache usage count */ if (cached && lchan->sacch.mr_cache_usage > 5) { diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index eb6f3dc..6bb662d 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -202,6 +202,9 @@ /* Allocate a new one */ trx->ts_list[tn] = talloc_zero(trx, struct trx_ts); + /* Add backpointer */ + trx->ts_list[tn]->trx = trx; + /* Assign TS index */ trx->ts_list[tn]->index = tn; @@ -287,6 +290,9 @@ if (!lchan) return -ENOMEM; + /* set backpointer */ + lchan->ts = ts; + /* Set channel type */ lchan->type = type; diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h index f2089e8..8718ed6 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -237,6 +237,9 @@ uint8_t key_len; uint8_t algo; } a5; + + /* TS that this lchan belongs to */ + struct trx_ts *ts; }; struct trx_ts { @@ -251,6 +254,8 @@ struct llist_head lchans; /*! \brief Queue primitives for TX */ struct llist_head tx_prims; + /* backpointer to its TRX */ + struct trx_instance *trx; }; /* Represents one TX primitive in the queue of trx_ts */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16475 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I975cfc5f5d63eb32a7f8932a7f6a544c9a12233c Gerrit-Change-Number: 16475 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 11:54:55 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 9 Dec 2019 11:54:55 +0000 Subject: Change in libosmocore[master]: sim: allow opening reader# > 0 In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#4) to the change originally created by Hoernchen. ( https://gerrit.osmocom.org/c/libosmocore/+/15927 ) Change subject: sim: allow opening reader# > 0 ...................................................................... sim: allow opening reader# > 0 Change-Id: I4b1abc8d8aae4bd9a32f927269d7ebfef902d7c5 --- M src/sim/reader_pcsc.c M utils/osmo-sim-test.c 2 files changed, 53 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/27/15927/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4b1abc8d8aae4bd9a32f927269d7ebfef902d7c5 Gerrit-Change-Number: 15927 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 11:56:09 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 9 Dec 2019 11:56:09 +0000 Subject: Change in libosmocore[master]: sim: allow opening reader# > 0 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15927 ) Change subject: sim: allow opening reader# > 0 ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4b1abc8d8aae4bd9a32f927269d7ebfef902d7c5 Gerrit-Change-Number: 15927 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 09 Dec 2019 11:56:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Dec 9 11:58:55 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 09 Dec 2019 11:58:55 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5dee370ef30e0_653f2ad8858225fc745265@build.opensuse.org> 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: [ 431s] [ 431s] Error: [Errno 2] No such file or directory [ 431s] [ 431s] /usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:61: recipe for target 'osmux-reference.pdf' failed [ 431s] make[4]: *** [osmux-reference.pdf] Error 1 [ 431s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 431s] Makefile:387: recipe for target 'all-recursive' failed [ 431s] make[3]: *** [all-recursive] Error 1 [ 431s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 431s] Makefile:448: recipe for target 'all-recursive' failed [ 431s] make[2]: *** [all-recursive] Error 1 [ 431s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 431s] Makefile:380: recipe for target 'all' failed [ 431s] make[1]: *** [all] Error 2 [ 431s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 431s] dh_auto_build: make -j1 returned exit code 2 [ 431s] debian/rules:45: recipe for target 'build' failed [ 431s] make: *** [build] Error 2 [ 431s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 431s] [ 431s] obs-arm-5 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 11:58:44 UTC 2019. [ 431s] [ 431s] ### VM INTERACTION START ### [ 434s] [ 401.533072] sysrq: SysRq : Power Off [ 434s] [ 401.545299] reboot: Power down [ 434s] ### VM INTERACTION END ### [ 434s] [ 434s] obs-arm-5 failed "build osmo-bsc_1.5.0.42.01a3c.dsc" at Mon Dec 9 11:58:47 UTC 2019. [ 434s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Dec 9 12:37:32 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 9 Dec 2019 12:37:32 +0000 Subject: Change in osmo-gsm-manuals[master]: D-GSM biblio entries References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16525 ) Change subject: D-GSM biblio entries ...................................................................... D-GSM biblio entries Change-Id: Ief8dd1998e2445aea41fe9f0c8a98d6cd515c8a5 --- M common/chapters/bibliography.adoc 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/25/16525/1 diff --git a/common/chapters/bibliography.adoc b/common/chapters/bibliography.adoc index 12115c6..96a8555 100644 --- a/common/chapters/bibliography.adoc +++ b/common/chapters/bibliography.adoc @@ -112,6 +112,8 @@ https://tools.ietf.org/html/rfc791 - [[[ietf-rfc793]]] IETF RFC 793: Transmission Control Protocol https://tools.ietf.org/html/rfc793 +- [[[ietf-rfc1035]]] IETF RFC 1035: Domain Names - Implementation and Specification + https://tools.ietf.org/html/rfc1035 - [[[ietf-rfc1350]]] IETF RFC 1350: Trivial File Transfer Protool https://tools.ietf.org/html/rfc1350 - [[[ietf-rfc2131]]] IETF RFC 2131: Dynamic Host Configuration Protocol @@ -122,6 +124,8 @@ https://tools.ietf.org/html/rfc3331 - [[[ietf-rfc3550]]] IETF RFC 3550: RTP: A Transport protocol for Real-Time Applications https://tools.ietf.org/html/rfc3550 +- [[[ietf-rfc3596]]] IETF RFC 3596: DNS Extensions to Support IP Version 6 + https://tools.ietf.org/html/rfc3596 - [[[ietf-rfc3868]]] IETF RFC 3868: SCCP User Adaptation Layer https://tools.ietf.org/html/rfc3868 - [[[ietf-rfc4165]]] IETF RFC 4165: Message Transfer Part 2 Peer-to-Peeer Adaptation Layer @@ -130,6 +134,8 @@ https://tools.ietf.org/html/rfc4251 - [[[ietf-rfc4666]]] IETF RFC 4666: Message Transfer Part 3 User Adaptation Layer https://tools.ietf.org/html/rfc4666 +- [[[ietf-rfc5771]]] IETF RFC 5771: IANA Guidelines for IPv4 Multicast Address Assignments + https://tools.ietf.org/html/rfc5771 - [[[itu-t-q701]]] ITU-T Q.701: Functional Description of the Message Transfer Part (MTP) https://www.itu.int/rec/T-REC-Q.701/en/ @@ -149,3 +155,5 @@ - [[[gnu-agplv3]]] Free Software Foundation. GNU Affero General Public License. http://www.gnu.org/licenses/agpl-3.0.en.html +- [[[freeswitch_pbx]]] FreeSWITCH SIP PBX + https://freeswitch.org -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ief8dd1998e2445aea41fe9f0c8a98d6cd515c8a5 Gerrit-Change-Number: 16525 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 12:38:26 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 9 Dec 2019 12:38:26 +0000 Subject: Change in docker-playground[master]: ttcn3-bts: Fix trxcon docker volume dir created as root In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16524 ) Change subject: ttcn3-bts: Fix trxcon docker volume dir created as root ...................................................................... Patch Set 1: Code-Review-2 Files inside trxcon still belong to root. $ user at gsmdevel /tmp/logs % ls -l total 92 drwxr-xr-x 2 user user 4096 Dec 9 13:02 bsc drwxr-xr-x 3 user user 4096 Dec 9 13:02 bts drwxr-xr-x 3 user user 73728 Dec 9 13:24 bts-tester drwxr-xr-x 2 user user 4096 Dec 9 13:02 fake_trx drwxr-xr-x 3 user user 4096 Dec 9 13:02 trxcon drwxr-xr-x 2 user user 4096 Dec 9 13:24 unix $ user at gsmdevel /tmp/logs % ls -l trxcon total 1904 -rw-r--r-- 1 root root 1937861 Dec 9 13:24 trxcon.log drwxr-xr-x 2 root root 4096 Dec 9 13:02 unix user at gsmdevel /tmp/logs % -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3f02faef1aa5846c48a3776191c3862bac913d10 Gerrit-Change-Number: 16524 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 09 Dec 2019 12:38:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 12:43:16 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 9 Dec 2019 12:43:16 +0000 Subject: Change in docker-playground[master]: ttcn3-bts: Fix trxcon docker volume dir created as root In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16524 ) Change subject: ttcn3-bts: Fix trxcon docker volume dir created as root ...................................................................... Patch Set 1: In any case, the directory and its contents can be deleted (I tested on my laptop), and that seems to be the same for other components being run? -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3f02faef1aa5846c48a3776191c3862bac913d10 Gerrit-Change-Number: 16524 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 09 Dec 2019 12:43:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 12:50:04 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 9 Dec 2019 12:50:04 +0000 Subject: Change in docker-playground[master]: ttcn3-bts: Fix trxcon docker volume dir created as root In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16524 ) Change subject: ttcn3-bts: Fix trxcon docker volume dir created as root ...................................................................... Patch Set 1: Code-Review+1 > Patch Set 1: > > In any case, the directory and its contents can be deleted (I tested on my laptop), and that seems to be the same for other components being run? Right, I did not try to delete the files. That works indeed, so this should resolve the issue. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3f02faef1aa5846c48a3776191c3862bac913d10 Gerrit-Change-Number: 16524 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 09 Dec 2019 12:50:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 13:01:29 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 9 Dec 2019 13:01:29 +0000 Subject: Change in docker-playground[master]: pcu-master: Remove non-existent --enable-trx configure option from Do... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16526 ) Change subject: pcu-master: Remove non-existent --enable-trx configure option from Dockerfile ...................................................................... pcu-master: Remove non-existent --enable-trx configure option from Dockerfile configure: WARNING: unrecognized options: --enable-trx Change-Id: I24f10e2b99771cdd5a1e72a1ad5626aff649258f --- M osmo-pcu-master/Dockerfile 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/26/16526/1 diff --git a/osmo-pcu-master/Dockerfile b/osmo-pcu-master/Dockerfile index 01f7755..1aed8c9 100644 --- a/osmo-pcu-master/Dockerfile +++ b/osmo-pcu-master/Dockerfile @@ -32,7 +32,7 @@ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_PCU_BRANCH || exit 1); \ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ - ./configure --enable-trx && \ + ./configure && \ make -j8 install VOLUME /data @@ -42,4 +42,4 @@ WORKDIR /data CMD ["/usr/local/bin/osmo-pcu", "-i", "172.18.0.230"] -#EXPOSE +#EXPOSE -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I24f10e2b99771cdd5a1e72a1ad5626aff649258f Gerrit-Change-Number: 16526 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 13:01:43 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 9 Dec 2019 13:01:43 +0000 Subject: Change in osmo-pcu[master]: pcu_l1_if: Check pag_req id_lv len fits buffer References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16527 ) Change subject: pcu_l1_if: Check pag_req id_lv len fits buffer ...................................................................... pcu_l1_if: Check pag_req id_lv len fits buffer Related: OS#4316 Change-Id: I803e1d2577a0d210e74feb5ca4c216375a5024ea --- M src/pcu_l1_if.cpp 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/27/16527/1 diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 5e22c5c..98e697d 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -19,6 +19,7 @@ #include #include +#include #include #include #include @@ -636,6 +637,13 @@ LOGP(DL1IF, LOGL_DEBUG, "Paging request received: chan_needed=%d " "length=%d\n", pag_req->chan_needed, pag_req->identity_lv[0]); + /* check if identity does not fit: length > sizeof(lv) - 1 */ + if (pag_req->identity_lv[0] >= sizeof(pag_req->identity_lv)) { + LOGP(DL1IF, LOGL_ERROR, "Paging identity too large (%" PRIu8 ")\n", + pag_req->identity_lv[0]); + return -EINVAL; + } + return BTS::main_bts()->add_paging(pag_req->chan_needed, pag_req->identity_lv); } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I803e1d2577a0d210e74feb5ca4c216375a5024ea Gerrit-Change-Number: 16527 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 15:27:45 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 9 Dec 2019 15:27:45 +0000 Subject: Change in libosmocore[master]: sim: allow opening reader# > 0 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15927 ) Change subject: sim: allow opening reader# > 0 ...................................................................... sim: allow opening reader# > 0 Change-Id: I4b1abc8d8aae4bd9a32f927269d7ebfef902d7c5 --- M src/sim/reader_pcsc.c M utils/osmo-sim-test.c 2 files changed, 53 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/sim/reader_pcsc.c b/src/sim/reader_pcsc.c index f22103f..9e05e3c 100644 --- a/src/sim/reader_pcsc.c +++ b/src/sim/reader_pcsc.c @@ -79,17 +79,18 @@ rc = SCardListReaders(st->hContext, NULL, (LPSTR)&mszReaders, &dwReaders); PCSC_ERROR(rc, "SCardListReaders"); + /* SCARD_S_SUCCESS means there is at least one reader in the group */ num_readers = 0; ptr = mszReaders; - while (*ptr != '\0') { + while (*ptr != '\0' && num_readers != num) { ptr += strlen(ptr)+1; num_readers++; } - if (num_readers == 0) + if (num != num_readers) goto end; - st->name = talloc_strdup(rh, mszReaders); + st->name = talloc_strdup(rh, ptr); st->dwActiveProtocol = -1; return rh; diff --git a/utils/osmo-sim-test.c b/utils/osmo-sim-test.c index 5588294..cd98397 100644 --- a/utils/osmo-sim-test.c +++ b/utils/osmo-sim-test.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -328,6 +329,51 @@ return -EINVAL; } +static void print_help(void) +{ + printf( "osmo-sim-test Usage:\n" + " -h --help This message\n" + " -n --reader-num NR Open reader number NR\n" + ); +} + +static int readernum = 0; + +static void handle_options(int argc, char **argv) +{ + while (1) { + int option_index = 0, c; + const struct option long_options[] = { + { "help", 0, 0, 'h' }, + { "reader-num", 1, 0, 'n' }, + {0,0,0,0} + }; + + c = getopt_long(argc, argv, "hn:", + long_options, &option_index); + if (c == -1) + break; + + switch (c) { + case 'h': + print_help(); + exit(0); + break; + case 'n': + readernum = atoi(optarg); + break; + default: + exit(2); + break; + } + } + + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); + } +} + int main(int argc, char **argv) { struct osim_reader_hdl *reader; @@ -335,7 +381,9 @@ struct osim_chan_hdl *chan; struct msgb *msg; - reader = osim_reader_open(OSIM_READER_DRV_PCSC, 0, "", NULL); + handle_options(argc, argv); + + reader = osim_reader_open(OSIM_READER_DRV_PCSC, readernum, "", NULL); if (!reader) exit(1); card = osim_card_open(reader, OSIM_PROTO_T0); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4b1abc8d8aae4bd9a32f927269d7ebfef902d7c5 Gerrit-Change-Number: 15927 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 15:28:05 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 9 Dec 2019 15:28:05 +0000 Subject: Change in docker-playground[master]: ttcn3-bts: Fix trxcon docker volume dir created as root In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16524 ) Change subject: ttcn3-bts: Fix trxcon docker volume dir created as root ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3f02faef1aa5846c48a3776191c3862bac913d10 Gerrit-Change-Number: 16524 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 09 Dec 2019 15:28:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 15:28:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 9 Dec 2019 15:28:18 +0000 Subject: Change in docker-playground[master]: ttcn3-bts: Fix trxcon docker volume dir created as root In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16524 ) Change subject: ttcn3-bts: Fix trxcon docker volume dir created as root ...................................................................... ttcn3-bts: Fix trxcon docker volume dir created as root If directory is not created beforehand by the user, docker (root) will create the directory before binding it to the container. Related: OS#4313 Fixes: a66f6ebb23716a157ea68d78d6f7b827581dc5ed Change-Id: I3f02faef1aa5846c48a3776191c3862bac913d10 --- M ttcn3-bts-test/jenkins.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: pespin: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 4753383..325e564 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -101,6 +101,7 @@ mkdir $VOL_BASE_DIR/unix mkdir $VOL_BASE_DIR/fake_trx +mkdir $VOL_BASE_DIR/trxcon # 1) classic test suite with BSC for OML and trxcon+fake_trx start_bsc -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3f02faef1aa5846c48a3776191c3862bac913d10 Gerrit-Change-Number: 16524 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 15:28:28 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 9 Dec 2019 15:28:28 +0000 Subject: Change in docker-playground[master]: pcu-master: Remove non-existent --enable-trx configure option from Do... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16526 ) Change subject: pcu-master: Remove non-existent --enable-trx configure option from Dockerfile ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I24f10e2b99771cdd5a1e72a1ad5626aff649258f Gerrit-Change-Number: 16526 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 09 Dec 2019 15:28:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 16:20:03 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 9 Dec 2019 16:20:03 +0000 Subject: Change in osmo-pcu[master]: pcu_l1_if: Check pag_req id_lv len fits buffer In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16527 ) Change subject: pcu_l1_if: Check pag_req id_lv len fits buffer ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I803e1d2577a0d210e74feb5ca4c216375a5024ea Gerrit-Change-Number: 16527 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 09 Dec 2019 16:20:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 16:20:08 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 9 Dec 2019 16:20:08 +0000 Subject: Change in osmo-pcu[master]: pcu_l1_if: Check pag_req id_lv len fits buffer In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16527 ) Change subject: pcu_l1_if: Check pag_req id_lv len fits buffer ...................................................................... pcu_l1_if: Check pag_req id_lv len fits buffer Related: OS#4316 Change-Id: I803e1d2577a0d210e74feb5ca4c216375a5024ea --- M src/pcu_l1_if.cpp 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 5e22c5c..98e697d 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -19,6 +19,7 @@ #include #include +#include #include #include #include @@ -636,6 +637,13 @@ LOGP(DL1IF, LOGL_DEBUG, "Paging request received: chan_needed=%d " "length=%d\n", pag_req->chan_needed, pag_req->identity_lv[0]); + /* check if identity does not fit: length > sizeof(lv) - 1 */ + if (pag_req->identity_lv[0] >= sizeof(pag_req->identity_lv)) { + LOGP(DL1IF, LOGL_ERROR, "Paging identity too large (%" PRIu8 ")\n", + pag_req->identity_lv[0]); + return -EINVAL; + } + return BTS::main_bts()->add_paging(pag_req->chan_needed, pag_req->identity_lv); } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I803e1d2577a0d210e74feb5ca4c216375a5024ea Gerrit-Change-Number: 16527 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 16:20:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 9 Dec 2019 16:20:47 +0000 Subject: Change in osmo-gsm-manuals[master]: D-GSM biblio entries In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16525 ) Change subject: D-GSM biblio entries ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ief8dd1998e2445aea41fe9f0c8a98d6cd515c8a5 Gerrit-Change-Number: 16525 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 09 Dec 2019 16:20:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 16:20:52 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 9 Dec 2019 16:20:52 +0000 Subject: Change in osmo-gsm-manuals[master]: D-GSM biblio entries In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16525 ) Change subject: D-GSM biblio entries ...................................................................... D-GSM biblio entries Change-Id: Ief8dd1998e2445aea41fe9f0c8a98d6cd515c8a5 --- M common/chapters/bibliography.adoc 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/common/chapters/bibliography.adoc b/common/chapters/bibliography.adoc index 12115c6..96a8555 100644 --- a/common/chapters/bibliography.adoc +++ b/common/chapters/bibliography.adoc @@ -112,6 +112,8 @@ https://tools.ietf.org/html/rfc791 - [[[ietf-rfc793]]] IETF RFC 793: Transmission Control Protocol https://tools.ietf.org/html/rfc793 +- [[[ietf-rfc1035]]] IETF RFC 1035: Domain Names - Implementation and Specification + https://tools.ietf.org/html/rfc1035 - [[[ietf-rfc1350]]] IETF RFC 1350: Trivial File Transfer Protool https://tools.ietf.org/html/rfc1350 - [[[ietf-rfc2131]]] IETF RFC 2131: Dynamic Host Configuration Protocol @@ -122,6 +124,8 @@ https://tools.ietf.org/html/rfc3331 - [[[ietf-rfc3550]]] IETF RFC 3550: RTP: A Transport protocol for Real-Time Applications https://tools.ietf.org/html/rfc3550 +- [[[ietf-rfc3596]]] IETF RFC 3596: DNS Extensions to Support IP Version 6 + https://tools.ietf.org/html/rfc3596 - [[[ietf-rfc3868]]] IETF RFC 3868: SCCP User Adaptation Layer https://tools.ietf.org/html/rfc3868 - [[[ietf-rfc4165]]] IETF RFC 4165: Message Transfer Part 2 Peer-to-Peeer Adaptation Layer @@ -130,6 +134,8 @@ https://tools.ietf.org/html/rfc4251 - [[[ietf-rfc4666]]] IETF RFC 4666: Message Transfer Part 3 User Adaptation Layer https://tools.ietf.org/html/rfc4666 +- [[[ietf-rfc5771]]] IETF RFC 5771: IANA Guidelines for IPv4 Multicast Address Assignments + https://tools.ietf.org/html/rfc5771 - [[[itu-t-q701]]] ITU-T Q.701: Functional Description of the Message Transfer Part (MTP) https://www.itu.int/rec/T-REC-Q.701/en/ @@ -149,3 +155,5 @@ - [[[gnu-agplv3]]] Free Software Foundation. GNU Affero General Public License. http://www.gnu.org/licenses/agpl-3.0.en.html +- [[[freeswitch_pbx]]] FreeSWITCH SIP PBX + https://freeswitch.org -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ief8dd1998e2445aea41fe9f0c8a98d6cd515c8a5 Gerrit-Change-Number: 16525 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 16:23:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 9 Dec 2019 16:23:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: send UL CONTROL ACK triggered by DL ACK/NACK In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16501 ) Change subject: pcu: send UL CONTROL ACK triggered by DL ACK/NACK ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16501 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib409394257427cfc62da08fe06ce6c001dcf608a Gerrit-Change-Number: 16501 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 09 Dec 2019 16:23:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 16:24:34 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 9 Dec 2019 16:24:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce helpers to update AckNackDescription In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502 ) Change subject: pcu: Introduce helpers to update AckNackDescription ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic62ab9e4a854239b95c434068543d95c5352f1c6 Gerrit-Change-Number: 16502 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 09 Dec 2019 16:24:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 16:26:24 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 9 Dec 2019 16:26:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_imm_ass_dl_block_retrans In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16507 ) Change subject: pcu: Introduce test TC_imm_ass_dl_block_retrans ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16507/2/pcu/PCU_Tests_RAW.ttcn File pcu/PCU_Tests_RAW.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16507/2/pcu/PCU_Tests_RAW.ttcn at 1520 PS2, Line 1520: f_acknackdesc_ack_block(ack_nack_desc, dl_block.data.mac_hdr.hdr_ext.bsn, '1'B); Since we ack it at the end, we could also test that no further retransmissions happen after the back reaches pcu? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16507 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icc60cebb8583c9dc97b658def69f17e6efced384 Gerrit-Change-Number: 16507 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 09 Dec 2019 16:26:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 9 16:27:08 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 9 Dec 2019 16:27:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_t3193 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16508 ) Change subject: pcu: Introduce test TC_t3193 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16508 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib11cd1793d985ff609b10b0e60bddadd5fcfa6d2 Gerrit-Change-Number: 16508 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 09 Dec 2019 16:27:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 00:48:20 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 10 Dec 2019 00:48:20 +0000 Subject: Change in osmo-hlr[master]: D-GSM 3/n: implement roaming by mslookup in osmo-hlr In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16258 ) Change subject: D-GSM 3/n: implement roaming by mslookup in osmo-hlr ...................................................................... Patch Set 12: (2 comments) https://gerrit.osmocom.org/c/osmo-hlr/+/16258/12/include/osmocom/hlr/proxy.h File include/osmocom/hlr/proxy.h: https://gerrit.osmocom.org/c/osmo-hlr/+/16258/12/include/osmocom/hlr/proxy.h at 82 PS12, Line 82: const struct proxy_subscr *proxy_subscr_get_by_imsi(struct proxy *proxy, const char *imsi); My intention was that this API would be easy to move to an SQL db, but this implies a static struct (or at least one that remains valid after the function returns). What was I thinking! https://gerrit.osmocom.org/c/osmo-hlr/+/16258/12/include/osmocom/hlr/proxy.h at 87 PS12, Line 87: const struct proxy_subscr *proxy_subscr_get_by_imsi(struct proxy *proxy, const char *imsi); (repeated) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa Gerrit-Change-Number: 16258 Gerrit-PatchSet: 12 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 10 Dec 2019 00:48:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 07:49:17 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 10 Dec 2019 07:49:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: add TC_paging_cs_from_bts In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623 ) Change subject: pcu: add TC_paging_cs_from_bts ...................................................................... Patch Set 5: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia3ad503c243c9b3b162e204683fa4fa5447bbab3 Gerrit-Change-Number: 15623 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Assignee: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 10 Dec 2019 07:49:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 07:58:45 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 10 Dec 2019 07:58:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: add TC_paging_cs_from_bts In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623 ) Change subject: pcu: add TC_paging_cs_from_bts ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia3ad503c243c9b3b162e204683fa4fa5447bbab3 Gerrit-Change-Number: 15623 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Assignee: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 10 Dec 2019 07:58:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Dec 10 08:07:36 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 10 Dec 2019 08:07:36 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Raspbian_9.0/armv7l In-Reply-To: References: Message-ID: <5def5261381a7_653f2ad8858225fc9802b6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Raspbian_9.0/armv7l Package network:osmocom:latest/osmo-remsim failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 575s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc' [ 575s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 575s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 575s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 575s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 575s] make[4]: Nothing to be done for 'install-exec-am'. [ 575s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/arm-linux-gnueabihf/pkgconfig' [ 575s] /usr/bin/install -c -m 644 libosmo-rspro.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/arm-linux-gnueabihf/pkgconfig' [ 575s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 575s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 575s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 575s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 575s] dh_install -O--fail-missing [ 576s] dh_install: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 576s] dh_install: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 576s] dh_install: missing files, aborting [ 576s] debian/rules:12: recipe for target 'binary' failed [ 576s] make: *** [binary] Error 2 [ 576s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 576s] [ 576s] obs-arm-6 failed "build osmo-remsim_0.2.2.dsc" at Tue Dec 10 08:07:16 UTC 2019. [ 576s] [ 576s] ### VM INTERACTION START ### [ 579s] [ 546.381007] sysrq: SysRq : Power Off [ 579s] [ 546.388236] reboot: Power down [ 579s] ### VM INTERACTION END ### [ 579s] [ 579s] obs-arm-6 failed "build osmo-remsim_0.2.2.dsc" at Tue Dec 10 08:07:19 UTC 2019. [ 579s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Dec 10 08:18:10 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 10 Dec 2019 08:18:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: add TC_paging_cs_from_bts In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623 ) Change subject: pcu: add TC_paging_cs_from_bts ...................................................................... Patch Set 5: (4 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623/5/library/RLCMAC_Types.ttcn File library/RLCMAC_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623/5/library/RLCMAC_Types.ttcn at 424 PS5, Line 424: MAC_PT_RLCMAC_NO_OPT (MAC_PT_RLCMAC_NO_OPT, MAC_PT_RLCMAC_OPT) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623/5/pcu/PCU_Tests_RAW.ttcn File pcu/PCU_Tests_RAW.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623/5/pcu/PCU_Tests_RAW.ttcn at 1619 PS5, Line 1619: MobileL3_CommonIE_Types No need to use this prefix as you're importing all from MobileL3_CommonIE_Types. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623/5/pcu/PCU_Tests_RAW.ttcn at 1653 PS5, Line 1653: := cosmetic: space is missing https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623/5/pcu/PCU_Tests_RAW.ttcn at 1661 PS5, Line 1661: len So we only compare the lengths? Can we compare the identities too? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia3ad503c243c9b3b162e204683fa4fa5447bbab3 Gerrit-Change-Number: 15623 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Assignee: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 10 Dec 2019 08:18:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 11:18:04 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 10 Dec 2019 11:18:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Update transmitted MS power as requested by BTS In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16480 ) Change subject: bts: Update transmitted MS power as requested by BTS ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16480/2/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16480/2/bts/BTS_Tests.ttcn at 2042 PS2, Line 2042: > Did you remove the = on purpose? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I287761202093fbc1064f9868efe6f7f6155253ca Gerrit-Change-Number: 16480 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 10 Dec 2019 11:18:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 11:23:51 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 10 Dec 2019 11:23:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Update transmitted MS power as requested by BTS In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16480 ) Change subject: bts: Update transmitted MS power as requested by BTS ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16480/2/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16480/2/bts/BTS_Tests.ttcn at 2042 PS2, Line 2042: > > Did you remove the = on purpose? Yes, it's the logical opposite. On the case above (line 2019) the logic was actually wrong, as it should hae been ">=" instead of ">". But it's a bit difficult to understand with the "not", so I changed the way it is written. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I287761202093fbc1064f9868efe6f7f6155253ca Gerrit-Change-Number: 16480 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 10 Dec 2019 11:23:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 11:23:53 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 10 Dec 2019 11:23:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Update transmitted MS power as requested by BTS In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16480 ) Change subject: bts: Update transmitted MS power as requested by BTS ...................................................................... bts: Update transmitted MS power as requested by BTS New generic ms power loop algo takes into account the MS Power sent by MS over L1 SACCH Header. As a result, the test infra must now update its transmitted value according to what is requested by the BTS as if it was a real MS in order for algo to output expected results. Requires osmocom-bb I975cfc5f5d63eb32a7f8932a7f6a544c9a12233c to have transmitted MS power values for dummy Meas Results updated as requested over L1CTL. Change-Id: I287761202093fbc1064f9868efe6f7f6155253ca --- M bts/BTS_Tests.ttcn 1 file changed, 23 insertions(+), 7 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 779f7c3..4ba8f55 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2016,9 +2016,11 @@ T2.start; alt { [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl { - if( not(oct2int(l1_dl.payload.data_ind.payload[0]) > (pwr_var+6))){ + /* Update sent MS power to follow what BTS requests */ + f_L1CTL_PARAM(L1CTL, g_pars.l1_pars.ms_actual_ta, oct2int(l1_dl.payload.data_ind.payload[0])); + if (oct2int(l1_dl.payload.data_ind.payload[0]) < (pwr_var + 6)) { repeat; - } + } T2.stop; } [] L1CTL.receive { repeat; } @@ -2035,9 +2037,11 @@ T4.start; alt { [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl { - if( not(oct2int(l1_dl.payload.data_ind.payload[0]) <= (pwr_var))){ + /* Update sent MS power to follow what BTS requests */ + f_L1CTL_PARAM(L1CTL, g_pars.l1_pars.ms_actual_ta, oct2int(l1_dl.payload.data_ind.payload[0])); + if (oct2int(l1_dl.payload.data_ind.payload[0]) > pwr_var) { repeat; - } + } T4.stop; setverdict(pass, "Power level in L1 decreased/increased as expected"); } @@ -2077,7 +2081,11 @@ timer T1 := 10.0; T1.start; alt { - [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl { repeat; } + [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl { + /* Update sent MS power to follow what BTS requests */ + f_L1CTL_PARAM(L1CTL, g_pars.l1_pars.ms_actual_ta, oct2int(l1_dl.payload.data_ind.payload[0])); + repeat; + } [] L1CTL.receive { repeat; } [] T1.timeout { if( oct2int(l1_dl.payload.data_ind.payload[0]) != pwr_var){ @@ -2119,7 +2127,11 @@ timer T1 := 10.0; T1.start; alt { - [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl { repeat; } + [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl { + /* Update sent MS power to follow what BTS requests */ + f_L1CTL_PARAM(L1CTL, g_pars.l1_pars.ms_actual_ta, oct2int(l1_dl.payload.data_ind.payload[0])); + repeat; + } [] L1CTL.receive { repeat; } [] T1.timeout { var int8_t rcv := oct2int(l1_dl.payload.data_ind.payload[0]); @@ -2166,7 +2178,11 @@ timer T1 := 10.0; T1.start; alt { - [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl { repeat; } + [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl { + /* Update sent MS power to follow what BTS requests */ + f_L1CTL_PARAM(L1CTL, g_pars.l1_pars.ms_actual_ta, oct2int(l1_dl.payload.data_ind.payload[0])); + repeat; + } [] L1CTL.receive { repeat; } [] T1.timeout { if( f_power_level_is_lowest_dbm(oct2int(l1_dl.payload.data_ind.payload[0])) ){ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I287761202093fbc1064f9868efe6f7f6155253ca Gerrit-Change-Number: 16480 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 13:44:31 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 10 Dec 2019 13:44:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Early terminate TC_rec_invalid_frame on error References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16529 ) Change subject: bts: Early terminate TC_rec_invalid_frame on error ...................................................................... bts: Early terminate TC_rec_invalid_frame on error Extra debugging is added because otherwise it's extremely difficul to find at which state the test is when debugging sporadic failures. In f_TC_rec_invalid_frame, timer T is reused because it was actually not being used before, only defined in there. Change-Id: If24a81bf20d293b87adf9f37111fc7d344f169f5 --- M bts/BTS_Tests_LAPDm.ttcn 1 file changed, 32 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/16529/1 diff --git a/bts/BTS_Tests_LAPDm.ttcn b/bts/BTS_Tests_LAPDm.ttcn index da78ccb..4d4a988 100644 --- a/bts/BTS_Tests_LAPDm.ttcn +++ b/bts/BTS_Tests_LAPDm.ttcn @@ -813,11 +813,16 @@ f_testmatrix_each_chan(pars, refers(f_TC_nr_seq_error)); } -private function f_TC_rec_invalid_frame_txrx(integer sapi, LapdmFrame x) runs on ConnHdlr { +private function f_TC_rec_invalid_frame_txrx(integer sapi, LapdmFrame x, integer line_nr) runs on ConnHdlr { LAPDM.send(t_PH_DATA(0, false, x)); f_sleep(2.0); // T200 LAPDM.send(t_PH_DATA(0, false, ts_LAPDm_RR(sapi, c_r:=cr_MO_CMD, p:=true, nr:=0))); - LAPDM.receive(t_PH_DATA(0, false, tr_LAPDm_RR(sapi, c_r:=cr_MT_RSP, p:=true , nr := 0))); + timer T1 := 2.0; + T1.start; + alt { + [] LAPDM.receive(t_PH_DATA(0, false, tr_LAPDm_RR(sapi, c_r:=cr_MT_RSP, p:=true , nr := 0))) { T1.stop; } + [] T1.timeout{ Misc_Helpers.f_shutdown(__BFILE__, line_nr, fail, "Missing LAPDm_RR RSP"); } + } } /* 25.2.7 Test on receipt of invalid frames @@ -842,84 +847,90 @@ /* MO Establish Request via LADPm: SAPI = 0, C = 0, P = 1, M = 0, 0 ? L ? N201.. */ LAPDM.send(t_PH_DATA(0, false, ts_LAPDm_SABM(sapi, c_r:=cr_MO_CMD, p:=true, l3:=l3_mo))); - RSL.receive(tr_RSL_EST_IND(g_chan_nr, link_id, l3_mo)); + T.start + alt { + [] RSL.receive(tr_RSL_EST_IND(g_chan_nr, link_id, l3_mo)) {} + [] T.timeout{ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Missing RSL EST IND"); } + } + alt { /* UA: SAPI = 0, R = 0, F = 1, M = 0, L = L of SABM. */ - LAPDM.receive(t_PH_DATA(0, false, tr_LAPDm_UA(sapi, cr_MT_RSP, f:=true, l3:=l3_mo))); - + [] LAPDM.receive(t_PH_DATA(0, false, tr_LAPDm_UA(sapi, cr_MT_RSP, f:=true, l3:=l3_mo))) { T.stop; } + [] T.timeout{ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Missing LAPDm UA RSP"); } + } /* 1: One RR frame: SAPI = 0, R = 0, F = 0, M = 0, L > 0, N(R) = 1. RR frame with the Length indicator greater than zero and a faulty N(R); */ var LapdmFrame x:= valueof(ts_LAPDm_RR(sapi, c_r:=cr_MO_CMD, p:=false, nr:=1)); x.ab.payload := f_rnd_octstring(5); - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 3: One REJ frame: SAPI = 0, R = 0, F = 0, M = 0, L = 0, N(R) = 1, EA = 0. EJ frame with the EA bit set to zero and a faulty N(R); */ x:= valueof(ts_LAPDm_REJ(sapi, c_r:=cr_MO_CMD, p:=false, nr:=1)); x.ab.addr.ea := false; - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 4: One SABM frame: SAPI = 0, C = 1, P = 1, M = 0, L = 0, EL = 0. SABM frame with the EL bit set to zero; */ l3_mo := ''O; x:= valueof(ts_LAPDm_SABM(sapi, c_r:=cr_MO_CMD, p:=true, l3:=l3_mo)); x.ab.el := 0; - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 5: One DM frame: SAPI = 0, R = 0, F = 1, M = 0, L > 0. DM frame with the Length indicator greater than zero;*/ x:= valueof(ts_LAPDm_DM(sapi, c_r:=cr_MO_CMD, f:=true)); x.ab.payload := f_rnd_octstring(5); - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 6: One DISC frame: SAPI = 0, C = 1, P = 1, M = 1, L = 0. DISC frame with the M bit set to 1; */ x:= valueof(ts_LAPDm_DISC(sapi, c_r:=cr_MO_CMD, p:=true)); x.ab.m := true; - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 7: One UA frame: SAPI = 0, R = 0, F = 0, M = 0, L = 0, EA = 0. UA frame with the EA bit set to zero*/ x:= valueof(ts_LAPDm_UA(sapi, c_r:=cr_MO_CMD, f:=false, l3:=''O)); x.ab.addr.ea := false; - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 8: One I frame: SAPI = 0, C = 1, P = 0, M = 0, L > N201, N(R) = 0, N(S) = 6. I frame with the Length indicator greater than N201;*/ x:= valueof(ts_LAPDm_I(sapi, c_r:=cr_MO_CMD, p:=true, nr := 0, ns := 6, l3 := f_rnd_octstring(25))) - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 9: One I frame: SAPI = 0, C = 1, P = 0, M = 1, L < N201, N(R) = 0, N(S) = 7. I frame with the M bit set to 1 and the Length indicator less than N201;*/ x:= valueof(ts_LAPDm_I(sapi, c_r:=cr_MO_CMD, p:=true, nr := 0, ns := 7, l3 := f_rnd_octstring(5))) x.ab.m := true; - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 10: One RR frame: SAPI = 0, C = 1, P = 1, M = 0, L = 0, N(R) = 0. */ x:= valueof(ts_LAPDm_RR(sapi, c_r:=cr_MO_CMD, p:=true, nr:=0)); - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* command frames with correct Address and Length indicator field and a non-implemented control field */ /* 12: One command frame with Control Field = xxx1 1101. */ x:= valueof(ts_LAPDm_RR(sapi, c_r:=cr_MO_CMD, p:=false, nr:=1)); x.ab.ctrl.other := bit2int('00011101'B); - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 13: One command frame with Control field = xxx1 1011. */ x:= valueof(ts_LAPDm_RR(sapi, c_r:=cr_MO_CMD, p:=false, nr:=1)); x.ab.ctrl.other := bit2int('00011011'B); - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 14: One command frame with Control field = xxx1 0111. */ x:= valueof(ts_LAPDm_RR(sapi, c_r:=cr_MO_CMD, p:=false, nr:=1)); x.ab.ctrl.other := bit2int('00010001'B); - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 15: One command frame with Control field = 01x1 1111. */ x:= valueof(ts_LAPDm_RR(sapi, c_r:=cr_MO_CMD, p:=false, nr:=1)); x.ab.ctrl.other := bit2int('01011111'B); - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 16: One command frame with Control field = 1xx1 1111. */ x:= valueof(ts_LAPDm_RR(sapi, c_r:=cr_MO_CMD, p:=false, nr:=1)); x.ab.ctrl.other := bit2int('10011111'B); - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 17: One command frame with Control field = 0011 0011. */ x:= valueof(ts_LAPDm_RR(sapi, c_r:=cr_MO_CMD, p:=false, nr:=1)); x.ab.ctrl.other := bit2int('00110011'B); - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 18: One command frame with Control field = 1xx1 0011. */ x:= valueof(ts_LAPDm_RR(sapi, c_r:=cr_MO_CMD, p:=false, nr:=1)); x.ab.ctrl.other := bit2int('10010011'B); - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); deactivate(d); fp_common_fini(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16529 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If24a81bf20d293b87adf9f37111fc7d344f169f5 Gerrit-Change-Number: 16529 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 14:40:35 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 10 Dec 2019 14:40:35 +0000 Subject: Change in osmo-pcap[master]: Cosmetic: README.md: fix typo References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/16530 ) Change subject: Cosmetic: README.md: fix typo ...................................................................... Cosmetic: README.md: fix typo Change-Id: I2df3235bade659d62cf179c680a958baabacaa51 --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/30/16530/1 diff --git a/README.md b/README.md index b125f3c..b65b877 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ might be needed for auditing, resolving conflicts, post processing or debugging a distributed system. -The system consists out of the *osmo-pcap-client* to cpature traffic at a +The system consists out of the *osmo-pcap-client* to capture traffic at a host and *osmo-pcap-server* to receive the traffic, store and rotate the traffic at a centralized server. There is a shell script to compress and expire old traces. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/16530 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I2df3235bade659d62cf179c680a958baabacaa51 Gerrit-Change-Number: 16530 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 14:40:35 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 10 Dec 2019 14:40:35 +0000 Subject: Change in osmo-pcap[master]: osmoappdesc.py: fix paths to configs References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/16531 ) Change subject: osmoappdesc.py: fix paths to configs ...................................................................... osmoappdesc.py: fix paths to configs This makes external tests work again. Related: OS#4317 Change-Id: I73ab32ea48ddfc1b017c8152ec4e95a9ed4f1d7b --- M osmoappdesc.py 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/31/16531/1 diff --git a/osmoappdesc.py b/osmoappdesc.py index 2be96db..38b18c0 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -15,8 +15,10 @@ # along with this program. If not, see . app_configs = { - "osmo-pcap-client": ["contrib/osmo-pcap-client.cfg", "contrib/osmo-pcap-client-tls.cfg"], - "osmo-pcap-server": ["contrib/osmo-pcap-server.cfg", "contrib/osmo-pcap-server-tls.cfg"] + "osmo-pcap-client": ["doc/examples/osmo-pcap-client/osmo-pcap-client.cfg", + "doc/examples/osmo-pcap-client/osmo-pcap-client-tls.cfg"], + "osmo-pcap-server": ["doc/examples/osmo-pcap-server/osmo-pcap-server.cfg", + "doc/examples/osmo-pcap-server/osmo-pcap-server-tls.cfg"] } apps = [ @@ -24,7 +26,7 @@ (4237, "src/osmo-pcap-client", "OsmoPCAPClient", "osmo-pcap-client"), ] -vty_command = ["src/osmo-pcap-server", "-c", "contrib/osmo-pcap-server.cfg"] +vty_command = ["src/osmo-pcap-server", "-c", "doc/examples/osmo-pcap-server/osmo-pcap-server.cfg"] vty_app = apps[0] -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/16531 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I73ab32ea48ddfc1b017c8152ec4e95a9ed4f1d7b Gerrit-Change-Number: 16531 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 14:40:35 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 10 Dec 2019 14:40:35 +0000 Subject: Change in osmo-pcap[master]: Cosmetic: README.md: document how to run tests References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/16532 ) Change subject: Cosmetic: README.md: document how to run tests ...................................................................... Cosmetic: README.md: document how to run tests Mention the setcap command, that makes external tests work. Related: OS#4317 Change-Id: Idc18925f0b71164b52248ca9312b997681d15241 --- M README.md 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/32/16532/1 diff --git a/README.md b/README.md index b65b877..791e28f 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,15 @@ Please see the *contrib/osmo-pcap-server.cfg* and *contrib/osmo-pcap-client.cfg* file in the repository +## Running tests + +In order to run all tests, do the following: + +$ ./configure --enable-external-tests +$ make -j5 +$ sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' src/osmo-pcap-client +$ make check + ## Wishlist/TODO - [ ] Add non-blocking TLS (probably GNUtls) support between client and server. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/16532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Idc18925f0b71164b52248ca9312b997681d15241 Gerrit-Change-Number: 16532 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 14:40:36 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 10 Dec 2019 14:40:36 +0000 Subject: Change in osmo-pcap[master]: contrib/jenkins.sh: enable external tests References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/16533 ) Change subject: contrib/jenkins.sh: enable external tests ...................................................................... contrib/jenkins.sh: enable external tests Does not work this way as we don't have sudo enabled in the docker containers. Just uploading for reference. Related: OS#4317 Change-Id: I16f878995ecec7ef759799c0080ef79710363a06 --- M contrib/jenkins.sh 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/33/16533/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index f1779dc..c2b7072 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -35,8 +35,16 @@ cd "$base" autoreconf --install --force -PCAP_LIBS="-lpcap" PCAP_CFLAGS="" ./configure --with-pcap-config=/bin/true --enable-sanitize --enable-werror +PCAP_LIBS="-lpcap" PCAP_CFLAGS="" ./configure \ + --with-pcap-config=/bin/true \ + --enable-sanitize \ + --enable-werror \ + --enable-external-tests $MAKE $PARALLEL_MAKE + +# Required for external tests (otherwise: "Failed to open the device: any") +sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' src/osmo-pcap-client + $MAKE check || cat-testlogs.sh DISTCHECK_CONFIGURE_FLAGS="--with-pcap-config=/bin/true" \ PCAP_LIBS="-lpcap" PCAP_CFLAGS="" \ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/16533 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I16f878995ecec7ef759799c0080ef79710363a06 Gerrit-Change-Number: 16533 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 14:41:18 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 10 Dec 2019 14:41:18 +0000 Subject: Change in osmo-pcap[master]: contrib/jenkins.sh: enable external tests In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/16533 ) Change subject: contrib/jenkins.sh: enable external tests ...................................................................... Abandoned does not work -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/16533 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I16f878995ecec7ef759799c0080ef79710363a06 Gerrit-Change-Number: 16533 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 15:02:20 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 10 Dec 2019 15:02:20 +0000 Subject: Change in osmo-pcap[master]: Cosmetic: README.md: fix typo In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/16530 ) Change subject: Cosmetic: README.md: fix typo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/16530 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I2df3235bade659d62cf179c680a958baabacaa51 Gerrit-Change-Number: 16530 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 10 Dec 2019 15:02:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 15:02:40 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 10 Dec 2019 15:02:40 +0000 Subject: Change in osmo-pcap[master]: osmoappdesc.py: fix paths to configs In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/16531 ) Change subject: osmoappdesc.py: fix paths to configs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/16531 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I73ab32ea48ddfc1b017c8152ec4e95a9ed4f1d7b Gerrit-Change-Number: 16531 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 10 Dec 2019 15:02:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 15:03:13 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 10 Dec 2019 15:03:13 +0000 Subject: Change in osmo-pcap[master]: Cosmetic: README.md: document how to run tests In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/16532 ) Change subject: Cosmetic: README.md: document how to run tests ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/16532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Idc18925f0b71164b52248ca9312b997681d15241 Gerrit-Change-Number: 16532 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 10 Dec 2019 15:03:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 16:10:51 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 10 Dec 2019 16:10:51 +0000 Subject: Change in osmo-pcu[master]: prs_bssgp_pcu.cpp: Mark priv funcs as static and remove trailing whit... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16534 ) Change subject: prs_bssgp_pcu.cpp: Mark priv funcs as static and remove trailing whitespace ...................................................................... prs_bssgp_pcu.cpp: Mark priv funcs as static and remove trailing whitespace Change-Id: I93b7ee33cc33c773675c85ace7b8f1afa86fbf06 --- M src/gprs_bssgp_pcu.cpp 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/34/16534/1 diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp index 914afc0..8ce1342 100644 --- a/src/gprs_bssgp_pcu.cpp +++ b/src/gprs_bssgp_pcu.cpp @@ -171,7 +171,7 @@ ms_class, egprs_ms_class, delay_csec, data, len); } -int gprs_bssgp_pcu_rx_paging_ps(struct msgb *msg, struct tlv_parsed *tp) +static int gprs_bssgp_pcu_rx_paging_ps(struct msgb *msg, struct tlv_parsed *tp) { char imsi[16]; uint8_t *ptmsi = (uint8_t *) TLVP_VAL(tp, BSSGP_IE_TMSI); @@ -709,7 +709,7 @@ return GprsCodingScheme::getGprsByNum(num); } -int gprs_bssgp_tx_fc_bvc(void) +static int gprs_bssgp_tx_fc_bvc(void) { struct gprs_rlcmac_bts *bts; uint32_t bucket_size; /* oct */ @@ -967,7 +967,7 @@ the_pcu.nsvc_unblocked = 0; the_pcu.bvc_sig_reset = 0; the_pcu.bvc_reset = 0; - the_pcu.bvc_unblocked = 0; + the_pcu.bvc_unblocked = 0; gprs_ns_destroy(nsi); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I93b7ee33cc33c773675c85ace7b8f1afa86fbf06 Gerrit-Change-Number: 16534 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 16:46:10 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 10 Dec 2019 16:46:10 +0000 Subject: Change in osmo-pcap[master]: Cosmetic: README.md: fix typo In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/16530 ) Change subject: Cosmetic: README.md: fix typo ...................................................................... Cosmetic: README.md: fix typo Change-Id: I2df3235bade659d62cf179c680a958baabacaa51 --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/README.md b/README.md index b125f3c..b65b877 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ might be needed for auditing, resolving conflicts, post processing or debugging a distributed system. -The system consists out of the *osmo-pcap-client* to cpature traffic at a +The system consists out of the *osmo-pcap-client* to capture traffic at a host and *osmo-pcap-server* to receive the traffic, store and rotate the traffic at a centralized server. There is a shell script to compress and expire old traces. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/16530 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I2df3235bade659d62cf179c680a958baabacaa51 Gerrit-Change-Number: 16530 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 16:46:20 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 10 Dec 2019 16:46:20 +0000 Subject: Change in osmo-pcap[master]: osmoappdesc.py: fix paths to configs In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/16531 ) Change subject: osmoappdesc.py: fix paths to configs ...................................................................... osmoappdesc.py: fix paths to configs This makes external tests work again. Related: OS#4317 Change-Id: I73ab32ea48ddfc1b017c8152ec4e95a9ed4f1d7b --- M osmoappdesc.py 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/osmoappdesc.py b/osmoappdesc.py index 2be96db..38b18c0 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -15,8 +15,10 @@ # along with this program. If not, see . app_configs = { - "osmo-pcap-client": ["contrib/osmo-pcap-client.cfg", "contrib/osmo-pcap-client-tls.cfg"], - "osmo-pcap-server": ["contrib/osmo-pcap-server.cfg", "contrib/osmo-pcap-server-tls.cfg"] + "osmo-pcap-client": ["doc/examples/osmo-pcap-client/osmo-pcap-client.cfg", + "doc/examples/osmo-pcap-client/osmo-pcap-client-tls.cfg"], + "osmo-pcap-server": ["doc/examples/osmo-pcap-server/osmo-pcap-server.cfg", + "doc/examples/osmo-pcap-server/osmo-pcap-server-tls.cfg"] } apps = [ @@ -24,7 +26,7 @@ (4237, "src/osmo-pcap-client", "OsmoPCAPClient", "osmo-pcap-client"), ] -vty_command = ["src/osmo-pcap-server", "-c", "contrib/osmo-pcap-server.cfg"] +vty_command = ["src/osmo-pcap-server", "-c", "doc/examples/osmo-pcap-server/osmo-pcap-server.cfg"] vty_app = apps[0] -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/16531 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I73ab32ea48ddfc1b017c8152ec4e95a9ed4f1d7b Gerrit-Change-Number: 16531 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 16:46:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 10 Dec 2019 16:46:37 +0000 Subject: Change in osmo-pcap[master]: Cosmetic: README.md: document how to run tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/16532 ) Change subject: Cosmetic: README.md: document how to run tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/16532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Idc18925f0b71164b52248ca9312b997681d15241 Gerrit-Change-Number: 16532 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 10 Dec 2019 16:46:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 16:46:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 10 Dec 2019 16:46:39 +0000 Subject: Change in osmo-pcap[master]: Cosmetic: README.md: document how to run tests In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/16532 ) Change subject: Cosmetic: README.md: document how to run tests ...................................................................... Cosmetic: README.md: document how to run tests Mention the setcap command, that makes external tests work. Related: OS#4317 Change-Id: Idc18925f0b71164b52248ca9312b997681d15241 --- M README.md 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/README.md b/README.md index b65b877..791e28f 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,15 @@ Please see the *contrib/osmo-pcap-server.cfg* and *contrib/osmo-pcap-client.cfg* file in the repository +## Running tests + +In order to run all tests, do the following: + +$ ./configure --enable-external-tests +$ make -j5 +$ sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' src/osmo-pcap-client +$ make check + ## Wishlist/TODO - [ ] Add non-blocking TLS (probably GNUtls) support between client and server. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/16532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Idc18925f0b71164b52248ca9312b997681d15241 Gerrit-Change-Number: 16532 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 16:46:54 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 10 Dec 2019 16:46:54 +0000 Subject: Change in osmo-pcu[master]: prs_bssgp_pcu.cpp: Mark priv funcs as static and remove trailing whit... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16534 ) Change subject: prs_bssgp_pcu.cpp: Mark priv funcs as static and remove trailing whitespace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I93b7ee33cc33c773675c85ace7b8f1afa86fbf06 Gerrit-Change-Number: 16534 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 10 Dec 2019 16:46:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 16:46:56 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 10 Dec 2019 16:46:56 +0000 Subject: Change in osmo-pcu[master]: prs_bssgp_pcu.cpp: Mark priv funcs as static and remove trailing whit... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16534 ) Change subject: prs_bssgp_pcu.cpp: Mark priv funcs as static and remove trailing whitespace ...................................................................... prs_bssgp_pcu.cpp: Mark priv funcs as static and remove trailing whitespace Change-Id: I93b7ee33cc33c773675c85ace7b8f1afa86fbf06 --- M src/gprs_bssgp_pcu.cpp 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp index 914afc0..8ce1342 100644 --- a/src/gprs_bssgp_pcu.cpp +++ b/src/gprs_bssgp_pcu.cpp @@ -171,7 +171,7 @@ ms_class, egprs_ms_class, delay_csec, data, len); } -int gprs_bssgp_pcu_rx_paging_ps(struct msgb *msg, struct tlv_parsed *tp) +static int gprs_bssgp_pcu_rx_paging_ps(struct msgb *msg, struct tlv_parsed *tp) { char imsi[16]; uint8_t *ptmsi = (uint8_t *) TLVP_VAL(tp, BSSGP_IE_TMSI); @@ -709,7 +709,7 @@ return GprsCodingScheme::getGprsByNum(num); } -int gprs_bssgp_tx_fc_bvc(void) +static int gprs_bssgp_tx_fc_bvc(void) { struct gprs_rlcmac_bts *bts; uint32_t bucket_size; /* oct */ @@ -967,7 +967,7 @@ the_pcu.nsvc_unblocked = 0; the_pcu.bvc_sig_reset = 0; the_pcu.bvc_reset = 0; - the_pcu.bvc_unblocked = 0; + the_pcu.bvc_unblocked = 0; gprs_ns_destroy(nsi); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I93b7ee33cc33c773675c85ace7b8f1afa86fbf06 Gerrit-Change-Number: 16534 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 16:47:28 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 10 Dec 2019 16:47:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Early terminate TC_rec_invalid_frame on error In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16529 ) Change subject: bts: Early terminate TC_rec_invalid_frame on error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16529 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If24a81bf20d293b87adf9f37111fc7d344f169f5 Gerrit-Change-Number: 16529 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 10 Dec 2019 16:47:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 16:47:29 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 10 Dec 2019 16:47:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Early terminate TC_rec_invalid_frame on error In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16529 ) Change subject: bts: Early terminate TC_rec_invalid_frame on error ...................................................................... bts: Early terminate TC_rec_invalid_frame on error Extra debugging is added because otherwise it's extremely difficul to find at which state the test is when debugging sporadic failures. In f_TC_rec_invalid_frame, timer T is reused because it was actually not being used before, only defined in there. Change-Id: If24a81bf20d293b87adf9f37111fc7d344f169f5 --- M bts/BTS_Tests_LAPDm.ttcn 1 file changed, 32 insertions(+), 21 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests_LAPDm.ttcn b/bts/BTS_Tests_LAPDm.ttcn index da78ccb..4d4a988 100644 --- a/bts/BTS_Tests_LAPDm.ttcn +++ b/bts/BTS_Tests_LAPDm.ttcn @@ -813,11 +813,16 @@ f_testmatrix_each_chan(pars, refers(f_TC_nr_seq_error)); } -private function f_TC_rec_invalid_frame_txrx(integer sapi, LapdmFrame x) runs on ConnHdlr { +private function f_TC_rec_invalid_frame_txrx(integer sapi, LapdmFrame x, integer line_nr) runs on ConnHdlr { LAPDM.send(t_PH_DATA(0, false, x)); f_sleep(2.0); // T200 LAPDM.send(t_PH_DATA(0, false, ts_LAPDm_RR(sapi, c_r:=cr_MO_CMD, p:=true, nr:=0))); - LAPDM.receive(t_PH_DATA(0, false, tr_LAPDm_RR(sapi, c_r:=cr_MT_RSP, p:=true , nr := 0))); + timer T1 := 2.0; + T1.start; + alt { + [] LAPDM.receive(t_PH_DATA(0, false, tr_LAPDm_RR(sapi, c_r:=cr_MT_RSP, p:=true , nr := 0))) { T1.stop; } + [] T1.timeout{ Misc_Helpers.f_shutdown(__BFILE__, line_nr, fail, "Missing LAPDm_RR RSP"); } + } } /* 25.2.7 Test on receipt of invalid frames @@ -842,84 +847,90 @@ /* MO Establish Request via LADPm: SAPI = 0, C = 0, P = 1, M = 0, 0 ? L ? N201.. */ LAPDM.send(t_PH_DATA(0, false, ts_LAPDm_SABM(sapi, c_r:=cr_MO_CMD, p:=true, l3:=l3_mo))); - RSL.receive(tr_RSL_EST_IND(g_chan_nr, link_id, l3_mo)); + T.start + alt { + [] RSL.receive(tr_RSL_EST_IND(g_chan_nr, link_id, l3_mo)) {} + [] T.timeout{ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Missing RSL EST IND"); } + } + alt { /* UA: SAPI = 0, R = 0, F = 1, M = 0, L = L of SABM. */ - LAPDM.receive(t_PH_DATA(0, false, tr_LAPDm_UA(sapi, cr_MT_RSP, f:=true, l3:=l3_mo))); - + [] LAPDM.receive(t_PH_DATA(0, false, tr_LAPDm_UA(sapi, cr_MT_RSP, f:=true, l3:=l3_mo))) { T.stop; } + [] T.timeout{ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Missing LAPDm UA RSP"); } + } /* 1: One RR frame: SAPI = 0, R = 0, F = 0, M = 0, L > 0, N(R) = 1. RR frame with the Length indicator greater than zero and a faulty N(R); */ var LapdmFrame x:= valueof(ts_LAPDm_RR(sapi, c_r:=cr_MO_CMD, p:=false, nr:=1)); x.ab.payload := f_rnd_octstring(5); - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 3: One REJ frame: SAPI = 0, R = 0, F = 0, M = 0, L = 0, N(R) = 1, EA = 0. EJ frame with the EA bit set to zero and a faulty N(R); */ x:= valueof(ts_LAPDm_REJ(sapi, c_r:=cr_MO_CMD, p:=false, nr:=1)); x.ab.addr.ea := false; - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 4: One SABM frame: SAPI = 0, C = 1, P = 1, M = 0, L = 0, EL = 0. SABM frame with the EL bit set to zero; */ l3_mo := ''O; x:= valueof(ts_LAPDm_SABM(sapi, c_r:=cr_MO_CMD, p:=true, l3:=l3_mo)); x.ab.el := 0; - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 5: One DM frame: SAPI = 0, R = 0, F = 1, M = 0, L > 0. DM frame with the Length indicator greater than zero;*/ x:= valueof(ts_LAPDm_DM(sapi, c_r:=cr_MO_CMD, f:=true)); x.ab.payload := f_rnd_octstring(5); - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 6: One DISC frame: SAPI = 0, C = 1, P = 1, M = 1, L = 0. DISC frame with the M bit set to 1; */ x:= valueof(ts_LAPDm_DISC(sapi, c_r:=cr_MO_CMD, p:=true)); x.ab.m := true; - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 7: One UA frame: SAPI = 0, R = 0, F = 0, M = 0, L = 0, EA = 0. UA frame with the EA bit set to zero*/ x:= valueof(ts_LAPDm_UA(sapi, c_r:=cr_MO_CMD, f:=false, l3:=''O)); x.ab.addr.ea := false; - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 8: One I frame: SAPI = 0, C = 1, P = 0, M = 0, L > N201, N(R) = 0, N(S) = 6. I frame with the Length indicator greater than N201;*/ x:= valueof(ts_LAPDm_I(sapi, c_r:=cr_MO_CMD, p:=true, nr := 0, ns := 6, l3 := f_rnd_octstring(25))) - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 9: One I frame: SAPI = 0, C = 1, P = 0, M = 1, L < N201, N(R) = 0, N(S) = 7. I frame with the M bit set to 1 and the Length indicator less than N201;*/ x:= valueof(ts_LAPDm_I(sapi, c_r:=cr_MO_CMD, p:=true, nr := 0, ns := 7, l3 := f_rnd_octstring(5))) x.ab.m := true; - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 10: One RR frame: SAPI = 0, C = 1, P = 1, M = 0, L = 0, N(R) = 0. */ x:= valueof(ts_LAPDm_RR(sapi, c_r:=cr_MO_CMD, p:=true, nr:=0)); - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* command frames with correct Address and Length indicator field and a non-implemented control field */ /* 12: One command frame with Control Field = xxx1 1101. */ x:= valueof(ts_LAPDm_RR(sapi, c_r:=cr_MO_CMD, p:=false, nr:=1)); x.ab.ctrl.other := bit2int('00011101'B); - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 13: One command frame with Control field = xxx1 1011. */ x:= valueof(ts_LAPDm_RR(sapi, c_r:=cr_MO_CMD, p:=false, nr:=1)); x.ab.ctrl.other := bit2int('00011011'B); - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 14: One command frame with Control field = xxx1 0111. */ x:= valueof(ts_LAPDm_RR(sapi, c_r:=cr_MO_CMD, p:=false, nr:=1)); x.ab.ctrl.other := bit2int('00010001'B); - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 15: One command frame with Control field = 01x1 1111. */ x:= valueof(ts_LAPDm_RR(sapi, c_r:=cr_MO_CMD, p:=false, nr:=1)); x.ab.ctrl.other := bit2int('01011111'B); - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 16: One command frame with Control field = 1xx1 1111. */ x:= valueof(ts_LAPDm_RR(sapi, c_r:=cr_MO_CMD, p:=false, nr:=1)); x.ab.ctrl.other := bit2int('10011111'B); - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 17: One command frame with Control field = 0011 0011. */ x:= valueof(ts_LAPDm_RR(sapi, c_r:=cr_MO_CMD, p:=false, nr:=1)); x.ab.ctrl.other := bit2int('00110011'B); - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); /* 18: One command frame with Control field = 1xx1 0011. */ x:= valueof(ts_LAPDm_RR(sapi, c_r:=cr_MO_CMD, p:=false, nr:=1)); x.ab.ctrl.other := bit2int('10010011'B); - f_TC_rec_invalid_frame_txrx(0, x); + f_TC_rec_invalid_frame_txrx(0, x, __LINE__); deactivate(d); fp_common_fini(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16529 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If24a81bf20d293b87adf9f37111fc7d344f169f5 Gerrit-Change-Number: 16529 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 19:15:19 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 10 Dec 2019 19:15:19 +0000 Subject: Change in osmo-pcu[master]: Fix trailing whitespace References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16535 ) Change subject: Fix trailing whitespace ...................................................................... Fix trailing whitespace Change-Id: I0515b5c8f6744fa501de88fa7808b7fc91981f0e --- M src/encoding.cpp M src/gprs_rlcmac.cpp M src/gprs_rlcmac.h 3 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/35/16535/1 diff --git a/src/encoding.cpp b/src/encoding.cpp index b46f568..d4a7ae0 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -868,15 +868,15 @@ ..1. .... = ACKNACK: (Union) 0 0000 000 Length Desc - + ...0 .... = FINAL_ACK_INDICATION: False - + .... 1... = BEGINNING_OF_WINDOW: 1 - + .... .1.. = END_OF_WINDOW: 1 - + .... ..10 0101 0001 1... .... = STARTING_SEQUENCE_NUMBER: 1187 - + .0.. .... = CRBB Exist: 0 minimal size is 24 rest_bits */ rest_bits -= 24; diff --git a/src/gprs_rlcmac.cpp b/src/gprs_rlcmac.cpp index 7a98a25..e381b11 100644 --- a/src/gprs_rlcmac.cpp +++ b/src/gprs_rlcmac.cpp @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + #include #include #include diff --git a/src/gprs_rlcmac.h b/src/gprs_rlcmac.h index 16cb05f..5361a1c 100644 --- a/src/gprs_rlcmac.h +++ b/src/gprs_rlcmac.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + #ifndef GPRS_RLCMAC_H #define GPRS_RLCMAC_H @@ -85,7 +85,7 @@ /* TS 44.060 Section 10.4.7 Table 10.4.7.1: Payload Type field */ enum gprs_rlcmac_block_type { GPRS_RLCMAC_DATA_BLOCK = 0x0, - GPRS_RLCMAC_CONTROL_BLOCK = 0x1, + GPRS_RLCMAC_CONTROL_BLOCK = 0x1, GPRS_RLCMAC_CONTROL_BLOCK_OPT = 0x2, GPRS_RLCMAC_RESERVED = 0x3 }; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16535 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0515b5c8f6744fa501de88fa7808b7fc91981f0e Gerrit-Change-Number: 16535 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 19:15:20 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 10 Dec 2019 19:15:20 +0000 Subject: Change in osmo-pcu[master]: Allow Gb PAGING-PS without P-TMSI References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16536 ) Change subject: Allow Gb PAGING-PS without P-TMSI ...................................................................... Allow Gb PAGING-PS without P-TMSI P-TMSI is optional IE, but IE is mandatory and hence always available. Since the encoding is actually a Mobile Identity, the IMSI is used in case P-TMSI is not available. Change-Id: I4dbf8db04e81f98352a42ce34a5d91326be9bfd1 --- M src/encoding.cpp M src/encoding.h M src/gprs_bssgp_pcu.cpp M src/gprs_rlcmac.cpp M src/gprs_rlcmac.h 5 files changed, 32 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/36/16536/1 diff --git a/src/encoding.cpp b/src/encoding.cpp index d4a7ae0..69d2ace 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -729,7 +729,7 @@ } /* Generate paging request. See 44.018, sections 10 and 9.1.22 */ -int Encoding::write_paging_request(bitvec * dest, uint8_t *ptmsi, uint16_t ptmsi_len) +int Encoding::write_paging_request(bitvec * dest, const uint8_t *identity_lv) { unsigned wp = 0; int plen; @@ -742,13 +742,9 @@ bitvec_write_field(dest, &wp,0x0,4); // Channel Needed // Mobile Identity - bitvec_write_field(dest, &wp,ptmsi_len+1,8); // Mobile Identity length - bitvec_write_field(dest, &wp,0xf,4); // unused - bitvec_write_field(dest, &wp,0x4,4); // PTMSI type - for (int i = 0; i < ptmsi_len; i++) - { - bitvec_write_field(dest, &wp,ptmsi[i],8); // PTMSI - } + bitvec_write_field(dest, &wp, identity_lv[0], 8); // Mobile Identity length + for (int i = 1; i < identity_lv[0]; i++) + bitvec_write_field(dest, &wp, identity_lv[i], 8); // IMSI/PTMSI if ((wp % 8)) log_alert_exit("Length of PAG.REQ without rest octets is not " diff --git a/src/encoding.h b/src/encoding.h index 6dcced0..966b0c5 100644 --- a/src/encoding.h +++ b/src/encoding.h @@ -77,7 +77,7 @@ bitvec * dest, struct gprs_rlcmac_ul_tbf *tbf, bool is_final, uint8_t rrbp); - static int write_paging_request(bitvec * dest, uint8_t *ptmsi, uint16_t ptmsi_len); + static int write_paging_request(bitvec * dest, const uint8_t *identity_lv); static unsigned write_repeated_page_info(bitvec * dest, unsigned& wp, uint8_t len, uint8_t *identity, uint8_t chan_needed); diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp index 8ce1342..67c8653 100644 --- a/src/gprs_bssgp_pcu.cpp +++ b/src/gprs_bssgp_pcu.cpp @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "inttypes.h" + #include #include #include @@ -173,32 +175,40 @@ static int gprs_bssgp_pcu_rx_paging_ps(struct msgb *msg, struct tlv_parsed *tp) { + uint8_t identity_lv[9]; char imsi[16]; - uint8_t *ptmsi = (uint8_t *) TLVP_VAL(tp, BSSGP_IE_TMSI); - uint16_t ptmsi_len = TLVP_LEN(tp, BSSGP_IE_TMSI); int rc; - LOGP(DBSSGP, LOGL_NOTICE, " P-TMSI = "); - for (int i = 0; i < ptmsi_len; i++) - { - LOGPC(DBSSGP, LOGL_NOTICE, "%02x", ptmsi[i]); - } - LOGPC(DBSSGP, LOGL_NOTICE, "\n"); - if (!TLVP_PRESENT(tp, BSSGP_IE_IMSI)) { LOGP(DBSSGP, LOGL_ERROR, "No IMSI\n"); - return -EINVAL; + return bssgp_tx_status(BSSGP_CAUSE_COND_IE_ERR, NULL, msg); } /* gsm48_mi_to_string() returns number of bytes written, including '\0' */ rc = gsm48_mi_to_string(imsi, sizeof(imsi), TLVP_VAL(tp, BSSGP_IE_IMSI), - TLVP_LEN(tp, BSSGP_IE_IMSI)); + TLVP_LEN(tp, BSSGP_IE_IMSI)); if (rc != GSM23003_IMSI_MAX_DIGITS + 1) { LOGP(DBSSGP, LOGL_NOTICE, "Failed to parse IMSI IE (rc=%d)\n", rc); return bssgp_tx_status(BSSGP_CAUSE_COND_IE_ERR, NULL, msg); } - return gprs_rlcmac_paging_request(ptmsi, ptmsi_len, imsi); + if (TLVP_PRESENT(tp, BSSGP_IE_TMSI)) { + identity_lv[0] = TLVP_LEN(tp, BSSGP_IE_TMSI); + if (identity_lv[0] >= sizeof(identity_lv)) { + LOGP(DBSSGP, LOGL_NOTICE, "TMSI IE too big (%" PRIu8 ")\n", identity_lv[0]); + return bssgp_tx_status(BSSGP_CAUSE_COND_IE_ERR, NULL, msg); + } + memcpy(&identity_lv[1], TLVP_VAL(tp, BSSGP_IE_TMSI), identity_lv[0]); + } else { /* Use IMSI if TMSI not available: */ + identity_lv[0] = TLVP_LEN(tp, BSSGP_IE_IMSI); + if (identity_lv[0] >= sizeof(identity_lv)) { + LOGP(DBSSGP, LOGL_NOTICE, "IMSI IE too big (%" PRIu8 ")\n", identity_lv[0]); + return bssgp_tx_status(BSSGP_CAUSE_COND_IE_ERR, NULL, msg); + } + memcpy(&identity_lv[1], TLVP_VAL(tp, BSSGP_IE_IMSI), identity_lv[0]); + } + + return gprs_rlcmac_paging_request(identity_lv, imsi); } /* Receive a BSSGP PDU from a BSS on a PTP BVCI */ diff --git a/src/gprs_rlcmac.cpp b/src/gprs_rlcmac.cpp index e381b11..96de51d 100644 --- a/src/gprs_rlcmac.cpp +++ b/src/gprs_rlcmac.cpp @@ -28,13 +28,13 @@ extern void *tall_pcu_ctx; -int gprs_rlcmac_paging_request(uint8_t *ptmsi, uint16_t ptmsi_len, - const char *imsi) +int gprs_rlcmac_paging_request(const uint8_t *identity_lv, const char *imsi) { - LOGP(DRLCMAC, LOGL_NOTICE, "TX: [PCU -> BTS] Paging Request (CCCH)\n"); + LOGP(DRLCMAC, LOGL_NOTICE, "TX: [PCU -> BTS] Paging Request (CCCH) MI=%s\n", + osmo_hexdump(identity_lv + 1, identity_lv[0])); bitvec *paging_request = bitvec_alloc(22, tall_pcu_ctx); bitvec_unhex(paging_request, DUMMY_VEC); - int plen = Encoding::write_paging_request(paging_request, ptmsi, ptmsi_len); + int plen = Encoding::write_paging_request(paging_request, identity_lv); pcu_l1if_tx_pch(paging_request, plen, (char *)imsi); bitvec_free(paging_request); diff --git a/src/gprs_rlcmac.h b/src/gprs_rlcmac.h index 5361a1c..b504ad9 100644 --- a/src/gprs_rlcmac.h +++ b/src/gprs_rlcmac.h @@ -92,8 +92,7 @@ int gprs_rlcmac_tx_ul_ud(gprs_rlcmac_tbf *tbf); -int gprs_rlcmac_paging_request(uint8_t *ptmsi, uint16_t ptmsi_len, - const char *imsi); +int gprs_rlcmac_paging_request(const uint8_t *identity_lv, const char *imsi); struct msgb *gprs_rlcmac_app_info_msg(const struct gsm_pcu_if_app_info_req *req); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4dbf8db04e81f98352a42ce34a5d91326be9bfd1 Gerrit-Change-Number: 16536 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 19:15:20 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 10 Dec 2019 19:15:20 +0000 Subject: Change in osmo-pcu[master]: Support Gb PAGING-CS References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16537 ) Change subject: Support Gb PAGING-CS ...................................................................... Support Gb PAGING-CS The paging is sent over PACCH towards MS with an active TBF. Related: OS#2406 Change-Id: I9501e02e1d7f6944497e724dbccb9a19c3f5221f --- M src/gprs_bssgp_pcu.cpp 1 file changed, 30 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/37/16537/1 diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp index 67c8653..983c22c 100644 --- a/src/gprs_bssgp_pcu.cpp +++ b/src/gprs_bssgp_pcu.cpp @@ -173,6 +173,33 @@ ms_class, egprs_ms_class, delay_csec, data, len); } +static int gprs_bssgp_pcu_rx_paging_cs(struct msgb *msg, struct tlv_parsed *tp) +{ + uint8_t identity_lv[9]; + uint8_t *chan_needed = (uint8_t *)TLVP_VAL(tp, BSSGP_IE_CHAN_NEEDED); + + if (TLVP_PRESENT(tp, BSSGP_IE_TMSI)) { + identity_lv[0] = TLVP_LEN(tp, BSSGP_IE_TMSI); + if (identity_lv[0] >= sizeof(identity_lv)) { + LOGP(DBSSGP, LOGL_NOTICE, "TMSI IE too big (%" PRIu8 ")\n", identity_lv[0]); + return bssgp_tx_status(BSSGP_CAUSE_COND_IE_ERR, NULL, msg); + } + memcpy(&identity_lv[1], TLVP_VAL(tp, BSSGP_IE_TMSI), identity_lv[0]); + } else if (TLVP_PRESENT(tp, BSSGP_IE_IMSI)) { /* Use IMSI if TMSI not available: */ + identity_lv[0] = TLVP_LEN(tp, BSSGP_IE_IMSI); + if (identity_lv[0] >= sizeof(identity_lv)) { + LOGP(DBSSGP, LOGL_NOTICE, "IMSI IE too big (%" PRIu8 ")\n", identity_lv[0]); + return bssgp_tx_status(BSSGP_CAUSE_COND_IE_ERR, NULL, msg); + } + memcpy(&identity_lv[1], TLVP_VAL(tp, BSSGP_IE_IMSI), identity_lv[0]); + } else { + LOGP(DBSSGP, LOGL_ERROR, "No IMSI\n"); + return bssgp_tx_status(BSSGP_CAUSE_COND_IE_ERR, NULL, msg); + } + + return BTS::main_bts()->add_paging(chan_needed ? *chan_needed : 0, identity_lv); +} + static int gprs_bssgp_pcu_rx_paging_ps(struct msgb *msg, struct tlv_parsed *tp) { uint8_t identity_lv[9]; @@ -311,6 +338,9 @@ the_pcu.bvc_reset = 1; bvc_timeout(NULL); break; + case BSSGP_PDUT_PAGING_CS: + gprs_bssgp_pcu_rx_paging_cs(msg, tp); + break; case BSSGP_PDUT_PAGING_PS: gprs_bssgp_pcu_rx_paging_ps(msg, tp); break; @@ -323,7 +353,6 @@ break; case BSSGP_PDUT_SUSPEND_NACK: case BSSGP_PDUT_RESUME_NACK: - case BSSGP_PDUT_PAGING_CS: case BSSGP_PDUT_FLUSH_LL: case BSSGP_PDUT_SGSN_INVOKE_TRACE: LOGP(DBSSGP, LOGL_INFO, "Rx BSSGP BVCI=%d (SIGN) PDU type %s not implemented\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9501e02e1d7f6944497e724dbccb9a19c3f5221f Gerrit-Change-Number: 16537 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 19:15:20 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 10 Dec 2019 19:15:20 +0000 Subject: Change in osmo-pcu[master]: Support PAGING-CS and PAGING-PS on on PTP-BVCI References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16538 ) Change subject: Support PAGING-CS and PAGING-PS on on PTP-BVCI ...................................................................... Support PAGING-CS and PAGING-PS on on PTP-BVCI Related: OS#2403 Change-Id: I5c52b5af740460c48bb3ba858243b1d20e624268 --- M src/gprs_bssgp_pcu.cpp 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/38/16538/1 diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp index 983c22c..61311cd 100644 --- a/src/gprs_bssgp_pcu.cpp +++ b/src/gprs_bssgp_pcu.cpp @@ -275,8 +275,12 @@ LOGP(DBSSGP, LOGL_DEBUG, "Rx BSSGP BVCI=%d (PTP) %s\n", bvci, bssgp_pdu_str(pdu_type)); break; - case BSSGP_PDUT_PAGING_PS: case BSSGP_PDUT_PAGING_CS: + gprs_bssgp_pcu_rx_paging_cs(msg, tp); + break; + case BSSGP_PDUT_PAGING_PS: + gprs_bssgp_pcu_rx_paging_ps(msg, tp); + break; case BSSGP_PDUT_RA_CAPABILITY: case BSSGP_PDUT_RA_CAPA_UPDATE_ACK: LOGP(DBSSGP, LOGL_INFO, "Rx BSSGP BVCI=%d (PTP) PDU type %s not implemented\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5c52b5af740460c48bb3ba858243b1d20e624268 Gerrit-Change-Number: 16538 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 19:16:50 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 10 Dec 2019 19:16:50 +0000 Subject: Change in osmo-pcu[master]: Allow Gb PAGING-PS without P-TMSI In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16536 ) Change subject: Allow Gb PAGING-PS without P-TMSI ...................................................................... Patch Set 1: Code-Review-1 Don't merge this one yet, I think TTCN3 shows that last 2 bits of the IMSI are switched on during/after Encoding::write_paging_request().... -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4dbf8db04e81f98352a42ce34a5d91326be9bfd1 Gerrit-Change-Number: 16536 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 10 Dec 2019 19:16:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 19:23:10 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 10 Dec 2019 19:23:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: add TC_paging_cs_from_bts In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623 ) Change subject: pcu: add TC_paging_cs_from_bts ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623/5/pcu/PCU_Tests_RAW.ttcn File pcu/PCU_Tests_RAW.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623/5/pcu/PCU_Tests_RAW.ttcn at 1661 PS5, Line 1661: len > So we only compare the lengths? Can we compare the identities too? wE can compare them (and it's a good idea indeed) but it's not trivial afaict, since it's not binary compatible. I already tried for a while but I was unable to accomplish it. Maybe someone with more TTCN3 skills can help later here or advise me. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia3ad503c243c9b3b162e204683fa4fa5447bbab3 Gerrit-Change-Number: 15623 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Assignee: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 10 Dec 2019 19:23:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 21:29:49 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 10 Dec 2019 21:29:49 +0000 Subject: Change in docker-playground[master]: ttcn3-stp-test: Support testing of 'latest' References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16539 ) Change subject: ttcn3-stp-test: Support testing of 'latest' ...................................................................... ttcn3-stp-test: Support testing of 'latest' Change-Id: I1ea9d3312a2775aee8c298370fc5cd84a4b62477 --- M ttcn3-stp-test/jenkins.sh A ttcn3-stp-test/latest/osmo-stp.cfg 2 files changed, 117 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/39/16539/1 diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index 7bb0337..6195e3c 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -12,7 +12,11 @@ cp STP_Tests.cfg $VOL_BASE_DIR/stp-tester/ mkdir $VOL_BASE_DIR/stp -cp osmo-stp.cfg $VOL_BASE_DIR/stp/ +if [ "$IMAGE_SUFFIX" = "latest" ]; then + cp latest/osmo-stp.cfg $VOL_BASE_DIR/stp/ +else + cp osmo-stp.cfg $VOL_BASE_DIR/stp/ +fi network_create 172.18.19.0/24 diff --git a/ttcn3-stp-test/latest/osmo-stp.cfg b/ttcn3-stp-test/latest/osmo-stp.cfg new file mode 100644 index 0000000..37c453d --- /dev/null +++ b/ttcn3-stp-test/latest/osmo-stp.cfg @@ -0,0 +1,112 @@ +! +! OsmoSTP (1.1.0.2-3884) configuration saved from vty +!! +! +log gsmtap 172.18.19.203 + logging level set-all debug + logging filter all 1 +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level set-all debug +! +stats interval 5 +! +line vty + no login + bind 0.0.0.0 +! +cs7 instance 0 + point-code format 24 +! +!M3UA AS/ASP: +! + asp asp-sender 9999 2905 m3ua + local-ip 172.18.19.200 + remote-ip 172.18.19.203 + asp asp-receiver0 10000 2905 m3ua + local-ip 172.18.19.200 + remote-ip 172.18.19.203 + asp asp-receiver1 10001 2905 m3ua + local-ip 172.18.19.200 + remote-ip 172.18.19.203 + asp asp-client0 10002 2906 m3ua + local-ip 172.18.19.200 + remote-ip 172.18.19.203 + as as-sender m3ua + asp asp-sender + routing-key 1023 23 + as as-receiver m3ua + asp asp-receiver0 + asp asp-receiver1 + routing-key 1042 42 + as as-client m3ua + routing-key 1055 55 + asp asp-client0 +! +! IPA AS/ASP: +! + asp ipa-asp-loadshare-sender 20000 5000 ipa + local-ip 172.18.19.200 + remote-ip 172.18.19.203 +! LOADSHARE: + as ipa-as-loadshare-sender ipa + routing-key 0 6 + point-code override dpc 31 + asp ipa-asp-loadshare-sender + asp ipa-asp-loadshare-receiver0 20001 5000 ipa + local-ip 172.18.19.200 + remote-ip 172.18.19.203 + asp ipa-asp-loadshare-receiver1 20002 5000 ipa + local-ip 172.18.19.200 + remote-ip 172.18.19.203 + as ipa-as-loadshare-receiver ipa + traffic-mode loadshare + routing-key 0 7 + point-code override dpc 32 + asp ipa-asp-loadshare-receiver0 + asp ipa-asp-loadshare-receiver1 +! OVERRIDE: + asp ipa-asp-override-sender 20004 5000 ipa + local-ip 172.18.19.200 + remote-ip 172.18.19.203 + as ipa-as-override-sender ipa + routing-key 0 6 + point-code override dpc 33 + asp ipa-asp-override-sender + asp ipa-asp-override-receiver0 20005 5000 ipa + local-ip 172.18.19.200 + remote-ip 172.18.19.203 + asp ipa-asp-override-receiver1 20006 5000 ipa + local-ip 172.18.19.200 + remote-ip 172.18.19.203 + as ipa-as-override-receiver ipa + traffic-mode override + routing-key 0 8 + point-code override dpc 34 + asp ipa-asp-override-receiver0 + asp ipa-asp-override-receiver1 +! DYNAMIC AS: + as ipa-as-dynamic-asp ipa + routing-key 0 5 + point-code override dpc 23 +! +! ROUTING TABLE: +! + route-table system + update route 23 16777215 linkset as-sender + update route 42 16777215 linkset as-receiver + update route 55 16777215 linkset as-client + update route 31 16777215 linkset ipa-as-loadshare-receiver + update route 33 16777215 linkset ipa-as-override-receiver + update route 5 16777215 linkset ipa-as-dynamic-asp +! +!SERVERS: +! + listen m3ua 2905 + accept-asp-connections dynamic-permitted + listen ipa 5000 + accept-asp-connections dynamic-permitted -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1ea9d3312a2775aee8c298370fc5cd84a4b62477 Gerrit-Change-Number: 16539 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 21:31:19 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 10 Dec 2019 21:31:19 +0000 Subject: Change in docker-playground[master]: ttcn3-stp-test: Support testing of 'latest' In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16539 ) Change subject: ttcn3-stp-test: Support testing of 'latest' ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1ea9d3312a2775aee8c298370fc5cd84a4b62477 Gerrit-Change-Number: 16539 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 10 Dec 2019 21:31:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 10 21:31:27 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 10 Dec 2019 21:31:27 +0000 Subject: Change in docker-playground[master]: ttcn3-stp-test: Support testing of 'latest' In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16539 ) Change subject: ttcn3-stp-test: Support testing of 'latest' ...................................................................... ttcn3-stp-test: Support testing of 'latest' Change-Id: I1ea9d3312a2775aee8c298370fc5cd84a4b62477 --- M ttcn3-stp-test/jenkins.sh A ttcn3-stp-test/latest/osmo-stp.cfg 2 files changed, 117 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index 7bb0337..6195e3c 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -12,7 +12,11 @@ cp STP_Tests.cfg $VOL_BASE_DIR/stp-tester/ mkdir $VOL_BASE_DIR/stp -cp osmo-stp.cfg $VOL_BASE_DIR/stp/ +if [ "$IMAGE_SUFFIX" = "latest" ]; then + cp latest/osmo-stp.cfg $VOL_BASE_DIR/stp/ +else + cp osmo-stp.cfg $VOL_BASE_DIR/stp/ +fi network_create 172.18.19.0/24 diff --git a/ttcn3-stp-test/latest/osmo-stp.cfg b/ttcn3-stp-test/latest/osmo-stp.cfg new file mode 100644 index 0000000..37c453d --- /dev/null +++ b/ttcn3-stp-test/latest/osmo-stp.cfg @@ -0,0 +1,112 @@ +! +! OsmoSTP (1.1.0.2-3884) configuration saved from vty +!! +! +log gsmtap 172.18.19.203 + logging level set-all debug + logging filter all 1 +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level set-all debug +! +stats interval 5 +! +line vty + no login + bind 0.0.0.0 +! +cs7 instance 0 + point-code format 24 +! +!M3UA AS/ASP: +! + asp asp-sender 9999 2905 m3ua + local-ip 172.18.19.200 + remote-ip 172.18.19.203 + asp asp-receiver0 10000 2905 m3ua + local-ip 172.18.19.200 + remote-ip 172.18.19.203 + asp asp-receiver1 10001 2905 m3ua + local-ip 172.18.19.200 + remote-ip 172.18.19.203 + asp asp-client0 10002 2906 m3ua + local-ip 172.18.19.200 + remote-ip 172.18.19.203 + as as-sender m3ua + asp asp-sender + routing-key 1023 23 + as as-receiver m3ua + asp asp-receiver0 + asp asp-receiver1 + routing-key 1042 42 + as as-client m3ua + routing-key 1055 55 + asp asp-client0 +! +! IPA AS/ASP: +! + asp ipa-asp-loadshare-sender 20000 5000 ipa + local-ip 172.18.19.200 + remote-ip 172.18.19.203 +! LOADSHARE: + as ipa-as-loadshare-sender ipa + routing-key 0 6 + point-code override dpc 31 + asp ipa-asp-loadshare-sender + asp ipa-asp-loadshare-receiver0 20001 5000 ipa + local-ip 172.18.19.200 + remote-ip 172.18.19.203 + asp ipa-asp-loadshare-receiver1 20002 5000 ipa + local-ip 172.18.19.200 + remote-ip 172.18.19.203 + as ipa-as-loadshare-receiver ipa + traffic-mode loadshare + routing-key 0 7 + point-code override dpc 32 + asp ipa-asp-loadshare-receiver0 + asp ipa-asp-loadshare-receiver1 +! OVERRIDE: + asp ipa-asp-override-sender 20004 5000 ipa + local-ip 172.18.19.200 + remote-ip 172.18.19.203 + as ipa-as-override-sender ipa + routing-key 0 6 + point-code override dpc 33 + asp ipa-asp-override-sender + asp ipa-asp-override-receiver0 20005 5000 ipa + local-ip 172.18.19.200 + remote-ip 172.18.19.203 + asp ipa-asp-override-receiver1 20006 5000 ipa + local-ip 172.18.19.200 + remote-ip 172.18.19.203 + as ipa-as-override-receiver ipa + traffic-mode override + routing-key 0 8 + point-code override dpc 34 + asp ipa-asp-override-receiver0 + asp ipa-asp-override-receiver1 +! DYNAMIC AS: + as ipa-as-dynamic-asp ipa + routing-key 0 5 + point-code override dpc 23 +! +! ROUTING TABLE: +! + route-table system + update route 23 16777215 linkset as-sender + update route 42 16777215 linkset as-receiver + update route 55 16777215 linkset as-client + update route 31 16777215 linkset ipa-as-loadshare-receiver + update route 33 16777215 linkset ipa-as-override-receiver + update route 5 16777215 linkset ipa-as-dynamic-asp +! +!SERVERS: +! + listen m3ua 2905 + accept-asp-connections dynamic-permitted + listen ipa 5000 + accept-asp-connections dynamic-permitted -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1ea9d3312a2775aee8c298370fc5cd84a4b62477 Gerrit-Change-Number: 16539 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 01:03:01 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 11 Dec 2019 01:03:01 +0000 Subject: Change in osmo-pcu[master]: Fix trailing whitespace In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16535 ) Change subject: Fix trailing whitespace ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/16535/1/src/encoding.cpp File src/encoding.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/16535/1/src/encoding.cpp at 871 PS1, Line 871: I think we don't these blank lines at all. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16535 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0515b5c8f6744fa501de88fa7808b7fc91981f0e Gerrit-Change-Number: 16535 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 11 Dec 2019 01:03:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 01:26:36 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 11 Dec 2019 01:26:36 +0000 Subject: Change in osmo-pcu[master]: Allow Gb PAGING-PS without P-TMSI In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16536 ) Change subject: Allow Gb PAGING-PS without P-TMSI ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/16536/1/src/gprs_bssgp_pcu.cpp File src/gprs_bssgp_pcu.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/16536/1/src/gprs_bssgp_pcu.cpp at 201 PS1, Line 201: memcpy I believe this transitional memcpy() call can be eliminated. You could still pass both TLVP_VAL(tp, BSSGP_IE_xMSI) and TLVP_LEN(tp, BSSGP_IE_xMSI) directly to gprs_rlcmac_paging_request(). https://gerrit.osmocom.org/c/osmo-pcu/+/16536/1/src/gprs_rlcmac.cpp File src/gprs_rlcmac.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/16536/1/src/gprs_rlcmac.cpp at 34 PS1, Line 34: osmo_hexdump Can we use osmo_mi_name() here? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4dbf8db04e81f98352a42ce34a5d91326be9bfd1 Gerrit-Change-Number: 16536 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 11 Dec 2019 01:26:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 01:29:31 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 11 Dec 2019 01:29:31 +0000 Subject: Change in osmo-pcu[master]: Allow Gb PAGING-PS without P-TMSI In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16536 ) Change subject: Allow Gb PAGING-PS without P-TMSI ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/16536/1/src/gprs_bssgp_pcu.cpp File src/gprs_bssgp_pcu.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/16536/1/src/gprs_bssgp_pcu.cpp at 211 PS1, Line 211: imsi IDEA: AFAIR, IMSI is needed for pcu_l1if_tx_pch() just to calculate the paging group. Would be great to do this calculation here. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4dbf8db04e81f98352a42ce34a5d91326be9bfd1 Gerrit-Change-Number: 16536 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 11 Dec 2019 01:29:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 01:40:28 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 11 Dec 2019 01:40:28 +0000 Subject: Change in osmo-pcu[master]: Support Gb PAGING-CS In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16537 ) Change subject: Support Gb PAGING-CS ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/16537/1/src/gprs_bssgp_pcu.cpp File src/gprs_bssgp_pcu.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/16537/1/src/gprs_bssgp_pcu.cpp at 178 PS1, Line 178: 9 Where does this 9 come from BTW? Is it (GSM23003_IMSI_MAX_DIGITS + 1) / 2 + 1? * (GSM23003_IMSI_MAX_DIGITS + 1) == (15 + 1) -- 15 digits + 4 padding bits, * (GSM23003_IMSI_MAX_DIGITS + 1) / 2 -- amount of bytes to store the V part, * ... + 1 -- for the L part. Maybe we need a new macro in osmocom/gsm/protocol/gsm_23_003.h? https://gerrit.osmocom.org/c/osmo-pcu/+/16537/1/src/gprs_bssgp_pcu.cpp at 196 PS1, Line 196: No IMSI "Neither TMSI IE nor IMSI IE is present" -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9501e02e1d7f6944497e724dbccb9a19c3f5221f Gerrit-Change-Number: 16537 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 11 Dec 2019 01:40:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 01:45:21 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 11 Dec 2019 01:45:21 +0000 Subject: Change in osmo-pcu[master]: Support PAGING-CS and PAGING-PS on on PTP-BVCI In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16538 ) Change subject: Support PAGING-CS and PAGING-PS on on PTP-BVCI ...................................................................... Patch Set 1: Code-Review+1 Any spec. references? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5c52b5af740460c48bb3ba858243b1d20e624268 Gerrit-Change-Number: 16538 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 11 Dec 2019 01:45:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 02:18:39 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 11 Dec 2019 02:18:39 +0000 Subject: Change in osmo-pcu[master]: Allow Gb PAGING-PS without P-TMSI In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16536 ) Change subject: Allow Gb PAGING-PS without P-TMSI ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/16536/1/src/encoding.cpp File src/encoding.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/16536/1/src/encoding.cpp at a747 PS1, Line 747: bitvec_write_field(dest, &wp,0x4,4); Are you sure we don't need MI type anymore? Or is it contained in identity_lv[1] already? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4dbf8db04e81f98352a42ce34a5d91326be9bfd1 Gerrit-Change-Number: 16536 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 11 Dec 2019 02:18:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 02:52:21 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 11 Dec 2019 02:52:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: add TC_paging_cs_from_bts In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623 ) Change subject: pcu: add TC_paging_cs_from_bts ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623/5/library/RLCMAC_CSN1_Types.ttcn File library/RLCMAC_CSN1_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623/5/library/RLCMAC_CSN1_Types.ttcn at 217 PS5, Line 217: presence ('1'B), I think I know how to make TITAN distinguish between CS and PS paging properly. The PRESENCE attribute can also define presence of the whole record, so feel free to add: variant "PRESENCE (presence = '1'B)" /* to PageInfoCs */ variant "PRESENCE (presence = '0'B)" /* to PageInfoPs */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia3ad503c243c9b3b162e204683fa4fa5447bbab3 Gerrit-Change-Number: 15623 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Assignee: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 11 Dec 2019 02:52:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 04:43:31 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 11 Dec 2019 04:43:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: add TC_paging_cs_from_bts In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623 ) Change subject: pcu: add TC_paging_cs_from_bts ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623/5/pcu/PCU_Tests_RAW.ttcn File pcu/PCU_Tests_RAW.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623/5/pcu/PCU_Tests_RAW.ttcn at 1661 PS5, Line 1661: len > wE can compare them (and it's a good idea indeed) but it's not trivial afaict, since it's not binary compatible. Yep, they must be of the same type. You can either: - make use of MobileIdentityV (from MobileL3_CommonIE_Types.ttcn) in record MobileIdentityLV_Paging (preferred), or - introduce enc_MobileIdentityV (we already have enc_MobileIdentityLV in L3_Templates.ttcn), and compare octetstrings. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia3ad503c243c9b3b162e204683fa4fa5447bbab3 Gerrit-Change-Number: 15623 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Assignee: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 11 Dec 2019 04:43:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 05:27:19 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 11 Dec 2019 05:27:19 +0000 Subject: Change in libosmocore[master]: core/defs.h: introduce and use OSMO_DEPRECATED_OUTSIDE In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/14864 ) Change subject: core/defs.h: introduce and use OSMO_DEPRECATED_OUTSIDE ...................................................................... Patch Set 3: (1 comment) This change is ready for review. https://gerrit.osmocom.org/c/libosmocore/+/14864/3/include/osmocom/core/defs.h File include/osmocom/core/defs.h: https://gerrit.osmocom.org/c/libosmocore/+/14864/3/include/osmocom/core/defs.h at 46 PS3, Line 46: # define OSMO_DEPRECATED_OUTSIDE(text) > We can simply replace all occurences of it and use the new text version everywhere. ACK. "For internal use inside libosmocore only" does not give much details to the API users, e.g. what should they use instead. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1b0eff1396776900c1286e41da3aee3ff78b326e Gerrit-Change-Number: 14864 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Wed, 11 Dec 2019 05:27:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 06:26:31 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 11 Dec 2019 06:26:31 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: fix: include the length byte in SM-RP-DA In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16341 ) Change subject: libmsc/gsm_04_11.c: fix: include the length byte in SM-RP-DA ...................................................................... Patch Set 2: > Patch Set 2: > > don't we ahve any kind of unit or ttcn3 tests for this kind of problem? Unfortunately, in our TTCN-3 test cases we do not match the content of SM-RP-OA and SM-RP-DA. I am working on this now... -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I64f47fb68e8123f47d7770b7cb194c57acef1e8f Gerrit-Change-Number: 16341 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 11 Dec 2019 06:26:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 10:15:28 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 11 Dec 2019 10:15:28 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: fix: include the length byte in SM-RP-DA In-Reply-To: References: Message-ID: fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16341 ) Change subject: libmsc/gsm_04_11.c: fix: include the length byte in SM-RP-DA ...................................................................... Abandoned I just checked out MAP specs. and the code again, and realized that we don't need this length octet. Nowhere else in GSUP protocol we do this. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I64f47fb68e8123f47d7770b7cb194c57acef1e8f Gerrit-Change-Number: 16341 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 11:09:06 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 11 Dec 2019 11:09:06 +0000 Subject: Change in ...osmo-python-tests[master]: Drop python2 support / make it work with python3 References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16540 ) Change subject: Drop python2 support / make it work with python3 ...................................................................... Drop python2 support / make it work with python3 Re-apply reverted commit Iabda95073faa2191fd117e9637e0858c589e9d9e ("Drop python2 support"), but with additional changes to make the scripts actually work with python3 and to make it build without python2. I have verified, that the contrib/jenkins.sh scripts of all Osmocom repositories (with their python3 patches on top) are working with this patch and that all Osmocom repositories with the python3 patches build in OBS (tested in own namespace). All related patches for changing from python2 to 3 in other repositories must be merged shortly after this one, as soon as the build slaves were (automatically) updated to have the new osmo-python-tests installed: https://gerrit.osmocom.org/q/topic:drop-py2 New fixes: * osmopy/obscvty.py: verify: fix compare Comparing maps in python3 does not work the same as in python2. Convert them to lists first, so the compare works as intended again. Fix error: File "/home/user/code/osmo-dev/src/osmo-python-tests/scripts/osmotestvty.py", line 57, in test_history assert(self.vty.w_verify(test_str, [t1])) AssertionError * osmopy/obscvty.py: use enc/dec with send/recv Fix error: self.socket.send("%s\r" % request) TypeError: a bytes-like object is required, not 'str' * scripts/osmotestconfig.py: use encode() before writing to file Fix error: File "/home/user/code/osmo-dev/src/osmo-python-tests/scripts/osmotestconfig.py", line 91, in copy_config tmpfile.write(open(config).read()) File "/usr/lib/python3.5/tempfile.py", line 622, in func_wrapper return func(*args, **kwargs) TypeError: a bytes-like object is required, not 'str' * debian/control: add --buildsystem=pybuild. Otherwise "--with python3" is ignored and the build fails if python2 is not installed, with: Can't exec "pyversions": No such file or directory at /usr/[...]/python_distutils.pm line 120. Related: OS#2819 Change-Id: I3ffc3519bf6c22536a49dad7a966188ddad351a7 --- M contrib/jenkins.sh M debian/control M debian/rules M osmopy/__init__.py M osmopy/obscvty.py M osmopy/osmo_interact/__init__.py M osmopy/osmo_interact/common.py M osmopy/osmoutil.py M scripts/osmodumpdoc.py M scripts/osmotestconfig.py M scripts/osmotestvty.py M setup.py D tests/test_py2.py 13 files changed, 28 insertions(+), 77 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/40/16540/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 08908a4..9b219f9 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -4,16 +4,6 @@ COM_FLAGS='-m compileall' -# FIXME: remove once python 2 support is deprecated -PY2=python2 -PY2_LIST="osmopy scripts/osmodumpdoc.py scripts/osmotestvty.py scripts/osmotestconfig.py" -$PY2 ./setup.py install -$PY2 tests/test_py2.py -for f in $PY2_LIST -do - $PY2 $COM_FLAGS $f -done - rm -rf ./build PY3=python3 PY3_LIST="osmopy scripts/osmo_ctrl.py scripts/osmo_rate_ctr2csv.py scripts/osmodumpdoc.py scripts/osmotestvty.py scripts/osmotestconfig.py scripts/osmo_interact_ctrl.py scripts/osmo_interact_vty.py scripts/osmo_verify_transcript_ctrl.py scripts/osmo_verify_transcript_vty.py scripts/soap.py scripts/twisted_ipa.py" diff --git a/debian/control b/debian/control index 52b614c..1ad871d 100644 --- a/debian/control +++ b/debian/control @@ -2,26 +2,12 @@ Section: python Priority: optional Maintainer: Harald Welte -Build-Depends: debhelper (>= 9), python, dh-python, python-setuptools, python3, python3-setuptools +Build-Depends: debhelper (>= 9), dh-python, python3, python3-setuptools Standards-Version: 3.9.8 Homepage: http://git.osmocom.org/python/osmo-python-tests/ Vcs-Git: git://git.osmocom.org/python/osmo-python-tests Vcs-Browser: http://git.osmocom.org/python/osmo-python-tests/ -Package: python2-osmopy-libs -Architecture: all -Depends: ${python:Depends}, ${misc:Depends} -Description: Python code (not only) for testing of Osmocom programs - . - This package contains the Python 2 version of osmopy libraries. - -Package: python2-osmopy-utils -Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, python2-osmopy-libs -Description: Python code (not only) for testing of Osmocom programs - . - This package contains the Python 2 version of osmopy utils. - Package: python3-osmopy-libs Architecture: all Depends: ${python3:Depends}, ${misc:Depends} diff --git a/debian/rules b/debian/rules index 04b59f6..ff16a03 100755 --- a/debian/rules +++ b/debian/rules @@ -1,13 +1,9 @@ #!/usr/bin/make -f %: - dh $@ --with python2,python3 + dh $@ --with python3 --buildsystem=pybuild override_dh_auto_install: - python2 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python2-osmopy-libs - rm -rf $(CURDIR)/debian/python2-osmopy-libs/usr/bin - python2 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python2-osmopy-utils - rm -rf $(CURDIR)/debian/python2-osmopy-utils/usr/lib python3 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python3-osmopy-libs rm -rf $(CURDIR)/debian/python3-osmopy-libs/usr/bin python3 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python3-osmopy-utils diff --git a/osmopy/__init__.py b/osmopy/__init__.py index ce78caf..18362ec 100644 --- a/osmopy/__init__.py +++ b/osmopy/__init__.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 __version__ = '0.1.0' __all__ = ['obscvty', 'osmoutil', 'osmo_ipa', 'osmo_interact', 'trap_helper', 'twisted_ipa'] diff --git a/osmopy/obscvty.py b/osmopy/obscvty.py index d39d3da..6b7d56c 100755 --- a/osmopy/obscvty.py +++ b/osmopy/obscvty.py @@ -16,7 +16,6 @@ # # VTY helper code for OpenBSC # -from __future__ import print_function import re import socket import sys, subprocess @@ -176,13 +175,13 @@ self._connect_socket() # Now send the command - self.socket.send("%s\r" % request) + self.socket.send(("%s\r" % request).encode()) res = "" end = "" # Unfortunately, timeout and recv don't always play nicely while True: - data = self.socket.recv(4096) + data = self.socket.recv(4096).decode() res = "%s%s" % (res, data) if not res: # yes, this is ugly raise IOError("Failed to read data (did the app crash?)") @@ -205,7 +204,7 @@ buffer = '' data = True while data: - data = self.socket.recv(recv_buffer) + data = self.socket.recv(recv_buffer).decode() buffer += data while buffer.find(delim) != -1: @@ -244,8 +243,8 @@ def verify(self, command, results, close=False, loud=True, f=None): res = self.command(command, close).split('\r\n') if f: - res = map(f, res) - results = map(f, results) + res = list(map(f, res)) + results = list(map(f, results)) if loud: if res != results: diff --git a/osmopy/osmo_interact/__init__.py b/osmopy/osmo_interact/__init__.py index 4fc4fac..036238a 100644 --- a/osmopy/osmo_interact/__init__.py +++ b/osmopy/osmo_interact/__init__.py @@ -1,2 +1,2 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 __all__ = ['common', 'vty', 'ctrl'] diff --git a/osmopy/osmo_interact/common.py b/osmopy/osmo_interact/common.py index cc7e190..87eca6a 100644 --- a/osmopy/osmo_interact/common.py +++ b/osmopy/osmo_interact/common.py @@ -24,11 +24,6 @@ vty.py and ctrl.py plug VTY and CTRL interface specific bits. ''' -# Our setup.py currently wants everything to be parsable by both py2 and py3. -# IMHO that is not a good idea, but until that changes, let's just keep this -# py2 legacy shim in here so we can syntax-check this py3 module with py2. -from __future__ import print_function - import argparse import sys import os diff --git a/osmopy/osmoutil.py b/osmopy/osmoutil.py index 54a3456..ec9c8c3 100755 --- a/osmopy/osmoutil.py +++ b/osmopy/osmoutil.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify @@ -14,7 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from __future__ import print_function import subprocess import os import sys diff --git a/scripts/osmodumpdoc.py b/scripts/osmodumpdoc.py index d71edc8..64b088f 100755 --- a/scripts/osmodumpdoc.py +++ b/scripts/osmodumpdoc.py @@ -1,10 +1,9 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Make sure this code is in sync with the BTS directory. # Fixes may need to be applied to both. """Start the process and dump the documentation to the doc dir.""" -from __future__ import print_function import subprocess import time import os diff --git a/scripts/osmotestconfig.py b/scripts/osmotestconfig.py index f227504..3c96ca6 100755 --- a/scripts/osmotestconfig.py +++ b/scripts/osmotestconfig.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify @@ -13,7 +13,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from __future__ import print_function import os import os.path import time @@ -89,7 +88,7 @@ prefix = os.path.basename(config) tmpfile = tempfile.NamedTemporaryFile( dir=dirname, prefix=prefix, delete=False) - tmpfile.write(open(config).read()) + tmpfile.write(open(config).read().encode()) tmpfile.close() # This works around the precautions NamedTemporaryFile is made for... return tmpfile.name diff --git a/scripts/osmotestvty.py b/scripts/osmotestvty.py index 55017a5..600860f 100755 --- a/scripts/osmotestvty.py +++ b/scripts/osmotestvty.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify @@ -13,7 +13,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from __future__ import print_function import os import time import unittest diff --git a/setup.py b/setup.py index 69e18b0..ab604ce 100755 --- a/setup.py +++ b/setup.py @@ -19,24 +19,20 @@ from osmopy import __version__ import sys -if sys.version_info.major == 2: - scripts = [ - "scripts/osmodumpdoc.py", - "scripts/osmotestconfig.py", - "scripts/osmotestvty.py", - ] -elif sys.version_info.major == 3: - scripts = [ - "scripts/osmo_ctrl.py", - "scripts/osmo_rate_ctr2csv.py", - "scripts/soap.py", - "scripts/ctrl2cgi.py", - "scripts/osmo_trap2cgi.py", - "scripts/osmo_interact_vty.py", - "scripts/osmo_interact_ctrl.py", - "scripts/osmo_verify_transcript_vty.py", - "scripts/osmo_verify_transcript_ctrl.py", - ] +scripts = [ + "scripts/osmodumpdoc.py", + "scripts/osmotestvty.py", + "scripts/osmotestconfig.py", + "scripts/osmo_ctrl.py", + "scripts/osmo_rate_ctr2csv.py", + "scripts/soap.py", + "scripts/ctrl2cgi.py", + "scripts/osmo_trap2cgi.py", + "scripts/osmo_interact_vty.py", + "scripts/osmo_interact_ctrl.py", + "scripts/osmo_verify_transcript_vty.py", + "scripts/osmo_verify_transcript_ctrl.py", + ] setup( name = 'osmopython', diff --git a/tests/test_py2.py b/tests/test_py2.py deleted file mode 100644 index cac5261..0000000 --- a/tests/test_py2.py +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env python2 - -# just import a smoke test for osmopy - -import osmopy - -print '[Python2] Smoke test PASSED.' -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I3ffc3519bf6c22536a49dad7a966188ddad351a7 Gerrit-Change-Number: 16540 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 11:09:29 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 11 Dec 2019 11:09:29 +0000 Subject: Change in libosmo-sccp[master]: gitignore: add various generated doc files References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16541 ) Change subject: gitignore: add various generated doc files ...................................................................... gitignore: add various generated doc files Change-Id: I14eac5a1e7bc5ff202fc57d76c1b84d4e0050ca8 --- M .gitignore 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/41/16541/1 diff --git a/.gitignore b/.gitignore index 289ed0d..848c94c 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,6 @@ doc/manuals/osmomsc-usermanual.xml doc/manuals/common doc/manuals/build +doc/html.tar +doc/libosmo-sigtran.tag +doc/sigtran -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I14eac5a1e7bc5ff202fc57d76c1b84d4e0050ca8 Gerrit-Change-Number: 16541 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 11:09:29 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 11 Dec 2019 11:09:29 +0000 Subject: Change in libosmo-sccp[master]: osmoappdesc.py, tests: switch to python 3 References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16542 ) Change subject: osmoappdesc.py, tests: switch to python 3 ...................................................................... osmoappdesc.py, tests: switch to python 3 Make build and external tests work with python3, so we can drop the python2 dependency. This should be merged shortly after osmo-python-tests was migrated to python3, and the jenkins build slaves were (automatically) updated to have the new osmo-python-tests installed. Related: OS#2819 Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Change-Id: I344c49001fba23bdcfdef06ab174c52b60edd01c --- M osmoappdesc.py M tests/vty/vty_test_runner.py 2 files changed, 17 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/42/16542/1 diff --git a/osmoappdesc.py b/osmoappdesc.py index 02ccda6..6c1bafa 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 app_configs = { "osmo-stp": ["doc/examples/osmo-stp.cfg"], diff --git a/tests/vty/vty_test_runner.py b/tests/vty/vty_test_runner.py index 47ce23c..605bc93 100755 --- a/tests/vty/vty_test_runner.py +++ b/tests/vty/vty_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # (C) 2013 by Holger Hans Peter Freyther @@ -35,9 +35,9 @@ def checkForEndAndExit(self): res = self.vty.command("list") #print ('looking for "exit"\n') - self.assert_(res.find(' exit\r') > 0) + self.assertTrue(res.find(' exit\r') > 0) #print 'found "exit"\nlooking for "end"\n' - self.assert_(res.find(' end\r') > 0) + self.assertTrue(res.find(' end\r') > 0) #print 'found "end"\n' def vty_command(self): @@ -56,8 +56,8 @@ try: self.proc = osmoutil.popen_devnull(osmo_vty_cmd) except OSError: - print >> sys.stderr, "Current directory: %s" % os.getcwd() - print >> sys.stderr, "Consider setting -b" + print("Current directory: %s" % os.getcwd(), file=sys.stderr) + print("Consider setting -b", file=sys.stderr) appstring = self.vty_app()[2] appport = self.vty_app()[0] @@ -89,22 +89,22 @@ line = fp.readline().strip() if not line: return False - print "%s: parsing line: %s" %(path, line) + print("%s: parsing line: %s" %(path, line)) it = line.split() if lport == int(it[5]): - print "%s: local port %d found" %(path, lport) + print("%s: local port %d found" %(path, lport)) itaddr_list = it[8:] if len(itaddr_list) != len(laddr_list): - print "%s: addr list mismatch: %r vs %r" % (path, repr(itaddr_list), repr(laddr_list)) + print("%s: addr list mismatch: %r vs %r" % (path, repr(itaddr_list), repr(laddr_list))) continue for addr in laddr_list: if addr not in itaddr_list: - print "%s: addr not found in list: %s vs %r" % (path, addr, repr(itaddr_list)) + print("%s: addr not found in list: %s vs %r" % (path, addr, repr(itaddr_list))) return False return True return False except IOError as e: - print "I/O error({0}): {1}".format(e.errno, e.strerror) + print("I/O error({0}): {1}".format(e.errno, e.strerror)) return False def testMultiHome(self): @@ -115,9 +115,9 @@ found = True break else: - print "[%d] osmo-stp not yet available, retrying in a second" % i + print("[%d] osmo-stp not yet available, retrying in a second" % i) time.sleep(1) - self.assert_(found) + self.assertTrue(found) try: proto = socket.IPPROTO_SCTP except AttributeError: # it seems to be not defined under python2? @@ -128,8 +128,8 @@ s.connect(('127.0.0.2',2905)) except socket.error as msg: s.close() - self.assert_(False) - print "Connected to STP through SCTP" + self.assertTrue(False) + print("Connected to STP through SCTP") s.close() if __name__ == '__main__': @@ -158,9 +158,9 @@ if args.p: confpath = args.p - print "confpath %s, workdir %s" % (confpath, workdir) + print("confpath %s, workdir %s" % (confpath, workdir)) os.chdir(workdir) - print "Running tests for specific VTY commands" + print("Running tests for specific VTY commands") suite = unittest.TestSuite() suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestVTYSTP)) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I344c49001fba23bdcfdef06ab174c52b60edd01c Gerrit-Change-Number: 16542 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 11:09:47 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 11 Dec 2019 11:09:47 +0000 Subject: Change in libosmocore[master]: debian, utils: switch to python 3 References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16543 ) Change subject: debian, utils: switch to python 3 ...................................................................... debian, utils: switch to python 3 Make build and external tests work with python3, so we can drop the python2 dependency. This should be merged shortly after osmo-python-tests was migrated to python3, and the jenkins build slaves were (automatically) updated to have the new osmo-python-tests installed. Related: OS#2819 Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Change-Id: I84ef43f700e125c7a65f92347f12844e07e65655 --- M debian/control M include/Makefile.am M src/gsm/Makefile.am M tests/Makefile.am M utils/conv_codes_gsm.py M utils/conv_gen.py 6 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/16543/1 diff --git a/debian/control b/debian/control index 6c9cfae..cf7a853 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ pkg-config, libtalloc-dev, libsctp-dev, - python (>= 2.7.6) + python3 Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/libosmocore.git Vcs-Browser: http://git.osmocom.org/libosmocore/ diff --git a/include/Makefile.am b/include/Makefile.am index a82d6ac..d76addd 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -179,7 +179,7 @@ $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@ osmocom/gsm/gsm0503.h: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py - $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_header gsm \ + $(AM_V_GEN)python3 $(top_srcdir)/utils/conv_gen.py gen_header gsm \ --target-path $(builddir)/osmocom/gsm CLEANFILES = osmocom/gsm/gsm0503.h diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index f13ba9d..4a1faca 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -49,6 +49,6 @@ # Convolutional codes generation gsm0503_conv.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py - $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_codes gsm + $(AM_V_GEN)python3 $(top_srcdir)/utils/conv_gen.py gen_codes gsm CLEANFILES = gsm0503_conv.c diff --git a/tests/Makefile.am b/tests/Makefile.am index e8e4dee..3a3ea37 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -362,7 +362,7 @@ mv $@.tmp $@ conv/gsm0503_test_vectors.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py - $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_vectors gsm \ + $(AM_V_GEN)python3 $(top_srcdir)/utils/conv_gen.py gen_vectors gsm \ --target-path $(builddir)/conv if ENABLE_EXT_TESTS diff --git a/utils/conv_codes_gsm.py b/utils/conv_codes_gsm.py index ec77660..e189985 100644 --- a/utils/conv_codes_gsm.py +++ b/utils/conv_codes_gsm.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- from conv_gen import ConvolutionalCode diff --git a/utils/conv_gen.py b/utils/conv_gen.py index 06283d8..d2eda15 100644 --- a/utils/conv_gen.py +++ b/utils/conv_gen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 mod_license = """ /* -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16543 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I84ef43f700e125c7a65f92347f12844e07e65655 Gerrit-Change-Number: 16543 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 11:10:24 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 11 Dec 2019 11:10:24 +0000 Subject: Change in openbsc[master]: osmoappdesc.py, tests, ipa.py: switch to python 3 References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/openbsc/+/16544 ) Change subject: osmoappdesc.py, tests, ipa.py: switch to python 3 ...................................................................... osmoappdesc.py, tests, ipa.py: switch to python 3 Make build and external tests work with python3, so we can drop the python2 dependency. This should be merged shortly after osmo-python-tests was migrated to python3, and the jenkins build slaves were (automatically) updated to have the new osmo-python-tests installed. Related: OS#2819 Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Change-Id: Id7d006f892198bb8a7c0d4a8a8ea00b8d0e62df4 --- M openbsc/contrib/ipa.py M openbsc/osmoappdesc.py M openbsc/tests/ctrl_test_runner.py M openbsc/tests/smpp_test_runner.py M openbsc/tests/vty_test_runner.py 5 files changed, 450 insertions(+), 440 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/44/16544/1 diff --git a/openbsc/contrib/ipa.py b/openbsc/contrib/ipa.py index 71cbf45..cd1192c 100755 --- a/openbsc/contrib/ipa.py +++ b/openbsc/contrib/ipa.py @@ -56,7 +56,11 @@ """ Create TAG as TLV data """ - return struct.pack(">HB", len(v) + 1, t) + v + if isinstance(v, str): + v = v.encode() + if isinstance(t, str): + t = t.encode() + return struct.pack(">HB".encode(), len(v) + 1, t) + v def proto(self, p): """ @@ -96,9 +100,15 @@ """ Add IPA header (with extension if necessary), data must be represented as bytes """ + if isinstance(data, str): + data = data.encode() + if isinstance(proto, str): + proto = proto.encode() + if isinstance(ext, str): + ext = ext.encode() if ext is None: - return struct.pack(">HB", len(data) + 1, proto) + data - return struct.pack(">HBB", len(data) + 1, proto, ext) + data + return struct.pack(">HB".encode(), len(data) + 1, proto) + data + return struct.pack(">HBB".encode(), len(data) + 1, proto, ext) + data def del_header(self, data): """ diff --git a/openbsc/osmoappdesc.py b/openbsc/osmoappdesc.py index 5b01e4c..af949e8 100644 --- a/openbsc/osmoappdesc.py +++ b/openbsc/osmoappdesc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify diff --git a/openbsc/tests/ctrl_test_runner.py b/openbsc/tests/ctrl_test_runner.py index ad0a16b..a1d4195 100755 --- a/openbsc/tests/ctrl_test_runner.py +++ b/openbsc/tests/ctrl_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # (C) 2013 by Jacob Erlbeck # (C) 2014 by Holger Hans Peter Freyther @@ -57,8 +57,8 @@ try: self.proc = osmoutil.popen_devnull(osmo_ctrl_cmd) except OSError: - print >> sys.stderr, "Current directory: %s" % os.getcwd() - print >> sys.stderr, "Consider setting -b" + print("Current directory: %s" % os.getcwd(), file=sys.stderr) + print("Consider setting -b", file=sys.stderr) time.sleep(2) appstring = self.ctrl_app()[2] @@ -76,7 +76,7 @@ def connect(self, host, port): if verbose: - print "Connecting to host %s:%i" % (host, port) + print("Connecting to host %s:%i" % (host, port)) retries = 30 while True: @@ -96,7 +96,7 @@ def send(self, data): if verbose: - print "Sending \"%s\"" %(data) + print("Sending \"%s\"" %(data)) data = Ctrl().add_header(data) return self.sock.send(data) == len(data) @@ -125,9 +125,9 @@ data = self.sock.recv(4096) while (len(data)>0): (head, data) = IPA().split_combined(data) - answer = Ctrl().rem_header(head) + answer = Ctrl().rem_header(head).decode() if verbose: - print "Got message:", answer + print("Got message:", answer) (mtype, id, msg) = answer.split(None, 2) id = int(id) rsp = {'mtype': mtype, 'id': id} @@ -143,7 +143,7 @@ responses[id] = rsp if verbose: - print "Decoded replies: ", responses + print("Decoded replies: ", responses) return responses @@ -163,80 +163,80 @@ def testCtrlErrs(self): r = self.do_get('invalid') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Command not found') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Command not found') r = self.do_set('rf_locked', '999') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Value failed verification.') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Value failed verification.') r = self.do_get('bts') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Error while parsing the index.') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Error while parsing the index.') r = self.do_get('bts.999') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Error while resolving object') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Error while resolving object') def testBtsLac(self): r = self.do_get('bts.0.location-area-code') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.location-area-code') - self.assertEquals(r['value'], '1') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.location-area-code') + self.assertEqual(r['value'], '1') r = self.do_set('bts.0.location-area-code', '23') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'bts.0.location-area-code') - self.assertEquals(r['value'], '23') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'bts.0.location-area-code') + self.assertEqual(r['value'], '23') r = self.do_get('bts.0.location-area-code') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.location-area-code') - self.assertEquals(r['value'], '23') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.location-area-code') + self.assertEqual(r['value'], '23') r = self.do_set('bts.0.location-area-code', '-1') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Input not within the range') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Input not within the range') def testBtsCi(self): r = self.do_get('bts.0.cell-identity') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.cell-identity') - self.assertEquals(r['value'], '0') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.cell-identity') + self.assertEqual(r['value'], '0') r = self.do_set('bts.0.cell-identity', '23') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'bts.0.cell-identity') - self.assertEquals(r['value'], '23') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'bts.0.cell-identity') + self.assertEqual(r['value'], '23') r = self.do_get('bts.0.cell-identity') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.cell-identity') - self.assertEquals(r['value'], '23') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.cell-identity') + self.assertEqual(r['value'], '23') r = self.do_set('bts.0.cell-identity', '-1') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Input not within the range') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Input not within the range') def testBtsGenerateSystemInformation(self): r = self.do_get('bts.0.send-new-system-informations') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Write Only attribute') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Write Only attribute') # No RSL links so it will fail r = self.do_set('bts.0.send-new-system-informations', '1') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Failed to generate SI') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Failed to generate SI') def testBtsChannelLoad(self): r = self.do_set('bts.0.channel-load', '1') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Read Only attribute') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Read Only attribute') # No RSL link so everything is 0 r = self.do_get('bts.0.channel-load') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['value'], + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['value'], 'CCCH+SDCCH4,0,0 TCH/F,0,0 TCH/H,0,0 SDCCH8,0,0' + ' TCH/F_PDCH,0,0 CCCH+SDCCH4+CBCH,0,0' + ' SDCCH8+CBCH,0,0 TCH/F_TCH/H_PDCH,0,0') @@ -244,221 +244,221 @@ def testBtsOmlConnectionState(self): """Check OML state. It will not be connected""" r = self.do_set('bts.0.oml-connection-state', '1') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Read Only attribute') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Read Only attribute') # No RSL link so everything is 0 r = self.do_get('bts.0.oml-connection-state') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['value'], 'disconnected') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['value'], 'disconnected') def testTrxPowerRed(self): r = self.do_get('bts.0.trx.0.max-power-reduction') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.trx.0.max-power-reduction') - self.assertEquals(r['value'], '20') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.trx.0.max-power-reduction') + self.assertEqual(r['value'], '20') r = self.do_set('bts.0.trx.0.max-power-reduction', '22') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'bts.0.trx.0.max-power-reduction') - self.assertEquals(r['value'], '22') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'bts.0.trx.0.max-power-reduction') + self.assertEqual(r['value'], '22') r = self.do_get('bts.0.trx.0.max-power-reduction') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.trx.0.max-power-reduction') - self.assertEquals(r['value'], '22') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.trx.0.max-power-reduction') + self.assertEqual(r['value'], '22') r = self.do_set('bts.0.trx.0.max-power-reduction', '1') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Value must be even') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Value must be even') def testTrxArfcn(self): r = self.do_get('bts.0.trx.0.arfcn') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.trx.0.arfcn') - self.assertEquals(r['value'], '871') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.trx.0.arfcn') + self.assertEqual(r['value'], '871') r = self.do_set('bts.0.trx.0.arfcn', '873') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'bts.0.trx.0.arfcn') - self.assertEquals(r['value'], '873') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'bts.0.trx.0.arfcn') + self.assertEqual(r['value'], '873') r = self.do_get('bts.0.trx.0.arfcn') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.trx.0.arfcn') - self.assertEquals(r['value'], '873') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.trx.0.arfcn') + self.assertEqual(r['value'], '873') r = self.do_set('bts.0.trx.0.arfcn', '2000') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Input not within the range') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Input not within the range') def testRfLock(self): r = self.do_get('bts.0.rf_state') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.rf_state') - self.assertEquals(r['value'], 'inoperational,unlocked,on') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.rf_state') + self.assertEqual(r['value'], 'inoperational,unlocked,on') r = self.do_set('rf_locked', '1') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'rf_locked') - self.assertEquals(r['value'], '1') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'rf_locked') + self.assertEqual(r['value'], '1') time.sleep(1.5) r = self.do_get('bts.0.rf_state') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.rf_state') - self.assertEquals(r['value'], 'inoperational,locked,off') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.rf_state') + self.assertEqual(r['value'], 'inoperational,locked,off') r = self.do_get('rf_locked') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'rf_locked') - self.assertEquals(r['value'], 'state=off,policy=off') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'rf_locked') + self.assertEqual(r['value'], 'state=off,policy=off') r = self.do_set('rf_locked', '0') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'rf_locked') - self.assertEquals(r['value'], '0') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'rf_locked') + self.assertEqual(r['value'], '0') time.sleep(1.5) r = self.do_get('bts.0.rf_state') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.rf_state') - self.assertEquals(r['value'], 'inoperational,unlocked,on') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.rf_state') + self.assertEqual(r['value'], 'inoperational,unlocked,on') r = self.do_get('rf_locked') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'rf_locked') - self.assertEquals(r['value'], 'state=off,policy=on') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'rf_locked') + self.assertEqual(r['value'], 'state=off,policy=on') def testTimezone(self): r = self.do_get('timezone') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'timezone') - self.assertEquals(r['value'], 'off') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'timezone') + self.assertEqual(r['value'], 'off') r = self.do_set('timezone', '-2,15,2') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'timezone') - self.assertEquals(r['value'], '-2,15,2') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'timezone') + self.assertEqual(r['value'], '-2,15,2') r = self.do_get('timezone') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'timezone') - self.assertEquals(r['value'], '-2,15,2') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'timezone') + self.assertEqual(r['value'], '-2,15,2') # Test invalid input r = self.do_set('timezone', '-2,15,2,5,6,7') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'timezone') - self.assertEquals(r['value'], '-2,15,2') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'timezone') + self.assertEqual(r['value'], '-2,15,2') r = self.do_set('timezone', '-2,15') - self.assertEquals(r['mtype'], 'ERROR') + self.assertEqual(r['mtype'], 'ERROR') r = self.do_set('timezone', '-2') - self.assertEquals(r['mtype'], 'ERROR') + self.assertEqual(r['mtype'], 'ERROR') r = self.do_set('timezone', '1') r = self.do_set('timezone', 'off') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'timezone') - self.assertEquals(r['value'], 'off') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'timezone') + self.assertEqual(r['value'], 'off') r = self.do_get('timezone') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'timezone') - self.assertEquals(r['value'], 'off') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'timezone') + self.assertEqual(r['value'], 'off') def testMcc(self): r = self.do_set('mcc', '23') r = self.do_get('mcc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mcc') - self.assertEquals(r['value'], '023') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mcc') + self.assertEqual(r['value'], '023') r = self.do_set('mcc', '023') r = self.do_get('mcc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mcc') - self.assertEquals(r['value'], '023') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mcc') + self.assertEqual(r['value'], '023') def testMnc(self): r = self.do_set('mnc', '9') r = self.do_get('mnc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '09') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mnc') + self.assertEqual(r['value'], '09') r = self.do_set('mnc', '09') r = self.do_get('mnc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '09') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mnc') + self.assertEqual(r['value'], '09') r = self.do_set('mnc', '009') r = self.do_get('mnc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '009') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mnc') + self.assertEqual(r['value'], '009') def testMccMncApply(self): # Test some invalid input r = self.do_set('mcc-mnc-apply', 'WRONG') - self.assertEquals(r['mtype'], 'ERROR') + self.assertEqual(r['mtype'], 'ERROR') r = self.do_set('mcc-mnc-apply', '1,') - self.assertEquals(r['mtype'], 'ERROR') + self.assertEqual(r['mtype'], 'ERROR') r = self.do_set('mcc-mnc-apply', '200,3') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'mcc-mnc-apply') - self.assertEquals(r['value'], 'Tried to drop the BTS') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'mcc-mnc-apply') + self.assertEqual(r['value'], 'Tried to drop the BTS') # Set it again r = self.do_set('mcc-mnc-apply', '200,3') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'mcc-mnc-apply') - self.assertEquals(r['value'], 'Nothing changed') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'mcc-mnc-apply') + self.assertEqual(r['value'], 'Nothing changed') # Change it r = self.do_set('mcc-mnc-apply', '200,4') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'mcc-mnc-apply') - self.assertEquals(r['value'], 'Tried to drop the BTS') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'mcc-mnc-apply') + self.assertEqual(r['value'], 'Tried to drop the BTS') # Change it r = self.do_set('mcc-mnc-apply', '201,4') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'mcc-mnc-apply') - self.assertEquals(r['value'], 'Tried to drop the BTS') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'mcc-mnc-apply') + self.assertEqual(r['value'], 'Tried to drop the BTS') # Verify r = self.do_get('mnc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '04') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mnc') + self.assertEqual(r['value'], '04') r = self.do_get('mcc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mcc') - self.assertEquals(r['value'], '201') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mcc') + self.assertEqual(r['value'], '201') # Change it r = self.do_set('mcc-mnc-apply', '202,03') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'mcc-mnc-apply') - self.assertEquals(r['value'], 'Tried to drop the BTS') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'mcc-mnc-apply') + self.assertEqual(r['value'], 'Tried to drop the BTS') r = self.do_get('mnc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '03') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mnc') + self.assertEqual(r['value'], '03') r = self.do_get('mcc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mcc') - self.assertEquals(r['value'], '202') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mcc') + self.assertEqual(r['value'], '202') class TestCtrlNITB(TestCtrlBase): @@ -475,103 +475,103 @@ def testNumberOfBTS(self): r = self.do_get('number-of-bts') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'number-of-bts') - self.assertEquals(r['value'], '1') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'number-of-bts') + self.assertEqual(r['value'], '1') def testSubscriberAddWithKi(self): """Test that we can set the algorithm to none, xor, comp128v1""" r = self.do_set('subscriber-modify-v1', '2620345,445566') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'subscriber-modify-v1') - self.assertEquals(r['value'], 'OK') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'subscriber-modify-v1') + self.assertEqual(r['value'], 'OK') r = self.do_set('subscriber-modify-v1', '2620345,445566,none') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'subscriber-modify-v1') - self.assertEquals(r['value'], 'OK') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'subscriber-modify-v1') + self.assertEqual(r['value'], 'OK') r = self.do_set('subscriber-modify-v1', '2620345,445566,xor') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Value failed verification.') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Value failed verification.') r = self.do_set('subscriber-modify-v1', '2620345,445566,comp128v1,00112233445566778899AABBCCDDEEFF') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'subscriber-modify-v1') - self.assertEquals(r['value'], 'OK') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'subscriber-modify-v1') + self.assertEqual(r['value'], 'OK') r = self.do_set('subscriber-modify-v1', '2620345,445566,comp128v2,00112233445566778899AABBCCDDEEFF') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'subscriber-modify-v1') - self.assertEquals(r['value'], 'OK') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'subscriber-modify-v1') + self.assertEqual(r['value'], 'OK') r = self.do_set('subscriber-modify-v1', '2620345,445566,comp128v3,00112233445566778899AABBCCDDEEFF') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'subscriber-modify-v1') - self.assertEquals(r['value'], 'OK') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'subscriber-modify-v1') + self.assertEqual(r['value'], 'OK') r = self.do_set('subscriber-modify-v1', '2620345,445566,none') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'subscriber-modify-v1') - self.assertEquals(r['value'], 'OK') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'subscriber-modify-v1') + self.assertEqual(r['value'], 'OK') def testSubscriberAddRemove(self): r = self.do_set('subscriber-modify-v1', '2620345,445566') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'subscriber-modify-v1') - self.assertEquals(r['value'], 'OK') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'subscriber-modify-v1') + self.assertEqual(r['value'], 'OK') r = self.do_set('subscriber-modify-v1', '2620345,445567') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'subscriber-modify-v1') - self.assertEquals(r['value'], 'OK') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'subscriber-modify-v1') + self.assertEqual(r['value'], 'OK') # TODO. verify that the entry has been created and modified? Invoke # the sqlite3 CLI or do it through the DB libraries? r = self.do_set('subscriber-delete-v1', '2620345') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['value'], 'Removed') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['value'], 'Removed') r = self.do_set('subscriber-delete-v1', '2620345') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Failed to find subscriber') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Failed to find subscriber') def testSubscriberList(self): # TODO. Add command to mark a subscriber as active r = self.do_get('subscriber-list-active-v1') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'subscriber-list-active-v1') - self.assertEquals(r['value'], None) + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'subscriber-list-active-v1') + self.assertEqual(r['value'], None) def testApplyConfiguration(self): r = self.do_get('bts.0.apply-configuration') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Write Only attribute') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Write Only attribute') r = self.do_set('bts.0.apply-configuration', '1') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['value'], 'Tried to drop the BTS') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['value'], 'Tried to drop the BTS') def testGprsMode(self): r = self.do_get('bts.0.gprs-mode') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.gprs-mode') - self.assertEquals(r['value'], 'none') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.gprs-mode') + self.assertEqual(r['value'], 'none') r = self.do_set('bts.0.gprs-mode', 'bla') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Mode is not known') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Mode is not known') r = self.do_set('bts.0.gprs-mode', 'egprs') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['value'], 'egprs') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['value'], 'egprs') r = self.do_get('bts.0.gprs-mode') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.gprs-mode') - self.assertEquals(r['value'], 'egprs') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.gprs-mode') + self.assertEqual(r['value'], 'egprs') class TestCtrlNAT(TestCtrlBase): @@ -584,38 +584,38 @@ def testAccessList(self): r = self.do_get('net.0.bsc_cfg.0.access-list-name') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'net') - self.assertEquals(r['value'], None) + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'net') + self.assertEqual(r['value'], None) r = self.do_set('net.0.bsc_cfg.0.access-list-name', 'bla') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'net') - self.assertEquals(r['value'], 'bla') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'net') + self.assertEqual(r['value'], 'bla') r = self.do_get('net.0.bsc_cfg.0.access-list-name') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'net') - self.assertEquals(r['value'], 'bla') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'net') + self.assertEqual(r['value'], 'bla') r = self.do_set('net.0.bsc_cfg.0.no-access-list-name', '1') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'net') - self.assertEquals(r['value'], None) + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'net') + self.assertEqual(r['value'], None) r = self.do_get('net.0.bsc_cfg.0.access-list-name') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'net') - self.assertEquals(r['value'], None) + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'net') + self.assertEqual(r['value'], None) def testAccessListManagement(self): r = self.do_set("net.0.add.allow.access-list.404", "abc") - self.assertEquals(r['mtype'], 'ERROR') + self.assertEqual(r['mtype'], 'ERROR') r = self.do_set("net.0.add.allow.access-list.bla", "^234$") - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'net.0.add.allow.access-list.bla') - self.assertEquals(r['value'], 'IMSI allow added to access list') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'net.0.add.allow.access-list.bla') + self.assertEqual(r['value'], 'IMSI allow added to access list') # TODO.. find a way to actually see if this rule has been # added. e.g. by implementing a get for the list. @@ -664,9 +664,9 @@ if args.p: confpath = args.p - print "confpath %s, workdir %s" % (confpath, workdir) + print("confpath %s, workdir %s" % (confpath, workdir)) os.chdir(workdir) - print "Running tests for specific control commands" + print("Running tests for specific control commands") suite = unittest.TestSuite() add_bsc_test(suite, workdir) add_nitb_test(suite, workdir) diff --git a/openbsc/tests/smpp_test_runner.py b/openbsc/tests/smpp_test_runner.py index eccfa6b..343ae7b 100755 --- a/openbsc/tests/smpp_test_runner.py +++ b/openbsc/tests/smpp_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # (C) 2014 by Holger Hans Peter Freyther # based on vty_test_runner.py: @@ -46,8 +46,8 @@ try: self.proc = osmoutil.popen_devnull(osmo_vty_cmd) except OSError: - print >> sys.stderr, "Current directory: %s" % os.getcwd() - print >> sys.stderr, "Consider setting -b" + print("Current directory: %s" % os.getcwd(), file=sys.stderr) + print("Consider setting -b", file=sys.stderr) appstring = self.vty_app()[2] appport = self.vty_app()[0] @@ -73,14 +73,14 @@ # Enable the configuration self.vty.enable() self.assertTrue(self.vty.verify("configure terminal", [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('smpp', [''])) - self.assertEquals(self.vty.node(), 'config-smpp') + self.assertEqual(self.vty.node(), 'config-smpp') self.assertTrue(self.vty.verify('system-id test', [''])) self.assertTrue(self.vty.verify('local-tcp-port 2775', [''])) self.assertTrue(self.vty.verify('esme test', [''])) - self.assertEquals(self.vty.node(), 'config-smpp-esme') + self.assertEqual(self.vty.node(), 'config-smpp-esme') self.assertTrue(self.vty.verify('default-route', [''])) self.assertTrue(self.vty.verify('end', [''])) @@ -128,9 +128,9 @@ if args.p: confpath = args.p - print "confpath %s, workdir %s" % (confpath, workdir) + print("confpath %s, workdir %s" % (confpath, workdir)) os.chdir(workdir) - print "Running tests for specific SMPP" + print("Running tests for specific SMPP") suite = unittest.TestSuite() suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestSMPPNITB)) res = unittest.TextTestRunner(verbosity=verbose_level).run(suite) diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py index 67adb71..8044e61 100755 --- a/openbsc/tests/vty_test_runner.py +++ b/openbsc/tests/vty_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # (C) 2013 by Holger Hans Peter Freyther @@ -51,8 +51,8 @@ try: self.proc = osmoutil.popen_devnull(osmo_vty_cmd) except OSError: - print >> sys.stderr, "Current directory: %s" % os.getcwd() - print >> sys.stderr, "Consider setting -b" + print("Current directory: %s" % os.getcwd(), file=sys.stderr) + print("Consider setting -b", file=sys.stderr) appstring = self.vty_app()[2] appport = self.vty_app()[0] @@ -75,28 +75,28 @@ def testForcePtime(self): self.vty.enable() res = self.vty.command("show running-config") - self.assert_(res.find(' rtp force-ptime 20\r') > 0) - self.assertEquals(res.find(' no rtp force-ptime\r'), -1) + self.assertTrue(res.find(' rtp force-ptime 20\r') > 0) + self.assertEqual(res.find(' no rtp force-ptime\r'), -1) self.vty.command("configure terminal") self.vty.command("mgcp") self.vty.command("no rtp force-ptime") res = self.vty.command("show running-config") - self.assertEquals(res.find(' rtp force-ptime 20\r'), -1) - self.assertEquals(res.find(' no rtp force-ptime\r'), -1) + self.assertEqual(res.find(' rtp force-ptime 20\r'), -1) + self.assertEqual(res.find(' no rtp force-ptime\r'), -1) def testOmitAudio(self): self.vty.enable() res = self.vty.command("show running-config") - self.assert_(res.find(' sdp audio-payload send-name\r') > 0) - self.assertEquals(res.find(' no sdp audio-payload send-name\r'), -1) + self.assertTrue(res.find(' sdp audio-payload send-name\r') > 0) + self.assertEqual(res.find(' no sdp audio-payload send-name\r'), -1) self.vty.command("configure terminal") self.vty.command("mgcp") self.vty.command("no sdp audio-payload send-name") res = self.vty.command("show running-config") - self.assertEquals(res.find(' rtp sdp audio-payload send-name\r'), -1) - self.assert_(res.find(' no sdp audio-payload send-name\r') > 0) + self.assertEqual(res.find(' rtp sdp audio-payload send-name\r'), -1) + self.assertTrue(res.find(' no sdp audio-payload send-name\r') > 0) # TODO: test it for the trunk! @@ -109,18 +109,18 @@ # enable.. disable bts-bind-ip self.vty.command("rtp bts-bind-ip 254.253.252.250") res = self.vty.command("show running-config") - self.assert_(res.find('rtp bts-bind-ip 254.253.252.250') > 0) + self.assertTrue(res.find('rtp bts-bind-ip 254.253.252.250') > 0) self.vty.command("no rtp bts-bind-ip") res = self.vty.command("show running-config") - self.assertEquals(res.find(' rtp bts-bind-ip'), -1) + self.assertEqual(res.find(' rtp bts-bind-ip'), -1) # enable.. disable net-bind-ip self.vty.command("rtp net-bind-ip 254.253.252.250") res = self.vty.command("show running-config") - self.assert_(res.find('rtp net-bind-ip 254.253.252.250') > 0) + self.assertTrue(res.find('rtp net-bind-ip 254.253.252.250') > 0) self.vty.command("no rtp net-bind-ip") res = self.vty.command("show running-config") - self.assertEquals(res.find(' rtp net-bind-ip'), -1) + self.assertEqual(res.find(' rtp net-bind-ip'), -1) class TestVTYGenericBSC(TestVTYBase): @@ -128,42 +128,42 @@ def checkForEndAndExit(self): res = self.vty.command("list") #print ('looking for "exit"\n') - self.assert_(res.find(' exit\r') > 0) + self.assertTrue(res.find(' exit\r') > 0) #print 'found "exit"\nlooking for "end"\n' - self.assert_(res.find(' end\r') > 0) + self.assertTrue(res.find(' end\r') > 0) #print 'found "end"\n' def _testConfigNetworkTree(self): self.vty.enable() self.assertTrue(self.vty.verify("configure terminal",[''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.checkForEndAndExit() self.assertTrue(self.vty.verify("network",[''])) - self.assertEquals(self.vty.node(), 'config-net') + self.assertEqual(self.vty.node(), 'config-net') self.checkForEndAndExit() self.assertTrue(self.vty.verify("bts 0",[''])) - self.assertEquals(self.vty.node(), 'config-net-bts') + self.assertEqual(self.vty.node(), 'config-net-bts') self.checkForEndAndExit() self.assertTrue(self.vty.verify("trx 0",[''])) - self.assertEquals(self.vty.node(), 'config-net-bts-trx') + self.assertEqual(self.vty.node(), 'config-net-bts-trx') self.checkForEndAndExit() self.vty.command("write terminal") self.assertTrue(self.vty.verify("exit",[''])) - self.assertEquals(self.vty.node(), 'config-net-bts') + self.assertEqual(self.vty.node(), 'config-net-bts') self.assertTrue(self.vty.verify("exit",[''])) self.assertTrue(self.vty.verify("bts 1",[''])) - self.assertEquals(self.vty.node(), 'config-net-bts') + self.assertEqual(self.vty.node(), 'config-net-bts') self.checkForEndAndExit() self.assertTrue(self.vty.verify("trx 1",[''])) - self.assertEquals(self.vty.node(), 'config-net-bts-trx') + self.assertEqual(self.vty.node(), 'config-net-bts-trx') self.checkForEndAndExit() self.vty.command("write terminal") self.assertTrue(self.vty.verify("exit",[''])) - self.assertEquals(self.vty.node(), 'config-net-bts') + self.assertEqual(self.vty.node(), 'config-net-bts') self.assertTrue(self.vty.verify("exit",[''])) - self.assertEquals(self.vty.node(), 'config-net') + self.assertEqual(self.vty.node(), 'config-net') self.assertTrue(self.vty.verify("exit",[''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify("exit",[''])) self.assertTrue(self.vty.node() is None) @@ -196,35 +196,35 @@ # check the default res = self.vty.command("write terminal") - self.assert_(res.find(' no smpp-first') > 0) + self.assertTrue(res.find(' no smpp-first') > 0) self.vty.verify("smpp-first", ['']) res = self.vty.command("write terminal") - self.assert_(res.find(' smpp-first') > 0) - self.assertEquals(res.find('no smpp-first'), -1) + self.assertTrue(res.find(' smpp-first') > 0) + self.assertEqual(res.find('no smpp-first'), -1) self.vty.verify("no smpp-first", ['']) res = self.vty.command("write terminal") - self.assert_(res.find('no smpp-first') > 0) + self.assertTrue(res.find('no smpp-first') > 0) def testVtyTree(self): self.vty.enable() self.assertTrue(self.vty.verify("configure terminal", [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.checkForEndAndExit() self.assertTrue(self.vty.verify('mncc-int', [''])) - self.assertEquals(self.vty.node(), 'config-mncc-int') + self.assertEqual(self.vty.node(), 'config-mncc-int') self.checkForEndAndExit() self.assertTrue(self.vty.verify('exit', [''])) if self.checkForSmpp(): - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('smpp', [''])) - self.assertEquals(self.vty.node(), 'config-smpp') + self.assertEqual(self.vty.node(), 'config-smpp') self.checkForEndAndExit() self.assertTrue(self.vty.verify("exit", [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify("exit", [''])) self.assertTrue(self.vty.node() is None) @@ -234,10 +234,10 @@ if self.checkForSmpp(): self.vty.command('smpp') - self.assertEquals(self.vty.node(), 'config-smpp') + self.assertEqual(self.vty.node(), 'config-smpp') self.vty.command('mncc-int') - self.assertEquals(self.vty.node(), 'config-mncc-int') + self.assertEqual(self.vty.node(), 'config-mncc-int') def testVtyAuthorization(self): self.vty.enable() @@ -267,7 +267,7 @@ self.vty.command("si2quater neighbor-list del earfcn 1911") self.vty.command("si2quater neighbor-list del earfcn 1924") self.vty.command("si2quater neighbor-list del earfcn 2111") - self.assertEquals(before, self.vty.command("show running-config")) + self.assertEqual(before, self.vty.command("show running-config")) self.vty.command("si2quater neighbor-list add uarfcn 1976 13 1") self.vty.command("si2quater neighbor-list add uarfcn 1976 38 1") self.vty.command("si2quater neighbor-list add uarfcn 1976 44 1") @@ -290,7 +290,7 @@ self.vty.command("si2quater neighbor-list del uarfcn 1976 224") self.vty.command("si2quater neighbor-list del uarfcn 1976 225") self.vty.command("si2quater neighbor-list del uarfcn 1976 226") - self.assertEquals(before, self.vty.command("show running-config")) + self.assertEqual(before, self.vty.command("show running-config")) def testEnableDisablePeriodicLU(self): self.vty.enable() @@ -306,14 +306,14 @@ # Enable periodic lu.. self.vty.verify("periodic location update 60", ['']) res = self.vty.command("write terminal") - self.assert_(res.find('periodic location update 60') > 0) - self.assertEquals(res.find('no periodic location update'), -1) + self.assertTrue(res.find('periodic location update 60') > 0) + self.assertEqual(res.find('no periodic location update'), -1) # Now disable it.. self.vty.verify("no periodic location update", ['']) res = self.vty.command("write terminal") - self.assertEquals(res.find('periodic location update 60'), -1) - self.assert_(res.find('no periodic location update') > 0) + self.assertEqual(res.find('periodic location update 60'), -1) + self.assertTrue(res.find('no periodic location update') > 0) def testEnableDisableSiHacks(self): self.vty.enable() @@ -324,14 +324,14 @@ # Enable periodic lu.. self.vty.verify("force-combined-si", ['']) res = self.vty.command("write terminal") - self.assert_(res.find(' force-combined-si') > 0) - self.assertEquals(res.find('no force-combined-si'), -1) + self.assertTrue(res.find(' force-combined-si') > 0) + self.assertEqual(res.find('no force-combined-si'), -1) # Now disable it.. self.vty.verify("no force-combined-si", ['']) res = self.vty.command("write terminal") - self.assertEquals(res.find(' force-combined-si'), -1) - self.assert_(res.find('no force-combined-si') > 0) + self.assertEqual(res.find(' force-combined-si'), -1) + self.assertTrue(res.find('no force-combined-si') > 0) def testRachAccessControlClass(self): self.vty.enable() @@ -355,7 +355,7 @@ res = self.vty.command("write terminal") for classNum in range(16): if classNum != 10: - self.assert_(res.find("rach access-control-class " + str(classNum) + " barred") > 0) + self.assertTrue(res.find("rach access-control-class " + str(classNum) + " barred") > 0) # Allowed rach access control classes for classNum in range(16): @@ -366,7 +366,7 @@ res = self.vty.command("write terminal") for classNum in range(16): if classNum != 10: - self.assertEquals(res.find("rach access-control-class " + str(classNum) + " barred"), -1) + self.assertEqual(res.find("rach access-control-class " + str(classNum) + " barred"), -1) def testSubscriberCreateDeleteTwice(self): """ @@ -385,23 +385,23 @@ # Lets create one res = self.vty.command('subscriber create imsi '+imsi) - self.assert_(res.find(" IMSI: "+imsi) > 0) + self.assertTrue(res.find(" IMSI: "+imsi) > 0) # And now create one again. res2 = self.vty.command('subscriber create imsi '+imsi) - self.assert_(res2.find(" IMSI: "+imsi) > 0) + self.assertTrue(res2.find(" IMSI: "+imsi) > 0) self.assertEqual(res, res2) # Verify it has been created res = self.vty.command('show subscriber imsi '+imsi) - self.assert_(res.find(" IMSI: "+imsi) > 0) + self.assertTrue(res.find(" IMSI: "+imsi) > 0) # Delete it res = self.vty.command('subscriber imsi ' + imsi + ' delete') - self.assert_("" == res) + self.assertTrue("" == res) # Now it should not be there anymore res = self.vty.command('show subscriber imsi '+imsi) - self.assert_(('% No subscriber found for imsi ' + imsi) == res) + self.assertTrue(('% No subscriber found for imsi ' + imsi) == res) def testSubscriberCreateDelete(self): @@ -417,12 +417,12 @@ # Lets create one res = self.vty.command('subscriber create imsi '+imsi) - self.assert_(res.find(" IMSI: "+imsi) > 0) - self.assert_(res.find("Extension") > 0) + self.assertTrue(res.find(" IMSI: "+imsi) > 0) + self.assertTrue(res.find("Extension") > 0) # Now we have it res = self.vty.command('show subscriber imsi '+imsi) - self.assert_(res.find(" IMSI: "+imsi) > 0) + self.assertTrue(res.find(" IMSI: "+imsi) > 0) # With narrow random interval self.vty.command("configure terminal") @@ -431,16 +431,16 @@ # wrong interval res = self.vty.command("subscriber-create-on-demand random 221 122") # error string will contain arguments - self.assert_(res.find("122") > 0) - self.assert_(res.find("221") > 0) + self.assertTrue(res.find("122") > 0) + self.assertTrue(res.find("221") > 0) # correct interval - silent ok self.assertTrue(self.vty.verify("subscriber-create-on-demand random 221 222", [''])) self.vty.command("end") res = self.vty.command('subscriber create imsi ' + imsi2) - self.assert_(res.find(" IMSI: " + imsi2) > 0) - self.assert_(res.find("221") > 0 or res.find("222") > 0) - self.assert_(res.find(" Extension: ") > 0) + self.assertTrue(res.find(" IMSI: " + imsi2) > 0) + self.assertTrue(res.find("221") > 0 or res.find("222") > 0) + self.assertTrue(res.find(" Extension: ") > 0) # Without extension self.vty.command("configure terminal") @@ -448,8 +448,8 @@ self.assertTrue(self.vty.verify("subscriber-create-on-demand no-extension", [''])) self.vty.command("end") res = self.vty.command('subscriber create imsi ' + imsi3) - self.assert_(res.find(" IMSI: " + imsi3) > 0) - self.assertEquals(res.find("Extension"), -1) + self.assertTrue(res.find(" IMSI: " + imsi3) > 0) + self.assertEqual(res.find("Extension"), -1) # With extension again self.vty.command("configure terminal") @@ -460,22 +460,22 @@ self.vty.command("end") res = self.vty.command('subscriber create imsi ' + imsi4) - self.assert_(res.find(" IMSI: " + imsi4) > 0) - self.assert_(res.find(" Extension: ") > 0) + self.assertTrue(res.find(" IMSI: " + imsi4) > 0) + self.assertTrue(res.find(" Extension: ") > 0) # Delete it res = self.vty.command('subscriber imsi ' + imsi + ' delete') - self.assert_("" == res) + self.assertTrue("" == res) res = self.vty.command('subscriber imsi ' + imsi2 + ' delete') - self.assert_("" == res) + self.assertTrue("" == res) res = self.vty.command('subscriber imsi ' + imsi3 + ' delete') - self.assert_("" == res) + self.assertTrue("" == res) res = self.vty.command('subscriber imsi ' + imsi4 + ' delete') - self.assert_("" == res) + self.assertTrue("" == res) # Now it should not be there anymore res = self.vty.command('show subscriber imsi '+imsi) - self.assert_(('% No subscriber found for imsi ' + imsi) == res) + self.assertTrue(('% No subscriber found for imsi ' + imsi) == res) # range self.vty.command("end") @@ -483,20 +483,20 @@ self.vty.command("nitb") self.assertTrue(self.vty.verify("subscriber-create-on-demand random 9999999998 9999999999", [''])) res = self.vty.command("show running-config") - self.assert_(res.find("subscriber-create-on-demand random 9999999998 9999999999")) + self.assertTrue(res.find("subscriber-create-on-demand random 9999999998 9999999999")) self.vty.command("end") res = self.vty.command('subscriber create imsi ' + imsi) print(res) - self.assert_(res.find(" IMSI: " + imsi) > 0) - self.assert_(res.find("9999999998") > 0 or res.find("9999999999") > 0) - self.assert_(res.find(" Extension: ") > 0) + self.assertTrue(res.find(" IMSI: " + imsi) > 0) + self.assertTrue(res.find("9999999998") > 0 or res.find("9999999999") > 0) + self.assertTrue(res.find(" Extension: ") > 0) res = self.vty.command('subscriber imsi ' + imsi + ' delete') - self.assert_("" == res) + self.assertTrue("" == res) res = self.vty.command('show subscriber imsi '+imsi) - self.assert_(('% No subscriber found for imsi ' + imsi) == res) + self.assertTrue(('% No subscriber found for imsi ' + imsi) == res) def testSubscriberSettings(self): @@ -508,18 +508,18 @@ # Lets create one res = self.vty.command('subscriber create imsi '+imsi) - self.assert_(res.find(" IMSI: "+imsi) > 0) - self.assert_(res.find("Extension") > 0) + self.assertTrue(res.find(" IMSI: "+imsi) > 0) + self.assertTrue(res.find("Extension") > 0) self.vty.verify('subscriber imsi '+wrong_imsi+' name wrong', ['% No subscriber found for imsi '+wrong_imsi]) res = self.vty.command('subscriber imsi '+imsi+' name '+('X' * 160)) - self.assert_(res.find("NAME is too long") > 0) + self.assertTrue(res.find("NAME is too long") > 0) self.vty.verify('subscriber imsi '+imsi+' name '+('G' * 159), ['']) self.vty.verify('subscriber imsi '+wrong_imsi+' extension 840', ['% No subscriber found for imsi '+wrong_imsi]) res = self.vty.command('subscriber imsi '+imsi+' extension '+('9' * 15)) - self.assert_(res.find("EXTENSION is too long") > 0) + self.assertTrue(res.find("EXTENSION is too long") > 0) self.vty.verify('subscriber imsi '+imsi+' extension '+('1' * 14), ['']) @@ -529,34 +529,34 @@ self.assertTrue(self.vty.verify("subscriber-create-on-demand", [''])) # wrong interval res = self.vty.command("subscriber-create-on-demand random 221 122") - self.assert_(res.find("122") > 0) - self.assert_(res.find("221") > 0) + self.assertTrue(res.find("122") > 0) + self.assertTrue(res.find("221") > 0) # correct interval self.assertTrue(self.vty.verify("subscriber-create-on-demand random 221 222", [''])) self.vty.command("end") # create subscriber with extension in a configured interval res = self.vty.command('subscriber create imsi ' + imsi2) - self.assert_(res.find(" IMSI: " + imsi2) > 0) - self.assert_(res.find("221") > 0 or res.find("222") > 0) - self.assert_(res.find(" Extension: ") > 0) + self.assertTrue(res.find(" IMSI: " + imsi2) > 0) + self.assertTrue(res.find("221") > 0 or res.find("222") > 0) + self.assertTrue(res.find(" Extension: ") > 0) # Delete it res = self.vty.command('subscriber imsi ' + imsi + ' delete') - self.assert_(res != "") + self.assertTrue(res != "") # imsi2 is inactive so deletion should succeed res = self.vty.command('subscriber imsi ' + imsi2 + ' delete') - self.assert_("" == res) + self.assertTrue("" == res) def testShowPagingGroup(self): res = self.vty.command("show paging-group 255 1234567") self.assertEqual(res, "% can't find BTS 255") res = self.vty.command("show paging-group 0 1234567") - self.assertEquals(res, "%Paging group for IMSI 1234567 on BTS #0 is 7") + self.assertEqual(res, "%Paging group for IMSI 1234567 on BTS #0 is 7") def testShowNetwork(self): res = self.vty.command("show network") - self.assert_(res.startswith('BSC is on Country Code') >= 0) + self.assertTrue(res.startswith('BSC is on Country Code') >= 0) def testMeasurementFeed(self): self.vty.enable() @@ -564,17 +564,17 @@ self.vty.command("mncc-int") res = self.vty.command("write terminal") - self.assertEquals(res.find('meas-feed scenario'), -1) + self.assertEqual(res.find('meas-feed scenario'), -1) self.vty.command("meas-feed scenario bla") res = self.vty.command("write terminal") - self.assert_(res.find('meas-feed scenario bla') > 0) + self.assertTrue(res.find('meas-feed scenario bla') > 0) self.vty.command("meas-feed scenario abcdefghijklmnopqrstuvwxyz01234567890") res = self.vty.command("write terminal") - self.assertEquals(res.find('meas-feed scenario abcdefghijklmnopqrstuvwxyz01234567890'), -1) - self.assertEquals(res.find('meas-feed scenario abcdefghijklmnopqrstuvwxyz012345'), -1) - self.assert_(res.find('meas-feed scenario abcdefghijklmnopqrstuvwxyz01234') > 0) + self.assertEqual(res.find('meas-feed scenario abcdefghijklmnopqrstuvwxyz01234567890'), -1) + self.assertEqual(res.find('meas-feed scenario abcdefghijklmnopqrstuvwxyz012345'), -1) + self.assertTrue(res.find('meas-feed scenario abcdefghijklmnopqrstuvwxyz01234') > 0) class TestVTYBSC(TestVTYGenericBSC): @@ -592,18 +592,18 @@ def testVtyTree(self): self.vty.enable() self.assertTrue(self.vty.verify("configure terminal", [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.checkForEndAndExit() self.assertTrue(self.vty.verify("msc 0", [''])) - self.assertEquals(self.vty.node(), 'config-msc') + self.assertEqual(self.vty.node(), 'config-msc') self.checkForEndAndExit() self.assertTrue(self.vty.verify("exit", [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify("bsc", [''])) - self.assertEquals(self.vty.node(), 'config-bsc') + self.assertEqual(self.vty.node(), 'config-bsc') self.checkForEndAndExit() self.assertTrue(self.vty.verify("exit", [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify("exit", [''])) self.assertTrue(self.vty.node() is None) @@ -624,12 +624,12 @@ # Verify settings res = self.vty.command("write terminal") - self.assert_(res.find('bsc-msc-lost-text MSC disconnected') > 0) - self.assertEquals(res.find('no bsc-msc-lost-text'), -1) - self.assert_(res.find('bsc-welcome-text Hello MS') > 0) - self.assertEquals(res.find('no bsc-welcome-text'), -1) - self.assert_(res.find('bsc-grace-text In grace period') > 0) - self.assertEquals(res.find('no bsc-grace-text'), -1) + self.assertTrue(res.find('bsc-msc-lost-text MSC disconnected') > 0) + self.assertEqual(res.find('no bsc-msc-lost-text'), -1) + self.assertTrue(res.find('bsc-welcome-text Hello MS') > 0) + self.assertEqual(res.find('no bsc-welcome-text'), -1) + self.assertTrue(res.find('bsc-grace-text In grace period') > 0) + self.assertEqual(res.find('no bsc-grace-text'), -1) # Now disable it.. self.vty.verify("no bsc-msc-lost-text", ['']) @@ -638,12 +638,12 @@ # Verify settings res = self.vty.command("write terminal") - self.assertEquals(res.find('bsc-msc-lost-text MSC disconnected'), -1) - self.assert_(res.find('no bsc-msc-lost-text') > 0) - self.assertEquals(res.find('bsc-welcome-text Hello MS'), -1) - self.assert_(res.find('no bsc-welcome-text') > 0) - self.assertEquals(res.find('bsc-grace-text In grace period'), -1) - self.assert_(res.find('no bsc-grace-text') > 0) + self.assertEqual(res.find('bsc-msc-lost-text MSC disconnected'), -1) + self.assertTrue(res.find('no bsc-msc-lost-text') > 0) + self.assertEqual(res.find('bsc-welcome-text Hello MS'), -1) + self.assertTrue(res.find('no bsc-welcome-text') > 0) + self.assertEqual(res.find('bsc-grace-text In grace period'), -1) + self.assertTrue(res.find('no bsc-grace-text') > 0) def testUssdNotificationsBsc(self): self.vty.enable() @@ -658,16 +658,16 @@ # Verify settings res = self.vty.command("write terminal") - self.assert_(res.find('missing-msc-text No MSC found') > 0) - self.assertEquals(res.find('no missing-msc-text'), -1) + self.assertTrue(res.find('missing-msc-text No MSC found') > 0) + self.assertEqual(res.find('no missing-msc-text'), -1) # Now disable it.. self.vty.verify("no missing-msc-text", ['']) # Verify settings res = self.vty.command("write terminal") - self.assertEquals(res.find('missing-msc-text No MSC found'), -1) - self.assert_(res.find('no missing-msc-text') > 0) + self.assertEqual(res.find('missing-msc-text No MSC found'), -1) + self.assertTrue(res.find('no missing-msc-text') > 0) def testNetworkTimezone(self): self.vty.enable() @@ -685,26 +685,26 @@ # Verify settings res = self.vty.command("write terminal") - self.assert_(res.find('timezone 2 30') > 0) - self.assertEquals(res.find('timezone 2 30 '), -1) + self.assertTrue(res.find('timezone 2 30') > 0) + self.assertEqual(res.find('timezone 2 30 '), -1) # Set time zone with DST self.vty.verify("timezone 2 30 1", ['']) # Verify settings res = self.vty.command("write terminal") - self.assert_(res.find('timezone 2 30 1') > 0) + self.assertTrue(res.find('timezone 2 30 1') > 0) # Now disable it.. self.vty.verify("no timezone", ['']) # Verify settings res = self.vty.command("write terminal") - self.assertEquals(res.find(' timezone'), -1) + self.assertEqual(res.find(' timezone'), -1) def testShowNetwork(self): res = self.vty.command("show network") - self.assert_(res.startswith('BSC is on Country Code') >= 0) + self.assertTrue(res.startswith('BSC is on Country Code') >= 0) def testPingPongConfiguration(self): self.vty.enable() @@ -714,28 +714,28 @@ self.vty.verify("timeout-ping 12", ['']) self.vty.verify("timeout-pong 14", ['']) res = self.vty.command("show running-config") - self.assert_(res.find(" timeout-ping 12") > 0) - self.assert_(res.find(" timeout-pong 14") > 0) - self.assert_(res.find(" no timeout-ping advanced") > 0) + self.assertTrue(res.find(" timeout-ping 12") > 0) + self.assertTrue(res.find(" timeout-pong 14") > 0) + self.assertTrue(res.find(" no timeout-ping advanced") > 0) self.vty.verify("timeout-ping advanced", ['']) res = self.vty.command("show running-config") - self.assert_(res.find(" timeout-ping 12") > 0) - self.assert_(res.find(" timeout-pong 14") > 0) - self.assert_(res.find(" timeout-ping advanced") > 0) + self.assertTrue(res.find(" timeout-ping 12") > 0) + self.assertTrue(res.find(" timeout-pong 14") > 0) + self.assertTrue(res.find(" timeout-ping advanced") > 0) self.vty.verify("no timeout-ping advanced", ['']) res = self.vty.command("show running-config") - self.assert_(res.find(" timeout-ping 12") > 0) - self.assert_(res.find(" timeout-pong 14") > 0) - self.assert_(res.find(" no timeout-ping advanced") > 0) + self.assertTrue(res.find(" timeout-ping 12") > 0) + self.assertTrue(res.find(" timeout-pong 14") > 0) + self.assertTrue(res.find(" no timeout-ping advanced") > 0) self.vty.verify("no timeout-ping", ['']) res = self.vty.command("show running-config") - self.assertEquals(res.find(" timeout-ping 12"), -1) - self.assertEquals(res.find(" timeout-pong 14"), -1) - self.assertEquals(res.find(" no timeout-ping advanced"), -1) - self.assert_(res.find(" no timeout-ping") > 0) + self.assertEqual(res.find(" timeout-ping 12"), -1) + self.assertEqual(res.find(" timeout-pong 14"), -1) + self.assertEqual(res.find(" no timeout-ping advanced"), -1) + self.assertTrue(res.find(" no timeout-ping") > 0) self.vty.verify("timeout-ping advanced", ['%ping handling is disabled. Enable it first.']) @@ -743,15 +743,15 @@ self.vty.verify("timeout-ping 12", ['']) self.vty.verify("timeout-pong 14", ['']) res = self.vty.command("show running-config") - self.assert_(res.find(" timeout-ping 12") > 0) - self.assert_(res.find(" timeout-pong 14") > 0) - self.assert_(res.find(" timeout-ping advanced") > 0) + self.assertTrue(res.find(" timeout-ping 12") > 0) + self.assertTrue(res.find(" timeout-pong 14") > 0) + self.assertTrue(res.find(" timeout-ping advanced") > 0) def testMscDataCoreLACCI(self): self.vty.enable() res = self.vty.command("show running-config") - self.assertEquals(res.find("core-location-area-code"), -1) - self.assertEquals(res.find("core-cell-identity"), -1) + self.assertEqual(res.find("core-location-area-code"), -1) + self.assertEqual(res.find("core-cell-identity"), -1) self.vty.command("configure terminal") self.vty.command("msc 0") @@ -759,8 +759,8 @@ self.vty.command("core-cell-identity 333") res = self.vty.command("show running-config") - self.assert_(res.find("core-location-area-code 666") > 0) - self.assert_(res.find("core-cell-identity 333") > 0) + self.assertTrue(res.find("core-location-area-code 666") > 0) + self.assertTrue(res.find("core-cell-identity 333") > 0) class TestVTYNAT(TestVTYGenericBSC): @@ -781,7 +781,7 @@ nat_bsc_reload(self) bscs2 = self.vty.command("show bscs-config") # check that multiple calls to bscs-config-file give the same result - self.assertEquals(bscs1, bscs2) + self.assertEqual(bscs1, bscs2) # add new bsc self.vty.command("configure terminal") @@ -805,23 +805,23 @@ b1 = nat_bsc_sock_test(1, "xyu", verbose=True, proc=self.proc) b2 = nat_bsc_sock_test(5, "key", verbose=True, proc=self.proc) - self.assertEquals("3 BSCs configured", self.vty.command("show nat num-bscs-configured")) + self.assertEqual("3 BSCs configured", self.vty.command("show nat num-bscs-configured")) self.assertTrue(3 == nat_bsc_num_con(self)) - self.assertEquals("MSC is connected: 1", self.vty.command("show msc connection")) + self.assertEqual("MSC is connected: 1", self.vty.command("show msc connection")) nat_bsc_reload(self) bscs2 = self.vty.command("show bscs-config") # check that the reset to initial config succeeded - self.assertEquals(bscs1, bscs2) + self.assertEqual(bscs1, bscs2) - self.assertEquals("2 BSCs configured", self.vty.command("show nat num-bscs-configured")) + self.assertEqual("2 BSCs configured", self.vty.command("show nat num-bscs-configured")) self.assertTrue(1 == nat_bsc_num_con(self)) rem = self.vty.command("show bsc connections").split(' ') # remaining connection is for BSC0 - self.assertEquals('0', rem[2]) + self.assertEqual('0', rem[2]) # remaining connection is authorized - self.assertEquals('1', rem[4]) - self.assertEquals("MSC is connected: 1", self.vty.command("show msc connection")) + self.assertEqual('1', rem[4]) + self.assertEqual("MSC is connected: 1", self.vty.command("show msc connection")) finally: msc.close() msc_socket.close() @@ -829,23 +829,23 @@ def testVtyTree(self): self.vty.enable() self.assertTrue(self.vty.verify('configure terminal', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.checkForEndAndExit() self.assertTrue(self.vty.verify('mgcp', [''])) - self.assertEquals(self.vty.node(), 'config-mgcp') + self.assertEqual(self.vty.node(), 'config-mgcp') self.checkForEndAndExit() self.assertTrue(self.vty.verify('exit', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('nat', [''])) - self.assertEquals(self.vty.node(), 'config-nat') + self.assertEqual(self.vty.node(), 'config-nat') self.checkForEndAndExit() self.assertTrue(self.vty.verify('bsc 0', [''])) - self.assertEquals(self.vty.node(), 'config-nat-bsc') + self.assertEqual(self.vty.node(), 'config-nat-bsc') self.checkForEndAndExit() self.assertTrue(self.vty.verify('exit', [''])) - self.assertEquals(self.vty.node(), 'config-nat') + self.assertEqual(self.vty.node(), 'config-nat') self.assertTrue(self.vty.verify('exit', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('exit', [''])) self.assertTrue(self.vty.node() is None) @@ -863,15 +863,15 @@ # Ensure the default res = self.vty.command("show running-config") - self.assert_(res.find('\n sdp-ensure-amr-mode-set') > 0) + self.assertTrue(res.find('\n sdp-ensure-amr-mode-set') > 0) self.vty.command("sdp-ensure-amr-mode-set") res = self.vty.command("show running-config") - self.assert_(res.find('\n sdp-ensure-amr-mode-set') > 0) + self.assertTrue(res.find('\n sdp-ensure-amr-mode-set') > 0) self.vty.command("no sdp-ensure-amr-mode-set") res = self.vty.command("show running-config") - self.assert_(res.find('\n no sdp-ensure-amr-mode-set') > 0) + self.assertTrue(res.find('\n no sdp-ensure-amr-mode-set') > 0) def testRewritePostNoRewrite(self): self.vty.enable() @@ -916,35 +916,35 @@ ussdSocket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) ussdSocket.connect(('127.0.0.1', 5001)) ussdSocket.settimeout(2.0) - print "Connected to %s:%d" % ussdSocket.getpeername() + print("Connected to %s:%d" % ussdSocket.getpeername()) - print "Expecting ID_GET request" + print("Expecting ID_GET request") data = ussdSocket.recv(4) - self.assertEqual(data, "\x00\x01\xfe\x04") + self.assertEqual(data, b"\x00\x01\xfe\x04") - print "Going to send ID_RESP response" + print("Going to send ID_RESP response") res = ussdSocket.send(IPA().id_resp(IPA().tag_name('key'+'\0'))) self.assertEqual(res, 11) # initiating PING/PONG cycle to know, that the ID_RESP message has been processed - print "Going to send PING request" + print("Going to send PING request") res = ussdSocket.send(IPA().ping()) self.assertEqual(res, 4) - print "Expecting PONG response" + print("Expecting PONG response") data = ussdSocket.recv(4) - self.assertEqual(data, "\x00\x01\xfe\x01") + self.assertEqual(data, b"\x00\x01\xfe\x01") res = self.vty.verify("show ussd-connection", ['The USSD side channel provider is connected and authorized.']) self.assertTrue(res) - print "Going to shut down connection" + print("Going to shut down connection") ussdSocket.shutdown(socket.SHUT_WR) - print "Expecting EOF" + print("Expecting EOF") data = ussdSocket.recv(4) - self.assertEqual(data, "") + self.assertEqual(data, b"") ussdSocket.close() @@ -967,7 +967,7 @@ if line.startswith(" access-list test-default"): self.assertEqual(line, " access-list test-default imsi-deny ^123[0-9]*$ 11 11") asserted = True - self.assert_(asserted) + self.assertTrue(asserted) # Check the optional CM Service Reject Cause self.vty.command("access-list test-cm-deny imsi-deny ^123[0-9]*$ 42").split("\r\n") @@ -977,7 +977,7 @@ if line.startswith(" access-list test-cm"): self.assertEqual(line, " access-list test-cm-deny imsi-deny ^123[0-9]*$ 42 11") asserted = True - self.assert_(asserted) + self.assertTrue(asserted) # Check the optional LU Reject Cause self.vty.command("access-list test-lu-deny imsi-deny ^123[0-9]*$ 23 42").split("\r\n") @@ -987,7 +987,7 @@ if line.startswith(" access-list test-lu"): self.assertEqual(line, " access-list test-lu-deny imsi-deny ^123[0-9]*$ 23 42") asserted = True - self.assert_(asserted) + self.assertTrue(asserted) def add_nat_test(suite, workdir): if not os.path.isfile(os.path.join(workdir, "src/osmo-bsc_nat/osmo-bsc_nat")): @@ -1010,7 +1010,7 @@ x.vty.command("end") def data2str(d): - return d.encode('hex').lower() + return d.hex() def nat_msc_test(x, ip, port, verbose = False): msc = socket.socket(socket.AF_INET, socket.SOCK_STREAM) @@ -1019,11 +1019,11 @@ msc.bind((ip, port)) msc.listen(5) if (verbose): - print "MSC is ready at " + ip + print("MSC is ready at " + ip) conn = None while True: vty_response = x.vty.command("show msc connection") - print "'show msc connection' says: %r" % vty_response + print("'show msc connection' says: %r" % vty_response) if vty_response == "MSC is connected: 1": # success break; @@ -1035,10 +1035,10 @@ while timeout_retries > 0: try: conn, addr = msc.accept() - print "MSC got connection from ", addr + print("MSC got connection from ", addr) break except socket.timeout: - print "socket timed out." + print("socket timed out.") timeout_retries -= 1 continue @@ -1053,52 +1053,52 @@ raise Exception("expected to receive 4 bytes, but got %d (%r)" % (len(s)/2, s)) if "0001fe00" == s: if (verbose): - print "\tBSC <- NAT: PING?" + print("\tBSC <- NAT: PING?") x.send(IPA().pong()) elif "0001fe06" == s: if (verbose): - print "\tBSC <- NAT: IPA ID ACK" + print("\tBSC <- NAT: IPA ID ACK") x.send(IPA().id_ack()) elif "0001fe00" == s: if (verbose): - print "\tBSC <- NAT: PONG!" + print("\tBSC <- NAT: PONG!") else: if (verbose): - print "\tBSC <- NAT: ", s + print("\tBSC <- NAT: ", s) def ipa_handle_resp(x, tk, verbose = False, proc=None): s = data2str(x.recv(38)) if "0023fe040108010701020103010401050101010011" in s: retries = 3 while True: - print "\tsending IPA identity(%s) at %s" % (tk, time.strftime("%T")) + print("\tsending IPA identity(%s) at %s" % (tk, time.strftime("%T"))) try: x.send(IPA().id_resp(IPA().identity(name = (tk+'\0').encode('utf-8')))) - print "\tdone sending IPA identity(%s) at %s" % (tk, - time.strftime("%T")) + print("\tdone sending IPA identity(%s) at %s" % (tk, + time.strftime("%T"))) break except: - print "\tfailed sending IPA identity at", time.strftime("%T") + print("\tfailed sending IPA identity at", time.strftime("%T")) if proc: - print "\tproc.poll() = %r" % proc.poll() + print("\tproc.poll() = %r" % proc.poll()) if retries < 1: - print "\tgiving up" + print("\tgiving up") raise - print "\tretrying (%d attempts left)" % retries + print("\tretrying (%d attempts left)" % retries) retries -= 1 else: if (verbose): - print "\tBSC <- NAT: ", s + print("\tBSC <- NAT: ", s) def ipa_handle_mgcp(x, verbose = False): data = x.recv(3) s = data2str(data) if s[4:] != "fc": - print "expected IPA(MGCP) but received %r instead" % (s[4:]) + print("expected IPA(MGCP) but received %r instead" % (s[4:])) ipa_len, = struct.unpack('>H', data[:2]) mgcp_msg = x.recv(ipa_len) # MGCP msg if (verbose): - print "\tBSC <- NAT (MGCP[%d]): %s" % (ipa_len, mgcp_msg) + print("\tBSC <- NAT (MGCP[%d]): %s" % (ipa_len, mgcp_msg)) def nat_bsc_num_con(x): return len(x.vty.command("show bsc connections").split('\n')) @@ -1108,18 +1108,18 @@ bsc.bind(('127.0.0.1', 0)) bsc.connect(('127.0.0.1', 5000)) if (verbose): - print "BSC%d " %nr - print "\tconnected to %s:%d" % bsc.getpeername() + print("BSC%d " %nr) + print("\tconnected to %s:%d" % bsc.getpeername()) if proc: - print "\tproc.poll() = %r" % proc.poll() - print "\tproc.pid = %r" % proc.pid + print("\tproc.poll() = %r" % proc.poll()) + print("\tproc.pid = %r" % proc.pid) ipa_handle_small(bsc, verbose) ipa_handle_resp(bsc, tk, verbose, proc=proc) if proc: - print "\tproc.poll() = %r" % proc.poll() + print("\tproc.poll() = %r" % proc.poll()) ipa_handle_mgcp(bsc, verbose) if proc: - print "\tproc.poll() = %r" % proc.poll() + print("\tproc.poll() = %r" % proc.poll()) ipa_handle_small(bsc, verbose) return bsc @@ -1156,9 +1156,9 @@ if args.p: confpath = args.p - print "confpath %s, workdir %s" % (confpath, workdir) + print("confpath %s, workdir %s" % (confpath, workdir)) os.chdir(workdir) - print "Running tests for specific VTY commands" + print("Running tests for specific VTY commands") suite = unittest.TestSuite() suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestVTYMGCP)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestVTYNITB)) -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/16544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Id7d006f892198bb8a7c0d4a8a8ea00b8d0e62df4 Gerrit-Change-Number: 16544 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 11:10:51 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 11 Dec 2019 11:10:51 +0000 Subject: Change in osmo-bsc[master]: debian, osmoappdesc.py, tests: switch to python 3 References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16545 ) Change subject: debian, osmoappdesc.py, tests: switch to python 3 ...................................................................... debian, osmoappdesc.py, tests: switch to python 3 Make build and external tests work with python3, so we can drop the python2 dependency. This should be merged shortly after osmo-python-tests was migrated to python3, and the jenkins build slaves were (automatically) updated to have the new osmo-python-tests installed. Related: OS#2819 Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Change-Id: I438ca0c4b8e7957d0f347a5b2f5c4cb93f9325e6 --- M debian/control M osmoappdesc.py M tests/ctrl_test_runner.py M tests/vty_test_runner.py 4 files changed, 226 insertions(+), 226 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/45/16545/1 diff --git a/debian/control b/debian/control index a6b8c02..93b8a55 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ automake, libtool, pkg-config, - python-minimal, + python3-minimal, libcdk5-dev, libtalloc-dev, libosmocore-dev (>= 1.2.0), diff --git a/osmoappdesc.py b/osmoappdesc.py index f5f18b2..08c3252 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py index 4d87b74..e598273 100755 --- a/tests/ctrl_test_runner.py +++ b/tests/ctrl_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # (C) 2013 by Jacob Erlbeck # (C) 2014 by Holger Hans Peter Freyther @@ -53,8 +53,8 @@ try: self.proc = osmoutil.popen_devnull(osmo_ctrl_cmd) except OSError: - print >> sys.stderr, "Current directory: %s" % os.getcwd() - print >> sys.stderr, "Consider setting -b" + print("Current directory: %s" % os.getcwd(), file=sys.stderr) + print("Consider setting -b", file=sys.stderr) time.sleep(2) appstring = self.ctrl_app()[2] @@ -72,7 +72,7 @@ def connect(self, host, port): if verbose: - print "Connecting to host %s:%i" % (host, port) + print("Connecting to host %s:%i" % (host, port)) retries = 30 while True: @@ -92,7 +92,7 @@ def send(self, data): if verbose: - print "Sending \"%s\"" %(data) + print("Sending \"%s\"" %(data)) data = Ctrl().add_header(data) return self.sock.send(data) == len(data) @@ -121,9 +121,9 @@ data = self.sock.recv(4096) while (len(data)>0): (head, data) = IPA().split_combined(data) - answer = Ctrl().rem_header(head) + answer = Ctrl().rem_header(head).decode() if verbose: - print "Got message:", answer + print("Got message:", answer) (mtype, id, msg) = answer.split(None, 2) id = int(id) rsp = {'mtype': mtype, 'id': id} @@ -139,7 +139,7 @@ responses[id] = rsp if verbose: - print "Decoded replies: ", responses + print("Decoded replies: ", responses) return responses @@ -159,80 +159,80 @@ def testCtrlErrs(self): r = self.do_get('invalid') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Command not found') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Command not found') r = self.do_set('rf_locked', '999') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Value failed verification.') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Value failed verification.') r = self.do_get('bts') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Error while parsing the index.') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Error while parsing the index.') r = self.do_get('bts.999') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Error while resolving object') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Error while resolving object') def testBtsLac(self): r = self.do_get('bts.0.location-area-code') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.location-area-code') - self.assertEquals(r['value'], '1') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.location-area-code') + self.assertEqual(r['value'], '1') r = self.do_set('bts.0.location-area-code', '23') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'bts.0.location-area-code') - self.assertEquals(r['value'], '23') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'bts.0.location-area-code') + self.assertEqual(r['value'], '23') r = self.do_get('bts.0.location-area-code') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.location-area-code') - self.assertEquals(r['value'], '23') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.location-area-code') + self.assertEqual(r['value'], '23') r = self.do_set('bts.0.location-area-code', '-1') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Input not within the range') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Input not within the range') def testBtsCi(self): r = self.do_get('bts.0.cell-identity') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.cell-identity') - self.assertEquals(r['value'], '6969') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.cell-identity') + self.assertEqual(r['value'], '6969') r = self.do_set('bts.0.cell-identity', '23') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'bts.0.cell-identity') - self.assertEquals(r['value'], '23') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'bts.0.cell-identity') + self.assertEqual(r['value'], '23') r = self.do_get('bts.0.cell-identity') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.cell-identity') - self.assertEquals(r['value'], '23') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.cell-identity') + self.assertEqual(r['value'], '23') r = self.do_set('bts.0.cell-identity', '-1') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Input not within the range') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Input not within the range') def testBtsGenerateSystemInformation(self): r = self.do_get('bts.0.send-new-system-informations') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Write Only attribute') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Write Only attribute') # No RSL links so it will fail r = self.do_set('bts.0.send-new-system-informations', '1') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Failed to generate SI') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Failed to generate SI') def testBtsChannelLoad(self): r = self.do_set('bts.0.channel-load', '1') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Read Only attribute') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Read Only attribute') # No RSL link so everything is 0 r = self.do_get('bts.0.channel-load') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['value'], + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['value'], 'CCCH+SDCCH4,0,0 TCH/F,0,0 TCH/H,0,0 SDCCH8,0,0' + ' TCH/F_PDCH,0,0 CCCH+SDCCH4+CBCH,0,0' + ' SDCCH8+CBCH,0,0 TCH/F_TCH/H_PDCH,0,0') @@ -240,254 +240,254 @@ def testBtsOmlConnectionState(self): """Check OML state. It will not be connected""" r = self.do_set('bts.0.oml-connection-state', '1') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Read Only attribute') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Read Only attribute') # No RSL link so everything is 0 r = self.do_get('bts.0.oml-connection-state') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['value'], 'disconnected') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['value'], 'disconnected') def testTrxPowerRed(self): r = self.do_get('bts.0.trx.0.max-power-reduction') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.trx.0.max-power-reduction') - self.assertEquals(r['value'], '20') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.trx.0.max-power-reduction') + self.assertEqual(r['value'], '20') r = self.do_set('bts.0.trx.0.max-power-reduction', '22') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'bts.0.trx.0.max-power-reduction') - self.assertEquals(r['value'], '22') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'bts.0.trx.0.max-power-reduction') + self.assertEqual(r['value'], '22') r = self.do_get('bts.0.trx.0.max-power-reduction') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.trx.0.max-power-reduction') - self.assertEquals(r['value'], '22') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.trx.0.max-power-reduction') + self.assertEqual(r['value'], '22') r = self.do_set('bts.0.trx.0.max-power-reduction', '1') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Value must be even') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Value must be even') def testTrxArfcn(self): r = self.do_get('bts.0.trx.0.arfcn') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.trx.0.arfcn') - self.assertEquals(r['value'], '871') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.trx.0.arfcn') + self.assertEqual(r['value'], '871') r = self.do_set('bts.0.trx.0.arfcn', '873') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'bts.0.trx.0.arfcn') - self.assertEquals(r['value'], '873') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'bts.0.trx.0.arfcn') + self.assertEqual(r['value'], '873') r = self.do_get('bts.0.trx.0.arfcn') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.trx.0.arfcn') - self.assertEquals(r['value'], '873') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.trx.0.arfcn') + self.assertEqual(r['value'], '873') r = self.do_set('bts.0.trx.0.arfcn', '2000') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Input not within the range') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Input not within the range') def testRfLock(self): r = self.do_get('bts.0.rf_state') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.rf_state') - self.assertEquals(r['value'], 'inoperational,unlocked,on') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.rf_state') + self.assertEqual(r['value'], 'inoperational,unlocked,on') r = self.do_set('rf_locked', '1') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'rf_locked') - self.assertEquals(r['value'], '1') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'rf_locked') + self.assertEqual(r['value'], '1') time.sleep(1.5) r = self.do_get('bts.0.rf_state') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.rf_state') - self.assertEquals(r['value'], 'inoperational,locked,off') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.rf_state') + self.assertEqual(r['value'], 'inoperational,locked,off') r = self.do_get('rf_locked') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'rf_locked') - self.assertEquals(r['value'], 'state=off,policy=off') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'rf_locked') + self.assertEqual(r['value'], 'state=off,policy=off') r = self.do_set('rf_locked', '0') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'rf_locked') - self.assertEquals(r['value'], '0') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'rf_locked') + self.assertEqual(r['value'], '0') time.sleep(1.5) r = self.do_get('bts.0.rf_state') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.rf_state') - self.assertEquals(r['value'], 'inoperational,unlocked,on') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.rf_state') + self.assertEqual(r['value'], 'inoperational,unlocked,on') r = self.do_get('rf_locked') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'rf_locked') - self.assertEquals(r['value'], 'state=off,policy=on') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'rf_locked') + self.assertEqual(r['value'], 'state=off,policy=on') def testTimezone(self): r = self.do_get('timezone') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'timezone') - self.assertEquals(r['value'], 'off') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'timezone') + self.assertEqual(r['value'], 'off') r = self.do_set('timezone', '-2,15,2') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'timezone') - self.assertEquals(r['value'], '-2,15,2') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'timezone') + self.assertEqual(r['value'], '-2,15,2') r = self.do_get('timezone') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'timezone') - self.assertEquals(r['value'], '-2,15,2') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'timezone') + self.assertEqual(r['value'], '-2,15,2') # Test invalid input r = self.do_set('timezone', '-2,15,2,5,6,7') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'timezone') - self.assertEquals(r['value'], '-2,15,2') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'timezone') + self.assertEqual(r['value'], '-2,15,2') r = self.do_set('timezone', '-2,15') - self.assertEquals(r['mtype'], 'ERROR') + self.assertEqual(r['mtype'], 'ERROR') r = self.do_set('timezone', '-2') - self.assertEquals(r['mtype'], 'ERROR') + self.assertEqual(r['mtype'], 'ERROR') r = self.do_set('timezone', '1') r = self.do_set('timezone', 'off') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'timezone') - self.assertEquals(r['value'], 'off') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'timezone') + self.assertEqual(r['value'], 'off') r = self.do_get('timezone') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'timezone') - self.assertEquals(r['value'], 'off') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'timezone') + self.assertEqual(r['value'], 'off') def testMcc(self): r = self.do_set('mcc', '23') r = self.do_get('mcc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mcc') - self.assertEquals(r['value'], '023') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mcc') + self.assertEqual(r['value'], '023') r = self.do_set('mcc', '023') r = self.do_get('mcc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mcc') - self.assertEquals(r['value'], '023') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mcc') + self.assertEqual(r['value'], '023') def testMnc(self): r = self.do_set('mnc', '9') r = self.do_get('mnc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '09') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mnc') + self.assertEqual(r['value'], '09') r = self.do_set('mnc', '09') r = self.do_get('mnc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '09') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mnc') + self.assertEqual(r['value'], '09') r = self.do_set('mnc', '009') r = self.do_get('mnc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '009') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mnc') + self.assertEqual(r['value'], '009') def testMccMncApply(self): # Test some invalid input r = self.do_set('mcc-mnc-apply', 'WRONG') - self.assertEquals(r['mtype'], 'ERROR') + self.assertEqual(r['mtype'], 'ERROR') r = self.do_set('mcc-mnc-apply', '1,') - self.assertEquals(r['mtype'], 'ERROR') + self.assertEqual(r['mtype'], 'ERROR') r = self.do_set('mcc-mnc-apply', '200,3') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'mcc-mnc-apply') - self.assertEquals(r['value'], 'Tried to drop the BTS') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'mcc-mnc-apply') + self.assertEqual(r['value'], 'Tried to drop the BTS') # Set it again r = self.do_set('mcc-mnc-apply', '200,3') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'mcc-mnc-apply') - self.assertEquals(r['value'], 'Nothing changed') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'mcc-mnc-apply') + self.assertEqual(r['value'], 'Nothing changed') # Change it r = self.do_set('mcc-mnc-apply', '200,4') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'mcc-mnc-apply') - self.assertEquals(r['value'], 'Tried to drop the BTS') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'mcc-mnc-apply') + self.assertEqual(r['value'], 'Tried to drop the BTS') # Change it r = self.do_set('mcc-mnc-apply', '201,4') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'mcc-mnc-apply') - self.assertEquals(r['value'], 'Tried to drop the BTS') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'mcc-mnc-apply') + self.assertEqual(r['value'], 'Tried to drop the BTS') # Verify r = self.do_get('mnc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '04') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mnc') + self.assertEqual(r['value'], '04') r = self.do_get('mcc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mcc') - self.assertEquals(r['value'], '201') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mcc') + self.assertEqual(r['value'], '201') # Change it r = self.do_set('mcc-mnc-apply', '202,03') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'mcc-mnc-apply') - self.assertEquals(r['value'], 'Tried to drop the BTS') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'mcc-mnc-apply') + self.assertEqual(r['value'], 'Tried to drop the BTS') r = self.do_get('mnc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '03') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mnc') + self.assertEqual(r['value'], '03') r = self.do_get('mcc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mcc') - self.assertEquals(r['value'], '202') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mcc') + self.assertEqual(r['value'], '202') # Test MNC with 3 digits r = self.do_set('mcc-mnc-apply', '2,003') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'mcc-mnc-apply') - self.assertEquals(r['value'], 'Tried to drop the BTS') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'mcc-mnc-apply') + self.assertEqual(r['value'], 'Tried to drop the BTS') r = self.do_get('mnc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '003') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mnc') + self.assertEqual(r['value'], '003') r = self.do_get('mcc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mcc') - self.assertEquals(r['value'], '002') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mcc') + self.assertEqual(r['value'], '002') # Set same MNC with 3 digits r = self.do_set('mcc-mnc-apply', '2,003') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'mcc-mnc-apply') - self.assertEquals(r['value'], 'Nothing changed') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'mcc-mnc-apply') + self.assertEqual(r['value'], 'Nothing changed') r = self.do_get('mnc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '003') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mnc') + self.assertEqual(r['value'], '003') r = self.do_get('mcc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mcc') - self.assertEquals(r['value'], '002') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mcc') + self.assertEqual(r['value'], '002') def add_bsc_test(suite, workdir): if not os.path.isfile(os.path.join(workdir, "src/osmo-bsc/osmo-bsc")): @@ -522,9 +522,9 @@ if args.p: confpath = args.p - print "confpath %s, workdir %s" % (confpath, workdir) + print("confpath %s, workdir %s" % (confpath, workdir)) os.chdir(workdir) - print "Running tests for specific control commands" + print("Running tests for specific control commands") suite = unittest.TestSuite() add_bsc_test(suite, workdir) res = unittest.TextTestRunner(verbosity=verbose_level).run(suite) diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py index d2b3da4..a99bf4b 100755 --- a/tests/vty_test_runner.py +++ b/tests/vty_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # (C) 2013 by Holger Hans Peter Freyther @@ -33,9 +33,9 @@ def checkForEndAndExit(self): res = self.vty.command("list") #print ('looking for "exit"\n') - self.assert_(res.find(' exit\r') > 0) + self.assertTrue(res.find(' exit\r') > 0) #print 'found "exit"\nlooking for "end"\n' - self.assert_(res.find(' end\r') > 0) + self.assertTrue(res.find(' end\r') > 0) #print 'found "end"\n' def vty_command(self): @@ -54,8 +54,8 @@ try: self.proc = osmoutil.popen_devnull(osmo_vty_cmd) except OSError: - print >> sys.stderr, "Current directory: %s" % os.getcwd() - print >> sys.stderr, "Consider setting -b" + print("Current directory: %s" % os.getcwd(), file=sys.stderr) + print("Consider setting -b", file=sys.stderr) appstring = self.vty_app()[2] appport = self.vty_app()[0] @@ -73,34 +73,34 @@ def _testConfigNetworkTree(self, include_bsc_items=True): self.vty.enable() self.assertTrue(self.vty.verify("configure terminal",[''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.checkForEndAndExit() self.assertTrue(self.vty.verify("network",[''])) - self.assertEquals(self.vty.node(), 'config-net') + self.assertEqual(self.vty.node(), 'config-net') self.checkForEndAndExit() self.assertTrue(self.vty.verify("bts 0",[''])) - self.assertEquals(self.vty.node(), 'config-net-bts') + self.assertEqual(self.vty.node(), 'config-net-bts') self.checkForEndAndExit() self.assertTrue(self.vty.verify("trx 0",[''])) - self.assertEquals(self.vty.node(), 'config-net-bts-trx') + self.assertEqual(self.vty.node(), 'config-net-bts-trx') self.checkForEndAndExit() self.vty.command("write terminal") self.assertTrue(self.vty.verify("exit",[''])) - self.assertEquals(self.vty.node(), 'config-net-bts') + self.assertEqual(self.vty.node(), 'config-net-bts') self.assertTrue(self.vty.verify("exit",[''])) self.assertTrue(self.vty.verify("bts 1",[''])) - self.assertEquals(self.vty.node(), 'config-net-bts') + self.assertEqual(self.vty.node(), 'config-net-bts') self.checkForEndAndExit() self.assertTrue(self.vty.verify("trx 1",[''])) - self.assertEquals(self.vty.node(), 'config-net-bts-trx') + self.assertEqual(self.vty.node(), 'config-net-bts-trx') self.checkForEndAndExit() self.vty.command("write terminal") self.assertTrue(self.vty.verify("exit",[''])) - self.assertEquals(self.vty.node(), 'config-net-bts') + self.assertEqual(self.vty.node(), 'config-net-bts') self.assertTrue(self.vty.verify("exit",[''])) - self.assertEquals(self.vty.node(), 'config-net') + self.assertEqual(self.vty.node(), 'config-net') self.assertTrue(self.vty.verify("exit",[''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify("exit",[''])) self.assertTrue(self.vty.node() is None) @@ -120,18 +120,18 @@ def testVtyTree(self): self.vty.enable() self.assertTrue(self.vty.verify("configure terminal", [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.checkForEndAndExit() self.assertTrue(self.vty.verify("msc 0", [''])) - self.assertEquals(self.vty.node(), 'config-msc') + self.assertEqual(self.vty.node(), 'config-msc') self.checkForEndAndExit() self.assertTrue(self.vty.verify("exit", [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify("bsc", [''])) - self.assertEquals(self.vty.node(), 'config-bsc') + self.assertEqual(self.vty.node(), 'config-bsc') self.checkForEndAndExit() self.assertTrue(self.vty.verify("exit", [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify("exit", [''])) self.assertTrue(self.vty.node() is None) @@ -152,12 +152,12 @@ # Verify settings res = self.vty.command("write terminal") - self.assert_(res.find('bsc-msc-lost-text MSC disconnected') > 0) - self.assertEquals(res.find('no bsc-msc-lost-text'), -1) - self.assert_(res.find('bsc-welcome-text Hello MS') > 0) - self.assertEquals(res.find('no bsc-welcome-text'), -1) - self.assert_(res.find('bsc-grace-text In grace period') > 0) - self.assertEquals(res.find('no bsc-grace-text'), -1) + self.assertTrue(res.find('bsc-msc-lost-text MSC disconnected') > 0) + self.assertEqual(res.find('no bsc-msc-lost-text'), -1) + self.assertTrue(res.find('bsc-welcome-text Hello MS') > 0) + self.assertEqual(res.find('no bsc-welcome-text'), -1) + self.assertTrue(res.find('bsc-grace-text In grace period') > 0) + self.assertEqual(res.find('no bsc-grace-text'), -1) # Now disable it.. self.vty.verify("no bsc-msc-lost-text", ['']) @@ -166,12 +166,12 @@ # Verify settings res = self.vty.command("write terminal") - self.assertEquals(res.find('bsc-msc-lost-text MSC disconnected'), -1) - self.assert_(res.find('no bsc-msc-lost-text') > 0) - self.assertEquals(res.find('bsc-welcome-text Hello MS'), -1) - self.assert_(res.find('no bsc-welcome-text') > 0) - self.assertEquals(res.find('bsc-grace-text In grace period'), -1) - self.assert_(res.find('no bsc-grace-text') > 0) + self.assertEqual(res.find('bsc-msc-lost-text MSC disconnected'), -1) + self.assertTrue(res.find('no bsc-msc-lost-text') > 0) + self.assertEqual(res.find('bsc-welcome-text Hello MS'), -1) + self.assertTrue(res.find('no bsc-welcome-text') > 0) + self.assertEqual(res.find('bsc-grace-text In grace period'), -1) + self.assertTrue(res.find('no bsc-grace-text') > 0) def testUssdNotificationsBsc(self): self.vty.enable() @@ -186,16 +186,16 @@ # Verify settings res = self.vty.command("write terminal") - self.assert_(res.find('missing-msc-text No MSC found') > 0) - self.assertEquals(res.find('no missing-msc-text'), -1) + self.assertTrue(res.find('missing-msc-text No MSC found') > 0) + self.assertEqual(res.find('no missing-msc-text'), -1) # Now disable it.. self.vty.verify("no missing-msc-text", ['']) # Verify settings res = self.vty.command("write terminal") - self.assertEquals(res.find('missing-msc-text No MSC found'), -1) - self.assert_(res.find('no missing-msc-text') > 0) + self.assertEqual(res.find('missing-msc-text No MSC found'), -1) + self.assertTrue(res.find('no missing-msc-text') > 0) def testNetworkTimezone(self): self.vty.enable() @@ -213,32 +213,32 @@ # Verify settings res = self.vty.command("write terminal") - self.assert_(res.find('timezone 2 30') > 0) - self.assertEquals(res.find('timezone 2 30 '), -1) + self.assertTrue(res.find('timezone 2 30') > 0) + self.assertEqual(res.find('timezone 2 30 '), -1) # Set time zone with DST self.vty.verify("timezone 2 30 1", ['']) # Verify settings res = self.vty.command("write terminal") - self.assert_(res.find('timezone 2 30 1') > 0) + self.assertTrue(res.find('timezone 2 30 1') > 0) # Now disable it.. self.vty.verify("no timezone", ['']) # Verify settings res = self.vty.command("write terminal") - self.assertEquals(res.find(' timezone'), -1) + self.assertEqual(res.find(' timezone'), -1) def testShowNetwork(self): res = self.vty.command("show network") - self.assert_(res.startswith('BSC is on Country Code') >= 0) + self.assertTrue(res.startswith('BSC is on Country Code') >= 0) def testMscDataCoreLACCI(self): self.vty.enable() res = self.vty.command("show running-config") - self.assertEquals(res.find("core-location-area-code"), -1) - self.assertEquals(res.find("core-cell-identity"), -1) + self.assertEqual(res.find("core-location-area-code"), -1) + self.assertEqual(res.find("core-cell-identity"), -1) self.vty.command("configure terminal") self.vty.command("msc 0") @@ -246,8 +246,8 @@ self.vty.command("core-cell-identity 333") res = self.vty.command("show running-config") - self.assert_(res.find("core-location-area-code 666") > 0) - self.assert_(res.find("core-cell-identity 333") > 0) + self.assertTrue(res.find("core-location-area-code 666") > 0) + self.assertTrue(res.find("core-cell-identity 333") > 0) def add_bsc_test(suite, workdir): @@ -283,9 +283,9 @@ if args.p: confpath = args.p - print "confpath %s, workdir %s" % (confpath, workdir) + print("confpath %s, workdir %s" % (confpath, workdir)) os.chdir(workdir) - print "Running tests for specific VTY commands" + print("Running tests for specific VTY commands") suite = unittest.TestSuite() add_bsc_test(suite, workdir) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I438ca0c4b8e7957d0f347a5b2f5c4cb93f9325e6 Gerrit-Change-Number: 16545 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 11:11:23 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 11 Dec 2019 11:11:23 +0000 Subject: Change in osmo-hlr[master]: tests/auc: change back to python3 References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16546 ) Change subject: tests/auc: change back to python3 ...................................................................... tests/auc: change back to python3 Change the interpreter of the python script back to python3, as it was when the script was initially added in Idff9d757ab956179aa41ada2a223fd9f439aafbd. In the meantime, it had been changed to python2 to make it work with build slaves that were missing python3, but this is not necessary anymore. This should be merged shortly after osmo-python-tests was migrated to python3, and the jenkins build slaves were (automatically) updated to have the new osmo-python-tests installed. Related: OS#2819 Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Change-Id: Ifbb8f8f5428657a1c2d4d6d1217f8e374be43aba --- M debian/control M tests/auc/gen_ts_55_205_test_sets/pdftxt_2_c.py 2 files changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/46/16546/1 diff --git a/debian/control b/debian/control index debf669..a32c68d 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ dh-autoreconf, dh-systemd (>= 1.5), autotools-dev, - python-minimal, + python3-minimal, libosmocore-dev, libosmo-abis-dev, libosmo-netif-dev, diff --git a/tests/auc/gen_ts_55_205_test_sets/pdftxt_2_c.py b/tests/auc/gen_ts_55_205_test_sets/pdftxt_2_c.py index b01a797..9df65b5 100755 --- a/tests/auc/gen_ts_55_205_test_sets/pdftxt_2_c.py +++ b/tests/auc/gen_ts_55_205_test_sets/pdftxt_2_c.py @@ -1,5 +1,4 @@ -#!/usr/bin/env python -# FIXME: use python3 once buildslaves are updated. +#!/usr/bin/env python3 # Convert test sets pasted from 3GPP TS 55.205 to C code. # (C) 2016 by sysmocom s.f.m.c. GmbH -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ifbb8f8f5428657a1c2d4d6d1217f8e374be43aba Gerrit-Change-Number: 16546 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 11:11:53 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 11 Dec 2019 11:11:53 +0000 Subject: Change in osmo-iuh[master]: gitignore: add gen_sabp.stamp References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16547 ) Change subject: gitignore: add gen_sabp.stamp ...................................................................... gitignore: add gen_sabp.stamp Change-Id: I107d2c0e8c82523a8fb38f128bb81e32e437bdd8 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/47/16547/1 diff --git a/.gitignore b/.gitignore index 49b2cfb..e32000c 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,7 @@ gen_hnbap.stamp gen_rua.stamp gen_ranap.stamp +gen_sabp.stamp include/osmocom/hnbap/hnbap_ies_defs.h include/osmocom/rua/rua_ies_defs.h include/osmocom/ranap/ranap_ies_defs.h -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16547 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I107d2c0e8c82523a8fb38f128bb81e32e437bdd8 Gerrit-Change-Number: 16547 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 11:11:53 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 11 Dec 2019 11:11:53 +0000 Subject: Change in osmo-iuh[master]: debian, asn1tostruct.py: switch to python3 References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16548 ) Change subject: debian, asn1tostruct.py: switch to python3 ...................................................................... debian, asn1tostruct.py: switch to python3 Make build work with python3 and drop the python2 dependency. Related: OS#2819 Change-Id: Idb9d7a349ddb7619c784823f740648c7956bae5e --- M asn1/utils/asn1tostruct.py M debian/control 2 files changed, 35 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/48/16548/1 diff --git a/asn1/utils/asn1tostruct.py b/asn1/utils/asn1tostruct.py index 3c33980..220517d 100755 --- a/asn1/utils/asn1tostruct.py +++ b/asn1/utils/asn1tostruct.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 import re, os, sys, string import datetime @@ -27,11 +27,11 @@ sys.stderr.write(FAIL + string + ENDC + "\n") def printWarning(string): - print WARN + string + ENDC + print(WARN + string + ENDC) def printDebug(string): if verbosity > 0: - print string + print(string) def outputHeaderToFile(f, filename): now = datetime.datetime.utcfromtimestamp(int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))) @@ -57,7 +57,7 @@ return lowered for c in swapped: - if c in string.lowercase: + if c.islower(): newstr += c idx += 1 else: @@ -70,14 +70,14 @@ return newstr def usage(): - print "Python parser for asn1 v%s" % (version) - print "Usage: python asn1tostruct.py [options]" - print "Available options:" - print "-d Enable script debug" - print "-f [file] Input file to parse" - print "-o [dir] Output files to given directory" - print "-p [pfx] Prefix all types with given prefix" - print "-h Print this help and return" + print("Python parser for asn1 v%s" % (version)) + print("Usage: python asn1tostruct.py [options]") + print("Available options:") + print("-d Enable script debug") + print("-f [file] Input file to parse") + print("-o [dir] Output files to given directory") + print("-p [pfx] Prefix all types with given prefix") + print("-h Print this help and return") try: opts, args = getopt.getopt(sys.argv[1:], "df:ho:p:", ["debug", "file", "help", "outdir", "prefix"]) @@ -102,7 +102,7 @@ sys.exit(2) for filename in filenames: - file = open(filename, 'r') + file = open(filename, 'r', encoding='utf-8') for line in file: # Removing any comment if line.find('--') >= 0: @@ -139,17 +139,17 @@ printFail("No Information Element parsed, exiting") sys.exit(0) -f = open(outdir + fileprefix + '_ies_defs.h', 'w') +f = open(outdir + fileprefix + '_ies_defs.h', 'w', encoding='utf-8') outputHeaderToFile(f, filename) f.write("#include \"%s_common.h\"\n\n" % (fileprefix)) f.write("#ifndef %s_IES_DEFS_H_\n#define %s_IES_DEFS_H_\n\n" % (fileprefix.upper(), fileprefix.upper())) for key in iesDefs: - if key not in ieofielist.values(): + if key not in list(ieofielist.values()): continue - for (i, j) in ieofielist.items(): + for (i, j) in list(ieofielist.items()): if j == key: break @@ -200,10 +200,10 @@ f.write(" uint8_t direction;\n") f.write(" union {\n") -messageList = iesDefs.keys() +messageList = list(iesDefs.keys()) messageList.sort() for message in messageList: - if message in ieofielist.values(): + if message in list(ieofielist.values()): continue if len(iesDefs[message]["ies"]) == 0: continue @@ -212,7 +212,7 @@ f.write("} %s_message;\n\n" % (fileprefix)) for key in iesDefs: - if key in ieofielist.values(): + if key in list(ieofielist.values()): continue structName = re.sub('ies', '', key) asn1cStruct = re.sub('-', '_', re.sub('IEs', '', re.sub('-IEs', '', key))) @@ -242,7 +242,7 @@ f.write(" %s_t *%s);\n\n" % (prefix + re.sub('-', '_', key), lowerFirstCamelWord(re.sub('-', '_', key)))) for key in iesDefs: - if key not in ieofielist.values(): + if key not in list(ieofielist.values()): continue asn1cStruct = re.sub('-', '_', re.sub('IEs', '', key)) asn1cStruct = prefix + re.sub('Item', 'List', asn1cStruct) @@ -276,11 +276,11 @@ f.write("#endif /* %s_IES_DEFS_H_ */\n\n" % (fileprefix.upper())) #Generate Decode functions -f = open(outdir + fileprefix + '_decoder.c', 'w') +f = open(outdir + fileprefix + '_decoder.c', 'w', encoding='utf-8') outputHeaderToFile(f, filename) f.write("#include \"%s_common.h\"\n#include \"%s_ies_defs.h\"\n\n" % (fileprefix, fileprefix)) for key in iesDefs: - if key in ieofielist.values(): + if key in list(ieofielist.values()): continue structName = re.sub('ies', '', key) asn1cStruct = re.sub('-', '_', re.sub('IEs', '', re.sub('-IEs', '', key))) @@ -293,7 +293,7 @@ asn1cStruct = prefix + re.sub('Item', 'List', asn1cStruct) iesaccess = "" - if key not in ieofielist.values(): + if key not in list(ieofielist.values()): iesaccess = "%s_ies." % (firstlower) f.write("int %s_decode_%s(\n" % (fileprefix, re.sub('-', '_', structName.lower()))) @@ -346,7 +346,7 @@ f.write(" decoded += tempDecoded;\n") f.write(" if (asn1_xer_print)\n") f.write(" xer_fprint(stdout, &asn_DEF_%s, %s_p);\n" % (ietypeunderscore, lowerFirstCamelWord(ietypesubst))) - if ie[2] in ieofielist.keys(): + if ie[2] in list(ieofielist.keys()): f.write(" if (%s_decode_%s(&%s->%s, %s_p) < 0) {\n" % (fileprefix, ietypeunderscore.lower(), lowerFirstCamelWord(re.sub('-', '_', key)), ienameunderscore, lowerFirstCamelWord(ietypesubst))) f.write(" %s_DEBUG(\"Decoding of encapsulated IE %s failed\\n\");\n" % (fileprefix.upper(), lowerFirstCamelWord(ietypesubst))) f.write(" ASN_STRUCT_FREE(asn_DEF_%s, %s_p);\n" % (ietypeunderscore, lowerFirstCamelWord(ietypesubst))) @@ -395,7 +395,7 @@ f.write("}\n\n") for key in iesDefs: - if key not in ieofielist.values(): + if key not in list(ieofielist.values()): continue keyname = re.sub('IEs', '', re.sub('Item', 'List', key)) @@ -437,12 +437,12 @@ #Generate IES Encode functions -f = open(outdir + fileprefix + '_encoder.c', 'w') +f = open(outdir + fileprefix + '_encoder.c', 'w', encoding='utf-8') outputHeaderToFile(f,filename) f.write("#include \"%s_common.h\"\n" % (fileprefix)) f.write("#include \"%s_ies_defs.h\"\n\n" % (fileprefix)) for key in iesDefs: - if key in ieofielist.values(): + if key in list(ieofielist.values()): continue structName = re.sub('ies', '', key) @@ -452,7 +452,7 @@ asn1cStructfirstlower = asn1cStruct[:1].lower() + asn1cStruct[1:] iesaccess = "" - if key not in ieofielist.values(): + if key not in list(ieofielist.values()): iesaccess = "%s_ies." % (firstwordlower) keyName = re.sub('-', '_', key) @@ -489,7 +489,7 @@ f.write(" ASN_SEQUENCE_ADD(&%s->%slist, ie);\n" % (firstwordlower, iesaccess)) f.write(" }\n\n") else: - if ie[2] in ieofielist.keys(): + if ie[2] in list(ieofielist.keys()): f.write(" %s_t %s;\n\n" % (prefix + ietypeunderscore, ienamefirstwordlower)) f.write(" memset(&%s, 0, sizeof(%s_t));\n" % (ienamefirstwordlower, ietypeunderscore)) f.write("\n") @@ -497,21 +497,21 @@ f.write(" if ((ie = %s_new_ie(%sProtocolIE_ID_%s,\n" % (fileprefix, prefix, re.sub('-', '_', ie[0]))) f.write(" %sCriticality_%s,\n" % (prefix, ie[1])) f.write(" &asn_DEF_%s,\n" % (ietypeunderscore)) - if ie[2] in ieofielist.keys(): + if ie[2] in list(ieofielist.keys()): f.write(" &%s)) == NULL) {\n" % (ienamefirstwordlower)) else: f.write(" &%s->%s)) == NULL) {\n" % (lowerFirstCamelWord(re.sub('-', '_', key)), ienamefirstwordlower)) f.write(" return -1;\n") f.write(" }\n") f.write(" ASN_SEQUENCE_ADD(&%s->%slist, ie);\n\n" % (firstwordlower, iesaccess)) - if ie[2] in ieofielist.keys(): + if ie[2] in list(ieofielist.keys()): f.write(" ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_%s, &%s);\n\n" % (ietypeunderscore, ienamefirstwordlower)) f.write(" return 0;\n") f.write("}\n\n") -for (key, value) in iesDefs.items(): - if key not in ieofielist.values(): +for (key, value) in list(iesDefs.items()): + if key not in list(ieofielist.values()): continue ie = value["ies"][0] @@ -520,7 +520,7 @@ asn1cStruct = prefix + re.sub('Item', 'List', asn1cStruct) firstwordlower = re.sub('Item', 'List', re.sub('enb', 'eNB', lowerFirstCamelWord(asn1cStruct))) - for (i, j) in ieofielist.items(): + for (i, j) in list(ieofielist.items()): if j == key: break f.write("int %s_encode_%s(\n" % (fileprefix, re.sub('-', '_', i).lower())) diff --git a/debian/control b/debian/control index 7e760acb..d07ab67 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ libosmocore-dev (>= 0.12.0), libosmo-netif-dev (>= 0.3.0), libosmo-sigtran-dev (>= 0.10.0), - python (>= 2.7) + python3 Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-iuh.git Vcs-Browser: https://git.osmocom.org/osmo-iuh/ -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16548 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Idb9d7a349ddb7619c784823f740648c7956bae5e Gerrit-Change-Number: 16548 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 11:12:07 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 11 Dec 2019 11:12:07 +0000 Subject: Change in osmo-mgw[master]: osmoappdesc.py: switch to python 3 References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/16549 ) Change subject: osmoappdesc.py: switch to python 3 ...................................................................... osmoappdesc.py: switch to python 3 Make build and external tests work with python3, so we can drop the python2 dependency. This should be merged shortly after osmo-python-tests was migrated to python3, and the jenkins build slaves were (automatically) updated to have the new osmo-python-tests installed. Related: OS#2819 Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Change-Id: I48f4c2c520e8285aff5d6d65f95bd041c13466e8 --- M osmoappdesc.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/49/16549/1 diff --git a/osmoappdesc.py b/osmoappdesc.py index cee5a24..58e72e1 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/16549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I48f4c2c520e8285aff5d6d65f95bd041c13466e8 Gerrit-Change-Number: 16549 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 11:12:19 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 11 Dec 2019 11:12:19 +0000 Subject: Change in osmo-msc[master]: osmoappdesc.py, tests: switch to python 3 References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16550 ) Change subject: osmoappdesc.py, tests: switch to python 3 ...................................................................... osmoappdesc.py, tests: switch to python 3 Make build and external tests work with python3, so we can drop the python2 dependency. This should be merged shortly after osmo-python-tests was migrated to python3, and the jenkins build slaves were (automatically) updated to have the new osmo-python-tests installed. Related: OS#2819 Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Change-Id: I53ccde96dd3785098df0f7d693c504c8b8302e90 --- M osmoappdesc.py M tests/ctrl_test_runner.py M tests/smpp_test_runner.py M tests/vty_test_runner.py 4 files changed, 60 insertions(+), 60 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/50/16550/1 diff --git a/osmoappdesc.py b/osmoappdesc.py index bd7fea3..b7a274c 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py index f652a67..d24cc00 100755 --- a/tests/ctrl_test_runner.py +++ b/tests/ctrl_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # (C) 2013 by Jacob Erlbeck # (C) 2014 by Holger Hans Peter Freyther @@ -53,8 +53,8 @@ try: self.proc = osmoutil.popen_devnull(osmo_ctrl_cmd) except OSError: - print >> sys.stderr, "Current directory: %s" % os.getcwd() - print >> sys.stderr, "Consider setting -b" + print("Current directory: %s" % os.getcwd(), file=sys.stderr) + print("Consider setting -b", file=sys.stderr) time.sleep(2) appstring = self.ctrl_app()[2] @@ -72,7 +72,7 @@ def connect(self, host, port): if verbose: - print "Connecting to host %s:%i" % (host, port) + print("Connecting to host %s:%i" % (host, port)) retries = 30 while True: @@ -92,7 +92,7 @@ def send(self, data): if verbose: - print "Sending \"%s\"" %(data) + print("Sending \"%s\"" %(data)) data = Ctrl().add_header(data) return self.sock.send(data) == len(data) @@ -123,7 +123,7 @@ (head, data) = IPA().split_combined(data) answer = Ctrl().rem_header(head) if verbose: - print "Got message:", answer + print("Got message:", answer) (mtype, id, msg) = answer.split(None, 2) id = int(id) rsp = {'mtype': mtype, 'id': id} @@ -139,7 +139,7 @@ responses[id] = rsp if verbose: - print "Decoded replies: ", responses + print("Decoded replies: ", responses) return responses @@ -183,9 +183,9 @@ if args.p: confpath = args.p - print "confpath %s, workdir %s" % (confpath, workdir) + print("confpath %s, workdir %s" % (confpath, workdir)) os.chdir(workdir) - print "Running tests for specific control commands" + print("Running tests for specific control commands") suite = unittest.TestSuite() suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestCtrlMSC)) res = unittest.TextTestRunner(verbosity=verbose_level).run(suite) diff --git a/tests/smpp_test_runner.py b/tests/smpp_test_runner.py index f6567d9..b8c6e1c 100755 --- a/tests/smpp_test_runner.py +++ b/tests/smpp_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # (C) 2014 by Holger Hans Peter Freyther # based on vty_test_runner.py: @@ -46,8 +46,8 @@ try: self.proc = osmoutil.popen_devnull(osmo_vty_cmd) except OSError: - print >> sys.stderr, "Current directory: %s" % os.getcwd() - print >> sys.stderr, "Consider setting -b" + print("Current directory: %s" % os.getcwd(), file=sys.stderr) + print("Consider setting -b", file=sys.stderr) appstring = self.vty_app()[2] appport = self.vty_app()[0] @@ -73,14 +73,14 @@ # Enable the configuration self.vty.enable() self.assertTrue(self.vty.verify("configure terminal", [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('smpp', [''])) - self.assertEquals(self.vty.node(), 'config-smpp') + self.assertEqual(self.vty.node(), 'config-smpp') self.assertTrue(self.vty.verify('system-id test', [''])) self.assertTrue(self.vty.verify('local-tcp-port 2775', [''])) self.assertTrue(self.vty.verify('esme test', [''])) - self.assertEquals(self.vty.node(), 'config-smpp-esme') + self.assertEqual(self.vty.node(), 'config-smpp-esme') self.assertTrue(self.vty.verify('default-route', [''])) self.assertTrue(self.vty.verify('end', [''])) @@ -88,7 +88,7 @@ sck = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sck.setblocking(1) sck.connect(('0.0.0.0', 2775)) - sck.sendall('\x00\x00\x00\x02\x00') + sck.sendall(b'\x00\x00\x00\x02\x00') sck.close() # Check if the VTY is still there @@ -98,7 +98,7 @@ sck = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sck.setblocking(1) sck.connect(('0.0.0.0', 2775)) - sck.sendall('\x00\x01\x00\x01\x01') + sck.sendall(b'\x00\x01\x00\x01\x01') sck.close() self.vty.verify('enable',['']) @@ -128,9 +128,9 @@ if args.p: confpath = args.p - print "confpath %s, workdir %s" % (confpath, workdir) + print("confpath %s, workdir %s" % (confpath, workdir)) os.chdir(workdir) - print "Running tests for specific SMPP" + print("Running tests for specific SMPP") suite = unittest.TestSuite() suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestSMPPMSC)) res = unittest.TextTestRunner(verbosity=verbose_level).run(suite) diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py index 471ecf6..f954b5d 100755 --- a/tests/vty_test_runner.py +++ b/tests/vty_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # (C) 2013 by Holger Hans Peter Freyther @@ -33,9 +33,9 @@ def checkForEndAndExit(self): res = self.vty.command("list") #print ('looking for "exit"\n') - self.assert_(res.find(' exit\r') > 0) + self.assertTrue(res.find(' exit\r') > 0) #print 'found "exit"\nlooking for "end"\n' - self.assert_(res.find(' end\r') > 0) + self.assertTrue(res.find(' end\r') > 0) #print 'found "end"\n' def vty_command(self): @@ -54,8 +54,8 @@ try: self.proc = osmoutil.popen_devnull(osmo_vty_cmd) except OSError: - print >> sys.stderr, "Current directory: %s" % os.getcwd() - print >> sys.stderr, "Consider setting -b" + print("Current directory: %s" % os.getcwd(), file=sys.stderr) + print("Consider setting -b", file=sys.stderr) appstring = self.vty_app()[2] appport = self.vty_app()[0] @@ -79,14 +79,14 @@ def testConfigNetworkTree(self, include_bsc_items=True): self.vty.enable() self.assertTrue(self.vty.verify("configure terminal",[''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.checkForEndAndExit() self.assertTrue(self.vty.verify("network",[''])) - self.assertEquals(self.vty.node(), 'config-net') + self.assertEqual(self.vty.node(), 'config-net') self.checkForEndAndExit() self.vty.command("write terminal") self.assertTrue(self.vty.verify("exit",[''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify("exit",[''])) self.assertTrue(self.vty.node() is None) @@ -107,35 +107,35 @@ # check the default res = self.vty.command("write terminal") - self.assert_(res.find(' no smpp-first') > 0) + self.assertTrue(res.find(' no smpp-first') > 0) self.vty.verify("smpp-first", ['']) res = self.vty.command("write terminal") - self.assert_(res.find(' smpp-first') > 0) - self.assertEquals(res.find('no smpp-first'), -1) + self.assertTrue(res.find(' smpp-first') > 0) + self.assertEqual(res.find('no smpp-first'), -1) self.vty.verify("no smpp-first", ['']) res = self.vty.command("write terminal") - self.assert_(res.find('no smpp-first') > 0) + self.assertTrue(res.find('no smpp-first') > 0) def testVtyTree(self): self.vty.enable() self.assertTrue(self.vty.verify("configure terminal", [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.checkForEndAndExit() self.assertTrue(self.vty.verify('mncc-int', [''])) - self.assertEquals(self.vty.node(), 'config-mncc-int') + self.assertEqual(self.vty.node(), 'config-mncc-int') self.checkForEndAndExit() self.assertTrue(self.vty.verify('exit', [''])) if self.checkForSmpp(): - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('smpp', [''])) - self.assertEquals(self.vty.node(), 'config-smpp') + self.assertEqual(self.vty.node(), 'config-smpp') self.checkForEndAndExit() self.assertTrue(self.vty.verify("exit", [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify("exit", [''])) self.assertTrue(self.vty.node() is None) @@ -145,10 +145,10 @@ if self.checkForSmpp(): self.vty.command('smpp') - self.assertEquals(self.vty.node(), 'config-smpp') + self.assertEqual(self.vty.node(), 'config-smpp') self.vty.command('mncc-int') - self.assertEquals(self.vty.node(), 'config-mncc-int') + self.assertEqual(self.vty.node(), 'config-mncc-int') def testSi2Q(self): self.vty.enable() @@ -162,7 +162,7 @@ self.vty.command("si2quater neighbor-list del earfcn 1911") self.vty.command("si2quater neighbor-list del earfcn 1924") self.vty.command("si2quater neighbor-list del earfcn 2111") - self.assertEquals(before, self.vty.command("show running-config")) + self.assertEqual(before, self.vty.command("show running-config")) self.vty.command("si2quater neighbor-list add uarfcn 1976 13 1") self.vty.command("si2quater neighbor-list add uarfcn 1976 38 1") self.vty.command("si2quater neighbor-list add uarfcn 1976 44 1") @@ -185,7 +185,7 @@ self.vty.command("si2quater neighbor-list del uarfcn 1976 224") self.vty.command("si2quater neighbor-list del uarfcn 1976 225") self.vty.command("si2quater neighbor-list del uarfcn 1976 226") - self.assertEquals(before, self.vty.command("show running-config")) + self.assertEqual(before, self.vty.command("show running-config")) def testEnableDisablePeriodicLU(self): self.vty.enable() @@ -201,18 +201,18 @@ # Enable periodic lu.. self.vty.verify("periodic location update 60", ['']) res = self.vty.command("write terminal") - self.assert_(res.find('periodic location update 60') > 0) - self.assertEquals(res.find('no periodic location update'), -1) + self.assertTrue(res.find('periodic location update 60') > 0) + self.assertEqual(res.find('no periodic location update'), -1) # Now disable it.. self.vty.verify("no periodic location update", ['']) res = self.vty.command("write terminal") - self.assertEquals(res.find('periodic location update 60'), -1) - self.assert_(res.find('no periodic location update') > 0) + self.assertEqual(res.find('periodic location update 60'), -1) + self.assertTrue(res.find('no periodic location update') > 0) def testShowNetwork(self): res = self.vty.command("show network") - self.assert_(res.startswith('BSC is on Country Code') >= 0) + self.assertTrue(res.startswith('BSC is on Country Code') >= 0) def ipa_handle_small(x, verbose = False): s = data2str(x.recv(4)) @@ -220,42 +220,42 @@ raise Exception("expected to receive 4 bytes, but got %d (%r)" % (len(s)/2, s)) if "0001fe00" == s: if (verbose): - print "\tBSC <- NAT: PING?" + print("\tBSC <- NAT: PING?") x.send(IPA().pong()) elif "0001fe06" == s: if (verbose): - print "\tBSC <- NAT: IPA ID ACK" + print("\tBSC <- NAT: IPA ID ACK") x.send(IPA().id_ack()) elif "0001fe00" == s: if (verbose): - print "\tBSC <- NAT: PONG!" + print("\tBSC <- NAT: PONG!") else: if (verbose): - print "\tBSC <- NAT: ", s + print("\tBSC <- NAT: ", s) def ipa_handle_resp(x, tk, verbose = False, proc=None): s = data2str(x.recv(38)) if "0023fe040108010701020103010401050101010011" in s: retries = 3 while True: - print "\tsending IPA identity(%s) at %s" % (tk, time.strftime("%T")) + print("\tsending IPA identity(%s) at %s" % (tk, time.strftime("%T"))) try: x.send(IPA().id_resp(IPA().identity(name = tk.encode('utf-8')))) - print "\tdone sending IPA identity(%s) at %s" % (tk, - time.strftime("%T")) + print("\tdone sending IPA identity(%s) at %s" % (tk, + time.strftime("%T"))) break except: - print "\tfailed sending IPA identity at", time.strftime("%T") + print("\tfailed sending IPA identity at", time.strftime("%T")) if proc: - print "\tproc.poll() = %r" % proc.poll() + print("\tproc.poll() = %r" % proc.poll()) if retries < 1: - print "\tgiving up" + print("\tgiving up") raise - print "\tretrying (%d attempts left)" % retries + print("\tretrying (%d attempts left)" % retries) retries -= 1 else: if (verbose): - print "\tBSC <- NAT: ", s + print("\tBSC <- NAT: ", s) if __name__ == '__main__': import argparse @@ -283,9 +283,9 @@ if args.p: confpath = args.p - print "confpath %s, workdir %s" % (confpath, workdir) + print("confpath %s, workdir %s" % (confpath, workdir)) os.chdir(workdir) - print "Running tests for specific VTY commands" + print("Running tests for specific VTY commands") suite = unittest.TestSuite() suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestVTYMSC)) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I53ccde96dd3785098df0f7d693c504c8b8302e90 Gerrit-Change-Number: 16550 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 11:12:33 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 11 Dec 2019 11:12:33 +0000 Subject: Change in osmo-pcap[master]: osmoappdesc.py: switch to python 3 References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/16551 ) Change subject: osmoappdesc.py: switch to python 3 ...................................................................... osmoappdesc.py: switch to python 3 Make build and external tests work with python3, so we can drop the python2 dependency. Note that the external tests, which are using this file, are currently not enabled in jenkins (OS#4317). However, I've manually verified that the external tests work with this change. Related: OS#2819 Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Change-Id: I19a996458745026cff60608710944e5ab76d8976 --- M osmoappdesc.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/51/16551/1 diff --git a/osmoappdesc.py b/osmoappdesc.py index 38b18c0..331e6a9 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2016 by Holger Hans Peter Freyther # This program is free software: you can redistribute it and/or modify -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/16551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I19a996458745026cff60608710944e5ab76d8976 Gerrit-Change-Number: 16551 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 11:13:03 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 11 Dec 2019 11:13:03 +0000 Subject: Change in osmo-sgsn[master]: osmoappdesc.py, tests: switch to python 3 References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16552 ) Change subject: osmoappdesc.py, tests: switch to python 3 ...................................................................... osmoappdesc.py, tests: switch to python 3 Make build and external tests work with python3, so we can drop the python2 dependency. This should be merged shortly after osmo-python-tests was migrated to python3, and the jenkins build slaves were (automatically) updated to have the new osmo-python-tests installed. Related: OS#2819 Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Change-Id: I8c07d99c1bc9f0383e4bce17544e0998998cc54d --- M osmoappdesc.py M tests/ctrl_test_runner.py M tests/vty_test_runner.py 3 files changed, 82 insertions(+), 82 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/52/16552/1 diff --git a/osmoappdesc.py b/osmoappdesc.py index 08166a9..e91043f 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py index 9c253fc..69b2478 100755 --- a/tests/ctrl_test_runner.py +++ b/tests/ctrl_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # (C) 2013 by Jacob Erlbeck # (C) 2014 by Holger Hans Peter Freyther @@ -53,8 +53,8 @@ try: self.proc = osmoutil.popen_devnull(osmo_ctrl_cmd) except OSError: - print >> sys.stderr, "Current directory: %s" % os.getcwd() - print >> sys.stderr, "Consider setting -b" + print("Current directory: %s" % os.getcwd(), file=sys.stderr) + print("Consider setting -b", file=sys.stderr) time.sleep(2) appstring = self.ctrl_app()[2] @@ -72,7 +72,7 @@ def connect(self, host, port): if verbose: - print "Connecting to host %s:%i" % (host, port) + print("Connecting to host %s:%i" % (host, port)) retries = 30 while True: @@ -92,7 +92,7 @@ def send(self, data): if verbose: - print "Sending \"%s\"" %(data) + print("Sending \"%s\"" %(data)) data = Ctrl().add_header(data) return self.sock.send(data) == len(data) @@ -121,9 +121,9 @@ data = self.sock.recv(4096) while (len(data)>0): (head, data) = IPA().split_combined(data) - answer = Ctrl().rem_header(head) + answer = Ctrl().rem_header(head).decode() if verbose: - print "Got message:", answer + print("Got message:", answer) (mtype, id, msg) = answer.split(None, 2) id = int(id) rsp = {'mtype': mtype, 'id': id} @@ -139,7 +139,7 @@ responses[id] = rsp if verbose: - print "Decoded replies: ", responses + print("Decoded replies: ", responses) return responses @@ -154,9 +154,9 @@ def testListSubscribers(self): # TODO. Add command to mark a subscriber as active r = self.do_get('subscriber-list-active-v1') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'subscriber-list-active-v1') - self.assertEquals(r['value'], None) + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'subscriber-list-active-v1') + self.assertEqual(r['value'], None) def add_sgsn_test(suite, workdir): if not os.path.isfile(os.path.join(workdir, "src/sgsn/osmo-sgsn")): @@ -191,9 +191,9 @@ if args.p: confpath = args.p - print "confpath %s, workdir %s" % (confpath, workdir) + print("confpath %s, workdir %s" % (confpath, workdir)) os.chdir(workdir) - print "Running tests for specific control commands" + print("Running tests for specific control commands") suite = unittest.TestSuite() add_sgsn_test(suite, workdir) res = unittest.TextTestRunner(verbosity=verbose_level).run(suite) diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py index a925b6b..ed52d5f 100755 --- a/tests/vty_test_runner.py +++ b/tests/vty_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # (C) 2013 by Holger Hans Peter Freyther @@ -33,9 +33,9 @@ def checkForEndAndExit(self): res = self.vty.command("list") #print ('looking for "exit"\n') - self.assert_(res.find(' exit\r') > 0) + self.assertTrue(res.find(' exit\r') > 0) #print 'found "exit"\nlooking for "end"\n' - self.assert_(res.find(' end\r') > 0) + self.assertTrue(res.find(' end\r') > 0) #print 'found "end"\n' def vty_command(self): @@ -54,8 +54,8 @@ try: self.proc = osmoutil.popen_devnull(osmo_vty_cmd) except OSError: - print >> sys.stderr, "Current directory: %s" % os.getcwd() - print >> sys.stderr, "Consider setting -b" + print("Current directory: %s" % os.getcwd(), file=sys.stderr) + print("Consider setting -b", file=sys.stderr) appstring = self.vty_app()[2] appport = self.vty_app()[0] @@ -80,41 +80,41 @@ def testVtyTree(self): self.vty.enable() self.assertTrue(self.vty.verify('configure terminal', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.checkForEndAndExit() self.assertTrue(self.vty.verify('ns', [''])) - self.assertEquals(self.vty.node(), 'config-ns') + self.assertEqual(self.vty.node(), 'config-ns') self.checkForEndAndExit() self.assertTrue(self.vty.verify('exit', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('gbproxy', [''])) - self.assertEquals(self.vty.node(), 'config-gbproxy') + self.assertEqual(self.vty.node(), 'config-gbproxy') self.checkForEndAndExit() self.assertTrue(self.vty.verify('exit', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') def testVtyShow(self): res = self.vty.command("show ns") - self.assert_(res.find('Encapsulation NS-UDP-IP') >= 0) + self.assertTrue(res.find('Encapsulation NS-UDP-IP') >= 0) res = self.vty.command("show gbproxy stats") - self.assert_(res.find('GBProxy Global Statistics') >= 0) + self.assertTrue(res.find('GBProxy Global Statistics') >= 0) def testVtyDeletePeer(self): self.vty.enable() self.assertTrue(self.vty.verify('delete-gbproxy-peer 9999 bvci 7777', ['BVC not found'])) res = self.vty.command("delete-gbproxy-peer 9999 all dry-run") - self.assert_(res.find('Not Deleted 0 BVC') >= 0) - self.assert_(res.find('Not Deleted 0 NS-VC') >= 0) + self.assertTrue(res.find('Not Deleted 0 BVC') >= 0) + self.assertTrue(res.find('Not Deleted 0 NS-VC') >= 0) res = self.vty.command("delete-gbproxy-peer 9999 only-bvc dry-run") - self.assert_(res.find('Not Deleted 0 BVC') >= 0) - self.assert_(res.find('Not Deleted 0 NS-VC') < 0) + self.assertTrue(res.find('Not Deleted 0 BVC') >= 0) + self.assertTrue(res.find('Not Deleted 0 NS-VC') < 0) res = self.vty.command("delete-gbproxy-peer 9999 only-nsvc dry-run") - self.assert_(res.find('Not Deleted 0 BVC') < 0) - self.assert_(res.find('Not Deleted 0 NS-VC') >= 0) + self.assertTrue(res.find('Not Deleted 0 BVC') < 0) + self.assertTrue(res.find('Not Deleted 0 NS-VC') >= 0) res = self.vty.command("delete-gbproxy-peer 9999 all") - self.assert_(res.find('Deleted 0 BVC') >= 0) - self.assert_(res.find('Deleted 0 NS-VC') >= 0) + self.assertTrue(res.find('Deleted 0 BVC') >= 0) + self.assertTrue(res.find('Deleted 0 NS-VC') >= 0) class TestVTYSGSN(TestVTYBase): @@ -128,22 +128,22 @@ def testVtyTree(self): self.vty.enable() self.assertTrue(self.vty.verify('configure terminal', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.checkForEndAndExit() self.assertTrue(self.vty.verify('ns', [''])) - self.assertEquals(self.vty.node(), 'config-ns') + self.assertEqual(self.vty.node(), 'config-ns') self.checkForEndAndExit() self.assertTrue(self.vty.verify('exit', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('sgsn', [''])) - self.assertEquals(self.vty.node(), 'config-sgsn') + self.assertEqual(self.vty.node(), 'config-sgsn') self.checkForEndAndExit() self.assertTrue(self.vty.verify('exit', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') def testVtyShow(self): res = self.vty.command("show ns") - self.assert_(res.find('Encapsulation NS-UDP-IP') >= 0) + self.assertTrue(res.find('Encapsulation NS-UDP-IP') >= 0) self.assertTrue(self.vty.verify('show bssgp', [''])) self.assertTrue(self.vty.verify('show bssgp stats', [''])) self.assertTrue(self.vty.verify('show bssgp nsei 123', [''])) @@ -154,57 +154,57 @@ self.assertTrue(self.vty.verify('show pdp-context all', [''])) res = self.vty.command("show sndcp") - self.assert_(res.find('State of SNDCP Entities') >= 0) + self.assertTrue(res.find('State of SNDCP Entities') >= 0) res = self.vty.command("show llc") - self.assert_(res.find('State of LLC Entities') >= 0) + self.assertTrue(res.find('State of LLC Entities') >= 0) def testVtyAuth(self): self.vty.enable() self.assertTrue(self.vty.verify('configure terminal', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('sgsn', [''])) - self.assertEquals(self.vty.node(), 'config-sgsn') + self.assertEqual(self.vty.node(), 'config-sgsn') self.assertTrue(self.vty.verify('auth-policy accept-all', [''])) res = self.vty.command("show running-config") - self.assert_(res.find('auth-policy accept-all') > 0) + self.assertTrue(res.find('auth-policy accept-all') > 0) self.assertTrue(self.vty.verify('auth-policy acl-only', [''])) res = self.vty.command("show running-config") - self.assert_(res.find('auth-policy acl-only') > 0) + self.assertTrue(res.find('auth-policy acl-only') > 0) self.assertTrue(self.vty.verify('auth-policy closed', [''])) res = self.vty.command("show running-config") - self.assert_(res.find('auth-policy closed') > 0) + self.assertTrue(res.find('auth-policy closed') > 0) self.assertTrue(self.vty.verify('gsup remote-ip 127.0.0.4', [''])) self.assertTrue(self.vty.verify('gsup remote-port 2222', [''])) self.assertTrue(self.vty.verify('auth-policy remote', [''])) res = self.vty.command("show running-config") - self.assert_(res.find('auth-policy remote') > 0) + self.assertTrue(res.find('auth-policy remote') > 0) def testVtySubscriber(self): self.vty.enable() res = self.vty.command('show subscriber cache') - self.assert_(res.find('1234567890') < 0) + self.assertTrue(res.find('1234567890') < 0) self.assertTrue(self.vty.verify('update-subscriber imsi 1234567890 create', [''])) res = self.vty.command('show subscriber cache') - self.assert_(res.find('1234567890') >= 0) - self.assert_(res.find('Authorized: 0') >= 0) + self.assertTrue(res.find('1234567890') >= 0) + self.assertTrue(res.find('Authorized: 0') >= 0) self.assertTrue(self.vty.verify('update-subscriber imsi 1234567890 update-location-result ok', [''])) res = self.vty.command('show subscriber cache') - self.assert_(res.find('1234567890') >= 0) - self.assert_(res.find('Authorized: 1') >= 0) + self.assertTrue(res.find('1234567890') >= 0) + self.assertTrue(res.find('Authorized: 1') >= 0) self.assertTrue(self.vty.verify('update-subscriber imsi 1234567890 cancel update-procedure', [''])) res = self.vty.command('show subscriber cache') - self.assert_(res.find('1234567890') >= 0) + self.assertTrue(res.find('1234567890') >= 0) self.assertTrue(self.vty.verify('update-subscriber imsi 1234567890 destroy', [''])) res = self.vty.command('show subscriber cache') - self.assert_(res.find('1234567890') < 0) + self.assertTrue(res.find('1234567890') < 0) def testVtyGgsn(self): self.vty.enable() self.assertTrue(self.vty.verify('configure terminal', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('sgsn', [''])) - self.assertEquals(self.vty.node(), 'config-sgsn') + self.assertEqual(self.vty.node(), 'config-sgsn') self.assertTrue(self.vty.verify('ggsn 0 remote-ip 127.99.99.99', [''])) self.assertTrue(self.vty.verify('ggsn 0 gtp-version 1', [''])) self.assertTrue(self.vty.verify('apn * ggsn 0', [''])) @@ -213,65 +213,65 @@ self.assertTrue(self.vty.verify('apn apn1.test imsi-prefix 123456 ggsn 0', [''])) self.assertTrue(self.vty.verify('apn apn2.test imsi-prefix 123456 ggsn 0', [''])) res = self.vty.command("show running-config") - self.assert_(res.find('ggsn 0 remote-ip 127.99.99.99') >= 0) - self.assert_(res.find('ggsn 0 gtp-version 1') >= 0) - self.assert_(res.find('apn * ggsn 0') >= 0) - self.assert_(res.find('apn apn1.test ggsn 0') >= 0) - self.assert_(res.find('apn apn1.test imsi-prefix 123456 ggsn 0') >= 0) - self.assert_(res.find('apn apn2.test imsi-prefix 123456 ggsn 0') >= 0) + self.assertTrue(res.find('ggsn 0 remote-ip 127.99.99.99') >= 0) + self.assertTrue(res.find('ggsn 0 gtp-version 1') >= 0) + self.assertTrue(res.find('apn * ggsn 0') >= 0) + self.assertTrue(res.find('apn apn1.test ggsn 0') >= 0) + self.assertTrue(res.find('apn apn1.test imsi-prefix 123456 ggsn 0') >= 0) + self.assertTrue(res.find('apn apn2.test imsi-prefix 123456 ggsn 0') >= 0) def testVtyEasyAPN(self): self.vty.enable() self.assertTrue(self.vty.verify('configure terminal', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('sgsn', [''])) - self.assertEquals(self.vty.node(), 'config-sgsn') + self.assertEqual(self.vty.node(), 'config-sgsn') res = self.vty.command("show running-config") - self.assertEquals(res.find("apn internet"), -1) + self.assertEqual(res.find("apn internet"), -1) self.assertTrue(self.vty.verify("access-point-name internet.apn", [''])) res = self.vty.command("show running-config") - self.assert_(res.find("apn internet.apn ggsn 0") >= 0) + self.assertTrue(res.find("apn internet.apn ggsn 0") >= 0) self.assertTrue(self.vty.verify("no access-point-name internet.apn", [''])) res = self.vty.command("show running-config") - self.assertEquals(res.find("apn internet"), -1) + self.assertEqual(res.find("apn internet"), -1) def testVtyCDR(self): self.vty.enable() self.assertTrue(self.vty.verify('configure terminal', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('sgsn', [''])) - self.assertEquals(self.vty.node(), 'config-sgsn') + self.assertEqual(self.vty.node(), 'config-sgsn') res = self.vty.command("show running-config") - self.assert_(res.find("no cdr filename") > 0) + self.assertTrue(res.find("no cdr filename") > 0) self.vty.command("cdr filename bla.cdr") res = self.vty.command("show running-config") - self.assertEquals(res.find("no cdr filename"), -1) - self.assert_(res.find(" cdr filename bla.cdr") > 0) + self.assertEqual(res.find("no cdr filename"), -1) + self.assertTrue(res.find(" cdr filename bla.cdr") > 0) self.vty.command("no cdr filename") res = self.vty.command("show running-config") - self.assert_(res.find("no cdr filename") > 0) - self.assertEquals(res.find(" cdr filename bla.cdr"), -1) + self.assertTrue(res.find("no cdr filename") > 0) + self.assertEqual(res.find(" cdr filename bla.cdr"), -1) res = self.vty.command("show running-config") - self.assert_(res.find(" cdr interval 600") > 0) + self.assertTrue(res.find(" cdr interval 600") > 0) self.vty.command("cdr interval 900") res = self.vty.command("show running-config") - self.assert_(res.find(" cdr interval 900") > 0) - self.assertEquals(res.find(" cdr interval 600"), -1) + self.assertTrue(res.find(" cdr interval 900") > 0) + self.assertEqual(res.find(" cdr interval 600"), -1) def testVtyTimers(self): self.vty.enable() self.assertTrue(self.vty.verify('configure terminal', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('sgsn', [''])) - self.assertEquals(self.vty.node(), 'config-sgsn') + self.assertEqual(self.vty.node(), 'config-sgsn') for t in [3312, 3322, 3350, 3360, 3370, 3313, 3314, 3316, 3385, 3395, 3397]: self.assertTrue(self.vty.verify('timer t%d 10' % t, [''])) @@ -316,9 +316,9 @@ if args.p: confpath = args.p - print "confpath %s, workdir %s" % (confpath, workdir) + print("confpath %s, workdir %s" % (confpath, workdir)) os.chdir(workdir) - print "Running tests for specific VTY commands" + print("Running tests for specific VTY commands") suite = unittest.TestSuite() add_gbproxy_test(suite, workdir) add_sgsn_test(suite, workdir) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8c07d99c1bc9f0383e4bce17544e0998998cc54d Gerrit-Change-Number: 16552 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 11:13:13 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 11 Dec 2019 11:13:13 +0000 Subject: Change in osmo-sip-connector[master]: osmoappdesc.py: switch to python 3 References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16553 ) Change subject: osmoappdesc.py: switch to python 3 ...................................................................... osmoappdesc.py: switch to python 3 Make build and external tests work with python3, so we can drop the python2 dependency. This should be merged shortly after osmo-python-tests was migrated to python3, and the jenkins build slaves were (automatically) updated to have the new osmo-python-tests installed. Related: OS#2819 Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Change-Id: Ic913e336a5a962fe9515479b03eecdbef0917721 --- M osmoappdesc.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/53/16553/1 diff --git a/osmoappdesc.py b/osmoappdesc.py index adb9662..e0263b5 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2016 by Holger Hans Peter Freyther -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16553 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ic913e336a5a962fe9515479b03eecdbef0917721 Gerrit-Change-Number: 16553 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 11:20:31 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 11 Dec 2019 11:20:31 +0000 Subject: Change in osmo-ci[master]: docker: drop python2 References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16554 ) Change subject: docker: drop python2 ...................................................................... docker: drop python2 Re-apply patch Iacace670bdb949e67227e0faa1765e36bba42018, after providing additional patches to make all Osmocom repositories, that use external tests, work with python3 (after learning the hard way, that they were not really python3 compatible yet, although they looked like it): https://gerrit.osmocom.org/q/topic:drop-py2 This patch should not be merged, before all other patches from that topic are merged. Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Related: OS#2819 Change-Id: I7b5385416d5c48a2f4e07449192b3f74223cb094 --- M docker/Dockerfile_osmocom_jenkins.amd64 1 file changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/54/16554/1 diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64 index 2209fc6..63b6e74 100644 --- a/docker/Dockerfile_osmocom_jenkins.amd64 +++ b/docker/Dockerfile_osmocom_jenkins.amd64 @@ -85,7 +85,6 @@ osc \ patchelf \ pkg-config \ - python \ python3 \ python3-gi \ python3-mako \ @@ -95,10 +94,6 @@ python3-setuptools \ python3-usb \ python3-yaml \ - python-minimal \ - python-pip \ - python-pychart \ - python-setuptools \ rsync \ sdcc \ sqlite3 \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16554 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7b5385416d5c48a2f4e07449192b3f74223cb094 Gerrit-Change-Number: 16554 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 11:21:29 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 11 Dec 2019 11:21:29 +0000 Subject: Change in osmo-ci[master]: docker: drop python2 (again) In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ci/+/16554 ) Change subject: docker: drop python2 (again) ...................................................................... docker: drop python2 (again) Re-apply patch Iacace670bdb949e67227e0faa1765e36bba42018, after providing additional patches to make all Osmocom repositories, that use external tests, work with python3 (after learning the hard way, that they were not really python3 compatible yet, although they looked like it): https://gerrit.osmocom.org/q/topic:drop-py2 This patch should not be merged, before all other patches from that topic are merged. Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Related: OS#2819 Change-Id: I7b5385416d5c48a2f4e07449192b3f74223cb094 --- M docker/Dockerfile_osmocom_jenkins.amd64 1 file changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/54/16554/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16554 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7b5385416d5c48a2f4e07449192b3f74223cb094 Gerrit-Change-Number: 16554 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 11:25:39 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 11 Dec 2019 11:25:39 +0000 Subject: Change in osmo-ci[master]: docker: drop python2 (again) In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16554 ) Change subject: docker: drop python2 (again) ...................................................................... Patch Set 2: Setting to WIP, as this is definitively the last patch that should be merged (as mentioned in the commit message). All other patches from the drop-py2 topic can be merged beforehand. I may also do some further testing before merging it; right now I'm pretty certain that all Osmocom repositories using external tests will not need python2 anymore. See related patches for that, and testing in my own OBS namespace: https://build.opensuse.org/project/show/home:osmith42 - But other Osmocom repositories may still depend on python2. So to be safe I should probably run the jenkins.sh scripts from all repositories with this new docker image (like I did when upgrading the docker image from jessie to stretch). -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16554 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7b5385416d5c48a2f4e07449192b3f74223cb094 Gerrit-Change-Number: 16554 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 11 Dec 2019 11:25:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 11:28:55 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 11 Dec 2019 11:28:55 +0000 Subject: Change in ...osmo-python-tests[master]: Drop python2 support (again) In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16540 to look at the new patch set (#2). Change subject: Drop python2 support (again) ...................................................................... Drop python2 support (again) Re-apply reverted commit Iabda95073faa2191fd117e9637e0858c589e9d9e ("Drop python2 support"), but with additional changes to make the scripts actually work with python3 and to make it build without python2. I have verified, that the contrib/jenkins.sh scripts of all Osmocom repositories (with their python3 patches on top) are working with this patch and that all Osmocom repositories with the python3 patches build in OBS (tested in own namespace). All related patches for changing from python2 to 3 in other repositories must be merged shortly after this one, as soon as the build slaves were (automatically) updated to have the new osmo-python-tests installed: https://gerrit.osmocom.org/q/topic:drop-py2 New fixes: * osmopy/obscvty.py: verify: fix compare Comparing maps in python3 does not work the same as in python2. Convert them to lists first, so the compare works as intended again. Fix error: File "/home/user/code/osmo-dev/src/osmo-python-tests/scripts/osmotestvty.py", line 57, in test_history assert(self.vty.w_verify(test_str, [t1])) AssertionError * osmopy/obscvty.py: use enc/dec with send/recv Fix error: self.socket.send("%s\r" % request) TypeError: a bytes-like object is required, not 'str' * scripts/osmotestconfig.py: use encode() before writing to file Fix error: File "/home/user/code/osmo-dev/src/osmo-python-tests/scripts/osmotestconfig.py", line 91, in copy_config tmpfile.write(open(config).read()) File "/usr/lib/python3.5/tempfile.py", line 622, in func_wrapper return func(*args, **kwargs) TypeError: a bytes-like object is required, not 'str' * debian/control: add --buildsystem=pybuild. Otherwise "--with python3" is ignored and the build fails if python2 is not installed, with: Can't exec "pyversions": No such file or directory at /usr/[...]/python_distutils.pm line 120. Related: OS#2819 Change-Id: I3ffc3519bf6c22536a49dad7a966188ddad351a7 --- M contrib/jenkins.sh M debian/control M debian/rules M osmopy/__init__.py M osmopy/obscvty.py M osmopy/osmo_interact/__init__.py M osmopy/osmo_interact/common.py M osmopy/osmoutil.py M scripts/osmodumpdoc.py M scripts/osmotestconfig.py M scripts/osmotestvty.py M setup.py D tests/test_py2.py 13 files changed, 28 insertions(+), 77 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/40/16540/2 -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I3ffc3519bf6c22536a49dad7a966188ddad351a7 Gerrit-Change-Number: 16540 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 11:33:17 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 11 Dec 2019 11:33:17 +0000 Subject: Change in ...osmo-python-tests[master]: Drop python2 support (again) In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16540 ) Change subject: Drop python2 support (again) ...................................................................... Patch Set 2: Mentioned OBS tests: https://build.opensuse.org/project/monitor/home:osmith42 There are some unrelated errors, like limesuite not building. But everything that I've touched with the python3 patches has built successfully on a few distributions already, without failures, and building for remaining distributions is queued. -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I3ffc3519bf6c22536a49dad7a966188ddad351a7 Gerrit-Change-Number: 16540 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 11 Dec 2019 11:33:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 12:34:02 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 12:34:02 +0000 Subject: Change in libosmo-sccp[master]: gitignore: add various generated doc files In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16541 ) Change subject: gitignore: add various generated doc files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I14eac5a1e7bc5ff202fc57d76c1b84d4e0050ca8 Gerrit-Change-Number: 16541 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 11 Dec 2019 12:34:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 12:34:04 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 12:34:04 +0000 Subject: Change in libosmo-sccp[master]: gitignore: add various generated doc files In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16541 ) Change subject: gitignore: add various generated doc files ...................................................................... gitignore: add various generated doc files Change-Id: I14eac5a1e7bc5ff202fc57d76c1b84d4e0050ca8 --- M .gitignore 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index 289ed0d..848c94c 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,6 @@ doc/manuals/osmomsc-usermanual.xml doc/manuals/common doc/manuals/build +doc/html.tar +doc/libosmo-sigtran.tag +doc/sigtran -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I14eac5a1e7bc5ff202fc57d76c1b84d4e0050ca8 Gerrit-Change-Number: 16541 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 12:35:42 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 12:35:42 +0000 Subject: Change in ...osmo-python-tests[master]: Drop python2 support (again) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16540 ) Change subject: Drop python2 support (again) ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I3ffc3519bf6c22536a49dad7a966188ddad351a7 Gerrit-Change-Number: 16540 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 11 Dec 2019 12:35:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 12:36:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 12:36:07 +0000 Subject: Change in libosmo-sccp[master]: osmoappdesc.py, tests: switch to python 3 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16542 ) Change subject: osmoappdesc.py, tests: switch to python 3 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I344c49001fba23bdcfdef06ab174c52b60edd01c Gerrit-Change-Number: 16542 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 11 Dec 2019 12:36:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 12:36:22 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 12:36:22 +0000 Subject: Change in libosmocore[master]: debian, utils: switch to python 3 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16543 ) Change subject: debian, utils: switch to python 3 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16543 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I84ef43f700e125c7a65f92347f12844e07e65655 Gerrit-Change-Number: 16543 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 11 Dec 2019 12:36:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 12:36:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 12:36:32 +0000 Subject: Change in osmo-hlr[master]: tests/auc: change back to python3 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16546 ) Change subject: tests/auc: change back to python3 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ifbb8f8f5428657a1c2d4d6d1217f8e374be43aba Gerrit-Change-Number: 16546 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 11 Dec 2019 12:36:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 12:37:14 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 12:37:14 +0000 Subject: Change in openbsc[master]: osmoappdesc.py, tests, ipa.py: switch to python 3 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/16544 ) Change subject: osmoappdesc.py, tests, ipa.py: switch to python 3 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/16544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Id7d006f892198bb8a7c0d4a8a8ea00b8d0e62df4 Gerrit-Change-Number: 16544 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 11 Dec 2019 12:37:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 12:37:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 12:37:51 +0000 Subject: Change in osmo-bsc[master]: debian, osmoappdesc.py, tests: switch to python 3 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16545 ) Change subject: debian, osmoappdesc.py, tests: switch to python 3 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I438ca0c4b8e7957d0f347a5b2f5c4cb93f9325e6 Gerrit-Change-Number: 16545 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 11 Dec 2019 12:37:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 12:37:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 12:37:59 +0000 Subject: Change in osmo-pcap[master]: osmoappdesc.py: switch to python 3 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/16551 ) Change subject: osmoappdesc.py: switch to python 3 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/16551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I19a996458745026cff60608710944e5ab76d8976 Gerrit-Change-Number: 16551 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 11 Dec 2019 12:37:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 12:38:08 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 12:38:08 +0000 Subject: Change in osmo-mgw[master]: osmoappdesc.py: switch to python 3 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/16549 ) Change subject: osmoappdesc.py: switch to python 3 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/16549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I48f4c2c520e8285aff5d6d65f95bd041c13466e8 Gerrit-Change-Number: 16549 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 11 Dec 2019 12:38:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 12:38:14 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 12:38:14 +0000 Subject: Change in osmo-sip-connector[master]: osmoappdesc.py: switch to python 3 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16553 ) Change subject: osmoappdesc.py: switch to python 3 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16553 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ic913e336a5a962fe9515479b03eecdbef0917721 Gerrit-Change-Number: 16553 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 11 Dec 2019 12:38:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 12:39:16 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 12:39:16 +0000 Subject: Change in osmo-sgsn[master]: osmoappdesc.py, tests: switch to python 3 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16552 ) Change subject: osmoappdesc.py, tests: switch to python 3 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8c07d99c1bc9f0383e4bce17544e0998998cc54d Gerrit-Change-Number: 16552 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 11 Dec 2019 12:39:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 12:39:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 12:39:43 +0000 Subject: Change in osmo-msc[master]: osmoappdesc.py, tests: switch to python 3 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16550 ) Change subject: osmoappdesc.py, tests: switch to python 3 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I53ccde96dd3785098df0f7d693c504c8b8302e90 Gerrit-Change-Number: 16550 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 11 Dec 2019 12:39:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 12:39:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 12:39:53 +0000 Subject: Change in osmo-iuh[master]: gitignore: add gen_sabp.stamp In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16547 ) Change subject: gitignore: add gen_sabp.stamp ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16547 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I107d2c0e8c82523a8fb38f128bb81e32e437bdd8 Gerrit-Change-Number: 16547 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 11 Dec 2019 12:39:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 12:40:00 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 12:40:00 +0000 Subject: Change in osmo-iuh[master]: gitignore: add gen_sabp.stamp In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16547 ) Change subject: gitignore: add gen_sabp.stamp ...................................................................... gitignore: add gen_sabp.stamp Change-Id: I107d2c0e8c82523a8fb38f128bb81e32e437bdd8 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 49b2cfb..e32000c 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,7 @@ gen_hnbap.stamp gen_rua.stamp gen_ranap.stamp +gen_sabp.stamp include/osmocom/hnbap/hnbap_ies_defs.h include/osmocom/rua/rua_ies_defs.h include/osmocom/ranap/ranap_ies_defs.h -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16547 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I107d2c0e8c82523a8fb38f128bb81e32e437bdd8 Gerrit-Change-Number: 16547 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 12:40:21 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 12:40:21 +0000 Subject: Change in osmo-iuh[master]: debian, asn1tostruct.py: switch to python3 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16548 ) Change subject: debian, asn1tostruct.py: switch to python3 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16548 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Idb9d7a349ddb7619c784823f740648c7956bae5e Gerrit-Change-Number: 16548 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 11 Dec 2019 12:40:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 12:42:05 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 12:42:05 +0000 Subject: Change in libosmocore[master]: core/defs.h: introduce and use OSMO_DEPRECATED_OUTSIDE In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/14864 ) Change subject: core/defs.h: introduce and use OSMO_DEPRECATED_OUTSIDE ...................................................................... core/defs.h: introduce and use OSMO_DEPRECATED_OUTSIDE The new OSMO_DEPRECATED_OUTSIDE macro is similar to the existing OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE, but allows to override the deprecation message. Let's use it to suspend deprecation warnings related to: - gsm48_decode_bcd_number(), - osmo_ecu_fr_conceal(), - osmo_ecu_fr_reset(), as they're intentionally used in scope of the library. Change-Id: I1b0eff1396776900c1286e41da3aee3ff78b326e --- M include/osmocom/codec/ecu.h M include/osmocom/core/defs.h M include/osmocom/gsm/gsm48_ie.h 3 files changed, 7 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/codec/ecu.h b/include/osmocom/codec/ecu.h index 99b1430..668df36 100644 --- a/include/osmocom/codec/ecu.h +++ b/include/osmocom/codec/ecu.h @@ -3,6 +3,7 @@ #include #include +#include #include /* ECU state for GSM-FR */ @@ -12,9 +13,9 @@ }; void osmo_ecu_fr_reset(struct osmo_ecu_fr_state *state, const uint8_t *frame) - OSMO_DEPRECATED("Use generic ECU abstraction layer instead"); + OSMO_DEPRECATED_OUTSIDE("Use generic ECU abstraction layer instead"); int osmo_ecu_fr_conceal(struct osmo_ecu_fr_state *state, uint8_t *frame) - OSMO_DEPRECATED("Use generic ECU abstraction layer instead"); + OSMO_DEPRECATED_OUTSIDE("Use generic ECU abstraction layer instead"); enum osmo_ecu_codec { OSMO_ECU_CODEC_HR, diff --git a/include/osmocom/core/defs.h b/include/osmocom/core/defs.h index 5e5aa90..33ffb7b 100644 --- a/include/osmocom/core/defs.h +++ b/include/osmocom/core/defs.h @@ -43,8 +43,10 @@ #if BUILDING_LIBOSMOCORE # define OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE +# define OSMO_DEPRECATED_OUTSIDE(text) #else # define OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE OSMO_DEPRECATED("For internal use inside libosmocore only.") +# define OSMO_DEPRECATED_OUTSIDE(text) OSMO_DEPRECATED(text) #endif #undef _OSMO_HAS_ATTRIBUTE_DEPRECATED_WITH_MESSAGE diff --git a/include/osmocom/gsm/gsm48_ie.h b/include/osmocom/gsm/gsm48_ie.h index 71050df..339aa13 100644 --- a/include/osmocom/gsm/gsm48_ie.h +++ b/include/osmocom/gsm/gsm48_ie.h @@ -7,6 +7,7 @@ #include #include +#include #include #include #include @@ -14,7 +15,7 @@ /* decode a 'called/calling/connect party BCD number' as in 10.5.4.7 */ int gsm48_decode_bcd_number(char *output, int output_len, const uint8_t *bcd_lv, int h_len) - OSMO_DEPRECATED("Use gsm48_decode_bcd_number2() for improved bounds checking"); + OSMO_DEPRECATED_OUTSIDE("Use gsm48_decode_bcd_number2() for improved bounds checking"); int gsm48_decode_bcd_number2(char *output, size_t output_len, const uint8_t *bcd_lv, size_t input_len, size_t h_len); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1b0eff1396776900c1286e41da3aee3ff78b326e Gerrit-Change-Number: 14864 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 13:58:25 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 13:58:25 +0000 Subject: Change in openbsc[master]: osmoappdesc.py, tests, ipa.py: switch to python 3 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/16544 ) Change subject: osmoappdesc.py, tests, ipa.py: switch to python 3 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/16544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Id7d006f892198bb8a7c0d4a8a8ea00b8d0e62df4 Gerrit-Change-Number: 16544 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 11 Dec 2019 13:58:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 13:58:44 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 13:58:44 +0000 Subject: Change in ...osmo-python-tests[master]: Drop python2 support (again) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16540 ) Change subject: Drop python2 support (again) ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I3ffc3519bf6c22536a49dad7a966188ddad351a7 Gerrit-Change-Number: 16540 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 11 Dec 2019 13:58:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 13:59:00 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 13:59:00 +0000 Subject: Change in libosmo-sccp[master]: osmoappdesc.py, tests: switch to python 3 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16542 ) Change subject: osmoappdesc.py, tests: switch to python 3 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I344c49001fba23bdcfdef06ab174c52b60edd01c Gerrit-Change-Number: 16542 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 11 Dec 2019 13:59:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 16:20:21 2019 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Wed, 11 Dec 2019 16:20:21 +0000 Subject: Change in simtrace2[master]: Makefile: add linker option showing memory usage References: Message-ID: tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16555 ) Change subject: Makefile: add linker option showing memory usage ...................................................................... Makefile: add linker option showing memory usage this will help seeing how much free space is available for the bootloader (which is restricted to 16 kB) Change-Id: Ie74a1480c2f340765046be9bdfc3a8c4ba851e9b --- M firmware/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/55/16555/1 diff --git a/firmware/Makefile b/firmware/Makefile index 79e9a31..bd634aa 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -170,7 +170,7 @@ CFLAGS += -DBOARD=\"$(BOARD)\" -DBOARD_$(BOARD) CFLAGS += -DAPPLICATION=\"$(APP)\" -DAPPLICATION_$(APP) ASFLAGS = -mcpu=cortex-m3 -mthumb -Wall -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -D__ASSEMBLY__ -LDFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=ResetException -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols $(LIB) +LDFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=ResetException -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--print-memory-usage $(LIB) #LD_OPTIONAL=-Wl,--print-gc-sections -Wl,--stats # Append BIN directories to output filename -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie74a1480c2f340765046be9bdfc3a8c4ba851e9b Gerrit-Change-Number: 16555 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 16:20:21 2019 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Wed, 11 Dec 2019 16:20:21 +0000 Subject: Change in simtrace2[master]: improve shared bootloader/application memory References: Message-ID: tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16556 ) Change subject: improve shared bootloader/application memory ...................................................................... improve shared bootloader/application memory now both partitions (bootloader and application) use a commonly defined memory location to shared the DFU state (which includes the magic value to know which part to start), instead of using a hard coded value. the bootloader size has now also been restricted to 16 kB. this limitation is enforced so to not be able to create larger images, which could be corrupted when flashing the application. bootloader and application flashing have been successfully tested on qmod st12 and st34. Change-Id: I204bed7e9391602672ed894decec1fc12e879275 --- M firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c M firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c M firmware/libboard/common/resources/sam3s4/dfu.ld M firmware/libboard/common/resources/sam3s4/flash.ld 4 files changed, 17 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/56/16556/1 diff --git a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c index 3ffd9b3..e95c67b 100644 --- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c +++ b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c @@ -33,8 +33,7 @@ #include #include -/* FIXME: this was used for a special ELF section which then got called - * by DFU code and Application code, across flash partitions */ +/** specific memory location shared across bootloader and application */ #define __dfudata __attribute__ ((section (".dfudata"))) #define __dfufunc @@ -42,11 +41,14 @@ static USBDDriver usbdDriver; static unsigned char if_altsettings[1]; +/** structure containing the DFU state and magic value to know if DFU or application should be started */ __dfudata struct dfudata _g_dfu = { .state = DFU_STATE_appIDLE, .past_manifest = 0, .total_bytes = 0, }; + +/** variable to structure containing DFU state */ struct dfudata *g_dfu = &_g_dfu; WEAK void dfu_drv_updstatus(void) diff --git a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c index ac4d7df..4f772be 100644 --- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c +++ b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c @@ -36,7 +36,12 @@ #include #include -struct dfudata *g_dfu = (struct dfudata *) IRAM_ADDR; +/** specific memory location shared across bootloader and application */ +#define __dfudata __attribute__ ((section (".dfudata"))) +/** structure containing the magic value to know if DFU or application should be started */ +__dfudata struct dfudata _g_dfu; +/** variable to structure containing the magic value to know if DFU or application should be started */ +struct dfudata *g_dfu = &_g_dfu; /* FIXME: this was used for a special ELF section which then got called * by DFU code and Application code, across flash partitions */ diff --git a/firmware/libboard/common/resources/sam3s4/dfu.ld b/firmware/libboard/common/resources/sam3s4/dfu.ld index e56a435..a485770 100644 --- a/firmware/libboard/common/resources/sam3s4/dfu.ld +++ b/firmware/libboard/common/resources/sam3s4/dfu.ld @@ -39,9 +39,9 @@ MEMORY { /* reserve the first 16k (= 0x4000) for the DFU bootloader */ - rom (rx) : ORIGIN = 0x00404000, LENGTH = 0x0003c000 /* flash, 256K */ - /* reserve the first 32 (= 0x20) bytes for the _g_dfu struct */ - ram (rwx) : ORIGIN = 0x20000020, LENGTH = 0x0000bfe0 /* sram, 48K */ + rom (rx) : ORIGIN = 0x00400000 + 16K, LENGTH = 256K - 16K /* flash, 256K */ + /* note: dfudata will be at the start */ + ram (rwx) : ORIGIN = 0x20000000, LENGTH = 48K /* SRAM, 48K */ } /* Section Definitions */ @@ -111,6 +111,8 @@ { . = ALIGN(4); _srelocate = .; + /* we must make sure the .dfudata is linked to start of RAM */ + *(.dfudata .dfudata.*); *(.ramfunc .ramfunc.*); *(.data .data.*); . = ALIGN(4); diff --git a/firmware/libboard/common/resources/sam3s4/flash.ld b/firmware/libboard/common/resources/sam3s4/flash.ld index bdebbde..f5cdbfd 100644 --- a/firmware/libboard/common/resources/sam3s4/flash.ld +++ b/firmware/libboard/common/resources/sam3s4/flash.ld @@ -38,8 +38,8 @@ /* Memory Spaces Definitions */ MEMORY { - rom (rx) : ORIGIN = 0x00400000, LENGTH = 0x00040000 /* flash, 256K */ - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x0000c000 /* sram, 48K */ + rom (rx) : ORIGIN = 0x00400000, LENGTH = 16K /* flash, 256K, but only the first 16K should be used for the bootloader */ + ram (rwx) : ORIGIN = 0x20000000, LENGTH = 48K /* SRAM, 48K */ } /* Section Definitions */ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I204bed7e9391602672ed894decec1fc12e879275 Gerrit-Change-Number: 16556 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 16:20:21 2019 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Wed, 11 Dec 2019 16:20:21 +0000 Subject: Change in simtrace2[master]: minor: improve trace output References: Message-ID: tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16557 ) Change subject: minor: improve trace output ...................................................................... minor: improve trace output the USB trace now respects the global setting. the verbosity is also decreased, not showing USB activity unless debugging. this also saves some space. the reset cause is now printed. the strings increase the bootloader size, but it already exceeded the 16 kB limit when trace level is set to info. Change-Id: I9ba08d4bb4f188f6e7a202ea86acb7a42a2054f3 --- M firmware/apps/dfu/main.c M firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c M firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c 3 files changed, 23 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/57/16557/1 diff --git a/firmware/apps/dfu/main.c b/firmware/apps/dfu/main.c index 3d0cc1e..5aafc7c 100644 --- a/firmware/apps/dfu/main.c +++ b/firmware/apps/dfu/main.c @@ -257,11 +257,24 @@ "=============================================================================\n\r", manifest_revision, manifest_board); - TRACE_INFO("Chip ID: 0x%08x (Ext 0x%08x)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID); +#if (TRACE_LEVEL >= TRACE_LEVEL_INFO) + TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID); TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r", g_unique_id[0], g_unique_id[1], g_unique_id[2], g_unique_id[3]); - TRACE_INFO("Reset Cause: 0x%lx\n\r", reset_cause); + static const char* reset_causes[] = { + "general reset (first power-up reset)", + "backup reset (return from backup mode)", + "watchdog reset (watchdog fault occurred)", + "software reset (processor reset required by the software)", + "user reset (NRST pin detected low)", + }; + if (reset_cause < ARRAY_SIZE(reset_causes)) { + TRACE_INFO("Reset Cause: %s\n\r", reset_causes[reset_cause]); + } else { + TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos); + } +#endif #if (TRACE_LEVEL >= TRACE_LEVEL_INFO) /* Find out why we are in the DFU bootloader, and not the main application */ diff --git a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c index 2f56602..3fe3270 100644 --- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c +++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c @@ -45,11 +45,6 @@ * Headers *---------------------------------------------------------------------------*/ -#ifdef TRACE_LEVEL -#undef TRACE_LEVEL -#endif -#define TRACE_LEVEL TRACE_LEVEL_WARNING - #include "chip.h" #include "USBD_HAL.h" #include @@ -1138,7 +1133,7 @@ /* Resume (Wakeup) */ if ((status & (UDP_ISR_WAKEUP | UDP_ISR_RXRSM)) != 0) { - TRACE_INFO_WP("Res "); + TRACE_DEBUG_WP("Res "); /* Clear and disable resume interrupts */ UDP->UDP_ICR = UDP_ICR_WAKEUP | UDP_ICR_RXRSM | UDP_ICR_RXSUSP; UDP->UDP_IDR = UDP_IDR_WAKEUP | UDP_IDR_RXRSM; @@ -1150,7 +1145,7 @@ This interrupt is always treated last (hence the '==') */ if (status == UDP_ISR_RXSUSP) { - TRACE_INFO_WP("Susp "); + TRACE_DEBUG_WP("Susp "); /* Enable wakeup */ UDP->UDP_IER = UDP_IER_WAKEUP | UDP_IER_RXRSM; /* Acknowledge interrupt */ @@ -1161,7 +1156,7 @@ /* End of bus reset */ else if ((status & UDP_ISR_ENDBUSRES) != 0) { - TRACE_INFO_WP("EoBRes "); + TRACE_DEBUG_WP("EoBRes "); #if defined(BOARD_USB_DFU) #if defined(APPLICATION_dfu) @@ -1202,7 +1197,7 @@ if (status != 0) { - TRACE_INFO_WP("\n\r - "); + TRACE_DEBUG_WP("\n\r - "); } } eptnum++; @@ -1211,7 +1206,7 @@ /* Toggle LED back to its previous state */ TRACE_DEBUG_WP("!"); - TRACE_INFO_WP("\n\r"); + TRACE_DEBUG_WP("\n\r"); if (USBD_GetState() >= USBD_STATE_POWERED) { //LED_Clear(USBD_LEDUSB); @@ -1361,7 +1356,7 @@ UDP->UDP_IER = (1 << bEndpoint); } - TRACE_INFO_WP("CfgEp%d ", bEndpoint); + TRACE_DEBUG_WP("CfgEp%d ", bEndpoint); return bEndpoint; } @@ -1529,7 +1524,7 @@ UDP_EnableUsbClock(); UDP_EnableTransceiver(); - TRACE_INFO_WP("RWUp "); + TRACE_DEBUG_WP("RWUp "); // Activates a remote wakeup (edge on ESR), then clear ESR UDP->UDP_GLB_STAT |= UDP_GLB_STAT_ESR; diff --git a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c index e95c67b..1cca7ab 100644 --- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c +++ b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c @@ -85,7 +85,7 @@ { uint8_t u8 = g_dfu->state; - TRACE_DEBUG("handle_getstate(%u)\n\r", g_dfu->state); + TRACE_DEBUG("handle_getstate(%ld)\n\r", g_dfu->state); USBD_Write(0, (char *)&u8, sizeof(u8), NULL, 0); } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16557 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I9ba08d4bb4f188f6e7a202ea86acb7a42a2054f3 Gerrit-Change-Number: 16557 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 16:20:22 2019 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Wed, 11 Dec 2019 16:20:22 +0000 Subject: Change in simtrace2[master]: DFU: add DFU application References: Message-ID: tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16558 ) Change subject: DFU: add DFU application ...................................................................... DFU: add DFU application this adds the DFU as application, allowing to flash the bootloader. a USB DFU alternative is added to flash the bootloader partition. when the DFU is started as bootloader, the partition/alternative to flash the bootloader is marked as "not available", and ineffective. the same happens for the application partition when DFU is started as application. this distinction is make at compile time, not at runtime, because of size restrictions (the bootloader was already close to the 16 kB limit). *_dfu_flash.bin should not be mixed with *_dfu_dfu.bin. *_dfu_dfu.bin should be flashed as application using the already existing DFU bootloader. once this images is started (as application), the *_dfu_flash.bin should be flashed as bootloader using the DFU application. once the DFU bootloader has been flashed, soft resetting (not re-powering) will cause the bootloader to start, allowing to flash the application with a normal image (e.g. not DFU), replacing the DFU application. this switch to DFU only happens after downloading (e.g. flashing). it is planned to have the DFU application erase itself after flashing, but this is currently not implemented. Change-Id: Ic273bb593a7669111b0219fe301d7897419167c8 --- M firmware/Makefile M firmware/apps/dfu/main.c M firmware/apps/dfu/usb_strings.txt M firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c M firmware/atmel_softpack_libraries/usb/device/dfu/dfu.h M firmware/atmel_softpack_libraries/usb/device/dfu/dfu_desc.c M firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c M firmware/libboard/common/include/board_common.h M firmware/libboard/common/source/board_cstartup_gnu.c 9 files changed, 92 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/58/16558/1 diff --git a/firmware/Makefile b/firmware/Makefile index bd634aa..24e80be 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -41,7 +41,7 @@ # Defines which are the available memory targets for the SAM3S-EK board. ifeq ($(APP), dfu) -MEMORIES ?= flash +MEMORIES ?= flash dfu else MEMORIES ?= dfu endif diff --git a/firmware/apps/dfu/main.c b/firmware/apps/dfu/main.c index 5aafc7c..2e80884 100644 --- a/firmware/apps/dfu/main.c +++ b/firmware/apps/dfu/main.c @@ -26,8 +26,15 @@ #include +/* USB alternate interface index used to identify which partition to flash */ +/** USB alternate interface index indicating RAM partition */ #define ALTIF_RAM 0 +/** USB alternate interface index indicating flash partition */ +#if defined(ENVIRONMENT_flash) #define ALTIF_FLASH 1 +#elif defined(ENVIRONMENT_dfu) +#define ALTIF_FLASH 2 +#endif unsigned int g_unique_id[4]; /* remember if the watchdog has been configured in the main loop so we can kick it in the ISR */ @@ -44,10 +51,18 @@ *----------------------------------------------------------------------------*/ #define RAM_ADDR(offset) (IRAM_ADDR + BOARD_DFU_RAM_SIZE + offset) +#if defined(ENVIRONMENT_flash) #define FLASH_ADDR(offset) (IFLASH_ADDR + BOARD_DFU_BOOT_SIZE + offset) +#elif defined(ENVIRONMENT_dfu) +#define FLASH_ADDR(offset) (IFLASH_ADDR + offset) +#endif -#define IFLASH_END ((uint8_t *)IFLASH_ADDR + IFLASH_SIZE) -#define IRAM_END ((uint8_t *)IRAM_ADDR + IRAM_SIZE) +#define IRAM_END ((uint8_t *)IRAM_ADDR + IRAM_SIZE) +#if defined(ENVIRONMENT_flash) +#define IFLASH_END ((uint8_t *)IFLASH_ADDR + IFLASH_SIZE) +#elif defined(ENVIRONMENT_dfu) +#define IFLASH_END ((uint8_t *)IFLASH_ADDR + BOARD_DFU_BOOT_SIZE) +#endif /* incoming call-back: Host has transferred 'len' bytes (stored at * 'data'), which we shall write to 'offset' into the partition @@ -90,7 +105,11 @@ break; case ALTIF_FLASH: addr = FLASH_ADDR(offset); +#if defined(ENVIRONMENT_flash) if (addr < IFLASH_ADDR || addr + len >= IFLASH_ADDR + IFLASH_SIZE) { +#elif defined(ENVIRONMENT_dfu) + if (addr < IFLASH_ADDR || addr + len >= IFLASH_ADDR + BOARD_DFU_BOOT_SIZE) { +#endif g_dfu->state = DFU_STATE_dfuERROR; g_dfu->status = DFU_STATUS_errADDRESS; rc = DFU_RET_STALL; @@ -281,12 +300,12 @@ TRACE_INFO("DFU bootloader start reason: "); switch (USBDFU_OverrideEnterDFU()) { case 0: - /* 0 normally means that there is no override, but we are in the bootloader, - * thus the first check in board_cstartup_gnu did return something else than 0. - * this can only be g_dfu->magic which is erased when the segment are - * relocated, which happens in board_cstartup_gnu just after USBDFU_OverrideEnterDFU. - * no static variable can be used to store this case since this will also be overwritten - */ + if (SCB->VTOR < IFLASH_ADDR + BOARD_DFU_BOOT_SIZE) { + TRACE_INFO_WP("unknown\n\r"); + } else { + TRACE_INFO_WP("DFU is the main application\n\r"); + } + break; case 1: TRACE_INFO_WP("DFU switch requested by main application\n\r"); break; diff --git a/firmware/apps/dfu/usb_strings.txt b/firmware/apps/dfu/usb_strings.txt index f1c79bc..4a58cb8 100644 --- a/firmware/apps/dfu/usb_strings.txt +++ b/firmware/apps/dfu/usb_strings.txt @@ -3,3 +3,4 @@ DFU (Device Firmware Upgrade) RAM Flash (Application Partition) +Flash (Bootloader Partition) diff --git a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c index 3fe3270..26a45d2 100644 --- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c +++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c @@ -1163,12 +1163,19 @@ /* if we are currently in the DFU bootloader, and we are beyond * the MANIFEST stage, we shall switch to the normal * application */ - if (g_dfu->past_manifest) + if (g_dfu->past_manifest) { +#if defined(ENVIRONMENT_flash) USBDFU_SwitchToApp(); +#elif defined(ENVIRONMENT_dfu) + USBDFU_SwitchToDFU(); +#endif + } + #else /* if we are currently in the main application, and we are in - * appDETACH state, switch into the DFU bootloader */ - if (g_dfu->state == DFU_STATE_appDETACH) + * appDETACH state or past downloading, switch into the DFU bootloader. + */ + if (g_dfu->state == DFU_STATE_appDETACH || g_dfu->state == DFU_STATE_dfuMANIFEST) DFURT_SwitchToDFU(); #endif /* APPLICATION_dfu */ #endif /* BOARD_USB_DFU */ diff --git a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu.h b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu.h index 7354696..5bd8684 100644 --- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu.h +++ b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu.h @@ -124,6 +124,9 @@ /* USBD tells us to switch from DFU mode to application mode */ void USBDFU_SwitchToApp(void); +/* USBD tells us to switch from to DFU mode */ +void USBDFU_SwitchToDFU(void); + /* Return values to be used by USBDFU_handle_{dn,up}load */ #define DFU_RET_NOTHING 0 #define DFU_RET_ZLP 1 diff --git a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_desc.c b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_desc.c index ebbe070..faebc13 100644 --- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_desc.c +++ b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_desc.c @@ -19,9 +19,10 @@ STR_MANUF = 1, STR_PROD, STR_CONFIG, + // strings for the first alternate interface (e.g. DFU) _STR_FIRST_ALT, // serial string - STR_SERIAL = (_STR_FIRST_ALT+BOARD_DFU_NUM_IF), + STR_SERIAL = (_STR_FIRST_ALT + BOARD_DFU_NUM_IF), // version string (on additional interface) VERSION_CONF_STR, VERSION_STR, @@ -29,6 +30,25 @@ STRING_DESC_CNT, }; +/* string used to replace one of both DFU flash partition atlsettings */ +static const unsigned char usb_string_notavailable[] = { + USBStringDescriptor_LENGTH(13), + USBGenericDescriptor_STRING, + USBStringDescriptor_UNICODE('n'), + USBStringDescriptor_UNICODE('o'), + USBStringDescriptor_UNICODE('t'), + USBStringDescriptor_UNICODE(' '), + USBStringDescriptor_UNICODE('a'), + USBStringDescriptor_UNICODE('v'), + USBStringDescriptor_UNICODE('a'), + USBStringDescriptor_UNICODE('i'), + USBStringDescriptor_UNICODE('l'), + USBStringDescriptor_UNICODE('a'), + USBStringDescriptor_UNICODE('b'), + USBStringDescriptor_UNICODE('l'), + USBStringDescriptor_UNICODE('e'), +}; + /* USB string for the serial (using 128-bit device ID) */ static unsigned char usb_string_serial[] = { USBStringDescriptor_LENGTH(32), @@ -121,7 +141,7 @@ .bNumEndpoints = 0, \ .bInterfaceClass = 0xfe, \ .bInterfaceSubClass = 1, \ - .iInterface = (_STR_FIRST_ALT+ALT), \ + .iInterface = (_STR_FIRST_ALT + ALT), \ .bInterfaceProtocol = 2, \ } @@ -180,6 +200,11 @@ for (i = 0; i < ARRAY_SIZE(usb_strings) && i < ARRAY_SIZE(usb_strings_extended); i++) { usb_strings_extended[i] = usb_strings[i]; } +#if defined(ENVIRONMENT_dfu) + usb_strings_extended[_STR_FIRST_ALT + 1] = usb_string_notavailable; +#elif defined(ENVIRONMENT_flash) + usb_strings_extended[_STR_FIRST_ALT + 2] = usb_string_notavailable; +#endif usb_strings_extended[STR_SERIAL] = usb_string_serial; usb_strings_extended[VERSION_CONF_STR] = usb_string_version_conf; usb_strings_extended[VERSION_STR] = usb_string_version; diff --git a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c index 1cca7ab..cfb9f63 100644 --- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c +++ b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c @@ -43,7 +43,7 @@ /** structure containing the DFU state and magic value to know if DFU or application should be started */ __dfudata struct dfudata _g_dfu = { - .state = DFU_STATE_appIDLE, + .state = DFU_STATE_dfuIDLE, .past_manifest = 0, .total_bytes = 0, }; @@ -463,7 +463,20 @@ /* make sure the MAGIC is not set to enter DFU again */ g_dfu->magic = 0; - printf("switching to app\r\n"); + /* disconnect from USB to ensure re-enumeration */ + USBD_Disconnect(); + + /* disable any interrupts during transition */ + __disable_irq(); + + /* Tell the hybrid to execute FTL JUMP! */ + NVIC_SystemReset(); +} + +void USBDFU_SwitchToDFU(void) +{ + /* make sure the MAGIC is not set to enter DFU again */ + g_dfu->magic = USB_DFU_MAGIC; /* disconnect from USB to ensure re-enumeration */ USBD_Disconnect(); diff --git a/firmware/libboard/common/include/board_common.h b/firmware/libboard/common/include/board_common.h index dd21e4b..7c4b908 100644 --- a/firmware/libboard/common/include/board_common.h +++ b/firmware/libboard/common/include/board_common.h @@ -112,10 +112,13 @@ #define BOARD_USB_UDP #define BOARD_USB_DFU + + #define BOARD_DFU_BOOT_SIZE (16 * 1024) #define BOARD_DFU_RAM_SIZE (2 * 1024) #define BOARD_DFU_PAGE_SIZE 512 -#define BOARD_DFU_NUM_IF 2 +/** number of DFU interfaces (used to flash specific partitions) */ +#define BOARD_DFU_NUM_IF 3 extern void board_exec_dbg_cmd(int ch); extern void board_main_top(void); diff --git a/firmware/libboard/common/source/board_cstartup_gnu.c b/firmware/libboard/common/source/board_cstartup_gnu.c index e82a2fb..d548a30 100644 --- a/firmware/libboard/common/source/board_cstartup_gnu.c +++ b/firmware/libboard/common/source/board_cstartup_gnu.c @@ -126,7 +126,7 @@ IrqHandlerNotUsed /* 35 not used */ }; -#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu) +#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu) && defined(ENVIRONMENT_flash) #include "usb/device/dfu/dfu.h" static void BootIntoApp(void) { @@ -159,8 +159,9 @@ LowLevelInit() ; -#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu) - if (!USBDFU_OverrideEnterDFU()) { +#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu) && defined(ENVIRONMENT_flash) + // boot application if there is not DFU override + if (!USBDFU_OverrideEnterDFU() && SCB->VTOR < IFLASH_ADDR + BOARD_DFU_BOOT_SIZE) { UART_Exit(); __disable_irq(); BootIntoApp(); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ic273bb593a7669111b0219fe301d7897419167c8 Gerrit-Change-Number: 16558 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 17:04:25 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 17:04:25 +0000 Subject: Change in simtrace2[master]: minor: improve trace output In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16557 ) Change subject: minor: improve trace output ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16557 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I9ba08d4bb4f188f6e7a202ea86acb7a42a2054f3 Gerrit-Change-Number: 16557 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 11 Dec 2019 17:04:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 17:04:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 17:04:35 +0000 Subject: Change in simtrace2[master]: Makefile: add linker option showing memory usage In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16555 ) Change subject: Makefile: add linker option showing memory usage ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie74a1480c2f340765046be9bdfc3a8c4ba851e9b Gerrit-Change-Number: 16555 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 11 Dec 2019 17:04:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 17:06:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 17:06:30 +0000 Subject: Change in simtrace2[master]: improve shared bootloader/application memory In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16556 ) Change subject: improve shared bootloader/application memory ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I204bed7e9391602672ed894decec1fc12e879275 Gerrit-Change-Number: 16556 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 11 Dec 2019 17:06:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 17:06:36 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 17:06:36 +0000 Subject: Change in simtrace2[master]: Makefile: add linker option showing memory usage In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16555 ) Change subject: Makefile: add linker option showing memory usage ...................................................................... Makefile: add linker option showing memory usage this will help seeing how much free space is available for the bootloader (which is restricted to 16 kB) Change-Id: Ie74a1480c2f340765046be9bdfc3a8c4ba851e9b --- M firmware/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/Makefile b/firmware/Makefile index 79e9a31..bd634aa 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -170,7 +170,7 @@ CFLAGS += -DBOARD=\"$(BOARD)\" -DBOARD_$(BOARD) CFLAGS += -DAPPLICATION=\"$(APP)\" -DAPPLICATION_$(APP) ASFLAGS = -mcpu=cortex-m3 -mthumb -Wall -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -D__ASSEMBLY__ -LDFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=ResetException -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols $(LIB) +LDFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=ResetException -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--print-memory-usage $(LIB) #LD_OPTIONAL=-Wl,--print-gc-sections -Wl,--stats # Append BIN directories to output filename -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie74a1480c2f340765046be9bdfc3a8c4ba851e9b Gerrit-Change-Number: 16555 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 17:06:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 17:06:37 +0000 Subject: Change in simtrace2[master]: improve shared bootloader/application memory In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16556 ) Change subject: improve shared bootloader/application memory ...................................................................... improve shared bootloader/application memory now both partitions (bootloader and application) use a commonly defined memory location to shared the DFU state (which includes the magic value to know which part to start), instead of using a hard coded value. the bootloader size has now also been restricted to 16 kB. this limitation is enforced so to not be able to create larger images, which could be corrupted when flashing the application. bootloader and application flashing have been successfully tested on qmod st12 and st34. Change-Id: I204bed7e9391602672ed894decec1fc12e879275 --- M firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c M firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c M firmware/libboard/common/resources/sam3s4/dfu.ld M firmware/libboard/common/resources/sam3s4/flash.ld 4 files changed, 17 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c index 3ffd9b3..e95c67b 100644 --- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c +++ b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c @@ -33,8 +33,7 @@ #include #include -/* FIXME: this was used for a special ELF section which then got called - * by DFU code and Application code, across flash partitions */ +/** specific memory location shared across bootloader and application */ #define __dfudata __attribute__ ((section (".dfudata"))) #define __dfufunc @@ -42,11 +41,14 @@ static USBDDriver usbdDriver; static unsigned char if_altsettings[1]; +/** structure containing the DFU state and magic value to know if DFU or application should be started */ __dfudata struct dfudata _g_dfu = { .state = DFU_STATE_appIDLE, .past_manifest = 0, .total_bytes = 0, }; + +/** variable to structure containing DFU state */ struct dfudata *g_dfu = &_g_dfu; WEAK void dfu_drv_updstatus(void) diff --git a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c index ac4d7df..4f772be 100644 --- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c +++ b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c @@ -36,7 +36,12 @@ #include #include -struct dfudata *g_dfu = (struct dfudata *) IRAM_ADDR; +/** specific memory location shared across bootloader and application */ +#define __dfudata __attribute__ ((section (".dfudata"))) +/** structure containing the magic value to know if DFU or application should be started */ +__dfudata struct dfudata _g_dfu; +/** variable to structure containing the magic value to know if DFU or application should be started */ +struct dfudata *g_dfu = &_g_dfu; /* FIXME: this was used for a special ELF section which then got called * by DFU code and Application code, across flash partitions */ diff --git a/firmware/libboard/common/resources/sam3s4/dfu.ld b/firmware/libboard/common/resources/sam3s4/dfu.ld index e56a435..a485770 100644 --- a/firmware/libboard/common/resources/sam3s4/dfu.ld +++ b/firmware/libboard/common/resources/sam3s4/dfu.ld @@ -39,9 +39,9 @@ MEMORY { /* reserve the first 16k (= 0x4000) for the DFU bootloader */ - rom (rx) : ORIGIN = 0x00404000, LENGTH = 0x0003c000 /* flash, 256K */ - /* reserve the first 32 (= 0x20) bytes for the _g_dfu struct */ - ram (rwx) : ORIGIN = 0x20000020, LENGTH = 0x0000bfe0 /* sram, 48K */ + rom (rx) : ORIGIN = 0x00400000 + 16K, LENGTH = 256K - 16K /* flash, 256K */ + /* note: dfudata will be at the start */ + ram (rwx) : ORIGIN = 0x20000000, LENGTH = 48K /* SRAM, 48K */ } /* Section Definitions */ @@ -111,6 +111,8 @@ { . = ALIGN(4); _srelocate = .; + /* we must make sure the .dfudata is linked to start of RAM */ + *(.dfudata .dfudata.*); *(.ramfunc .ramfunc.*); *(.data .data.*); . = ALIGN(4); diff --git a/firmware/libboard/common/resources/sam3s4/flash.ld b/firmware/libboard/common/resources/sam3s4/flash.ld index bdebbde..f5cdbfd 100644 --- a/firmware/libboard/common/resources/sam3s4/flash.ld +++ b/firmware/libboard/common/resources/sam3s4/flash.ld @@ -38,8 +38,8 @@ /* Memory Spaces Definitions */ MEMORY { - rom (rx) : ORIGIN = 0x00400000, LENGTH = 0x00040000 /* flash, 256K */ - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x0000c000 /* sram, 48K */ + rom (rx) : ORIGIN = 0x00400000, LENGTH = 16K /* flash, 256K, but only the first 16K should be used for the bootloader */ + ram (rwx) : ORIGIN = 0x20000000, LENGTH = 48K /* SRAM, 48K */ } /* Section Definitions */ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I204bed7e9391602672ed894decec1fc12e879275 Gerrit-Change-Number: 16556 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 17:06:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 17:06:37 +0000 Subject: Change in simtrace2[master]: minor: improve trace output In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16557 ) Change subject: minor: improve trace output ...................................................................... minor: improve trace output the USB trace now respects the global setting. the verbosity is also decreased, not showing USB activity unless debugging. this also saves some space. the reset cause is now printed. the strings increase the bootloader size, but it already exceeded the 16 kB limit when trace level is set to info. Change-Id: I9ba08d4bb4f188f6e7a202ea86acb7a42a2054f3 --- M firmware/apps/dfu/main.c M firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c M firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c 3 files changed, 23 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/apps/dfu/main.c b/firmware/apps/dfu/main.c index 3d0cc1e..5aafc7c 100644 --- a/firmware/apps/dfu/main.c +++ b/firmware/apps/dfu/main.c @@ -257,11 +257,24 @@ "=============================================================================\n\r", manifest_revision, manifest_board); - TRACE_INFO("Chip ID: 0x%08x (Ext 0x%08x)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID); +#if (TRACE_LEVEL >= TRACE_LEVEL_INFO) + TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID); TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r", g_unique_id[0], g_unique_id[1], g_unique_id[2], g_unique_id[3]); - TRACE_INFO("Reset Cause: 0x%lx\n\r", reset_cause); + static const char* reset_causes[] = { + "general reset (first power-up reset)", + "backup reset (return from backup mode)", + "watchdog reset (watchdog fault occurred)", + "software reset (processor reset required by the software)", + "user reset (NRST pin detected low)", + }; + if (reset_cause < ARRAY_SIZE(reset_causes)) { + TRACE_INFO("Reset Cause: %s\n\r", reset_causes[reset_cause]); + } else { + TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos); + } +#endif #if (TRACE_LEVEL >= TRACE_LEVEL_INFO) /* Find out why we are in the DFU bootloader, and not the main application */ diff --git a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c index 2f56602..3fe3270 100644 --- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c +++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c @@ -45,11 +45,6 @@ * Headers *---------------------------------------------------------------------------*/ -#ifdef TRACE_LEVEL -#undef TRACE_LEVEL -#endif -#define TRACE_LEVEL TRACE_LEVEL_WARNING - #include "chip.h" #include "USBD_HAL.h" #include @@ -1138,7 +1133,7 @@ /* Resume (Wakeup) */ if ((status & (UDP_ISR_WAKEUP | UDP_ISR_RXRSM)) != 0) { - TRACE_INFO_WP("Res "); + TRACE_DEBUG_WP("Res "); /* Clear and disable resume interrupts */ UDP->UDP_ICR = UDP_ICR_WAKEUP | UDP_ICR_RXRSM | UDP_ICR_RXSUSP; UDP->UDP_IDR = UDP_IDR_WAKEUP | UDP_IDR_RXRSM; @@ -1150,7 +1145,7 @@ This interrupt is always treated last (hence the '==') */ if (status == UDP_ISR_RXSUSP) { - TRACE_INFO_WP("Susp "); + TRACE_DEBUG_WP("Susp "); /* Enable wakeup */ UDP->UDP_IER = UDP_IER_WAKEUP | UDP_IER_RXRSM; /* Acknowledge interrupt */ @@ -1161,7 +1156,7 @@ /* End of bus reset */ else if ((status & UDP_ISR_ENDBUSRES) != 0) { - TRACE_INFO_WP("EoBRes "); + TRACE_DEBUG_WP("EoBRes "); #if defined(BOARD_USB_DFU) #if defined(APPLICATION_dfu) @@ -1202,7 +1197,7 @@ if (status != 0) { - TRACE_INFO_WP("\n\r - "); + TRACE_DEBUG_WP("\n\r - "); } } eptnum++; @@ -1211,7 +1206,7 @@ /* Toggle LED back to its previous state */ TRACE_DEBUG_WP("!"); - TRACE_INFO_WP("\n\r"); + TRACE_DEBUG_WP("\n\r"); if (USBD_GetState() >= USBD_STATE_POWERED) { //LED_Clear(USBD_LEDUSB); @@ -1361,7 +1356,7 @@ UDP->UDP_IER = (1 << bEndpoint); } - TRACE_INFO_WP("CfgEp%d ", bEndpoint); + TRACE_DEBUG_WP("CfgEp%d ", bEndpoint); return bEndpoint; } @@ -1529,7 +1524,7 @@ UDP_EnableUsbClock(); UDP_EnableTransceiver(); - TRACE_INFO_WP("RWUp "); + TRACE_DEBUG_WP("RWUp "); // Activates a remote wakeup (edge on ESR), then clear ESR UDP->UDP_GLB_STAT |= UDP_GLB_STAT_ESR; diff --git a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c index e95c67b..1cca7ab 100644 --- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c +++ b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c @@ -85,7 +85,7 @@ { uint8_t u8 = g_dfu->state; - TRACE_DEBUG("handle_getstate(%u)\n\r", g_dfu->state); + TRACE_DEBUG("handle_getstate(%ld)\n\r", g_dfu->state); USBD_Write(0, (char *)&u8, sizeof(u8), NULL, 0); } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16557 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I9ba08d4bb4f188f6e7a202ea86acb7a42a2054f3 Gerrit-Change-Number: 16557 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 17:08:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 17:08:51 +0000 Subject: Change in simtrace2[master]: DFU: add DFU application In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16558 ) Change subject: DFU: add DFU application ...................................................................... Patch Set 1: I think we should do something about the naming, making it less confusing to the user. I don't have immediate ideas, but using flash/dfu/... as memory type and then having also a dfu program with only the position in the name indicating which is which is not a good idea. -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ic273bb593a7669111b0219fe301d7897419167c8 Gerrit-Change-Number: 16558 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 11 Dec 2019 17:08:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 11 17:09:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 11 Dec 2019 17:09:33 +0000 Subject: Change in simtrace2[master]: DFU: add DFU application In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16558 ) Change subject: DFU: add DFU application ...................................................................... Patch Set 1: what about something bogus like "afblud" (application for boot loader update via dfu)? -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ic273bb593a7669111b0219fe301d7897419167c8 Gerrit-Change-Number: 16558 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 11 Dec 2019 17:09:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 01:11:11 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 12 Dec 2019 01:11:11 +0000 Subject: Change in osmo-msc[master]: gsup: indicate CN-Domain in SendAuthInfo Requests References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16559 ) Change subject: gsup: indicate CN-Domain in SendAuthInfo Requests ...................................................................... gsup: indicate CN-Domain in SendAuthInfo Requests In order for osmo-hlr to be able to 100% guarantee distinct INDs for CS and PS, set CN-Domain = CS in all SendAuthInfo Requests. In Milenage auth, it is highly desirable that osmo-hlr guarantees use of distinct INDs for CS and PS domains. If an MSC and SGSN attached at the same time use the same IND bucket to generate Milenage SQN, that collision would rapidly waste SQNs and load osmo-hlr with requesting new auth tuples on each CS/PS Complete-Layer3. So far, osmo-msc did not indicate the CN domain in the GSUP SendAuthInfo Request, which was neither required nor evaluated. The CN-Domain is only sent for the UpdateLocation Request that usually follows later. Related: OS#4318 Change-Id: I22f44068268e62801cadbf6542efaf153423cd65 --- M src/libvlr/vlr.c M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.c M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.c M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.c M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_test_ss.c M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.h 22 files changed, 148 insertions(+), 146 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/59/16559/1 diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 0f9c991..1a753dc 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -671,6 +671,7 @@ gsup_msg.message_type = OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST; gsup_msg.auts = auts; gsup_msg.rand = auts_rand; + gsup_msg.cn_domain = OSMO_GSUP_CN_DOMAIN_CS; return vlr_subscr_tx_gsup_message(vsub, &gsup_msg); } diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.c b/tests/msc_vlr/msc_vlr_test_authen_reuse.c index d73a5f8..f8f9383 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.c +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.c @@ -43,7 +43,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR); + gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508" /* MM LU */ "7" /* ciph key seq: no key available */ "0" /* LU type: normal */ @@ -85,7 +85,7 @@ if (via_ran == OSMO_RAT_GERAN_A) { btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0554" "e229c19e" "2104" "791f2e41"); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -98,7 +98,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_security_mode_complete(); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -195,7 +195,7 @@ " and needs to request a second auth vector from HLR"); auth_request_sent = false; cm_service_result_sent = RES_NONE; - gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR); + gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("052474" "03575886" /* classmark 2 */ "089910070000106005" /* IMSI */); diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.err b/tests/msc_vlr/msc_vlr_test_authen_reuse.err index c5dee0c..288040f 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.err +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.err @@ -36,7 +36,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -351,7 +351,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: is child of Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ) DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - proc_arq_vlr_fn_init: now used by 2 (attached,active-conn) DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (cm_service_sms) @@ -540,7 +540,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -875,7 +875,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: is child of Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - proc_arq_vlr_fn_init: now used by 2 (attached,active-conn) DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (cm_service_sms) @@ -1072,7 +1072,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -1680,7 +1680,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2324,7 +2324,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2523,7 +2523,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: is child of Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ) DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - proc_arq_vlr_fn_init: now used by 2 (attached,active-conn) DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (cm_service_sms) @@ -2712,7 +2712,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2923,7 +2923,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: is child of Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - proc_arq_vlr_fn_init: now used by 2 (attached,active-conn) DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (cm_service_sms) diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index 339233c..b4e20be 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -53,7 +53,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR); + gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508" /* MM LU */ "7" /* ciph key seq: no key available */ "0" /* LU type: normal */ @@ -127,7 +127,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_security_mode_complete(); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index 8c394d0..b651659 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -37,7 +37,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -511,7 +511,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -982,7 +982,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -1407,7 +1407,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -1835,7 +1835,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c b/tests/msc_vlr/msc_vlr_test_gsm_authen.c index ee5af1e..6d7e88a 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c @@ -34,7 +34,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508020081680001" "30" /* <-- Revision Level == 1, i.e. is_r99 == false */ "089910070000006402"); @@ -76,7 +76,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -224,7 +224,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508020081680001" "30" /* <-- Revision Level == 1, i.e. is_r99 == false */ "089910070000006402"); @@ -266,7 +266,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -438,7 +438,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("05545afc8d72"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -504,7 +504,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508020081680001" "30" /* <-- Revision Level == 1, i.e. is_r99 == false */ "089910070000006402"); @@ -544,7 +544,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -611,7 +611,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508020081680001" "30" /* <-- Revision Level == 1, i.e. is_r99 == false */ "089910070000006402"); @@ -653,7 +653,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -705,7 +705,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508020081680001" "30" /* <-- Revision Level == 1, i.e. is_r99 == false */ "089910070000006402"); @@ -746,7 +746,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -799,7 +799,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508020081680001" "30" /* <-- Revision Level == 1, i.e. is_r99 == false */ "089910070000006402"); @@ -840,7 +840,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -924,7 +924,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR); + gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508" /* MM LU */ "7" /* ciph key seq: no key available */ "0" /* LU type: normal */ @@ -977,7 +977,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0554" "9b36efdf"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -1129,7 +1129,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508020081680001" "30" /* <-- Revision Level == 1, i.e. is_r99 == false */ "089910070000006402"); diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index 3145610..ad2b80c 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -36,7 +36,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -620,7 +620,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -1443,7 +1443,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -1755,7 +1755,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2020,7 +2020,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2286,7 +2286,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2639,7 +2639,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -3198,7 +3198,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c index 9026241..1b413f9 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c @@ -40,7 +40,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -82,7 +82,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_ciphering_mode_complete(NULL); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -249,7 +249,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -292,7 +292,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_ciphering_mode_complete(NULL); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -484,7 +484,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -526,7 +526,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_ciphering_mode_complete(NULL); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -594,7 +594,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -642,7 +642,7 @@ vlr_subscr_put(vsub, __func__); btw("MS sends Ciphering Mode Complete with IMEISV, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_ciphering_mode_complete("063217094b32244332244372f5"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -695,7 +695,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -737,7 +737,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_ciphering_mode_complete(NULL); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -844,7 +844,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR); + gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508" /* MM LU */ "7" /* ciph key seq: no key available */ "0" /* LU type: normal */ @@ -922,7 +922,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_ciphering_mode_complete(NULL); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -1067,7 +1067,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -1111,7 +1111,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_ciphering_mode_complete(NULL); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -1283,7 +1283,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -1327,7 +1327,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_ciphering_mode_complete(NULL); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 96a5303..5f6b370 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -36,7 +36,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -688,7 +688,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -1388,7 +1388,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -1707,7 +1707,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -1991,7 +1991,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2351,7 +2351,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2948,7 +2948,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -3592,7 +3592,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.c b/tests/msc_vlr/msc_vlr_test_hlr_reject.c index 45aaa8c..6cdadcb 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_reject.c +++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.c @@ -31,7 +31,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -58,7 +58,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -91,7 +91,7 @@ BTW("Submit a used auth tuple in the VLR"); btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -114,7 +114,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -147,7 +147,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -180,7 +180,7 @@ BTW("Submit a used auth tuple in the VLR"); btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -203,7 +203,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -237,7 +237,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -266,7 +266,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -304,7 +304,7 @@ BTW("Submit a used auth tuple in the VLR"); btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -328,7 +328,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -361,7 +361,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -373,7 +373,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -402,7 +402,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -426,7 +426,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err b/tests/msc_vlr/msc_vlr_test_hlr_reject.err index e4ea226..f0d94b4 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err @@ -36,7 +36,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -137,7 +137,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -241,7 +241,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -403,7 +403,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -567,7 +567,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -729,7 +729,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -833,7 +833,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -996,7 +996,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -1097,7 +1097,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.c b/tests/msc_vlr/msc_vlr_test_hlr_timeout.c index abc7c5b..4523a7c 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.c +++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.c @@ -35,7 +35,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -73,7 +73,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err index 5853643..3717533 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err @@ -37,7 +37,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.c b/tests/msc_vlr/msc_vlr_test_ms_timeout.c index 91f00ef..11afc51 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.c +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.c @@ -33,7 +33,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -94,7 +94,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -125,7 +125,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -195,7 +195,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -296,7 +296,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err index b909f52..6ccc82a 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err @@ -37,7 +37,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -166,7 +166,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -747,7 +747,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c b/tests/msc_vlr/msc_vlr_test_no_authen.c index 9d506d6..7b684fe 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.c +++ b/tests/msc_vlr/msc_vlr_test_no_authen.c @@ -34,7 +34,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -171,7 +171,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -316,7 +316,7 @@ BTW("subscriber sends LU Request, this time with the TMSI"); btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130" "05f4" "03020100"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -389,7 +389,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -464,7 +464,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -552,7 +552,7 @@ OSMO_ASSERT(dtap_tx_confirmed); btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0559094332244332244372f5"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -628,7 +628,7 @@ btw("HLR accepts the IMEI, VLR responds with LU Request"); expect_bssap_clear(); gsup_rx("32010809710000004026f0510100" HLR_TO_VLR, - "04010809710000004026f0280102" VLR_TO_HLR); + "04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -686,7 +686,7 @@ OSMO_ASSERT(dtap_tx_confirmed); btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0559094332244332244372f5"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -742,7 +742,7 @@ OSMO_ASSERT(dtap_tx_confirmed); btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0559095332244332244372f6"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -841,7 +841,7 @@ btw("HLR accepts the IMEI, VLR responds with LU Request"); expect_bssap_clear(); gsup_rx("32010809710000004026f0510100" HLR_TO_VLR, - "04010809710000004026f0280102" VLR_TO_HLR); + "04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -915,7 +915,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c index 648313f..dea0c29 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c @@ -30,7 +30,7 @@ btw("Location Update Request on one connection"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -73,7 +73,7 @@ { btw("Location Update Request"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_rest.c b/tests/msc_vlr/msc_vlr_test_rest.c index 1b998ad..029e8b5 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.c +++ b/tests/msc_vlr/msc_vlr_test_rest.c @@ -89,7 +89,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -120,7 +120,7 @@ BTW("verify that the MS can send another LU request"); btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -172,7 +172,7 @@ thwart_rx_non_initial_requests(); btw("MS tells us the IMSI, causes a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0559089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_ss.c b/tests/msc_vlr/msc_vlr_test_ss.c index 978ceae..772429e 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.c +++ b/tests/msc_vlr/msc_vlr_test_ss.c @@ -47,7 +47,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.c b/tests/msc_vlr/msc_vlr_test_umts_authen.c index 761db55..46f8d98 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.c +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.c @@ -58,7 +58,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR); + gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508" /* MM LU */ "7" /* ciph key seq: no key available */ "0" /* LU type: normal */ @@ -137,7 +137,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_security_mode_complete(); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -145,7 +145,7 @@ } else { /* Encryption disabled */ btw("Encryption disabled. MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0554" "e229c19e" "2104" "791f2e41"); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -369,7 +369,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR); + gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508" /* MM LU */ "7" /* ciph key seq: no key available */ "0" /* LU type: normal */ @@ -471,7 +471,7 @@ "0108" "09710000000156f0" /* IMSI */ "260e" "979498b1f72d3e28c59fa2e72f9c" /* AUTS */ "2010" "39fa2f4e3d523d8619a73b4f65c3e14d" /* RAND */ - VLR_TO_HLR); + CN_DOMAIN VLR_TO_HLR); ms_sends_msg("051c" /* 05 = MM; 1c = Auth Failure */ "15" /* cause = Synch Failure */ "220e" "979498b1f72d3e28c59fa2e72f9c" /* AUTS */); @@ -529,7 +529,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_security_mode_complete(); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -537,7 +537,7 @@ } else { /* Encryption disabled */ btw("Encryption disabled. MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0554" "1df5f0b4" "2104" "f22b696e"); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -609,7 +609,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR); + gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508" /* MM LU */ "7" /* ciph key seq: no key available */ "0" /* LU type: normal */ @@ -709,7 +709,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR); + gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508" /* MM LU */ "7" /* ciph key seq: no key available */ "0" /* LU type: normal */ @@ -809,7 +809,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR); + gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508" /* MM LU */ "7" /* ciph key seq: no key available */ "0" /* LU type: normal */ diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err index 62dc2d3..3e5dbae 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.err +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err @@ -36,7 +36,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -638,7 +638,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -1246,7 +1246,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -1878,7 +1878,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -1905,7 +1905,7 @@ DRLL msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_AUTH_FAIL DMM msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: MM R99 AUTHENTICATION SYNCH (AUTS = 979498b1f72d3e28c59fa2e72f9c) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_FAIL -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f0260e979498b1f72d3e28c59fa2e72f9c201039fa2f4e3d523d8619a73b4f65c3e14d0a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f0260e979498b1f72d3e28c59fa2e72f9c201039fa2f4e3d523d8619a73b4f65c3e14d2801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_SAI_RESYNC DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) gsup_tx_confirmed == 1 @@ -2110,7 +2110,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2137,7 +2137,7 @@ DRLL msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_AUTH_FAIL DMM msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: MM R99 AUTHENTICATION SYNCH (AUTS = 979498b1f72d3e28c59fa2e72f9c) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_FAIL -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f0260e979498b1f72d3e28c59fa2e72f9c201039fa2f4e3d523d8619a73b4f65c3e14d0a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f0260e979498b1f72d3e28c59fa2e72f9c201039fa2f4e3d523d8619a73b4f65c3e14d2801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_SAI_RESYNC DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) gsup_tx_confirmed == 1 @@ -2344,7 +2344,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2371,7 +2371,7 @@ DRLL msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_AUTH_FAIL DMM msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: MM R99 AUTHENTICATION SYNCH (AUTS = 979498b1f72d3e28c59fa2e72f9c) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_FAIL -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f0260e979498b1f72d3e28c59fa2e72f9c201039fa2f4e3d523d8619a73b4f65c3e14d0a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f0260e979498b1f72d3e28c59fa2e72f9c201039fa2f4e3d523d8619a73b4f65c3e14d2801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_SAI_RESYNC DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) gsup_tx_confirmed == 1 @@ -2588,7 +2588,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2706,7 +2706,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2824,7 +2824,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2942,7 +2942,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -3060,7 +3060,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -3178,7 +3178,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h index 88f80b4..23dc9da 100644 --- a/tests/msc_vlr/msc_vlr_tests.h +++ b/tests/msc_vlr/msc_vlr_tests.h @@ -270,6 +270,7 @@ #define HLR_TO_VLR "0a0101" #define VLR_TO_HLR "0a0101" +#define CN_DOMAIN "280102" #define EUSE_TO_MSC_USSD "0a0103" #define MSC_USSD_TO_EUSE "0a0103" -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I22f44068268e62801cadbf6542efaf153423cd65 Gerrit-Change-Number: 16559 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Dec 12 02:21:06 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 12 Dec 2019 02:21:06 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5df1a43016b70_12c72b0af114860c1067a6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 239s] /usr/src/packages/BUILD/firmware/apps/dfu/main.c:360: warning: undefined reference to `__stack_chk_guard' [ 239s] obj/simtrace/flash_dfu_desc.o: In function `set_usb_serial_str': [ 239s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_fail' [ 239s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_guard' [ 239s] obj/simtrace/flash_dfu_driver.o: In function `handle_getstate': [ 239s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_fail' [ 239s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_guard' [ 239s] collect2: error: ld returned 1 exit status [ 239s] % [ 239s] Makefile:233: recipe for target 'flash' failed [ 239s] make[2]: *** [flash] Error 1 [ 239s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 239s] Makefile:10: recipe for target 'fw-simtrace-dfu' failed [ 239s] make[1]: *** [fw-simtrace-dfu] Error 2 [ 239s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 239s] dh_auto_build: make -j1 returned exit code 2 [ 239s] debian/rules:16: recipe for target 'build' failed [ 239s] make: *** [build] Error 2 [ 239s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 239s] [ 239s] cloud120 failed "build simtrace2_0.7.0.3.75a5.dsc" at Thu Dec 12 02:20:51 UTC 2019. [ 239s] [ 239s] ### VM INTERACTION START ### [ 242s] [ 170.630599] sysrq: SysRq : Power Off [ 242s] [ 170.650887] reboot: Power down [ 242s] ### VM INTERACTION END ### [ 242s] [ 242s] cloud120 failed "build simtrace2_0.7.0.3.75a5.dsc" at Thu Dec 12 02:20:54 UTC 2019. [ 242s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Dec 12 02:40:50 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 12 Dec 2019 02:40:50 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5df1a8c46cb26_12c72b0af114860c10854b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 101s] /usr/src/packages/BUILD/firmware/apps/dfu/main.c:360: warning: undefined reference to `__stack_chk_guard' [ 101s] obj/simtrace/flash_dfu_desc.o: In function `set_usb_serial_str': [ 101s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_fail' [ 101s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_guard' [ 101s] obj/simtrace/flash_dfu_driver.o: In function `handle_getstate': [ 101s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_fail' [ 101s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_guard' [ 101s] collect2: error: ld returned 1 exit status [ 101s] % [ 101s] Makefile:233: recipe for target 'flash' failed [ 101s] make[2]: *** [flash] Error 1 [ 101s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 101s] Makefile:10: recipe for target 'fw-simtrace-dfu' failed [ 101s] make[1]: *** [fw-simtrace-dfu] Error 2 [ 101s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 101s] dh_auto_build: make -j1 returned exit code 2 [ 101s] debian/rules:16: recipe for target 'build' failed [ 101s] make: *** [build] Error 2 [ 101s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 101s] [ 101s] build33 failed "build simtrace2_0.7.0.3.75a5.dsc" at Thu Dec 12 02:40:35 UTC 2019. [ 101s] [ 101s] ### VM INTERACTION START ### [ 104s] [ 91.905435] sysrq: SysRq : Power Off [ 104s] [ 91.944759] reboot: Power down [ 104s] ### VM INTERACTION END ### [ 104s] [ 104s] build33 failed "build simtrace2_0.7.0.3.75a5.dsc" at Thu Dec 12 02:40:38 UTC 2019. [ 104s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Dec 12 04:54:45 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 12 Dec 2019 04:54:45 +0000 Subject: Change in osmo-msc[master]: gsup: indicate CN-Domain in SendAuthInfo Requests In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16559 ) Change subject: gsup: indicate CN-Domain in SendAuthInfo Requests ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I22f44068268e62801cadbf6542efaf153423cd65 Gerrit-Change-Number: 16559 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 12 Dec 2019 04:54:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 07:28:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 12 Dec 2019 07:28:39 +0000 Subject: Change in osmo-msc[master]: gsup: indicate CN-Domain in SendAuthInfo Requests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16559 ) Change subject: gsup: indicate CN-Domain in SendAuthInfo Requests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I22f44068268e62801cadbf6542efaf153423cd65 Gerrit-Change-Number: 16559 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 12 Dec 2019 07:28:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 07:28:40 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 12 Dec 2019 07:28:40 +0000 Subject: Change in osmo-msc[master]: gsup: indicate CN-Domain in SendAuthInfo Requests In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16559 ) Change subject: gsup: indicate CN-Domain in SendAuthInfo Requests ...................................................................... gsup: indicate CN-Domain in SendAuthInfo Requests In order for osmo-hlr to be able to 100% guarantee distinct INDs for CS and PS, set CN-Domain = CS in all SendAuthInfo Requests. In Milenage auth, it is highly desirable that osmo-hlr guarantees use of distinct INDs for CS and PS domains. If an MSC and SGSN attached at the same time use the same IND bucket to generate Milenage SQN, that collision would rapidly waste SQNs and load osmo-hlr with requesting new auth tuples on each CS/PS Complete-Layer3. So far, osmo-msc did not indicate the CN domain in the GSUP SendAuthInfo Request, which was neither required nor evaluated. The CN-Domain is only sent for the UpdateLocation Request that usually follows later. Related: OS#4318 Change-Id: I22f44068268e62801cadbf6542efaf153423cd65 --- M src/libvlr/vlr.c M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.c M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.c M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.c M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_test_ss.c M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.h 22 files changed, 148 insertions(+), 146 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 0f9c991..1a753dc 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -671,6 +671,7 @@ gsup_msg.message_type = OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST; gsup_msg.auts = auts; gsup_msg.rand = auts_rand; + gsup_msg.cn_domain = OSMO_GSUP_CN_DOMAIN_CS; return vlr_subscr_tx_gsup_message(vsub, &gsup_msg); } diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.c b/tests/msc_vlr/msc_vlr_test_authen_reuse.c index d73a5f8..f8f9383 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.c +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.c @@ -43,7 +43,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR); + gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508" /* MM LU */ "7" /* ciph key seq: no key available */ "0" /* LU type: normal */ @@ -85,7 +85,7 @@ if (via_ran == OSMO_RAT_GERAN_A) { btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0554" "e229c19e" "2104" "791f2e41"); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -98,7 +98,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_security_mode_complete(); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -195,7 +195,7 @@ " and needs to request a second auth vector from HLR"); auth_request_sent = false; cm_service_result_sent = RES_NONE; - gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR); + gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("052474" "03575886" /* classmark 2 */ "089910070000106005" /* IMSI */); diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.err b/tests/msc_vlr/msc_vlr_test_authen_reuse.err index c5dee0c..288040f 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.err +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.err @@ -36,7 +36,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -351,7 +351,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: is child of Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ) DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - proc_arq_vlr_fn_init: now used by 2 (attached,active-conn) DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (cm_service_sms) @@ -540,7 +540,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -875,7 +875,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: is child of Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - proc_arq_vlr_fn_init: now used by 2 (attached,active-conn) DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (cm_service_sms) @@ -1072,7 +1072,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -1680,7 +1680,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2324,7 +2324,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2523,7 +2523,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: is child of Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ) DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - proc_arq_vlr_fn_init: now used by 2 (attached,active-conn) DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (cm_service_sms) @@ -2712,7 +2712,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2923,7 +2923,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: is child of Process_Access_Request_VLR(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ) DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - proc_arq_vlr_fn_init: now used by 2 (attached,active-conn) DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (cm_service_sms) diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index 339233c..b4e20be 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -53,7 +53,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR); + gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508" /* MM LU */ "7" /* ciph key seq: no key available */ "0" /* LU type: normal */ @@ -127,7 +127,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_security_mode_complete(); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index 8c394d0..b651659 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -37,7 +37,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -511,7 +511,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -982,7 +982,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -1407,7 +1407,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -1835,7 +1835,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c b/tests/msc_vlr/msc_vlr_test_gsm_authen.c index ee5af1e..6d7e88a 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c @@ -34,7 +34,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508020081680001" "30" /* <-- Revision Level == 1, i.e. is_r99 == false */ "089910070000006402"); @@ -76,7 +76,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -224,7 +224,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508020081680001" "30" /* <-- Revision Level == 1, i.e. is_r99 == false */ "089910070000006402"); @@ -266,7 +266,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -438,7 +438,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("05545afc8d72"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -504,7 +504,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508020081680001" "30" /* <-- Revision Level == 1, i.e. is_r99 == false */ "089910070000006402"); @@ -544,7 +544,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -611,7 +611,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508020081680001" "30" /* <-- Revision Level == 1, i.e. is_r99 == false */ "089910070000006402"); @@ -653,7 +653,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -705,7 +705,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508020081680001" "30" /* <-- Revision Level == 1, i.e. is_r99 == false */ "089910070000006402"); @@ -746,7 +746,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -799,7 +799,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508020081680001" "30" /* <-- Revision Level == 1, i.e. is_r99 == false */ "089910070000006402"); @@ -840,7 +840,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -924,7 +924,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR); + gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508" /* MM LU */ "7" /* ciph key seq: no key available */ "0" /* LU type: normal */ @@ -977,7 +977,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0554" "9b36efdf"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -1129,7 +1129,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508020081680001" "30" /* <-- Revision Level == 1, i.e. is_r99 == false */ "089910070000006402"); diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index 3145610..ad2b80c 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -36,7 +36,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -620,7 +620,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -1443,7 +1443,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -1755,7 +1755,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2020,7 +2020,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2286,7 +2286,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2639,7 +2639,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -3198,7 +3198,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c index 9026241..1b413f9 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c @@ -40,7 +40,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -82,7 +82,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_ciphering_mode_complete(NULL); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -249,7 +249,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -292,7 +292,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_ciphering_mode_complete(NULL); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -484,7 +484,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -526,7 +526,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_ciphering_mode_complete(NULL); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -594,7 +594,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -642,7 +642,7 @@ vlr_subscr_put(vsub, __func__); btw("MS sends Ciphering Mode Complete with IMEISV, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_ciphering_mode_complete("063217094b32244332244372f5"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -695,7 +695,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -737,7 +737,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_ciphering_mode_complete(NULL); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -844,7 +844,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR); + gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508" /* MM LU */ "7" /* ciph key seq: no key available */ "0" /* LU type: normal */ @@ -922,7 +922,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_ciphering_mode_complete(NULL); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -1067,7 +1067,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -1111,7 +1111,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_ciphering_mode_complete(NULL); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -1283,7 +1283,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -1327,7 +1327,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_ciphering_mode_complete(NULL); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 96a5303..5f6b370 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -36,7 +36,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -688,7 +688,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -1388,7 +1388,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -1707,7 +1707,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -1991,7 +1991,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2351,7 +2351,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2948,7 +2948,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -3592,7 +3592,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.c b/tests/msc_vlr/msc_vlr_test_hlr_reject.c index 45aaa8c..6cdadcb 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_reject.c +++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.c @@ -31,7 +31,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -58,7 +58,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -91,7 +91,7 @@ BTW("Submit a used auth tuple in the VLR"); btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -114,7 +114,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -147,7 +147,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -180,7 +180,7 @@ BTW("Submit a used auth tuple in the VLR"); btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -203,7 +203,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -237,7 +237,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -266,7 +266,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -304,7 +304,7 @@ BTW("Submit a used auth tuple in the VLR"); btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -328,7 +328,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -361,7 +361,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -373,7 +373,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -402,7 +402,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -426,7 +426,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err b/tests/msc_vlr/msc_vlr_test_hlr_reject.err index e4ea226..f0d94b4 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err @@ -36,7 +36,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -137,7 +137,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -241,7 +241,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -403,7 +403,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -567,7 +567,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -729,7 +729,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -833,7 +833,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -996,7 +996,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -1097,7 +1097,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.c b/tests/msc_vlr/msc_vlr_test_hlr_timeout.c index abc7c5b..4523a7c 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.c +++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.c @@ -35,7 +35,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -73,7 +73,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err index 5853643..3717533 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err @@ -37,7 +37,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.c b/tests/msc_vlr/msc_vlr_test_ms_timeout.c index 91f00ef..11afc51 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.c +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.c @@ -33,7 +33,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -94,7 +94,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -125,7 +125,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("05542d8b2c3e"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -195,7 +195,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -296,7 +296,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("08010809710000004026f0" VLR_TO_HLR); + gsup_expect_tx("08010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err index b909f52..6ccc82a 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err @@ -37,7 +37,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -166,7 +166,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -747,7 +747,7 @@ DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000004620:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c b/tests/msc_vlr/msc_vlr_test_no_authen.c index 9d506d6..7b684fe 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.c +++ b/tests/msc_vlr/msc_vlr_test_no_authen.c @@ -34,7 +34,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -171,7 +171,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -316,7 +316,7 @@ BTW("subscriber sends LU Request, this time with the TMSI"); btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130" "05f4" "03020100"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -389,7 +389,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -464,7 +464,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -552,7 +552,7 @@ OSMO_ASSERT(dtap_tx_confirmed); btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0559094332244332244372f5"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -628,7 +628,7 @@ btw("HLR accepts the IMEI, VLR responds with LU Request"); expect_bssap_clear(); gsup_rx("32010809710000004026f0510100" HLR_TO_VLR, - "04010809710000004026f0280102" VLR_TO_HLR); + "04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -686,7 +686,7 @@ OSMO_ASSERT(dtap_tx_confirmed); btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0559094332244332244372f5"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -742,7 +742,7 @@ OSMO_ASSERT(dtap_tx_confirmed); btw("MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0559095332244332244372f6"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -841,7 +841,7 @@ btw("HLR accepts the IMEI, VLR responds with LU Request"); expect_bssap_clear(); gsup_rx("32010809710000004026f0510100" HLR_TO_VLR, - "04010809710000004026f0280102" VLR_TO_HLR); + "04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -915,7 +915,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c index 648313f..dea0c29 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c @@ -30,7 +30,7 @@ btw("Location Update Request on one connection"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -73,7 +73,7 @@ { btw("Location Update Request"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_rest.c b/tests/msc_vlr/msc_vlr_test_rest.c index 1b998ad..029e8b5 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.c +++ b/tests/msc_vlr/msc_vlr_test_rest.c @@ -89,7 +89,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -120,7 +120,7 @@ BTW("verify that the MS can send another LU request"); btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -172,7 +172,7 @@ thwart_rx_non_initial_requests(); btw("MS tells us the IMSI, causes a GSUP LU request to HLR"); - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0559089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_ss.c b/tests/msc_vlr/msc_vlr_test_ss.c index 978ceae..772429e 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.c +++ b/tests/msc_vlr/msc_vlr_test_ss.c @@ -47,7 +47,7 @@ btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("04010809710000004026f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000004026f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("050802008168000130089910070000006402"); OSMO_ASSERT(gsup_tx_confirmed); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.c b/tests/msc_vlr/msc_vlr_test_umts_authen.c index 761db55..46f8d98 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.c +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.c @@ -58,7 +58,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR); + gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508" /* MM LU */ "7" /* ciph key seq: no key available */ "0" /* LU type: normal */ @@ -137,7 +137,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_security_mode_complete(); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -145,7 +145,7 @@ } else { /* Encryption disabled */ btw("Encryption disabled. MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0554" "e229c19e" "2104" "791f2e41"); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -369,7 +369,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR); + gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508" /* MM LU */ "7" /* ciph key seq: no key available */ "0" /* LU type: normal */ @@ -471,7 +471,7 @@ "0108" "09710000000156f0" /* IMSI */ "260e" "979498b1f72d3e28c59fa2e72f9c" /* AUTS */ "2010" "39fa2f4e3d523d8619a73b4f65c3e14d" /* RAND */ - VLR_TO_HLR); + CN_DOMAIN VLR_TO_HLR); ms_sends_msg("051c" /* 05 = MM; 1c = Auth Failure */ "15" /* cause = Synch Failure */ "220e" "979498b1f72d3e28c59fa2e72f9c" /* AUTS */); @@ -529,7 +529,7 @@ VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_security_mode_complete(); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -537,7 +537,7 @@ } else { /* Encryption disabled */ btw("Encryption disabled. MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR"); - gsup_expect_tx("04010809710000000156f0280102" VLR_TO_HLR); + gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0554" "1df5f0b4" "2104" "f22b696e"); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -609,7 +609,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR); + gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508" /* MM LU */ "7" /* ciph key seq: no key available */ "0" /* LU type: normal */ @@ -709,7 +709,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR); + gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508" /* MM LU */ "7" /* ciph key seq: no key available */ "0" /* LU type: normal */ @@ -809,7 +809,7 @@ btw("Location Update request causes a GSUP Send Auth Info request to HLR"); lu_result_sent = RES_NONE; - gsup_expect_tx("080108" "09710000000156f0" VLR_TO_HLR); + gsup_expect_tx("080108" "09710000000156f0" CN_DOMAIN VLR_TO_HLR); ms_sends_msg("0508" /* MM LU */ "7" /* ciph key seq: no key available */ "0" /* LU type: normal */ diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err index 62dc2d3..3e5dbae 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.err +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err @@ -36,7 +36,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -638,7 +638,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -1246,7 +1246,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -1878,7 +1878,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -1905,7 +1905,7 @@ DRLL msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_AUTH_FAIL DMM msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: MM R99 AUTHENTICATION SYNCH (AUTS = 979498b1f72d3e28c59fa2e72f9c) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_FAIL -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f0260e979498b1f72d3e28c59fa2e72f9c201039fa2f4e3d523d8619a73b4f65c3e14d0a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f0260e979498b1f72d3e28c59fa2e72f9c201039fa2f4e3d523d8619a73b4f65c3e14d2801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_SAI_RESYNC DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) gsup_tx_confirmed == 1 @@ -2110,7 +2110,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2137,7 +2137,7 @@ DRLL msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_AUTH_FAIL DMM msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: MM R99 AUTHENTICATION SYNCH (AUTS = 979498b1f72d3e28c59fa2e72f9c) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_FAIL -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f0260e979498b1f72d3e28c59fa2e72f9c201039fa2f4e3d523d8619a73b4f65c3e14d0a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f0260e979498b1f72d3e28c59fa2e72f9c201039fa2f4e3d523d8619a73b4f65c3e14d2801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_SAI_RESYNC DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) gsup_tx_confirmed == 1 @@ -2344,7 +2344,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2371,7 +2371,7 @@ DRLL msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_AUTH_FAIL DMM msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: MM R99 AUTHENTICATION SYNCH (AUTS = 979498b1f72d3e28c59fa2e72f9c) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: Received Event VLR_AUTH_E_MS_AUTH_FAIL -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f0260e979498b1f72d3e28c59fa2e72f9c201039fa2f4e3d523d8619a73b4f65c3e14d0a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f0260e979498b1f72d3e28c59fa2e72f9c201039fa2f4e3d523d8619a73b4f65c3e14d2801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_WAIT_RESP}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_SAI_RESYNC DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) gsup_tx_confirmed == 1 @@ -2588,7 +2588,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2706,7 +2706,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2824,7 +2824,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -2942,7 +2942,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -3060,7 +3060,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:GERAN-A:LU) DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:GERAN-A:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) @@ -3178,7 +3178,7 @@ DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(IMSI-901700000010650:UTRAN-Iu:LU) DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START -GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f00a0101 +GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000000156f02801020a0101 DVLR VLR_Authenticate(IMSI-901700000010650:UTRAN-Iu:LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - mm_rx_loc_upd_req: now used by 2 (rx_from_ms,lu) DREF msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu) diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h index 88f80b4..23dc9da 100644 --- a/tests/msc_vlr/msc_vlr_tests.h +++ b/tests/msc_vlr/msc_vlr_tests.h @@ -270,6 +270,7 @@ #define HLR_TO_VLR "0a0101" #define VLR_TO_HLR "0a0101" +#define CN_DOMAIN "280102" #define EUSE_TO_MSC_USSD "0a0103" #define MSC_USSD_TO_EUSE "0a0103" -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I22f44068268e62801cadbf6542efaf153423cd65 Gerrit-Change-Number: 16559 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 08:59:21 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 12 Dec 2019 08:59:21 +0000 Subject: Change in ...osmo-python-tests[master]: Drop python2 support (again) In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16540 ) Change subject: Drop python2 support (again) ...................................................................... Drop python2 support (again) Re-apply reverted commit Iabda95073faa2191fd117e9637e0858c589e9d9e ("Drop python2 support"), but with additional changes to make the scripts actually work with python3 and to make it build without python2. I have verified, that the contrib/jenkins.sh scripts of all Osmocom repositories (with their python3 patches on top) are working with this patch and that all Osmocom repositories with the python3 patches build in OBS (tested in own namespace). All related patches for changing from python2 to 3 in other repositories must be merged shortly after this one, as soon as the build slaves were (automatically) updated to have the new osmo-python-tests installed: https://gerrit.osmocom.org/q/topic:drop-py2 New fixes: * osmopy/obscvty.py: verify: fix compare Comparing maps in python3 does not work the same as in python2. Convert them to lists first, so the compare works as intended again. Fix error: File "/home/user/code/osmo-dev/src/osmo-python-tests/scripts/osmotestvty.py", line 57, in test_history assert(self.vty.w_verify(test_str, [t1])) AssertionError * osmopy/obscvty.py: use enc/dec with send/recv Fix error: self.socket.send("%s\r" % request) TypeError: a bytes-like object is required, not 'str' * scripts/osmotestconfig.py: use encode() before writing to file Fix error: File "/home/user/code/osmo-dev/src/osmo-python-tests/scripts/osmotestconfig.py", line 91, in copy_config tmpfile.write(open(config).read()) File "/usr/lib/python3.5/tempfile.py", line 622, in func_wrapper return func(*args, **kwargs) TypeError: a bytes-like object is required, not 'str' * debian/control: add --buildsystem=pybuild. Otherwise "--with python3" is ignored and the build fails if python2 is not installed, with: Can't exec "pyversions": No such file or directory at /usr/[...]/python_distutils.pm line 120. Related: OS#2819 Change-Id: I3ffc3519bf6c22536a49dad7a966188ddad351a7 --- M contrib/jenkins.sh M debian/control M debian/rules M osmopy/__init__.py M osmopy/obscvty.py M osmopy/osmo_interact/__init__.py M osmopy/osmo_interact/common.py M osmopy/osmoutil.py M scripts/osmodumpdoc.py M scripts/osmotestconfig.py M scripts/osmotestvty.py M setup.py D tests/test_py2.py 13 files changed, 28 insertions(+), 77 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 08908a4..9b219f9 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -4,16 +4,6 @@ COM_FLAGS='-m compileall' -# FIXME: remove once python 2 support is deprecated -PY2=python2 -PY2_LIST="osmopy scripts/osmodumpdoc.py scripts/osmotestvty.py scripts/osmotestconfig.py" -$PY2 ./setup.py install -$PY2 tests/test_py2.py -for f in $PY2_LIST -do - $PY2 $COM_FLAGS $f -done - rm -rf ./build PY3=python3 PY3_LIST="osmopy scripts/osmo_ctrl.py scripts/osmo_rate_ctr2csv.py scripts/osmodumpdoc.py scripts/osmotestvty.py scripts/osmotestconfig.py scripts/osmo_interact_ctrl.py scripts/osmo_interact_vty.py scripts/osmo_verify_transcript_ctrl.py scripts/osmo_verify_transcript_vty.py scripts/soap.py scripts/twisted_ipa.py" diff --git a/debian/control b/debian/control index 52b614c..1ad871d 100644 --- a/debian/control +++ b/debian/control @@ -2,26 +2,12 @@ Section: python Priority: optional Maintainer: Harald Welte -Build-Depends: debhelper (>= 9), python, dh-python, python-setuptools, python3, python3-setuptools +Build-Depends: debhelper (>= 9), dh-python, python3, python3-setuptools Standards-Version: 3.9.8 Homepage: http://git.osmocom.org/python/osmo-python-tests/ Vcs-Git: git://git.osmocom.org/python/osmo-python-tests Vcs-Browser: http://git.osmocom.org/python/osmo-python-tests/ -Package: python2-osmopy-libs -Architecture: all -Depends: ${python:Depends}, ${misc:Depends} -Description: Python code (not only) for testing of Osmocom programs - . - This package contains the Python 2 version of osmopy libraries. - -Package: python2-osmopy-utils -Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, python2-osmopy-libs -Description: Python code (not only) for testing of Osmocom programs - . - This package contains the Python 2 version of osmopy utils. - Package: python3-osmopy-libs Architecture: all Depends: ${python3:Depends}, ${misc:Depends} diff --git a/debian/rules b/debian/rules index 04b59f6..ff16a03 100755 --- a/debian/rules +++ b/debian/rules @@ -1,13 +1,9 @@ #!/usr/bin/make -f %: - dh $@ --with python2,python3 + dh $@ --with python3 --buildsystem=pybuild override_dh_auto_install: - python2 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python2-osmopy-libs - rm -rf $(CURDIR)/debian/python2-osmopy-libs/usr/bin - python2 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python2-osmopy-utils - rm -rf $(CURDIR)/debian/python2-osmopy-utils/usr/lib python3 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python3-osmopy-libs rm -rf $(CURDIR)/debian/python3-osmopy-libs/usr/bin python3 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python3-osmopy-utils diff --git a/osmopy/__init__.py b/osmopy/__init__.py index ce78caf..18362ec 100644 --- a/osmopy/__init__.py +++ b/osmopy/__init__.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 __version__ = '0.1.0' __all__ = ['obscvty', 'osmoutil', 'osmo_ipa', 'osmo_interact', 'trap_helper', 'twisted_ipa'] diff --git a/osmopy/obscvty.py b/osmopy/obscvty.py index d39d3da..6b7d56c 100755 --- a/osmopy/obscvty.py +++ b/osmopy/obscvty.py @@ -16,7 +16,6 @@ # # VTY helper code for OpenBSC # -from __future__ import print_function import re import socket import sys, subprocess @@ -176,13 +175,13 @@ self._connect_socket() # Now send the command - self.socket.send("%s\r" % request) + self.socket.send(("%s\r" % request).encode()) res = "" end = "" # Unfortunately, timeout and recv don't always play nicely while True: - data = self.socket.recv(4096) + data = self.socket.recv(4096).decode() res = "%s%s" % (res, data) if not res: # yes, this is ugly raise IOError("Failed to read data (did the app crash?)") @@ -205,7 +204,7 @@ buffer = '' data = True while data: - data = self.socket.recv(recv_buffer) + data = self.socket.recv(recv_buffer).decode() buffer += data while buffer.find(delim) != -1: @@ -244,8 +243,8 @@ def verify(self, command, results, close=False, loud=True, f=None): res = self.command(command, close).split('\r\n') if f: - res = map(f, res) - results = map(f, results) + res = list(map(f, res)) + results = list(map(f, results)) if loud: if res != results: diff --git a/osmopy/osmo_interact/__init__.py b/osmopy/osmo_interact/__init__.py index 4fc4fac..036238a 100644 --- a/osmopy/osmo_interact/__init__.py +++ b/osmopy/osmo_interact/__init__.py @@ -1,2 +1,2 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 __all__ = ['common', 'vty', 'ctrl'] diff --git a/osmopy/osmo_interact/common.py b/osmopy/osmo_interact/common.py index cc7e190..87eca6a 100644 --- a/osmopy/osmo_interact/common.py +++ b/osmopy/osmo_interact/common.py @@ -24,11 +24,6 @@ vty.py and ctrl.py plug VTY and CTRL interface specific bits. ''' -# Our setup.py currently wants everything to be parsable by both py2 and py3. -# IMHO that is not a good idea, but until that changes, let's just keep this -# py2 legacy shim in here so we can syntax-check this py3 module with py2. -from __future__ import print_function - import argparse import sys import os diff --git a/osmopy/osmoutil.py b/osmopy/osmoutil.py index 54a3456..ec9c8c3 100755 --- a/osmopy/osmoutil.py +++ b/osmopy/osmoutil.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify @@ -14,7 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from __future__ import print_function import subprocess import os import sys diff --git a/scripts/osmodumpdoc.py b/scripts/osmodumpdoc.py index d71edc8..64b088f 100755 --- a/scripts/osmodumpdoc.py +++ b/scripts/osmodumpdoc.py @@ -1,10 +1,9 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Make sure this code is in sync with the BTS directory. # Fixes may need to be applied to both. """Start the process and dump the documentation to the doc dir.""" -from __future__ import print_function import subprocess import time import os diff --git a/scripts/osmotestconfig.py b/scripts/osmotestconfig.py index f227504..3c96ca6 100755 --- a/scripts/osmotestconfig.py +++ b/scripts/osmotestconfig.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify @@ -13,7 +13,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from __future__ import print_function import os import os.path import time @@ -89,7 +88,7 @@ prefix = os.path.basename(config) tmpfile = tempfile.NamedTemporaryFile( dir=dirname, prefix=prefix, delete=False) - tmpfile.write(open(config).read()) + tmpfile.write(open(config).read().encode()) tmpfile.close() # This works around the precautions NamedTemporaryFile is made for... return tmpfile.name diff --git a/scripts/osmotestvty.py b/scripts/osmotestvty.py index 55017a5..600860f 100755 --- a/scripts/osmotestvty.py +++ b/scripts/osmotestvty.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify @@ -13,7 +13,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from __future__ import print_function import os import time import unittest diff --git a/setup.py b/setup.py index 69e18b0..ab604ce 100755 --- a/setup.py +++ b/setup.py @@ -19,24 +19,20 @@ from osmopy import __version__ import sys -if sys.version_info.major == 2: - scripts = [ - "scripts/osmodumpdoc.py", - "scripts/osmotestconfig.py", - "scripts/osmotestvty.py", - ] -elif sys.version_info.major == 3: - scripts = [ - "scripts/osmo_ctrl.py", - "scripts/osmo_rate_ctr2csv.py", - "scripts/soap.py", - "scripts/ctrl2cgi.py", - "scripts/osmo_trap2cgi.py", - "scripts/osmo_interact_vty.py", - "scripts/osmo_interact_ctrl.py", - "scripts/osmo_verify_transcript_vty.py", - "scripts/osmo_verify_transcript_ctrl.py", - ] +scripts = [ + "scripts/osmodumpdoc.py", + "scripts/osmotestvty.py", + "scripts/osmotestconfig.py", + "scripts/osmo_ctrl.py", + "scripts/osmo_rate_ctr2csv.py", + "scripts/soap.py", + "scripts/ctrl2cgi.py", + "scripts/osmo_trap2cgi.py", + "scripts/osmo_interact_vty.py", + "scripts/osmo_interact_ctrl.py", + "scripts/osmo_verify_transcript_vty.py", + "scripts/osmo_verify_transcript_ctrl.py", + ] setup( name = 'osmopython', diff --git a/tests/test_py2.py b/tests/test_py2.py deleted file mode 100644 index cac5261..0000000 --- a/tests/test_py2.py +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env python2 - -# just import a smoke test for osmopy - -import osmopy - -print '[Python2] Smoke test PASSED.' -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I3ffc3519bf6c22536a49dad7a966188ddad351a7 Gerrit-Change-Number: 16540 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 09:18:58 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 12 Dec 2019 09:18:58 +0000 Subject: Change in libosmo-sccp[master]: osmoappdesc.py, tests: switch to python 3 In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16542 ) Change subject: osmoappdesc.py, tests: switch to python 3 ...................................................................... osmoappdesc.py, tests: switch to python 3 Make build and external tests work with python3, so we can drop the python2 dependency. This should be merged shortly after osmo-python-tests was migrated to python3, and the jenkins build slaves were (automatically) updated to have the new osmo-python-tests installed. Related: OS#2819 Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Change-Id: I344c49001fba23bdcfdef06ab174c52b60edd01c --- M osmoappdesc.py M tests/vty/vty_test_runner.py 2 files changed, 17 insertions(+), 17 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/osmoappdesc.py b/osmoappdesc.py index 02ccda6..6c1bafa 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 app_configs = { "osmo-stp": ["doc/examples/osmo-stp.cfg"], diff --git a/tests/vty/vty_test_runner.py b/tests/vty/vty_test_runner.py index 47ce23c..605bc93 100755 --- a/tests/vty/vty_test_runner.py +++ b/tests/vty/vty_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # (C) 2013 by Holger Hans Peter Freyther @@ -35,9 +35,9 @@ def checkForEndAndExit(self): res = self.vty.command("list") #print ('looking for "exit"\n') - self.assert_(res.find(' exit\r') > 0) + self.assertTrue(res.find(' exit\r') > 0) #print 'found "exit"\nlooking for "end"\n' - self.assert_(res.find(' end\r') > 0) + self.assertTrue(res.find(' end\r') > 0) #print 'found "end"\n' def vty_command(self): @@ -56,8 +56,8 @@ try: self.proc = osmoutil.popen_devnull(osmo_vty_cmd) except OSError: - print >> sys.stderr, "Current directory: %s" % os.getcwd() - print >> sys.stderr, "Consider setting -b" + print("Current directory: %s" % os.getcwd(), file=sys.stderr) + print("Consider setting -b", file=sys.stderr) appstring = self.vty_app()[2] appport = self.vty_app()[0] @@ -89,22 +89,22 @@ line = fp.readline().strip() if not line: return False - print "%s: parsing line: %s" %(path, line) + print("%s: parsing line: %s" %(path, line)) it = line.split() if lport == int(it[5]): - print "%s: local port %d found" %(path, lport) + print("%s: local port %d found" %(path, lport)) itaddr_list = it[8:] if len(itaddr_list) != len(laddr_list): - print "%s: addr list mismatch: %r vs %r" % (path, repr(itaddr_list), repr(laddr_list)) + print("%s: addr list mismatch: %r vs %r" % (path, repr(itaddr_list), repr(laddr_list))) continue for addr in laddr_list: if addr not in itaddr_list: - print "%s: addr not found in list: %s vs %r" % (path, addr, repr(itaddr_list)) + print("%s: addr not found in list: %s vs %r" % (path, addr, repr(itaddr_list))) return False return True return False except IOError as e: - print "I/O error({0}): {1}".format(e.errno, e.strerror) + print("I/O error({0}): {1}".format(e.errno, e.strerror)) return False def testMultiHome(self): @@ -115,9 +115,9 @@ found = True break else: - print "[%d] osmo-stp not yet available, retrying in a second" % i + print("[%d] osmo-stp not yet available, retrying in a second" % i) time.sleep(1) - self.assert_(found) + self.assertTrue(found) try: proto = socket.IPPROTO_SCTP except AttributeError: # it seems to be not defined under python2? @@ -128,8 +128,8 @@ s.connect(('127.0.0.2',2905)) except socket.error as msg: s.close() - self.assert_(False) - print "Connected to STP through SCTP" + self.assertTrue(False) + print("Connected to STP through SCTP") s.close() if __name__ == '__main__': @@ -158,9 +158,9 @@ if args.p: confpath = args.p - print "confpath %s, workdir %s" % (confpath, workdir) + print("confpath %s, workdir %s" % (confpath, workdir)) os.chdir(workdir) - print "Running tests for specific VTY commands" + print("Running tests for specific VTY commands") suite = unittest.TestSuite() suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestVTYSTP)) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I344c49001fba23bdcfdef06ab174c52b60edd01c Gerrit-Change-Number: 16542 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 09:22:00 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 12 Dec 2019 09:22:00 +0000 Subject: Change in osmo-sip-connector[master]: osmoappdesc.py: switch to python 3 In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16553 ) Change subject: osmoappdesc.py: switch to python 3 ...................................................................... osmoappdesc.py: switch to python 3 Make build and external tests work with python3, so we can drop the python2 dependency. This should be merged shortly after osmo-python-tests was migrated to python3, and the jenkins build slaves were (automatically) updated to have the new osmo-python-tests installed. Related: OS#2819 Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Change-Id: Ic913e336a5a962fe9515479b03eecdbef0917721 --- M osmoappdesc.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/osmoappdesc.py b/osmoappdesc.py index adb9662..e0263b5 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2016 by Holger Hans Peter Freyther -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16553 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ic913e336a5a962fe9515479b03eecdbef0917721 Gerrit-Change-Number: 16553 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 09:22:09 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 12 Dec 2019 09:22:09 +0000 Subject: Change in osmo-mgw[master]: osmoappdesc.py: switch to python 3 In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/16549 ) Change subject: osmoappdesc.py: switch to python 3 ...................................................................... osmoappdesc.py: switch to python 3 Make build and external tests work with python3, so we can drop the python2 dependency. This should be merged shortly after osmo-python-tests was migrated to python3, and the jenkins build slaves were (automatically) updated to have the new osmo-python-tests installed. Related: OS#2819 Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Change-Id: I48f4c2c520e8285aff5d6d65f95bd041c13466e8 --- M osmoappdesc.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/osmoappdesc.py b/osmoappdesc.py index cee5a24..58e72e1 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/16549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I48f4c2c520e8285aff5d6d65f95bd041c13466e8 Gerrit-Change-Number: 16549 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 09:22:30 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 12 Dec 2019 09:22:30 +0000 Subject: Change in osmo-pcap[master]: osmoappdesc.py: switch to python 3 In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/16551 ) Change subject: osmoappdesc.py: switch to python 3 ...................................................................... osmoappdesc.py: switch to python 3 Make build and external tests work with python3, so we can drop the python2 dependency. Note that the external tests, which are using this file, are currently not enabled in jenkins (OS#4317). However, I've manually verified that the external tests work with this change. Related: OS#2819 Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Change-Id: I19a996458745026cff60608710944e5ab76d8976 --- M osmoappdesc.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/osmoappdesc.py b/osmoappdesc.py index 38b18c0..331e6a9 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2016 by Holger Hans Peter Freyther # This program is free software: you can redistribute it and/or modify -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/16551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I19a996458745026cff60608710944e5ab76d8976 Gerrit-Change-Number: 16551 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 09:22:39 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 12 Dec 2019 09:22:39 +0000 Subject: Change in osmo-hlr[master]: tests/auc: change back to python3 In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16546 ) Change subject: tests/auc: change back to python3 ...................................................................... tests/auc: change back to python3 Change the interpreter of the python script back to python3, as it was when the script was initially added in Idff9d757ab956179aa41ada2a223fd9f439aafbd. In the meantime, it had been changed to python2 to make it work with build slaves that were missing python3, but this is not necessary anymore. This should be merged shortly after osmo-python-tests was migrated to python3, and the jenkins build slaves were (automatically) updated to have the new osmo-python-tests installed. Related: OS#2819 Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Change-Id: Ifbb8f8f5428657a1c2d4d6d1217f8e374be43aba --- M debian/control M tests/auc/gen_ts_55_205_test_sets/pdftxt_2_c.py 2 files changed, 2 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/control b/debian/control index debf669..a32c68d 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ dh-autoreconf, dh-systemd (>= 1.5), autotools-dev, - python-minimal, + python3-minimal, libosmocore-dev, libosmo-abis-dev, libosmo-netif-dev, diff --git a/tests/auc/gen_ts_55_205_test_sets/pdftxt_2_c.py b/tests/auc/gen_ts_55_205_test_sets/pdftxt_2_c.py index b01a797..9df65b5 100755 --- a/tests/auc/gen_ts_55_205_test_sets/pdftxt_2_c.py +++ b/tests/auc/gen_ts_55_205_test_sets/pdftxt_2_c.py @@ -1,5 +1,4 @@ -#!/usr/bin/env python -# FIXME: use python3 once buildslaves are updated. +#!/usr/bin/env python3 # Convert test sets pasted from 3GPP TS 55.205 to C code. # (C) 2016 by sysmocom s.f.m.c. GmbH -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ifbb8f8f5428657a1c2d4d6d1217f8e374be43aba Gerrit-Change-Number: 16546 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 09:24:05 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 12 Dec 2019 09:24:05 +0000 Subject: Change in libosmocore[master]: debian, utils: switch to python 3 In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16543 ) Change subject: debian, utils: switch to python 3 ...................................................................... debian, utils: switch to python 3 Make build and external tests work with python3, so we can drop the python2 dependency. This should be merged shortly after osmo-python-tests was migrated to python3, and the jenkins build slaves were (automatically) updated to have the new osmo-python-tests installed. Related: OS#2819 Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Change-Id: I84ef43f700e125c7a65f92347f12844e07e65655 --- M debian/control M include/Makefile.am M src/gsm/Makefile.am M tests/Makefile.am M utils/conv_codes_gsm.py M utils/conv_gen.py 6 files changed, 6 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/control b/debian/control index 6c9cfae..cf7a853 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ pkg-config, libtalloc-dev, libsctp-dev, - python (>= 2.7.6) + python3 Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/libosmocore.git Vcs-Browser: http://git.osmocom.org/libosmocore/ diff --git a/include/Makefile.am b/include/Makefile.am index a82d6ac..d76addd 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -179,7 +179,7 @@ $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@ osmocom/gsm/gsm0503.h: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py - $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_header gsm \ + $(AM_V_GEN)python3 $(top_srcdir)/utils/conv_gen.py gen_header gsm \ --target-path $(builddir)/osmocom/gsm CLEANFILES = osmocom/gsm/gsm0503.h diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index f13ba9d..4a1faca 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -49,6 +49,6 @@ # Convolutional codes generation gsm0503_conv.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py - $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_codes gsm + $(AM_V_GEN)python3 $(top_srcdir)/utils/conv_gen.py gen_codes gsm CLEANFILES = gsm0503_conv.c diff --git a/tests/Makefile.am b/tests/Makefile.am index e8e4dee..3a3ea37 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -362,7 +362,7 @@ mv $@.tmp $@ conv/gsm0503_test_vectors.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py - $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_vectors gsm \ + $(AM_V_GEN)python3 $(top_srcdir)/utils/conv_gen.py gen_vectors gsm \ --target-path $(builddir)/conv if ENABLE_EXT_TESTS diff --git a/utils/conv_codes_gsm.py b/utils/conv_codes_gsm.py index ec77660..e189985 100644 --- a/utils/conv_codes_gsm.py +++ b/utils/conv_codes_gsm.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- from conv_gen import ConvolutionalCode diff --git a/utils/conv_gen.py b/utils/conv_gen.py index 06283d8..d2eda15 100644 --- a/utils/conv_gen.py +++ b/utils/conv_gen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 mod_license = """ /* -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16543 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I84ef43f700e125c7a65f92347f12844e07e65655 Gerrit-Change-Number: 16543 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 09:24:19 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 12 Dec 2019 09:24:19 +0000 Subject: Change in osmo-iuh[master]: debian, asn1tostruct.py: switch to python3 In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/16548 ) Change subject: debian, asn1tostruct.py: switch to python3 ...................................................................... debian, asn1tostruct.py: switch to python3 Make build work with python3 and drop the python2 dependency. Related: OS#2819 Change-Id: Idb9d7a349ddb7619c784823f740648c7956bae5e --- M asn1/utils/asn1tostruct.py M debian/control 2 files changed, 35 insertions(+), 35 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/asn1/utils/asn1tostruct.py b/asn1/utils/asn1tostruct.py index 3c33980..220517d 100755 --- a/asn1/utils/asn1tostruct.py +++ b/asn1/utils/asn1tostruct.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 import re, os, sys, string import datetime @@ -27,11 +27,11 @@ sys.stderr.write(FAIL + string + ENDC + "\n") def printWarning(string): - print WARN + string + ENDC + print(WARN + string + ENDC) def printDebug(string): if verbosity > 0: - print string + print(string) def outputHeaderToFile(f, filename): now = datetime.datetime.utcfromtimestamp(int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))) @@ -57,7 +57,7 @@ return lowered for c in swapped: - if c in string.lowercase: + if c.islower(): newstr += c idx += 1 else: @@ -70,14 +70,14 @@ return newstr def usage(): - print "Python parser for asn1 v%s" % (version) - print "Usage: python asn1tostruct.py [options]" - print "Available options:" - print "-d Enable script debug" - print "-f [file] Input file to parse" - print "-o [dir] Output files to given directory" - print "-p [pfx] Prefix all types with given prefix" - print "-h Print this help and return" + print("Python parser for asn1 v%s" % (version)) + print("Usage: python asn1tostruct.py [options]") + print("Available options:") + print("-d Enable script debug") + print("-f [file] Input file to parse") + print("-o [dir] Output files to given directory") + print("-p [pfx] Prefix all types with given prefix") + print("-h Print this help and return") try: opts, args = getopt.getopt(sys.argv[1:], "df:ho:p:", ["debug", "file", "help", "outdir", "prefix"]) @@ -102,7 +102,7 @@ sys.exit(2) for filename in filenames: - file = open(filename, 'r') + file = open(filename, 'r', encoding='utf-8') for line in file: # Removing any comment if line.find('--') >= 0: @@ -139,17 +139,17 @@ printFail("No Information Element parsed, exiting") sys.exit(0) -f = open(outdir + fileprefix + '_ies_defs.h', 'w') +f = open(outdir + fileprefix + '_ies_defs.h', 'w', encoding='utf-8') outputHeaderToFile(f, filename) f.write("#include \"%s_common.h\"\n\n" % (fileprefix)) f.write("#ifndef %s_IES_DEFS_H_\n#define %s_IES_DEFS_H_\n\n" % (fileprefix.upper(), fileprefix.upper())) for key in iesDefs: - if key not in ieofielist.values(): + if key not in list(ieofielist.values()): continue - for (i, j) in ieofielist.items(): + for (i, j) in list(ieofielist.items()): if j == key: break @@ -200,10 +200,10 @@ f.write(" uint8_t direction;\n") f.write(" union {\n") -messageList = iesDefs.keys() +messageList = list(iesDefs.keys()) messageList.sort() for message in messageList: - if message in ieofielist.values(): + if message in list(ieofielist.values()): continue if len(iesDefs[message]["ies"]) == 0: continue @@ -212,7 +212,7 @@ f.write("} %s_message;\n\n" % (fileprefix)) for key in iesDefs: - if key in ieofielist.values(): + if key in list(ieofielist.values()): continue structName = re.sub('ies', '', key) asn1cStruct = re.sub('-', '_', re.sub('IEs', '', re.sub('-IEs', '', key))) @@ -242,7 +242,7 @@ f.write(" %s_t *%s);\n\n" % (prefix + re.sub('-', '_', key), lowerFirstCamelWord(re.sub('-', '_', key)))) for key in iesDefs: - if key not in ieofielist.values(): + if key not in list(ieofielist.values()): continue asn1cStruct = re.sub('-', '_', re.sub('IEs', '', key)) asn1cStruct = prefix + re.sub('Item', 'List', asn1cStruct) @@ -276,11 +276,11 @@ f.write("#endif /* %s_IES_DEFS_H_ */\n\n" % (fileprefix.upper())) #Generate Decode functions -f = open(outdir + fileprefix + '_decoder.c', 'w') +f = open(outdir + fileprefix + '_decoder.c', 'w', encoding='utf-8') outputHeaderToFile(f, filename) f.write("#include \"%s_common.h\"\n#include \"%s_ies_defs.h\"\n\n" % (fileprefix, fileprefix)) for key in iesDefs: - if key in ieofielist.values(): + if key in list(ieofielist.values()): continue structName = re.sub('ies', '', key) asn1cStruct = re.sub('-', '_', re.sub('IEs', '', re.sub('-IEs', '', key))) @@ -293,7 +293,7 @@ asn1cStruct = prefix + re.sub('Item', 'List', asn1cStruct) iesaccess = "" - if key not in ieofielist.values(): + if key not in list(ieofielist.values()): iesaccess = "%s_ies." % (firstlower) f.write("int %s_decode_%s(\n" % (fileprefix, re.sub('-', '_', structName.lower()))) @@ -346,7 +346,7 @@ f.write(" decoded += tempDecoded;\n") f.write(" if (asn1_xer_print)\n") f.write(" xer_fprint(stdout, &asn_DEF_%s, %s_p);\n" % (ietypeunderscore, lowerFirstCamelWord(ietypesubst))) - if ie[2] in ieofielist.keys(): + if ie[2] in list(ieofielist.keys()): f.write(" if (%s_decode_%s(&%s->%s, %s_p) < 0) {\n" % (fileprefix, ietypeunderscore.lower(), lowerFirstCamelWord(re.sub('-', '_', key)), ienameunderscore, lowerFirstCamelWord(ietypesubst))) f.write(" %s_DEBUG(\"Decoding of encapsulated IE %s failed\\n\");\n" % (fileprefix.upper(), lowerFirstCamelWord(ietypesubst))) f.write(" ASN_STRUCT_FREE(asn_DEF_%s, %s_p);\n" % (ietypeunderscore, lowerFirstCamelWord(ietypesubst))) @@ -395,7 +395,7 @@ f.write("}\n\n") for key in iesDefs: - if key not in ieofielist.values(): + if key not in list(ieofielist.values()): continue keyname = re.sub('IEs', '', re.sub('Item', 'List', key)) @@ -437,12 +437,12 @@ #Generate IES Encode functions -f = open(outdir + fileprefix + '_encoder.c', 'w') +f = open(outdir + fileprefix + '_encoder.c', 'w', encoding='utf-8') outputHeaderToFile(f,filename) f.write("#include \"%s_common.h\"\n" % (fileprefix)) f.write("#include \"%s_ies_defs.h\"\n\n" % (fileprefix)) for key in iesDefs: - if key in ieofielist.values(): + if key in list(ieofielist.values()): continue structName = re.sub('ies', '', key) @@ -452,7 +452,7 @@ asn1cStructfirstlower = asn1cStruct[:1].lower() + asn1cStruct[1:] iesaccess = "" - if key not in ieofielist.values(): + if key not in list(ieofielist.values()): iesaccess = "%s_ies." % (firstwordlower) keyName = re.sub('-', '_', key) @@ -489,7 +489,7 @@ f.write(" ASN_SEQUENCE_ADD(&%s->%slist, ie);\n" % (firstwordlower, iesaccess)) f.write(" }\n\n") else: - if ie[2] in ieofielist.keys(): + if ie[2] in list(ieofielist.keys()): f.write(" %s_t %s;\n\n" % (prefix + ietypeunderscore, ienamefirstwordlower)) f.write(" memset(&%s, 0, sizeof(%s_t));\n" % (ienamefirstwordlower, ietypeunderscore)) f.write("\n") @@ -497,21 +497,21 @@ f.write(" if ((ie = %s_new_ie(%sProtocolIE_ID_%s,\n" % (fileprefix, prefix, re.sub('-', '_', ie[0]))) f.write(" %sCriticality_%s,\n" % (prefix, ie[1])) f.write(" &asn_DEF_%s,\n" % (ietypeunderscore)) - if ie[2] in ieofielist.keys(): + if ie[2] in list(ieofielist.keys()): f.write(" &%s)) == NULL) {\n" % (ienamefirstwordlower)) else: f.write(" &%s->%s)) == NULL) {\n" % (lowerFirstCamelWord(re.sub('-', '_', key)), ienamefirstwordlower)) f.write(" return -1;\n") f.write(" }\n") f.write(" ASN_SEQUENCE_ADD(&%s->%slist, ie);\n\n" % (firstwordlower, iesaccess)) - if ie[2] in ieofielist.keys(): + if ie[2] in list(ieofielist.keys()): f.write(" ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_%s, &%s);\n\n" % (ietypeunderscore, ienamefirstwordlower)) f.write(" return 0;\n") f.write("}\n\n") -for (key, value) in iesDefs.items(): - if key not in ieofielist.values(): +for (key, value) in list(iesDefs.items()): + if key not in list(ieofielist.values()): continue ie = value["ies"][0] @@ -520,7 +520,7 @@ asn1cStruct = prefix + re.sub('Item', 'List', asn1cStruct) firstwordlower = re.sub('Item', 'List', re.sub('enb', 'eNB', lowerFirstCamelWord(asn1cStruct))) - for (i, j) in ieofielist.items(): + for (i, j) in list(ieofielist.items()): if j == key: break f.write("int %s_encode_%s(\n" % (fileprefix, re.sub('-', '_', i).lower())) diff --git a/debian/control b/debian/control index 7e760acb..d07ab67 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ libosmocore-dev (>= 0.12.0), libosmo-netif-dev (>= 0.3.0), libosmo-sigtran-dev (>= 0.10.0), - python (>= 2.7) + python3 Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-iuh.git Vcs-Browser: https://git.osmocom.org/osmo-iuh/ -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/16548 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Idb9d7a349ddb7619c784823f740648c7956bae5e Gerrit-Change-Number: 16548 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 09:29:08 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 12 Dec 2019 09:29:08 +0000 Subject: Change in osmo-sgsn[master]: osmoappdesc.py, tests: switch to python 3 In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/16552 ) Change subject: osmoappdesc.py, tests: switch to python 3 ...................................................................... osmoappdesc.py, tests: switch to python 3 Make build and external tests work with python3, so we can drop the python2 dependency. This should be merged shortly after osmo-python-tests was migrated to python3, and the jenkins build slaves were (automatically) updated to have the new osmo-python-tests installed. Related: OS#2819 Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Change-Id: I8c07d99c1bc9f0383e4bce17544e0998998cc54d --- M osmoappdesc.py M tests/ctrl_test_runner.py M tests/vty_test_runner.py 3 files changed, 82 insertions(+), 82 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/osmoappdesc.py b/osmoappdesc.py index 08166a9..e91043f 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py index 9c253fc..69b2478 100755 --- a/tests/ctrl_test_runner.py +++ b/tests/ctrl_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # (C) 2013 by Jacob Erlbeck # (C) 2014 by Holger Hans Peter Freyther @@ -53,8 +53,8 @@ try: self.proc = osmoutil.popen_devnull(osmo_ctrl_cmd) except OSError: - print >> sys.stderr, "Current directory: %s" % os.getcwd() - print >> sys.stderr, "Consider setting -b" + print("Current directory: %s" % os.getcwd(), file=sys.stderr) + print("Consider setting -b", file=sys.stderr) time.sleep(2) appstring = self.ctrl_app()[2] @@ -72,7 +72,7 @@ def connect(self, host, port): if verbose: - print "Connecting to host %s:%i" % (host, port) + print("Connecting to host %s:%i" % (host, port)) retries = 30 while True: @@ -92,7 +92,7 @@ def send(self, data): if verbose: - print "Sending \"%s\"" %(data) + print("Sending \"%s\"" %(data)) data = Ctrl().add_header(data) return self.sock.send(data) == len(data) @@ -121,9 +121,9 @@ data = self.sock.recv(4096) while (len(data)>0): (head, data) = IPA().split_combined(data) - answer = Ctrl().rem_header(head) + answer = Ctrl().rem_header(head).decode() if verbose: - print "Got message:", answer + print("Got message:", answer) (mtype, id, msg) = answer.split(None, 2) id = int(id) rsp = {'mtype': mtype, 'id': id} @@ -139,7 +139,7 @@ responses[id] = rsp if verbose: - print "Decoded replies: ", responses + print("Decoded replies: ", responses) return responses @@ -154,9 +154,9 @@ def testListSubscribers(self): # TODO. Add command to mark a subscriber as active r = self.do_get('subscriber-list-active-v1') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'subscriber-list-active-v1') - self.assertEquals(r['value'], None) + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'subscriber-list-active-v1') + self.assertEqual(r['value'], None) def add_sgsn_test(suite, workdir): if not os.path.isfile(os.path.join(workdir, "src/sgsn/osmo-sgsn")): @@ -191,9 +191,9 @@ if args.p: confpath = args.p - print "confpath %s, workdir %s" % (confpath, workdir) + print("confpath %s, workdir %s" % (confpath, workdir)) os.chdir(workdir) - print "Running tests for specific control commands" + print("Running tests for specific control commands") suite = unittest.TestSuite() add_sgsn_test(suite, workdir) res = unittest.TextTestRunner(verbosity=verbose_level).run(suite) diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py index a925b6b..ed52d5f 100755 --- a/tests/vty_test_runner.py +++ b/tests/vty_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # (C) 2013 by Holger Hans Peter Freyther @@ -33,9 +33,9 @@ def checkForEndAndExit(self): res = self.vty.command("list") #print ('looking for "exit"\n') - self.assert_(res.find(' exit\r') > 0) + self.assertTrue(res.find(' exit\r') > 0) #print 'found "exit"\nlooking for "end"\n' - self.assert_(res.find(' end\r') > 0) + self.assertTrue(res.find(' end\r') > 0) #print 'found "end"\n' def vty_command(self): @@ -54,8 +54,8 @@ try: self.proc = osmoutil.popen_devnull(osmo_vty_cmd) except OSError: - print >> sys.stderr, "Current directory: %s" % os.getcwd() - print >> sys.stderr, "Consider setting -b" + print("Current directory: %s" % os.getcwd(), file=sys.stderr) + print("Consider setting -b", file=sys.stderr) appstring = self.vty_app()[2] appport = self.vty_app()[0] @@ -80,41 +80,41 @@ def testVtyTree(self): self.vty.enable() self.assertTrue(self.vty.verify('configure terminal', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.checkForEndAndExit() self.assertTrue(self.vty.verify('ns', [''])) - self.assertEquals(self.vty.node(), 'config-ns') + self.assertEqual(self.vty.node(), 'config-ns') self.checkForEndAndExit() self.assertTrue(self.vty.verify('exit', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('gbproxy', [''])) - self.assertEquals(self.vty.node(), 'config-gbproxy') + self.assertEqual(self.vty.node(), 'config-gbproxy') self.checkForEndAndExit() self.assertTrue(self.vty.verify('exit', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') def testVtyShow(self): res = self.vty.command("show ns") - self.assert_(res.find('Encapsulation NS-UDP-IP') >= 0) + self.assertTrue(res.find('Encapsulation NS-UDP-IP') >= 0) res = self.vty.command("show gbproxy stats") - self.assert_(res.find('GBProxy Global Statistics') >= 0) + self.assertTrue(res.find('GBProxy Global Statistics') >= 0) def testVtyDeletePeer(self): self.vty.enable() self.assertTrue(self.vty.verify('delete-gbproxy-peer 9999 bvci 7777', ['BVC not found'])) res = self.vty.command("delete-gbproxy-peer 9999 all dry-run") - self.assert_(res.find('Not Deleted 0 BVC') >= 0) - self.assert_(res.find('Not Deleted 0 NS-VC') >= 0) + self.assertTrue(res.find('Not Deleted 0 BVC') >= 0) + self.assertTrue(res.find('Not Deleted 0 NS-VC') >= 0) res = self.vty.command("delete-gbproxy-peer 9999 only-bvc dry-run") - self.assert_(res.find('Not Deleted 0 BVC') >= 0) - self.assert_(res.find('Not Deleted 0 NS-VC') < 0) + self.assertTrue(res.find('Not Deleted 0 BVC') >= 0) + self.assertTrue(res.find('Not Deleted 0 NS-VC') < 0) res = self.vty.command("delete-gbproxy-peer 9999 only-nsvc dry-run") - self.assert_(res.find('Not Deleted 0 BVC') < 0) - self.assert_(res.find('Not Deleted 0 NS-VC') >= 0) + self.assertTrue(res.find('Not Deleted 0 BVC') < 0) + self.assertTrue(res.find('Not Deleted 0 NS-VC') >= 0) res = self.vty.command("delete-gbproxy-peer 9999 all") - self.assert_(res.find('Deleted 0 BVC') >= 0) - self.assert_(res.find('Deleted 0 NS-VC') >= 0) + self.assertTrue(res.find('Deleted 0 BVC') >= 0) + self.assertTrue(res.find('Deleted 0 NS-VC') >= 0) class TestVTYSGSN(TestVTYBase): @@ -128,22 +128,22 @@ def testVtyTree(self): self.vty.enable() self.assertTrue(self.vty.verify('configure terminal', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.checkForEndAndExit() self.assertTrue(self.vty.verify('ns', [''])) - self.assertEquals(self.vty.node(), 'config-ns') + self.assertEqual(self.vty.node(), 'config-ns') self.checkForEndAndExit() self.assertTrue(self.vty.verify('exit', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('sgsn', [''])) - self.assertEquals(self.vty.node(), 'config-sgsn') + self.assertEqual(self.vty.node(), 'config-sgsn') self.checkForEndAndExit() self.assertTrue(self.vty.verify('exit', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') def testVtyShow(self): res = self.vty.command("show ns") - self.assert_(res.find('Encapsulation NS-UDP-IP') >= 0) + self.assertTrue(res.find('Encapsulation NS-UDP-IP') >= 0) self.assertTrue(self.vty.verify('show bssgp', [''])) self.assertTrue(self.vty.verify('show bssgp stats', [''])) self.assertTrue(self.vty.verify('show bssgp nsei 123', [''])) @@ -154,57 +154,57 @@ self.assertTrue(self.vty.verify('show pdp-context all', [''])) res = self.vty.command("show sndcp") - self.assert_(res.find('State of SNDCP Entities') >= 0) + self.assertTrue(res.find('State of SNDCP Entities') >= 0) res = self.vty.command("show llc") - self.assert_(res.find('State of LLC Entities') >= 0) + self.assertTrue(res.find('State of LLC Entities') >= 0) def testVtyAuth(self): self.vty.enable() self.assertTrue(self.vty.verify('configure terminal', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('sgsn', [''])) - self.assertEquals(self.vty.node(), 'config-sgsn') + self.assertEqual(self.vty.node(), 'config-sgsn') self.assertTrue(self.vty.verify('auth-policy accept-all', [''])) res = self.vty.command("show running-config") - self.assert_(res.find('auth-policy accept-all') > 0) + self.assertTrue(res.find('auth-policy accept-all') > 0) self.assertTrue(self.vty.verify('auth-policy acl-only', [''])) res = self.vty.command("show running-config") - self.assert_(res.find('auth-policy acl-only') > 0) + self.assertTrue(res.find('auth-policy acl-only') > 0) self.assertTrue(self.vty.verify('auth-policy closed', [''])) res = self.vty.command("show running-config") - self.assert_(res.find('auth-policy closed') > 0) + self.assertTrue(res.find('auth-policy closed') > 0) self.assertTrue(self.vty.verify('gsup remote-ip 127.0.0.4', [''])) self.assertTrue(self.vty.verify('gsup remote-port 2222', [''])) self.assertTrue(self.vty.verify('auth-policy remote', [''])) res = self.vty.command("show running-config") - self.assert_(res.find('auth-policy remote') > 0) + self.assertTrue(res.find('auth-policy remote') > 0) def testVtySubscriber(self): self.vty.enable() res = self.vty.command('show subscriber cache') - self.assert_(res.find('1234567890') < 0) + self.assertTrue(res.find('1234567890') < 0) self.assertTrue(self.vty.verify('update-subscriber imsi 1234567890 create', [''])) res = self.vty.command('show subscriber cache') - self.assert_(res.find('1234567890') >= 0) - self.assert_(res.find('Authorized: 0') >= 0) + self.assertTrue(res.find('1234567890') >= 0) + self.assertTrue(res.find('Authorized: 0') >= 0) self.assertTrue(self.vty.verify('update-subscriber imsi 1234567890 update-location-result ok', [''])) res = self.vty.command('show subscriber cache') - self.assert_(res.find('1234567890') >= 0) - self.assert_(res.find('Authorized: 1') >= 0) + self.assertTrue(res.find('1234567890') >= 0) + self.assertTrue(res.find('Authorized: 1') >= 0) self.assertTrue(self.vty.verify('update-subscriber imsi 1234567890 cancel update-procedure', [''])) res = self.vty.command('show subscriber cache') - self.assert_(res.find('1234567890') >= 0) + self.assertTrue(res.find('1234567890') >= 0) self.assertTrue(self.vty.verify('update-subscriber imsi 1234567890 destroy', [''])) res = self.vty.command('show subscriber cache') - self.assert_(res.find('1234567890') < 0) + self.assertTrue(res.find('1234567890') < 0) def testVtyGgsn(self): self.vty.enable() self.assertTrue(self.vty.verify('configure terminal', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('sgsn', [''])) - self.assertEquals(self.vty.node(), 'config-sgsn') + self.assertEqual(self.vty.node(), 'config-sgsn') self.assertTrue(self.vty.verify('ggsn 0 remote-ip 127.99.99.99', [''])) self.assertTrue(self.vty.verify('ggsn 0 gtp-version 1', [''])) self.assertTrue(self.vty.verify('apn * ggsn 0', [''])) @@ -213,65 +213,65 @@ self.assertTrue(self.vty.verify('apn apn1.test imsi-prefix 123456 ggsn 0', [''])) self.assertTrue(self.vty.verify('apn apn2.test imsi-prefix 123456 ggsn 0', [''])) res = self.vty.command("show running-config") - self.assert_(res.find('ggsn 0 remote-ip 127.99.99.99') >= 0) - self.assert_(res.find('ggsn 0 gtp-version 1') >= 0) - self.assert_(res.find('apn * ggsn 0') >= 0) - self.assert_(res.find('apn apn1.test ggsn 0') >= 0) - self.assert_(res.find('apn apn1.test imsi-prefix 123456 ggsn 0') >= 0) - self.assert_(res.find('apn apn2.test imsi-prefix 123456 ggsn 0') >= 0) + self.assertTrue(res.find('ggsn 0 remote-ip 127.99.99.99') >= 0) + self.assertTrue(res.find('ggsn 0 gtp-version 1') >= 0) + self.assertTrue(res.find('apn * ggsn 0') >= 0) + self.assertTrue(res.find('apn apn1.test ggsn 0') >= 0) + self.assertTrue(res.find('apn apn1.test imsi-prefix 123456 ggsn 0') >= 0) + self.assertTrue(res.find('apn apn2.test imsi-prefix 123456 ggsn 0') >= 0) def testVtyEasyAPN(self): self.vty.enable() self.assertTrue(self.vty.verify('configure terminal', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('sgsn', [''])) - self.assertEquals(self.vty.node(), 'config-sgsn') + self.assertEqual(self.vty.node(), 'config-sgsn') res = self.vty.command("show running-config") - self.assertEquals(res.find("apn internet"), -1) + self.assertEqual(res.find("apn internet"), -1) self.assertTrue(self.vty.verify("access-point-name internet.apn", [''])) res = self.vty.command("show running-config") - self.assert_(res.find("apn internet.apn ggsn 0") >= 0) + self.assertTrue(res.find("apn internet.apn ggsn 0") >= 0) self.assertTrue(self.vty.verify("no access-point-name internet.apn", [''])) res = self.vty.command("show running-config") - self.assertEquals(res.find("apn internet"), -1) + self.assertEqual(res.find("apn internet"), -1) def testVtyCDR(self): self.vty.enable() self.assertTrue(self.vty.verify('configure terminal', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('sgsn', [''])) - self.assertEquals(self.vty.node(), 'config-sgsn') + self.assertEqual(self.vty.node(), 'config-sgsn') res = self.vty.command("show running-config") - self.assert_(res.find("no cdr filename") > 0) + self.assertTrue(res.find("no cdr filename") > 0) self.vty.command("cdr filename bla.cdr") res = self.vty.command("show running-config") - self.assertEquals(res.find("no cdr filename"), -1) - self.assert_(res.find(" cdr filename bla.cdr") > 0) + self.assertEqual(res.find("no cdr filename"), -1) + self.assertTrue(res.find(" cdr filename bla.cdr") > 0) self.vty.command("no cdr filename") res = self.vty.command("show running-config") - self.assert_(res.find("no cdr filename") > 0) - self.assertEquals(res.find(" cdr filename bla.cdr"), -1) + self.assertTrue(res.find("no cdr filename") > 0) + self.assertEqual(res.find(" cdr filename bla.cdr"), -1) res = self.vty.command("show running-config") - self.assert_(res.find(" cdr interval 600") > 0) + self.assertTrue(res.find(" cdr interval 600") > 0) self.vty.command("cdr interval 900") res = self.vty.command("show running-config") - self.assert_(res.find(" cdr interval 900") > 0) - self.assertEquals(res.find(" cdr interval 600"), -1) + self.assertTrue(res.find(" cdr interval 900") > 0) + self.assertEqual(res.find(" cdr interval 600"), -1) def testVtyTimers(self): self.vty.enable() self.assertTrue(self.vty.verify('configure terminal', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('sgsn', [''])) - self.assertEquals(self.vty.node(), 'config-sgsn') + self.assertEqual(self.vty.node(), 'config-sgsn') for t in [3312, 3322, 3350, 3360, 3370, 3313, 3314, 3316, 3385, 3395, 3397]: self.assertTrue(self.vty.verify('timer t%d 10' % t, [''])) @@ -316,9 +316,9 @@ if args.p: confpath = args.p - print "confpath %s, workdir %s" % (confpath, workdir) + print("confpath %s, workdir %s" % (confpath, workdir)) os.chdir(workdir) - print "Running tests for specific VTY commands" + print("Running tests for specific VTY commands") suite = unittest.TestSuite() add_gbproxy_test(suite, workdir) add_sgsn_test(suite, workdir) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/16552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8c07d99c1bc9f0383e4bce17544e0998998cc54d Gerrit-Change-Number: 16552 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 09:29:19 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 12 Dec 2019 09:29:19 +0000 Subject: Change in osmo-msc[master]: osmoappdesc.py, tests: switch to python 3 In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16550 ) Change subject: osmoappdesc.py, tests: switch to python 3 ...................................................................... osmoappdesc.py, tests: switch to python 3 Make build and external tests work with python3, so we can drop the python2 dependency. This should be merged shortly after osmo-python-tests was migrated to python3, and the jenkins build slaves were (automatically) updated to have the new osmo-python-tests installed. Related: OS#2819 Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Change-Id: I53ccde96dd3785098df0f7d693c504c8b8302e90 --- M osmoappdesc.py M tests/ctrl_test_runner.py M tests/smpp_test_runner.py M tests/vty_test_runner.py 4 files changed, 60 insertions(+), 60 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/osmoappdesc.py b/osmoappdesc.py index bd7fea3..b7a274c 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py index f652a67..d24cc00 100755 --- a/tests/ctrl_test_runner.py +++ b/tests/ctrl_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # (C) 2013 by Jacob Erlbeck # (C) 2014 by Holger Hans Peter Freyther @@ -53,8 +53,8 @@ try: self.proc = osmoutil.popen_devnull(osmo_ctrl_cmd) except OSError: - print >> sys.stderr, "Current directory: %s" % os.getcwd() - print >> sys.stderr, "Consider setting -b" + print("Current directory: %s" % os.getcwd(), file=sys.stderr) + print("Consider setting -b", file=sys.stderr) time.sleep(2) appstring = self.ctrl_app()[2] @@ -72,7 +72,7 @@ def connect(self, host, port): if verbose: - print "Connecting to host %s:%i" % (host, port) + print("Connecting to host %s:%i" % (host, port)) retries = 30 while True: @@ -92,7 +92,7 @@ def send(self, data): if verbose: - print "Sending \"%s\"" %(data) + print("Sending \"%s\"" %(data)) data = Ctrl().add_header(data) return self.sock.send(data) == len(data) @@ -123,7 +123,7 @@ (head, data) = IPA().split_combined(data) answer = Ctrl().rem_header(head) if verbose: - print "Got message:", answer + print("Got message:", answer) (mtype, id, msg) = answer.split(None, 2) id = int(id) rsp = {'mtype': mtype, 'id': id} @@ -139,7 +139,7 @@ responses[id] = rsp if verbose: - print "Decoded replies: ", responses + print("Decoded replies: ", responses) return responses @@ -183,9 +183,9 @@ if args.p: confpath = args.p - print "confpath %s, workdir %s" % (confpath, workdir) + print("confpath %s, workdir %s" % (confpath, workdir)) os.chdir(workdir) - print "Running tests for specific control commands" + print("Running tests for specific control commands") suite = unittest.TestSuite() suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestCtrlMSC)) res = unittest.TextTestRunner(verbosity=verbose_level).run(suite) diff --git a/tests/smpp_test_runner.py b/tests/smpp_test_runner.py index f6567d9..b8c6e1c 100755 --- a/tests/smpp_test_runner.py +++ b/tests/smpp_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # (C) 2014 by Holger Hans Peter Freyther # based on vty_test_runner.py: @@ -46,8 +46,8 @@ try: self.proc = osmoutil.popen_devnull(osmo_vty_cmd) except OSError: - print >> sys.stderr, "Current directory: %s" % os.getcwd() - print >> sys.stderr, "Consider setting -b" + print("Current directory: %s" % os.getcwd(), file=sys.stderr) + print("Consider setting -b", file=sys.stderr) appstring = self.vty_app()[2] appport = self.vty_app()[0] @@ -73,14 +73,14 @@ # Enable the configuration self.vty.enable() self.assertTrue(self.vty.verify("configure terminal", [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('smpp', [''])) - self.assertEquals(self.vty.node(), 'config-smpp') + self.assertEqual(self.vty.node(), 'config-smpp') self.assertTrue(self.vty.verify('system-id test', [''])) self.assertTrue(self.vty.verify('local-tcp-port 2775', [''])) self.assertTrue(self.vty.verify('esme test', [''])) - self.assertEquals(self.vty.node(), 'config-smpp-esme') + self.assertEqual(self.vty.node(), 'config-smpp-esme') self.assertTrue(self.vty.verify('default-route', [''])) self.assertTrue(self.vty.verify('end', [''])) @@ -88,7 +88,7 @@ sck = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sck.setblocking(1) sck.connect(('0.0.0.0', 2775)) - sck.sendall('\x00\x00\x00\x02\x00') + sck.sendall(b'\x00\x00\x00\x02\x00') sck.close() # Check if the VTY is still there @@ -98,7 +98,7 @@ sck = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sck.setblocking(1) sck.connect(('0.0.0.0', 2775)) - sck.sendall('\x00\x01\x00\x01\x01') + sck.sendall(b'\x00\x01\x00\x01\x01') sck.close() self.vty.verify('enable',['']) @@ -128,9 +128,9 @@ if args.p: confpath = args.p - print "confpath %s, workdir %s" % (confpath, workdir) + print("confpath %s, workdir %s" % (confpath, workdir)) os.chdir(workdir) - print "Running tests for specific SMPP" + print("Running tests for specific SMPP") suite = unittest.TestSuite() suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestSMPPMSC)) res = unittest.TextTestRunner(verbosity=verbose_level).run(suite) diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py index 471ecf6..f954b5d 100755 --- a/tests/vty_test_runner.py +++ b/tests/vty_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # (C) 2013 by Holger Hans Peter Freyther @@ -33,9 +33,9 @@ def checkForEndAndExit(self): res = self.vty.command("list") #print ('looking for "exit"\n') - self.assert_(res.find(' exit\r') > 0) + self.assertTrue(res.find(' exit\r') > 0) #print 'found "exit"\nlooking for "end"\n' - self.assert_(res.find(' end\r') > 0) + self.assertTrue(res.find(' end\r') > 0) #print 'found "end"\n' def vty_command(self): @@ -54,8 +54,8 @@ try: self.proc = osmoutil.popen_devnull(osmo_vty_cmd) except OSError: - print >> sys.stderr, "Current directory: %s" % os.getcwd() - print >> sys.stderr, "Consider setting -b" + print("Current directory: %s" % os.getcwd(), file=sys.stderr) + print("Consider setting -b", file=sys.stderr) appstring = self.vty_app()[2] appport = self.vty_app()[0] @@ -79,14 +79,14 @@ def testConfigNetworkTree(self, include_bsc_items=True): self.vty.enable() self.assertTrue(self.vty.verify("configure terminal",[''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.checkForEndAndExit() self.assertTrue(self.vty.verify("network",[''])) - self.assertEquals(self.vty.node(), 'config-net') + self.assertEqual(self.vty.node(), 'config-net') self.checkForEndAndExit() self.vty.command("write terminal") self.assertTrue(self.vty.verify("exit",[''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify("exit",[''])) self.assertTrue(self.vty.node() is None) @@ -107,35 +107,35 @@ # check the default res = self.vty.command("write terminal") - self.assert_(res.find(' no smpp-first') > 0) + self.assertTrue(res.find(' no smpp-first') > 0) self.vty.verify("smpp-first", ['']) res = self.vty.command("write terminal") - self.assert_(res.find(' smpp-first') > 0) - self.assertEquals(res.find('no smpp-first'), -1) + self.assertTrue(res.find(' smpp-first') > 0) + self.assertEqual(res.find('no smpp-first'), -1) self.vty.verify("no smpp-first", ['']) res = self.vty.command("write terminal") - self.assert_(res.find('no smpp-first') > 0) + self.assertTrue(res.find('no smpp-first') > 0) def testVtyTree(self): self.vty.enable() self.assertTrue(self.vty.verify("configure terminal", [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.checkForEndAndExit() self.assertTrue(self.vty.verify('mncc-int', [''])) - self.assertEquals(self.vty.node(), 'config-mncc-int') + self.assertEqual(self.vty.node(), 'config-mncc-int') self.checkForEndAndExit() self.assertTrue(self.vty.verify('exit', [''])) if self.checkForSmpp(): - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('smpp', [''])) - self.assertEquals(self.vty.node(), 'config-smpp') + self.assertEqual(self.vty.node(), 'config-smpp') self.checkForEndAndExit() self.assertTrue(self.vty.verify("exit", [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify("exit", [''])) self.assertTrue(self.vty.node() is None) @@ -145,10 +145,10 @@ if self.checkForSmpp(): self.vty.command('smpp') - self.assertEquals(self.vty.node(), 'config-smpp') + self.assertEqual(self.vty.node(), 'config-smpp') self.vty.command('mncc-int') - self.assertEquals(self.vty.node(), 'config-mncc-int') + self.assertEqual(self.vty.node(), 'config-mncc-int') def testSi2Q(self): self.vty.enable() @@ -162,7 +162,7 @@ self.vty.command("si2quater neighbor-list del earfcn 1911") self.vty.command("si2quater neighbor-list del earfcn 1924") self.vty.command("si2quater neighbor-list del earfcn 2111") - self.assertEquals(before, self.vty.command("show running-config")) + self.assertEqual(before, self.vty.command("show running-config")) self.vty.command("si2quater neighbor-list add uarfcn 1976 13 1") self.vty.command("si2quater neighbor-list add uarfcn 1976 38 1") self.vty.command("si2quater neighbor-list add uarfcn 1976 44 1") @@ -185,7 +185,7 @@ self.vty.command("si2quater neighbor-list del uarfcn 1976 224") self.vty.command("si2quater neighbor-list del uarfcn 1976 225") self.vty.command("si2quater neighbor-list del uarfcn 1976 226") - self.assertEquals(before, self.vty.command("show running-config")) + self.assertEqual(before, self.vty.command("show running-config")) def testEnableDisablePeriodicLU(self): self.vty.enable() @@ -201,18 +201,18 @@ # Enable periodic lu.. self.vty.verify("periodic location update 60", ['']) res = self.vty.command("write terminal") - self.assert_(res.find('periodic location update 60') > 0) - self.assertEquals(res.find('no periodic location update'), -1) + self.assertTrue(res.find('periodic location update 60') > 0) + self.assertEqual(res.find('no periodic location update'), -1) # Now disable it.. self.vty.verify("no periodic location update", ['']) res = self.vty.command("write terminal") - self.assertEquals(res.find('periodic location update 60'), -1) - self.assert_(res.find('no periodic location update') > 0) + self.assertEqual(res.find('periodic location update 60'), -1) + self.assertTrue(res.find('no periodic location update') > 0) def testShowNetwork(self): res = self.vty.command("show network") - self.assert_(res.startswith('BSC is on Country Code') >= 0) + self.assertTrue(res.startswith('BSC is on Country Code') >= 0) def ipa_handle_small(x, verbose = False): s = data2str(x.recv(4)) @@ -220,42 +220,42 @@ raise Exception("expected to receive 4 bytes, but got %d (%r)" % (len(s)/2, s)) if "0001fe00" == s: if (verbose): - print "\tBSC <- NAT: PING?" + print("\tBSC <- NAT: PING?") x.send(IPA().pong()) elif "0001fe06" == s: if (verbose): - print "\tBSC <- NAT: IPA ID ACK" + print("\tBSC <- NAT: IPA ID ACK") x.send(IPA().id_ack()) elif "0001fe00" == s: if (verbose): - print "\tBSC <- NAT: PONG!" + print("\tBSC <- NAT: PONG!") else: if (verbose): - print "\tBSC <- NAT: ", s + print("\tBSC <- NAT: ", s) def ipa_handle_resp(x, tk, verbose = False, proc=None): s = data2str(x.recv(38)) if "0023fe040108010701020103010401050101010011" in s: retries = 3 while True: - print "\tsending IPA identity(%s) at %s" % (tk, time.strftime("%T")) + print("\tsending IPA identity(%s) at %s" % (tk, time.strftime("%T"))) try: x.send(IPA().id_resp(IPA().identity(name = tk.encode('utf-8')))) - print "\tdone sending IPA identity(%s) at %s" % (tk, - time.strftime("%T")) + print("\tdone sending IPA identity(%s) at %s" % (tk, + time.strftime("%T"))) break except: - print "\tfailed sending IPA identity at", time.strftime("%T") + print("\tfailed sending IPA identity at", time.strftime("%T")) if proc: - print "\tproc.poll() = %r" % proc.poll() + print("\tproc.poll() = %r" % proc.poll()) if retries < 1: - print "\tgiving up" + print("\tgiving up") raise - print "\tretrying (%d attempts left)" % retries + print("\tretrying (%d attempts left)" % retries) retries -= 1 else: if (verbose): - print "\tBSC <- NAT: ", s + print("\tBSC <- NAT: ", s) if __name__ == '__main__': import argparse @@ -283,9 +283,9 @@ if args.p: confpath = args.p - print "confpath %s, workdir %s" % (confpath, workdir) + print("confpath %s, workdir %s" % (confpath, workdir)) os.chdir(workdir) - print "Running tests for specific VTY commands" + print("Running tests for specific VTY commands") suite = unittest.TestSuite() suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestVTYMSC)) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I53ccde96dd3785098df0f7d693c504c8b8302e90 Gerrit-Change-Number: 16550 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 09:32:38 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 12 Dec 2019 09:32:38 +0000 Subject: Change in openbsc[master]: osmoappdesc.py, tests, ipa.py: switch to python 3 In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/openbsc/+/16544 to look at the new patch set (#2). Change subject: osmoappdesc.py, tests, ipa.py: switch to python 3 ...................................................................... osmoappdesc.py, tests, ipa.py: switch to python 3 Make build and external tests work with python3, so we can drop the python2 dependency. This should be merged shortly after osmo-python-tests was migrated to python3, and the jenkins build slaves were (automatically) updated to have the new osmo-python-tests installed. Related: OS#2819 Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Change-Id: Id7d006f892198bb8a7c0d4a8a8ea00b8d0e62df4 --- M openbsc/contrib/ipa.py M openbsc/osmoappdesc.py M openbsc/tests/ctrl_test_runner.py M openbsc/tests/smpp_test_runner.py M openbsc/tests/vty_test_runner.py 5 files changed, 452 insertions(+), 442 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/44/16544/2 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/16544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Id7d006f892198bb8a7c0d4a8a8ea00b8d0e62df4 Gerrit-Change-Number: 16544 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 09:33:27 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 12 Dec 2019 09:33:27 +0000 Subject: Change in osmo-bsc[master]: debian, osmoappdesc.py, tests: switch to python 3 In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/16545 ) Change subject: debian, osmoappdesc.py, tests: switch to python 3 ...................................................................... debian, osmoappdesc.py, tests: switch to python 3 Make build and external tests work with python3, so we can drop the python2 dependency. This should be merged shortly after osmo-python-tests was migrated to python3, and the jenkins build slaves were (automatically) updated to have the new osmo-python-tests installed. Related: OS#2819 Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Change-Id: I438ca0c4b8e7957d0f347a5b2f5c4cb93f9325e6 --- M debian/control M osmoappdesc.py M tests/ctrl_test_runner.py M tests/vty_test_runner.py 4 files changed, 226 insertions(+), 226 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/control b/debian/control index a6b8c02..93b8a55 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ automake, libtool, pkg-config, - python-minimal, + python3-minimal, libcdk5-dev, libtalloc-dev, libosmocore-dev (>= 1.2.0), diff --git a/osmoappdesc.py b/osmoappdesc.py index f5f18b2..08c3252 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py index 4d87b74..e598273 100755 --- a/tests/ctrl_test_runner.py +++ b/tests/ctrl_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # (C) 2013 by Jacob Erlbeck # (C) 2014 by Holger Hans Peter Freyther @@ -53,8 +53,8 @@ try: self.proc = osmoutil.popen_devnull(osmo_ctrl_cmd) except OSError: - print >> sys.stderr, "Current directory: %s" % os.getcwd() - print >> sys.stderr, "Consider setting -b" + print("Current directory: %s" % os.getcwd(), file=sys.stderr) + print("Consider setting -b", file=sys.stderr) time.sleep(2) appstring = self.ctrl_app()[2] @@ -72,7 +72,7 @@ def connect(self, host, port): if verbose: - print "Connecting to host %s:%i" % (host, port) + print("Connecting to host %s:%i" % (host, port)) retries = 30 while True: @@ -92,7 +92,7 @@ def send(self, data): if verbose: - print "Sending \"%s\"" %(data) + print("Sending \"%s\"" %(data)) data = Ctrl().add_header(data) return self.sock.send(data) == len(data) @@ -121,9 +121,9 @@ data = self.sock.recv(4096) while (len(data)>0): (head, data) = IPA().split_combined(data) - answer = Ctrl().rem_header(head) + answer = Ctrl().rem_header(head).decode() if verbose: - print "Got message:", answer + print("Got message:", answer) (mtype, id, msg) = answer.split(None, 2) id = int(id) rsp = {'mtype': mtype, 'id': id} @@ -139,7 +139,7 @@ responses[id] = rsp if verbose: - print "Decoded replies: ", responses + print("Decoded replies: ", responses) return responses @@ -159,80 +159,80 @@ def testCtrlErrs(self): r = self.do_get('invalid') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Command not found') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Command not found') r = self.do_set('rf_locked', '999') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Value failed verification.') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Value failed verification.') r = self.do_get('bts') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Error while parsing the index.') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Error while parsing the index.') r = self.do_get('bts.999') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Error while resolving object') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Error while resolving object') def testBtsLac(self): r = self.do_get('bts.0.location-area-code') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.location-area-code') - self.assertEquals(r['value'], '1') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.location-area-code') + self.assertEqual(r['value'], '1') r = self.do_set('bts.0.location-area-code', '23') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'bts.0.location-area-code') - self.assertEquals(r['value'], '23') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'bts.0.location-area-code') + self.assertEqual(r['value'], '23') r = self.do_get('bts.0.location-area-code') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.location-area-code') - self.assertEquals(r['value'], '23') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.location-area-code') + self.assertEqual(r['value'], '23') r = self.do_set('bts.0.location-area-code', '-1') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Input not within the range') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Input not within the range') def testBtsCi(self): r = self.do_get('bts.0.cell-identity') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.cell-identity') - self.assertEquals(r['value'], '6969') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.cell-identity') + self.assertEqual(r['value'], '6969') r = self.do_set('bts.0.cell-identity', '23') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'bts.0.cell-identity') - self.assertEquals(r['value'], '23') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'bts.0.cell-identity') + self.assertEqual(r['value'], '23') r = self.do_get('bts.0.cell-identity') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.cell-identity') - self.assertEquals(r['value'], '23') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.cell-identity') + self.assertEqual(r['value'], '23') r = self.do_set('bts.0.cell-identity', '-1') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Input not within the range') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Input not within the range') def testBtsGenerateSystemInformation(self): r = self.do_get('bts.0.send-new-system-informations') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Write Only attribute') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Write Only attribute') # No RSL links so it will fail r = self.do_set('bts.0.send-new-system-informations', '1') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Failed to generate SI') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Failed to generate SI') def testBtsChannelLoad(self): r = self.do_set('bts.0.channel-load', '1') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Read Only attribute') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Read Only attribute') # No RSL link so everything is 0 r = self.do_get('bts.0.channel-load') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['value'], + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['value'], 'CCCH+SDCCH4,0,0 TCH/F,0,0 TCH/H,0,0 SDCCH8,0,0' + ' TCH/F_PDCH,0,0 CCCH+SDCCH4+CBCH,0,0' + ' SDCCH8+CBCH,0,0 TCH/F_TCH/H_PDCH,0,0') @@ -240,254 +240,254 @@ def testBtsOmlConnectionState(self): """Check OML state. It will not be connected""" r = self.do_set('bts.0.oml-connection-state', '1') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Read Only attribute') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Read Only attribute') # No RSL link so everything is 0 r = self.do_get('bts.0.oml-connection-state') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['value'], 'disconnected') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['value'], 'disconnected') def testTrxPowerRed(self): r = self.do_get('bts.0.trx.0.max-power-reduction') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.trx.0.max-power-reduction') - self.assertEquals(r['value'], '20') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.trx.0.max-power-reduction') + self.assertEqual(r['value'], '20') r = self.do_set('bts.0.trx.0.max-power-reduction', '22') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'bts.0.trx.0.max-power-reduction') - self.assertEquals(r['value'], '22') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'bts.0.trx.0.max-power-reduction') + self.assertEqual(r['value'], '22') r = self.do_get('bts.0.trx.0.max-power-reduction') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.trx.0.max-power-reduction') - self.assertEquals(r['value'], '22') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.trx.0.max-power-reduction') + self.assertEqual(r['value'], '22') r = self.do_set('bts.0.trx.0.max-power-reduction', '1') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Value must be even') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Value must be even') def testTrxArfcn(self): r = self.do_get('bts.0.trx.0.arfcn') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.trx.0.arfcn') - self.assertEquals(r['value'], '871') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.trx.0.arfcn') + self.assertEqual(r['value'], '871') r = self.do_set('bts.0.trx.0.arfcn', '873') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'bts.0.trx.0.arfcn') - self.assertEquals(r['value'], '873') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'bts.0.trx.0.arfcn') + self.assertEqual(r['value'], '873') r = self.do_get('bts.0.trx.0.arfcn') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.trx.0.arfcn') - self.assertEquals(r['value'], '873') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.trx.0.arfcn') + self.assertEqual(r['value'], '873') r = self.do_set('bts.0.trx.0.arfcn', '2000') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Input not within the range') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Input not within the range') def testRfLock(self): r = self.do_get('bts.0.rf_state') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.rf_state') - self.assertEquals(r['value'], 'inoperational,unlocked,on') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.rf_state') + self.assertEqual(r['value'], 'inoperational,unlocked,on') r = self.do_set('rf_locked', '1') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'rf_locked') - self.assertEquals(r['value'], '1') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'rf_locked') + self.assertEqual(r['value'], '1') time.sleep(1.5) r = self.do_get('bts.0.rf_state') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.rf_state') - self.assertEquals(r['value'], 'inoperational,locked,off') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.rf_state') + self.assertEqual(r['value'], 'inoperational,locked,off') r = self.do_get('rf_locked') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'rf_locked') - self.assertEquals(r['value'], 'state=off,policy=off') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'rf_locked') + self.assertEqual(r['value'], 'state=off,policy=off') r = self.do_set('rf_locked', '0') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'rf_locked') - self.assertEquals(r['value'], '0') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'rf_locked') + self.assertEqual(r['value'], '0') time.sleep(1.5) r = self.do_get('bts.0.rf_state') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.rf_state') - self.assertEquals(r['value'], 'inoperational,unlocked,on') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.rf_state') + self.assertEqual(r['value'], 'inoperational,unlocked,on') r = self.do_get('rf_locked') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'rf_locked') - self.assertEquals(r['value'], 'state=off,policy=on') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'rf_locked') + self.assertEqual(r['value'], 'state=off,policy=on') def testTimezone(self): r = self.do_get('timezone') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'timezone') - self.assertEquals(r['value'], 'off') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'timezone') + self.assertEqual(r['value'], 'off') r = self.do_set('timezone', '-2,15,2') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'timezone') - self.assertEquals(r['value'], '-2,15,2') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'timezone') + self.assertEqual(r['value'], '-2,15,2') r = self.do_get('timezone') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'timezone') - self.assertEquals(r['value'], '-2,15,2') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'timezone') + self.assertEqual(r['value'], '-2,15,2') # Test invalid input r = self.do_set('timezone', '-2,15,2,5,6,7') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'timezone') - self.assertEquals(r['value'], '-2,15,2') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'timezone') + self.assertEqual(r['value'], '-2,15,2') r = self.do_set('timezone', '-2,15') - self.assertEquals(r['mtype'], 'ERROR') + self.assertEqual(r['mtype'], 'ERROR') r = self.do_set('timezone', '-2') - self.assertEquals(r['mtype'], 'ERROR') + self.assertEqual(r['mtype'], 'ERROR') r = self.do_set('timezone', '1') r = self.do_set('timezone', 'off') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'timezone') - self.assertEquals(r['value'], 'off') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'timezone') + self.assertEqual(r['value'], 'off') r = self.do_get('timezone') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'timezone') - self.assertEquals(r['value'], 'off') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'timezone') + self.assertEqual(r['value'], 'off') def testMcc(self): r = self.do_set('mcc', '23') r = self.do_get('mcc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mcc') - self.assertEquals(r['value'], '023') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mcc') + self.assertEqual(r['value'], '023') r = self.do_set('mcc', '023') r = self.do_get('mcc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mcc') - self.assertEquals(r['value'], '023') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mcc') + self.assertEqual(r['value'], '023') def testMnc(self): r = self.do_set('mnc', '9') r = self.do_get('mnc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '09') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mnc') + self.assertEqual(r['value'], '09') r = self.do_set('mnc', '09') r = self.do_get('mnc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '09') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mnc') + self.assertEqual(r['value'], '09') r = self.do_set('mnc', '009') r = self.do_get('mnc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '009') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mnc') + self.assertEqual(r['value'], '009') def testMccMncApply(self): # Test some invalid input r = self.do_set('mcc-mnc-apply', 'WRONG') - self.assertEquals(r['mtype'], 'ERROR') + self.assertEqual(r['mtype'], 'ERROR') r = self.do_set('mcc-mnc-apply', '1,') - self.assertEquals(r['mtype'], 'ERROR') + self.assertEqual(r['mtype'], 'ERROR') r = self.do_set('mcc-mnc-apply', '200,3') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'mcc-mnc-apply') - self.assertEquals(r['value'], 'Tried to drop the BTS') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'mcc-mnc-apply') + self.assertEqual(r['value'], 'Tried to drop the BTS') # Set it again r = self.do_set('mcc-mnc-apply', '200,3') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'mcc-mnc-apply') - self.assertEquals(r['value'], 'Nothing changed') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'mcc-mnc-apply') + self.assertEqual(r['value'], 'Nothing changed') # Change it r = self.do_set('mcc-mnc-apply', '200,4') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'mcc-mnc-apply') - self.assertEquals(r['value'], 'Tried to drop the BTS') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'mcc-mnc-apply') + self.assertEqual(r['value'], 'Tried to drop the BTS') # Change it r = self.do_set('mcc-mnc-apply', '201,4') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'mcc-mnc-apply') - self.assertEquals(r['value'], 'Tried to drop the BTS') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'mcc-mnc-apply') + self.assertEqual(r['value'], 'Tried to drop the BTS') # Verify r = self.do_get('mnc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '04') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mnc') + self.assertEqual(r['value'], '04') r = self.do_get('mcc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mcc') - self.assertEquals(r['value'], '201') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mcc') + self.assertEqual(r['value'], '201') # Change it r = self.do_set('mcc-mnc-apply', '202,03') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'mcc-mnc-apply') - self.assertEquals(r['value'], 'Tried to drop the BTS') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'mcc-mnc-apply') + self.assertEqual(r['value'], 'Tried to drop the BTS') r = self.do_get('mnc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '03') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mnc') + self.assertEqual(r['value'], '03') r = self.do_get('mcc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mcc') - self.assertEquals(r['value'], '202') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mcc') + self.assertEqual(r['value'], '202') # Test MNC with 3 digits r = self.do_set('mcc-mnc-apply', '2,003') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'mcc-mnc-apply') - self.assertEquals(r['value'], 'Tried to drop the BTS') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'mcc-mnc-apply') + self.assertEqual(r['value'], 'Tried to drop the BTS') r = self.do_get('mnc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '003') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mnc') + self.assertEqual(r['value'], '003') r = self.do_get('mcc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mcc') - self.assertEquals(r['value'], '002') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mcc') + self.assertEqual(r['value'], '002') # Set same MNC with 3 digits r = self.do_set('mcc-mnc-apply', '2,003') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'mcc-mnc-apply') - self.assertEquals(r['value'], 'Nothing changed') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'mcc-mnc-apply') + self.assertEqual(r['value'], 'Nothing changed') r = self.do_get('mnc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '003') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mnc') + self.assertEqual(r['value'], '003') r = self.do_get('mcc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mcc') - self.assertEquals(r['value'], '002') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mcc') + self.assertEqual(r['value'], '002') def add_bsc_test(suite, workdir): if not os.path.isfile(os.path.join(workdir, "src/osmo-bsc/osmo-bsc")): @@ -522,9 +522,9 @@ if args.p: confpath = args.p - print "confpath %s, workdir %s" % (confpath, workdir) + print("confpath %s, workdir %s" % (confpath, workdir)) os.chdir(workdir) - print "Running tests for specific control commands" + print("Running tests for specific control commands") suite = unittest.TestSuite() add_bsc_test(suite, workdir) res = unittest.TextTestRunner(verbosity=verbose_level).run(suite) diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py index d2b3da4..a99bf4b 100755 --- a/tests/vty_test_runner.py +++ b/tests/vty_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # (C) 2013 by Holger Hans Peter Freyther @@ -33,9 +33,9 @@ def checkForEndAndExit(self): res = self.vty.command("list") #print ('looking for "exit"\n') - self.assert_(res.find(' exit\r') > 0) + self.assertTrue(res.find(' exit\r') > 0) #print 'found "exit"\nlooking for "end"\n' - self.assert_(res.find(' end\r') > 0) + self.assertTrue(res.find(' end\r') > 0) #print 'found "end"\n' def vty_command(self): @@ -54,8 +54,8 @@ try: self.proc = osmoutil.popen_devnull(osmo_vty_cmd) except OSError: - print >> sys.stderr, "Current directory: %s" % os.getcwd() - print >> sys.stderr, "Consider setting -b" + print("Current directory: %s" % os.getcwd(), file=sys.stderr) + print("Consider setting -b", file=sys.stderr) appstring = self.vty_app()[2] appport = self.vty_app()[0] @@ -73,34 +73,34 @@ def _testConfigNetworkTree(self, include_bsc_items=True): self.vty.enable() self.assertTrue(self.vty.verify("configure terminal",[''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.checkForEndAndExit() self.assertTrue(self.vty.verify("network",[''])) - self.assertEquals(self.vty.node(), 'config-net') + self.assertEqual(self.vty.node(), 'config-net') self.checkForEndAndExit() self.assertTrue(self.vty.verify("bts 0",[''])) - self.assertEquals(self.vty.node(), 'config-net-bts') + self.assertEqual(self.vty.node(), 'config-net-bts') self.checkForEndAndExit() self.assertTrue(self.vty.verify("trx 0",[''])) - self.assertEquals(self.vty.node(), 'config-net-bts-trx') + self.assertEqual(self.vty.node(), 'config-net-bts-trx') self.checkForEndAndExit() self.vty.command("write terminal") self.assertTrue(self.vty.verify("exit",[''])) - self.assertEquals(self.vty.node(), 'config-net-bts') + self.assertEqual(self.vty.node(), 'config-net-bts') self.assertTrue(self.vty.verify("exit",[''])) self.assertTrue(self.vty.verify("bts 1",[''])) - self.assertEquals(self.vty.node(), 'config-net-bts') + self.assertEqual(self.vty.node(), 'config-net-bts') self.checkForEndAndExit() self.assertTrue(self.vty.verify("trx 1",[''])) - self.assertEquals(self.vty.node(), 'config-net-bts-trx') + self.assertEqual(self.vty.node(), 'config-net-bts-trx') self.checkForEndAndExit() self.vty.command("write terminal") self.assertTrue(self.vty.verify("exit",[''])) - self.assertEquals(self.vty.node(), 'config-net-bts') + self.assertEqual(self.vty.node(), 'config-net-bts') self.assertTrue(self.vty.verify("exit",[''])) - self.assertEquals(self.vty.node(), 'config-net') + self.assertEqual(self.vty.node(), 'config-net') self.assertTrue(self.vty.verify("exit",[''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify("exit",[''])) self.assertTrue(self.vty.node() is None) @@ -120,18 +120,18 @@ def testVtyTree(self): self.vty.enable() self.assertTrue(self.vty.verify("configure terminal", [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.checkForEndAndExit() self.assertTrue(self.vty.verify("msc 0", [''])) - self.assertEquals(self.vty.node(), 'config-msc') + self.assertEqual(self.vty.node(), 'config-msc') self.checkForEndAndExit() self.assertTrue(self.vty.verify("exit", [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify("bsc", [''])) - self.assertEquals(self.vty.node(), 'config-bsc') + self.assertEqual(self.vty.node(), 'config-bsc') self.checkForEndAndExit() self.assertTrue(self.vty.verify("exit", [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify("exit", [''])) self.assertTrue(self.vty.node() is None) @@ -152,12 +152,12 @@ # Verify settings res = self.vty.command("write terminal") - self.assert_(res.find('bsc-msc-lost-text MSC disconnected') > 0) - self.assertEquals(res.find('no bsc-msc-lost-text'), -1) - self.assert_(res.find('bsc-welcome-text Hello MS') > 0) - self.assertEquals(res.find('no bsc-welcome-text'), -1) - self.assert_(res.find('bsc-grace-text In grace period') > 0) - self.assertEquals(res.find('no bsc-grace-text'), -1) + self.assertTrue(res.find('bsc-msc-lost-text MSC disconnected') > 0) + self.assertEqual(res.find('no bsc-msc-lost-text'), -1) + self.assertTrue(res.find('bsc-welcome-text Hello MS') > 0) + self.assertEqual(res.find('no bsc-welcome-text'), -1) + self.assertTrue(res.find('bsc-grace-text In grace period') > 0) + self.assertEqual(res.find('no bsc-grace-text'), -1) # Now disable it.. self.vty.verify("no bsc-msc-lost-text", ['']) @@ -166,12 +166,12 @@ # Verify settings res = self.vty.command("write terminal") - self.assertEquals(res.find('bsc-msc-lost-text MSC disconnected'), -1) - self.assert_(res.find('no bsc-msc-lost-text') > 0) - self.assertEquals(res.find('bsc-welcome-text Hello MS'), -1) - self.assert_(res.find('no bsc-welcome-text') > 0) - self.assertEquals(res.find('bsc-grace-text In grace period'), -1) - self.assert_(res.find('no bsc-grace-text') > 0) + self.assertEqual(res.find('bsc-msc-lost-text MSC disconnected'), -1) + self.assertTrue(res.find('no bsc-msc-lost-text') > 0) + self.assertEqual(res.find('bsc-welcome-text Hello MS'), -1) + self.assertTrue(res.find('no bsc-welcome-text') > 0) + self.assertEqual(res.find('bsc-grace-text In grace period'), -1) + self.assertTrue(res.find('no bsc-grace-text') > 0) def testUssdNotificationsBsc(self): self.vty.enable() @@ -186,16 +186,16 @@ # Verify settings res = self.vty.command("write terminal") - self.assert_(res.find('missing-msc-text No MSC found') > 0) - self.assertEquals(res.find('no missing-msc-text'), -1) + self.assertTrue(res.find('missing-msc-text No MSC found') > 0) + self.assertEqual(res.find('no missing-msc-text'), -1) # Now disable it.. self.vty.verify("no missing-msc-text", ['']) # Verify settings res = self.vty.command("write terminal") - self.assertEquals(res.find('missing-msc-text No MSC found'), -1) - self.assert_(res.find('no missing-msc-text') > 0) + self.assertEqual(res.find('missing-msc-text No MSC found'), -1) + self.assertTrue(res.find('no missing-msc-text') > 0) def testNetworkTimezone(self): self.vty.enable() @@ -213,32 +213,32 @@ # Verify settings res = self.vty.command("write terminal") - self.assert_(res.find('timezone 2 30') > 0) - self.assertEquals(res.find('timezone 2 30 '), -1) + self.assertTrue(res.find('timezone 2 30') > 0) + self.assertEqual(res.find('timezone 2 30 '), -1) # Set time zone with DST self.vty.verify("timezone 2 30 1", ['']) # Verify settings res = self.vty.command("write terminal") - self.assert_(res.find('timezone 2 30 1') > 0) + self.assertTrue(res.find('timezone 2 30 1') > 0) # Now disable it.. self.vty.verify("no timezone", ['']) # Verify settings res = self.vty.command("write terminal") - self.assertEquals(res.find(' timezone'), -1) + self.assertEqual(res.find(' timezone'), -1) def testShowNetwork(self): res = self.vty.command("show network") - self.assert_(res.startswith('BSC is on Country Code') >= 0) + self.assertTrue(res.startswith('BSC is on Country Code') >= 0) def testMscDataCoreLACCI(self): self.vty.enable() res = self.vty.command("show running-config") - self.assertEquals(res.find("core-location-area-code"), -1) - self.assertEquals(res.find("core-cell-identity"), -1) + self.assertEqual(res.find("core-location-area-code"), -1) + self.assertEqual(res.find("core-cell-identity"), -1) self.vty.command("configure terminal") self.vty.command("msc 0") @@ -246,8 +246,8 @@ self.vty.command("core-cell-identity 333") res = self.vty.command("show running-config") - self.assert_(res.find("core-location-area-code 666") > 0) - self.assert_(res.find("core-cell-identity 333") > 0) + self.assertTrue(res.find("core-location-area-code 666") > 0) + self.assertTrue(res.find("core-cell-identity 333") > 0) def add_bsc_test(suite, workdir): @@ -283,9 +283,9 @@ if args.p: confpath = args.p - print "confpath %s, workdir %s" % (confpath, workdir) + print("confpath %s, workdir %s" % (confpath, workdir)) os.chdir(workdir) - print "Running tests for specific VTY commands" + print("Running tests for specific VTY commands") suite = unittest.TestSuite() add_bsc_test(suite, workdir) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/16545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I438ca0c4b8e7957d0f347a5b2f5c4cb93f9325e6 Gerrit-Change-Number: 16545 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 09:47:42 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 12 Dec 2019 09:47:42 +0000 Subject: Change in openbsc[master]: osmoappdesc.py, tests, ipa.py: switch to python 3 In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/16544 ) Change subject: osmoappdesc.py, tests, ipa.py: switch to python 3 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/16544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Id7d006f892198bb8a7c0d4a8a8ea00b8d0e62df4 Gerrit-Change-Number: 16544 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 12 Dec 2019 09:47:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 09:47:45 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 12 Dec 2019 09:47:45 +0000 Subject: Change in openbsc[master]: osmoappdesc.py, tests, ipa.py: switch to python 3 In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/openbsc/+/16544 ) Change subject: osmoappdesc.py, tests, ipa.py: switch to python 3 ...................................................................... osmoappdesc.py, tests, ipa.py: switch to python 3 Make build and external tests work with python3, so we can drop the python2 dependency. This should be merged shortly after osmo-python-tests was migrated to python3, and the jenkins build slaves were (automatically) updated to have the new osmo-python-tests installed. Related: OS#2819 Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7 Change-Id: Id7d006f892198bb8a7c0d4a8a8ea00b8d0e62df4 --- M openbsc/contrib/ipa.py M openbsc/osmoappdesc.py M openbsc/tests/ctrl_test_runner.py M openbsc/tests/smpp_test_runner.py M openbsc/tests/vty_test_runner.py 5 files changed, 452 insertions(+), 442 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/openbsc/contrib/ipa.py b/openbsc/contrib/ipa.py index 71cbf45..cd1192c 100755 --- a/openbsc/contrib/ipa.py +++ b/openbsc/contrib/ipa.py @@ -56,7 +56,11 @@ """ Create TAG as TLV data """ - return struct.pack(">HB", len(v) + 1, t) + v + if isinstance(v, str): + v = v.encode() + if isinstance(t, str): + t = t.encode() + return struct.pack(">HB".encode(), len(v) + 1, t) + v def proto(self, p): """ @@ -96,9 +100,15 @@ """ Add IPA header (with extension if necessary), data must be represented as bytes """ + if isinstance(data, str): + data = data.encode() + if isinstance(proto, str): + proto = proto.encode() + if isinstance(ext, str): + ext = ext.encode() if ext is None: - return struct.pack(">HB", len(data) + 1, proto) + data - return struct.pack(">HBB", len(data) + 1, proto, ext) + data + return struct.pack(">HB".encode(), len(data) + 1, proto) + data + return struct.pack(">HBB".encode(), len(data) + 1, proto, ext) + data def del_header(self, data): """ diff --git a/openbsc/osmoappdesc.py b/openbsc/osmoappdesc.py index 5b01e4c..af949e8 100644 --- a/openbsc/osmoappdesc.py +++ b/openbsc/osmoappdesc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # This program is free software: you can redistribute it and/or modify diff --git a/openbsc/tests/ctrl_test_runner.py b/openbsc/tests/ctrl_test_runner.py index ad0a16b..a1d4195 100755 --- a/openbsc/tests/ctrl_test_runner.py +++ b/openbsc/tests/ctrl_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # (C) 2013 by Jacob Erlbeck # (C) 2014 by Holger Hans Peter Freyther @@ -57,8 +57,8 @@ try: self.proc = osmoutil.popen_devnull(osmo_ctrl_cmd) except OSError: - print >> sys.stderr, "Current directory: %s" % os.getcwd() - print >> sys.stderr, "Consider setting -b" + print("Current directory: %s" % os.getcwd(), file=sys.stderr) + print("Consider setting -b", file=sys.stderr) time.sleep(2) appstring = self.ctrl_app()[2] @@ -76,7 +76,7 @@ def connect(self, host, port): if verbose: - print "Connecting to host %s:%i" % (host, port) + print("Connecting to host %s:%i" % (host, port)) retries = 30 while True: @@ -96,7 +96,7 @@ def send(self, data): if verbose: - print "Sending \"%s\"" %(data) + print("Sending \"%s\"" %(data)) data = Ctrl().add_header(data) return self.sock.send(data) == len(data) @@ -125,9 +125,9 @@ data = self.sock.recv(4096) while (len(data)>0): (head, data) = IPA().split_combined(data) - answer = Ctrl().rem_header(head) + answer = Ctrl().rem_header(head).decode() if verbose: - print "Got message:", answer + print("Got message:", answer) (mtype, id, msg) = answer.split(None, 2) id = int(id) rsp = {'mtype': mtype, 'id': id} @@ -143,7 +143,7 @@ responses[id] = rsp if verbose: - print "Decoded replies: ", responses + print("Decoded replies: ", responses) return responses @@ -163,80 +163,80 @@ def testCtrlErrs(self): r = self.do_get('invalid') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Command not found') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Command not found') r = self.do_set('rf_locked', '999') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Value failed verification.') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Value failed verification.') r = self.do_get('bts') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Error while parsing the index.') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Error while parsing the index.') r = self.do_get('bts.999') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Error while resolving object') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Error while resolving object') def testBtsLac(self): r = self.do_get('bts.0.location-area-code') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.location-area-code') - self.assertEquals(r['value'], '1') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.location-area-code') + self.assertEqual(r['value'], '1') r = self.do_set('bts.0.location-area-code', '23') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'bts.0.location-area-code') - self.assertEquals(r['value'], '23') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'bts.0.location-area-code') + self.assertEqual(r['value'], '23') r = self.do_get('bts.0.location-area-code') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.location-area-code') - self.assertEquals(r['value'], '23') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.location-area-code') + self.assertEqual(r['value'], '23') r = self.do_set('bts.0.location-area-code', '-1') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Input not within the range') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Input not within the range') def testBtsCi(self): r = self.do_get('bts.0.cell-identity') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.cell-identity') - self.assertEquals(r['value'], '0') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.cell-identity') + self.assertEqual(r['value'], '0') r = self.do_set('bts.0.cell-identity', '23') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'bts.0.cell-identity') - self.assertEquals(r['value'], '23') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'bts.0.cell-identity') + self.assertEqual(r['value'], '23') r = self.do_get('bts.0.cell-identity') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.cell-identity') - self.assertEquals(r['value'], '23') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.cell-identity') + self.assertEqual(r['value'], '23') r = self.do_set('bts.0.cell-identity', '-1') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Input not within the range') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Input not within the range') def testBtsGenerateSystemInformation(self): r = self.do_get('bts.0.send-new-system-informations') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Write Only attribute') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Write Only attribute') # No RSL links so it will fail r = self.do_set('bts.0.send-new-system-informations', '1') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Failed to generate SI') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Failed to generate SI') def testBtsChannelLoad(self): r = self.do_set('bts.0.channel-load', '1') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Read Only attribute') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Read Only attribute') # No RSL link so everything is 0 r = self.do_get('bts.0.channel-load') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['value'], + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['value'], 'CCCH+SDCCH4,0,0 TCH/F,0,0 TCH/H,0,0 SDCCH8,0,0' + ' TCH/F_PDCH,0,0 CCCH+SDCCH4+CBCH,0,0' + ' SDCCH8+CBCH,0,0 TCH/F_TCH/H_PDCH,0,0') @@ -244,221 +244,221 @@ def testBtsOmlConnectionState(self): """Check OML state. It will not be connected""" r = self.do_set('bts.0.oml-connection-state', '1') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Read Only attribute') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Read Only attribute') # No RSL link so everything is 0 r = self.do_get('bts.0.oml-connection-state') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['value'], 'disconnected') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['value'], 'disconnected') def testTrxPowerRed(self): r = self.do_get('bts.0.trx.0.max-power-reduction') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.trx.0.max-power-reduction') - self.assertEquals(r['value'], '20') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.trx.0.max-power-reduction') + self.assertEqual(r['value'], '20') r = self.do_set('bts.0.trx.0.max-power-reduction', '22') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'bts.0.trx.0.max-power-reduction') - self.assertEquals(r['value'], '22') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'bts.0.trx.0.max-power-reduction') + self.assertEqual(r['value'], '22') r = self.do_get('bts.0.trx.0.max-power-reduction') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.trx.0.max-power-reduction') - self.assertEquals(r['value'], '22') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.trx.0.max-power-reduction') + self.assertEqual(r['value'], '22') r = self.do_set('bts.0.trx.0.max-power-reduction', '1') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Value must be even') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Value must be even') def testTrxArfcn(self): r = self.do_get('bts.0.trx.0.arfcn') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.trx.0.arfcn') - self.assertEquals(r['value'], '871') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.trx.0.arfcn') + self.assertEqual(r['value'], '871') r = self.do_set('bts.0.trx.0.arfcn', '873') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'bts.0.trx.0.arfcn') - self.assertEquals(r['value'], '873') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'bts.0.trx.0.arfcn') + self.assertEqual(r['value'], '873') r = self.do_get('bts.0.trx.0.arfcn') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.trx.0.arfcn') - self.assertEquals(r['value'], '873') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.trx.0.arfcn') + self.assertEqual(r['value'], '873') r = self.do_set('bts.0.trx.0.arfcn', '2000') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Input not within the range') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Input not within the range') def testRfLock(self): r = self.do_get('bts.0.rf_state') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.rf_state') - self.assertEquals(r['value'], 'inoperational,unlocked,on') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.rf_state') + self.assertEqual(r['value'], 'inoperational,unlocked,on') r = self.do_set('rf_locked', '1') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'rf_locked') - self.assertEquals(r['value'], '1') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'rf_locked') + self.assertEqual(r['value'], '1') time.sleep(1.5) r = self.do_get('bts.0.rf_state') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.rf_state') - self.assertEquals(r['value'], 'inoperational,locked,off') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.rf_state') + self.assertEqual(r['value'], 'inoperational,locked,off') r = self.do_get('rf_locked') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'rf_locked') - self.assertEquals(r['value'], 'state=off,policy=off') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'rf_locked') + self.assertEqual(r['value'], 'state=off,policy=off') r = self.do_set('rf_locked', '0') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'rf_locked') - self.assertEquals(r['value'], '0') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'rf_locked') + self.assertEqual(r['value'], '0') time.sleep(1.5) r = self.do_get('bts.0.rf_state') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.rf_state') - self.assertEquals(r['value'], 'inoperational,unlocked,on') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.rf_state') + self.assertEqual(r['value'], 'inoperational,unlocked,on') r = self.do_get('rf_locked') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'rf_locked') - self.assertEquals(r['value'], 'state=off,policy=on') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'rf_locked') + self.assertEqual(r['value'], 'state=off,policy=on') def testTimezone(self): r = self.do_get('timezone') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'timezone') - self.assertEquals(r['value'], 'off') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'timezone') + self.assertEqual(r['value'], 'off') r = self.do_set('timezone', '-2,15,2') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'timezone') - self.assertEquals(r['value'], '-2,15,2') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'timezone') + self.assertEqual(r['value'], '-2,15,2') r = self.do_get('timezone') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'timezone') - self.assertEquals(r['value'], '-2,15,2') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'timezone') + self.assertEqual(r['value'], '-2,15,2') # Test invalid input r = self.do_set('timezone', '-2,15,2,5,6,7') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'timezone') - self.assertEquals(r['value'], '-2,15,2') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'timezone') + self.assertEqual(r['value'], '-2,15,2') r = self.do_set('timezone', '-2,15') - self.assertEquals(r['mtype'], 'ERROR') + self.assertEqual(r['mtype'], 'ERROR') r = self.do_set('timezone', '-2') - self.assertEquals(r['mtype'], 'ERROR') + self.assertEqual(r['mtype'], 'ERROR') r = self.do_set('timezone', '1') r = self.do_set('timezone', 'off') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'timezone') - self.assertEquals(r['value'], 'off') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'timezone') + self.assertEqual(r['value'], 'off') r = self.do_get('timezone') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'timezone') - self.assertEquals(r['value'], 'off') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'timezone') + self.assertEqual(r['value'], 'off') def testMcc(self): r = self.do_set('mcc', '23') r = self.do_get('mcc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mcc') - self.assertEquals(r['value'], '023') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mcc') + self.assertEqual(r['value'], '023') r = self.do_set('mcc', '023') r = self.do_get('mcc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mcc') - self.assertEquals(r['value'], '023') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mcc') + self.assertEqual(r['value'], '023') def testMnc(self): r = self.do_set('mnc', '9') r = self.do_get('mnc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '09') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mnc') + self.assertEqual(r['value'], '09') r = self.do_set('mnc', '09') r = self.do_get('mnc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '09') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mnc') + self.assertEqual(r['value'], '09') r = self.do_set('mnc', '009') r = self.do_get('mnc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '009') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mnc') + self.assertEqual(r['value'], '009') def testMccMncApply(self): # Test some invalid input r = self.do_set('mcc-mnc-apply', 'WRONG') - self.assertEquals(r['mtype'], 'ERROR') + self.assertEqual(r['mtype'], 'ERROR') r = self.do_set('mcc-mnc-apply', '1,') - self.assertEquals(r['mtype'], 'ERROR') + self.assertEqual(r['mtype'], 'ERROR') r = self.do_set('mcc-mnc-apply', '200,3') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'mcc-mnc-apply') - self.assertEquals(r['value'], 'Tried to drop the BTS') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'mcc-mnc-apply') + self.assertEqual(r['value'], 'Tried to drop the BTS') # Set it again r = self.do_set('mcc-mnc-apply', '200,3') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'mcc-mnc-apply') - self.assertEquals(r['value'], 'Nothing changed') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'mcc-mnc-apply') + self.assertEqual(r['value'], 'Nothing changed') # Change it r = self.do_set('mcc-mnc-apply', '200,4') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'mcc-mnc-apply') - self.assertEquals(r['value'], 'Tried to drop the BTS') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'mcc-mnc-apply') + self.assertEqual(r['value'], 'Tried to drop the BTS') # Change it r = self.do_set('mcc-mnc-apply', '201,4') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'mcc-mnc-apply') - self.assertEquals(r['value'], 'Tried to drop the BTS') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'mcc-mnc-apply') + self.assertEqual(r['value'], 'Tried to drop the BTS') # Verify r = self.do_get('mnc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '04') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mnc') + self.assertEqual(r['value'], '04') r = self.do_get('mcc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mcc') - self.assertEquals(r['value'], '201') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mcc') + self.assertEqual(r['value'], '201') # Change it r = self.do_set('mcc-mnc-apply', '202,03') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'mcc-mnc-apply') - self.assertEquals(r['value'], 'Tried to drop the BTS') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'mcc-mnc-apply') + self.assertEqual(r['value'], 'Tried to drop the BTS') r = self.do_get('mnc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mnc') - self.assertEquals(r['value'], '03') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mnc') + self.assertEqual(r['value'], '03') r = self.do_get('mcc') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'mcc') - self.assertEquals(r['value'], '202') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'mcc') + self.assertEqual(r['value'], '202') class TestCtrlNITB(TestCtrlBase): @@ -475,103 +475,103 @@ def testNumberOfBTS(self): r = self.do_get('number-of-bts') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'number-of-bts') - self.assertEquals(r['value'], '1') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'number-of-bts') + self.assertEqual(r['value'], '1') def testSubscriberAddWithKi(self): """Test that we can set the algorithm to none, xor, comp128v1""" r = self.do_set('subscriber-modify-v1', '2620345,445566') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'subscriber-modify-v1') - self.assertEquals(r['value'], 'OK') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'subscriber-modify-v1') + self.assertEqual(r['value'], 'OK') r = self.do_set('subscriber-modify-v1', '2620345,445566,none') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'subscriber-modify-v1') - self.assertEquals(r['value'], 'OK') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'subscriber-modify-v1') + self.assertEqual(r['value'], 'OK') r = self.do_set('subscriber-modify-v1', '2620345,445566,xor') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Value failed verification.') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Value failed verification.') r = self.do_set('subscriber-modify-v1', '2620345,445566,comp128v1,00112233445566778899AABBCCDDEEFF') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'subscriber-modify-v1') - self.assertEquals(r['value'], 'OK') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'subscriber-modify-v1') + self.assertEqual(r['value'], 'OK') r = self.do_set('subscriber-modify-v1', '2620345,445566,comp128v2,00112233445566778899AABBCCDDEEFF') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'subscriber-modify-v1') - self.assertEquals(r['value'], 'OK') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'subscriber-modify-v1') + self.assertEqual(r['value'], 'OK') r = self.do_set('subscriber-modify-v1', '2620345,445566,comp128v3,00112233445566778899AABBCCDDEEFF') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'subscriber-modify-v1') - self.assertEquals(r['value'], 'OK') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'subscriber-modify-v1') + self.assertEqual(r['value'], 'OK') r = self.do_set('subscriber-modify-v1', '2620345,445566,none') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'subscriber-modify-v1') - self.assertEquals(r['value'], 'OK') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'subscriber-modify-v1') + self.assertEqual(r['value'], 'OK') def testSubscriberAddRemove(self): r = self.do_set('subscriber-modify-v1', '2620345,445566') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'subscriber-modify-v1') - self.assertEquals(r['value'], 'OK') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'subscriber-modify-v1') + self.assertEqual(r['value'], 'OK') r = self.do_set('subscriber-modify-v1', '2620345,445567') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'subscriber-modify-v1') - self.assertEquals(r['value'], 'OK') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'subscriber-modify-v1') + self.assertEqual(r['value'], 'OK') # TODO. verify that the entry has been created and modified? Invoke # the sqlite3 CLI or do it through the DB libraries? r = self.do_set('subscriber-delete-v1', '2620345') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['value'], 'Removed') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['value'], 'Removed') r = self.do_set('subscriber-delete-v1', '2620345') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Failed to find subscriber') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Failed to find subscriber') def testSubscriberList(self): # TODO. Add command to mark a subscriber as active r = self.do_get('subscriber-list-active-v1') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'subscriber-list-active-v1') - self.assertEquals(r['value'], None) + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'subscriber-list-active-v1') + self.assertEqual(r['value'], None) def testApplyConfiguration(self): r = self.do_get('bts.0.apply-configuration') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Write Only attribute') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Write Only attribute') r = self.do_set('bts.0.apply-configuration', '1') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['value'], 'Tried to drop the BTS') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['value'], 'Tried to drop the BTS') def testGprsMode(self): r = self.do_get('bts.0.gprs-mode') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.gprs-mode') - self.assertEquals(r['value'], 'none') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.gprs-mode') + self.assertEqual(r['value'], 'none') r = self.do_set('bts.0.gprs-mode', 'bla') - self.assertEquals(r['mtype'], 'ERROR') - self.assertEquals(r['error'], 'Mode is not known') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Mode is not known') r = self.do_set('bts.0.gprs-mode', 'egprs') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['value'], 'egprs') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['value'], 'egprs') r = self.do_get('bts.0.gprs-mode') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'bts.0.gprs-mode') - self.assertEquals(r['value'], 'egprs') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'bts.0.gprs-mode') + self.assertEqual(r['value'], 'egprs') class TestCtrlNAT(TestCtrlBase): @@ -584,38 +584,38 @@ def testAccessList(self): r = self.do_get('net.0.bsc_cfg.0.access-list-name') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'net') - self.assertEquals(r['value'], None) + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'net') + self.assertEqual(r['value'], None) r = self.do_set('net.0.bsc_cfg.0.access-list-name', 'bla') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'net') - self.assertEquals(r['value'], 'bla') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'net') + self.assertEqual(r['value'], 'bla') r = self.do_get('net.0.bsc_cfg.0.access-list-name') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'net') - self.assertEquals(r['value'], 'bla') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'net') + self.assertEqual(r['value'], 'bla') r = self.do_set('net.0.bsc_cfg.0.no-access-list-name', '1') - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'net') - self.assertEquals(r['value'], None) + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'net') + self.assertEqual(r['value'], None) r = self.do_get('net.0.bsc_cfg.0.access-list-name') - self.assertEquals(r['mtype'], 'GET_REPLY') - self.assertEquals(r['var'], 'net') - self.assertEquals(r['value'], None) + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'net') + self.assertEqual(r['value'], None) def testAccessListManagement(self): r = self.do_set("net.0.add.allow.access-list.404", "abc") - self.assertEquals(r['mtype'], 'ERROR') + self.assertEqual(r['mtype'], 'ERROR') r = self.do_set("net.0.add.allow.access-list.bla", "^234$") - self.assertEquals(r['mtype'], 'SET_REPLY') - self.assertEquals(r['var'], 'net.0.add.allow.access-list.bla') - self.assertEquals(r['value'], 'IMSI allow added to access list') + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'net.0.add.allow.access-list.bla') + self.assertEqual(r['value'], 'IMSI allow added to access list') # TODO.. find a way to actually see if this rule has been # added. e.g. by implementing a get for the list. @@ -664,9 +664,9 @@ if args.p: confpath = args.p - print "confpath %s, workdir %s" % (confpath, workdir) + print("confpath %s, workdir %s" % (confpath, workdir)) os.chdir(workdir) - print "Running tests for specific control commands" + print("Running tests for specific control commands") suite = unittest.TestSuite() add_bsc_test(suite, workdir) add_nitb_test(suite, workdir) diff --git a/openbsc/tests/smpp_test_runner.py b/openbsc/tests/smpp_test_runner.py index eccfa6b..a34d7ba 100755 --- a/openbsc/tests/smpp_test_runner.py +++ b/openbsc/tests/smpp_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # (C) 2014 by Holger Hans Peter Freyther # based on vty_test_runner.py: @@ -46,8 +46,8 @@ try: self.proc = osmoutil.popen_devnull(osmo_vty_cmd) except OSError: - print >> sys.stderr, "Current directory: %s" % os.getcwd() - print >> sys.stderr, "Consider setting -b" + print("Current directory: %s" % os.getcwd(), file=sys.stderr) + print("Consider setting -b", file=sys.stderr) appstring = self.vty_app()[2] appport = self.vty_app()[0] @@ -73,14 +73,14 @@ # Enable the configuration self.vty.enable() self.assertTrue(self.vty.verify("configure terminal", [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('smpp', [''])) - self.assertEquals(self.vty.node(), 'config-smpp') + self.assertEqual(self.vty.node(), 'config-smpp') self.assertTrue(self.vty.verify('system-id test', [''])) self.assertTrue(self.vty.verify('local-tcp-port 2775', [''])) self.assertTrue(self.vty.verify('esme test', [''])) - self.assertEquals(self.vty.node(), 'config-smpp-esme') + self.assertEqual(self.vty.node(), 'config-smpp-esme') self.assertTrue(self.vty.verify('default-route', [''])) self.assertTrue(self.vty.verify('end', [''])) @@ -88,7 +88,7 @@ sck = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sck.setblocking(1) sck.connect(('0.0.0.0', 2775)) - sck.sendall('\x00\x00\x00\x02\x00') + sck.sendall(b'\x00\x00\x00\x02\x00') sck.close() # Check if the VTY is still there @@ -98,7 +98,7 @@ sck = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sck.setblocking(1) sck.connect(('0.0.0.0', 2775)) - sck.sendall('\x00\x01\x00\x01\x01') + sck.sendall(b'\x00\x01\x00\x01\x01') sck.close() self.vty.verify('enable',['']) @@ -128,9 +128,9 @@ if args.p: confpath = args.p - print "confpath %s, workdir %s" % (confpath, workdir) + print("confpath %s, workdir %s" % (confpath, workdir)) os.chdir(workdir) - print "Running tests for specific SMPP" + print("Running tests for specific SMPP") suite = unittest.TestSuite() suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestSMPPNITB)) res = unittest.TextTestRunner(verbosity=verbose_level).run(suite) diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py index 67adb71..8044e61 100755 --- a/openbsc/tests/vty_test_runner.py +++ b/openbsc/tests/vty_test_runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # (C) 2013 by Katerina Barone-Adesi # (C) 2013 by Holger Hans Peter Freyther @@ -51,8 +51,8 @@ try: self.proc = osmoutil.popen_devnull(osmo_vty_cmd) except OSError: - print >> sys.stderr, "Current directory: %s" % os.getcwd() - print >> sys.stderr, "Consider setting -b" + print("Current directory: %s" % os.getcwd(), file=sys.stderr) + print("Consider setting -b", file=sys.stderr) appstring = self.vty_app()[2] appport = self.vty_app()[0] @@ -75,28 +75,28 @@ def testForcePtime(self): self.vty.enable() res = self.vty.command("show running-config") - self.assert_(res.find(' rtp force-ptime 20\r') > 0) - self.assertEquals(res.find(' no rtp force-ptime\r'), -1) + self.assertTrue(res.find(' rtp force-ptime 20\r') > 0) + self.assertEqual(res.find(' no rtp force-ptime\r'), -1) self.vty.command("configure terminal") self.vty.command("mgcp") self.vty.command("no rtp force-ptime") res = self.vty.command("show running-config") - self.assertEquals(res.find(' rtp force-ptime 20\r'), -1) - self.assertEquals(res.find(' no rtp force-ptime\r'), -1) + self.assertEqual(res.find(' rtp force-ptime 20\r'), -1) + self.assertEqual(res.find(' no rtp force-ptime\r'), -1) def testOmitAudio(self): self.vty.enable() res = self.vty.command("show running-config") - self.assert_(res.find(' sdp audio-payload send-name\r') > 0) - self.assertEquals(res.find(' no sdp audio-payload send-name\r'), -1) + self.assertTrue(res.find(' sdp audio-payload send-name\r') > 0) + self.assertEqual(res.find(' no sdp audio-payload send-name\r'), -1) self.vty.command("configure terminal") self.vty.command("mgcp") self.vty.command("no sdp audio-payload send-name") res = self.vty.command("show running-config") - self.assertEquals(res.find(' rtp sdp audio-payload send-name\r'), -1) - self.assert_(res.find(' no sdp audio-payload send-name\r') > 0) + self.assertEqual(res.find(' rtp sdp audio-payload send-name\r'), -1) + self.assertTrue(res.find(' no sdp audio-payload send-name\r') > 0) # TODO: test it for the trunk! @@ -109,18 +109,18 @@ # enable.. disable bts-bind-ip self.vty.command("rtp bts-bind-ip 254.253.252.250") res = self.vty.command("show running-config") - self.assert_(res.find('rtp bts-bind-ip 254.253.252.250') > 0) + self.assertTrue(res.find('rtp bts-bind-ip 254.253.252.250') > 0) self.vty.command("no rtp bts-bind-ip") res = self.vty.command("show running-config") - self.assertEquals(res.find(' rtp bts-bind-ip'), -1) + self.assertEqual(res.find(' rtp bts-bind-ip'), -1) # enable.. disable net-bind-ip self.vty.command("rtp net-bind-ip 254.253.252.250") res = self.vty.command("show running-config") - self.assert_(res.find('rtp net-bind-ip 254.253.252.250') > 0) + self.assertTrue(res.find('rtp net-bind-ip 254.253.252.250') > 0) self.vty.command("no rtp net-bind-ip") res = self.vty.command("show running-config") - self.assertEquals(res.find(' rtp net-bind-ip'), -1) + self.assertEqual(res.find(' rtp net-bind-ip'), -1) class TestVTYGenericBSC(TestVTYBase): @@ -128,42 +128,42 @@ def checkForEndAndExit(self): res = self.vty.command("list") #print ('looking for "exit"\n') - self.assert_(res.find(' exit\r') > 0) + self.assertTrue(res.find(' exit\r') > 0) #print 'found "exit"\nlooking for "end"\n' - self.assert_(res.find(' end\r') > 0) + self.assertTrue(res.find(' end\r') > 0) #print 'found "end"\n' def _testConfigNetworkTree(self): self.vty.enable() self.assertTrue(self.vty.verify("configure terminal",[''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.checkForEndAndExit() self.assertTrue(self.vty.verify("network",[''])) - self.assertEquals(self.vty.node(), 'config-net') + self.assertEqual(self.vty.node(), 'config-net') self.checkForEndAndExit() self.assertTrue(self.vty.verify("bts 0",[''])) - self.assertEquals(self.vty.node(), 'config-net-bts') + self.assertEqual(self.vty.node(), 'config-net-bts') self.checkForEndAndExit() self.assertTrue(self.vty.verify("trx 0",[''])) - self.assertEquals(self.vty.node(), 'config-net-bts-trx') + self.assertEqual(self.vty.node(), 'config-net-bts-trx') self.checkForEndAndExit() self.vty.command("write terminal") self.assertTrue(self.vty.verify("exit",[''])) - self.assertEquals(self.vty.node(), 'config-net-bts') + self.assertEqual(self.vty.node(), 'config-net-bts') self.assertTrue(self.vty.verify("exit",[''])) self.assertTrue(self.vty.verify("bts 1",[''])) - self.assertEquals(self.vty.node(), 'config-net-bts') + self.assertEqual(self.vty.node(), 'config-net-bts') self.checkForEndAndExit() self.assertTrue(self.vty.verify("trx 1",[''])) - self.assertEquals(self.vty.node(), 'config-net-bts-trx') + self.assertEqual(self.vty.node(), 'config-net-bts-trx') self.checkForEndAndExit() self.vty.command("write terminal") self.assertTrue(self.vty.verify("exit",[''])) - self.assertEquals(self.vty.node(), 'config-net-bts') + self.assertEqual(self.vty.node(), 'config-net-bts') self.assertTrue(self.vty.verify("exit",[''])) - self.assertEquals(self.vty.node(), 'config-net') + self.assertEqual(self.vty.node(), 'config-net') self.assertTrue(self.vty.verify("exit",[''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify("exit",[''])) self.assertTrue(self.vty.node() is None) @@ -196,35 +196,35 @@ # check the default res = self.vty.command("write terminal") - self.assert_(res.find(' no smpp-first') > 0) + self.assertTrue(res.find(' no smpp-first') > 0) self.vty.verify("smpp-first", ['']) res = self.vty.command("write terminal") - self.assert_(res.find(' smpp-first') > 0) - self.assertEquals(res.find('no smpp-first'), -1) + self.assertTrue(res.find(' smpp-first') > 0) + self.assertEqual(res.find('no smpp-first'), -1) self.vty.verify("no smpp-first", ['']) res = self.vty.command("write terminal") - self.assert_(res.find('no smpp-first') > 0) + self.assertTrue(res.find('no smpp-first') > 0) def testVtyTree(self): self.vty.enable() self.assertTrue(self.vty.verify("configure terminal", [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.checkForEndAndExit() self.assertTrue(self.vty.verify('mncc-int', [''])) - self.assertEquals(self.vty.node(), 'config-mncc-int') + self.assertEqual(self.vty.node(), 'config-mncc-int') self.checkForEndAndExit() self.assertTrue(self.vty.verify('exit', [''])) if self.checkForSmpp(): - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('smpp', [''])) - self.assertEquals(self.vty.node(), 'config-smpp') + self.assertEqual(self.vty.node(), 'config-smpp') self.checkForEndAndExit() self.assertTrue(self.vty.verify("exit", [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify("exit", [''])) self.assertTrue(self.vty.node() is None) @@ -234,10 +234,10 @@ if self.checkForSmpp(): self.vty.command('smpp') - self.assertEquals(self.vty.node(), 'config-smpp') + self.assertEqual(self.vty.node(), 'config-smpp') self.vty.command('mncc-int') - self.assertEquals(self.vty.node(), 'config-mncc-int') + self.assertEqual(self.vty.node(), 'config-mncc-int') def testVtyAuthorization(self): self.vty.enable() @@ -267,7 +267,7 @@ self.vty.command("si2quater neighbor-list del earfcn 1911") self.vty.command("si2quater neighbor-list del earfcn 1924") self.vty.command("si2quater neighbor-list del earfcn 2111") - self.assertEquals(before, self.vty.command("show running-config")) + self.assertEqual(before, self.vty.command("show running-config")) self.vty.command("si2quater neighbor-list add uarfcn 1976 13 1") self.vty.command("si2quater neighbor-list add uarfcn 1976 38 1") self.vty.command("si2quater neighbor-list add uarfcn 1976 44 1") @@ -290,7 +290,7 @@ self.vty.command("si2quater neighbor-list del uarfcn 1976 224") self.vty.command("si2quater neighbor-list del uarfcn 1976 225") self.vty.command("si2quater neighbor-list del uarfcn 1976 226") - self.assertEquals(before, self.vty.command("show running-config")) + self.assertEqual(before, self.vty.command("show running-config")) def testEnableDisablePeriodicLU(self): self.vty.enable() @@ -306,14 +306,14 @@ # Enable periodic lu.. self.vty.verify("periodic location update 60", ['']) res = self.vty.command("write terminal") - self.assert_(res.find('periodic location update 60') > 0) - self.assertEquals(res.find('no periodic location update'), -1) + self.assertTrue(res.find('periodic location update 60') > 0) + self.assertEqual(res.find('no periodic location update'), -1) # Now disable it.. self.vty.verify("no periodic location update", ['']) res = self.vty.command("write terminal") - self.assertEquals(res.find('periodic location update 60'), -1) - self.assert_(res.find('no periodic location update') > 0) + self.assertEqual(res.find('periodic location update 60'), -1) + self.assertTrue(res.find('no periodic location update') > 0) def testEnableDisableSiHacks(self): self.vty.enable() @@ -324,14 +324,14 @@ # Enable periodic lu.. self.vty.verify("force-combined-si", ['']) res = self.vty.command("write terminal") - self.assert_(res.find(' force-combined-si') > 0) - self.assertEquals(res.find('no force-combined-si'), -1) + self.assertTrue(res.find(' force-combined-si') > 0) + self.assertEqual(res.find('no force-combined-si'), -1) # Now disable it.. self.vty.verify("no force-combined-si", ['']) res = self.vty.command("write terminal") - self.assertEquals(res.find(' force-combined-si'), -1) - self.assert_(res.find('no force-combined-si') > 0) + self.assertEqual(res.find(' force-combined-si'), -1) + self.assertTrue(res.find('no force-combined-si') > 0) def testRachAccessControlClass(self): self.vty.enable() @@ -355,7 +355,7 @@ res = self.vty.command("write terminal") for classNum in range(16): if classNum != 10: - self.assert_(res.find("rach access-control-class " + str(classNum) + " barred") > 0) + self.assertTrue(res.find("rach access-control-class " + str(classNum) + " barred") > 0) # Allowed rach access control classes for classNum in range(16): @@ -366,7 +366,7 @@ res = self.vty.command("write terminal") for classNum in range(16): if classNum != 10: - self.assertEquals(res.find("rach access-control-class " + str(classNum) + " barred"), -1) + self.assertEqual(res.find("rach access-control-class " + str(classNum) + " barred"), -1) def testSubscriberCreateDeleteTwice(self): """ @@ -385,23 +385,23 @@ # Lets create one res = self.vty.command('subscriber create imsi '+imsi) - self.assert_(res.find(" IMSI: "+imsi) > 0) + self.assertTrue(res.find(" IMSI: "+imsi) > 0) # And now create one again. res2 = self.vty.command('subscriber create imsi '+imsi) - self.assert_(res2.find(" IMSI: "+imsi) > 0) + self.assertTrue(res2.find(" IMSI: "+imsi) > 0) self.assertEqual(res, res2) # Verify it has been created res = self.vty.command('show subscriber imsi '+imsi) - self.assert_(res.find(" IMSI: "+imsi) > 0) + self.assertTrue(res.find(" IMSI: "+imsi) > 0) # Delete it res = self.vty.command('subscriber imsi ' + imsi + ' delete') - self.assert_("" == res) + self.assertTrue("" == res) # Now it should not be there anymore res = self.vty.command('show subscriber imsi '+imsi) - self.assert_(('% No subscriber found for imsi ' + imsi) == res) + self.assertTrue(('% No subscriber found for imsi ' + imsi) == res) def testSubscriberCreateDelete(self): @@ -417,12 +417,12 @@ # Lets create one res = self.vty.command('subscriber create imsi '+imsi) - self.assert_(res.find(" IMSI: "+imsi) > 0) - self.assert_(res.find("Extension") > 0) + self.assertTrue(res.find(" IMSI: "+imsi) > 0) + self.assertTrue(res.find("Extension") > 0) # Now we have it res = self.vty.command('show subscriber imsi '+imsi) - self.assert_(res.find(" IMSI: "+imsi) > 0) + self.assertTrue(res.find(" IMSI: "+imsi) > 0) # With narrow random interval self.vty.command("configure terminal") @@ -431,16 +431,16 @@ # wrong interval res = self.vty.command("subscriber-create-on-demand random 221 122") # error string will contain arguments - self.assert_(res.find("122") > 0) - self.assert_(res.find("221") > 0) + self.assertTrue(res.find("122") > 0) + self.assertTrue(res.find("221") > 0) # correct interval - silent ok self.assertTrue(self.vty.verify("subscriber-create-on-demand random 221 222", [''])) self.vty.command("end") res = self.vty.command('subscriber create imsi ' + imsi2) - self.assert_(res.find(" IMSI: " + imsi2) > 0) - self.assert_(res.find("221") > 0 or res.find("222") > 0) - self.assert_(res.find(" Extension: ") > 0) + self.assertTrue(res.find(" IMSI: " + imsi2) > 0) + self.assertTrue(res.find("221") > 0 or res.find("222") > 0) + self.assertTrue(res.find(" Extension: ") > 0) # Without extension self.vty.command("configure terminal") @@ -448,8 +448,8 @@ self.assertTrue(self.vty.verify("subscriber-create-on-demand no-extension", [''])) self.vty.command("end") res = self.vty.command('subscriber create imsi ' + imsi3) - self.assert_(res.find(" IMSI: " + imsi3) > 0) - self.assertEquals(res.find("Extension"), -1) + self.assertTrue(res.find(" IMSI: " + imsi3) > 0) + self.assertEqual(res.find("Extension"), -1) # With extension again self.vty.command("configure terminal") @@ -460,22 +460,22 @@ self.vty.command("end") res = self.vty.command('subscriber create imsi ' + imsi4) - self.assert_(res.find(" IMSI: " + imsi4) > 0) - self.assert_(res.find(" Extension: ") > 0) + self.assertTrue(res.find(" IMSI: " + imsi4) > 0) + self.assertTrue(res.find(" Extension: ") > 0) # Delete it res = self.vty.command('subscriber imsi ' + imsi + ' delete') - self.assert_("" == res) + self.assertTrue("" == res) res = self.vty.command('subscriber imsi ' + imsi2 + ' delete') - self.assert_("" == res) + self.assertTrue("" == res) res = self.vty.command('subscriber imsi ' + imsi3 + ' delete') - self.assert_("" == res) + self.assertTrue("" == res) res = self.vty.command('subscriber imsi ' + imsi4 + ' delete') - self.assert_("" == res) + self.assertTrue("" == res) # Now it should not be there anymore res = self.vty.command('show subscriber imsi '+imsi) - self.assert_(('% No subscriber found for imsi ' + imsi) == res) + self.assertTrue(('% No subscriber found for imsi ' + imsi) == res) # range self.vty.command("end") @@ -483,20 +483,20 @@ self.vty.command("nitb") self.assertTrue(self.vty.verify("subscriber-create-on-demand random 9999999998 9999999999", [''])) res = self.vty.command("show running-config") - self.assert_(res.find("subscriber-create-on-demand random 9999999998 9999999999")) + self.assertTrue(res.find("subscriber-create-on-demand random 9999999998 9999999999")) self.vty.command("end") res = self.vty.command('subscriber create imsi ' + imsi) print(res) - self.assert_(res.find(" IMSI: " + imsi) > 0) - self.assert_(res.find("9999999998") > 0 or res.find("9999999999") > 0) - self.assert_(res.find(" Extension: ") > 0) + self.assertTrue(res.find(" IMSI: " + imsi) > 0) + self.assertTrue(res.find("9999999998") > 0 or res.find("9999999999") > 0) + self.assertTrue(res.find(" Extension: ") > 0) res = self.vty.command('subscriber imsi ' + imsi + ' delete') - self.assert_("" == res) + self.assertTrue("" == res) res = self.vty.command('show subscriber imsi '+imsi) - self.assert_(('% No subscriber found for imsi ' + imsi) == res) + self.assertTrue(('% No subscriber found for imsi ' + imsi) == res) def testSubscriberSettings(self): @@ -508,18 +508,18 @@ # Lets create one res = self.vty.command('subscriber create imsi '+imsi) - self.assert_(res.find(" IMSI: "+imsi) > 0) - self.assert_(res.find("Extension") > 0) + self.assertTrue(res.find(" IMSI: "+imsi) > 0) + self.assertTrue(res.find("Extension") > 0) self.vty.verify('subscriber imsi '+wrong_imsi+' name wrong', ['% No subscriber found for imsi '+wrong_imsi]) res = self.vty.command('subscriber imsi '+imsi+' name '+('X' * 160)) - self.assert_(res.find("NAME is too long") > 0) + self.assertTrue(res.find("NAME is too long") > 0) self.vty.verify('subscriber imsi '+imsi+' name '+('G' * 159), ['']) self.vty.verify('subscriber imsi '+wrong_imsi+' extension 840', ['% No subscriber found for imsi '+wrong_imsi]) res = self.vty.command('subscriber imsi '+imsi+' extension '+('9' * 15)) - self.assert_(res.find("EXTENSION is too long") > 0) + self.assertTrue(res.find("EXTENSION is too long") > 0) self.vty.verify('subscriber imsi '+imsi+' extension '+('1' * 14), ['']) @@ -529,34 +529,34 @@ self.assertTrue(self.vty.verify("subscriber-create-on-demand", [''])) # wrong interval res = self.vty.command("subscriber-create-on-demand random 221 122") - self.assert_(res.find("122") > 0) - self.assert_(res.find("221") > 0) + self.assertTrue(res.find("122") > 0) + self.assertTrue(res.find("221") > 0) # correct interval self.assertTrue(self.vty.verify("subscriber-create-on-demand random 221 222", [''])) self.vty.command("end") # create subscriber with extension in a configured interval res = self.vty.command('subscriber create imsi ' + imsi2) - self.assert_(res.find(" IMSI: " + imsi2) > 0) - self.assert_(res.find("221") > 0 or res.find("222") > 0) - self.assert_(res.find(" Extension: ") > 0) + self.assertTrue(res.find(" IMSI: " + imsi2) > 0) + self.assertTrue(res.find("221") > 0 or res.find("222") > 0) + self.assertTrue(res.find(" Extension: ") > 0) # Delete it res = self.vty.command('subscriber imsi ' + imsi + ' delete') - self.assert_(res != "") + self.assertTrue(res != "") # imsi2 is inactive so deletion should succeed res = self.vty.command('subscriber imsi ' + imsi2 + ' delete') - self.assert_("" == res) + self.assertTrue("" == res) def testShowPagingGroup(self): res = self.vty.command("show paging-group 255 1234567") self.assertEqual(res, "% can't find BTS 255") res = self.vty.command("show paging-group 0 1234567") - self.assertEquals(res, "%Paging group for IMSI 1234567 on BTS #0 is 7") + self.assertEqual(res, "%Paging group for IMSI 1234567 on BTS #0 is 7") def testShowNetwork(self): res = self.vty.command("show network") - self.assert_(res.startswith('BSC is on Country Code') >= 0) + self.assertTrue(res.startswith('BSC is on Country Code') >= 0) def testMeasurementFeed(self): self.vty.enable() @@ -564,17 +564,17 @@ self.vty.command("mncc-int") res = self.vty.command("write terminal") - self.assertEquals(res.find('meas-feed scenario'), -1) + self.assertEqual(res.find('meas-feed scenario'), -1) self.vty.command("meas-feed scenario bla") res = self.vty.command("write terminal") - self.assert_(res.find('meas-feed scenario bla') > 0) + self.assertTrue(res.find('meas-feed scenario bla') > 0) self.vty.command("meas-feed scenario abcdefghijklmnopqrstuvwxyz01234567890") res = self.vty.command("write terminal") - self.assertEquals(res.find('meas-feed scenario abcdefghijklmnopqrstuvwxyz01234567890'), -1) - self.assertEquals(res.find('meas-feed scenario abcdefghijklmnopqrstuvwxyz012345'), -1) - self.assert_(res.find('meas-feed scenario abcdefghijklmnopqrstuvwxyz01234') > 0) + self.assertEqual(res.find('meas-feed scenario abcdefghijklmnopqrstuvwxyz01234567890'), -1) + self.assertEqual(res.find('meas-feed scenario abcdefghijklmnopqrstuvwxyz012345'), -1) + self.assertTrue(res.find('meas-feed scenario abcdefghijklmnopqrstuvwxyz01234') > 0) class TestVTYBSC(TestVTYGenericBSC): @@ -592,18 +592,18 @@ def testVtyTree(self): self.vty.enable() self.assertTrue(self.vty.verify("configure terminal", [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.checkForEndAndExit() self.assertTrue(self.vty.verify("msc 0", [''])) - self.assertEquals(self.vty.node(), 'config-msc') + self.assertEqual(self.vty.node(), 'config-msc') self.checkForEndAndExit() self.assertTrue(self.vty.verify("exit", [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify("bsc", [''])) - self.assertEquals(self.vty.node(), 'config-bsc') + self.assertEqual(self.vty.node(), 'config-bsc') self.checkForEndAndExit() self.assertTrue(self.vty.verify("exit", [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify("exit", [''])) self.assertTrue(self.vty.node() is None) @@ -624,12 +624,12 @@ # Verify settings res = self.vty.command("write terminal") - self.assert_(res.find('bsc-msc-lost-text MSC disconnected') > 0) - self.assertEquals(res.find('no bsc-msc-lost-text'), -1) - self.assert_(res.find('bsc-welcome-text Hello MS') > 0) - self.assertEquals(res.find('no bsc-welcome-text'), -1) - self.assert_(res.find('bsc-grace-text In grace period') > 0) - self.assertEquals(res.find('no bsc-grace-text'), -1) + self.assertTrue(res.find('bsc-msc-lost-text MSC disconnected') > 0) + self.assertEqual(res.find('no bsc-msc-lost-text'), -1) + self.assertTrue(res.find('bsc-welcome-text Hello MS') > 0) + self.assertEqual(res.find('no bsc-welcome-text'), -1) + self.assertTrue(res.find('bsc-grace-text In grace period') > 0) + self.assertEqual(res.find('no bsc-grace-text'), -1) # Now disable it.. self.vty.verify("no bsc-msc-lost-text", ['']) @@ -638,12 +638,12 @@ # Verify settings res = self.vty.command("write terminal") - self.assertEquals(res.find('bsc-msc-lost-text MSC disconnected'), -1) - self.assert_(res.find('no bsc-msc-lost-text') > 0) - self.assertEquals(res.find('bsc-welcome-text Hello MS'), -1) - self.assert_(res.find('no bsc-welcome-text') > 0) - self.assertEquals(res.find('bsc-grace-text In grace period'), -1) - self.assert_(res.find('no bsc-grace-text') > 0) + self.assertEqual(res.find('bsc-msc-lost-text MSC disconnected'), -1) + self.assertTrue(res.find('no bsc-msc-lost-text') > 0) + self.assertEqual(res.find('bsc-welcome-text Hello MS'), -1) + self.assertTrue(res.find('no bsc-welcome-text') > 0) + self.assertEqual(res.find('bsc-grace-text In grace period'), -1) + self.assertTrue(res.find('no bsc-grace-text') > 0) def testUssdNotificationsBsc(self): self.vty.enable() @@ -658,16 +658,16 @@ # Verify settings res = self.vty.command("write terminal") - self.assert_(res.find('missing-msc-text No MSC found') > 0) - self.assertEquals(res.find('no missing-msc-text'), -1) + self.assertTrue(res.find('missing-msc-text No MSC found') > 0) + self.assertEqual(res.find('no missing-msc-text'), -1) # Now disable it.. self.vty.verify("no missing-msc-text", ['']) # Verify settings res = self.vty.command("write terminal") - self.assertEquals(res.find('missing-msc-text No MSC found'), -1) - self.assert_(res.find('no missing-msc-text') > 0) + self.assertEqual(res.find('missing-msc-text No MSC found'), -1) + self.assertTrue(res.find('no missing-msc-text') > 0) def testNetworkTimezone(self): self.vty.enable() @@ -685,26 +685,26 @@ # Verify settings res = self.vty.command("write terminal") - self.assert_(res.find('timezone 2 30') > 0) - self.assertEquals(res.find('timezone 2 30 '), -1) + self.assertTrue(res.find('timezone 2 30') > 0) + self.assertEqual(res.find('timezone 2 30 '), -1) # Set time zone with DST self.vty.verify("timezone 2 30 1", ['']) # Verify settings res = self.vty.command("write terminal") - self.assert_(res.find('timezone 2 30 1') > 0) + self.assertTrue(res.find('timezone 2 30 1') > 0) # Now disable it.. self.vty.verify("no timezone", ['']) # Verify settings res = self.vty.command("write terminal") - self.assertEquals(res.find(' timezone'), -1) + self.assertEqual(res.find(' timezone'), -1) def testShowNetwork(self): res = self.vty.command("show network") - self.assert_(res.startswith('BSC is on Country Code') >= 0) + self.assertTrue(res.startswith('BSC is on Country Code') >= 0) def testPingPongConfiguration(self): self.vty.enable() @@ -714,28 +714,28 @@ self.vty.verify("timeout-ping 12", ['']) self.vty.verify("timeout-pong 14", ['']) res = self.vty.command("show running-config") - self.assert_(res.find(" timeout-ping 12") > 0) - self.assert_(res.find(" timeout-pong 14") > 0) - self.assert_(res.find(" no timeout-ping advanced") > 0) + self.assertTrue(res.find(" timeout-ping 12") > 0) + self.assertTrue(res.find(" timeout-pong 14") > 0) + self.assertTrue(res.find(" no timeout-ping advanced") > 0) self.vty.verify("timeout-ping advanced", ['']) res = self.vty.command("show running-config") - self.assert_(res.find(" timeout-ping 12") > 0) - self.assert_(res.find(" timeout-pong 14") > 0) - self.assert_(res.find(" timeout-ping advanced") > 0) + self.assertTrue(res.find(" timeout-ping 12") > 0) + self.assertTrue(res.find(" timeout-pong 14") > 0) + self.assertTrue(res.find(" timeout-ping advanced") > 0) self.vty.verify("no timeout-ping advanced", ['']) res = self.vty.command("show running-config") - self.assert_(res.find(" timeout-ping 12") > 0) - self.assert_(res.find(" timeout-pong 14") > 0) - self.assert_(res.find(" no timeout-ping advanced") > 0) + self.assertTrue(res.find(" timeout-ping 12") > 0) + self.assertTrue(res.find(" timeout-pong 14") > 0) + self.assertTrue(res.find(" no timeout-ping advanced") > 0) self.vty.verify("no timeout-ping", ['']) res = self.vty.command("show running-config") - self.assertEquals(res.find(" timeout-ping 12"), -1) - self.assertEquals(res.find(" timeout-pong 14"), -1) - self.assertEquals(res.find(" no timeout-ping advanced"), -1) - self.assert_(res.find(" no timeout-ping") > 0) + self.assertEqual(res.find(" timeout-ping 12"), -1) + self.assertEqual(res.find(" timeout-pong 14"), -1) + self.assertEqual(res.find(" no timeout-ping advanced"), -1) + self.assertTrue(res.find(" no timeout-ping") > 0) self.vty.verify("timeout-ping advanced", ['%ping handling is disabled. Enable it first.']) @@ -743,15 +743,15 @@ self.vty.verify("timeout-ping 12", ['']) self.vty.verify("timeout-pong 14", ['']) res = self.vty.command("show running-config") - self.assert_(res.find(" timeout-ping 12") > 0) - self.assert_(res.find(" timeout-pong 14") > 0) - self.assert_(res.find(" timeout-ping advanced") > 0) + self.assertTrue(res.find(" timeout-ping 12") > 0) + self.assertTrue(res.find(" timeout-pong 14") > 0) + self.assertTrue(res.find(" timeout-ping advanced") > 0) def testMscDataCoreLACCI(self): self.vty.enable() res = self.vty.command("show running-config") - self.assertEquals(res.find("core-location-area-code"), -1) - self.assertEquals(res.find("core-cell-identity"), -1) + self.assertEqual(res.find("core-location-area-code"), -1) + self.assertEqual(res.find("core-cell-identity"), -1) self.vty.command("configure terminal") self.vty.command("msc 0") @@ -759,8 +759,8 @@ self.vty.command("core-cell-identity 333") res = self.vty.command("show running-config") - self.assert_(res.find("core-location-area-code 666") > 0) - self.assert_(res.find("core-cell-identity 333") > 0) + self.assertTrue(res.find("core-location-area-code 666") > 0) + self.assertTrue(res.find("core-cell-identity 333") > 0) class TestVTYNAT(TestVTYGenericBSC): @@ -781,7 +781,7 @@ nat_bsc_reload(self) bscs2 = self.vty.command("show bscs-config") # check that multiple calls to bscs-config-file give the same result - self.assertEquals(bscs1, bscs2) + self.assertEqual(bscs1, bscs2) # add new bsc self.vty.command("configure terminal") @@ -805,23 +805,23 @@ b1 = nat_bsc_sock_test(1, "xyu", verbose=True, proc=self.proc) b2 = nat_bsc_sock_test(5, "key", verbose=True, proc=self.proc) - self.assertEquals("3 BSCs configured", self.vty.command("show nat num-bscs-configured")) + self.assertEqual("3 BSCs configured", self.vty.command("show nat num-bscs-configured")) self.assertTrue(3 == nat_bsc_num_con(self)) - self.assertEquals("MSC is connected: 1", self.vty.command("show msc connection")) + self.assertEqual("MSC is connected: 1", self.vty.command("show msc connection")) nat_bsc_reload(self) bscs2 = self.vty.command("show bscs-config") # check that the reset to initial config succeeded - self.assertEquals(bscs1, bscs2) + self.assertEqual(bscs1, bscs2) - self.assertEquals("2 BSCs configured", self.vty.command("show nat num-bscs-configured")) + self.assertEqual("2 BSCs configured", self.vty.command("show nat num-bscs-configured")) self.assertTrue(1 == nat_bsc_num_con(self)) rem = self.vty.command("show bsc connections").split(' ') # remaining connection is for BSC0 - self.assertEquals('0', rem[2]) + self.assertEqual('0', rem[2]) # remaining connection is authorized - self.assertEquals('1', rem[4]) - self.assertEquals("MSC is connected: 1", self.vty.command("show msc connection")) + self.assertEqual('1', rem[4]) + self.assertEqual("MSC is connected: 1", self.vty.command("show msc connection")) finally: msc.close() msc_socket.close() @@ -829,23 +829,23 @@ def testVtyTree(self): self.vty.enable() self.assertTrue(self.vty.verify('configure terminal', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.checkForEndAndExit() self.assertTrue(self.vty.verify('mgcp', [''])) - self.assertEquals(self.vty.node(), 'config-mgcp') + self.assertEqual(self.vty.node(), 'config-mgcp') self.checkForEndAndExit() self.assertTrue(self.vty.verify('exit', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('nat', [''])) - self.assertEquals(self.vty.node(), 'config-nat') + self.assertEqual(self.vty.node(), 'config-nat') self.checkForEndAndExit() self.assertTrue(self.vty.verify('bsc 0', [''])) - self.assertEquals(self.vty.node(), 'config-nat-bsc') + self.assertEqual(self.vty.node(), 'config-nat-bsc') self.checkForEndAndExit() self.assertTrue(self.vty.verify('exit', [''])) - self.assertEquals(self.vty.node(), 'config-nat') + self.assertEqual(self.vty.node(), 'config-nat') self.assertTrue(self.vty.verify('exit', [''])) - self.assertEquals(self.vty.node(), 'config') + self.assertEqual(self.vty.node(), 'config') self.assertTrue(self.vty.verify('exit', [''])) self.assertTrue(self.vty.node() is None) @@ -863,15 +863,15 @@ # Ensure the default res = self.vty.command("show running-config") - self.assert_(res.find('\n sdp-ensure-amr-mode-set') > 0) + self.assertTrue(res.find('\n sdp-ensure-amr-mode-set') > 0) self.vty.command("sdp-ensure-amr-mode-set") res = self.vty.command("show running-config") - self.assert_(res.find('\n sdp-ensure-amr-mode-set') > 0) + self.assertTrue(res.find('\n sdp-ensure-amr-mode-set') > 0) self.vty.command("no sdp-ensure-amr-mode-set") res = self.vty.command("show running-config") - self.assert_(res.find('\n no sdp-ensure-amr-mode-set') > 0) + self.assertTrue(res.find('\n no sdp-ensure-amr-mode-set') > 0) def testRewritePostNoRewrite(self): self.vty.enable() @@ -916,35 +916,35 @@ ussdSocket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) ussdSocket.connect(('127.0.0.1', 5001)) ussdSocket.settimeout(2.0) - print "Connected to %s:%d" % ussdSocket.getpeername() + print("Connected to %s:%d" % ussdSocket.getpeername()) - print "Expecting ID_GET request" + print("Expecting ID_GET request") data = ussdSocket.recv(4) - self.assertEqual(data, "\x00\x01\xfe\x04") + self.assertEqual(data, b"\x00\x01\xfe\x04") - print "Going to send ID_RESP response" + print("Going to send ID_RESP response") res = ussdSocket.send(IPA().id_resp(IPA().tag_name('key'+'\0'))) self.assertEqual(res, 11) # initiating PING/PONG cycle to know, that the ID_RESP message has been processed - print "Going to send PING request" + print("Going to send PING request") res = ussdSocket.send(IPA().ping()) self.assertEqual(res, 4) - print "Expecting PONG response" + print("Expecting PONG response") data = ussdSocket.recv(4) - self.assertEqual(data, "\x00\x01\xfe\x01") + self.assertEqual(data, b"\x00\x01\xfe\x01") res = self.vty.verify("show ussd-connection", ['The USSD side channel provider is connected and authorized.']) self.assertTrue(res) - print "Going to shut down connection" + print("Going to shut down connection") ussdSocket.shutdown(socket.SHUT_WR) - print "Expecting EOF" + print("Expecting EOF") data = ussdSocket.recv(4) - self.assertEqual(data, "") + self.assertEqual(data, b"") ussdSocket.close() @@ -967,7 +967,7 @@ if line.startswith(" access-list test-default"): self.assertEqual(line, " access-list test-default imsi-deny ^123[0-9]*$ 11 11") asserted = True - self.assert_(asserted) + self.assertTrue(asserted) # Check the optional CM Service Reject Cause self.vty.command("access-list test-cm-deny imsi-deny ^123[0-9]*$ 42").split("\r\n") @@ -977,7 +977,7 @@ if line.startswith(" access-list test-cm"): self.assertEqual(line, " access-list test-cm-deny imsi-deny ^123[0-9]*$ 42 11") asserted = True - self.assert_(asserted) + self.assertTrue(asserted) # Check the optional LU Reject Cause self.vty.command("access-list test-lu-deny imsi-deny ^123[0-9]*$ 23 42").split("\r\n") @@ -987,7 +987,7 @@ if line.startswith(" access-list test-lu"): self.assertEqual(line, " access-list test-lu-deny imsi-deny ^123[0-9]*$ 23 42") asserted = True - self.assert_(asserted) + self.assertTrue(asserted) def add_nat_test(suite, workdir): if not os.path.isfile(os.path.join(workdir, "src/osmo-bsc_nat/osmo-bsc_nat")): @@ -1010,7 +1010,7 @@ x.vty.command("end") def data2str(d): - return d.encode('hex').lower() + return d.hex() def nat_msc_test(x, ip, port, verbose = False): msc = socket.socket(socket.AF_INET, socket.SOCK_STREAM) @@ -1019,11 +1019,11 @@ msc.bind((ip, port)) msc.listen(5) if (verbose): - print "MSC is ready at " + ip + print("MSC is ready at " + ip) conn = None while True: vty_response = x.vty.command("show msc connection") - print "'show msc connection' says: %r" % vty_response + print("'show msc connection' says: %r" % vty_response) if vty_response == "MSC is connected: 1": # success break; @@ -1035,10 +1035,10 @@ while timeout_retries > 0: try: conn, addr = msc.accept() - print "MSC got connection from ", addr + print("MSC got connection from ", addr) break except socket.timeout: - print "socket timed out." + print("socket timed out.") timeout_retries -= 1 continue @@ -1053,52 +1053,52 @@ raise Exception("expected to receive 4 bytes, but got %d (%r)" % (len(s)/2, s)) if "0001fe00" == s: if (verbose): - print "\tBSC <- NAT: PING?" + print("\tBSC <- NAT: PING?") x.send(IPA().pong()) elif "0001fe06" == s: if (verbose): - print "\tBSC <- NAT: IPA ID ACK" + print("\tBSC <- NAT: IPA ID ACK") x.send(IPA().id_ack()) elif "0001fe00" == s: if (verbose): - print "\tBSC <- NAT: PONG!" + print("\tBSC <- NAT: PONG!") else: if (verbose): - print "\tBSC <- NAT: ", s + print("\tBSC <- NAT: ", s) def ipa_handle_resp(x, tk, verbose = False, proc=None): s = data2str(x.recv(38)) if "0023fe040108010701020103010401050101010011" in s: retries = 3 while True: - print "\tsending IPA identity(%s) at %s" % (tk, time.strftime("%T")) + print("\tsending IPA identity(%s) at %s" % (tk, time.strftime("%T"))) try: x.send(IPA().id_resp(IPA().identity(name = (tk+'\0').encode('utf-8')))) - print "\tdone sending IPA identity(%s) at %s" % (tk, - time.strftime("%T")) + print("\tdone sending IPA identity(%s) at %s" % (tk, + time.strftime("%T"))) break except: - print "\tfailed sending IPA identity at", time.strftime("%T") + print("\tfailed sending IPA identity at", time.strftime("%T")) if proc: - print "\tproc.poll() = %r" % proc.poll() + print("\tproc.poll() = %r" % proc.poll()) if retries < 1: - print "\tgiving up" + print("\tgiving up") raise - print "\tretrying (%d attempts left)" % retries + print("\tretrying (%d attempts left)" % retries) retries -= 1 else: if (verbose): - print "\tBSC <- NAT: ", s + print("\tBSC <- NAT: ", s) def ipa_handle_mgcp(x, verbose = False): data = x.recv(3) s = data2str(data) if s[4:] != "fc": - print "expected IPA(MGCP) but received %r instead" % (s[4:]) + print("expected IPA(MGCP) but received %r instead" % (s[4:])) ipa_len, = struct.unpack('>H', data[:2]) mgcp_msg = x.recv(ipa_len) # MGCP msg if (verbose): - print "\tBSC <- NAT (MGCP[%d]): %s" % (ipa_len, mgcp_msg) + print("\tBSC <- NAT (MGCP[%d]): %s" % (ipa_len, mgcp_msg)) def nat_bsc_num_con(x): return len(x.vty.command("show bsc connections").split('\n')) @@ -1108,18 +1108,18 @@ bsc.bind(('127.0.0.1', 0)) bsc.connect(('127.0.0.1', 5000)) if (verbose): - print "BSC%d " %nr - print "\tconnected to %s:%d" % bsc.getpeername() + print("BSC%d " %nr) + print("\tconnected to %s:%d" % bsc.getpeername()) if proc: - print "\tproc.poll() = %r" % proc.poll() - print "\tproc.pid = %r" % proc.pid + print("\tproc.poll() = %r" % proc.poll()) + print("\tproc.pid = %r" % proc.pid) ipa_handle_small(bsc, verbose) ipa_handle_resp(bsc, tk, verbose, proc=proc) if proc: - print "\tproc.poll() = %r" % proc.poll() + print("\tproc.poll() = %r" % proc.poll()) ipa_handle_mgcp(bsc, verbose) if proc: - print "\tproc.poll() = %r" % proc.poll() + print("\tproc.poll() = %r" % proc.poll()) ipa_handle_small(bsc, verbose) return bsc @@ -1156,9 +1156,9 @@ if args.p: confpath = args.p - print "confpath %s, workdir %s" % (confpath, workdir) + print("confpath %s, workdir %s" % (confpath, workdir)) os.chdir(workdir) - print "Running tests for specific VTY commands" + print("Running tests for specific VTY commands") suite = unittest.TestSuite() suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestVTYMGCP)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestVTYNITB)) -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/16544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Id7d006f892198bb8a7c0d4a8a8ea00b8d0e62df4 Gerrit-Change-Number: 16544 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Dec 12 10:45:41 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 12 Dec 2019 10:45:41 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5df21a6df954_12c72b0af114860c1804a6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 169s] /usr/src/packages/BUILD/firmware/apps/dfu/main.c:360: warning: undefined reference to `__stack_chk_guard' [ 169s] obj/simtrace/flash_dfu_desc.o: In function `set_usb_serial_str': [ 169s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_fail' [ 169s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_guard' [ 169s] obj/simtrace/flash_dfu_driver.o: In function `handle_getstate': [ 169s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_fail' [ 169s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_guard' [ 169s] collect2: error: ld returned 1 exit status [ 169s] % [ 169s] Makefile:233: recipe for target 'flash' failed [ 169s] make[2]: *** [flash] Error 1 [ 169s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 169s] Makefile:10: recipe for target 'fw-simtrace-dfu' failed [ 169s] make[1]: *** [fw-simtrace-dfu] Error 2 [ 169s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 169s] dh_auto_build: make -j1 returned exit code 2 [ 169s] debian/rules:16: recipe for target 'build' failed [ 169s] make: *** [build] Error 2 [ 169s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 169s] [ 169s] lamb05 failed "build simtrace2_0.7.0.3.75a5.dsc" at Thu Dec 12 10:45:36 UTC 2019. [ 169s] [ 169s] ### VM INTERACTION START ### [ 172s] [ 158.664503] sysrq: SysRq : Power Off [ 172s] [ 158.689088] reboot: Power down [ 172s] ### VM INTERACTION END ### [ 172s] [ 172s] lamb05 failed "build simtrace2_0.7.0.3.75a5.dsc" at Thu Dec 12 10:45:39 UTC 2019. [ 172s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Dec 12 10:55:06 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 12 Dec 2019 10:55:06 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5df21ca6ac51f_12c72b0af114860c18139c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 225s] /usr/src/packages/BUILD/firmware/apps/dfu/main.c:360: warning: undefined reference to `__stack_chk_guard' [ 225s] obj/simtrace/flash_dfu_desc.o: In function `set_usb_serial_str': [ 225s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_fail' [ 225s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_guard' [ 225s] obj/simtrace/flash_dfu_driver.o: In function `handle_getstate': [ 225s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_fail' [ 225s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_guard' [ 225s] collect2: error: ld returned 1 exit status [ 225s] % [ 225s] Makefile:233: recipe for target 'flash' failed [ 225s] make[2]: *** [flash] Error 1 [ 225s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 225s] Makefile:10: recipe for target 'fw-simtrace-dfu' failed [ 225s] make[1]: *** [fw-simtrace-dfu] Error 2 [ 225s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 225s] dh_auto_build: make -j1 returned exit code 2 [ 225s] debian/rules:16: recipe for target 'build' failed [ 225s] make: *** [build] Error 2 [ 225s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 225s] [ 225s] lamb27 failed "build simtrace2_0.7.0.3.75a5.dsc" at Thu Dec 12 10:54:57 UTC 2019. [ 225s] [ 225s] ### VM INTERACTION START ### [ 229s] [ 193.144278] sysrq: SysRq : Power Off [ 229s] [ 193.209250] reboot: Power down [ 229s] ### VM INTERACTION END ### [ 229s] [ 229s] lamb27 failed "build simtrace2_0.7.0.3.75a5.dsc" at Thu Dec 12 10:55:02 UTC 2019. [ 229s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Dec 12 11:53:23 2019 From: gerrit-no-reply at lists.osmocom.org (tsaitgaist) Date: Thu, 12 Dec 2019 11:53:23 +0000 Subject: Change in simtrace2[master]: DFU: add DFU application In-Reply-To: References: Message-ID: tsaitgaist has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16558 ) Change subject: DFU: add DFU application ...................................................................... Patch Set 1: > Patch Set 1: > > what about something bogus like "afblud" (application for boot loader update via dfu)? I find afblud also very cryptic, but I agree that the firmware names are not super clear for uninitiated users. just flashing the DFU application using the DFU bootloader so to updated the bootloader using DFU is complicated enough to parse. instead I think we just need to provide a script taking care of updating everything. this will hide all the details and avoid confusion and mistakes. thus I don't think renaming is necessary, but I don't mind. instead of renaming the DFU "app" (since it's the same for the bootloader or application), I would just rename the final binary in the Makefile. -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ic273bb593a7669111b0219fe301d7897419167c8 Gerrit-Change-Number: 16558 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tsaitgaist Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 12 Dec 2019 11:53:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 12:07:13 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 12 Dec 2019 12:07:13 +0000 Subject: Change in osmo-ci[master]: jobs/update-osmo-ci-on-slaves.yml: use master only References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16560 ) Change subject: jobs/update-osmo-ci-on-slaves.yml: use master only ...................................................................... jobs/update-osmo-ci-on-slaves.yml: use master only When manually triggering the update-osmo-ci-on-slaves, it must only ever use the master branch. Earler today I ran it manually, and it seemed to pick the last branch that was pushed to instead. Change-Id: I44ee3ff4477cb8313e5608b10b46ac131f51fbfc --- M jobs/update-osmo-ci-on-slaves.yml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/60/16560/1 diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml index d1bc893..e881e92 100644 --- a/jobs/update-osmo-ci-on-slaves.yml +++ b/jobs/update-osmo-ci-on-slaves.yml @@ -22,6 +22,8 @@ git-config-name: 'Jenkins Builder' git-config-email: 'jenkins at osmocom.org' skip-tag: true + branches: + - 'master' triggers: - pollscm: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I44ee3ff4477cb8313e5608b10b46ac131f51fbfc Gerrit-Change-Number: 16560 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 13:05:50 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 12 Dec 2019 13:05:50 +0000 Subject: Change in osmo-ci[master]: OBS: clone from gerrit.osmocom.org References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16561 ) Change subject: OBS: clone from gerrit.osmocom.org ...................................................................... OBS: clone from gerrit.osmocom.org Work around "garbage at end of loose object" errors that occasionally cause these jenkins jobs to fail. A few repositories are not hosted on gerrit, so they still get cloned from git.osmocom.org. However, having almost all repositories cloned from gerrit should improve the situation a lot. Related: OS#4083 Change-Id: Id8f08a1bc10d6c81be9ad44c60646e2ea9f6cf4e --- M scripts/common.sh M scripts/osmocom-latest-packages.sh M scripts/osmocom-nightly-packages.sh 3 files changed, 20 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/61/16561/1 diff --git a/scripts/common.sh b/scripts/common.sh index 6d91101..8b21166 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -1,6 +1,7 @@ #!/bin/sh # Various functions and variables used in multiple osmo-ci shell scripts OSMO_GIT_URL="https://git.osmocom.org" +OSMO_GIT_URL_GERRIT="https://gerrit.osmocom.org" # Osmocom repositories of which we want to build release tarballs automatically, and list the current versions at # https://jenkins.osmocom.org/jenkins/job/Osmocom-list-commits/lastSuccessfulBuild/artifact/commits.txt @@ -99,6 +100,20 @@ fi } +# Print git clone URL for an Osmocom git repository. Prefer the gerrit clone URL, because cloning from the regular URL +# sometimes results in the "garbage at end of loose object" error (OS#4083). +# $1: Osmocom project (e.g. "osmo-hlr") +osmo_git_clone_url() { + case "$1" in + rtl-sdr|osmo-fl2k|libosmo-dsp|libgtpnl|libasn1c|libusrp|libsmpp34) + echo "$OSMO_GIT_URL"/"$1" + ;; + *) + echo "$OSMO_GIT_URL_GERRIT"/"$1" + ;; + esac +} + # Print the subdirectory of the repository where the source lies (configure.ac etc.). # Print nothing when the source is in the topdir of the repository. osmo_source_subdir() { diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index 509bced..3770ee1 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -55,7 +55,7 @@ if [ "$project" = "limesuite" ]; then [ -d "$project" ] || git clone "https://github.com/myriadrf/LimeSuite" "$project" else - [ -d "$project" ] || osmo_git_clone_date "https://git.osmocom.org/$project" + [ -d "$project" ] || osmo_git_clone_date "$(osmo_git_clone_url "$project")" fi cd "$project" git fetch @@ -131,6 +131,7 @@ build_osmocom() { prepare + # NOTE: when adding a repository that is not in gerrit, adjust osmo_git_clone_url() checkout limesuite checkout osmo-gsm-manuals checkout libosmocore diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 1c76cc1..d49d968 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -64,14 +64,13 @@ checkout() { local name=$1 local branch=$2 - local url="https://git.osmocom.org" cd "$REPO" if [ -n "$branch" ] ; then - osmo_git_clone_date "$url/$name" -b "$branch" + osmo_git_clone_date "$(osmo_git_clone_url "$name")" -b "$branch" else - osmo_git_clone_date "$url/$name" + osmo_git_clone_date "$(osmo_git_clone_url "$name")" fi cd - @@ -177,6 +176,7 @@ prepare + # NOTE: when adding a repository that is not in gerrit, adjust osmo_git_clone_url() checkout_limesuite checkout osmo-gsm-manuals checkout libosmocore -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id8f08a1bc10d6c81be9ad44c60646e2ea9f6cf4e Gerrit-Change-Number: 16561 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 15:04:16 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 12 Dec 2019 15:04:16 +0000 Subject: Change in osmo-msc[master]: add full SDP codec information to the MNCC socket In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15953 ) Change subject: add full SDP codec information to the MNCC socket ...................................................................... Patch Set 6: (5 comments) https://gerrit.osmocom.org/c/osmo-msc/+/15953/5//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/15953/5//COMMIT_MSG at 7 PS5, Line 7: add full SDP codec information to the MNCC socket > So there's 2 main topics here which seem would be in different commits, splitting this huge commit: [?] That is true, but it is also true that it is realitvely hard to do one without the other. I actually started out separating it once, and I gave up, because it seemed to be too much effort. The reasons: to only move the CRCX implies changing the order of the callbacks between msc_a and gsm_04_08_cc. That semantically separates in different places than before, and would require keeping state across those calls. Keeping that state is in this patch implemented by cc_sdp.c, which accumulates all information about what parts imply what codec choices. So, "just for the sake of review", I would invent a different patch version, that keeps state in a way that needs to be made to work and make sense, yet is again completely discarded one patch later. I would argue that reviewers should in fact take a test setup, be it in hardware or in ttcn3, and examine what this code does and how it acts and reacts. This kind of profound change should anyway see such scrutiny, IMHO. To put it in blunt words, I want people to understand this patch and what it is doing. Now, OTOH, that may be naive. I am not sure what benefit it would bring to do the extra work and separate patches, just to get two half uninformed reviews instead of no informed review at all. But if it means getting the patch merged (and if sysmocom agrees in the form of time available) then I can also invest more time in separating this paradigm shift into one weird patch that is then followed by still a paradigm shift. I know I'm sounding sarcastic, but whatever the community needs is fine with me. Maybe it does need to sit here a bit longer, maybe needs to be test-run at congress first, gain more audience before it can be merged. I personally think this change is really exciting, also with the other change that I still have in mind for after this patch, because it allows a truly informed codec choice for the first time. So we can let this sit here for a bit, I'm fairly confident that someone or other will be drawn to it at some point and give it deep attention. https://gerrit.osmocom.org/c/osmo-msc/+/15953/5/include/osmocom/msc/gsm_04_08.h File include/osmocom/msc/gsm_04_08.h: https://gerrit.osmocom.org/c/osmo-msc/+/15953/5/include/osmocom/msc/gsm_04_08.h at 51 PS5, Line 51: int cc_assignment_done(struct gsm_trans *trans); (talking about these callbacks above) https://gerrit.osmocom.org/c/osmo-msc/+/15953/5/src/libmsc/gsm_04_08_cc.c File src/libmsc/gsm_04_08_cc.c: https://gerrit.osmocom.org/c/osmo-msc/+/15953/5/src/libmsc/gsm_04_08_cc.c at 581 PS5, Line 581: &trans->msc_a->cc.codec_list_bss_supported); (talking about this state above) https://gerrit.osmocom.org/c/osmo-msc/+/15953/5/src/libmsc/gsm_04_08_cc.c at 640 PS5, Line 640: sdp->rtp = *rtp_cn_local; (and this state) https://gerrit.osmocom.org/c/osmo-msc/+/15953/5/src/libmsc/gsm_04_08_cc.c at 719 PS5, Line 719: sdp_audio_codecs_to_bearer_cap(&trans->bearer_cap, &trans->cc.sdp.result.audio_codecs); (this state ... and so on) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8c3b2de53ffae4ec3a66b9dabf308c290a2c999f Gerrit-Change-Number: 15953 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 12 Dec 2019 15:04:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 15:07:27 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 12 Dec 2019 15:07:27 +0000 Subject: Change in osmo-msc[master]: Add tests for transaction routines In-Reply-To: References: Message-ID: neels has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/12556 ) Change subject: Add tests for transaction routines ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/12556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I78dfb7cd35073a305cf668beda7d9d58d5a5a713 Gerrit-Change-Number: 12556 Gerrit-PatchSet: 11 Gerrit-Owner: Max Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 15:20:48 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 12 Dec 2019 15:20:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: add tests for SMS and voice call while Paging In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297 ) Change subject: msc: add tests for SMS and voice call while Paging ...................................................................... Patch Set 2: (3 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297/2/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297/2/msc/MSC_Tests.ttcn at 173 PS2, Line 173: f_vty_transceive(MSCVTY, "logp lglobal notice " & log_msg); What about this MSCVTY? I would prefer to not have to pass that as argument all the time, Seems good enough to me to "code dup" these two lines to each FOO_ConnHdlr context? If it's too controversial I could also drop this part into a separate patch and only log() below... https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297/2/msc/MSC_Tests.ttcn at 1892 PS2, Line 1892: spars.tp.ud := 'C8329BFD064D9B53'O; re below comment: same PDU as here, and see the "Hello SMS" above that this represents in, what, a septet stream or similar nightmare. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297/2/msc/MSC_Tests.ttcn at 1941 PS2, Line 1941: spars.tp.ud := '41F79B8E2ECB41D3E614'O; ("Another SMS") I guess I would have put comments next to it if the previous code I copied from had them. Seems obvious enough, right? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ieeae6322d4e80893ea3408c6b74bf8e32bea8e46 Gerrit-Change-Number: 16297 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 12 Dec 2019 15:20:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 15:30:14 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 12 Dec 2019 15:30:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: expect only one Paging on GERAN In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16301 to look at the new patch set (#3). Change subject: msc: expect only one Paging on GERAN ...................................................................... msc: expect only one Paging on GERAN After discussion on this thread: http://lists.osmocom.org/pipermail/openbsc/2019-November/013058.html Do not expect repeated Paging on GERAN. Pending clarification on 3G, still expect repeated Paging on Iu, though we are not 100% certain that this is indeed required. Fixes MSC_Tests.TC_lu_and_mt_sms_paging_repeated, but not MSC_Tests_Iu.TC_iu_lu_and_mt_sms_paging_repeated Change-Id: Ie914ea88f31ac158f4bd1700143bbe728dd05e0b --- M msc/MSC_Tests.ttcn 1 file changed, 28 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/16301/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie914ea88f31ac158f4bd1700143bbe728dd05e0b Gerrit-Change-Number: 16301 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 15:30:14 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 12 Dec 2019 15:30:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: add tests for SMS and voice call while Paging In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297 to look at the new patch set (#4). Change subject: msc: add tests for SMS and voice call while Paging ...................................................................... msc: add tests for SMS and voice call while Paging Start a second - MT SMS - MT call while a Paging is already ongoing. The second trans being an SMS works. The second trans being a call fails with current osmo-msc master; a fix is in the related patch (s.b.). Related: Idd4537b5f4817d17e5c87d9a93775a32aee0e7be Change-Id: Ieeae6322d4e80893ea3408c6b74bf8e32bea8e46 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/MSC_Tests_Iu.ttcn 3 files changed, 139 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/16297/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ieeae6322d4e80893ea3408c6b74bf8e32bea8e46 Gerrit-Change-Number: 16297 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 15:30:16 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 12 Dec 2019 15:30:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: introduce f_logp() References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16562 ) Change subject: msc: introduce f_logp() ...................................................................... msc: introduce f_logp() This is separated from other patches that were using it, so introduce this function and apply to some select places, so that log markers are also seen in the osmo-msc log output, to help pinpoint what is happening when. Change-Id: Iddcda7f0f9940cc21f89d52962707667fe844010 --- M msc/MSC_Tests.ttcn 1 file changed, 21 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/16562/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 885743a..c4d407a 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -165,6 +165,14 @@ }; } +private function f_logp(charstring log_msg) runs on BSC_ConnHdlr +{ + // log on TTCN3 log output + log(log_msg); + // log in stderr log + f_vty_transceive(MSCVTY, "logp lglobal notice " & log_msg); +} + /* altstep for the global guard timer (only used when BSSAP_DIRECT * is used for communication */ private altstep as_Tguard_direct() runs on MTC_CT { @@ -1913,13 +1921,13 @@ } f_ran_register_imsi(g_pars.imsi, tmsi); - log("first SMS"); + f_logp("first SMS"); f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS"); /* MSC->BSC: expect PAGING from MSC */ f_expect_paging(); - log("second SMS"); + f_logp("second SMS"); /* Now osmo-msc is in state "Paging pending", make sure that another SMS to be sent at this time just joins in * with the pending paging. Another SMS: */ f_vty_sms_send(hex2str(pars.imsi), "2342", "Another SMS"); @@ -2022,14 +2030,14 @@ f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS"); - log("Expecting first Paging"); + f_logp("Expecting first Paging"); /* MSC->BSC: expect PAGING from MSC */ f_expect_paging(); if (g_pars.ran_is_geran) { - log("GERAN: expect no further Paging"); + f_logp("GERAN: expect no further Paging"); } else { - log("UTRAN: expect more Paging"); + f_logp("UTRAN: expect more Paging"); } timer T := 5.0; @@ -2040,12 +2048,12 @@ mtc.stop; } [not g_pars.ran_is_geran] BSSAP.receive(tr_RANAP_Paging(cs_domain, imsi_hex2oct(g_pars.imsi))) { - log("UTRAN: second Paging received, as expected"); + f_logp("UTRAN: second Paging received, as expected"); setverdict(pass); } [] T.timeout { if (g_pars.ran_is_geran) { - log("GERAN: No further Paging received, as expected"); + f_logp("GERAN: No further Paging received, as expected"); setverdict(pass); } else { setverdict(fail, "UTRAN: Expected a second Paging"); @@ -5008,30 +5016,30 @@ } f_ran_register_imsi(g_pars.imsi, tmsi); - log("start Paging by an SMS"); + f_logp("start Paging by an SMS"); f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS"); /* MSC->BSC: expect PAGING from MSC */ f_expect_paging(); - log("MNCC signals MT call, before Paging Response"); + f_logp("MNCC signals MT call, before Paging Response"); f_mt_call_initate(cpars); f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); f_sleep(0.5); - log("phone answers Paging, expecting both SMS and MT call to be established"); + f_logp("phone answers Paging, expecting both SMS and MT call to be established"); f_establish_fully(EST_TYPE_PAG_RESP); spars.tp.ud := 'C8329BFD064D9B53'O; interleave { [] BSSAP.receive(f_mt_sms_expect_deliver_pdu(spars)) { - log("Got SMS-DELIVER"); + f_logp("Got SMS-DELIVER"); }; [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_SETUP(cpars.transaction_id, *, cpars.called_party))) { - log("Got CC Setup"); + f_logp("Got CC Setup"); }; } setverdict(pass); - log("success, tear down"); + f_logp("success, tear down"); var default ccrel := activate(as_optional_cc_rel(cpars)); if (g_pars.ran_is_geran) { BSSAP.send(ts_BSSMAP_ClearRequest(0)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iddcda7f0f9940cc21f89d52962707667fe844010 Gerrit-Change-Number: 16562 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 15:32:08 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 12 Dec 2019 15:32:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: introduce f_logp() In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16562 ) Change subject: msc: introduce f_logp() ...................................................................... Patch Set 1: The ongoing discussion is whether to move this to a more general position, which would imply needing to pass MSCVTY as argument to every call, or whether this is better per-ConnHdlr for more logging convenienve. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iddcda7f0f9940cc21f89d52962707667fe844010 Gerrit-Change-Number: 16562 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 12 Dec 2019 15:32:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 15:33:29 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 12 Dec 2019 15:33:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: expect only one Paging on GERAN In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16301 ) Change subject: msc: expect only one Paging on GERAN ...................................................................... Patch Set 3: Code-Review+2 Re-adding previous +2, which was only lost from removing the orthogonal f_logp() feature (put in a separate patch now) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie914ea88f31ac158f4bd1700143bbe728dd05e0b Gerrit-Change-Number: 16301 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 12 Dec 2019 15:33:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 15:33:36 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 12 Dec 2019 15:33:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: fix 2 Iu tests: use f_mm_common() instead of f_mm_auth() In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16299 ) Change subject: msc: fix 2 Iu tests: use f_mm_common() instead of f_mm_auth() ...................................................................... msc: fix 2 Iu tests: use f_mm_common() instead of f_mm_auth() Fix these tests by using f_mm_common(), which takes care of Iu auth+ciph: TC_iu_lu_imsi_reject TC_iu_lu_imsi_timeout_gsup Change-Id: Id2bf160ac4e1cad4770202c6a6f1b8eeeee21d68 --- M msc/MSC_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 480ec96..6e482e2 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -478,7 +478,7 @@ f_create_gsup_expect(hex2str(g_pars.imsi)); f_cl3_or_initial_ue(l3_lu); - f_mm_auth(); + f_mm_common(); GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)); GSUP.send(ts_GSUP_UL_ERR(g_pars.imsi, 23)); alt { @@ -508,7 +508,7 @@ f_create_gsup_expect(hex2str(g_pars.imsi)); f_cl3_or_initial_ue(l3_lu); - f_mm_auth(); + f_mm_common(); GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)); /* Normally the HLR would need to respond here, but we decide to force a timeout here */ alt { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id2bf160ac4e1cad4770202c6a6f1b8eeeee21d68 Gerrit-Change-Number: 16299 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 15:33:37 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 12 Dec 2019 15:33:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Iu: fix missing 'ran_is_geran := false' for TC_iu_lu_and_mt_sms_... In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16300 ) Change subject: msc: Iu: fix missing 'ran_is_geran := false' for TC_iu_lu_and_mt_sms_paging_repeated ...................................................................... msc: Iu: fix missing 'ran_is_geran := false' for TC_iu_lu_and_mt_sms_paging_repeated Change-Id: I011795cacf62f2cac6861fe657966795e6370ddb --- M msc/MSC_Tests_Iu.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/msc/MSC_Tests_Iu.ttcn b/msc/MSC_Tests_Iu.ttcn index 987baf0..9ea0c76 100644 --- a/msc/MSC_Tests_Iu.ttcn +++ b/msc/MSC_Tests_Iu.ttcn @@ -285,7 +285,7 @@ var BSC_ConnHdlrPars pars; var BSC_ConnHdlr vc_conn; f_init(3); - pars := f_init_pars(101844); + pars := f_init_pars(101844, ran_idx := 2, ran_is_geran := false); vc_conn := f_start_handler_with_pars(refers(f_tc_lu_and_mt_sms_paging_repeated), pars); vc_conn.done; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I011795cacf62f2cac6861fe657966795e6370ddb Gerrit-Change-Number: 16300 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 15:33:37 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 12 Dec 2019 15:33:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: expect only one Paging on GERAN In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16301 ) Change subject: msc: expect only one Paging on GERAN ...................................................................... msc: expect only one Paging on GERAN After discussion on this thread: http://lists.osmocom.org/pipermail/openbsc/2019-November/013058.html Do not expect repeated Paging on GERAN. Pending clarification on 3G, still expect repeated Paging on Iu, though we are not 100% certain that this is indeed required. Fixes MSC_Tests.TC_lu_and_mt_sms_paging_repeated, but not MSC_Tests_Iu.TC_iu_lu_and_mt_sms_paging_repeated Change-Id: Ie914ea88f31ac158f4bd1700143bbe728dd05e0b --- M msc/MSC_Tests.ttcn 1 file changed, 28 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 6e482e2..a083606 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1974,11 +1974,37 @@ f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS"); + log("Expecting first Paging"); /* MSC->BSC: expect PAGING from MSC */ f_expect_paging(); - /* MSC->BSC: expect PAGING from MSC */ - f_expect_paging(); + if (g_pars.ran_is_geran) { + log("GERAN: expect no further Paging"); + } else { + log("UTRAN: expect more Paging"); + } + + timer T := 5.0; + T.start; + alt { + [g_pars.ran_is_geran] BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)) { + setverdict(fail, "GERAN should not repeat Paging, but received a second Paging"); + mtc.stop; + } + [not g_pars.ran_is_geran] BSSAP.receive(tr_RANAP_Paging(cs_domain, imsi_hex2oct(g_pars.imsi))) { + log("UTRAN: second Paging received, as expected"); + setverdict(pass); + } + [] T.timeout { + if (g_pars.ran_is_geran) { + log("GERAN: No further Paging received, as expected"); + setverdict(pass); + } else { + setverdict(fail, "UTRAN: Expected a second Paging"); + mtc.stop; + } + } + } /* Establish DTAP / BSSAP / SCCP connection */ f_establish_fully(EST_TYPE_PAG_RESP); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie914ea88f31ac158f4bd1700143bbe728dd05e0b Gerrit-Change-Number: 16301 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 15:40:49 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 12 Dec 2019 15:40:49 +0000 Subject: Change in pysim[master]: test References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16563 ) Change subject: test ...................................................................... test Change-Id: Ib5aa0ef437e897300a5fa49cf76d250aec7805cf --- A testme 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/63/16563/1 diff --git a/testme b/testme new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/testme -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16563 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib5aa0ef437e897300a5fa49cf76d250aec7805cf Gerrit-Change-Number: 16563 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 15:46:25 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 12 Dec 2019 15:46:25 +0000 Subject: Change in osmo-msc[master]: sms db: when storing an SMS, retrieve the ID In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16218 ) Change subject: sms db: when storing an SMS, retrieve the ID ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/16218/1/src/libmsc/db.c File src/libmsc/db.c: https://gerrit.osmocom.org/c/osmo-msc/+/16218/1/src/libmsc/db.c at 773 PS1, Line 773: sms->id = dbi_conn_sequence_last(conn, "id"); > So we had an id which was always 0 until now? yes, but AFAICT no code path used it; we would instead always retrieve from the db later. Still it seems a sane thing to do in principle. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5fa55307a6abb8bbfe56619235d7b79fbbda6caf Gerrit-Change-Number: 16218 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 12 Dec 2019 15:46:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 15:46:42 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 12 Dec 2019 15:46:42 +0000 Subject: Change in osmo-msc[master]: sms db: when storing an SMS, retrieve the ID In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16218 ) Change subject: sms db: when storing an SMS, retrieve the ID ...................................................................... sms db: when storing an SMS, retrieve the ID seemed like a good idea, but not sure if we need it at all. Change-Id: I5fa55307a6abb8bbfe56619235d7b79fbbda6caf --- M src/libmsc/db.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/db.c b/src/libmsc/db.c index 241bc86..a1683be 100644 --- a/src/libmsc/db.c +++ b/src/libmsc/db.c @@ -769,6 +769,9 @@ return -EIO; dbi_result_free(result); + + sms->id = dbi_conn_sequence_last(conn, "id"); + LOGP(DLSMS, LOGL_INFO, "Stored SMS id=%llu in DB\n", sms->id); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5fa55307a6abb8bbfe56619235d7b79fbbda6caf Gerrit-Change-Number: 16218 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 15:51:35 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 12 Dec 2019 15:51:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add tests for GSUP proxy routing In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16021 to look at the new patch set (#3). Change subject: hlr: add tests for GSUP proxy routing ...................................................................... hlr: add tests for GSUP proxy routing GSUP proxy routing, as it is implemented in an upcoming osmo-hlr patch, requires that osmo-hlr returns a received Source Name IE back as Destination Name IE. Add tests for these, for various situations. At the time of writing, these tests still fail on master, and will pass as soon as GSUP request handling with request->response association is introduced to osmo-hlr in an upcoming patch (I179ebb0385b5b355f4740e14d43be97bf93622e3). Implement this by adding a source_name to the g_pars, which should be sent out in ts_GSUP_* to osmo-hlr, and expected back as destination_name in returned messages. Add source_name and destination_name to various templates, with default := omit. Add f_gen_ts_ies() and f_gen_tr_ies() to compose expected IEs more generically. Change-Id: I3728776d862c5e5fa7628ca28d74c1ef247459fa --- M hlr/HLR_Tests.ttcn M library/GSUP_Types.ttcn 2 files changed, 233 insertions(+), 66 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/21/16021/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3728776d862c5e5fa7628ca28d74c1ef247459fa Gerrit-Change-Number: 16021 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 16:01:30 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 12 Dec 2019 16:01:30 +0000 Subject: Change in pysim[master]: test In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/c/pysim/+/16563 ) Change subject: test ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16563 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib5aa0ef437e897300a5fa49cf76d250aec7805cf Gerrit-Change-Number: 16563 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 12 16:02:37 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 12 Dec 2019 16:02:37 +0000 Subject: Change in pysim[master]: test References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16564 ) Change subject: test ...................................................................... test Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 --- A test 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/64/16564/1 diff --git a/test b/test new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 Gerrit-Change-Number: 16564 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 13 00:59:47 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 13 Dec 2019 00:59:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: add tests for SMS and voice call while Paging In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297 ) Change subject: msc: add tests for SMS and voice call while Paging ...................................................................... Patch Set 4: Code-Review-1 (5 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297/4/msc/BSC_ConnectionHandler.ttcn File msc/BSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297/4/msc/BSC_ConnectionHandler.ttcn at 1757 PS4, Line 1757: expect_deliver_pdu This naming is confusing. We don't 'expect' (to receive) anything in this function. I would call it 'f_mt_sms_compose' or 'f_mt_sms_assemble', because all it does is composing CP/RP/TP and DTAP layers together. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297/4/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297/4/msc/MSC_Tests.ttcn at 1905 PS4, Line 1905: and call unrelated comment https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297/4/msc/MSC_Tests.ttcn at 1942 PS4, Line 1942: 43 I guess a different value needs to be used here. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297/4/msc/MSC_Tests.ttcn at 5026 PS4, Line 5026: f_mt_sms_expect_deliver_pdu So you only receive SMS here, but do not acknowledge. MSC would still consider that SMS as to be delivered, and that might break other test cases (given that you're using not unique IMSI prefix 43). https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297/4/msc/MSC_Tests.ttcn at 5049 PS4, Line 5049: 43 same -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ieeae6322d4e80893ea3408c6b74bf8e32bea8e46 Gerrit-Change-Number: 16297 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 13 Dec 2019 00:59:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 13 01:20:40 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 13 Dec 2019 01:20:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: introduce f_logp() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16562 ) Change subject: msc: introduce f_logp() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16562/1/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16562/1/msc/MSC_Tests.ttcn at 173 PS1, Line 173: MSCVTY If we pass this as a parameter, then other BSC/BTS/... tests could use it too. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iddcda7f0f9940cc21f89d52962707667fe844010 Gerrit-Change-Number: 16562 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Comment-Date: Fri, 13 Dec 2019 01:20:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 13 01:21:26 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 13 Dec 2019 01:21:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: introduce f_logp() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16562 ) Change subject: msc: introduce f_logp() ...................................................................... Patch Set 1: > Patch Set 1: > > The ongoing discussion is whether to move this to a more general position, which would imply needing to pass MSCVTY as argument to every call, or whether this is better per-ConnHdlr for more logging convenienve. Ah, I see your point now. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iddcda7f0f9940cc21f89d52962707667fe844010 Gerrit-Change-Number: 16562 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Comment-Date: Fri, 13 Dec 2019 01:21:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 13 01:39:21 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 13 Dec 2019 01:39:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: add tests for GSUP proxy routing In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16021 ) Change subject: hlr: add tests for GSUP proxy routing ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16021/3/hlr/HLR_Tests.ttcn File hlr/HLR_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16021/3/hlr/HLR_Tests.ttcn at 104 PS3, Line 104: 7468652d736f757263650a char2oct("the-source\n")? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3728776d862c5e5fa7628ca28d74c1ef247459fa Gerrit-Change-Number: 16021 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 13 Dec 2019 01:39:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Dec 13 01:41:10 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 13 Dec 2019 01:41:10 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5df2ec53ac307_6cb22ad57b0f6600503952@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 82s] /usr/src/packages/BUILD/firmware/apps/dfu/main.c:360: warning: undefined reference to `__stack_chk_guard' [ 82s] obj/simtrace/flash_dfu_desc.o: In function `set_usb_serial_str': [ 82s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_fail' [ 82s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_guard' [ 82s] obj/simtrace/flash_dfu_driver.o: In function `handle_getstate': [ 82s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_fail' [ 82s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_guard' [ 82s] collect2: error: ld returned 1 exit status [ 82s] % [ 82s] Makefile:233: recipe for target 'flash' failed [ 82s] make[2]: *** [flash] Error 1 [ 82s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 82s] Makefile:10: recipe for target 'fw-simtrace-dfu' failed [ 82s] make[1]: *** [fw-simtrace-dfu] Error 2 [ 82s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 82s] dh_auto_build: make -j1 returned exit code 2 [ 82s] debian/rules:16: recipe for target 'build' failed [ 82s] make: *** [build] Error 2 [ 82s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 82s] [ 82s] lamb51 failed "build simtrace2_0.7.0.3.75a5.dsc" at Fri Dec 13 01:40:58 UTC 2019. [ 82s] [ 82s] ### VM INTERACTION START ### [ 85s] [ 74.866482] sysrq: SysRq : Power Off [ 85s] [ 74.873369] reboot: Power down [ 85s] ### VM INTERACTION END ### [ 85s] [ 85s] lamb51 failed "build simtrace2_0.7.0.3.75a5.dsc" at Fri Dec 13 01:41:01 UTC 2019. [ 85s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Dec 13 01:46:01 2019 From: admin at opensuse.org (OBS Notification) Date: Fri, 13 Dec 2019 01:46:01 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5df2ed60a6177_6cb22ad57b0f66005040e2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 117s] /usr/src/packages/BUILD/firmware/apps/dfu/main.c:360: warning: undefined reference to `__stack_chk_guard' [ 117s] obj/simtrace/flash_dfu_desc.o: In function `set_usb_serial_str': [ 117s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_fail' [ 117s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_guard' [ 117s] obj/simtrace/flash_dfu_driver.o: In function `handle_getstate': [ 117s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_fail' [ 117s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_guard' [ 117s] collect2: error: ld returned 1 exit status [ 117s] % [ 117s] Makefile:233: recipe for target 'flash' failed [ 117s] make[2]: *** [flash] Error 1 [ 117s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 117s] Makefile:10: recipe for target 'fw-simtrace-dfu' failed [ 117s] make[1]: *** [fw-simtrace-dfu] Error 2 [ 117s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 117s] dh_auto_build: make -j1 returned exit code 2 [ 117s] debian/rules:16: recipe for target 'build' failed [ 117s] make: *** [build] Error 2 [ 117s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 117s] [ 117s] cloud109 failed "build simtrace2_0.7.0.3.75a5.dsc" at Fri Dec 13 01:45:41 UTC 2019. [ 117s] [ 117s] ### VM INTERACTION START ### [ 120s] [ 102.393779] sysrq: SysRq : Power Off [ 120s] [ 102.412865] reboot: Power down [ 120s] ### VM INTERACTION END ### [ 120s] [ 120s] cloud109 failed "build simtrace2_0.7.0.3.75a5.dsc" at Fri Dec 13 01:45:45 UTC 2019. [ 120s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Dec 13 06:33:54 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 13 Dec 2019 06:33:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: fix MSISDN / SMSC coding in SM-RP-OA/DA References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16565 ) Change subject: library/GSUP_Types.ttcn: fix MSISDN / SMSC coding in SM-RP-OA/DA ...................................................................... library/GSUP_Types.ttcn: fix MSISDN / SMSC coding in SM-RP-OA/DA Unlike IMSI, both MSISDN and SMSC address in SM-RP-OA/DA not only contain the BCD encoded digits, but also a little header with NPI (Numbering Plan Identification), ToN (Type of Number), and Extension fields. Change-Id: I3f55834489f3e613f541cf1e216027e8d48ccaf0 --- M library/GSUP_Types.ttcn M library/Osmocom_Types.ttcn M msc/MSC_Tests.ttcn 3 files changed, 60 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/16565/1 diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index 8977d9f..3fa525f 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -869,6 +869,38 @@ OSMO_GSUP_SM_RP_ODA_ID_NULL ('FF'O) } with { variant "FIELDLENGTH(8)" }; +/* See 3GPP TS 24.011, figures 8.5 and 8.6 */ +type record GSUP_SM_RP_Addr { + BIT4 npi, /* Numbering Plan Identification */ + BIT3 ton, /* Type of Number */ + BIT1 ext, /* Extension? */ + hexstring number length (1..20) +} with { + variant "PADDING(yes)"; + variant "PADDING_PATTERN('1111'B)" +}; + +private function f_pad_SM_RP_Addr(template hexstring number) +return template hexstring { + if (isvalue(number) and not istemplatekind(number, "omit")) { + return f_pad_bcd_number(valueof(number)); + } else { + return number; + } +} + +template GSUP_SM_RP_Addr t_GSUP_SM_RP_Addr(template hexstring number, + template BIT4 npi := '0001'B, + template BIT3 ton := '001'B, + template BIT1 ext := '1'B) := { + npi := npi, + ton := ton, + ext := ext, + /* Work around TITAN's padding problems: encoding works fine, + * but it does not consider 'F'H as padding in decoded data. */ + number := f_pad_SM_RP_Addr(number) +} + /** * SM-RP-DA represents the SM Destination Address, see 7.6.8.1. * It can be either of the following: @@ -879,9 +911,9 @@ * - service centre address */ type union GSUP_SM_RP_DA_ID { - hexstring imsi, - hexstring msisdn, - hexstring smsc_addr + hexstring imsi, + GSUP_SM_RP_Addr msisdn, + GSUP_SM_RP_Addr smsc_addr }; type record GSUP_SM_RP_DA { @@ -904,20 +936,20 @@ id_enc := { imsi := imsi } } -template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_MSISDN(hexstring msisdn) := { +template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_MSISDN(GSUP_SM_RP_Addr msisdn) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_MSISDN, id_enc := { msisdn := msisdn } } -template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_MSISDN(template hexstring msisdn) := { +template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_MSISDN(template GSUP_SM_RP_Addr msisdn) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_MSISDN, id_enc := { msisdn := msisdn } } -template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_SMSC_ADDR(hexstring smsc_addr) := { +template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_SMSC_ADDR(GSUP_SM_RP_Addr smsc_addr) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR, id_enc := { smsc_addr := smsc_addr } } -template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_SMSC_ADDR(template hexstring smsc_addr) := { +template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_SMSC_ADDR(template GSUP_SM_RP_Addr smsc_addr) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR, id_enc := { smsc_addr := smsc_addr } } @@ -953,8 +985,8 @@ * - service centre address */ type union GSUP_SM_RP_OA_ID { - hexstring msisdn, - hexstring smsc_addr + GSUP_SM_RP_Addr msisdn, + GSUP_SM_RP_Addr smsc_addr }; type record GSUP_SM_RP_OA { @@ -967,20 +999,20 @@ )" }; -template (value) GSUP_SM_RP_OA ts_GSUP_SM_RP_OA_MSISDN(hexstring msisdn) := { +template (value) GSUP_SM_RP_OA ts_GSUP_SM_RP_OA_MSISDN(GSUP_SM_RP_Addr msisdn) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_MSISDN, id_enc := { msisdn := msisdn } } -template GSUP_SM_RP_OA tr_GSUP_SM_RP_OA_MSISDN(template hexstring msisdn) := { +template GSUP_SM_RP_OA tr_GSUP_SM_RP_OA_MSISDN(template GSUP_SM_RP_Addr msisdn) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_MSISDN, id_enc := { msisdn := msisdn } } -template (value) GSUP_SM_RP_OA ts_GSUP_SM_RP_OA_SMSC_ADDR(hexstring smsc_addr) := { +template (value) GSUP_SM_RP_OA ts_GSUP_SM_RP_OA_SMSC_ADDR(GSUP_SM_RP_Addr smsc_addr) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR, id_enc := { smsc_addr := smsc_addr } } -template GSUP_SM_RP_OA tr_GSUP_SM_RP_OA_SMSC_ADDR(template hexstring smsc_addr) := { +template GSUP_SM_RP_OA tr_GSUP_SM_RP_OA_SMSC_ADDR(template GSUP_SM_RP_Addr smsc_addr) := { id_type := OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR, id_enc := { smsc_addr := smsc_addr } } diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn index 046a9ea..2e71123 100644 --- a/library/Osmocom_Types.ttcn +++ b/library/Osmocom_Types.ttcn @@ -170,5 +170,13 @@ return str; } +function f_pad_bcd_number(hexstring number) return hexstring { + if (lengthof(number) mod 2 != 0) { + return number & 'F'H; + } else { + return number; + } +} + } with { encode "RAW"; variant "FIELDORDER(msb)" } diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 480ec96..25d6b64 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2185,16 +2185,18 @@ /* Helper for sending MT SMS over GSUP */ -private function f_gsup_forwardSM_req(SmsParameters spars, OCT1 mms := '00'O) +private function f_gsup_forwardSM_req(SmsParameters spars, + template (value) GSUP_SM_RP_Addr msisdn := t_GSUP_SM_RP_Addr('12345678'H), + template (value) GSUP_SM_RP_Addr smsc := t_GSUP_SM_RP_Addr('87654321'H), + OCT1 mms := '00'O) runs on BSC_ConnHdlr { GSUP.send(ts_GSUP_MT_FORWARD_SM_REQ( imsi := g_pars.imsi, /* NOTE: MSC should assign RP-MR itself */ sm_rp_mr := 'FF'O, - /* FIXME: extract SM-RP-DA from spars.rp.dest */ /* TODO: fix encoding of ts_GSUP_SM_RP_DA_IMSI */ - sm_rp_da := valueof(ts_GSUP_SM_RP_DA_MSISDN(g_pars.msisdn)), - sm_rp_oa := valueof(ts_GSUP_SM_RP_OA_SMSC_ADDR(g_pars.msisdn)), + sm_rp_da := valueof(ts_GSUP_SM_RP_DA_MSISDN(valueof(msisdn))), + sm_rp_oa := valueof(ts_GSUP_SM_RP_OA_SMSC_ADDR(valueof(smsc))), /* Encoded SMS TPDU (taken from Wireshark) * FIXME: we should encode spars somehow */ sm_rp_ui := '00068021436500008111328130858200'O, @@ -2580,7 +2582,7 @@ /* Send 4 messages (NOTE: SM-RP-UI remains unchanged) */ for (var integer i := 3; i >= 0; i := i-1) { /* Submit a MT SMS on GSUP (MMS is decremented) */ - f_gsup_forwardSM_req(spars, int2oct(i, 1)); + f_gsup_forwardSM_req(spars, mms := int2oct(i, 1)); /* Expect Paging Request and Establish connection */ if (i == 3) { /* ... only once! */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3f55834489f3e613f541cf1e216027e8d48ccaf0 Gerrit-Change-Number: 16565 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 13 06:46:17 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 13 Dec 2019 06:46:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: fix: verify the contents of SM-RP DA/OA for MO SMS References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16566 ) Change subject: MSC_Tests.ttcn: fix: verify the contents of SM-RP DA/OA for MO SMS ...................................................................... MSC_Tests.ttcn: fix: verify the contents of SM-RP DA/OA for MO SMS Change-Id: Ib467eeca6439bc6cce72293fbb5bb48f6d233db9 --- M msc/MSC_Tests.ttcn 1 file changed, 11 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/16566/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 25d6b64..61b637a 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2085,10 +2085,17 @@ var template GSUP_PDU mo_forwardSM := tr_GSUP_MO_FORWARD_SM_REQ( imsi := g_pars.imsi, sm_rp_mr := spars.rp.msg_ref, - /* FIXME: extract SM-RP-DA from spars.rp.dest */ - sm_rp_da := tr_GSUP_SM_RP_DA_SMSC_ADDR(?), - /* FIXME: MSISDN coding troubles */ - sm_rp_oa := tr_GSUP_SM_RP_OA_MSISDN(?), + /* SM-RP-DA: SMSC address */ + sm_rp_da := tr_GSUP_SM_RP_DA_SMSC_ADDR(t_GSUP_SM_RP_Addr( + number := spars.rp.dest.rP_NumberDigits, + npi := spars.rp.dest.rP_NumberingPlanIdentification, + ton := spars.rp.dest.rP_TypeOfNumber, + ext := spars.rp.dest.rP_Ext)), + /* SM-RP-OA: subscriber's MSISDN (filled in by MSC) */ + sm_rp_oa := tr_GSUP_SM_RP_OA_MSISDN(t_GSUP_SM_RP_Addr( + number := g_pars.msisdn, + /* FIXME: MSISDN we have in g_pars lacks this info */ + npi := ?, ton := ?, ext := ?)), /* TODO: can we use decmatch here? */ sm_rp_ui := sm_tpdu ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16566 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib467eeca6439bc6cce72293fbb5bb48f6d233db9 Gerrit-Change-Number: 16566 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 13 12:23:42 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 13 Dec 2019 12:23:42 +0000 Subject: Change in osmocom-bb[master]: contrib/jenkins.sh: also run unit tests for TRX Toolkit References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16567 ) Change subject: contrib/jenkins.sh: also run unit tests for TRX Toolkit ...................................................................... contrib/jenkins.sh: also run unit tests for TRX Toolkit Change-Id: Ia3990dc8e1ff98b83d3ee25fafa5b029f46646cd --- M contrib/jenkins.sh 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/67/16567/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 52c6566..ab44c2c 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -67,4 +67,9 @@ make maintainer-clean done +# Test TRX Toolkit scripts +for i in data_msg data_dump; do + python "$base/src/target/trx_toolkit/$i.py" +done + osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia3990dc8e1ff98b83d3ee25fafa5b029f46646cd Gerrit-Change-Number: 16567 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 13 13:49:50 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 13 Dec 2019 13:49:50 +0000 Subject: Change in pysim[master]: test In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16564 to look at the new patch set (#2). Change subject: test ...................................................................... test Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 --- A test A testme 2 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/64/16564/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 Gerrit-Change-Number: 16564 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 13 13:55:49 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 13 Dec 2019 13:55:49 +0000 Subject: Change in pysim[master]: test In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16564 to look at the new patch set (#3). Change subject: test ...................................................................... test test Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 --- A test A testme 2 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/64/16564/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 Gerrit-Change-Number: 16564 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 13 14:02:00 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 13 Dec 2019 14:02:00 +0000 Subject: Change in pysim[master]: Tests: Move Fairwaves-Sim from Reader #4 to Reader #0 In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16564 to look at the new patch set (#4). Change subject: Tests: Move Fairwaves-Sim from Reader #4 to Reader #0 ...................................................................... Tests: Move Fairwaves-Sim from Reader #4 to Reader #0 Hardware changes on the simcard tester require Fairwaves-Sim to be moved from Reader #4 (The last reader in the testbed) to reader #0. Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 --- M pysim-testdata/Fairwaves-SIM.ok A test A testme 3 files changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/64/16564/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 Gerrit-Change-Number: 16564 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 13 15:01:50 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 13 Dec 2019 15:01:50 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_msg.py: rewrite unit tests to use unittest framework References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16568 ) Change subject: trx_toolkit/data_msg.py: rewrite unit tests to use unittest framework ...................................................................... trx_toolkit/data_msg.py: rewrite unit tests to use unittest framework Change-Id: Ia0cc7447b193a705e994078d16f3902339219916 --- M src/target/trx_toolkit/data_msg.py 1 file changed, 149 insertions(+), 195 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/68/16568/1 diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index c96dddb..e95ff23 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -22,6 +22,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +import unittest import random import struct @@ -857,214 +858,167 @@ return msg -# Regression test -if __name__ == '__main__': - import logging as log +class DATAMSG_Test(unittest.TestCase): + # Compare message a with message b + def _compare_msg(self, a, b): + # Make sure we're comparing messages of the same type + self.assertEqual(a.__class__, b.__class__) - # Configure logging - log.basicConfig(level = log.DEBUG, - format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") + # Compare common header fields + self.assertEqual(a.ver, b.ver) + self.assertEqual(a.fn, b.fn) + self.assertEqual(a.tn, b.tn) - log.info("Generating the reference messages") + # Burst bits (if present) + self.assertEqual(a.burst, b.burst) - # Create messages of both types - msg_l12trx_ref = DATAMSG_L12TRX() - msg_trx2l1_ref = DATAMSG_TRX2L1() + # TRX2L1 specific fields + if isinstance(a, DATAMSG_L12TRX): + self.assertEqual(a.pwr, b.pwr) - # Validate header randomization - for i in range(0, 100): - msg_l12trx_ref.rand_hdr() - msg_trx2l1_ref.rand_hdr() + # L12TRX specific fields + if isinstance(a, DATAMSG_TRX2L1): + # Version independent fields + self.assertEqual(a.toa256, b.toa256) + self.assertEqual(a.rssi, b.rssi) - msg_l12trx_ref.rand_burst() - msg_trx2l1_ref.rand_burst() - - msg_l12trx_ref.validate() - msg_trx2l1_ref.validate() - - log.info("Validate header randomization: OK") - - # Test error handling for common fields - msg = DATAMSG() + # Version specific fields + if a.ver >= 1: + self.assertEqual(a.nope_ind, b.nope_ind) + self.assertEqual(a.mod_type, b.mod_type) + self.assertEqual(a.tsc_set, b.tsc_set) + self.assertEqual(a.tsc, b.tsc) + self.assertEqual(a.ci, b.ci) # Make sure that message validation throws a ValueError - def validate_throw(msg): - try: + def test_validate(self): + # Unknown version + with self.assertRaises(ValueError): + msg = DATAMSG(fn = 0, tn = 0, ver = 100) msg.validate() - return False - except ValueError: - return True - # Unknown version - msg.rand_hdr() - msg.ver = 100 - assert(validate_throw(msg)) + # Uninitialized field + with self.assertRaises(ValueError): + msg = DATAMSG() + msg.validate() + with self.assertRaises(ValueError): + msg = DATAMSG(fn = None, tn = 0) + msg.validate() - # Uninitialized field - msg.rand_hdr() - msg.fn = None - assert(validate_throw(msg)) + # Out-of-range value(s) + with self.assertRaises(ValueError): + msg = DATAMSG(fn = -1, tn = 0) + msg.validate() + with self.assertRaises(ValueError): + msg = DATAMSG(fn = 0, tn = 10) + msg.validate() - # Out-of-range value - msg.rand_hdr() - msg.tn = 10 - assert(validate_throw(msg)) + # Validate header and burst randomization + def test_rand_hdr_burst(self): + msg_l12trx = DATAMSG_L12TRX() + msg_trx2l1 = DATAMSG_TRX2L1() - log.info("Check incorrect message validation: OK") - - log.info("Encoding the reference messages") - - # Encode DATA messages - l12trx_raw = msg_l12trx_ref.gen_msg() - trx2l1_raw = msg_trx2l1_ref.gen_msg() - - # Encode a TRX2L1 message in legacy mode - trx2l1_raw_legacy = msg_trx2l1_ref.gen_msg(legacy = True) - - log.info("Parsing generated messages back") - - # Parse generated DATA messages - msg_l12trx_dec = DATAMSG_L12TRX() - msg_trx2l1_dec = DATAMSG_TRX2L1() - msg_l12trx_dec.parse_msg(l12trx_raw) - msg_trx2l1_dec.parse_msg(trx2l1_raw) - - # Parse generated TRX2L1 message in legacy mode - msg_trx2l1_legacy_dec = DATAMSG_TRX2L1() - msg_trx2l1_legacy_dec.parse_msg(trx2l1_raw_legacy) - - log.info("Comparing decoded messages with the reference") - - # Compare bursts - assert(msg_l12trx_dec.burst == msg_l12trx_ref.burst) - assert(msg_trx2l1_dec.burst == msg_trx2l1_ref.burst) - assert(msg_trx2l1_legacy_dec.burst == msg_trx2l1_ref.burst) - - log.info("Compare bursts: OK") - - # Compare both parsed messages with the reference data - assert(msg_l12trx_dec.fn == msg_l12trx_ref.fn) - assert(msg_trx2l1_dec.fn == msg_trx2l1_ref.fn) - assert(msg_l12trx_dec.tn == msg_l12trx_ref.tn) - assert(msg_trx2l1_dec.tn == msg_trx2l1_ref.tn) - - log.info("Compare FN / TN: OK") - - # Compare message specific parts - assert(msg_trx2l1_dec.rssi == msg_trx2l1_ref.rssi) - assert(msg_l12trx_dec.pwr == msg_l12trx_ref.pwr) - assert(msg_trx2l1_dec.toa256 == msg_trx2l1_ref.toa256) - - log.info("Compare message specific data: OK") - - # Bit conversation test - usbits_ref = list(range(0, 256)) - sbits_ref = list(range(-127, 128)) - - # Test both usbit2sbit() and sbit2usbit() - sbits = DATAMSG.usbit2sbit(usbits_ref) - usbits = DATAMSG.sbit2usbit(sbits) - assert(usbits[:255] == usbits_ref[:255]) - assert(usbits[255] == 254) - - log.info("Check both usbit2sbit() and sbit2usbit(): OK") - - # Test both sbit2ubit() and ubit2sbit() - ubits = DATAMSG.sbit2ubit(sbits_ref) - assert(ubits == ([1] * 127 + [0] * 128)) - - sbits = DATAMSG.ubit2sbit(ubits) - assert(sbits == ([-127] * 127 + [127] * 128)) - - log.info("Check both sbit2ubit() and ubit2sbit(): OK") - - # Test message transformation - msg_l12trx_dec = msg_trx2l1_ref.gen_l12trx() - msg_trx2l1_dec = msg_l12trx_ref.gen_trx2l1() - - assert(msg_l12trx_dec.fn == msg_trx2l1_ref.fn) - assert(msg_l12trx_dec.tn == msg_trx2l1_ref.tn) - - assert(msg_trx2l1_dec.fn == msg_l12trx_ref.fn) - assert(msg_trx2l1_dec.tn == msg_l12trx_ref.tn) - - assert(msg_l12trx_dec.burst == DATAMSG.sbit2ubit(msg_trx2l1_ref.burst)) - assert(msg_trx2l1_dec.burst == DATAMSG.ubit2sbit(msg_l12trx_ref.burst)) - - log.info("Check L12TRX <-> TRX2L1 type transformations: OK") - - # Test header version coding - for ver in DATAMSG.known_versions: - # Create messages of both types - msg_l12trx = DATAMSG_L12TRX(ver = ver) - msg_trx2l1 = DATAMSG_TRX2L1(ver = ver) - - # Randomize message specific headers - msg_l12trx.rand_hdr() - msg_trx2l1.rand_hdr() - - # Randomize bursts - msg_l12trx.rand_burst() - msg_trx2l1.rand_burst() - - # Encode DATA messages - msg_l12trx_enc = msg_l12trx.gen_msg() - msg_trx2l1_enc = msg_trx2l1.gen_msg() - - # Parse generated DATA messages - msg_l12trx_dec = DATAMSG_L12TRX() - msg_trx2l1_dec = DATAMSG_TRX2L1() - msg_l12trx_dec.parse_msg(msg_l12trx_enc) - msg_trx2l1_dec.parse_msg(msg_trx2l1_enc) - - # Match the header version - assert(msg_l12trx_dec.ver == ver) - assert(msg_trx2l1_dec.ver == ver) - - # Match common TDMA fields - assert(msg_l12trx_dec.tn == msg_l12trx.tn) - assert(msg_trx2l1_dec.fn == msg_trx2l1.fn) - - # Match version specific fields - if msg_trx2l1.ver >= 0x01: - assert(msg_trx2l1_dec.nope_ind == msg_trx2l1.nope_ind) - assert(msg_trx2l1_dec.mod_type == msg_trx2l1.mod_type) - assert(msg_trx2l1_dec.tsc_set == msg_trx2l1.tsc_set) - assert(msg_trx2l1_dec.tsc == msg_trx2l1.tsc) - assert(msg_trx2l1_dec.ci == msg_trx2l1.ci) - - log.info("Check header version %u coding: OK" % ver) - - # Compare bursts - assert(msg_l12trx_dec.burst == msg_l12trx.burst) - assert(msg_trx2l1_dec.burst == msg_trx2l1.burst) - - msg_trx2l1_gen = msg_l12trx.gen_trx2l1() - msg_l12trx_gen = msg_trx2l1.gen_l12trx() - - assert(msg_trx2l1_gen is not None) - assert(msg_l12trx_gen is not None) - - # Match the header version - assert(msg_trx2l1_gen.ver == ver) - assert(msg_l12trx_gen.ver == ver) - - # Match common TDMA fields - assert(msg_trx2l1_gen.tn == msg_l12trx.tn) - assert(msg_l12trx_gen.fn == msg_trx2l1.fn) - - log.info("Verify version %u direct transformation: OK" % ver) - - # Verify NOPE indication coding - if msg_trx2l1.ver >= 0x01: - msg_trx2l1 = DATAMSG_TRX2L1(ver = ver) - msg_trx2l1.nope_ind = True + for i in range(100): + msg_l12trx.rand_burst() + msg_trx2l1.rand_burst() + msg_l12trx.rand_hdr() msg_trx2l1.rand_hdr() - msg_trx2l1_dec = DATAMSG_TRX2L1() - msg_trx2l1_dec.parse_msg(msg_trx2l1.gen_msg()) + msg_l12trx.validate() + msg_trx2l1.validate() - assert(msg_trx2l1.nope_ind == msg_trx2l1_dec.nope_ind) - assert(msg_trx2l1.burst == msg_trx2l1_dec.burst) + def _test_enc_dec(self, msg, legacy = False, nope_ind = False): + # Prepare a given message (randomize) + msg.rand_hdr() - log.info("Verify version %u NOPE indication coding: OK" % ver) + # NOPE.ind contains no burst + if not nope_ind: + msg.rand_burst() + else: + msg.nope_ind = True + msg.mod_type = None + msg.tsc_set = None + msg.tsc = None + + # Encode a given message to bytes + msg_enc = msg.gen_msg(legacy) + + # Decode a new message from bytes + msg_dec = msg.__class__() + msg_dec.parse_msg(msg_enc) + + # Compare decoded vs the original + self._compare_msg(msg, msg_dec) + + # Validate encoding and decoding + def test_enc_dec(self): + for ver in DATAMSG.known_versions: + # L1 -> TRX message + msg = DATAMSG_L12TRX(ver = ver) + self._test_enc_dec(msg) + + # TRX -> L1 message + msg = DATAMSG_L12TRX(ver = ver) + self._test_enc_dec(msg) + + # TRX -> L1 NOPE.ind + if ver >= 1: + msg = DATAMSG_TRX2L1(ver = ver) + self._test_enc_dec(msg, nope_ind = True) + + # TRX -> L1 message (legacy) + msg = DATAMSG_L12TRX() + self._test_enc_dec(msg, legacy = True) + + # Validate bit conversations + def test_bit_conv(self): + usbits_ref = list(range(0, 256)) + sbits_ref = list(range(-127, 128)) + + # Test both usbit2sbit() and sbit2usbit() + sbits = DATAMSG.usbit2sbit(usbits_ref) + usbits = DATAMSG.sbit2usbit(sbits) + self.assertEqual(usbits[:255], usbits_ref[:255]) + self.assertEqual(usbits[255], 254) + + # Test both sbit2ubit() and ubit2sbit() + ubits = DATAMSG.sbit2ubit(sbits_ref) + self.assertEqual(ubits, ([1] * 127 + [0] * 128)) + + sbits = DATAMSG.ubit2sbit(ubits) + self.assertEqual(sbits, ([-127] * 127 + [127] * 128)) + + def _test_transform(self, msg): + # Prepare given messages + msg.rand_hdr() + msg.rand_burst() + + # Perform message transformation + if isinstance(msg, DATAMSG_L12TRX): + msg_trans = msg.gen_trx2l1() + else: + msg_trans = msg.gen_l12trx() + + # FIXME: Compare common header fields and burst bits only + self.assertEqual(msg_trans.ver, msg.ver) + self.assertEqual(msg_trans.fn, msg.fn) + self.assertEqual(msg_trans.tn, msg.tn) + + if isinstance(msg, DATAMSG_TRX2L1): + burst = DATAMSG.sbit2ubit(msg.burst) + self.assertEqual(msg_trans.burst, burst) + else: + burst = DATAMSG.ubit2sbit(msg.burst) + self.assertEqual(msg_trans.burst, burst) + + # Validate message transformation + def test_transform(self): + for ver in DATAMSG.known_versions: + msg = DATAMSG_L12TRX(ver = ver) + self._test_transform(msg) + + msg = DATAMSG_TRX2L1(ver = ver) + self._test_transform(msg) + +if __name__ == '__main__': + unittest.main() -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia0cc7447b193a705e994078d16f3902339219916 Gerrit-Change-Number: 16568 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 13 15:17:22 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 13 Dec 2019 15:17:22 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_msg.py: rewrite unit tests to use unittest framework In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/16568 to look at the new patch set (#2). Change subject: trx_toolkit/data_msg.py: rewrite unit tests to use unittest framework ...................................................................... trx_toolkit/data_msg.py: rewrite unit tests to use unittest framework Change-Id: Ia0cc7447b193a705e994078d16f3902339219916 --- M src/target/trx_toolkit/data_msg.py 1 file changed, 151 insertions(+), 195 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/68/16568/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia0cc7447b193a705e994078d16f3902339219916 Gerrit-Change-Number: 16568 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 13 15:36:57 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 13 Dec 2019 15:36:57 +0000 Subject: Change in osmo-hlr[master]: add libosmo-mslookup abstract client In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#19) to the change originally created by neels. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16202 ) Change subject: add libosmo-mslookup abstract client ...................................................................... add libosmo-mslookup abstract client mslookup is a key concept in Distributed GSM, which allows querying the current location of a subscriber in a number of cooperating but independent core network sites, by arbitrary service names and by MSISDN/IMSI. Add the abstract mslookup client library. An actual lookup method (besides mslookup_client_fake.c) is added in a subsequent patch. For a detailed overview of this and upcoming patches, please see the elaborate comment at the top of mslookup.c. Add as separate library, libosmo-mslookup, to allow adding D-GSM capability to arbitrary client programs. osmo-hlr will be the only mslookup server implementation, added in a subsequent patch. osmo-hlr itself will also use this library and act as an mslookup client, when requesting the home HLR for locally unknown IMSIs. Related: OS#4237 Patch-by: osmith, nhofmeyr Change-Id: I83487ab8aad1611eb02e997dafbcb8344da13df1 --- M .gitignore M configure.ac M debian/control A debian/libosmo-mslookup-dev.install A debian/libosmo-mslookup0.install M include/Makefile.am M include/osmocom/hlr/logging.h A include/osmocom/mslookup/mslookup.h A include/osmocom/mslookup/mslookup_client.h A include/osmocom/mslookup/mslookup_client_fake.h A libosmo-mslookup.pc.in M src/Makefile.am M src/logging.c A src/mslookup/Makefile.am A src/mslookup/mslookup.c A src/mslookup/mslookup_client.c A src/mslookup/mslookup_client_fake.c M tests/Makefile.am A tests/mslookup/Makefile.am A tests/mslookup/mslookup_client_test.c A tests/mslookup/mslookup_client_test.err A tests/mslookup/mslookup_test.c A tests/mslookup/mslookup_test.err M tests/testsuite.at 24 files changed, 1,620 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/02/16202/19 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I83487ab8aad1611eb02e997dafbcb8344da13df1 Gerrit-Change-Number: 16202 Gerrit-PatchSet: 19 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 13 15:36:57 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 13 Dec 2019 15:36:57 +0000 Subject: Change in osmo-hlr[master]: add mDNS lookup method to libosmo-mslookup In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#10) to the change originally created by neels. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16256 ) Change subject: add mDNS lookup method to libosmo-mslookup ...................................................................... add mDNS lookup method to libosmo-mslookup Add the first actually useful lookup method to the mslookup library: multicast DNS. The server side is added in a subsequent commit, when the mslookup server is implemented for the osmo-hlr program. Use custom DNS encoding instead of libc-ares (which we use in OsmoSGSN already), because libc-ares is only a DNS client implementation and we will need both client and server. Related: OS#4237 Patch-by: osmith, nhofmeyr Change-Id: I03a0ffa1d4dc1b24ac78a5ad0975bca90a49c728 --- M .gitignore M configure.ac M include/Makefile.am M include/osmocom/Makefile.am A include/osmocom/mslookup/Makefile.am A include/osmocom/mslookup/mdns.h A include/osmocom/mslookup/mdns_msg.h A include/osmocom/mslookup/mdns_rfc.h A include/osmocom/mslookup/mdns_sock.h A include/osmocom/mslookup/mslookup_client_mdns.h M src/mslookup/Makefile.am A src/mslookup/mdns.c A src/mslookup/mdns_msg.c A src/mslookup/mdns_rfc.c A src/mslookup/mdns_sock.c A src/mslookup/mslookup_client_mdns.c M tests/mslookup/Makefile.am A tests/mslookup/mdns_test.c A tests/mslookup/mdns_test.err A tests/mslookup/mslookup_client_mdns_test.c A tests/mslookup/mslookup_client_mdns_test.err M tests/testsuite.at 22 files changed, 2,829 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/56/16256/10 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I03a0ffa1d4dc1b24ac78a5ad0975bca90a49c728 Gerrit-Change-Number: 16256 Gerrit-PatchSet: 10 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 13 15:36:57 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 13 Dec 2019 15:36:57 +0000 Subject: Change in osmo-hlr[master]: add osmo-mslookup-client program In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#21) to the change originally created by neels. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16203 ) Change subject: add osmo-mslookup-client program ...................................................................... add osmo-mslookup-client program Standalone program using libosmo-mslookup to easily integrate with programs that want to connect services (SIP, SMS,...) to the current location of a subscriber. Also useful for manual testing. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: Ie68a5c1db04fb4dff00dc3c774a1162f5b9fabf7 --- M .gitignore M configure.ac M contrib/Makefile.am A contrib/dgsm/Makefile.am A contrib/dgsm/osmo-mslookup-pipe.py A contrib/dgsm/osmo-mslookup-socket.py M src/mslookup/Makefile.am A src/mslookup/osmo-mslookup-client.c 8 files changed, 957 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/03/16203/21 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ie68a5c1db04fb4dff00dc3c774a1162f5b9fabf7 Gerrit-Change-Number: 16203 Gerrit-PatchSet: 21 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 13 15:36:57 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 13 Dec 2019 15:36:57 +0000 Subject: Change in osmo-hlr[master]: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#22) to the change originally created by neels. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16205 ) Change subject: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name ...................................................................... 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name These are seemingly orthogonal changes in one patch, because they are in fact sufficiently intertwined that we are not willing to spend the time to separate them. They are also refactoring changes, unlikely to make sense on their own. ** lu_fsm: Attempting to make luop.c keep state about incoming GSUP requests made me find shortcomings in several places: - since it predates osmo_fsm, it is a state machine that does not strictly enforce the order of state transitions or the right sequence of incoming events. - several places OSMO_ASSERT() on data received from the network. - modifies the subscriber state before a LU is accepted. - dead code about canceling a subscriber in a previous VLR. That would be a good thing to actually do, which should also be trivial now that we record vlr_name and sgsn_name, but I decided to remove the dead code for now. To both step up the LU game *and* make it easier for me to integrate osmo_gsup_req handling, I decided to create a lu_fsm, drawing from my, by now, ample experience of writing osmo_fsms. ** osmo_gsup_req: Prepare for D-GSM, where osmo-hlr will do proxy routing for remote HLRs / communicate with remote MSCs via a proxy: a) It is important that a response that osmo-hlr generates and that is sent back to a requesting MSC contains all IEs that are needed to route it back to the requester. Particularly source_name must become destination_name in the response to be able to even reach the requesting MSC. Other fields are also necessary to match, which were so far taken care of in individual numerous code paths. b) For some operations, the response to a GSUP request is generated asynchronously (like Update Location Request -> Response, or taking the response from an EUSE, or the upcoming proxying to a remote HLR). To be able to feed a request message's information back into the response, we must thus keep the request data around. Since struct osmo_gsup_message references a lot of external data, usually with pointers directly into the received msgb, it is not so trivial to pass GSUP message data around asynchronously, on its own. osmo_gsup_req is the combined solution for both a and b: it keeps all data for a GSUP message by taking ownership of the incoming msgb, and it provides an explicit API "forcing" callers to respond with osmo_gsup_req_respond(), so that all code paths trivially are definitely responding with the correct IEs set to match the request's routing (by using osmo_gsup_make_response() recently added to libosmocore). Adjust all osmo-hlr code paths to use *only* osmo_gsup_req to respond to incoming requests received on the GSUP server (above LU code being one of them). In fact, the same should be done on the client side. Hence osmo_gsup_req is implemented in a server/client agnostic way, and is placed in libosmo-gsupclient. As soon as we see routing errors in complex GSUP setups, using osmo_gsup_req in the related GSUP client is likely to resolve those problems without much thinking required beyond making all code paths use it. libosmo-gsupclient is hence added to osmo-hlr binary's own library dependencies. It would have been added by the D-GSM proxy routing anyway, we are just doing it a little sooner. ** gsup_peer_id.c / osmo_ipa_name: We so far handle an IPA unit name as pointer + size, or as just pointer with implicit talloc size. To ease working with GSUP peer identification data, I require: - a non-allocated storage of an IPA Name. It brings the drawback of being size limited, but our current implementation is anyway only able to handle MSC and SGSN names of 31 characters (see struct hlr_subscriber). - a single-argument handle for IPA Name, - easy to use utility functions like osmo_ipa_name_to_str(), osmo_ipa_name_cmp(), and copying by simple assignment, a = b. Hence this patch adds a osmo_ipa_name in gsup_peer_id.h and gsup_peer_id.c. Heavily used in LU and osmo_gsup_req. Depends: libosmocore Id9692880079ea0f219f52d81b1923a76fc640566 Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 --- M configure.ac M include/Makefile.am A include/osmocom/gsupclient/gsup_req.h A include/osmocom/gsupclient/ipa_name.h M include/osmocom/hlr/Makefile.am M include/osmocom/hlr/db.h M include/osmocom/hlr/gsup_router.h M include/osmocom/hlr/gsup_server.h M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_ussd.h M include/osmocom/hlr/logging.h A include/osmocom/hlr/lu_fsm.h D include/osmocom/hlr/luop.h M src/Makefile.am M src/db.c M src/db_hlr.c M src/gsup_router.c M src/gsup_send.c M src/gsup_server.c M src/gsupclient/Makefile.am M src/gsupclient/gsup_client.c A src/gsupclient/gsup_req.c A src/gsupclient/ipa_name.c M src/hlr.c M src/hlr_ussd.c M src/logging.c A src/lu_fsm.c D src/luop.c M tests/Makefile.am M tests/db/Makefile.am M tests/db/db_test.c M tests/db/db_test.err A tests/gsup/Makefile.am A tests/gsup/gsup_test.c A tests/gsup/gsup_test.err A tests/gsup/gsup_test.ok M tests/gsup_server/Makefile.am M tests/test_nodes.vty M tests/testsuite.at 39 files changed, 1,627 insertions(+), 905 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/05/16205/22 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 Gerrit-Change-Number: 16205 Gerrit-PatchSet: 22 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 13 15:36:57 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 13 Dec 2019 15:36:57 +0000 Subject: Change in osmo-hlr[master]: D-GSM 2/n: implement mDNS method of mslookup server In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#12) to the change originally created by neels. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16257 ) Change subject: D-GSM 2/n: implement mDNS method of mslookup server ...................................................................... D-GSM 2/n: implement mDNS method of mslookup server Implement the mslookup server's mDNS responder, to actually service remote mslookup requests: - VTY mslookup/server config with service names, - the mslookup_mdns_server listening for mslookup requests, For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: I5cae6459090588b4dd292be90a5e8903432669d2 --- M include/osmocom/hlr/Makefile.am M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_vty.h M include/osmocom/hlr/mslookup_server.h A include/osmocom/hlr/mslookup_server_mdns.h M src/Makefile.am A src/dgsm_vty.c M src/hlr.c A src/mslookup_server_mdns.c M tests/test_nodes.vty M tests/test_subscriber.vty 11 files changed, 605 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/57/16257/12 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5cae6459090588b4dd292be90a5e8903432669d2 Gerrit-Change-Number: 16257 Gerrit-PatchSet: 12 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 13 15:36:57 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 13 Dec 2019 15:36:57 +0000 Subject: Change in osmo-hlr[master]: D-GSM 3/n: implement roaming by mslookup in osmo-hlr In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#13) to the change originally created by neels. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16258 ) Change subject: D-GSM 3/n: implement roaming by mslookup in osmo-hlr ...................................................................... D-GSM 3/n: implement roaming by mslookup in osmo-hlr Add mslookup client to find remote home HLRs of unknown IMSIs, and proxy/forward GSUP for those to the right remote HLR instances. Add remote_hlr.c to manage one GSUP client per remote HLR GSUP address. Add proxy.c to keep state about remotely handled IMSIs (remote GSUP address, MSISDN, and probably more in future patches). The mslookup_server that determines whether a given MSISDN is attached locally now also needs to look in the proxy record: it is always the osmo-hlr immediately peering for the MSC that should respond to mslookup service address queries like SIP and SMPP. (Only gsup.hlr service is always answered by the home HLR.) Add dgsm.c to set up an mdns mslookup client, ask for IMSI homes, and to decide which GSUP is handled locally and which needs to go to a remote HLR. Add full VTY config and VTY tests. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa --- M include/osmocom/hlr/Makefile.am A include/osmocom/hlr/dgsm.h M include/osmocom/hlr/gsup_server.h M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_vty.h M include/osmocom/hlr/logging.h A include/osmocom/hlr/proxy.h A include/osmocom/hlr/remote_hlr.h M src/Makefile.am A src/dgsm.c M src/dgsm_vty.c M src/hlr.c M src/hlr_vty.c M src/logging.c M src/mslookup_server.c M src/mslookup_server_mdns.c A src/proxy.c A src/remote_hlr.c M tests/test_nodes.vty 19 files changed, 1,919 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/58/16258/13 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa Gerrit-Change-Number: 16258 Gerrit-PatchSet: 13 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 13 15:41:57 2019 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 13 Dec 2019 15:41:57 +0000 Subject: Change in osmo-hlr[master]: adoc: add D-GSM chapter to osmohlr-usermanual In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#26) to the change originally created by neels. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16211 ) Change subject: adoc: add D-GSM chapter to osmohlr-usermanual ...................................................................... adoc: add D-GSM chapter to osmohlr-usermanual Change-Id: I392b5523870c2ef3267179160028d26f3f761b77 --- A doc/manuals/chapters/dgsm.adoc M doc/manuals/osmohlr-usermanual.adoc 2 files changed, 483 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/11/16211/26 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I392b5523870c2ef3267179160028d26f3f761b77 Gerrit-Change-Number: 16211 Gerrit-PatchSet: 26 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Dec 14 01:41:43 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 14 Dec 2019 01:41:43 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5df43df39d413_57302ac434b785f4230942@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 165s] /usr/src/packages/BUILD/firmware/apps/dfu/main.c:360: warning: undefined reference to `__stack_chk_guard' [ 165s] obj/simtrace/flash_dfu_desc.o: In function `set_usb_serial_str': [ 165s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_fail' [ 165s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_guard' [ 165s] obj/simtrace/flash_dfu_driver.o: In function `handle_getstate': [ 165s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_fail' [ 165s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_guard' [ 165s] collect2: error: ld returned 1 exit status [ 165s] % [ 165s] Makefile:233: recipe for target 'flash' failed [ 165s] make[2]: *** [flash] Error 1 [ 165s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 165s] Makefile:10: recipe for target 'fw-simtrace-dfu' failed [ 165s] make[1]: *** [fw-simtrace-dfu] Error 2 [ 165s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 165s] dh_auto_build: make -j1 returned exit code 2 [ 165s] debian/rules:16: recipe for target 'build' failed [ 165s] make: *** [build] Error 2 [ 165s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 165s] [ 165s] lamb02 failed "build simtrace2_0.7.0.3.75a5.dsc" at Sat Dec 14 01:41:23 UTC 2019. [ 165s] [ 165s] ### VM INTERACTION START ### [ 168s] [ 152.618332] sysrq: SysRq : Power Off [ 168s] [ 152.627924] reboot: Power down [ 168s] ### VM INTERACTION END ### [ 168s] [ 168s] lamb02 failed "build simtrace2_0.7.0.3.75a5.dsc" at Sat Dec 14 01:41:26 UTC 2019. [ 168s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 14 01:44:34 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 14 Dec 2019 01:44:34 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5df43e8b1717_57302ac434b785f42318f9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 89s] /usr/src/packages/BUILD/firmware/apps/dfu/main.c:360: warning: undefined reference to `__stack_chk_guard' [ 89s] obj/simtrace/flash_dfu_desc.o: In function `set_usb_serial_str': [ 89s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_fail' [ 89s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_guard' [ 89s] obj/simtrace/flash_dfu_driver.o: In function `handle_getstate': [ 89s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_fail' [ 89s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_guard' [ 89s] collect2: error: ld returned 1 exit status [ 89s] % [ 89s] Makefile:233: recipe for target 'flash' failed [ 89s] make[2]: *** [flash] Error 1 [ 89s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 89s] Makefile:10: recipe for target 'fw-simtrace-dfu' failed [ 89s] make[1]: *** [fw-simtrace-dfu] Error 2 [ 89s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 89s] dh_auto_build: make -j1 returned exit code 2 [ 89s] debian/rules:16: recipe for target 'build' failed [ 89s] make: *** [build] Error 2 [ 89s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 89s] [ 89s] lamb18 failed "build simtrace2_0.7.0.3.75a5.dsc" at Sat Dec 14 01:44:17 UTC 2019. [ 89s] [ 89s] ### VM INTERACTION START ### [ 92s] [ 79.768654] sysrq: SysRq : Power Off [ 92s] [ 79.774689] reboot: Power down [ 92s] ### VM INTERACTION END ### [ 92s] [ 92s] lamb18 failed "build simtrace2_0.7.0.3.75a5.dsc" at Sat Dec 14 01:44:20 UTC 2019. [ 92s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 14 10:16:00 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 14 Dec 2019 10:16:00 +0000 Subject: Build failure of network:osmocom:latest/libosmo-netif in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5df4b66de9ebf_57302ac434b785f428073b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-netif/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-netif failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-netif Last lines of build log: [ 186s] | configure:9518: checking dahdi/user.h presence [ 186s] | configure:9518: gcc -E -Wdate-time -D_FORTIFY_SOURCE=2 -Wall conftest.c [ 186s] | conftest.c:30:10: fatal error: dahdi/user.h: No such file or directory [ 186s] | 30 | #include [ 186s] | | ^~~~~~~~~~~~~~ [ 186s] | compilation terminated. [ 186s] | configure:9518: $? = 1 [ 186s] | configure: failed program was: [ 186s] | | /* confdefs.h */ [ 186s] | | #define PACKAGE_NAME "libosmo-netif" [ 186s] | | #define PACKAGE_TARNAME "libosmo-netif" [ 186s] | | #define PACKAGE_VERSION "0.6.0" [ 186s] | | #define PACKAGE_STRING "libosmo-netif 0.6.0" [ 186s] | | #define PACKAGE_BUGREPORT "openbsc-devel at lists.openbsc.org" [ 186s] | | #define PACKAGE_URL "" [ 186s] | | #define PACKAGE "libosmo-netif" [ 186s] | | #define VERSION "0.6.0" [ 186s] | | #define STDC_HEADERS 1 [ 186s] | | #define HAVE_SYS_TYPES_H 1 [ 186s] | | #define HAVE_SYS_STAT_H 1 [ 186s] | | #define HAVE_STDLIB_H 1 [ 186s] | | #define HAVE_STRING_H 1 [ 186s] | | #define HAVE_MEMORY_H 1 [ 188s] | | #define HAVE_STRIN[ 170.236813] sysrq: SysRq : Power Off [ 188s] [ 170.242387] reboot: Power down [ 189s] ### VM INTERACTION END ### [ 189s] [ 189s] cloud109 failed "build libosmo-netif_0.6.0.dsc" at Sat Dec 14 10:15:55 UTC 2019. [ 189s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Dec 14 10:47:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 10:47:30 +0000 Subject: Change in simtrace2[master]: stdio: Add support for %p format string (pointer address) References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16569 ) Change subject: stdio: Add support for %p format string (pointer address) ...................................................................... stdio: Add support for %p format string (pointer address) We actually llready had plrenty of code using %p, despite our stdio not implementing it ;) Change-Id: Iecf6c849ce5ef72a8fed9b19a18e215c61c3d09f --- M firmware/libcommon/source/stdio.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/69/16569/1 diff --git a/firmware/libcommon/source/stdio.c b/firmware/libcommon/source/stdio.c index a8612d1..1002c2d 100644 --- a/firmware/libcommon/source/stdio.c +++ b/firmware/libcommon/source/stdio.c @@ -358,6 +358,7 @@ case 'i': num = PutSignedInt(pStr, fill, width, va_arg(ap, signed int)); break; case 'u': num = PutUnsignedInt(pStr, fill, width, va_arg(ap, unsigned int)); break; case 'x': num = PutHexa(pStr, fill, width, 0, va_arg(ap, unsigned int)); break; + case 'p': num = PutHexa(pStr, fill, width, 0, va_arg(ap, unsigned long)); break; case 'X': num = PutHexa(pStr, fill, width, 1, va_arg(ap, unsigned int)); break; case 's': num = PutString(pStr, va_arg(ap, char *)); break; case 'c': num = PutChar(pStr, va_arg(ap, unsigned int)); break; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16569 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Iecf6c849ce5ef72a8fed9b19a18e215c61c3d09f Gerrit-Change-Number: 16569 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 10:47:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 10:47:30 +0000 Subject: Change in simtrace2[master]: Fix format string related warnings (int vs. long) References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16570 ) Change subject: Fix format string related warnings (int vs. long) ...................................................................... Fix format string related warnings (int vs. long) Change-Id: I924a16f03e2a099b9f8eb56746bff2b9101c6802 --- M firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c M firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c M firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c M firmware/libcommon/source/host_communication.c M firmware/libcommon/source/simtrace_iso7816.c 5 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/70/16570/1 diff --git a/firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c index 0c288e0..f8925b4 100644 --- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c +++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c @@ -163,7 +163,7 @@ wPage = (dwAddress - IFLASH_ADDR) / IFLASH_PAGE_SIZE; wOffset = (dwAddress - IFLASH_ADDR) % IFLASH_PAGE_SIZE; - TRACE_DEBUG( "Translated 0x%08X to page=%d and offset=%d\n\r", dwAddress, wPage, wOffset ) ; + TRACE_DEBUG( "Translated 0x%08lX to page=%d and offset=%d\n\r", dwAddress, wPage, wOffset ) ; /* Store values */ if ( pEfc ) { diff --git a/firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c index 677ea30..c661b3f 100644 --- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c +++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c @@ -134,7 +134,7 @@ // Store actual page numbers EFC_ComputeAddress( pStartEfc, wActualStartPage, 0, pdwActualStart ) ; EFC_ComputeAddress( pEndEfc, wActualEndPage, 0, pdwActualEnd ) ; - TRACE_DEBUG( "Actual lock range is 0x%06X - 0x%06X\n\r", *pdwActualStart, *pdwActualEnd ) ; + TRACE_DEBUG( "Actual lock range is 0x%06lX - 0x%06lX\n\r", *pdwActualStart, *pdwActualEnd ) ; } diff --git a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c index 4f772be..4467cc9 100644 --- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c +++ b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c @@ -68,7 +68,7 @@ { uint8_t u8 = g_dfu->state; - TRACE_DEBUG("handle_getstate(%u)\n\r", g_dfu->state); + TRACE_DEBUG("handle_getstate(%lu)\n\r", g_dfu->state); USBD_Write(0, (char *)&u8, sizeof(u8), NULL, 0); } diff --git a/firmware/libcommon/source/host_communication.c b/firmware/libcommon/source/host_communication.c index ea573bb..c305b80 100644 --- a/firmware/libcommon/source/host_communication.c +++ b/firmware/libcommon/source/host_communication.c @@ -40,7 +40,7 @@ local_irq_save(x); bep->in_progress--; local_irq_restore(x); - TRACE_DEBUG("%u: in_progress=%d\n", bep->ep, bep->in_progress); + TRACE_DEBUG("%u: in_progress=%lu\n", bep->ep, bep->in_progress); if (status != USBD_STATUS_SUCCESS) TRACE_ERROR("%s error, status=%d\n", __func__, status); @@ -79,7 +79,7 @@ local_irq_restore(x); - TRACE_DEBUG("%s (EP=0x%02x), in_progress=%d\r\n", __func__, ep, bep->in_progress); + TRACE_DEBUG("%s (EP=0x%02x), in_progress=%lu\r\n", __func__, ep, bep->in_progress); msg->dst = bep; @@ -92,7 +92,7 @@ local_irq_save(x); bep->in_progress--; local_irq_restore(x); - TRACE_DEBUG("%02x: in_progress=%d\n", bep->ep, bep->in_progress); + TRACE_DEBUG("%02x: in_progress=%lu\n", bep->ep, bep->in_progress); return 0; } @@ -106,7 +106,7 @@ struct msgb *msg = (struct msgb *) arg; struct usb_buffered_ep *bep = msg->dst; - TRACE_DEBUG("%s (EP=%u, len=%u, q=%p)\r\n", __func__, + TRACE_DEBUG("%s (EP=%u, len=%lu, q=%p)\r\n", __func__, bep->ep, transferred, &bep->queue); bep->in_progress = 0; diff --git a/firmware/libcommon/source/simtrace_iso7816.c b/firmware/libcommon/source/simtrace_iso7816.c index 8ee3f8c..dc41c08 100644 --- a/firmware/libcommon/source/simtrace_iso7816.c +++ b/firmware/libcommon/source/simtrace_iso7816.c @@ -109,7 +109,7 @@ /* Fill char into buffer */ rbuf_write(&sim_rcv_buf, c); } else { - TRACE_DEBUG("e %x st: %x\n", c, stat); + TRACE_DEBUG("e %x st: %lx\n", c, stat); } /* else: error occurred */ char_stat = stat; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I924a16f03e2a099b9f8eb56746bff2b9101c6802 Gerrit-Change-Number: 16570 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 17:24:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 17:24:12 +0000 Subject: Change in simtrace2[master]: laforge local openocd config References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16571 ) Change subject: laforge local openocd config ...................................................................... laforge local openocd config Change-Id: Id156d07b611951d92200dc38a9e11f021da1d780 --- M firmware/openocd/openocd.cfg 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/71/16571/1 diff --git a/firmware/openocd/openocd.cfg b/firmware/openocd/openocd.cfg index 9ab657a..4350ec5 100644 --- a/firmware/openocd/openocd.cfg +++ b/firmware/openocd/openocd.cfg @@ -1,2 +1,3 @@ -source [find interface/ftdi/jtagkey.cfg] +set CPUTAPID 0x2ba01477 +source [find interface/stlink.cfg] source [find target/at91sam3sXX.cfg] -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Id156d07b611951d92200dc38a9e11f021da1d780 Gerrit-Change-Number: 16571 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 17:24:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 17:24:13 +0000 Subject: Change in simtrace2[master]: Add missing CR to achieve CRLF at end of log lines References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16572 ) Change subject: Add missing CR to achieve CRLF at end of log lines ...................................................................... Add missing CR to achieve CRLF at end of log lines Change-Id: Ic4afb2981f68811fddb272e64dbddd3397a12642 --- M firmware/libcommon/source/cciddriver.c M firmware/libcommon/source/host_communication.c M firmware/libcommon/source/simtrace_iso7816.c 3 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/72/16572/1 diff --git a/firmware/libcommon/source/cciddriver.c b/firmware/libcommon/source/cciddriver.c index 1dbdf23..dfadd6b 100644 --- a/firmware/libcommon/source/cciddriver.c +++ b/firmware/libcommon/source/cciddriver.c @@ -428,7 +428,7 @@ uint16_t msglen = 0; uint32_t ret; - TRACE_DEBUG("PCtoRDRXfrBlock\n"); + TRACE_DEBUG("PCtoRDRXfrBlock\n\r"); // Check the block length if ( ccidDriver.sCcidCommand.wLength > (configurationDescriptorsFS->ccid.dwMaxCCIDMessageLength-10) ) { @@ -921,7 +921,7 @@ void CCID_SmartCardRequest( void ) { unsigned char bStatus; - TRACE_DEBUG("CCID_req\n"); + TRACE_DEBUG("CCID_req\n\r"); do { diff --git a/firmware/libcommon/source/host_communication.c b/firmware/libcommon/source/host_communication.c index c305b80..d500aed 100644 --- a/firmware/libcommon/source/host_communication.c +++ b/firmware/libcommon/source/host_communication.c @@ -40,10 +40,10 @@ local_irq_save(x); bep->in_progress--; local_irq_restore(x); - TRACE_DEBUG("%u: in_progress=%lu\n", bep->ep, bep->in_progress); + TRACE_DEBUG("%u: in_progress=%lu\r\n", bep->ep, bep->in_progress); if (status != USBD_STATUS_SUCCESS) - TRACE_ERROR("%s error, status=%d\n", __func__, status); + TRACE_ERROR("%s error, status=%d\r\n", __func__, status); usb_buf_free(msg); } @@ -86,13 +86,13 @@ rc = USBD_Write(ep, msgb_data(msg), msgb_length(msg), (TransferCallback) &usb_write_cb, msg); if (rc != USBD_STATUS_SUCCESS) { - TRACE_ERROR("%s error %x\n", __func__, rc); + TRACE_ERROR("%s error %x\r\n", __func__, rc); /* re-insert to head of queue */ llist_add_irqsafe(&msg->list, &bep->queue); local_irq_save(x); bep->in_progress--; local_irq_restore(x); - TRACE_DEBUG("%02x: in_progress=%lu\n", bep->ep, bep->in_progress); + TRACE_DEBUG("%02x: in_progress=%lu\r\n", bep->ep, bep->in_progress); return 0; } @@ -112,7 +112,7 @@ bep->in_progress = 0; if (status != USBD_STATUS_SUCCESS) { - TRACE_ERROR("%s error, status=%d\n", __func__, status); + TRACE_ERROR("%s error, status=%d\r\n", __func__, status); usb_buf_free(msg); return; } @@ -150,7 +150,7 @@ rc = USBD_Read(ep, msg->head, msgb_tailroom(msg), (TransferCallback) &usb_read_cb, msg); if (rc != USBD_STATUS_SUCCESS) { - TRACE_ERROR("%s error %d\n", __func__, rc); + TRACE_ERROR("%s error %d\r\n", __func__, rc); usb_buf_free(msg); bep->in_progress = 0; } diff --git a/firmware/libcommon/source/simtrace_iso7816.c b/firmware/libcommon/source/simtrace_iso7816.c index dc41c08..8742696 100644 --- a/firmware/libcommon/source/simtrace_iso7816.c +++ b/firmware/libcommon/source/simtrace_iso7816.c @@ -71,7 +71,7 @@ USBD_Write(SIMTRACE_USB_EP_PHONE_INT, "R", 1, (TransferCallback) & Callback_PhoneRST_ISR, 0)) != USBD_STATUS_SUCCESS) { - TRACE_ERROR("USB err status: %d (%s)\n", ret, __FUNCTION__); + TRACE_ERROR("USB err status: %d (%s)\r\n", ret, __FUNCTION__); return; } @@ -109,7 +109,7 @@ /* Fill char into buffer */ rbuf_write(&sim_rcv_buf, c); } else { - TRACE_DEBUG("e %x st: %lx\n", c, stat); + TRACE_DEBUG("e %x st: %lx\r\n", c, stat); } /* else: error occurred */ char_stat = stat; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ic4afb2981f68811fddb272e64dbddd3397a12642 Gerrit-Change-Number: 16572 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 17:25:41 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 17:25:41 +0000 Subject: Change in simtrace2[master]: laforge local openocd config In-Reply-To: References: Message-ID: laforge has abandoned this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16571 ) Change subject: laforge local openocd config ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Id156d07b611951d92200dc38a9e11f021da1d780 Gerrit-Change-Number: 16571 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 17:25:45 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 17:25:45 +0000 Subject: Change in simtrace2[master]: stdio: Add support for %p format string (pointer address) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16569 ) Change subject: stdio: Add support for %p format string (pointer address) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16569 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Iecf6c849ce5ef72a8fed9b19a18e215c61c3d09f Gerrit-Change-Number: 16569 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 14 Dec 2019 17:25:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 17:25:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 17:25:47 +0000 Subject: Change in simtrace2[master]: Fix format string related warnings (int vs. long) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16570 ) Change subject: Fix format string related warnings (int vs. long) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I924a16f03e2a099b9f8eb56746bff2b9101c6802 Gerrit-Change-Number: 16570 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 14 Dec 2019 17:25:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 17:25:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 17:25:50 +0000 Subject: Change in simtrace2[master]: Add missing CR to achieve CRLF at end of log lines In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16572 ) Change subject: Add missing CR to achieve CRLF at end of log lines ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ic4afb2981f68811fddb272e64dbddd3397a12642 Gerrit-Change-Number: 16572 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 14 Dec 2019 17:25:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 17:25:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 17:25:53 +0000 Subject: Change in simtrace2[master]: stdio: Add support for %p format string (pointer address) In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16569 ) Change subject: stdio: Add support for %p format string (pointer address) ...................................................................... stdio: Add support for %p format string (pointer address) We actually llready had plrenty of code using %p, despite our stdio not implementing it ;) Change-Id: Iecf6c849ce5ef72a8fed9b19a18e215c61c3d09f --- M firmware/libcommon/source/stdio.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/source/stdio.c b/firmware/libcommon/source/stdio.c index a8612d1..1002c2d 100644 --- a/firmware/libcommon/source/stdio.c +++ b/firmware/libcommon/source/stdio.c @@ -358,6 +358,7 @@ case 'i': num = PutSignedInt(pStr, fill, width, va_arg(ap, signed int)); break; case 'u': num = PutUnsignedInt(pStr, fill, width, va_arg(ap, unsigned int)); break; case 'x': num = PutHexa(pStr, fill, width, 0, va_arg(ap, unsigned int)); break; + case 'p': num = PutHexa(pStr, fill, width, 0, va_arg(ap, unsigned long)); break; case 'X': num = PutHexa(pStr, fill, width, 1, va_arg(ap, unsigned int)); break; case 's': num = PutString(pStr, va_arg(ap, char *)); break; case 'c': num = PutChar(pStr, va_arg(ap, unsigned int)); break; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16569 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Iecf6c849ce5ef72a8fed9b19a18e215c61c3d09f Gerrit-Change-Number: 16569 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 17:25:54 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 17:25:54 +0000 Subject: Change in simtrace2[master]: Fix format string related warnings (int vs. long) In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16570 ) Change subject: Fix format string related warnings (int vs. long) ...................................................................... Fix format string related warnings (int vs. long) Change-Id: I924a16f03e2a099b9f8eb56746bff2b9101c6802 --- M firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c M firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c M firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c M firmware/libcommon/source/host_communication.c M firmware/libcommon/source/simtrace_iso7816.c 5 files changed, 8 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c index 0c288e0..f8925b4 100644 --- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c +++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c @@ -163,7 +163,7 @@ wPage = (dwAddress - IFLASH_ADDR) / IFLASH_PAGE_SIZE; wOffset = (dwAddress - IFLASH_ADDR) % IFLASH_PAGE_SIZE; - TRACE_DEBUG( "Translated 0x%08X to page=%d and offset=%d\n\r", dwAddress, wPage, wOffset ) ; + TRACE_DEBUG( "Translated 0x%08lX to page=%d and offset=%d\n\r", dwAddress, wPage, wOffset ) ; /* Store values */ if ( pEfc ) { diff --git a/firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c index 677ea30..c661b3f 100644 --- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c +++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c @@ -134,7 +134,7 @@ // Store actual page numbers EFC_ComputeAddress( pStartEfc, wActualStartPage, 0, pdwActualStart ) ; EFC_ComputeAddress( pEndEfc, wActualEndPage, 0, pdwActualEnd ) ; - TRACE_DEBUG( "Actual lock range is 0x%06X - 0x%06X\n\r", *pdwActualStart, *pdwActualEnd ) ; + TRACE_DEBUG( "Actual lock range is 0x%06lX - 0x%06lX\n\r", *pdwActualStart, *pdwActualEnd ) ; } diff --git a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c index 4f772be..4467cc9 100644 --- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c +++ b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c @@ -68,7 +68,7 @@ { uint8_t u8 = g_dfu->state; - TRACE_DEBUG("handle_getstate(%u)\n\r", g_dfu->state); + TRACE_DEBUG("handle_getstate(%lu)\n\r", g_dfu->state); USBD_Write(0, (char *)&u8, sizeof(u8), NULL, 0); } diff --git a/firmware/libcommon/source/host_communication.c b/firmware/libcommon/source/host_communication.c index ea573bb..c305b80 100644 --- a/firmware/libcommon/source/host_communication.c +++ b/firmware/libcommon/source/host_communication.c @@ -40,7 +40,7 @@ local_irq_save(x); bep->in_progress--; local_irq_restore(x); - TRACE_DEBUG("%u: in_progress=%d\n", bep->ep, bep->in_progress); + TRACE_DEBUG("%u: in_progress=%lu\n", bep->ep, bep->in_progress); if (status != USBD_STATUS_SUCCESS) TRACE_ERROR("%s error, status=%d\n", __func__, status); @@ -79,7 +79,7 @@ local_irq_restore(x); - TRACE_DEBUG("%s (EP=0x%02x), in_progress=%d\r\n", __func__, ep, bep->in_progress); + TRACE_DEBUG("%s (EP=0x%02x), in_progress=%lu\r\n", __func__, ep, bep->in_progress); msg->dst = bep; @@ -92,7 +92,7 @@ local_irq_save(x); bep->in_progress--; local_irq_restore(x); - TRACE_DEBUG("%02x: in_progress=%d\n", bep->ep, bep->in_progress); + TRACE_DEBUG("%02x: in_progress=%lu\n", bep->ep, bep->in_progress); return 0; } @@ -106,7 +106,7 @@ struct msgb *msg = (struct msgb *) arg; struct usb_buffered_ep *bep = msg->dst; - TRACE_DEBUG("%s (EP=%u, len=%u, q=%p)\r\n", __func__, + TRACE_DEBUG("%s (EP=%u, len=%lu, q=%p)\r\n", __func__, bep->ep, transferred, &bep->queue); bep->in_progress = 0; diff --git a/firmware/libcommon/source/simtrace_iso7816.c b/firmware/libcommon/source/simtrace_iso7816.c index 8ee3f8c..dc41c08 100644 --- a/firmware/libcommon/source/simtrace_iso7816.c +++ b/firmware/libcommon/source/simtrace_iso7816.c @@ -109,7 +109,7 @@ /* Fill char into buffer */ rbuf_write(&sim_rcv_buf, c); } else { - TRACE_DEBUG("e %x st: %x\n", c, stat); + TRACE_DEBUG("e %x st: %lx\n", c, stat); } /* else: error occurred */ char_stat = stat; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I924a16f03e2a099b9f8eb56746bff2b9101c6802 Gerrit-Change-Number: 16570 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 17:28:05 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 17:28:05 +0000 Subject: Change in osmo-hlr[master]: add libosmo-mslookup abstract client In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16202 ) Change subject: add libosmo-mslookup abstract client ...................................................................... Patch Set 19: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I83487ab8aad1611eb02e997dafbcb8344da13df1 Gerrit-Change-Number: 16202 Gerrit-PatchSet: 19 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 14 Dec 2019 17:28:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 17:29:26 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 17:29:26 +0000 Subject: Change in osmo-hlr[master]: add mDNS lookup method to libosmo-mslookup In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16256 ) Change subject: add mDNS lookup method to libosmo-mslookup ...................................................................... Patch Set 10: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I03a0ffa1d4dc1b24ac78a5ad0975bca90a49c728 Gerrit-Change-Number: 16256 Gerrit-PatchSet: 10 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Sat, 14 Dec 2019 17:29:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 17:30:08 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 17:30:08 +0000 Subject: Change in osmo-hlr[master]: add osmo-mslookup-client program In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16203 ) Change subject: add osmo-mslookup-client program ...................................................................... Patch Set 21: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16203/19/src/mslookup/osmo-mslookup-client.c File src/mslookup/osmo-mslookup-client.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16203/19/src/mslookup/osmo-mslookup-client.c at 61 PS19, Line 61: "\n" it's fairy atypical for us to print such extensive help messages interactively. I don't have a strong opinion, but I would guess a man page is more applicable for this. Instead of writing that manpage from hand, one can actually do this in asciidoc these days (and hopefully the same .adoc could then also be transparently imported into our manuals?) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ie68a5c1db04fb4dff00dc3c774a1162f5b9fabf7 Gerrit-Change-Number: 16203 Gerrit-PatchSet: 21 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 14 Dec 2019 17:30:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 17:31:05 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 17:31:05 +0000 Subject: Change in osmo-hlr[master]: contrib/dgsm/ add example esme and dialplan In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16204 ) Change subject: contrib/dgsm/ add example esme and dialplan ...................................................................... Patch Set 21: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I26e8dd8d9a08187fccb3e74ee91366bc24f6c608 Gerrit-Change-Number: 16204 Gerrit-PatchSet: 21 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 14 Dec 2019 17:31:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 17:32:46 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 17:32:46 +0000 Subject: Change in osmo-hlr[master]: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16205 ) Change subject: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name ...................................................................... Patch Set 22: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 Gerrit-Change-Number: 16205 Gerrit-PatchSet: 22 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Sat, 14 Dec 2019 17:32:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 17:36:46 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 17:36:46 +0000 Subject: Change in simtrace2[master]: Add missing CR to achieve CRLF at end of log lines In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16572 ) Change subject: Add missing CR to achieve CRLF at end of log lines ...................................................................... Add missing CR to achieve CRLF at end of log lines Change-Id: Ic4afb2981f68811fddb272e64dbddd3397a12642 --- M firmware/libcommon/source/cciddriver.c M firmware/libcommon/source/host_communication.c M firmware/libcommon/source/simtrace_iso7816.c 3 files changed, 10 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/source/cciddriver.c b/firmware/libcommon/source/cciddriver.c index 1dbdf23..dfadd6b 100644 --- a/firmware/libcommon/source/cciddriver.c +++ b/firmware/libcommon/source/cciddriver.c @@ -428,7 +428,7 @@ uint16_t msglen = 0; uint32_t ret; - TRACE_DEBUG("PCtoRDRXfrBlock\n"); + TRACE_DEBUG("PCtoRDRXfrBlock\n\r"); // Check the block length if ( ccidDriver.sCcidCommand.wLength > (configurationDescriptorsFS->ccid.dwMaxCCIDMessageLength-10) ) { @@ -921,7 +921,7 @@ void CCID_SmartCardRequest( void ) { unsigned char bStatus; - TRACE_DEBUG("CCID_req\n"); + TRACE_DEBUG("CCID_req\n\r"); do { diff --git a/firmware/libcommon/source/host_communication.c b/firmware/libcommon/source/host_communication.c index c305b80..d500aed 100644 --- a/firmware/libcommon/source/host_communication.c +++ b/firmware/libcommon/source/host_communication.c @@ -40,10 +40,10 @@ local_irq_save(x); bep->in_progress--; local_irq_restore(x); - TRACE_DEBUG("%u: in_progress=%lu\n", bep->ep, bep->in_progress); + TRACE_DEBUG("%u: in_progress=%lu\r\n", bep->ep, bep->in_progress); if (status != USBD_STATUS_SUCCESS) - TRACE_ERROR("%s error, status=%d\n", __func__, status); + TRACE_ERROR("%s error, status=%d\r\n", __func__, status); usb_buf_free(msg); } @@ -86,13 +86,13 @@ rc = USBD_Write(ep, msgb_data(msg), msgb_length(msg), (TransferCallback) &usb_write_cb, msg); if (rc != USBD_STATUS_SUCCESS) { - TRACE_ERROR("%s error %x\n", __func__, rc); + TRACE_ERROR("%s error %x\r\n", __func__, rc); /* re-insert to head of queue */ llist_add_irqsafe(&msg->list, &bep->queue); local_irq_save(x); bep->in_progress--; local_irq_restore(x); - TRACE_DEBUG("%02x: in_progress=%lu\n", bep->ep, bep->in_progress); + TRACE_DEBUG("%02x: in_progress=%lu\r\n", bep->ep, bep->in_progress); return 0; } @@ -112,7 +112,7 @@ bep->in_progress = 0; if (status != USBD_STATUS_SUCCESS) { - TRACE_ERROR("%s error, status=%d\n", __func__, status); + TRACE_ERROR("%s error, status=%d\r\n", __func__, status); usb_buf_free(msg); return; } @@ -150,7 +150,7 @@ rc = USBD_Read(ep, msg->head, msgb_tailroom(msg), (TransferCallback) &usb_read_cb, msg); if (rc != USBD_STATUS_SUCCESS) { - TRACE_ERROR("%s error %d\n", __func__, rc); + TRACE_ERROR("%s error %d\r\n", __func__, rc); usb_buf_free(msg); bep->in_progress = 0; } diff --git a/firmware/libcommon/source/simtrace_iso7816.c b/firmware/libcommon/source/simtrace_iso7816.c index dc41c08..8742696 100644 --- a/firmware/libcommon/source/simtrace_iso7816.c +++ b/firmware/libcommon/source/simtrace_iso7816.c @@ -71,7 +71,7 @@ USBD_Write(SIMTRACE_USB_EP_PHONE_INT, "R", 1, (TransferCallback) & Callback_PhoneRST_ISR, 0)) != USBD_STATUS_SUCCESS) { - TRACE_ERROR("USB err status: %d (%s)\n", ret, __FUNCTION__); + TRACE_ERROR("USB err status: %d (%s)\r\n", ret, __FUNCTION__); return; } @@ -109,7 +109,7 @@ /* Fill char into buffer */ rbuf_write(&sim_rcv_buf, c); } else { - TRACE_DEBUG("e %x st: %lx\n", c, stat); + TRACE_DEBUG("e %x st: %lx\r\n", c, stat); } /* else: error occurred */ char_stat = stat; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ic4afb2981f68811fddb272e64dbddd3397a12642 Gerrit-Change-Number: 16572 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 20:14:04 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 20:14:04 +0000 Subject: Change in simtrace2[master]: more comments in host_communication.c. References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16573 ) Change subject: more comments in host_communication.c. ...................................................................... more comments in host_communication.c. Change-Id: I8b0124ec96b56b7c89e4c7033a11cc93c4fa2d26 --- M firmware/libcommon/source/host_communication.c 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/73/16573/1 diff --git a/firmware/libcommon/source/host_communication.c b/firmware/libcommon/source/host_communication.c index d500aed..1e15ada 100644 --- a/firmware/libcommon/source/host_communication.c +++ b/firmware/libcommon/source/host_communication.c @@ -27,7 +27,7 @@ * USBD Integration API ***********************************************************************/ -/* call-back after (successful?) transfer of a buffer */ +/* call-back after (successful?) transfer of a write buffer on IN EP */ static void usb_write_cb(uint8_t *arg, uint8_t status, uint32_t transferred, uint32_t remaining) { @@ -48,6 +48,7 @@ usb_buf_free(msg); } +/* check if the spcified IN endpoint is idle and submit the next buffer from queue */ int usb_refill_to_host(uint8_t ep) { struct usb_buffered_ep *bep = usb_get_buf_ep(ep); @@ -99,7 +100,7 @@ return 1; } -/* call-back after (successful?) transfer of a buffer */ +/* call-back after (successful?) read transfer of a buffer on OUT EP */ static void usb_read_cb(uint8_t *arg, uint8_t status, uint32_t transferred, uint32_t remaining) { @@ -120,6 +121,7 @@ llist_add_tail_irqsafe(&msg->list, &bep->queue); } +/* refill the read queue for data received from host PC on OUT EP, if needed */ int usb_refill_from_host(uint8_t ep) { struct usb_buffered_ep *bep = usb_get_buf_ep(ep); @@ -158,6 +160,7 @@ return 1; } +/* drain any buffers from the queue of the endpoint and release their memory */ int usb_drain_queue(uint8_t ep) { struct usb_buffered_ep *bep = usb_get_buf_ep(ep); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I8b0124ec96b56b7c89e4c7033a11cc93c4fa2d26 Gerrit-Change-Number: 16573 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 20:14:05 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 20:14:05 +0000 Subject: Change in simtrace2[master]: usb_buf: count number of elements in queue References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16574 ) Change subject: usb_buf: count number of elements in queue ...................................................................... usb_buf: count number of elements in queue This is in preparation for limiting the maximum queue length Change-Id: I7cb184d7a1ccb519010a2f3e3295cc3a5fbf8052 --- M firmware/libcommon/include/usb_buf.h M firmware/libcommon/source/card_emu.c M firmware/libcommon/source/host_communication.c M firmware/libcommon/source/usb_buf.c M firmware/libosmocore/include/osmocom/core/msgb.h 5 files changed, 52 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/74/16574/1 diff --git a/firmware/libcommon/include/usb_buf.h b/firmware/libcommon/include/usb_buf.h index bd6947b..3a4eda2 100644 --- a/firmware/libcommon/include/usb_buf.h +++ b/firmware/libcommon/include/usb_buf.h @@ -29,6 +29,8 @@ volatile uint32_t in_progress; /* Tx queue (IN) / Rx queue (OUT) */ struct llist_head queue; + /* current length of queue */ + unsigned int queue_len; }; struct msgb *usb_buf_alloc(uint8_t ep); diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 923226a..f95f5d1 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -260,18 +260,18 @@ while (!msg) { msg = usb_buf_alloc(ep); // try to allocate some memory if (!msg) { // allocation failed, we might be out of memory - struct llist_head *queue = usb_get_queue(ep); - if (!queue) { + struct usb_buffered_ep *bep = usb_get_buf_ep(ep); + if (!bep) { TRACE_ERROR("ep %u: %s queue does not exist\n\r", ep, __func__); return NULL; } - if (llist_empty(queue)) { + if (llist_empty(&bep->queue)) { TRACE_ERROR("ep %u: %s EOMEM (queue already empty)\n\r", ep, __func__); return NULL; } - msg = msgb_dequeue(queue); + msg = msgb_dequeue_count(&bep->queue, &bep->queue_len); if (!msg) { TRACE_ERROR("ep %u: %s no msg in non-empty queue\n\r", ep, __func__); diff --git a/firmware/libcommon/source/host_communication.c b/firmware/libcommon/source/host_communication.c index 1e15ada..0e496c5 100644 --- a/firmware/libcommon/source/host_communication.c +++ b/firmware/libcommon/source/host_communication.c @@ -76,7 +76,7 @@ bep->in_progress++; - msg = msgb_dequeue(&bep->queue); + msg = msgb_dequeue_count(&bep->queue, &bep->queue_len); local_irq_restore(x); @@ -180,7 +180,7 @@ } /* free all queued msgbs */ - while ((msg = msgb_dequeue(&bep->queue))) { + while ((msg = msgb_dequeue_count(&bep->queue, &bep->queue_len))) { usb_buf_free(msg); ret++; } diff --git a/firmware/libcommon/source/usb_buf.c b/firmware/libcommon/source/usb_buf.c index 418569e..8ad5a0e 100644 --- a/firmware/libcommon/source/usb_buf.c +++ b/firmware/libcommon/source/usb_buf.c @@ -78,7 +78,7 @@ /* no need for irqsafe operation, as the usb_tx_queue is * processed only by the main loop context */ - msgb_enqueue(&ep->queue, msg); + msgb_enqueue_count(&ep->queue, msg, &ep->queue_len); return 0; } diff --git a/firmware/libosmocore/include/osmocom/core/msgb.h b/firmware/libosmocore/include/osmocom/core/msgb.h index afb887c..7c4420d 100644 --- a/firmware/libosmocore/include/osmocom/core/msgb.h +++ b/firmware/libosmocore/include/osmocom/core/msgb.h @@ -80,6 +80,49 @@ extern struct msgb *msgb_copy(const struct msgb *msg, const char *name); static int msgb_test_invariant(const struct msgb *msg) __attribute__((pure)); +/*! Free all msgbs from a queue built with msgb_enqueue(). + * \param[in] queue list head of a msgb queue. + */ +static inline void msgb_queue_free(struct llist_head *queue) +{ + struct msgb *msg; + while ((msg = msgb_dequeue(queue))) msgb_free(msg); +} + +/*! Enqueue message buffer to tail of a queue and increment queue size counter + * \param[in] queue linked list header of queue + * \param[in] msg message buffer to be added to the queue + * \param[in] count pointer to variable holding size of the queue + * + * The function will append the specified message buffer \a msg to the queue + * implemented by \ref llist_head \a queue using function \ref msgb_enqueue_count, + * then increment \a count + */ +static inline void msgb_enqueue_count(struct llist_head *queue, struct msgb *msg, + unsigned int *count) +{ + msgb_enqueue(queue, msg); + (*count)++; +} + +/*! Dequeue message buffer from head of queue and decrement queue size counter + * \param[in] queue linked list header of queue + * \param[in] count pointer to variable holding size of the queue + * \returns message buffer (if any) or NULL if queue empty + * + * The function will remove the first message buffer from the queue + * implemented by \ref llist_head \a queue using function \ref msgb_enqueue_count, + * and decrement \a count, all if queue is not empty. + */ +static inline struct msgb *msgb_dequeue_count(struct llist_head *queue, + unsigned int *count) +{ + struct msgb *msg = msgb_dequeue(queue); + if (msg) + (*count)--; + return msg; +} + #ifdef MSGB_DEBUG #include #define MSGB_ABORT(msg, fmt, args ...) do { \ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I7cb184d7a1ccb519010a2f3e3295cc3a5fbf8052 Gerrit-Change-Number: 16574 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 20:14:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 20:14:06 +0000 Subject: Change in simtrace2[master]: usb_buf: Limit the maximum queue length to 3 elements References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16575 ) Change subject: usb_buf: Limit the maximum queue length to 3 elements ...................................................................... usb_buf: Limit the maximum queue length to 3 elements If there are already three elements in the to-be-transmitted queue for the EP, let's free the first element of the queue. This is a clear indication that the USB host is not polling the endpoint regularly. Maybe there's no host application running at all? This should obsolete Change-Id Ie9ebdd2ff966f67c9afd1ed760f106558f0091ad Change-Id: Ie15183f16b22193ffdaf01845db2eae4c7f43c17 Closes: OS#4251 --- M firmware/libcommon/source/usb_buf.c 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/75/16575/1 diff --git a/firmware/libcommon/source/usb_buf.c b/firmware/libcommon/source/usb_buf.c index 8ad5a0e..b584ad6 100644 --- a/firmware/libcommon/source/usb_buf.c +++ b/firmware/libcommon/source/usb_buf.c @@ -24,6 +24,7 @@ #include #define USB_ALLOC_SIZE 280 +#define USB_MQX_QLEN 3 static struct usb_buffered_ep usb_buffered_ep[BOARD_USB_NUMENDPOINTS]; @@ -78,6 +79,17 @@ /* no need for irqsafe operation, as the usb_tx_queue is * processed only by the main loop context */ + + if (ep->queue_len > USB_MQX_QLEN) { + struct msgb *evict; + /* free the first pending buffer in the queue */ + TRACE_INFO("EP%02x: dropping first queue element (qlen=%u)\r\n", + ep->ep, ep->queue_len); + evict = msgb_dequeue_count(&ep->queue, &ep->queue_len); + OSMO_ASSERT(evict); + usb_buf_free(evict); + } + msgb_enqueue_count(&ep->queue, msg, &ep->queue_len); return 0; } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie15183f16b22193ffdaf01845db2eae4c7f43c17 Gerrit-Change-Number: 16575 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 20:14:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 20:14:06 +0000 Subject: Change in simtrace2[master]: OSMO_ASSERT() on double-free or invalid pointer References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16576 ) Change subject: OSMO_ASSERT() on double-free or invalid pointer ...................................................................... OSMO_ASSERT() on double-free or invalid pointer Change-Id: I2ab8fb7b86b6f608bbd9c4f79369c64cbad88bdf --- M firmware/libcommon/source/pseudo_talloc.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/76/16576/1 diff --git a/firmware/libcommon/source/pseudo_talloc.c b/firmware/libcommon/source/pseudo_talloc.c index 862fffd..72303dc 100644 --- a/firmware/libcommon/source/pseudo_talloc.c +++ b/firmware/libcommon/source/pseudo_talloc.c @@ -63,6 +63,7 @@ if (ptr == msgb_data[i]) { if (!msgb_inuse[i]) { TRACE_ERROR("%s: double_free by %s\r\n", __func__, location); + OSMO_ASSERT(0); } else { msgb_inuse[i] = 0; } @@ -73,6 +74,7 @@ local_irq_restore(x); TRACE_ERROR("%s: invalid pointer %p from %s\r\n", __func__, ptr, location); + OSMO_ASSERT(0); return -1; } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16576 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2ab8fb7b86b6f608bbd9c4f79369c64cbad88bdf Gerrit-Change-Number: 16576 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 20:14:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 20:14:07 +0000 Subject: Change in simtrace2[master]: qmod: Don't print EEPROM operations in help when not supported References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16577 ) Change subject: qmod: Don't print EEPROM operations in help when not supported ...................................................................... qmod: Don't print EEPROM operations in help when not supported As of Change-Id I1c8cca2f7f0f0070d7bf1ade676e035c45e4d5ab, a firmware compiled without ALLOW_PEER_ERASE will not support resetting the hub or writing to its EEPROM. Let's make sure to remove those options also from the menu. Change-Id: I3071332d85e6168947384ddc230298d3293e4668 --- M firmware/libboard/qmod/source/board_qmod.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/77/16577/1 diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c index 0b03180..900a3bc 100644 --- a/firmware/libboard/qmod/source/board_qmod.c +++ b/firmware/libboard/qmod/source/board_qmod.c @@ -205,13 +205,17 @@ printf("\tg\tswitch off LED 2\n\r"); printf("\tG\tswitch off LED 2\n\r"); if (qmod_sam3_is_12()) { +#if (ALLOW_PEER_ERASE > 0) printf("\tE\tprogram EEPROM\n\r"); printf("\te\tErase EEPROM\n\r"); +#endif printf("\tO\tEnable PRTPWR_OVERRIDE\n\r"); printf("\to\tDisable PRTPWR_OVERRIDE\n\r"); +#if (ALLOW_PEER_ERASE > 0) printf("\tH\tRelease HUB RESET (high)\n\r"); printf("\th\tAssert HUB RESET (low)\n\r"); printf("\tw\tWrite single byte in EEPROM\n\r"); +#endif printf("\tr\tRead single byte from EEPROM\n\r"); } printf("\tX\tRelease peer SAM3 from reset\n\r"); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I3071332d85e6168947384ddc230298d3293e4668 Gerrit-Change-Number: 16577 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 20:14:08 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 20:14:08 +0000 Subject: Change in simtrace2[master]: cosmetic: board_qmod: Annotate #endif with comments References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16578 ) Change subject: cosmetic: board_qmod: Annotate #endif with comments ...................................................................... cosmetic: board_qmod: Annotate #endif with comments Change-Id: I2e2de6c65d791767637b9c43a1c0ff9cbeabf5e9 --- M firmware/libboard/qmod/source/board_qmod.c 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/78/16578/1 diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c index 900a3bc..b3979f4 100644 --- a/firmware/libboard/qmod/source/board_qmod.c +++ b/firmware/libboard/qmod/source/board_qmod.c @@ -194,7 +194,7 @@ this is done to prevent accidental ERASE on noisy serial input since only one character can trigger the ERASE. */ static bool allow_erase = false; -#endif +#endif /* ALLOW_PEER_ERASE */ switch (ch) { case '?': @@ -208,14 +208,14 @@ #if (ALLOW_PEER_ERASE > 0) printf("\tE\tprogram EEPROM\n\r"); printf("\te\tErase EEPROM\n\r"); -#endif +#endif /* ALLOW_PEER_ERASE */ printf("\tO\tEnable PRTPWR_OVERRIDE\n\r"); printf("\to\tDisable PRTPWR_OVERRIDE\n\r"); #if (ALLOW_PEER_ERASE > 0) printf("\tH\tRelease HUB RESET (high)\n\r"); printf("\th\tAssert HUB RESET (low)\n\r"); printf("\tw\tWrite single byte in EEPROM\n\r"); -#endif +#endif /* ALLOW_PEER_ERASE */ printf("\tr\tRead single byte from EEPROM\n\r"); } printf("\tX\tRelease peer SAM3 from reset\n\r"); @@ -224,7 +224,7 @@ printf("\tY\tRelease peer SAM3 ERASE signal\n\r"); printf("\ta\tAllow asserting peer SAM3 ERASE signal\n\r"); printf("\ty\tAssert peer SAM3 ERASE signal\n\r"); -#endif +#endif /* ALLOW_PEER_ERASE */ printf("\tU\tProceed to USB Initialization\n\r"); printf("\t1\tGenerate 1ms reset pulse on WWAN1\n\r"); printf("\t2\tGenerate 1ms reset pulse on WWAN2\n\r"); @@ -275,7 +275,7 @@ printf("Please first allow setting SIMTRACExx_ERASE\n\r"); } break; -#endif +#endif /* ALLOW_PEER_ERASE */ case '1': printf("Resetting Modem 1 (of this SAM3)\n\r"); wwan_perst_do_reset_pulse(0, 300); @@ -303,7 +303,7 @@ if ('a' != ch) { allow_erase = false; } -#endif +#endif /* ALLOW_PEER_ERASE */ } void board_main_top(void) -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2e2de6c65d791767637b9c43a1c0ff9cbeabf5e9 Gerrit-Change-Number: 16578 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 20:14:09 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 20:14:09 +0000 Subject: Change in simtrace2[master]: qmod: Document '!' and '@' commands on UART References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16579 ) Change subject: qmod: Document '!' and '@' commands on UART ...................................................................... qmod: Document '!' and '@' commands on UART Change-Id: I38c69ef45e92fd0aa03907e984cf524331b53d57 --- M firmware/libboard/qmod/source/board_qmod.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/79/16579/1 diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c index b3979f4..6316979 100644 --- a/firmware/libboard/qmod/source/board_qmod.c +++ b/firmware/libboard/qmod/source/board_qmod.c @@ -228,6 +228,8 @@ printf("\tU\tProceed to USB Initialization\n\r"); printf("\t1\tGenerate 1ms reset pulse on WWAN1\n\r"); printf("\t2\tGenerate 1ms reset pulse on WWAN2\n\r"); + printf("\t!\tSwitch Channel A from physical -> remote\n\r"); + printf("\t@\tSwitch Channel B from physical -> remote\n\r"); break; case 'R': printf("Asking NVIC to reset us\n\r"); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I38c69ef45e92fd0aa03907e984cf524331b53d57 Gerrit-Change-Number: 16579 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 20:14:09 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 20:14:09 +0000 Subject: Change in simtrace2[master]: implement minimalistic talloc_report(); add 't' command on UART References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16580 ) Change subject: implement minimalistic talloc_report(); add 't' command on UART ...................................................................... implement minimalistic talloc_report(); add 't' command on UART This helps when debugging the firmware, as it shows the current utliization of the 10-msgb-talloc pool. Change-Id: Ib10c4396cd4c9c4a6257cf45886e367214787927 --- M firmware/libboard/qmod/source/board_qmod.c M firmware/libcommon/include/talloc.h M firmware/libcommon/source/pseudo_talloc.c 3 files changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/80/16580/1 diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c index 6316979..32bfdd4 100644 --- a/firmware/libboard/qmod/source/board_qmod.c +++ b/firmware/libboard/qmod/source/board_qmod.c @@ -230,6 +230,7 @@ printf("\t2\tGenerate 1ms reset pulse on WWAN2\n\r"); printf("\t!\tSwitch Channel A from physical -> remote\n\r"); printf("\t@\tSwitch Channel B from physical -> remote\n\r"); + printf("\tt\t(pseudo)talloc report\n\r"); break; case 'R': printf("Asking NVIC to reset us\n\r"); @@ -292,6 +293,9 @@ case '@': sim_switch_use_physical(0, 0); break; + case 't': + talloc_report(NULL, stdout); + break; default: if (!qmod_sam3_is_12()) printf("Unknown command '%c'\n\r", ch); diff --git a/firmware/libcommon/include/talloc.h b/firmware/libcommon/include/talloc.h index 0bd75d2..625355a 100644 --- a/firmware/libcommon/include/talloc.h +++ b/firmware/libcommon/include/talloc.h @@ -17,6 +17,7 @@ #pragma once #include +#include #include /* minimalistic emulation of core talloc API functions used by msgb.c */ @@ -39,3 +40,4 @@ void talloc_set_name_const(const void *ptr, const char *name); char *talloc_strdup(const void *t, const char *p); void *talloc_pool(const void *context, size_t size); +void talloc_report(const void *ptr, FILE *f); diff --git a/firmware/libcommon/source/pseudo_talloc.c b/firmware/libcommon/source/pseudo_talloc.c index 72303dc..c0503ff 100644 --- a/firmware/libcommon/source/pseudo_talloc.c +++ b/firmware/libcommon/source/pseudo_talloc.c @@ -15,6 +15,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA */ #include +#include #include "talloc.h" #include "trace.h" @@ -78,6 +79,20 @@ return -1; } +void talloc_report(const void *ptr, FILE *f) +{ + unsigned int i; + + fprintf(f, "talloc_report(): "); + for (i = 0; i < ARRAY_SIZE(msgb_inuse); i++) { + if (msgb_inuse[i]) + fputc('X', f); + else + fputc('_', f); + } + fprintf(f, "\r\n"); +} + void talloc_set_name_const(const void *ptr, const char *name) { /* do nothing */ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ib10c4396cd4c9c4a6257cf45886e367214787927 Gerrit-Change-Number: 16580 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 20:14:10 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 20:14:10 +0000 Subject: Change in simtrace2[master]: update copyright statement References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16581 ) Change subject: update copyright statement ...................................................................... update copyright statement Change-Id: I6ffced85cf2398bbf6dcc3123accb5610e766f61 --- M firmware/apps/cardem/main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/81/16581/1 diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c index 3c5a32c..2f7bcd5 100644 --- a/firmware/apps/cardem/main.c +++ b/firmware/apps/cardem/main.c @@ -159,7 +159,7 @@ printf("\n\r\n\r" "=============================================================================\n\r" "SIMtrace2 firmware " GIT_VERSION "\n\r" - "(C) 2010-2017 by Harald Welte, 2018-2019 by Kevin Redon\n\r" + "(C) 2010-2019 by Harald Welte, 2018-2019 by Kevin Redon\n\r" "=============================================================================\n\r"); #if (TRACE_LEVEL >= TRACE_LEVEL_INFO) -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I6ffced85cf2398bbf6dcc3123accb5610e766f61 Gerrit-Change-Number: 16581 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 20:16:02 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 20:16:02 +0000 Subject: Change in simtrace2[master]: more comments in host_communication.c. In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16573 ) Change subject: more comments in host_communication.c. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I8b0124ec96b56b7c89e4c7033a11cc93c4fa2d26 Gerrit-Change-Number: 16573 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 14 Dec 2019 20:16:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 20:22:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 20:22:50 +0000 Subject: Change in simtrace2[master]: usb_buf: count number of elements in queue In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/16574 to look at the new patch set (#2). Change subject: usb_buf: count number of elements in queue ...................................................................... usb_buf: count number of elements in queue This is in preparation for limiting the maximum queue length Change-Id: I7cb184d7a1ccb519010a2f3e3295cc3a5fbf8052 --- M firmware/libcommon/include/usb_buf.h M firmware/libcommon/source/card_emu.c M firmware/libcommon/source/host_communication.c M firmware/libcommon/source/usb_buf.c M firmware/libosmocore/include/osmocom/core/msgb.h M firmware/test/card_emu_tests.c 6 files changed, 58 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/74/16574/2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I7cb184d7a1ccb519010a2f3e3295cc3a5fbf8052 Gerrit-Change-Number: 16574 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:07:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:07:30 +0000 Subject: Change in simtrace2[master]: usb_buf: count number of elements in queue In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/16574 to look at the new patch set (#3). Change subject: usb_buf: count number of elements in queue ...................................................................... usb_buf: count number of elements in queue This is in preparation for limiting the maximum queue length Change-Id: I7cb184d7a1ccb519010a2f3e3295cc3a5fbf8052 Related: OS#4251 --- M firmware/libcommon/include/usb_buf.h M firmware/libcommon/source/card_emu.c M firmware/libcommon/source/host_communication.c M firmware/libcommon/source/usb_buf.c M firmware/libosmocore/include/osmocom/core/msgb.h M firmware/test/card_emu_tests.c 6 files changed, 58 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/74/16574/3 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I7cb184d7a1ccb519010a2f3e3295cc3a5fbf8052 Gerrit-Change-Number: 16574 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:07:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:07:30 +0000 Subject: Change in simtrace2[master]: usb_buf: Limit the maximum queue length to 3 elements In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/16575 to look at the new patch set (#3). Change subject: usb_buf: Limit the maximum queue length to 3 elements ...................................................................... usb_buf: Limit the maximum queue length to 3 elements If there are already three elements in the to-be-transmitted queue for the EP, let's free the first element of the queue. This is a clear indication that the USB host is not polling the endpoint regularly. Maybe there's no host application running at all? This should obsolete Change-Id Ie9ebdd2ff966f67c9afd1ed760f106558f0091ad Change-Id: Ie15183f16b22193ffdaf01845db2eae4c7f43c17 Closes: OS#4251 --- M firmware/libcommon/source/usb_buf.c 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/75/16575/3 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie15183f16b22193ffdaf01845db2eae4c7f43c17 Gerrit-Change-Number: 16575 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:07:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:07:30 +0000 Subject: Change in simtrace2[master]: implement minimalistic talloc_report(); add 't' command on UART In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/16580 to look at the new patch set (#3). Change subject: implement minimalistic talloc_report(); add 't' command on UART ...................................................................... implement minimalistic talloc_report(); add 't' command on UART This helps when debugging the firmware, as it shows the current utliization of the 10-msgb-talloc pool. Change-Id: Ib10c4396cd4c9c4a6257cf45886e367214787927 Related: OS#4251 --- M firmware/libboard/qmod/source/board_qmod.c M firmware/libcommon/include/talloc.h M firmware/libcommon/source/pseudo_talloc.c 3 files changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/80/16580/3 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ib10c4396cd4c9c4a6257cf45886e367214787927 Gerrit-Change-Number: 16580 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:07:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:07:33 +0000 Subject: Change in simtrace2[master]: card_emu: Factor out card_handle_reset() from card_emu_init() References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16582 ) Change subject: card_emu: Factor out card_handle_reset() from card_emu_init() ...................................................................... card_emu: Factor out card_handle_reset() from card_emu_init() Let's move all initialization of state that may change at runtime to a separate function: card_handle_reset(). This has the advantage that the related function may also be called at later/other instances, not just during initialization of card_emu. Change-Id: I0954d192d001a3af5592010cc84a3a22aaf4b030 Related: OS#4251 --- M firmware/libcommon/source/card_emu.c 1 file changed, 30 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/82/16582/1 diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index f95f5d1..3f2cb7b 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -1,6 +1,6 @@ /* ISO7816-3 state machine for the card side * - * (C) 2010-2017 by Harald Welte + * (C) 2010-2019 by Harald Welte * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * This program is free software; you can redistribute it and/or modify @@ -233,6 +233,33 @@ } stats; }; +/* reset all the 'dynamic' state of the card handle to the initial/default values */ +static void card_handle_reset(struct card_handle *ch) +{ + struct msgb *msg; + + ch->fi = 1; + ch->di = 1; + ch->wi = ISO7816_3_DEFAULT_WI; + ch->waiting_time = ISO7816_3_INIT_WTIME; + ch->atr.idx = 0; + ch->pts.state = PTS_S_WAIT_REQ_PTSS; + ch->tpdu.state = TPDU_S_WAIT_CLA; + + /* release any buffers we may still own */ + if (ch->uart_tx_msg) { + usb_buf_free(ch->uart_tx_msg); + ch->uart_tx_msg = NULL; + } + if (ch->uart_rx_msg) { + usb_buf_free(ch->uart_rx_msg); + ch->uart_rx_msg = NULL; + } + while ((msg = msgb_dequeue(&ch->uart_tx_queue))) { + usb_buf_free(msg); + } +} + struct llist_head *card_emu_get_uart_tx_queue(struct card_handle *ch) { return &ch->uart_tx_queue; @@ -1177,22 +1204,15 @@ ch->in_reset = in_reset; ch->clocked = clocked; - ch->fi = 0; - ch->di = 1; - ch->wi = ISO7816_3_DEFAULT_WI; - ch->tc_chan = tc_chan; ch->uart_chan = uart_chan; - ch->waiting_time = ISO7816_3_INIT_WTIME; - ch->atr.idx = 0; ch->atr.len = sizeof(default_atr); memcpy(ch->atr.atr, default_atr, ch->atr.len); - ch->pts.state = PTS_S_WAIT_REQ_PTSS; - ch->tpdu.state = TPDU_S_WAIT_CLA; - tc_etu_init(ch->tc_chan, ch); + card_handle_reset(ch); + return ch; } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I0954d192d001a3af5592010cc84a3a22aaf4b030 Gerrit-Change-Number: 16582 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:07:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:07:33 +0000 Subject: Change in simtrace2[master]: cardem: Move card_emu_io_statechg() calls out of interrupt context References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16583 ) Change subject: cardem: Move card_emu_io_statechg() calls out of interrupt context ...................................................................... cardem: Move card_emu_io_statechg() calls out of interrupt context So far, we called card_emu_io_statechg() from interrupt context, which was safe with the current code. However, as we want to trigger a more comprehensive reset of data structures, including the flushing of message queues, it is best to shift this processing from interrupt context to main loop context. Change-Id: I3983078396538f32bdff55611c41d2163be4d796 Related: OS#4251 --- M firmware/libcommon/source/mode_cardemu.c 1 file changed, 51 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/83/16583/1 diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c index 704e6ba..7b13c4a 100644 --- a/firmware/libcommon/source/mode_cardemu.c +++ b/firmware/libcommon/source/mode_cardemu.c @@ -60,8 +60,13 @@ uint8_t ep_in; uint8_t ep_int; const Pin pin_insert; +#ifdef DETECT_VCC_BY_ADC uint32_t vcc_uv; - uint32_t vcc_uv_last; +#endif + bool vcc_active; + bool vcc_active_last; + bool rst_active; + bool rst_active_last; }; struct cardem_inst cardem_inst[] = { @@ -261,7 +266,7 @@ #ifdef DETECT_VCC_BY_ADC -static int adc_triggered = 0; +static volatile int adc_triggered = 0; static int adc_sam3s_reva_errata = 0; static int card_vcc_adc_init(void) @@ -313,18 +318,10 @@ static void process_vcc_adc(struct cardem_inst *ci) { - if (ci->vcc_uv >= VCC_UV_THRESH_3V && - ci->vcc_uv_last < VCC_UV_THRESH_3V) { - card_emu_io_statechg(ci->ch, CARD_IO_VCC, 1); - /* FIXME do this for real */ - card_emu_io_statechg(ci->ch, CARD_IO_CLK, 1); - } else if (ci->vcc_uv < VCC_UV_THRESH_3V && - ci->vcc_uv_last >= VCC_UV_THRESH_3V) { - /* FIXME do this for real */ - card_emu_io_statechg(ci->ch, CARD_IO_CLK, 0); - card_emu_io_statechg(ci->ch, CARD_IO_VCC, 0); - } - ci->vcc_uv_last = ci->vcc_uv; + if (ci->vcc_uv >= VCC_UV_THRESH_3V) + ci->vcc_active = true; + else + ci->vcc_active = false; } void ADC_IrqHandler(void) @@ -347,44 +344,54 @@ cardem_inst[0].vcc_uv = adc2uv(val); process_vcc_adc(&cardem_inst[0]); ADC->ADC_CR |= ADC_CR_START; + adc_triggered = 1; } } #endif /* DETECT_VCC_BY_ADC */ + +/* called from main loop; dispatches card I/O state changes to card_emu from main loop */ +static void process_io_statechg(struct cardem_inst *ci) +{ + if (ci->vcc_active != ci->vcc_active_last) { + card_emu_io_statechg(ci->ch, CARD_IO_VCC, ci->vcc_active); + /* FIXME do this for real */ + card_emu_io_statechg(ci->ch, CARD_IO_CLK, ci->vcc_active); + ci->vcc_active_last = ci->vcc_active; + } + + if (ci->rst_active != ci->rst_active_last) { + card_emu_io_statechg(ci->ch, CARD_IO_RST, ci->rst_active); + ci->rst_active_last = ci->rst_active; + } +} + /*********************************************************************** * Core USB / main loop integration ***********************************************************************/ static void usim1_rst_irqhandler(const Pin *pPin) { - bool active = PIO_Get(&pin_usim1_rst) ? false : true; - card_emu_io_statechg(cardem_inst[0].ch, CARD_IO_RST, active); + cardem_inst[0].rst_active = PIO_Get(&pin_usim1_rst) ? false : true; } #ifndef DETECT_VCC_BY_ADC static void usim1_vcc_irqhandler(const Pin *pPin) { - bool active = PIO_Get(&pin_usim1_vcc) ? true : false; - card_emu_io_statechg(cardem_inst[0].ch, CARD_IO_VCC, active); - /* FIXME do this for real */ - card_emu_io_statechg(cardem_inst[0].ch, CARD_IO_CLK, active); + cardem_inst[0].vcc_active = PIO_Get(&pin_usim1_vcc) ? true : false; } #endif /* !DETECT_VCC_BY_ADC */ #ifdef CARDEMU_SECOND_UART static void usim2_rst_irqhandler(const Pin *pPin) { - bool active = PIO_Get(&pin_usim2_rst) ? false : true; - card_emu_io_statechg(cardem_inst[1].ch, CARD_IO_RST, active); + cardem_inst[1].rst_active = PIO_Get(&pin_usim2_rst) ? false : true; } #ifndef DETECT_VCC_BY_ADC static void usim2_vcc_irqhandler(const Pin *pPin) { - bool active = PIO_Get(&pin_usim2_vcc) ? true : false; - card_emu_io_statechg(cardem_inst[1].ch, CARD_IO_VCC, active); - /* FIXME do this for real */ - card_emu_io_statechg(cardem_inst[1].ch, CARD_IO_CLK, active); + cardem_inst[1].vcc_active = PIO_Get(&pin_usim2_vcc) ? true : false; } #endif /* !DETECT_VCC_BY_ADC */ #endif /* CARDEMU_SECOND_UART */ @@ -416,11 +423,18 @@ NVIC_EnableIRQ(USART1_IRQn); PIO_ConfigureIt(&pin_usim1_rst, usim1_rst_irqhandler); PIO_EnableIt(&pin_usim1_rst); + usim1_rst_irqhandler(&pin_usim1_rst); /* obtain current RST state */ #ifndef DETECT_VCC_BY_ADC PIO_ConfigureIt(&pin_usim1_vcc, usim1_vcc_irqhandler); PIO_EnableIt(&pin_usim1_vcc); + usim1_vcc_irqhandler(&pin_usim1_vcc); /* obtain current VCC state */ +#else + do {} while (!adc_triggered); /* wait for first ADC reading */ #endif /* DETECT_VCC_BY_ADC */ - cardem_inst[0].ch = card_emu_init(0, 2, 0, SIMTRACE_CARDEM_USB_EP_USIM1_DATAIN, SIMTRACE_CARDEM_USB_EP_USIM1_INT, PIO_Get(&pin_usim1_vcc) ? true : false, PIO_Get(&pin_usim1_rst) ? false : true, PIO_Get(&pin_usim1_vcc) ? true : false); + + cardem_inst[0].ch = card_emu_init(0, 2, 0, SIMTRACE_CARDEM_USB_EP_USIM1_DATAIN, + SIMTRACE_CARDEM_USB_EP_USIM1_INT, cardem_inst[0].vcc_active, + cardem_inst[0].rst_active, cardem_inst[0].vcc_active); sim_switch_use_physical(0, 1); #ifdef CARDEMU_SECOND_UART @@ -431,11 +445,18 @@ NVIC_EnableIRQ(USART0_IRQn); PIO_ConfigureIt(&pin_usim2_rst, usim2_rst_irqhandler); PIO_EnableIt(&pin_usim2_rst); + usim2_rst_irqhandler(&pin_usim2_rst); /* obtain current RST state */ #ifndef DETECT_VCC_BY_ADC PIO_ConfigureIt(&pin_usim2_vcc, usim2_vcc_irqhandler); PIO_EnableIt(&pin_usim2_vcc); + usim2_vcc_irqhandler(&pin_usim2_vcc); /* obtain current VCC state */ +#else + do {} while (!adc_triggered); /* wait for first ADC reading */ #endif /* DETECT_VCC_BY_ADC */ - cardem_inst[1].ch = card_emu_init(1, 0, 1, SIMTRACE_CARDEM_USB_EP_USIM2_DATAIN, SIMTRACE_CARDEM_USB_EP_USIM2_INT, PIO_Get(&pin_usim2_vcc) ? true : false, PIO_Get(&pin_usim2_rst) ? false : true, PIO_Get(&pin_usim2_vcc) ? true : false); + + cardem_inst[1].ch = card_emu_init(1, 0, 1, SIMTRACE_CARDEM_USB_EP_USIM2_DATAIN, + SIMTRACE_CARDEM_USB_EP_USIM2_INT, cardem_inst[1].vcc_active, + cardem_inst[1].rst_active, cardem_inst[1].vcc_active); sim_switch_use_physical(1, 1); #endif /* CARDEMU_SECOND_UART */ } @@ -714,6 +735,8 @@ //TRACE_ERROR("%uRx%02x\r\n", i, byte); } + process_io_statechg(ci); + /* first try to send any pending messages on IRQ */ usb_refill_to_host(ci->ep_int); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16583 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I3983078396538f32bdff55611c41d2163be4d796 Gerrit-Change-Number: 16583 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:07:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:07:33 +0000 Subject: Change in simtrace2[master]: cardem: RST resets all state (including release of buffers) References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16584 ) Change subject: cardem: RST resets all state (including release of buffers) ...................................................................... cardem: RST resets all state (including release of buffers) When the Modem is asserting RST, the emulated card should set all of its state back to default/initial values and release any buffers it may still hold in its state. Change-Id: I66eca6afe4ff7d900c5b75df1e3ec6d52f6ef214 Related: OS#4251 --- M firmware/libcommon/source/card_emu.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/84/16584/1 diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 3f2cb7b..c3884a6 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -1112,6 +1112,7 @@ } else if (active && !ch->in_reset) { TRACE_INFO("%u: RST asserted\r\n", ch->num); tc_etu_disable(ch->tc_chan); + card_handle_reset(ch); } ch->in_reset = active; break; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I66eca6afe4ff7d900c5b75df1e3ec6d52f6ef214 Gerrit-Change-Number: 16584 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:26:25 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:26:25 +0000 Subject: Change in simtrace2[master]: cardem: Fix memory leak on unsupported SIMTRACE_MSGT_DT_CEMU_CARDINSERT References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16585 ) Change subject: cardem: Fix memory leak on unsupported SIMTRACE_MSGT_DT_CEMU_CARDINSERT ...................................................................... cardem: Fix memory leak on unsupported SIMTRACE_MSGT_DT_CEMU_CARDINSERT Some boards like QMOD cannot simulate a virtual card insert signal towards the modem (as the mPCIe connector doesn't have that signal). In these situations, we were aborting processing of the related OUT endpoint command and forgot to release the related memory. Change-Id: I489097b7e332004e0f2beca0b22fa36d5d1d31b5 Related: OS#4251 --- M firmware/libcommon/source/mode_cardemu.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/85/16585/1 diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c index 704e6ba..1669c2d 100644 --- a/firmware/libcommon/source/mode_cardemu.c +++ b/firmware/libcommon/source/mode_cardemu.c @@ -505,6 +505,7 @@ if (!ci->pin_insert.pio) { TRACE_INFO("%u: skipping unsupported card_insert to %s\r\n", ci->num, cardins->card_insert ? "INSERTED" : "REMOVED"); + usb_buf_free(msg); break; } TRACE_INFO("%u: set card_insert to %s\r\n", ci->num, -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16585 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I489097b7e332004e0f2beca0b22fa36d5d1d31b5 Gerrit-Change-Number: 16585 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:29:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:29:12 +0000 Subject: Change in simtrace2[master]: usb_buf: count number of elements in queue In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16574 ) Change subject: usb_buf: count number of elements in queue ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I7cb184d7a1ccb519010a2f3e3295cc3a5fbf8052 Gerrit-Change-Number: 16574 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 14 Dec 2019 22:29:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:29:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:29:35 +0000 Subject: Change in simtrace2[master]: usb_buf: Limit the maximum queue length to 3 elements In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16575 ) Change subject: usb_buf: Limit the maximum queue length to 3 elements ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie15183f16b22193ffdaf01845db2eae4c7f43c17 Gerrit-Change-Number: 16575 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 14 Dec 2019 22:29:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:29:46 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:29:46 +0000 Subject: Change in simtrace2[master]: qmod: Don't print EEPROM operations in help when not supported In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16577 ) Change subject: qmod: Don't print EEPROM operations in help when not supported ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I3071332d85e6168947384ddc230298d3293e4668 Gerrit-Change-Number: 16577 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 14 Dec 2019 22:29:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:29:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:29:51 +0000 Subject: Change in simtrace2[master]: cosmetic: board_qmod: Annotate #endif with comments In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16578 ) Change subject: cosmetic: board_qmod: Annotate #endif with comments ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2e2de6c65d791767637b9c43a1c0ff9cbeabf5e9 Gerrit-Change-Number: 16578 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 14 Dec 2019 22:29:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:30:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:30:30 +0000 Subject: Change in simtrace2[master]: qmod: Document '!' and '@' commands on UART In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16579 ) Change subject: qmod: Document '!' and '@' commands on UART ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I38c69ef45e92fd0aa03907e984cf524331b53d57 Gerrit-Change-Number: 16579 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 14 Dec 2019 22:30:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:30:40 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:30:40 +0000 Subject: Change in simtrace2[master]: implement minimalistic talloc_report(); add 't' command on UART In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16580 ) Change subject: implement minimalistic talloc_report(); add 't' command on UART ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ib10c4396cd4c9c4a6257cf45886e367214787927 Gerrit-Change-Number: 16580 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 14 Dec 2019 22:30:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:30:42 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:30:42 +0000 Subject: Change in simtrace2[master]: update copyright statement In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16581 ) Change subject: update copyright statement ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I6ffced85cf2398bbf6dcc3123accb5610e766f61 Gerrit-Change-Number: 16581 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 14 Dec 2019 22:30:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:30:56 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:30:56 +0000 Subject: Change in simtrace2[master]: more comments in host_communication.c. In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16573 ) Change subject: more comments in host_communication.c. ...................................................................... more comments in host_communication.c. Change-Id: I8b0124ec96b56b7c89e4c7033a11cc93c4fa2d26 --- M firmware/libcommon/source/host_communication.c 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/source/host_communication.c b/firmware/libcommon/source/host_communication.c index d500aed..1e15ada 100644 --- a/firmware/libcommon/source/host_communication.c +++ b/firmware/libcommon/source/host_communication.c @@ -27,7 +27,7 @@ * USBD Integration API ***********************************************************************/ -/* call-back after (successful?) transfer of a buffer */ +/* call-back after (successful?) transfer of a write buffer on IN EP */ static void usb_write_cb(uint8_t *arg, uint8_t status, uint32_t transferred, uint32_t remaining) { @@ -48,6 +48,7 @@ usb_buf_free(msg); } +/* check if the spcified IN endpoint is idle and submit the next buffer from queue */ int usb_refill_to_host(uint8_t ep) { struct usb_buffered_ep *bep = usb_get_buf_ep(ep); @@ -99,7 +100,7 @@ return 1; } -/* call-back after (successful?) transfer of a buffer */ +/* call-back after (successful?) read transfer of a buffer on OUT EP */ static void usb_read_cb(uint8_t *arg, uint8_t status, uint32_t transferred, uint32_t remaining) { @@ -120,6 +121,7 @@ llist_add_tail_irqsafe(&msg->list, &bep->queue); } +/* refill the read queue for data received from host PC on OUT EP, if needed */ int usb_refill_from_host(uint8_t ep) { struct usb_buffered_ep *bep = usb_get_buf_ep(ep); @@ -158,6 +160,7 @@ return 1; } +/* drain any buffers from the queue of the endpoint and release their memory */ int usb_drain_queue(uint8_t ep) { struct usb_buffered_ep *bep = usb_get_buf_ep(ep); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I8b0124ec96b56b7c89e4c7033a11cc93c4fa2d26 Gerrit-Change-Number: 16573 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:30:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:30:57 +0000 Subject: Change in simtrace2[master]: usb_buf: count number of elements in queue In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16574 ) Change subject: usb_buf: count number of elements in queue ...................................................................... usb_buf: count number of elements in queue This is in preparation for limiting the maximum queue length Change-Id: I7cb184d7a1ccb519010a2f3e3295cc3a5fbf8052 Related: OS#4251 --- M firmware/libcommon/include/usb_buf.h M firmware/libcommon/source/card_emu.c M firmware/libcommon/source/host_communication.c M firmware/libcommon/source/usb_buf.c M firmware/libosmocore/include/osmocom/core/msgb.h M firmware/test/card_emu_tests.c 6 files changed, 58 insertions(+), 13 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/firmware/libcommon/include/usb_buf.h b/firmware/libcommon/include/usb_buf.h index bd6947b..3a4eda2 100644 --- a/firmware/libcommon/include/usb_buf.h +++ b/firmware/libcommon/include/usb_buf.h @@ -29,6 +29,8 @@ volatile uint32_t in_progress; /* Tx queue (IN) / Rx queue (OUT) */ struct llist_head queue; + /* current length of queue */ + unsigned int queue_len; }; struct msgb *usb_buf_alloc(uint8_t ep); diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 923226a..f95f5d1 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -260,18 +260,18 @@ while (!msg) { msg = usb_buf_alloc(ep); // try to allocate some memory if (!msg) { // allocation failed, we might be out of memory - struct llist_head *queue = usb_get_queue(ep); - if (!queue) { + struct usb_buffered_ep *bep = usb_get_buf_ep(ep); + if (!bep) { TRACE_ERROR("ep %u: %s queue does not exist\n\r", ep, __func__); return NULL; } - if (llist_empty(queue)) { + if (llist_empty(&bep->queue)) { TRACE_ERROR("ep %u: %s EOMEM (queue already empty)\n\r", ep, __func__); return NULL; } - msg = msgb_dequeue(queue); + msg = msgb_dequeue_count(&bep->queue, &bep->queue_len); if (!msg) { TRACE_ERROR("ep %u: %s no msg in non-empty queue\n\r", ep, __func__); diff --git a/firmware/libcommon/source/host_communication.c b/firmware/libcommon/source/host_communication.c index 1e15ada..0e496c5 100644 --- a/firmware/libcommon/source/host_communication.c +++ b/firmware/libcommon/source/host_communication.c @@ -76,7 +76,7 @@ bep->in_progress++; - msg = msgb_dequeue(&bep->queue); + msg = msgb_dequeue_count(&bep->queue, &bep->queue_len); local_irq_restore(x); @@ -180,7 +180,7 @@ } /* free all queued msgbs */ - while ((msg = msgb_dequeue(&bep->queue))) { + while ((msg = msgb_dequeue_count(&bep->queue, &bep->queue_len))) { usb_buf_free(msg); ret++; } diff --git a/firmware/libcommon/source/usb_buf.c b/firmware/libcommon/source/usb_buf.c index 418569e..8ad5a0e 100644 --- a/firmware/libcommon/source/usb_buf.c +++ b/firmware/libcommon/source/usb_buf.c @@ -78,7 +78,7 @@ /* no need for irqsafe operation, as the usb_tx_queue is * processed only by the main loop context */ - msgb_enqueue(&ep->queue, msg); + msgb_enqueue_count(&ep->queue, msg, &ep->queue_len); return 0; } diff --git a/firmware/libosmocore/include/osmocom/core/msgb.h b/firmware/libosmocore/include/osmocom/core/msgb.h index afb887c..7c4420d 100644 --- a/firmware/libosmocore/include/osmocom/core/msgb.h +++ b/firmware/libosmocore/include/osmocom/core/msgb.h @@ -80,6 +80,49 @@ extern struct msgb *msgb_copy(const struct msgb *msg, const char *name); static int msgb_test_invariant(const struct msgb *msg) __attribute__((pure)); +/*! Free all msgbs from a queue built with msgb_enqueue(). + * \param[in] queue list head of a msgb queue. + */ +static inline void msgb_queue_free(struct llist_head *queue) +{ + struct msgb *msg; + while ((msg = msgb_dequeue(queue))) msgb_free(msg); +} + +/*! Enqueue message buffer to tail of a queue and increment queue size counter + * \param[in] queue linked list header of queue + * \param[in] msg message buffer to be added to the queue + * \param[in] count pointer to variable holding size of the queue + * + * The function will append the specified message buffer \a msg to the queue + * implemented by \ref llist_head \a queue using function \ref msgb_enqueue_count, + * then increment \a count + */ +static inline void msgb_enqueue_count(struct llist_head *queue, struct msgb *msg, + unsigned int *count) +{ + msgb_enqueue(queue, msg); + (*count)++; +} + +/*! Dequeue message buffer from head of queue and decrement queue size counter + * \param[in] queue linked list header of queue + * \param[in] count pointer to variable holding size of the queue + * \returns message buffer (if any) or NULL if queue empty + * + * The function will remove the first message buffer from the queue + * implemented by \ref llist_head \a queue using function \ref msgb_enqueue_count, + * and decrement \a count, all if queue is not empty. + */ +static inline struct msgb *msgb_dequeue_count(struct llist_head *queue, + unsigned int *count) +{ + struct msgb *msg = msgb_dequeue(queue); + if (msg) + (*count)--; + return msg; +} + #ifdef MSGB_DEBUG #include #define MSGB_ABORT(msg, fmt, args ...) do { \ diff --git a/firmware/test/card_emu_tests.c b/firmware/test/card_emu_tests.c index a5ba62e..2a1d682 100644 --- a/firmware/test/card_emu_tests.c +++ b/firmware/test/card_emu_tests.c @@ -177,14 +177,14 @@ static void get_and_verify_rctx(uint8_t ep, const uint8_t *data, unsigned int len) { - struct llist_head *queue = usb_get_queue(ep); + struct usb_buffered_ep *bep = usb_get_buf_ep(ep); struct msgb *msg; struct cardemu_usb_msg_tx_data *td; struct cardemu_usb_msg_rx_data *rd; struct simtrace_msg_hdr *mh; - assert(queue); - msg = msgb_dequeue(queue); + assert(bep); + msg = msgb_dequeue_count(&bep->queue, &bep->queue_len); assert(msg); dump_rctx(msg); assert(msg->l1h); @@ -214,13 +214,13 @@ static void get_and_verify_rctx_pps(const uint8_t *data, unsigned int len) { - struct llist_head *queue = usb_get_queue(PHONE_DATAIN); + struct usb_buffered_ep *bep = usb_get_buf_ep(PHONE_DATAIN); struct msgb *msg; struct simtrace_msg_hdr *mh; struct cardemu_usb_msg_pts_info *ptsi; - assert(queue); - msg = msgb_dequeue(queue); + assert(bep); + msg = msgb_dequeue_count(&bep->queue, &bep->queue_len); assert(msg); dump_rctx(msg); assert(msg->l1h); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I7cb184d7a1ccb519010a2f3e3295cc3a5fbf8052 Gerrit-Change-Number: 16574 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:30:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:30:57 +0000 Subject: Change in simtrace2[master]: usb_buf: Limit the maximum queue length to 3 elements In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16575 ) Change subject: usb_buf: Limit the maximum queue length to 3 elements ...................................................................... usb_buf: Limit the maximum queue length to 3 elements If there are already three elements in the to-be-transmitted queue for the EP, let's free the first element of the queue. This is a clear indication that the USB host is not polling the endpoint regularly. Maybe there's no host application running at all? This should obsolete Change-Id Ie9ebdd2ff966f67c9afd1ed760f106558f0091ad Change-Id: Ie15183f16b22193ffdaf01845db2eae4c7f43c17 Closes: OS#4251 --- M firmware/libcommon/source/usb_buf.c 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/source/usb_buf.c b/firmware/libcommon/source/usb_buf.c index 8ad5a0e..7892d6e 100644 --- a/firmware/libcommon/source/usb_buf.c +++ b/firmware/libcommon/source/usb_buf.c @@ -24,6 +24,7 @@ #include #define USB_ALLOC_SIZE 280 +#define USB_MAX_QLEN 3 static struct usb_buffered_ep usb_buffered_ep[BOARD_USB_NUMENDPOINTS]; @@ -78,6 +79,17 @@ /* no need for irqsafe operation, as the usb_tx_queue is * processed only by the main loop context */ + + if (ep->queue_len > USB_MAX_QLEN) { + struct msgb *evict; + /* free the first pending buffer in the queue */ + TRACE_INFO("EP%02x: dropping first queue element (qlen=%u)\r\n", + ep->ep, ep->queue_len); + evict = msgb_dequeue_count(&ep->queue, &ep->queue_len); + OSMO_ASSERT(evict); + usb_buf_free(evict); + } + msgb_enqueue_count(&ep->queue, msg, &ep->queue_len); return 0; } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie15183f16b22193ffdaf01845db2eae4c7f43c17 Gerrit-Change-Number: 16575 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:30:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:30:58 +0000 Subject: Change in simtrace2[master]: qmod: Don't print EEPROM operations in help when not supported In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16577 ) Change subject: qmod: Don't print EEPROM operations in help when not supported ...................................................................... qmod: Don't print EEPROM operations in help when not supported As of Change-Id I1c8cca2f7f0f0070d7bf1ade676e035c45e4d5ab, a firmware compiled without ALLOW_PEER_ERASE will not support resetting the hub or writing to its EEPROM. Let's make sure to remove those options also from the menu. Change-Id: I3071332d85e6168947384ddc230298d3293e4668 --- M firmware/libboard/qmod/source/board_qmod.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c index 0b03180..900a3bc 100644 --- a/firmware/libboard/qmod/source/board_qmod.c +++ b/firmware/libboard/qmod/source/board_qmod.c @@ -205,13 +205,17 @@ printf("\tg\tswitch off LED 2\n\r"); printf("\tG\tswitch off LED 2\n\r"); if (qmod_sam3_is_12()) { +#if (ALLOW_PEER_ERASE > 0) printf("\tE\tprogram EEPROM\n\r"); printf("\te\tErase EEPROM\n\r"); +#endif printf("\tO\tEnable PRTPWR_OVERRIDE\n\r"); printf("\to\tDisable PRTPWR_OVERRIDE\n\r"); +#if (ALLOW_PEER_ERASE > 0) printf("\tH\tRelease HUB RESET (high)\n\r"); printf("\th\tAssert HUB RESET (low)\n\r"); printf("\tw\tWrite single byte in EEPROM\n\r"); +#endif printf("\tr\tRead single byte from EEPROM\n\r"); } printf("\tX\tRelease peer SAM3 from reset\n\r"); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I3071332d85e6168947384ddc230298d3293e4668 Gerrit-Change-Number: 16577 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:30:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:30:58 +0000 Subject: Change in simtrace2[master]: cosmetic: board_qmod: Annotate #endif with comments In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16578 ) Change subject: cosmetic: board_qmod: Annotate #endif with comments ...................................................................... cosmetic: board_qmod: Annotate #endif with comments Change-Id: I2e2de6c65d791767637b9c43a1c0ff9cbeabf5e9 --- M firmware/libboard/qmod/source/board_qmod.c 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c index 900a3bc..b3979f4 100644 --- a/firmware/libboard/qmod/source/board_qmod.c +++ b/firmware/libboard/qmod/source/board_qmod.c @@ -194,7 +194,7 @@ this is done to prevent accidental ERASE on noisy serial input since only one character can trigger the ERASE. */ static bool allow_erase = false; -#endif +#endif /* ALLOW_PEER_ERASE */ switch (ch) { case '?': @@ -208,14 +208,14 @@ #if (ALLOW_PEER_ERASE > 0) printf("\tE\tprogram EEPROM\n\r"); printf("\te\tErase EEPROM\n\r"); -#endif +#endif /* ALLOW_PEER_ERASE */ printf("\tO\tEnable PRTPWR_OVERRIDE\n\r"); printf("\to\tDisable PRTPWR_OVERRIDE\n\r"); #if (ALLOW_PEER_ERASE > 0) printf("\tH\tRelease HUB RESET (high)\n\r"); printf("\th\tAssert HUB RESET (low)\n\r"); printf("\tw\tWrite single byte in EEPROM\n\r"); -#endif +#endif /* ALLOW_PEER_ERASE */ printf("\tr\tRead single byte from EEPROM\n\r"); } printf("\tX\tRelease peer SAM3 from reset\n\r"); @@ -224,7 +224,7 @@ printf("\tY\tRelease peer SAM3 ERASE signal\n\r"); printf("\ta\tAllow asserting peer SAM3 ERASE signal\n\r"); printf("\ty\tAssert peer SAM3 ERASE signal\n\r"); -#endif +#endif /* ALLOW_PEER_ERASE */ printf("\tU\tProceed to USB Initialization\n\r"); printf("\t1\tGenerate 1ms reset pulse on WWAN1\n\r"); printf("\t2\tGenerate 1ms reset pulse on WWAN2\n\r"); @@ -275,7 +275,7 @@ printf("Please first allow setting SIMTRACExx_ERASE\n\r"); } break; -#endif +#endif /* ALLOW_PEER_ERASE */ case '1': printf("Resetting Modem 1 (of this SAM3)\n\r"); wwan_perst_do_reset_pulse(0, 300); @@ -303,7 +303,7 @@ if ('a' != ch) { allow_erase = false; } -#endif +#endif /* ALLOW_PEER_ERASE */ } void board_main_top(void) -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2e2de6c65d791767637b9c43a1c0ff9cbeabf5e9 Gerrit-Change-Number: 16578 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:30:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:30:59 +0000 Subject: Change in simtrace2[master]: qmod: Document '!' and '@' commands on UART In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16579 ) Change subject: qmod: Document '!' and '@' commands on UART ...................................................................... qmod: Document '!' and '@' commands on UART Change-Id: I38c69ef45e92fd0aa03907e984cf524331b53d57 --- M firmware/libboard/qmod/source/board_qmod.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c index b3979f4..6316979 100644 --- a/firmware/libboard/qmod/source/board_qmod.c +++ b/firmware/libboard/qmod/source/board_qmod.c @@ -228,6 +228,8 @@ printf("\tU\tProceed to USB Initialization\n\r"); printf("\t1\tGenerate 1ms reset pulse on WWAN1\n\r"); printf("\t2\tGenerate 1ms reset pulse on WWAN2\n\r"); + printf("\t!\tSwitch Channel A from physical -> remote\n\r"); + printf("\t@\tSwitch Channel B from physical -> remote\n\r"); break; case 'R': printf("Asking NVIC to reset us\n\r"); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I38c69ef45e92fd0aa03907e984cf524331b53d57 Gerrit-Change-Number: 16579 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:30:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:30:59 +0000 Subject: Change in simtrace2[master]: implement minimalistic talloc_report(); add 't' command on UART In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16580 ) Change subject: implement minimalistic talloc_report(); add 't' command on UART ...................................................................... implement minimalistic talloc_report(); add 't' command on UART This helps when debugging the firmware, as it shows the current utliization of the 10-msgb-talloc pool. Change-Id: Ib10c4396cd4c9c4a6257cf45886e367214787927 Related: OS#4251 --- M firmware/libboard/qmod/source/board_qmod.c M firmware/libcommon/include/talloc.h M firmware/libcommon/source/pseudo_talloc.c 3 files changed, 21 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c index 6316979..32bfdd4 100644 --- a/firmware/libboard/qmod/source/board_qmod.c +++ b/firmware/libboard/qmod/source/board_qmod.c @@ -230,6 +230,7 @@ printf("\t2\tGenerate 1ms reset pulse on WWAN2\n\r"); printf("\t!\tSwitch Channel A from physical -> remote\n\r"); printf("\t@\tSwitch Channel B from physical -> remote\n\r"); + printf("\tt\t(pseudo)talloc report\n\r"); break; case 'R': printf("Asking NVIC to reset us\n\r"); @@ -292,6 +293,9 @@ case '@': sim_switch_use_physical(0, 0); break; + case 't': + talloc_report(NULL, stdout); + break; default: if (!qmod_sam3_is_12()) printf("Unknown command '%c'\n\r", ch); diff --git a/firmware/libcommon/include/talloc.h b/firmware/libcommon/include/talloc.h index 0bd75d2..625355a 100644 --- a/firmware/libcommon/include/talloc.h +++ b/firmware/libcommon/include/talloc.h @@ -17,6 +17,7 @@ #pragma once #include +#include #include /* minimalistic emulation of core talloc API functions used by msgb.c */ @@ -39,3 +40,4 @@ void talloc_set_name_const(const void *ptr, const char *name); char *talloc_strdup(const void *t, const char *p); void *talloc_pool(const void *context, size_t size); +void talloc_report(const void *ptr, FILE *f); diff --git a/firmware/libcommon/source/pseudo_talloc.c b/firmware/libcommon/source/pseudo_talloc.c index 862fffd..7c452b3 100644 --- a/firmware/libcommon/source/pseudo_talloc.c +++ b/firmware/libcommon/source/pseudo_talloc.c @@ -15,6 +15,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA */ #include +#include #include "talloc.h" #include "trace.h" @@ -76,6 +77,20 @@ return -1; } +void talloc_report(const void *ptr, FILE *f) +{ + unsigned int i; + + fprintf(f, "talloc_report(): "); + for (i = 0; i < ARRAY_SIZE(msgb_inuse); i++) { + if (msgb_inuse[i]) + fputc('X', f); + else + fputc('_', f); + } + fprintf(f, "\r\n"); +} + void talloc_set_name_const(const void *ptr, const char *name) { /* do nothing */ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ib10c4396cd4c9c4a6257cf45886e367214787927 Gerrit-Change-Number: 16580 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:31:00 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:31:00 +0000 Subject: Change in simtrace2[master]: update copyright statement In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16581 ) Change subject: update copyright statement ...................................................................... update copyright statement Change-Id: I6ffced85cf2398bbf6dcc3123accb5610e766f61 --- M firmware/apps/cardem/main.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c index 3c5a32c..2f7bcd5 100644 --- a/firmware/apps/cardem/main.c +++ b/firmware/apps/cardem/main.c @@ -159,7 +159,7 @@ printf("\n\r\n\r" "=============================================================================\n\r" "SIMtrace2 firmware " GIT_VERSION "\n\r" - "(C) 2010-2017 by Harald Welte, 2018-2019 by Kevin Redon\n\r" + "(C) 2010-2019 by Harald Welte, 2018-2019 by Kevin Redon\n\r" "=============================================================================\n\r"); #if (TRACE_LEVEL >= TRACE_LEVEL_INFO) -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I6ffced85cf2398bbf6dcc3123accb5610e766f61 Gerrit-Change-Number: 16581 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:31:02 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:31:02 +0000 Subject: Change in simtrace2[master]: cardem: Fix memory leak on unsupported SIMTRACE_MSGT_DT_CEMU_CARDINSERT In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16585 ) Change subject: cardem: Fix memory leak on unsupported SIMTRACE_MSGT_DT_CEMU_CARDINSERT ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16585 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I489097b7e332004e0f2beca0b22fa36d5d1d31b5 Gerrit-Change-Number: 16585 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 14 Dec 2019 22:31:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:59:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:59:57 +0000 Subject: Change in osmo-remsim[master]: rspro_client_fsm: Make RSPRO transmit use FSM event References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16586 ) Change subject: rspro_client_fsm: Make RSPRO transmit use FSM event ...................................................................... rspro_client_fsm: Make RSPRO transmit use FSM event This way we can easily guarantee that RSPRO transmit will only happen in the fully established state, and that violations of that rule will generate error logs by means of osmo_fsm core logging code. Change-Id: I3c403507fa11c068d7503107857fbd5676ce135f --- M src/rspro_client_fsm.c M src/rspro_client_fsm.h 2 files changed, 22 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/86/16586/1 diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index 9f2d7c0..91e91eb 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -77,6 +77,12 @@ return 0; } +static int _server_conn_send_rspro(struct rspro_server_conn *srvc, RsproPDU_t *rspro) +{ + LOGPFSM(srvc->fi, "Tx RSPRO %s\n", rspro_msgt_name(rspro)); + return ipa_client_conn_send_rspro(srvc->conn, rspro); +} + int server_conn_send_rspro(struct rspro_server_conn *srvc, RsproPDU_t *rspro) { if (!rspro) { @@ -84,8 +90,11 @@ osmo_log_backtrace(DMAIN, LOGL_ERROR); return -EINVAL; } - LOGPFSM(srvc->fi, "Tx RSPRO %s\n", rspro_msgt_name(rspro)); - return ipa_client_conn_send_rspro(srvc->conn, rspro); + if (osmo_fsm_inst_dispatch(srvc->fi, SRVC_E_RSPRO_TX, rspro) < 0) { + ASN_STRUCT_FREE(asn_DEF_RsproPDU, rspro); + return -EPERM; + } + return 0; } enum server_conn_fsm_state { @@ -105,6 +114,7 @@ OSMO_VALUE_STRING(SRVC_E_TCP_DOWN), OSMO_VALUE_STRING(SRVC_E_KA_TIMEOUT), OSMO_VALUE_STRING(SRVC_E_CLIENT_CONN_RES), + OSMO_VALUE_STRING(SRVC_E_RSPRO_TX), { 0, NULL } }; @@ -202,7 +212,7 @@ else pdu = rspro_gen_ConnectBankReq(&srvc->own_comp_id, srvc->bankd.bank_id, srvc->bankd.num_slots); - server_conn_send_rspro(srvc, pdu); + _server_conn_send_rspro(srvc, pdu); } static void srvc_st_established(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -234,11 +244,18 @@ static void srvc_st_connected(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct rspro_server_conn *srvc = (struct rspro_server_conn *) fi->priv; + RsproPDU_t *pdu = NULL; + switch (event) { case SRVC_E_TCP_DOWN: case SRVC_E_KA_TIMEOUT: osmo_fsm_inst_state_chg(fi, SRVC_ST_REESTABLISH, T2_RECONNECT, 2); break; + case SRVC_E_RSPRO_TX: + pdu = data; + _server_conn_send_rspro(srvc, pdu); + break; default: OSMO_ASSERT(0); } @@ -350,7 +367,7 @@ }, [SRVC_ST_CONNECTED] = { .name = "CONNECTED", - .in_event_mask = S(SRVC_E_TCP_DOWN) | S(SRVC_E_KA_TIMEOUT), + .in_event_mask = S(SRVC_E_TCP_DOWN) | S(SRVC_E_KA_TIMEOUT) | S(SRVC_E_RSPRO_TX), .out_state_mask = S(SRVC_ST_REESTABLISH), .action = srvc_st_connected, }, diff --git a/src/rspro_client_fsm.h b/src/rspro_client_fsm.h index c11e260..7a998dc 100644 --- a/src/rspro_client_fsm.h +++ b/src/rspro_client_fsm.h @@ -10,6 +10,7 @@ SRVC_E_TCP_DOWN, SRVC_E_KA_TIMEOUT, SRVC_E_CLIENT_CONN_RES, + SRVC_E_RSPRO_TX /* transmit a RSPRO PDU to the peer */ }; struct rspro_server_conn; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I3c403507fa11c068d7503107857fbd5676ce135f Gerrit-Change-Number: 16586 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:59:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:59:57 +0000 Subject: Change in osmo-remsim[master]: Replace bankd_client_fsm with rspro_client_fsm References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16587 ) Change subject: Replace bankd_client_fsm with rspro_client_fsm ...................................................................... Replace bankd_client_fsm with rspro_client_fsm There was a lot of similarity between the bankd_client_fsm (for the client->bankd RSPRO connection) and the rspro_client_fsm (for the client->server and the bankd->server RSPRO connections). With the last few commits introducing the missing features to rspro_client_fsm, we can completely obsolete bankd_client_fsm and further simplify the codebase. Change-Id: Icbe9881a0391fcd0c47e5d930dc764fc0cb1dfbf --- M src/Makefile.am D src/bankd_client_fsm.c M src/client.h M src/simtrace2-remsim_client.c 4 files changed, 37 insertions(+), 353 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/87/16587/1 diff --git a/src/Makefile.am b/src/Makefile.am index fa0f732..35da621 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,12 +28,12 @@ bin_PROGRAMS = osmo-remsim-client-st2 -remsim_client_SOURCES = remsim_client.c rspro_client_fsm.c bankd_client_fsm.c debug.c +remsim_client_SOURCES = remsim_client.c rspro_client_fsm.c debug.c remsim_client_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \ libosmo-rspro.la osmo_remsim_client_st2_SOURCES = simtrace2-remsim_client.c \ - bankd_client_fsm.c rspro_client_fsm.c debug.c \ + rspro_client_fsm.c debug.c \ simtrace2/apdu_dispatch.c \ simtrace2/simtrace2-discovery.c \ simtrace2/libusb_util.c diff --git a/src/bankd_client_fsm.c b/src/bankd_client_fsm.c deleted file mode 100644 index 7ddc065..0000000 --- a/src/bankd_client_fsm.c +++ /dev/null @@ -1,278 +0,0 @@ -/* (C) 2018-2019 by Harald Welte - * - * All Rights Reserved - * - * SPDX-License-Identifier: GPL-2.0+ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - */ -#include -#include -#include - -#include - -#include -#include -#include -#include - -#include -#include - -#include "client.h" -#include "rspro_util.h" - -#define S(x) (1 << (x)) - -static void bankd_updown_cb(struct ipa_client_conn *conn, int up) -{ - struct bankd_client *bc = conn->data; - - printf("RSPRO link to %s:%d %s\n", conn->addr, conn->port, up ? "UP" : "DOWN"); - - osmo_fsm_inst_dispatch(bc->bankd_fi, up ? BDC_E_TCP_UP: BDC_E_TCP_DOWN, 0); -} - -/* internal function, bypassing FSM state */ -static int _bankd_conn_send_rspro(struct bankd_client *bc, RsproPDU_t *rspro) -{ - return ipa_client_conn_send_rspro(bc->bankd_conn, rspro); -} - -int bankd_conn_send_rspro(struct bankd_client *bc, RsproPDU_t *rspro) -{ - if (osmo_fsm_inst_dispatch(bc->bankd_fi, BDC_E_RSPRO_TX, rspro) < 0) { - ASN_STRUCT_FREE(asn_DEF_RsproPDU, rspro); - return -1; - } - return 0; -} - -/*********************************************************************** - * client-side FSM for RSPRO connection to remsim-bankd - * - * This is part of remsim-client and manages the connection to remsim-bankd, - * over which actual TPDU exchanges happen. - ***********************************************************************/ - -enum bankd_conn_fsm_state { - /* waiting for initial connection to remsim-bankd */ - BDC_ST_INIT, - /* bankd connection established, waiting for ClientConnectRes */ - BDC_ST_ESTABLISHED, - /* bankd connection established, ClientConnect succeeded */ - BDC_ST_CONNECTED, - /* connection lost, we're waiting for a re-establish */ - BDC_ST_REESTABLISH, -}; - -static const struct value_string remsim_client_bankd_fsm_event_names[] = { - OSMO_VALUE_STRING(BDC_E_ESTABLISH), - OSMO_VALUE_STRING(BDC_E_TCP_UP), - OSMO_VALUE_STRING(BDC_E_TCP_DOWN), - OSMO_VALUE_STRING(BDC_E_CLIENT_CONN_RES), - OSMO_VALUE_STRING(BDC_E_RSPRO_TX), - { 0, NULL } -}; - -#define T1_WAIT_CLIENT_CONN_RES 10 -#define T2_RECONNECT 10 - - -static void bdc_st_init(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - switch (event) { - case BDC_E_ESTABLISH: - osmo_fsm_inst_state_chg(fi, BDC_ST_REESTABLISH, T2_RECONNECT, 2); - break; - default: - OSMO_ASSERT(0); - } -} - -static void bdc_st_established_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) -{ - struct bankd_client *bc = (struct bankd_client *) fi->priv; - RsproPDU_t *pdu; - - /* Send ClientConnReq */ - pdu = rspro_gen_ConnectClientReq(&bc->srv_conn.own_comp_id, bc->srv_conn.clslot); - _bankd_conn_send_rspro(bc, pdu); -} - -static void bdc_st_established(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - switch (event) { - case BDC_E_TCP_DOWN: - osmo_fsm_inst_state_chg(fi, BDC_ST_REESTABLISH, T2_RECONNECT, 2); - break; - case BDC_E_CLIENT_CONN_RES: - /* somehow notify the main code? */ - osmo_fsm_inst_state_chg(fi, BDC_ST_CONNECTED, 0, 0); - break; - default: - OSMO_ASSERT(0); - } -} - -static void bdc_st_connected(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - struct bankd_client *bc = (struct bankd_client *) fi->priv; - RsproPDU_t *pdu = NULL; - - switch (event) { - case BDC_E_TCP_DOWN: - osmo_fsm_inst_state_chg(fi, BDC_ST_REESTABLISH, T2_RECONNECT, 2); - break; - case BDC_E_RSPRO_TX: - pdu = data; - _bankd_conn_send_rspro(bc, pdu); - break; - default: - OSMO_ASSERT(0); - } -} - -static void bdc_st_reestablish_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) -{ - struct bankd_client *bc = (struct bankd_client *) fi->priv; - int rc; - - /* re-create bankd_conn */ - if (bc->bankd_conn) { - LOGPFSML(fi, LOGL_INFO, "Destroying existing connection to bankd\n"); - ipa_client_conn_close(bc->bankd_conn); - ipa_client_conn_destroy(bc->bankd_conn); - bc->bankd_conn = NULL; - } - LOGPFSML(fi, LOGL_INFO, "Creating TCP connection to bankd at %s:%u\n", - bc->bankd_host, bc->bankd_port); - bc->bankd_conn = ipa_client_conn_create(bc, NULL, 0, bc->bankd_host, bc->bankd_port, - bankd_updown_cb, bankd_read_cb, NULL, bc); - if (!bc->bankd_conn) { - fprintf(stderr, "Unable to create socket: %s\n", strerror(errno)); - exit(1); - } - - /* Attempt to connect TCP socket */ - rc = ipa_client_conn_open(bc->bankd_conn); - if (rc < 0) { - fprintf(stderr, "Unable to connect RSPRO to %s:%d - %s\n", - bc->bankd_conn->addr, bc->bankd_conn->port, strerror(errno)); - /* FIXME: retry? Timer? Abort? */ - OSMO_ASSERT(0); - } -} - -static void bdc_st_reestablish(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - switch (event) { - case BDC_E_TCP_UP: - osmo_fsm_inst_state_chg(fi, BDC_ST_ESTABLISHED, T1_WAIT_CLIENT_CONN_RES, 1); - break; - case BDC_E_TCP_DOWN: - /* wait for normal T2 timeout */ - break; - default: - OSMO_ASSERT(0); - } -} - -static void bdc_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - switch (event) { - case BDC_E_ESTABLISH: - osmo_fsm_inst_state_chg(fi, BDC_ST_REESTABLISH, T2_RECONNECT, 2); - break; - default: - OSMO_ASSERT(0); - } -} - -static int remsim_client_bankd_fsm_timer_cb(struct osmo_fsm_inst *fi) -{ - switch (fi->T) { - case 2: - /* TCP reconnect failed: retry */ - osmo_fsm_inst_state_chg(fi, BDC_ST_REESTABLISH, T2_RECONNECT, 2); - break; - case 1: - /* no ClientConnectRes received: disconnect + reconnect */ - osmo_fsm_inst_state_chg(fi, BDC_ST_REESTABLISH, T2_RECONNECT, 2); - break; - default: - OSMO_ASSERT(0); - } - return 0; -} - -static const struct osmo_fsm_state bankd_conn_fsm_states[] = { - [BDC_ST_INIT] = { - .name = "INIT", - .in_event_mask = 0, /* S(BDC_E_ESTABLISH) via allstate */ - .out_state_mask = S(BDC_ST_REESTABLISH), - .action = bdc_st_init, - }, - [BDC_ST_ESTABLISHED] = { - .name = "ESTABLISHED", - .in_event_mask = S(BDC_E_TCP_DOWN) | S(BDC_E_CLIENT_CONN_RES), - .out_state_mask = S(BDC_ST_CONNECTED) | S(BDC_ST_REESTABLISH), - .action = bdc_st_established, - .onenter = bdc_st_established_onenter, - }, - [BDC_ST_CONNECTED] = { - .name = "CONNECTED", - .in_event_mask = S(BDC_E_TCP_DOWN) | S(BDC_E_RSPRO_TX), - .out_state_mask = S(BDC_ST_REESTABLISH), - .action = bdc_st_connected, - }, - [BDC_ST_REESTABLISH] = { - .name = "REESTABLISH", - .in_event_mask = S(BDC_E_TCP_UP) | S(BDC_E_TCP_DOWN), - .out_state_mask = S(BDC_ST_ESTABLISHED) | S(BDC_ST_REESTABLISH), - .action = bdc_st_reestablish, - .onenter = bdc_st_reestablish_onenter, - }, -}; - -struct osmo_fsm remsim_client_bankd_fsm = { - .name = "BANKD_CONN", - .states = bankd_conn_fsm_states, - .num_states = ARRAY_SIZE(bankd_conn_fsm_states), - .allstate_event_mask = S(BDC_E_ESTABLISH), - .allstate_action = bdc_allstate_action, - .timer_cb = remsim_client_bankd_fsm_timer_cb, - .log_subsys = DMAIN, - .event_names = remsim_client_bankd_fsm_event_names, -}; - -int bankd_conn_fsm_alloc(struct bankd_client *bc) -{ - struct osmo_fsm_inst *fi; - - fi = osmo_fsm_inst_alloc(&remsim_client_bankd_fsm, bc, bc, LOGL_DEBUG, "bankd"); - if (!fi) - return -1; - - bc->bankd_fi = fi; - return 0; -} - -static __attribute__((constructor)) void on_dso_load(void) -{ - OSMO_ASSERT(osmo_fsm_register(&remsim_client_bankd_fsm) == 0); -} diff --git a/src/client.h b/src/client.h index 80edaa3..ce891a9 100644 --- a/src/client.h +++ b/src/client.h @@ -9,36 +9,23 @@ #include "slotmap.h" #include "debug.h" -/* fsm.c */ - -enum bankd_conn_fsm_event { - BDC_E_ESTABLISH, /* instruct BDC to (re)etablish TCP connection to bankd */ - BDC_E_TCP_UP, /* notify BDC that TCP connection is up/connected */ - BDC_E_TCP_DOWN, /* notify BDC that TCP connection is down/disconnected */ - BDC_E_CLIENT_CONN_RES, /* notify BDC that ClientConnectRes has been received */ - BDC_E_RSPRO_TX, /* transmit a RSPRO PDU to the bankd */ -}; - -extern struct osmo_fsm remsim_client_bankd_fsm; - - /* main.c */ struct bankd_client { /* connection to the remsim-server (control) */ struct rspro_server_conn srv_conn; + /* connection to the remsim-bankd (data) */ + struct rspro_server_conn bankd_conn; /* remote component ID */ struct app_comp_id peer_comp_id; + struct bank_slot bankd_slot; +#if 0 /* connection to the remsim-bankd */ char *bankd_host; uint16_t bankd_port; - struct bank_slot bankd_slot; struct ipa_client_conn *bankd_conn; struct osmo_fsm_inst *bankd_fi; +#endif }; - -int bankd_conn_send_rspro(struct bankd_client *bc, RsproPDU_t *pdu); -int bankd_read_cb(struct ipa_client_conn *conn, struct msgb *msg); -int bankd_conn_fsm_alloc(struct bankd_client *bc); diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index 19f84a3..d54e963 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -430,7 +430,7 @@ BankSlot_t bslot; bank_slot2rspro(&bslot, &g_client->bankd_slot); RsproPDU_t *pdu = rspro_gen_TpduModem2Card(g_client->srv_conn.clslot, &bslot, apdu_command, sizeof(ac.hdr) + ac.lc.tot); // create RSPRO packet - bankd_conn_send_rspro(g_client, pdu); + server_conn_send_rspro(&g_client->bankd_conn, pdu); // the response will come separately } else if (ac.lc.tot > ac.lc.cur) { // there is pending data from the modem cardem_request_pb_and_rx(ci, ac.hdr.ins, ac.lc.tot - ac.lc.cur); // send procedure byte to get remaining data @@ -532,7 +532,7 @@ /** remsim_client **/ -static int bankd_handle_tpduCardToModem(struct bankd_client *bc, RsproPDU_t *pdu) +static int bankd_handle_tpduCardToModem(struct bankd_client *bc, const RsproPDU_t *pdu) { OSMO_ASSERT(pdu); OSMO_ASSERT(RsproPDUchoice_PR_tpduCardToModem == pdu->msg.present); @@ -554,7 +554,7 @@ return 0; } -static int bankd_handle_setAtrReq(struct bankd_client *bc, RsproPDU_t *pdu) +static int bankd_handle_setAtrReq(struct bankd_client *bc, const RsproPDU_t *pdu) { RsproPDU_t *resp; int rc; @@ -571,70 +571,35 @@ resp = rspro_gen_SetAtrRes(ResultCode_cardTransmissionError); if (!resp) return -ENOMEM; - bankd_conn_send_rspro(g_client, resp); + server_conn_send_rspro(&g_client->bankd_conn, resp); return 0; } -static int bankd_handle_msg(struct bankd_client *bc, struct msgb *msg) +/* handle incoming message from bankd */ +static int bankd_handle_rx(struct rspro_server_conn *bankdc, const RsproPDU_t *pdu) { - RsproPDU_t *pdu = rspro_dec_msg(msg); - if (!pdu) { - LOGPFSML(bc->bankd_fi, LOGL_ERROR, "Error decoding PDU\n"); - return -1; - } - switch (pdu->msg.present) { case RsproPDUchoice_PR_connectClientRes: /* Store 'identity' of bankd to in peer_comp_id */ - rspro_comp_id_retrieve(&bc->peer_comp_id, &pdu->msg.choice.connectClientRes.identity); - osmo_fsm_inst_dispatch(bc->bankd_fi, BDC_E_CLIENT_CONN_RES, pdu); + rspro_comp_id_retrieve(&bankdc->peer_comp_id, &pdu->msg.choice.connectClientRes.identity); + osmo_fsm_inst_dispatch(bankdc->fi, SRVC_E_CLIENT_CONN_RES, (void *) pdu); break; case RsproPDUchoice_PR_tpduCardToModem: // APDU response from card received - bankd_handle_tpduCardToModem(bc, pdu); + bankd_handle_tpduCardToModem(g_client, pdu); break; case RsproPDUchoice_PR_setAtrReq: - bankd_handle_setAtrReq(bc, pdu); + bankd_handle_setAtrReq(g_client, pdu); break; default: - LOGPFSML(bc->bankd_fi, LOGL_ERROR, "Unknown/Unsuppoerted RSPRO PDU %s: %s\n", - rspro_msgt_name(pdu), msgb_hexdump(msg)); + LOGPFSML(bankdc->fi, LOGL_ERROR, "Unknown/Unsuppoerted RSPRO PDU %s\n", + rspro_msgt_name(pdu)); return -1; } return 0; } -int bankd_read_cb(struct ipa_client_conn *conn, struct msgb *msg) -{ - struct ipaccess_head *hh = (struct ipaccess_head *) msg->data; - struct ipaccess_head_ext *he = (struct ipaccess_head_ext *) msgb_l2(msg); - struct bankd_client *bc = conn->data; - int rc; - - if (msgb_length(msg) < sizeof(*hh)) - goto invalid; - msg->l2h = &hh->data[0]; - if (hh->proto != IPAC_PROTO_OSMO) - goto invalid; - if (!he || msgb_l2len(msg) < sizeof(*he)) - goto invalid; - msg->l2h = &he->data[0]; - - if (he->proto != IPAC_PROTO_EXT_RSPRO) - goto invalid; - - LOGPFSML(bc->bankd_fi, LOGL_DEBUG, "Received RSPRO %s\n", msgb_hexdump(msg)); - - rc = bankd_handle_msg(bc, msg); - msgb_free(msg); - return rc; - -invalid: - msgb_free(msg); - return -1; -} - /* handle incoming messages from server */ static int srvc_handle_rx(struct rspro_server_conn *srvc, const RsproPDU_t *pdu) { @@ -651,18 +616,21 @@ if (!g_client->srv_conn.clslot) g_client->srv_conn.clslot = talloc_zero(g_client, ClientSlot_t); *g_client->srv_conn.clslot = pdu->msg.choice.configClientIdReq.clientSlot; + if (!g_client->bankd_conn.clslot) + g_client->bankd_conn.clslot = talloc_zero(g_client, ClientSlot_t); + *g_client->bankd_conn.clslot = *g_client->srv_conn.clslot; /* send response to server */ resp = rspro_gen_ConfigClientIdRes(ResultCode_ok); server_conn_send_rspro(srvc, resp); break; case RsproPDUchoice_PR_configClientBankReq: /* store/set the bankd ip/port as instructed by the server */ - osmo_talloc_replace_string(g_client, &g_client->bankd_host, + osmo_talloc_replace_string(g_client, &g_client->bankd_conn.server_host, rspro_IpAddr2str(&pdu->msg.choice.configClientBankReq.bankd.ip)); rspro2bank_slot(&g_client->bankd_slot, &pdu->msg.choice.configClientBankReq.bankSlot); - g_client->bankd_port = pdu->msg.choice.configClientBankReq.bankd.port; + g_client->bankd_conn.server_port = pdu->msg.choice.configClientBankReq.bankd.port; /* instruct bankd FSM to connect */ - osmo_fsm_inst_dispatch(g_client->bankd_fi, BDC_E_ESTABLISH, NULL); + osmo_fsm_inst_dispatch(g_client->bankd_conn.fi, SRVC_E_ESTABLISH, NULL); /* send response to server */ resp = rspro_gen_ConfigClientBankRes(ResultCode_ok); server_conn_send_rspro(srvc, resp); @@ -733,7 +701,7 @@ int main(int argc, char **argv) { - struct rspro_server_conn *srvc; + struct rspro_server_conn *srvc, *bankdc; struct st_transport *transp = ci->slot->transp; char *gsmtap_host = "127.0.0.1"; int rc; @@ -853,6 +821,8 @@ g_client->srv_conn.clslot = talloc_zero(g_client, ClientSlot_t); g_client->srv_conn.clslot->clientId = client_id; g_client->srv_conn.clslot->slotNr = client_slot; + g_client->bankd_conn.clslot = talloc_zero(g_client, ClientSlot_t); + *g_client->bankd_conn.clslot = *g_client->srv_conn.clslot; } srvc = &g_client->srv_conn; @@ -870,13 +840,18 @@ } osmo_fsm_inst_dispatch(srvc->fi, SRVC_E_ESTABLISH, NULL); - asn_debug = 0; - - if (bankd_conn_fsm_alloc(g_client) < 0) { - fprintf(stderr, "Unable to connect: %s\n", strerror(errno)); + bankdc = &g_client->bankd_conn; + /* server_host / server_port are configured from remsim-server */ + bankdc->handle_rx = bankd_handle_rx; + memcpy(&bankdc->own_comp_id, &srvc->own_comp_id, sizeof(bankdc->own_comp_id)); + rc = server_conn_fsm_alloc(g_client, bankdc); + if (rc < 0) { + fprintf(stderr, "Unable to create bankd conn FSM: %s\n", strerror(errno)); exit(1); } + asn_debug = 0; + // connect to SIMtrace2 cardem do { struct usb_interface_match _ifm, *ifm = &_ifm; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Icbe9881a0391fcd0c47e5d930dc764fc0cb1dfbf Gerrit-Change-Number: 16587 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:59:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:59:58 +0000 Subject: Change in osmo-remsim[master]: client: Enable libusb logging References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16593 ) Change subject: client: Enable libusb logging ...................................................................... client: Enable libusb logging Change-Id: I4818a3cd405ff042bb5748ec377c9042b825a395 --- M src/simtrace2-remsim_client.c 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/93/16593/1 diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index 622f150..633b69e 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -701,6 +701,11 @@ { NULL, 0, 0, 0 } }; +static void usb_log_cb(libusb_context *uctx, enum libusb_log_level level, const char *str) +{ + fprintf(stderr, "USB: %s", str); +} + int main(int argc, char **argv) { struct rspro_server_conn *srvc, *bankdc; @@ -804,6 +809,9 @@ goto do_exit; } + libusb_set_log_cb(NULL, usb_log_cb, LIBUSB_LOG_CB_GLOBAL); + libusb_set_option(NULL, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_INFO); + g_gti = gsmtap_source_init(gsmtap_host, GSMTAP_UDP_PORT, 0); if (!g_gti) { perror("unable to open GSMTAP"); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16593 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I4818a3cd405ff042bb5748ec377c9042b825a395 Gerrit-Change-Number: 16593 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:59:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:59:57 +0000 Subject: Change in osmo-remsim[master]: remsim-client: Differentiate the two rspro_client_fsm instances by name References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16588 ) Change subject: remsim-client: Differentiate the two rspro_client_fsm instances by name ...................................................................... remsim-client: Differentiate the two rspro_client_fsm instances by name They were both called "server", which can be confusing. Now the bankd-facing FSM has the identity of "bankd" Change-Id: I2626f92202717880c678ce219a14872538713f4e --- M src/simtrace2-remsim_client.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/88/16588/1 diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index d54e963..fc5ac55 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -849,6 +849,7 @@ fprintf(stderr, "Unable to create bankd conn FSM: %s\n", strerror(errno)); exit(1); } + osmo_fsm_inst_update_id(bankdc->fi, "bankd"); asn_debug = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I2626f92202717880c678ce219a14872538713f4e Gerrit-Change-Number: 16588 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:59:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:59:58 +0000 Subject: Change in osmo-remsim[master]: client: Enable talloc NULL context tracking References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16592 ) Change subject: client: Enable talloc NULL context tracking ...................................................................... client: Enable talloc NULL context tracking Change-Id: I41ac5437e9262cf9e5a6e92db9b733902c91755b --- M src/simtrace2-remsim_client.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/92/16592/1 diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index fc5ac55..622f150 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -648,6 +648,8 @@ { OSMO_ASSERT(signal == SIGUSR1); talloc_report_full(g_tall_ctx, stderr); + printf("===== NULL\n"); + talloc_report_full(NULL, stderr); } static void print_welcome(void) @@ -790,6 +792,7 @@ signal(SIGUSR1, handle_sig_usr1); + talloc_enable_null_tracking(); g_tall_ctx = talloc_named_const(NULL, 0, "global"); talloc_asn1_ctx = talloc_named_const(g_tall_ctx, 0, "asn1"); msgb_talloc_ctx_init(g_tall_ctx, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16592 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I41ac5437e9262cf9e5a6e92db9b733902c91755b Gerrit-Change-Number: 16592 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:59:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:59:58 +0000 Subject: Change in osmo-remsim[master]: rspro_client_fsm(): Remove outdated/wrong comment from code References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16590 ) Change subject: rspro_client_fsm(): Remove outdated/wrong comment from code ...................................................................... rspro_client_fsm(): Remove outdated/wrong comment from code Since Change-Id I55d5d61922053fd94e2b5a8cdf0d799b29feec98, rspro_dec_msg() is no longer taking ownership of the msgb. Change-Id: Ic1e9f35a2ae82b28dbb4b2ba850c257fa9629cbf --- M src/rspro_client_fsm.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/90/16590/1 diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index f0a9fff..6be2fef 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -161,8 +161,6 @@ switch (he->proto) { case IPAC_PROTO_EXT_RSPRO: LOGPFSM(srvc->fi, "Received RSPRO %s\n", msgb_hexdump(msg)); - /* respro_dec_msg() takes ownership of the input message buffer in successful - * and unsuccessful cases */ pdu = rspro_dec_msg(msg); if (!pdu) break; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ic1e9f35a2ae82b28dbb4b2ba850c257fa9629cbf Gerrit-Change-Number: 16590 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:59:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:59:59 +0000 Subject: Change in osmo-remsim[master]: bankd: Factor out signal-sending from bankd_srvc_remove_mapping() References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16594 ) Change subject: bankd: Factor out signal-sending from bankd_srvc_remove_mapping() ...................................................................... bankd: Factor out signal-sending from bankd_srvc_remove_mapping() This way we can also deliver other signals to workers. Change-Id: I86744554187d5bcee75592427990d404889f29fe --- M src/bankd/bankd_main.c 1 file changed, 19 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/94/16594/1 diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 194baef..29a13ed 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -125,6 +125,24 @@ static bool terminate = false; +/* deliver given signal 'sig' to the firts worker matching bs and cs (if given) */ +static void send_signal_to_worker(const struct bank_slot *bs, const struct client_slot *cs, int sig) +{ + struct bankd_worker *worker; + pthread_mutex_lock(&g_bankd->workers_mutex); + llist_for_each_entry(worker, &g_bankd->workers, list) { + if (bs && (bs->bank_id != worker->slot.bank_id || bs->slot_nr != worker->slot.slot_nr)) + continue; + if (cs && (cs->client_id != worker->client.clslot.client_id || + cs->slot_nr != worker->client.clslot.slot_nr)) + continue; + + pthread_kill(worker->thread, sig); + break; + } + pthread_mutex_unlock(&g_bankd->workers_mutex); +} + /* Remove a mapping */ static void bankd_srvc_remove_mapping(struct slot_mapping *map) { @@ -133,16 +151,7 @@ slotmap_del(g_bankd->slotmaps, map); /* kill/reset the respective worker, if any! */ - struct bankd_worker *worker; - pthread_mutex_lock(&g_bankd->workers_mutex); - llist_for_each_entry(worker, &g_bankd->workers, list) { - if (bs.bank_id == worker->slot.bank_id && - bs.slot_nr == worker->slot.slot_nr) { - pthread_kill(worker->thread, SIGMAPDEL); - break; - } - } - pthread_mutex_unlock(&g_bankd->workers_mutex); + send_signal_to_worker(&bs, NULL, SIGMAPDEL); } /* handle incoming messages from server */ -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I86744554187d5bcee75592427990d404889f29fe Gerrit-Change-Number: 16594 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:59:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:59:58 +0000 Subject: Change in osmo-remsim[master]: rspro_client_fsm: Fix handling of IPA keepalive References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16591 ) Change subject: rspro_client_fsm: Fix handling of IPA keepalive ...................................................................... rspro_client_fsm: Fix handling of IPA keepalive We cannot rely on the implicit IPA keepalive FSM termination, as that somehow gets the termination order wrong and we end up accessing free'd memory. Let's handle the termination explicitly: We register a callback with the IPA keepalive FSM, and once that callback gets hit, we ask the core to *not* terminate the FSM implicitly. We are anyway terminating it explicitly in st_reestablish_onenter(). Change-Id: Ia745ccb44c0d0224d1e7ab6b6da3713474111d41 --- M src/rspro_client_fsm.c M src/rspro_client_fsm.h 2 files changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/91/16591/1 diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index 6be2fef..cb51416 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -113,6 +113,7 @@ OSMO_VALUE_STRING(SRVC_E_TCP_UP), OSMO_VALUE_STRING(SRVC_E_TCP_DOWN), OSMO_VALUE_STRING(SRVC_E_KA_TIMEOUT), + OSMO_VALUE_STRING(SRVC_E_KA_TERMINATED), OSMO_VALUE_STRING(SRVC_E_CLIENT_CONN_RES), OSMO_VALUE_STRING(SRVC_E_RSPRO_TX), { 0, NULL } @@ -259,6 +260,13 @@ } } +static int ipa_kaepalive_timeout_cb(struct osmo_fsm_inst *ka_fi, void *conn) +{ + struct osmo_fsm_inst *fi = ka_fi->proc.parent; + osmo_fsm_inst_dispatch(fi, SRVC_E_KA_TIMEOUT, NULL); + return 0; /* we will explicitly terminate it */ +} + static void srvc_st_reestablish_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct rspro_server_conn *srvc = (struct rspro_server_conn *) fi->priv; @@ -290,8 +298,9 @@ LOGPFSM(fi, "Unable to create keepalive FSM\n"); exit(1); } + ipa_keepalive_fsm_set_timeout_cb(srvc->keepalive_fi, ipa_kaepalive_timeout_cb); /* ensure parent is notified once keepalive FSM instance is dying */ - osmo_fsm_inst_change_parent(srvc->keepalive_fi, srvc->fi, SRVC_E_KA_TIMEOUT); + osmo_fsm_inst_change_parent(srvc->keepalive_fi, srvc->fi, SRVC_E_KA_TERMINATED); /* Attempt to connect TCP socket */ rc = ipa_client_conn_open(srvc->conn); diff --git a/src/rspro_client_fsm.h b/src/rspro_client_fsm.h index b1c14f8..ca59c77 100644 --- a/src/rspro_client_fsm.h +++ b/src/rspro_client_fsm.h @@ -9,6 +9,7 @@ SRVC_E_TCP_UP, SRVC_E_TCP_DOWN, SRVC_E_KA_TIMEOUT, + SRVC_E_KA_TERMINATED, SRVC_E_CLIENT_CONN_RES, SRVC_E_RSPRO_TX /* transmit a RSPRO PDU to the peer */ }; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ia745ccb44c0d0224d1e7ab6b6da3713474111d41 Gerrit-Change-Number: 16591 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:59:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:59:59 +0000 Subject: Change in osmo-remsim[master]: bankd: Introduce SIGMAPADD to tell worker about new mapping References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16595 ) Change subject: bankd: Introduce SIGMAPADD to tell worker about new mapping ...................................................................... bankd: Introduce SIGMAPADD to tell worker about new mapping So far the wokrer used to sleep 10s and only check in those intervals if [finally] a mapping had arrived. Using SIGMAPADD, we can directly break the worker out of its select() call and hence make it pick up a new mapping instantaneously. This also makes RemsimBankd_Tests.TC_removeMapping_connected() pass Change-Id: If0130ab4b49ffcae6ab7a8b9926a6d9477eb3981 --- M src/bankd/bankd_main.c 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/95/16595/1 diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 29a13ed..af25ded 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -53,9 +53,11 @@ /* signal indicates to worker thread that its map has been deleted */ #define SIGMAPDEL SIGRTMIN+1 +#define SIGMAPADD SIGRTMIN+2 static void handle_sig_usr1(int sig); static void handle_sig_mapdel(int sig); +static void handle_sig_mapadd(int sig); __thread void *talloc_asn1_ctx; struct bankd *g_bankd; @@ -203,8 +205,10 @@ if (!map) { LOGPFSML(srvc->fi, LOGL_ERROR, "could not create slotmap\n"); resp = rspro_gen_CreateMappingRes(ResultCode_illegalSlotId); - } else + } else { + send_signal_to_worker(NULL, &cs, SIGMAPADD); resp = rspro_gen_CreateMappingRes(ResultCode_ok); + } } send_resp: server_conn_send_rspro(srvc, resp); @@ -359,6 +363,7 @@ g_bankd->main = pthread_self(); signal(SIGMAPDEL, handle_sig_mapdel); + signal(SIGMAPADD, handle_sig_mapadd); signal(SIGUSR1, handle_sig_usr1); /* Np lock or mutex required for the pcsc_slot_names list, as this is only @@ -448,6 +453,13 @@ } } +/* signal handler for receiving SIGMAPADD from main thread */ +static void handle_sig_mapadd(int sig) +{ + LOGW(g_worker, "SIGMAPADD received\n"); + /* do nothing */ +} + static void handle_sig_usr1(int sig) { OSMO_ASSERT(sig == SIGUSR1); @@ -769,6 +781,8 @@ if (rc == -1 && errno == EINTR) { if (worker->state == BW_ST_CONN_CLIENT_UNMAPPED) return -23; + else + worker_try_slotmap(worker); goto restart_wait; } else if (rc < 0) return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: If0130ab4b49ffcae6ab7a8b9926a6d9477eb3981 Gerrit-Change-Number: 16595 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 22:59:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 22:59:57 +0000 Subject: Change in osmo-remsim[master]: rspro_client_fsm: Mark ipa_client_conn_send_rspro() as static References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16589 ) Change subject: rspro_client_fsm: Mark ipa_client_conn_send_rspro() as static ...................................................................... rspro_client_fsm: Mark ipa_client_conn_send_rspro() as static Change-Id: Icc2f9e984dee4a2f1f604beee6c9081ecf032dd2 --- M src/rspro_client_fsm.c M src/rspro_client_fsm.h 2 files changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/89/16589/1 diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index 91e91eb..f0a9fff 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -64,7 +64,7 @@ /* msg_tx is now queued and will be freed. */ } -int ipa_client_conn_send_rspro(struct ipa_client_conn *ipa, RsproPDU_t *rspro) +static int ipa_client_conn_send_rspro(struct ipa_client_conn *ipa, RsproPDU_t *rspro) { struct msgb *msg = rspro_enc_msg(rspro); if (!msg) { diff --git a/src/rspro_client_fsm.h b/src/rspro_client_fsm.h index 7a998dc..b1c14f8 100644 --- a/src/rspro_client_fsm.h +++ b/src/rspro_client_fsm.h @@ -44,6 +44,5 @@ } bankd; }; -int ipa_client_conn_send_rspro(struct ipa_client_conn *ipa, RsproPDU_t *rspro); int server_conn_send_rspro(struct rspro_server_conn *srvc, RsproPDU_t *rspro); int server_conn_fsm_alloc(void *ctx, struct rspro_server_conn *srvc); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Icc2f9e984dee4a2f1f604beee6c9081ecf032dd2 Gerrit-Change-Number: 16589 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 23:00:21 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 23:00:21 +0000 Subject: Change in simtrace2[master]: cardem: Fix memory leak on unsupported SIMTRACE_MSGT_DT_CEMU_CARDINSERT In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16585 ) Change subject: cardem: Fix memory leak on unsupported SIMTRACE_MSGT_DT_CEMU_CARDINSERT ...................................................................... cardem: Fix memory leak on unsupported SIMTRACE_MSGT_DT_CEMU_CARDINSERT Some boards like QMOD cannot simulate a virtual card insert signal towards the modem (as the mPCIe connector doesn't have that signal). In these situations, we were aborting processing of the related OUT endpoint command and forgot to release the related memory. Change-Id: I489097b7e332004e0f2beca0b22fa36d5d1d31b5 Related: OS#4251 --- M firmware/libcommon/source/mode_cardemu.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c index 704e6ba..1669c2d 100644 --- a/firmware/libcommon/source/mode_cardemu.c +++ b/firmware/libcommon/source/mode_cardemu.c @@ -505,6 +505,7 @@ if (!ci->pin_insert.pio) { TRACE_INFO("%u: skipping unsupported card_insert to %s\r\n", ci->num, cardins->card_insert ? "INSERTED" : "REMOVED"); + usb_buf_free(msg); break; } TRACE_INFO("%u: set card_insert to %s\r\n", ci->num, -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16585 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I489097b7e332004e0f2beca0b22fa36d5d1d31b5 Gerrit-Change-Number: 16585 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 23:02:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 23:02:18 +0000 Subject: Change in osmo-remsim[master]: rspro_client_fsm: Make RSPRO transmit use FSM event In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16586 ) Change subject: rspro_client_fsm: Make RSPRO transmit use FSM event ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I3c403507fa11c068d7503107857fbd5676ce135f Gerrit-Change-Number: 16586 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sat, 14 Dec 2019 23:02:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 23:02:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 23:02:35 +0000 Subject: Change in osmo-remsim[master]: bankd: Factor out signal-sending from bankd_srvc_remove_mapping() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16594 ) Change subject: bankd: Factor out signal-sending from bankd_srvc_remove_mapping() ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I86744554187d5bcee75592427990d404889f29fe Gerrit-Change-Number: 16594 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sat, 14 Dec 2019 23:02:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 23:02:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 23:02:37 +0000 Subject: Change in osmo-remsim[master]: bankd: Introduce SIGMAPADD to tell worker about new mapping In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16595 ) Change subject: bankd: Introduce SIGMAPADD to tell worker about new mapping ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: If0130ab4b49ffcae6ab7a8b9926a6d9477eb3981 Gerrit-Change-Number: 16595 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sat, 14 Dec 2019 23:02:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 23:03:31 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 23:03:31 +0000 Subject: Change in osmo-remsim[master]: rspro_client_fsm: Disable automatic connect on FSM allocation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16499 ) Change subject: rspro_client_fsm: Disable automatic connect on FSM allocation ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16499 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Icd882405f2ef54e10a66054829c089e4985f1d1f Gerrit-Change-Number: 16499 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 14 Dec 2019 23:03:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 23:06:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 23:06:32 +0000 Subject: Change in osmo-remsim[master]: Replace bankd_client_fsm with rspro_client_fsm In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-remsim/+/16587 to look at the new patch set (#2). Change subject: Replace bankd_client_fsm with rspro_client_fsm ...................................................................... Replace bankd_client_fsm with rspro_client_fsm There was a lot of similarity between the bankd_client_fsm (for the client->bankd RSPRO connection) and the rspro_client_fsm (for the client->server and the bankd->server RSPRO connections). With the last few commits introducing the missing features to rspro_client_fsm, we can completely obsolete bankd_client_fsm and further simplify the codebase. Change-Id: Icbe9881a0391fcd0c47e5d930dc764fc0cb1dfbf --- M src/Makefile.am D src/bankd_client_fsm.c M src/client.h M src/simtrace2-remsim_client.c 4 files changed, 34 insertions(+), 357 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/87/16587/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Icbe9881a0391fcd0c47e5d930dc764fc0cb1dfbf Gerrit-Change-Number: 16587 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 23:06:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 23:06:59 +0000 Subject: Change in osmo-remsim[master]: Replace bankd_client_fsm with rspro_client_fsm In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16587 ) Change subject: Replace bankd_client_fsm with rspro_client_fsm ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-remsim/+/16587/1/src/client.h File src/client.h: https://gerrit.osmocom.org/c/osmo-remsim/+/16587/1/src/client.h at 24 PS1, Line 24: #if 0 : /* connection to the remsim-bankd */ : char *bankd_host; : uint16_t bankd_port; : struct ipa_client_conn *bankd_conn; : struct osmo_fsm_inst this should be removed -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Icbe9881a0391fcd0c47e5d930dc764fc0cb1dfbf Gerrit-Change-Number: 16587 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 14 Dec 2019 23:06:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 23:08:09 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 23:08:09 +0000 Subject: Change in osmo-remsim[master]: Replace bankd_client_fsm with rspro_client_fsm In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16587 ) Change subject: Replace bankd_client_fsm with rspro_client_fsm ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Icbe9881a0391fcd0c47e5d930dc764fc0cb1dfbf Gerrit-Change-Number: 16587 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 14 Dec 2019 23:08:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 23:08:14 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 23:08:14 +0000 Subject: Change in osmo-remsim[master]: remsim-client: Differentiate the two rspro_client_fsm instances by name In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16588 ) Change subject: remsim-client: Differentiate the two rspro_client_fsm instances by name ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I2626f92202717880c678ce219a14872538713f4e Gerrit-Change-Number: 16588 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 14 Dec 2019 23:08:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 23:08:26 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 23:08:26 +0000 Subject: Change in osmo-remsim[master]: rspro_client_fsm: Mark ipa_client_conn_send_rspro() as static In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16589 ) Change subject: rspro_client_fsm: Mark ipa_client_conn_send_rspro() as static ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Icc2f9e984dee4a2f1f604beee6c9081ecf032dd2 Gerrit-Change-Number: 16589 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 14 Dec 2019 23:08:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 23:08:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 23:08:32 +0000 Subject: Change in osmo-remsim[master]: rspro_client_fsm(): Remove outdated/wrong comment from code In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16590 ) Change subject: rspro_client_fsm(): Remove outdated/wrong comment from code ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ic1e9f35a2ae82b28dbb4b2ba850c257fa9629cbf Gerrit-Change-Number: 16590 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 14 Dec 2019 23:08:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 23:12:04 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 23:12:04 +0000 Subject: Change in osmo-remsim[master]: rspro_client_fsm: Fix uninitialized return variable use References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16596 ) Change subject: rspro_client_fsm: Fix uninitialized return variable use ...................................................................... rspro_client_fsm: Fix uninitialized return variable use rspro_client_fsm.c:180:9: warning: ?rc? may be used uninitialized in this function [-Wmaybe-uninitialized] 180 | return rc; | ^~ Change-Id: I64b275b06b2aa40bd7c6e1dd42afba5ffebd7b00 --- M src/rspro_client_fsm.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/96/16596/1 diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index 6be2fef..eea8471 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -162,8 +162,10 @@ case IPAC_PROTO_EXT_RSPRO: LOGPFSM(srvc->fi, "Received RSPRO %s\n", msgb_hexdump(msg)); pdu = rspro_dec_msg(msg); - if (!pdu) + if (!pdu) { + rc = -EIO; break; + } rc = srvc->handle_rx(srvc, pdu); ASN_STRUCT_FREE(asn_DEF_RsproPDU, pdu); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I64b275b06b2aa40bd7c6e1dd42afba5ffebd7b00 Gerrit-Change-Number: 16596 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 23:12:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 23:12:30 +0000 Subject: Change in osmo-remsim[master]: rspro_client_fsm: Fix uninitialized return variable use In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16596 ) Change subject: rspro_client_fsm: Fix uninitialized return variable use ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I64b275b06b2aa40bd7c6e1dd42afba5ffebd7b00 Gerrit-Change-Number: 16596 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sat, 14 Dec 2019 23:12:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 23:12:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 23:12:32 +0000 Subject: Change in osmo-remsim[master]: rspro_client_fsm: Disable automatic connect on FSM allocation In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16499 ) Change subject: rspro_client_fsm: Disable automatic connect on FSM allocation ...................................................................... rspro_client_fsm: Disable automatic connect on FSM allocation So far, the rspor_client_fsm immediately attempted to establish a TCP connection to the RSPRO server when calling server_conn_fsm_alloc(). Let's make this implicit auto-connect an explicit request to connect using the newly-introduced SRVC_E_ESTABLISH. Let's also change all three existing users of server_conn_fsm_alloc() to send SRVC_E_ESTABLISH after calling it. The rationale of this change is to use the same rspro_client_fsm also for the client->bankd RSPRO connection, where we don't want to automatically connect at startup, but connect only at a later point, after the server a has told us to do so. Change-Id: Icd882405f2ef54e10a66054829c089e4985f1d1f --- M src/bankd/bankd_main.c M src/remsim_client.c M src/rspro_client_fsm.c M src/rspro_client_fsm.h M src/simtrace2-remsim_client.c 5 files changed, 52 insertions(+), 51 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index a204be5..194baef 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -363,6 +363,7 @@ fprintf(stderr, "Unable to create Server conn FSM: %s\n", strerror(errno)); exit(1); } + osmo_fsm_inst_dispatch(srvc->fi, SRVC_E_ESTABLISH, NULL); /* create listening socket for inbound client connections */ rc = osmo_sock_init(AF_INET, SOCK_STREAM, IPPROTO_TCP, g_bind_ip, g_bind_port, OSMO_SOCK_F_BIND); diff --git a/src/remsim_client.c b/src/remsim_client.c index 0bfc0a4..ca6143e 100644 --- a/src/remsim_client.c +++ b/src/remsim_client.c @@ -255,6 +255,7 @@ fprintf(stderr, "Unable to create Server conn FSM: %s\n", strerror(errno)); exit(1); } + osmo_fsm_inst_dispatch(srvc->fi, SRVC_E_ESTABLISH, NULL); asn_debug = 0; diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index 7045778..9f2d7c0 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -100,6 +100,7 @@ }; static const struct value_string server_conn_fsm_event_names[] = { + OSMO_VALUE_STRING(SRVC_E_ESTABLISH), OSMO_VALUE_STRING(SRVC_E_TCP_UP), OSMO_VALUE_STRING(SRVC_E_TCP_DOWN), OSMO_VALUE_STRING(SRVC_E_KA_TIMEOUT), @@ -180,52 +181,10 @@ .wait_for_resp = 10, }; -static void srvc_st_init_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) -{ - struct rspro_server_conn *srvc = (struct rspro_server_conn *) fi->priv; - int rc; - - srvc->conn = ipa_client_conn_create(fi, NULL, 0, srvc->server_host, srvc->server_port, - srvc_updown_cb, srvc_read_cb, NULL, srvc); - if (!srvc->conn) { - LOGPFSM(fi, "Unable to create socket: %s\n", strerror(errno)); - goto out_fi; - } - - srvc->keepalive_fi = ipa_client_conn_alloc_keepalive_fsm(srvc->conn, &ka_params, fi->id); - if (!srvc->keepalive_fi) { - LOGPFSM(fi, "Unable to create keepalive FSM\n"); - goto out_conn; - } - /* ensure parent is notified once keepalive FSM instance is dying */ - osmo_fsm_inst_change_parent(srvc->keepalive_fi, srvc->fi, SRVC_E_KA_TIMEOUT); - - /* Attempt to connect TCP socket */ - rc = ipa_client_conn_open(srvc->conn); - if (rc < 0) { - LOGPFSML(fi, LOGL_NOTICE, "Unable to connect: %s\n", strerror(errno)); - goto out_ka; - } - - return; - -out_ka: - osmo_fsm_inst_term(srvc->keepalive_fi, OSMO_FSM_TERM_ERROR, NULL); -out_conn: - ipa_client_conn_destroy(srvc->conn); -out_fi: - osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); -} - static void srvc_st_init(struct osmo_fsm_inst *fi, uint32_t event, void *data) { switch (event) { - case SRVC_E_TCP_UP: - osmo_fsm_inst_state_chg(fi, SRVC_ST_ESTABLISHED, T1_WAIT_CLIENT_CONN_RES, 1); - break; - case SRVC_E_TCP_DOWN: - osmo_fsm_inst_state_chg(fi, SRVC_ST_REESTABLISH, T2_RECONNECT, 2); - break; + case SRVC_E_ESTABLISH: default: OSMO_ASSERT(0); } @@ -290,12 +249,39 @@ struct rspro_server_conn *srvc = (struct rspro_server_conn *) fi->priv; int rc; - ipa_keepalive_fsm_stop(srvc->keepalive_fi); + if (srvc->keepalive_fi) { + ipa_keepalive_fsm_stop(srvc->keepalive_fi); + osmo_fsm_inst_term(srvc->keepalive_fi, OSMO_FSM_TERM_REGULAR, NULL); + srvc->keepalive_fi = NULL; + } + + if (srvc->conn) { + LOGPFSML(fi, LOGL_INFO, "Destroying existing connection to server\n"); + ipa_client_conn_close(srvc->conn); + ipa_client_conn_destroy(srvc->conn); + srvc->conn = NULL; + } + LOGPFSML(fi, LOGL_INFO, "Creating TCP connection to server at %s:%u\n", + srvc->server_host, srvc->server_port); + srvc->conn = ipa_client_conn_create(fi, NULL, 0, srvc->server_host, srvc->server_port, + srvc_updown_cb, srvc_read_cb, NULL, srvc); + if (!srvc->conn) { + LOGPFSML(fi, LOGL_FATAL, "Unable to create socket: %s\n", strerror(errno)); + exit(1); + } + + srvc->keepalive_fi = ipa_client_conn_alloc_keepalive_fsm(srvc->conn, &ka_params, fi->id); + if (!srvc->keepalive_fi) { + LOGPFSM(fi, "Unable to create keepalive FSM\n"); + exit(1); + } + /* ensure parent is notified once keepalive FSM instance is dying */ + osmo_fsm_inst_change_parent(srvc->keepalive_fi, srvc->fi, SRVC_E_KA_TIMEOUT); /* Attempt to connect TCP socket */ rc = ipa_client_conn_open(srvc->conn); if (rc < 0) { - LOGPFSM(fi, "Unable to connect RSPRO to %s:%d - %s\n", + LOGPFSML(fi, LOGL_FATAL, "Unable to connect RSPRO to %s:%u - %s\n", srvc->server_host, srvc->server_port, strerror(errno)); /* FIXME: retry? Timer? Abort? */ OSMO_ASSERT(0); @@ -316,16 +302,28 @@ } } +static void srvc_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch (event) { + case SRVC_E_ESTABLISH: + osmo_fsm_inst_state_chg(fi, SRVC_ST_REESTABLISH, T2_RECONNECT, 2); + break; + default: + OSMO_ASSERT(0); + } +} + static int server_conn_fsm_timer_cb(struct osmo_fsm_inst *fi) { struct rspro_server_conn *srvc = (struct rspro_server_conn *) fi->priv; switch (fi->T) { case 2: + /* TCP reconnect failed: retry */ osmo_fsm_inst_state_chg(fi, SRVC_ST_REESTABLISH, T2_RECONNECT, 2); break; case 1: - /* close connection and re-start connection attempt */ + /* no ClientConnectRes received: disconnect + reconnect */ ipa_client_conn_close(srvc->conn); osmo_fsm_inst_dispatch(fi, SRVC_E_TCP_DOWN, NULL); break; @@ -339,10 +337,9 @@ static const struct osmo_fsm_state server_conn_fsm_states[] = { [SRVC_ST_INIT] = { .name = "INIT", - .in_event_mask = S(SRVC_E_TCP_UP) | S(SRVC_E_TCP_DOWN), - .out_state_mask = S(SRVC_ST_ESTABLISHED) | S(SRVC_ST_REESTABLISH), + .in_event_mask = 0, /* S(SRVC_E_ESTABLISH) via allstate */ + .out_state_mask = S(SRVC_ST_REESTABLISH), .action = srvc_st_init, - .onenter = srvc_st_init_onenter, }, [SRVC_ST_ESTABLISHED] = { .name = "ESTABLISHED", @@ -370,6 +367,8 @@ .name = "RSPRO_CLIENT", .states = server_conn_fsm_states, .num_states = ARRAY_SIZE(server_conn_fsm_states), + .allstate_event_mask = S(SRVC_E_ESTABLISH), + .allstate_action = srvc_allstate_action, .timer_cb = server_conn_fsm_timer_cb, .log_subsys = DMAIN, .event_names = server_conn_fsm_event_names, @@ -384,8 +383,6 @@ return -1; srvc->fi = fi; - /* onenter of the initial state is not automatically executed by osmo_fsm :( */ - srvc_st_init_onenter(fi, 0); return 0; } diff --git a/src/rspro_client_fsm.h b/src/rspro_client_fsm.h index 8e7f58c..c11e260 100644 --- a/src/rspro_client_fsm.h +++ b/src/rspro_client_fsm.h @@ -5,6 +5,7 @@ #include enum server_conn_fsm_event { + SRVC_E_ESTABLISH, /* instruct SRVC to (re)etablish TCP connection to bankd */ SRVC_E_TCP_UP, SRVC_E_TCP_DOWN, SRVC_E_KA_TIMEOUT, diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index 69d6a04..19f84a3 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -868,6 +868,7 @@ fprintf(stderr, "Unable to create Server conn FSM: %s\n", strerror(errno)); exit(1); } + osmo_fsm_inst_dispatch(srvc->fi, SRVC_E_ESTABLISH, NULL); asn_debug = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16499 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Icd882405f2ef54e10a66054829c089e4985f1d1f Gerrit-Change-Number: 16499 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 23:12:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 23:12:32 +0000 Subject: Change in osmo-remsim[master]: rspro_client_fsm: Make RSPRO transmit use FSM event In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16586 ) Change subject: rspro_client_fsm: Make RSPRO transmit use FSM event ...................................................................... rspro_client_fsm: Make RSPRO transmit use FSM event This way we can easily guarantee that RSPRO transmit will only happen in the fully established state, and that violations of that rule will generate error logs by means of osmo_fsm core logging code. Change-Id: I3c403507fa11c068d7503107857fbd5676ce135f --- M src/rspro_client_fsm.c M src/rspro_client_fsm.h 2 files changed, 22 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index 9f2d7c0..91e91eb 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -77,6 +77,12 @@ return 0; } +static int _server_conn_send_rspro(struct rspro_server_conn *srvc, RsproPDU_t *rspro) +{ + LOGPFSM(srvc->fi, "Tx RSPRO %s\n", rspro_msgt_name(rspro)); + return ipa_client_conn_send_rspro(srvc->conn, rspro); +} + int server_conn_send_rspro(struct rspro_server_conn *srvc, RsproPDU_t *rspro) { if (!rspro) { @@ -84,8 +90,11 @@ osmo_log_backtrace(DMAIN, LOGL_ERROR); return -EINVAL; } - LOGPFSM(srvc->fi, "Tx RSPRO %s\n", rspro_msgt_name(rspro)); - return ipa_client_conn_send_rspro(srvc->conn, rspro); + if (osmo_fsm_inst_dispatch(srvc->fi, SRVC_E_RSPRO_TX, rspro) < 0) { + ASN_STRUCT_FREE(asn_DEF_RsproPDU, rspro); + return -EPERM; + } + return 0; } enum server_conn_fsm_state { @@ -105,6 +114,7 @@ OSMO_VALUE_STRING(SRVC_E_TCP_DOWN), OSMO_VALUE_STRING(SRVC_E_KA_TIMEOUT), OSMO_VALUE_STRING(SRVC_E_CLIENT_CONN_RES), + OSMO_VALUE_STRING(SRVC_E_RSPRO_TX), { 0, NULL } }; @@ -202,7 +212,7 @@ else pdu = rspro_gen_ConnectBankReq(&srvc->own_comp_id, srvc->bankd.bank_id, srvc->bankd.num_slots); - server_conn_send_rspro(srvc, pdu); + _server_conn_send_rspro(srvc, pdu); } static void srvc_st_established(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -234,11 +244,18 @@ static void srvc_st_connected(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct rspro_server_conn *srvc = (struct rspro_server_conn *) fi->priv; + RsproPDU_t *pdu = NULL; + switch (event) { case SRVC_E_TCP_DOWN: case SRVC_E_KA_TIMEOUT: osmo_fsm_inst_state_chg(fi, SRVC_ST_REESTABLISH, T2_RECONNECT, 2); break; + case SRVC_E_RSPRO_TX: + pdu = data; + _server_conn_send_rspro(srvc, pdu); + break; default: OSMO_ASSERT(0); } @@ -350,7 +367,7 @@ }, [SRVC_ST_CONNECTED] = { .name = "CONNECTED", - .in_event_mask = S(SRVC_E_TCP_DOWN) | S(SRVC_E_KA_TIMEOUT), + .in_event_mask = S(SRVC_E_TCP_DOWN) | S(SRVC_E_KA_TIMEOUT) | S(SRVC_E_RSPRO_TX), .out_state_mask = S(SRVC_ST_REESTABLISH), .action = srvc_st_connected, }, diff --git a/src/rspro_client_fsm.h b/src/rspro_client_fsm.h index c11e260..7a998dc 100644 --- a/src/rspro_client_fsm.h +++ b/src/rspro_client_fsm.h @@ -10,6 +10,7 @@ SRVC_E_TCP_DOWN, SRVC_E_KA_TIMEOUT, SRVC_E_CLIENT_CONN_RES, + SRVC_E_RSPRO_TX /* transmit a RSPRO PDU to the peer */ }; struct rspro_server_conn; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I3c403507fa11c068d7503107857fbd5676ce135f Gerrit-Change-Number: 16586 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 23:12:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 23:12:33 +0000 Subject: Change in osmo-remsim[master]: Replace bankd_client_fsm with rspro_client_fsm In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16587 ) Change subject: Replace bankd_client_fsm with rspro_client_fsm ...................................................................... Replace bankd_client_fsm with rspro_client_fsm There was a lot of similarity between the bankd_client_fsm (for the client->bankd RSPRO connection) and the rspro_client_fsm (for the client->server and the bankd->server RSPRO connections). With the last few commits introducing the missing features to rspro_client_fsm, we can completely obsolete bankd_client_fsm and further simplify the codebase. Change-Id: Icbe9881a0391fcd0c47e5d930dc764fc0cb1dfbf --- M src/Makefile.am D src/bankd_client_fsm.c M src/client.h M src/simtrace2-remsim_client.c 4 files changed, 34 insertions(+), 357 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/Makefile.am b/src/Makefile.am index fa0f732..35da621 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,12 +28,12 @@ bin_PROGRAMS = osmo-remsim-client-st2 -remsim_client_SOURCES = remsim_client.c rspro_client_fsm.c bankd_client_fsm.c debug.c +remsim_client_SOURCES = remsim_client.c rspro_client_fsm.c debug.c remsim_client_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \ libosmo-rspro.la osmo_remsim_client_st2_SOURCES = simtrace2-remsim_client.c \ - bankd_client_fsm.c rspro_client_fsm.c debug.c \ + rspro_client_fsm.c debug.c \ simtrace2/apdu_dispatch.c \ simtrace2/simtrace2-discovery.c \ simtrace2/libusb_util.c diff --git a/src/bankd_client_fsm.c b/src/bankd_client_fsm.c deleted file mode 100644 index 7ddc065..0000000 --- a/src/bankd_client_fsm.c +++ /dev/null @@ -1,278 +0,0 @@ -/* (C) 2018-2019 by Harald Welte - * - * All Rights Reserved - * - * SPDX-License-Identifier: GPL-2.0+ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - */ -#include -#include -#include - -#include - -#include -#include -#include -#include - -#include -#include - -#include "client.h" -#include "rspro_util.h" - -#define S(x) (1 << (x)) - -static void bankd_updown_cb(struct ipa_client_conn *conn, int up) -{ - struct bankd_client *bc = conn->data; - - printf("RSPRO link to %s:%d %s\n", conn->addr, conn->port, up ? "UP" : "DOWN"); - - osmo_fsm_inst_dispatch(bc->bankd_fi, up ? BDC_E_TCP_UP: BDC_E_TCP_DOWN, 0); -} - -/* internal function, bypassing FSM state */ -static int _bankd_conn_send_rspro(struct bankd_client *bc, RsproPDU_t *rspro) -{ - return ipa_client_conn_send_rspro(bc->bankd_conn, rspro); -} - -int bankd_conn_send_rspro(struct bankd_client *bc, RsproPDU_t *rspro) -{ - if (osmo_fsm_inst_dispatch(bc->bankd_fi, BDC_E_RSPRO_TX, rspro) < 0) { - ASN_STRUCT_FREE(asn_DEF_RsproPDU, rspro); - return -1; - } - return 0; -} - -/*********************************************************************** - * client-side FSM for RSPRO connection to remsim-bankd - * - * This is part of remsim-client and manages the connection to remsim-bankd, - * over which actual TPDU exchanges happen. - ***********************************************************************/ - -enum bankd_conn_fsm_state { - /* waiting for initial connection to remsim-bankd */ - BDC_ST_INIT, - /* bankd connection established, waiting for ClientConnectRes */ - BDC_ST_ESTABLISHED, - /* bankd connection established, ClientConnect succeeded */ - BDC_ST_CONNECTED, - /* connection lost, we're waiting for a re-establish */ - BDC_ST_REESTABLISH, -}; - -static const struct value_string remsim_client_bankd_fsm_event_names[] = { - OSMO_VALUE_STRING(BDC_E_ESTABLISH), - OSMO_VALUE_STRING(BDC_E_TCP_UP), - OSMO_VALUE_STRING(BDC_E_TCP_DOWN), - OSMO_VALUE_STRING(BDC_E_CLIENT_CONN_RES), - OSMO_VALUE_STRING(BDC_E_RSPRO_TX), - { 0, NULL } -}; - -#define T1_WAIT_CLIENT_CONN_RES 10 -#define T2_RECONNECT 10 - - -static void bdc_st_init(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - switch (event) { - case BDC_E_ESTABLISH: - osmo_fsm_inst_state_chg(fi, BDC_ST_REESTABLISH, T2_RECONNECT, 2); - break; - default: - OSMO_ASSERT(0); - } -} - -static void bdc_st_established_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) -{ - struct bankd_client *bc = (struct bankd_client *) fi->priv; - RsproPDU_t *pdu; - - /* Send ClientConnReq */ - pdu = rspro_gen_ConnectClientReq(&bc->srv_conn.own_comp_id, bc->srv_conn.clslot); - _bankd_conn_send_rspro(bc, pdu); -} - -static void bdc_st_established(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - switch (event) { - case BDC_E_TCP_DOWN: - osmo_fsm_inst_state_chg(fi, BDC_ST_REESTABLISH, T2_RECONNECT, 2); - break; - case BDC_E_CLIENT_CONN_RES: - /* somehow notify the main code? */ - osmo_fsm_inst_state_chg(fi, BDC_ST_CONNECTED, 0, 0); - break; - default: - OSMO_ASSERT(0); - } -} - -static void bdc_st_connected(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - struct bankd_client *bc = (struct bankd_client *) fi->priv; - RsproPDU_t *pdu = NULL; - - switch (event) { - case BDC_E_TCP_DOWN: - osmo_fsm_inst_state_chg(fi, BDC_ST_REESTABLISH, T2_RECONNECT, 2); - break; - case BDC_E_RSPRO_TX: - pdu = data; - _bankd_conn_send_rspro(bc, pdu); - break; - default: - OSMO_ASSERT(0); - } -} - -static void bdc_st_reestablish_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) -{ - struct bankd_client *bc = (struct bankd_client *) fi->priv; - int rc; - - /* re-create bankd_conn */ - if (bc->bankd_conn) { - LOGPFSML(fi, LOGL_INFO, "Destroying existing connection to bankd\n"); - ipa_client_conn_close(bc->bankd_conn); - ipa_client_conn_destroy(bc->bankd_conn); - bc->bankd_conn = NULL; - } - LOGPFSML(fi, LOGL_INFO, "Creating TCP connection to bankd at %s:%u\n", - bc->bankd_host, bc->bankd_port); - bc->bankd_conn = ipa_client_conn_create(bc, NULL, 0, bc->bankd_host, bc->bankd_port, - bankd_updown_cb, bankd_read_cb, NULL, bc); - if (!bc->bankd_conn) { - fprintf(stderr, "Unable to create socket: %s\n", strerror(errno)); - exit(1); - } - - /* Attempt to connect TCP socket */ - rc = ipa_client_conn_open(bc->bankd_conn); - if (rc < 0) { - fprintf(stderr, "Unable to connect RSPRO to %s:%d - %s\n", - bc->bankd_conn->addr, bc->bankd_conn->port, strerror(errno)); - /* FIXME: retry? Timer? Abort? */ - OSMO_ASSERT(0); - } -} - -static void bdc_st_reestablish(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - switch (event) { - case BDC_E_TCP_UP: - osmo_fsm_inst_state_chg(fi, BDC_ST_ESTABLISHED, T1_WAIT_CLIENT_CONN_RES, 1); - break; - case BDC_E_TCP_DOWN: - /* wait for normal T2 timeout */ - break; - default: - OSMO_ASSERT(0); - } -} - -static void bdc_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - switch (event) { - case BDC_E_ESTABLISH: - osmo_fsm_inst_state_chg(fi, BDC_ST_REESTABLISH, T2_RECONNECT, 2); - break; - default: - OSMO_ASSERT(0); - } -} - -static int remsim_client_bankd_fsm_timer_cb(struct osmo_fsm_inst *fi) -{ - switch (fi->T) { - case 2: - /* TCP reconnect failed: retry */ - osmo_fsm_inst_state_chg(fi, BDC_ST_REESTABLISH, T2_RECONNECT, 2); - break; - case 1: - /* no ClientConnectRes received: disconnect + reconnect */ - osmo_fsm_inst_state_chg(fi, BDC_ST_REESTABLISH, T2_RECONNECT, 2); - break; - default: - OSMO_ASSERT(0); - } - return 0; -} - -static const struct osmo_fsm_state bankd_conn_fsm_states[] = { - [BDC_ST_INIT] = { - .name = "INIT", - .in_event_mask = 0, /* S(BDC_E_ESTABLISH) via allstate */ - .out_state_mask = S(BDC_ST_REESTABLISH), - .action = bdc_st_init, - }, - [BDC_ST_ESTABLISHED] = { - .name = "ESTABLISHED", - .in_event_mask = S(BDC_E_TCP_DOWN) | S(BDC_E_CLIENT_CONN_RES), - .out_state_mask = S(BDC_ST_CONNECTED) | S(BDC_ST_REESTABLISH), - .action = bdc_st_established, - .onenter = bdc_st_established_onenter, - }, - [BDC_ST_CONNECTED] = { - .name = "CONNECTED", - .in_event_mask = S(BDC_E_TCP_DOWN) | S(BDC_E_RSPRO_TX), - .out_state_mask = S(BDC_ST_REESTABLISH), - .action = bdc_st_connected, - }, - [BDC_ST_REESTABLISH] = { - .name = "REESTABLISH", - .in_event_mask = S(BDC_E_TCP_UP) | S(BDC_E_TCP_DOWN), - .out_state_mask = S(BDC_ST_ESTABLISHED) | S(BDC_ST_REESTABLISH), - .action = bdc_st_reestablish, - .onenter = bdc_st_reestablish_onenter, - }, -}; - -struct osmo_fsm remsim_client_bankd_fsm = { - .name = "BANKD_CONN", - .states = bankd_conn_fsm_states, - .num_states = ARRAY_SIZE(bankd_conn_fsm_states), - .allstate_event_mask = S(BDC_E_ESTABLISH), - .allstate_action = bdc_allstate_action, - .timer_cb = remsim_client_bankd_fsm_timer_cb, - .log_subsys = DMAIN, - .event_names = remsim_client_bankd_fsm_event_names, -}; - -int bankd_conn_fsm_alloc(struct bankd_client *bc) -{ - struct osmo_fsm_inst *fi; - - fi = osmo_fsm_inst_alloc(&remsim_client_bankd_fsm, bc, bc, LOGL_DEBUG, "bankd"); - if (!fi) - return -1; - - bc->bankd_fi = fi; - return 0; -} - -static __attribute__((constructor)) void on_dso_load(void) -{ - OSMO_ASSERT(osmo_fsm_register(&remsim_client_bankd_fsm) == 0); -} diff --git a/src/client.h b/src/client.h index 80edaa3..96a454f 100644 --- a/src/client.h +++ b/src/client.h @@ -9,36 +9,16 @@ #include "slotmap.h" #include "debug.h" -/* fsm.c */ - -enum bankd_conn_fsm_event { - BDC_E_ESTABLISH, /* instruct BDC to (re)etablish TCP connection to bankd */ - BDC_E_TCP_UP, /* notify BDC that TCP connection is up/connected */ - BDC_E_TCP_DOWN, /* notify BDC that TCP connection is down/disconnected */ - BDC_E_CLIENT_CONN_RES, /* notify BDC that ClientConnectRes has been received */ - BDC_E_RSPRO_TX, /* transmit a RSPRO PDU to the bankd */ -}; - -extern struct osmo_fsm remsim_client_bankd_fsm; - - /* main.c */ struct bankd_client { /* connection to the remsim-server (control) */ struct rspro_server_conn srv_conn; + /* connection to the remsim-bankd (data) */ + struct rspro_server_conn bankd_conn; /* remote component ID */ struct app_comp_id peer_comp_id; - /* connection to the remsim-bankd */ - char *bankd_host; - uint16_t bankd_port; struct bank_slot bankd_slot; - struct ipa_client_conn *bankd_conn; - struct osmo_fsm_inst *bankd_fi; }; - -int bankd_conn_send_rspro(struct bankd_client *bc, RsproPDU_t *pdu); -int bankd_read_cb(struct ipa_client_conn *conn, struct msgb *msg); -int bankd_conn_fsm_alloc(struct bankd_client *bc); diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index 19f84a3..d54e963 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -430,7 +430,7 @@ BankSlot_t bslot; bank_slot2rspro(&bslot, &g_client->bankd_slot); RsproPDU_t *pdu = rspro_gen_TpduModem2Card(g_client->srv_conn.clslot, &bslot, apdu_command, sizeof(ac.hdr) + ac.lc.tot); // create RSPRO packet - bankd_conn_send_rspro(g_client, pdu); + server_conn_send_rspro(&g_client->bankd_conn, pdu); // the response will come separately } else if (ac.lc.tot > ac.lc.cur) { // there is pending data from the modem cardem_request_pb_and_rx(ci, ac.hdr.ins, ac.lc.tot - ac.lc.cur); // send procedure byte to get remaining data @@ -532,7 +532,7 @@ /** remsim_client **/ -static int bankd_handle_tpduCardToModem(struct bankd_client *bc, RsproPDU_t *pdu) +static int bankd_handle_tpduCardToModem(struct bankd_client *bc, const RsproPDU_t *pdu) { OSMO_ASSERT(pdu); OSMO_ASSERT(RsproPDUchoice_PR_tpduCardToModem == pdu->msg.present); @@ -554,7 +554,7 @@ return 0; } -static int bankd_handle_setAtrReq(struct bankd_client *bc, RsproPDU_t *pdu) +static int bankd_handle_setAtrReq(struct bankd_client *bc, const RsproPDU_t *pdu) { RsproPDU_t *resp; int rc; @@ -571,70 +571,35 @@ resp = rspro_gen_SetAtrRes(ResultCode_cardTransmissionError); if (!resp) return -ENOMEM; - bankd_conn_send_rspro(g_client, resp); + server_conn_send_rspro(&g_client->bankd_conn, resp); return 0; } -static int bankd_handle_msg(struct bankd_client *bc, struct msgb *msg) +/* handle incoming message from bankd */ +static int bankd_handle_rx(struct rspro_server_conn *bankdc, const RsproPDU_t *pdu) { - RsproPDU_t *pdu = rspro_dec_msg(msg); - if (!pdu) { - LOGPFSML(bc->bankd_fi, LOGL_ERROR, "Error decoding PDU\n"); - return -1; - } - switch (pdu->msg.present) { case RsproPDUchoice_PR_connectClientRes: /* Store 'identity' of bankd to in peer_comp_id */ - rspro_comp_id_retrieve(&bc->peer_comp_id, &pdu->msg.choice.connectClientRes.identity); - osmo_fsm_inst_dispatch(bc->bankd_fi, BDC_E_CLIENT_CONN_RES, pdu); + rspro_comp_id_retrieve(&bankdc->peer_comp_id, &pdu->msg.choice.connectClientRes.identity); + osmo_fsm_inst_dispatch(bankdc->fi, SRVC_E_CLIENT_CONN_RES, (void *) pdu); break; case RsproPDUchoice_PR_tpduCardToModem: // APDU response from card received - bankd_handle_tpduCardToModem(bc, pdu); + bankd_handle_tpduCardToModem(g_client, pdu); break; case RsproPDUchoice_PR_setAtrReq: - bankd_handle_setAtrReq(bc, pdu); + bankd_handle_setAtrReq(g_client, pdu); break; default: - LOGPFSML(bc->bankd_fi, LOGL_ERROR, "Unknown/Unsuppoerted RSPRO PDU %s: %s\n", - rspro_msgt_name(pdu), msgb_hexdump(msg)); + LOGPFSML(bankdc->fi, LOGL_ERROR, "Unknown/Unsuppoerted RSPRO PDU %s\n", + rspro_msgt_name(pdu)); return -1; } return 0; } -int bankd_read_cb(struct ipa_client_conn *conn, struct msgb *msg) -{ - struct ipaccess_head *hh = (struct ipaccess_head *) msg->data; - struct ipaccess_head_ext *he = (struct ipaccess_head_ext *) msgb_l2(msg); - struct bankd_client *bc = conn->data; - int rc; - - if (msgb_length(msg) < sizeof(*hh)) - goto invalid; - msg->l2h = &hh->data[0]; - if (hh->proto != IPAC_PROTO_OSMO) - goto invalid; - if (!he || msgb_l2len(msg) < sizeof(*he)) - goto invalid; - msg->l2h = &he->data[0]; - - if (he->proto != IPAC_PROTO_EXT_RSPRO) - goto invalid; - - LOGPFSML(bc->bankd_fi, LOGL_DEBUG, "Received RSPRO %s\n", msgb_hexdump(msg)); - - rc = bankd_handle_msg(bc, msg); - msgb_free(msg); - return rc; - -invalid: - msgb_free(msg); - return -1; -} - /* handle incoming messages from server */ static int srvc_handle_rx(struct rspro_server_conn *srvc, const RsproPDU_t *pdu) { @@ -651,18 +616,21 @@ if (!g_client->srv_conn.clslot) g_client->srv_conn.clslot = talloc_zero(g_client, ClientSlot_t); *g_client->srv_conn.clslot = pdu->msg.choice.configClientIdReq.clientSlot; + if (!g_client->bankd_conn.clslot) + g_client->bankd_conn.clslot = talloc_zero(g_client, ClientSlot_t); + *g_client->bankd_conn.clslot = *g_client->srv_conn.clslot; /* send response to server */ resp = rspro_gen_ConfigClientIdRes(ResultCode_ok); server_conn_send_rspro(srvc, resp); break; case RsproPDUchoice_PR_configClientBankReq: /* store/set the bankd ip/port as instructed by the server */ - osmo_talloc_replace_string(g_client, &g_client->bankd_host, + osmo_talloc_replace_string(g_client, &g_client->bankd_conn.server_host, rspro_IpAddr2str(&pdu->msg.choice.configClientBankReq.bankd.ip)); rspro2bank_slot(&g_client->bankd_slot, &pdu->msg.choice.configClientBankReq.bankSlot); - g_client->bankd_port = pdu->msg.choice.configClientBankReq.bankd.port; + g_client->bankd_conn.server_port = pdu->msg.choice.configClientBankReq.bankd.port; /* instruct bankd FSM to connect */ - osmo_fsm_inst_dispatch(g_client->bankd_fi, BDC_E_ESTABLISH, NULL); + osmo_fsm_inst_dispatch(g_client->bankd_conn.fi, SRVC_E_ESTABLISH, NULL); /* send response to server */ resp = rspro_gen_ConfigClientBankRes(ResultCode_ok); server_conn_send_rspro(srvc, resp); @@ -733,7 +701,7 @@ int main(int argc, char **argv) { - struct rspro_server_conn *srvc; + struct rspro_server_conn *srvc, *bankdc; struct st_transport *transp = ci->slot->transp; char *gsmtap_host = "127.0.0.1"; int rc; @@ -853,6 +821,8 @@ g_client->srv_conn.clslot = talloc_zero(g_client, ClientSlot_t); g_client->srv_conn.clslot->clientId = client_id; g_client->srv_conn.clslot->slotNr = client_slot; + g_client->bankd_conn.clslot = talloc_zero(g_client, ClientSlot_t); + *g_client->bankd_conn.clslot = *g_client->srv_conn.clslot; } srvc = &g_client->srv_conn; @@ -870,13 +840,18 @@ } osmo_fsm_inst_dispatch(srvc->fi, SRVC_E_ESTABLISH, NULL); - asn_debug = 0; - - if (bankd_conn_fsm_alloc(g_client) < 0) { - fprintf(stderr, "Unable to connect: %s\n", strerror(errno)); + bankdc = &g_client->bankd_conn; + /* server_host / server_port are configured from remsim-server */ + bankdc->handle_rx = bankd_handle_rx; + memcpy(&bankdc->own_comp_id, &srvc->own_comp_id, sizeof(bankdc->own_comp_id)); + rc = server_conn_fsm_alloc(g_client, bankdc); + if (rc < 0) { + fprintf(stderr, "Unable to create bankd conn FSM: %s\n", strerror(errno)); exit(1); } + asn_debug = 0; + // connect to SIMtrace2 cardem do { struct usb_interface_match _ifm, *ifm = &_ifm; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Icbe9881a0391fcd0c47e5d930dc764fc0cb1dfbf Gerrit-Change-Number: 16587 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 23:12:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 23:12:33 +0000 Subject: Change in osmo-remsim[master]: remsim-client: Differentiate the two rspro_client_fsm instances by name In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16588 ) Change subject: remsim-client: Differentiate the two rspro_client_fsm instances by name ...................................................................... remsim-client: Differentiate the two rspro_client_fsm instances by name They were both called "server", which can be confusing. Now the bankd-facing FSM has the identity of "bankd" Change-Id: I2626f92202717880c678ce219a14872538713f4e --- M src/simtrace2-remsim_client.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index d54e963..fc5ac55 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -849,6 +849,7 @@ fprintf(stderr, "Unable to create bankd conn FSM: %s\n", strerror(errno)); exit(1); } + osmo_fsm_inst_update_id(bankdc->fi, "bankd"); asn_debug = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I2626f92202717880c678ce219a14872538713f4e Gerrit-Change-Number: 16588 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 23:12:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 23:12:33 +0000 Subject: Change in osmo-remsim[master]: rspro_client_fsm: Mark ipa_client_conn_send_rspro() as static In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16589 ) Change subject: rspro_client_fsm: Mark ipa_client_conn_send_rspro() as static ...................................................................... rspro_client_fsm: Mark ipa_client_conn_send_rspro() as static Change-Id: Icc2f9e984dee4a2f1f604beee6c9081ecf032dd2 --- M src/rspro_client_fsm.c M src/rspro_client_fsm.h 2 files changed, 1 insertion(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index 91e91eb..f0a9fff 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -64,7 +64,7 @@ /* msg_tx is now queued and will be freed. */ } -int ipa_client_conn_send_rspro(struct ipa_client_conn *ipa, RsproPDU_t *rspro) +static int ipa_client_conn_send_rspro(struct ipa_client_conn *ipa, RsproPDU_t *rspro) { struct msgb *msg = rspro_enc_msg(rspro); if (!msg) { diff --git a/src/rspro_client_fsm.h b/src/rspro_client_fsm.h index 7a998dc..b1c14f8 100644 --- a/src/rspro_client_fsm.h +++ b/src/rspro_client_fsm.h @@ -44,6 +44,5 @@ } bankd; }; -int ipa_client_conn_send_rspro(struct ipa_client_conn *ipa, RsproPDU_t *rspro); int server_conn_send_rspro(struct rspro_server_conn *srvc, RsproPDU_t *rspro); int server_conn_fsm_alloc(void *ctx, struct rspro_server_conn *srvc); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Icc2f9e984dee4a2f1f604beee6c9081ecf032dd2 Gerrit-Change-Number: 16589 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 23:12:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 23:12:33 +0000 Subject: Change in osmo-remsim[master]: rspro_client_fsm(): Remove outdated/wrong comment from code In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16590 ) Change subject: rspro_client_fsm(): Remove outdated/wrong comment from code ...................................................................... rspro_client_fsm(): Remove outdated/wrong comment from code Since Change-Id I55d5d61922053fd94e2b5a8cdf0d799b29feec98, rspro_dec_msg() is no longer taking ownership of the msgb. Change-Id: Ic1e9f35a2ae82b28dbb4b2ba850c257fa9629cbf --- M src/rspro_client_fsm.c 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index f0a9fff..6be2fef 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -161,8 +161,6 @@ switch (he->proto) { case IPAC_PROTO_EXT_RSPRO: LOGPFSM(srvc->fi, "Received RSPRO %s\n", msgb_hexdump(msg)); - /* respro_dec_msg() takes ownership of the input message buffer in successful - * and unsuccessful cases */ pdu = rspro_dec_msg(msg); if (!pdu) break; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ic1e9f35a2ae82b28dbb4b2ba850c257fa9629cbf Gerrit-Change-Number: 16590 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 23:13:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 23:13:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: fix: verify the contents of SM-RP DA/OA for MO SMS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16566 ) Change subject: MSC_Tests.ttcn: fix: verify the contents of SM-RP DA/OA for MO SMS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16566 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib467eeca6439bc6cce72293fbb5bb48f6d233db9 Gerrit-Change-Number: 16566 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 14 Dec 2019 23:13:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 23:16:03 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 23:16:03 +0000 Subject: Change in osmo-msc[master]: sms log tweak In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16219 ) Change subject: sms log tweak ...................................................................... sms log tweak Change-Id: I77e7a1501f74b9045f032c5b6c2322025a11fd59 --- M src/libmsc/sms_queue.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/libmsc/sms_queue.c b/src/libmsc/sms_queue.c index c00a8c6..6098a53 100644 --- a/src/libmsc/sms_queue.c +++ b/src/libmsc/sms_queue.c @@ -272,7 +272,7 @@ } rounds += 1; - LOGP(DLSMS, LOGL_DEBUG, "Sending SMS round %d\n", rounds); + LOGP(DLSMS, LOGL_DEBUG, "Checking whether to send SMS %llu\n", sms->id); /* * This code needs to detect a loop. It assumes that no SMS -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I77e7a1501f74b9045f032c5b6c2322025a11fd59 Gerrit-Change-Number: 16219 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 23:19:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 23:19:06 +0000 Subject: Change in osmo-pcu[master]: Support PAGING-CS and PAGING-PS on on PTP-BVCI In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16538 ) Change subject: Support PAGING-CS and PAGING-PS on on PTP-BVCI ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5c52b5af740460c48bb3ba858243b1d20e624268 Gerrit-Change-Number: 16538 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 14 Dec 2019 23:19:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 14 23:22:23 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 14 Dec 2019 23:22:23 +0000 Subject: Change in libosmocore[master]: ecu_fr: Avoid using deprecated symbols In-Reply-To: References: Message-ID: laforge has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16473 ) Change subject: ecu_fr: Avoid using deprecated symbols ...................................................................... Abandoned https://gerrit.osmocom.org/c/libosmocore/+/14864 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16473 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idf84c2efbd3e71f07d3801feb8c5e48a1b4a136d Gerrit-Change-Number: 16473 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Dec 15 01:40:47 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 15 Dec 2019 01:40:47 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5df58f351ee0f_4ab62abaac3ec600219713@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 83s] /usr/src/packages/BUILD/firmware/apps/dfu/main.c:360: warning: undefined reference to `__stack_chk_guard' [ 83s] obj/simtrace/flash_dfu_desc.o: In function `set_usb_serial_str': [ 83s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_fail' [ 83s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_guard' [ 83s] obj/simtrace/flash_dfu_driver.o: In function `handle_getstate': [ 83s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_fail' [ 83s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_guard' [ 83s] collect2: error: ld returned 1 exit status [ 83s] % [ 83s] Makefile:233: recipe for target 'flash' failed [ 83s] make[2]: *** [flash] Error 1 [ 83s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 83s] Makefile:10: recipe for target 'fw-simtrace-dfu' failed [ 83s] make[1]: *** [fw-simtrace-dfu] Error 2 [ 83s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 83s] dh_auto_build: make -j1 returned exit code 2 [ 83s] debian/rules:16: recipe for target 'build' failed [ 83s] make: *** [build] Error 2 [ 83s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 83s] [ 83s] lamb02 failed "build simtrace2_0.7.0.15.56be.dsc" at Sun Dec 15 01:40:41 UTC 2019. [ 83s] [ 83s] ### VM INTERACTION START ### [ 86s] [ 75.632368] sysrq: SysRq : Power Off [ 86s] [ 75.640490] reboot: Power down [ 86s] ### VM INTERACTION END ### [ 86s] [ 86s] lamb02 failed "build simtrace2_0.7.0.15.56be.dsc" at Sun Dec 15 01:40:44 UTC 2019. [ 86s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Dec 15 01:41:22 2019 From: admin at opensuse.org (OBS Notification) Date: Sun, 15 Dec 2019 01:41:22 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5df58f553736c_4ab62abaac3ec6002198f7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 90s] /usr/src/packages/BUILD/firmware/apps/dfu/main.c:360: warning: undefined reference to `__stack_chk_guard' [ 90s] obj/simtrace/flash_dfu_desc.o: In function `set_usb_serial_str': [ 90s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_fail' [ 90s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_guard' [ 90s] obj/simtrace/flash_dfu_driver.o: In function `handle_getstate': [ 90s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_fail' [ 90s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_guard' [ 90s] collect2: error: ld returned 1 exit status [ 90s] % [ 90s] Makefile:233: recipe for target 'flash' failed [ 90s] make[2]: *** [flash] Error 1 [ 90s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 90s] Makefile:10: recipe for target 'fw-simtrace-dfu' failed [ 90s] make[1]: *** [fw-simtrace-dfu] Error 2 [ 90s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 90s] dh_auto_build: make -j1 returned exit code 2 [ 90s] debian/rules:16: recipe for target 'build' failed [ 90s] make: *** [build] Error 2 [ 90s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 90s] [ 90s] build30 failed "build simtrace2_0.7.0.15.56be.dsc" at Sun Dec 15 01:41:04 UTC 2019. [ 90s] [ 90s] ### VM INTERACTION START ### [ 93s] [ 81.567152] sysrq: SysRq : Power Off [ 93s] [ 81.573842] reboot: Power down [ 93s] ### VM INTERACTION END ### [ 93s] [ 93s] build30 failed "build simtrace2_0.7.0.15.56be.dsc" at Sun Dec 15 01:41:07 UTC 2019. [ 93s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Dec 15 03:14:29 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 15 Dec 2019 03:14:29 +0000 Subject: Change in osmo-hlr[master]: add libosmo-mslookup abstract client In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16202 ) Change subject: add libosmo-mslookup abstract client ...................................................................... Patch Set 19: Code-Review-1 None of my comments (to patchset #15) has been addressed :/ -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I83487ab8aad1611eb02e997dafbcb8344da13df1 Gerrit-Change-Number: 16202 Gerrit-PatchSet: 19 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 15 Dec 2019 03:14:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 13:47:49 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 15 Dec 2019 13:47:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: fix: verify the contents of SM-RP-DA/OA for MO/MT SMS In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16566 to look at the new patch set (#2). Change subject: MSC_Tests.ttcn: fix: verify the contents of SM-RP-DA/OA for MO/MT SMS ...................................................................... MSC_Tests.ttcn: fix: verify the contents of SM-RP-DA/OA for MO/MT SMS Change-Id: Ib467eeca6439bc6cce72293fbb5bb48f6d233db9 Related: OS#4324 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 19 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/16566/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16566 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib467eeca6439bc6cce72293fbb5bb48f6d233db9 Gerrit-Change-Number: 16566 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 13:47:50 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 15 Dec 2019 13:47:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/BSC_ConnectionHandler: only keep SMSC address in SmsParametersRp References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16597 ) Change subject: MSC/BSC_ConnectionHandler: only keep SMSC address in SmsParametersRp ...................................................................... MSC/BSC_ConnectionHandler: only keep SMSC address in SmsParametersRp When sending MO or MT SMS, we never include both SM-RP-DA/OA IEs at the same time. In case of MO SMS, SM-RP-OA is omitted, and in case of MT SMS - SM-RP-DA is omitted. Change-Id: Ia60bdd2498034b6b849f874cf1eee272abef2b47 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 16 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/16597/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 0846c04..3dde9b4 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1618,8 +1618,7 @@ } type record SmsParametersRp { OCT1 msg_ref, - RP_NumberingPlan_and_NumberDigits orig optional, - RP_NumberingPlan_and_NumberDigits dest optional + RP_NumberingPlan_and_NumberDigits smsc_addr optional } type record SmsParameters { SmsParametersTp tp, @@ -1639,6 +1638,16 @@ } } +template RP_NumberingPlan_and_NumberDigits t_RP_Addr(template hexstring addr, + template BIT4 npi := '0001'B, + template BIT3 ton := '001'B, + template BIT1 ext := '1'B) := { + rP_NumberingPlanIdentification := npi, + rP_TypeOfNumber := ton, + rP_Ext := ext, + rP_NumberDigits := addr +} + template (value) SmsParameters t_SmsPars(hexstring tp_daddr := '12345'H) := { tp := { msg_ref := '23'O, @@ -1650,8 +1659,9 @@ }, rp := { msg_ref := '42'O, - orig := omit, - dest := { '0000'B, '000'B, '0'B, '98765'H } + /* We don't really need to have both SM-RP-DA/OA here, because only one IE + * is included in MO/MT SMS, and in the most cases it's the SMSC address. */ + smsc_addr := t_RP_Addr('76722337'H) }, tid := 0, dlci := '03'O, @@ -1700,7 +1710,7 @@ tp_mo := ts_SMS_SUBMIT(spars.tp.msg_ref, spars.tp.da, spars.tp.pid, spars.tp.dcs, spars.tp.udl, spars.tp.ud); - rp_mo := ts_RP_DATA_MO(spars.rp.msg_ref, spars.rp.orig, spars.rp.dest, tp_mo); + rp_mo := ts_RP_DATA_MO(spars.rp.msg_ref, omit, spars.rp.smsc_addr, tp_mo); l3_mo := ts_ML3_MO_SMS(spars.tid, c_TIF_ORIG, ts_CP_DATA_MO(rp_mo)); BSSAP.send(ts_PDU_DTAP_MO(l3_mo, spars.dlci, true)); /* receive CP-ACK for CP-DATA above */ diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 480ec96..87f595d 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -4621,7 +4621,7 @@ tp_mo := ts_SMS_SUBMIT(spars.tp.msg_ref, spars.tp.da, spars.tp.pid, spars.tp.dcs, spars.tp.udl, spars.tp.ud); - rp_mo := ts_RP_DATA_MO(spars.rp.msg_ref, spars.rp.orig, spars.rp.dest, tp_mo); + rp_mo := ts_RP_DATA_MO(spars.rp.msg_ref, omit, spars.rp.smsc_addr, tp_mo); l3_mo := ts_ML3_MO_SMS(spars.tid, c_TIF_ORIG, ts_CP_DATA_MO(rp_mo)); SGsAP.send(l3_mo); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia60bdd2498034b6b849f874cf1eee272abef2b47 Gerrit-Change-Number: 16597 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 13:54:14 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 15 Dec 2019 13:54:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: fix MSISDN / SMSC coding in SM-RP-OA/DA In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16565 ) Change subject: library/GSUP_Types.ttcn: fix MSISDN / SMSC coding in SM-RP-OA/DA ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3f55834489f3e613f541cf1e216027e8d48ccaf0 Gerrit-Change-Number: 16565 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 15 Dec 2019 13:54:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 16:25:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 16:25:58 +0000 Subject: Change in simtrace2[master]: cardem: RST resets all state (including release of buffers) In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/16584 to look at the new patch set (#3). Change subject: cardem: RST resets all state (including release of buffers) ...................................................................... cardem: RST resets all state (including release of buffers) When the Modem is asserting RST, the emulated card should set all of its state back to default/initial values and release any buffers it may still hold in its state. Change-Id: I66eca6afe4ff7d900c5b75df1e3ec6d52f6ef214 Related: OS#4251 --- M firmware/libcommon/source/card_emu.c 1 file changed, 23 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/84/16584/3 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I66eca6afe4ff7d900c5b75df1e3ec6d52f6ef214 Gerrit-Change-Number: 16584 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 16:25:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 16:25:58 +0000 Subject: Change in simtrace2[master]: usb_buf: Actually limit queue to 3 elements, not 4 References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16598 ) Change subject: usb_buf: Actually limit queue to 3 elements, not 4 ...................................................................... usb_buf: Actually limit queue to 3 elements, not 4 In Change-ID Ie15183f16b22193ffdaf01845db2eae4c7f43c17 we wanted to limit the number of queue elements to 3, but actually implemented 4. Change-Id: Ic5fb164f2dfd1c293c51bee8184fc34552267a54 --- M firmware/libcommon/source/usb_buf.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/98/16598/1 diff --git a/firmware/libcommon/source/usb_buf.c b/firmware/libcommon/source/usb_buf.c index 7892d6e..b6ecd54 100644 --- a/firmware/libcommon/source/usb_buf.c +++ b/firmware/libcommon/source/usb_buf.c @@ -80,7 +80,7 @@ /* no need for irqsafe operation, as the usb_tx_queue is * processed only by the main loop context */ - if (ep->queue_len > USB_MAX_QLEN) { + if (ep->queue_len >= USB_MAX_QLEN) { struct msgb *evict; /* free the first pending buffer in the queue */ TRACE_INFO("EP%02x: dropping first queue element (qlen=%u)\r\n", -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ic5fb164f2dfd1c293c51bee8184fc34552267a54 Gerrit-Change-Number: 16598 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 16:25:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 16:25:59 +0000 Subject: Change in simtrace2[master]: USBD_HAL: Don't disable UDP peripheral clock on suspend References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16599 ) Change subject: USBD_HAL: Don't disable UDP peripheral clock on suspend ...................................................................... USBD_HAL: Don't disable UDP peripheral clock on suspend Change-Id: I2169e2140762b37661f4567bb148326afd85cddc Closes: OS#4329 --- M firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/99/16599/1 diff --git a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c index 3fe3270..0eccc65 100644 --- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c +++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c @@ -1687,7 +1687,10 @@ /* The device enters the Suspended state */ UDP_DisableTransceiver(); UDP_DisableUsbClock(); - UDP_DisablePeripheralClock(); + /* Don't disable peripheral clock; this somehow breaks completion of any IN transfers + * that have already been written to the peripheral, and which we expect to complete + * after resume */ + //UDP_DisablePeripheralClock(); } /** -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2169e2140762b37661f4567bb148326afd85cddc Gerrit-Change-Number: 16599 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 16:26:00 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 16:26:00 +0000 Subject: Change in simtrace2[master]: usb_buf: Properly initialize buffered_endpoint->ep number References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16600 ) Change subject: usb_buf: Properly initialize buffered_endpoint->ep number ...................................................................... usb_buf: Properly initialize buffered_endpoint->ep number The number is used only in print statements, and it's always '0' so far. Change-Id: Id147e24d9d50c274fec963f00494cb20e2360b33 --- M firmware/libcommon/source/usb_buf.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/00/16600/1 diff --git a/firmware/libcommon/source/usb_buf.c b/firmware/libcommon/source/usb_buf.c index b6ecd54..b97eb9c 100644 --- a/firmware/libcommon/source/usb_buf.c +++ b/firmware/libcommon/source/usb_buf.c @@ -101,5 +101,6 @@ for (i = 0; i < ARRAY_SIZE(usb_buffered_ep); i++) { struct usb_buffered_ep *ep = &usb_buffered_ep[i]; INIT_LLIST_HEAD(&ep->queue); + ep->ep = i; } } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Id147e24d9d50c274fec963f00494cb20e2360b33 Gerrit-Change-Number: 16600 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 16:26:00 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 16:26:00 +0000 Subject: Change in simtrace2[master]: card_emu: Initialize PTSS state every time we start PTS References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16601 ) Change subject: card_emu: Initialize PTSS state every time we start PTS ...................................................................... card_emu: Initialize PTSS state every time we start PTS Let's shift the responsibility from the caller side to the calee side. Change-Id: I39661ca93c87b2e2071765f69578eec5aaf90ce4 --- M firmware/libcommon/source/card_emu.c 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/01/16601/1 diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 9ea500d..f53b3df 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -536,8 +536,6 @@ /* update waiting time (see ISO 7816-3 10.2) */ ch->waiting_time = ch->wi * 960 * ch->fi; tc_etu_set_wtime(ch->tc_chan, ch->waiting_time); - /* reset PTS to initial state */ - set_pts_state(ch, PTS_S_WAIT_REQ_PTSS); /* go to next state */ card_set_state(ch, ISO_S_WAIT_TPDU); return 0; @@ -703,7 +701,6 @@ emu_update_fidi(ch); /* Wait for the next TPDU */ card_set_state(ch, ISO_S_WAIT_TPDU); - set_pts_state(ch, PTS_S_WAIT_REQ_PTSS); break; default: /* calculate the next state and set it */ @@ -981,6 +978,8 @@ switch (ch->state) { case ISO_S_WAIT_TPDU: if (byte == 0xff) { + /* reset PTS to initial state */ + set_pts_state(ch, PTS_S_WAIT_REQ_PTSS); new_state = process_byte_pts(ch, byte); ch->stats.pps++; goto out_silent; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I39661ca93c87b2e2071765f69578eec5aaf90ce4 Gerrit-Change-Number: 16601 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 16:26:01 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 16:26:01 +0000 Subject: Change in simtrace2[master]: card_emu: Avoid recursive calls to card_set_state() References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16602 ) Change subject: card_emu: Avoid recursive calls to card_set_state() ...................................................................... card_emu: Avoid recursive calls to card_set_state() A function that is called to set the state should not in itself contain logic to issue further state changes. Let's shift the related block out to the end of card_emu_io_statechg(), which is the only source of card_set_state() calls for the WAIT_{POWER,CLK,RST} states anyway. As an added benefit, the block of statements is now also executed if there's no state change - something that was prevented by the "if old == new" state guard at the top of card_set_state(). I believe this may help us to cover more (non-standard) card activation sequences. Change-Id: Ieefa1807099eb234cfd994bca83caaa0dcc919b6 --- M firmware/libcommon/source/card_emu.c 1 file changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/02/16602/1 diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index f53b3df..66932af 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -429,13 +429,6 @@ case ISO_S_WAIT_RST: /* disable Rx and Tx of UART */ card_emu_uart_enable(ch->uart_chan, 0); - /* check end activation state (only necessary if the reader to not respect the activation sequence) */ - if (ch->vcc_active && ch->clocked && !ch->in_reset) { - /* enable the TC/ETU counter once reset has been released */ - tc_etu_enable(ch->tc_chan); - /* prepare to send the ATR */ - card_set_state(ch, ISO_S_WAIT_ATR); - } break; case ISO_S_WAIT_ATR: /* Reset to initial Fi / Di ratio */ @@ -1114,6 +1107,15 @@ ch->in_reset = active; break; } + + /* check end activation state (only necessary if the reader to + * not respect the activation sequence) */ + if (ch->vcc_active && ch->clocked && !ch->in_reset) { + /* enable the TC/ETU counter once reset has been released */ + tc_etu_enable(ch->tc_chan); + /* prepare to send the ATR */ + card_set_state(ch, ISO_S_WAIT_ATR); + } } /* User sets a new ATR to be returned during next card reset */ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ieefa1807099eb234cfd994bca83caaa0dcc919b6 Gerrit-Change-Number: 16602 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 16:26:02 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 16:26:02 +0000 Subject: Change in simtrace2[master]: card_emu: Remove extraneous code References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16603 ) Change subject: card_emu: Remove extraneous code ...................................................................... card_emu: Remove extraneous code card_set_state(ch, ISO_S_WAIT_ATR) internally calls tc_etu_enable(), so there's no need for the caller to do the same, too. Change-Id: I2a2b4d64c40264623313a867957ffcefe57748f9 --- M firmware/libcommon/source/card_emu.c 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/03/16603/1 diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 66932af..0577a12 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -440,7 +440,7 @@ * since the initial ETU is Fd=372/Dd=1 clock cycles long, we have to wait 2-107 ETU. */ tc_etu_set_wtime(ch->tc_chan, 2); - /* ensure the TC_ETU timer is enabled */ + /* enable the TC/ETU counter once reset has been released */ tc_etu_enable(ch->tc_chan); break; case ISO_S_IN_ATR: @@ -1111,8 +1111,6 @@ /* check end activation state (only necessary if the reader to * not respect the activation sequence) */ if (ch->vcc_active && ch->clocked && !ch->in_reset) { - /* enable the TC/ETU counter once reset has been released */ - tc_etu_enable(ch->tc_chan); /* prepare to send the ATR */ card_set_state(ch, ISO_S_WAIT_ATR); } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2a2b4d64c40264623313a867957ffcefe57748f9 Gerrit-Change-Number: 16603 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 16:29:34 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 16:29:34 +0000 Subject: Change in simtrace2[master]: usb_buf: Actually limit queue to 3 elements, not 4 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16598 ) Change subject: usb_buf: Actually limit queue to 3 elements, not 4 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ic5fb164f2dfd1c293c51bee8184fc34552267a54 Gerrit-Change-Number: 16598 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 15 Dec 2019 16:29:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 16:29:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 16:29:50 +0000 Subject: Change in simtrace2[master]: usb_buf: Properly initialize buffered_endpoint->ep number In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16600 ) Change subject: usb_buf: Properly initialize buffered_endpoint->ep number ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Id147e24d9d50c274fec963f00494cb20e2360b33 Gerrit-Change-Number: 16600 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 15 Dec 2019 16:29:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 16:31:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 16:31:07 +0000 Subject: Change in simtrace2[master]: usb_buf: Actually limit queue to 3 elements, not 4 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16598 ) Change subject: usb_buf: Actually limit queue to 3 elements, not 4 ...................................................................... usb_buf: Actually limit queue to 3 elements, not 4 In Change-ID Ie15183f16b22193ffdaf01845db2eae4c7f43c17 we wanted to limit the number of queue elements to 3, but actually implemented 4. Change-Id: Ic5fb164f2dfd1c293c51bee8184fc34552267a54 --- M firmware/libcommon/source/usb_buf.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/firmware/libcommon/source/usb_buf.c b/firmware/libcommon/source/usb_buf.c index 7892d6e..b6ecd54 100644 --- a/firmware/libcommon/source/usb_buf.c +++ b/firmware/libcommon/source/usb_buf.c @@ -80,7 +80,7 @@ /* no need for irqsafe operation, as the usb_tx_queue is * processed only by the main loop context */ - if (ep->queue_len > USB_MAX_QLEN) { + if (ep->queue_len >= USB_MAX_QLEN) { struct msgb *evict; /* free the first pending buffer in the queue */ TRACE_INFO("EP%02x: dropping first queue element (qlen=%u)\r\n", -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ic5fb164f2dfd1c293c51bee8184fc34552267a54 Gerrit-Change-Number: 16598 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 16:48:44 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 16:48:44 +0000 Subject: Change in simtrace2[master]: card_emu: Initialize PTSS state every time we start PTS In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/16601 to look at the new patch set (#2). Change subject: card_emu: Initialize PTSS state every time we start PTS ...................................................................... card_emu: Initialize PTSS state every time we start PTS Let's shift the responsibility from the caller side to the calee side. Change-Id: I39661ca93c87b2e2071765f69578eec5aaf90ce4 --- M firmware/libcommon/source/card_emu.c 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/01/16601/2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I39661ca93c87b2e2071765f69578eec5aaf90ce4 Gerrit-Change-Number: 16601 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 16:48:45 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 16:48:45 +0000 Subject: Change in simtrace2[master]: pseudo_talloc: Increment number of buffers from 10 to 20 References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16604 ) Change subject: pseudo_talloc: Increment number of buffers from 10 to 20 ...................................................................... pseudo_talloc: Increment number of buffers from 10 to 20 We need at least one per IN/IRQ endpoint, as well as at least 3 for every OUT endpoint. Plus some more depending on the application, in case of cardem there could be one in uart_tx and one in uart_rx. So for cardem, it should be 7 per slot, resulting 14 for dual-slot devices like OWHW and QMOD. Given that we have plenty of RAM available (utilization up from 49% to 56% with this change), we can be on the comfortable size and easily have 20 buffers for now. Future MITM / triple-play applications likely need more. Change-Id: I022ba3bb3e1f5fd0c364aafe1a23f8fd9b2d8499 Related: OS#4251 --- M firmware/libcommon/source/pseudo_talloc.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/04/16604/1 diff --git a/firmware/libcommon/source/pseudo_talloc.c b/firmware/libcommon/source/pseudo_talloc.c index 7c452b3..3407a59 100644 --- a/firmware/libcommon/source/pseudo_talloc.c +++ b/firmware/libcommon/source/pseudo_talloc.c @@ -22,7 +22,9 @@ #include "utils.h" #include -#define NUM_RCTX_SMALL 10 +/* TODO: this number should dynamically scale. We need at least one per IN/IRQ endpoint, + * as well as at least 3 for every OUT endpoint. Plus some more depending on the application */ +#define NUM_RCTX_SMALL 20 #define RCTX_SIZE_SMALL 348 static uint8_t msgb_data[NUM_RCTX_SMALL][RCTX_SIZE_SMALL] __attribute__((aligned(sizeof(long)))); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I022ba3bb3e1f5fd0c364aafe1a23f8fd9b2d8499 Gerrit-Change-Number: 16604 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 16:48:45 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 16:48:45 +0000 Subject: Change in simtrace2[master]: card_emu: Remove extraneous initialization of ch->pts.state References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16605 ) Change subject: card_emu: Remove extraneous initialization of ch->pts.state ...................................................................... card_emu: Remove extraneous initialization of ch->pts.state ch->pts.state is initialized every time we enter ISO_S_WAIT_TPDU state, so there's no need to reset it at other locations. KISS. Change-Id: I5ff8b2671c3c893cc5f6542d48b65487ae8c5be1 --- M firmware/libcommon/source/card_emu.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/05/16605/1 diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index ac28805..f9c3673 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -240,8 +240,6 @@ tc_etu_disable(ch->tc_chan); - ch->tpdu.state = TPDU_S_WAIT_CLA; - /* release any buffers we may still own */ if (ch->uart_tx_msg) { usb_buf_free(ch->uart_tx_msg); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I5ff8b2671c3c893cc5f6542d48b65487ae8c5be1 Gerrit-Change-Number: 16605 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 16:48:52 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 16:48:52 +0000 Subject: Change in simtrace2[master]: USBD_HAL: Don't disable UDP peripheral clock on suspend In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16599 ) Change subject: USBD_HAL: Don't disable UDP peripheral clock on suspend ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2169e2140762b37661f4567bb148326afd85cddc Gerrit-Change-Number: 16599 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 15 Dec 2019 16:48:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 16:53:25 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 16:53:25 +0000 Subject: Change in simtrace2[master]: card_emu: Initialize PTSS state every time we start PTS In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/16601 to look at the new patch set (#3). Change subject: card_emu: Initialize PTSS state every time we start PTS ...................................................................... card_emu: Initialize PTSS state every time we start PTS Let's shift the responsibility from the caller side to the calee side. Change-Id: I39661ca93c87b2e2071765f69578eec5aaf90ce4 --- M firmware/libcommon/source/card_emu.c 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/01/16601/3 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I39661ca93c87b2e2071765f69578eec5aaf90ce4 Gerrit-Change-Number: 16601 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 16:53:25 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 16:53:25 +0000 Subject: Change in simtrace2[master]: card_emu: Avoid recursive calls to card_set_state() In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/c/simtrace2/+/16602 ) Change subject: card_emu: Avoid recursive calls to card_set_state() ...................................................................... card_emu: Avoid recursive calls to card_set_state() A function that is called to set the state should not in itself contain logic to issue further state changes. Let's shift the related block out to the end of card_emu_io_statechg(), which is the only source of card_set_state() calls for the WAIT_{POWER,CLK,RST} states anyway. As an added benefit, the block of statements is now also executed if there's no state change - something that was prevented by the "if old == new" state guard at the top of card_set_state(). I believe this may help us to cover more (non-standard) card activation sequences. Change-Id: Ieefa1807099eb234cfd994bca83caaa0dcc919b6 --- M firmware/libcommon/source/card_emu.c 1 file changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/02/16602/3 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ieefa1807099eb234cfd994bca83caaa0dcc919b6 Gerrit-Change-Number: 16602 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 16:53:25 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 16:53:25 +0000 Subject: Change in simtrace2[master]: card_emu: Remove extraneous code In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/c/simtrace2/+/16603 ) Change subject: card_emu: Remove extraneous code ...................................................................... card_emu: Remove extraneous code card_set_state(ch, ISO_S_WAIT_ATR) internally calls tc_etu_enable(), so there's no need for the caller to do the same, too. Change-Id: I2a2b4d64c40264623313a867957ffcefe57748f9 --- M firmware/libcommon/source/card_emu.c 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/03/16603/3 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2a2b4d64c40264623313a867957ffcefe57748f9 Gerrit-Change-Number: 16603 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 16:53:25 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 16:53:25 +0000 Subject: Change in simtrace2[master]: card_emu: Remove extraneous initialization of ch->pts.state In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/simtrace2/+/16605 ) Change subject: card_emu: Remove extraneous initialization of ch->pts.state ...................................................................... card_emu: Remove extraneous initialization of ch->pts.state ch->pts.state is initialized every time we enter ISO_S_WAIT_TPDU state, so there's no need to reset it at other locations. KISS. Change-Id: I5ff8b2671c3c893cc5f6542d48b65487ae8c5be1 --- M firmware/libcommon/source/card_emu.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/05/16605/2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I5ff8b2671c3c893cc5f6542d48b65487ae8c5be1 Gerrit-Change-Number: 16605 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 16:53:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 16:53:53 +0000 Subject: Change in simtrace2[master]: pseudo_talloc: Increment number of buffers from 10 to 20 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16604 ) Change subject: pseudo_talloc: Increment number of buffers from 10 to 20 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I022ba3bb3e1f5fd0c364aafe1a23f8fd9b2d8499 Gerrit-Change-Number: 16604 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 15 Dec 2019 16:53:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 16:54:24 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 16:54:24 +0000 Subject: Change in simtrace2[master]: cardem: Move card_emu_io_statechg() calls out of interrupt context In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16583 ) Change subject: cardem: Move card_emu_io_statechg() calls out of interrupt context ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16583 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I3983078396538f32bdff55611c41d2163be4d796 Gerrit-Change-Number: 16583 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 15 Dec 2019 16:54:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 16:54:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 16:54:47 +0000 Subject: Change in simtrace2[master]: card_emu: Initialize PTSS state every time we start PTS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16601 ) Change subject: card_emu: Initialize PTSS state every time we start PTS ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I39661ca93c87b2e2071765f69578eec5aaf90ce4 Gerrit-Change-Number: 16601 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 15 Dec 2019 16:54:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 16:54:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 16:54:51 +0000 Subject: Change in simtrace2[master]: cardem: RST resets all state (including release of buffers) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16584 ) Change subject: cardem: RST resets all state (including release of buffers) ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I66eca6afe4ff7d900c5b75df1e3ec6d52f6ef214 Gerrit-Change-Number: 16584 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 15 Dec 2019 16:54:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 16:54:55 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 16:54:55 +0000 Subject: Change in simtrace2[master]: card_emu: Factor out card_handle_reset() from card_emu_init() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16582 ) Change subject: card_emu: Factor out card_handle_reset() from card_emu_init() ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I0954d192d001a3af5592010cc84a3a22aaf4b030 Gerrit-Change-Number: 16582 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 15 Dec 2019 16:54:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 17:00:28 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 17:00:28 +0000 Subject: Change in simtrace2[master]: cardem: RST resets all state (including release of buffers) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16584 ) Change subject: cardem: RST resets all state (including release of buffers) ...................................................................... Patch Set 5: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I66eca6afe4ff7d900c5b75df1e3ec6d52f6ef214 Gerrit-Change-Number: 16584 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 15 Dec 2019 17:00:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 17:00:36 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 17:00:36 +0000 Subject: Change in simtrace2[master]: USBD_HAL: Don't disable UDP peripheral clock on suspend In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16599 ) Change subject: USBD_HAL: Don't disable UDP peripheral clock on suspend ...................................................................... USBD_HAL: Don't disable UDP peripheral clock on suspend Change-Id: I2169e2140762b37661f4567bb148326afd85cddc Closes: OS#4329 --- M firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c index 3fe3270..0eccc65 100644 --- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c +++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c @@ -1687,7 +1687,10 @@ /* The device enters the Suspended state */ UDP_DisableTransceiver(); UDP_DisableUsbClock(); - UDP_DisablePeripheralClock(); + /* Don't disable peripheral clock; this somehow breaks completion of any IN transfers + * that have already been written to the peripheral, and which we expect to complete + * after resume */ + //UDP_DisablePeripheralClock(); } /** -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2169e2140762b37661f4567bb148326afd85cddc Gerrit-Change-Number: 16599 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 17:00:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 17:00:37 +0000 Subject: Change in simtrace2[master]: usb_buf: Properly initialize buffered_endpoint->ep number In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16600 ) Change subject: usb_buf: Properly initialize buffered_endpoint->ep number ...................................................................... usb_buf: Properly initialize buffered_endpoint->ep number The number is used only in print statements, and it's always '0' so far. Change-Id: Id147e24d9d50c274fec963f00494cb20e2360b33 --- M firmware/libcommon/source/usb_buf.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/firmware/libcommon/source/usb_buf.c b/firmware/libcommon/source/usb_buf.c index b6ecd54..b97eb9c 100644 --- a/firmware/libcommon/source/usb_buf.c +++ b/firmware/libcommon/source/usb_buf.c @@ -101,5 +101,6 @@ for (i = 0; i < ARRAY_SIZE(usb_buffered_ep); i++) { struct usb_buffered_ep *ep = &usb_buffered_ep[i]; INIT_LLIST_HEAD(&ep->queue); + ep->ep = i; } } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Id147e24d9d50c274fec963f00494cb20e2360b33 Gerrit-Change-Number: 16600 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 17:00:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 17:00:37 +0000 Subject: Change in simtrace2[master]: pseudo_talloc: Increment number of buffers from 10 to 20 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16604 ) Change subject: pseudo_talloc: Increment number of buffers from 10 to 20 ...................................................................... pseudo_talloc: Increment number of buffers from 10 to 20 We need at least one per IN/IRQ endpoint, as well as at least 3 for every OUT endpoint. Plus some more depending on the application, in case of cardem there could be one in uart_tx and one in uart_rx. So for cardem, it should be 7 per slot, resulting 14 for dual-slot devices like OWHW and QMOD. Given that we have plenty of RAM available (utilization up from 49% to 56% with this change), we can be on the comfortable size and easily have 20 buffers for now. Future MITM / triple-play applications likely need more. Change-Id: I022ba3bb3e1f5fd0c364aafe1a23f8fd9b2d8499 Related: OS#4251 --- M firmware/libcommon/source/pseudo_talloc.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/source/pseudo_talloc.c b/firmware/libcommon/source/pseudo_talloc.c index 7c452b3..3407a59 100644 --- a/firmware/libcommon/source/pseudo_talloc.c +++ b/firmware/libcommon/source/pseudo_talloc.c @@ -22,7 +22,9 @@ #include "utils.h" #include -#define NUM_RCTX_SMALL 10 +/* TODO: this number should dynamically scale. We need at least one per IN/IRQ endpoint, + * as well as at least 3 for every OUT endpoint. Plus some more depending on the application */ +#define NUM_RCTX_SMALL 20 #define RCTX_SIZE_SMALL 348 static uint8_t msgb_data[NUM_RCTX_SMALL][RCTX_SIZE_SMALL] __attribute__((aligned(sizeof(long)))); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I022ba3bb3e1f5fd0c364aafe1a23f8fd9b2d8499 Gerrit-Change-Number: 16604 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 17:00:38 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 17:00:38 +0000 Subject: Change in simtrace2[master]: card_emu: Factor out card_handle_reset() from card_emu_init() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16582 ) Change subject: card_emu: Factor out card_handle_reset() from card_emu_init() ...................................................................... card_emu: Factor out card_handle_reset() from card_emu_init() Let's move all initialization of state that may change at runtime to a separate function: card_handle_reset(). This has the advantage that the related function may also be called at later/other instances, not just during initialization of card_emu. Change-Id: I0954d192d001a3af5592010cc84a3a22aaf4b030 Related: OS#4251 --- M firmware/libcommon/source/card_emu.c 1 file changed, 9 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index f95f5d1..7ce10a8 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -1,6 +1,6 @@ /* ISO7816-3 state machine for the card side * - * (C) 2010-2017 by Harald Welte + * (C) 2010-2019 by Harald Welte * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * This program is free software; you can redistribute it and/or modify @@ -233,6 +233,13 @@ } stats; }; +/* reset all the 'dynamic' state of the card handle to the initial/default values */ +static void card_handle_reset(struct card_handle *ch) +{ + ch->pts.state = PTS_S_WAIT_REQ_PTSS; + ch->tpdu.state = TPDU_S_WAIT_CLA; +} + struct llist_head *card_emu_get_uart_tx_queue(struct card_handle *ch) { return &ch->uart_tx_queue; @@ -1189,8 +1196,7 @@ ch->atr.len = sizeof(default_atr); memcpy(ch->atr.atr, default_atr, ch->atr.len); - ch->pts.state = PTS_S_WAIT_REQ_PTSS; - ch->tpdu.state = TPDU_S_WAIT_CLA; + card_handle_reset(ch); tc_etu_init(ch->tc_chan, ch); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I0954d192d001a3af5592010cc84a3a22aaf4b030 Gerrit-Change-Number: 16582 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 17:00:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 17:00:39 +0000 Subject: Change in simtrace2[master]: cardem: Move card_emu_io_statechg() calls out of interrupt context In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16583 ) Change subject: cardem: Move card_emu_io_statechg() calls out of interrupt context ...................................................................... cardem: Move card_emu_io_statechg() calls out of interrupt context So far, we called card_emu_io_statechg() from interrupt context, which was safe with the current code. However, as we want to trigger a more comprehensive reset of data structures, including the flushing of message queues, it is best to shift this processing from interrupt context to main loop context. Change-Id: I3983078396538f32bdff55611c41d2163be4d796 Related: OS#4251 --- M firmware/libcommon/source/mode_cardemu.c 1 file changed, 51 insertions(+), 28 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c index 1669c2d..1d074cb 100644 --- a/firmware/libcommon/source/mode_cardemu.c +++ b/firmware/libcommon/source/mode_cardemu.c @@ -60,8 +60,13 @@ uint8_t ep_in; uint8_t ep_int; const Pin pin_insert; +#ifdef DETECT_VCC_BY_ADC uint32_t vcc_uv; - uint32_t vcc_uv_last; +#endif + bool vcc_active; + bool vcc_active_last; + bool rst_active; + bool rst_active_last; }; struct cardem_inst cardem_inst[] = { @@ -261,7 +266,7 @@ #ifdef DETECT_VCC_BY_ADC -static int adc_triggered = 0; +static volatile int adc_triggered = 0; static int adc_sam3s_reva_errata = 0; static int card_vcc_adc_init(void) @@ -313,18 +318,10 @@ static void process_vcc_adc(struct cardem_inst *ci) { - if (ci->vcc_uv >= VCC_UV_THRESH_3V && - ci->vcc_uv_last < VCC_UV_THRESH_3V) { - card_emu_io_statechg(ci->ch, CARD_IO_VCC, 1); - /* FIXME do this for real */ - card_emu_io_statechg(ci->ch, CARD_IO_CLK, 1); - } else if (ci->vcc_uv < VCC_UV_THRESH_3V && - ci->vcc_uv_last >= VCC_UV_THRESH_3V) { - /* FIXME do this for real */ - card_emu_io_statechg(ci->ch, CARD_IO_CLK, 0); - card_emu_io_statechg(ci->ch, CARD_IO_VCC, 0); - } - ci->vcc_uv_last = ci->vcc_uv; + if (ci->vcc_uv >= VCC_UV_THRESH_3V) + ci->vcc_active = true; + else + ci->vcc_active = false; } void ADC_IrqHandler(void) @@ -347,44 +344,54 @@ cardem_inst[0].vcc_uv = adc2uv(val); process_vcc_adc(&cardem_inst[0]); ADC->ADC_CR |= ADC_CR_START; + adc_triggered = 1; } } #endif /* DETECT_VCC_BY_ADC */ + +/* called from main loop; dispatches card I/O state changes to card_emu from main loop */ +static void process_io_statechg(struct cardem_inst *ci) +{ + if (ci->vcc_active != ci->vcc_active_last) { + card_emu_io_statechg(ci->ch, CARD_IO_VCC, ci->vcc_active); + /* FIXME do this for real */ + card_emu_io_statechg(ci->ch, CARD_IO_CLK, ci->vcc_active); + ci->vcc_active_last = ci->vcc_active; + } + + if (ci->rst_active != ci->rst_active_last) { + card_emu_io_statechg(ci->ch, CARD_IO_RST, ci->rst_active); + ci->rst_active_last = ci->rst_active; + } +} + /*********************************************************************** * Core USB / main loop integration ***********************************************************************/ static void usim1_rst_irqhandler(const Pin *pPin) { - bool active = PIO_Get(&pin_usim1_rst) ? false : true; - card_emu_io_statechg(cardem_inst[0].ch, CARD_IO_RST, active); + cardem_inst[0].rst_active = PIO_Get(&pin_usim1_rst) ? false : true; } #ifndef DETECT_VCC_BY_ADC static void usim1_vcc_irqhandler(const Pin *pPin) { - bool active = PIO_Get(&pin_usim1_vcc) ? true : false; - card_emu_io_statechg(cardem_inst[0].ch, CARD_IO_VCC, active); - /* FIXME do this for real */ - card_emu_io_statechg(cardem_inst[0].ch, CARD_IO_CLK, active); + cardem_inst[0].vcc_active = PIO_Get(&pin_usim1_vcc) ? true : false; } #endif /* !DETECT_VCC_BY_ADC */ #ifdef CARDEMU_SECOND_UART static void usim2_rst_irqhandler(const Pin *pPin) { - bool active = PIO_Get(&pin_usim2_rst) ? false : true; - card_emu_io_statechg(cardem_inst[1].ch, CARD_IO_RST, active); + cardem_inst[1].rst_active = PIO_Get(&pin_usim2_rst) ? false : true; } #ifndef DETECT_VCC_BY_ADC static void usim2_vcc_irqhandler(const Pin *pPin) { - bool active = PIO_Get(&pin_usim2_vcc) ? true : false; - card_emu_io_statechg(cardem_inst[1].ch, CARD_IO_VCC, active); - /* FIXME do this for real */ - card_emu_io_statechg(cardem_inst[1].ch, CARD_IO_CLK, active); + cardem_inst[1].vcc_active = PIO_Get(&pin_usim2_vcc) ? true : false; } #endif /* !DETECT_VCC_BY_ADC */ #endif /* CARDEMU_SECOND_UART */ @@ -416,11 +423,18 @@ NVIC_EnableIRQ(USART1_IRQn); PIO_ConfigureIt(&pin_usim1_rst, usim1_rst_irqhandler); PIO_EnableIt(&pin_usim1_rst); + usim1_rst_irqhandler(&pin_usim1_rst); /* obtain current RST state */ #ifndef DETECT_VCC_BY_ADC PIO_ConfigureIt(&pin_usim1_vcc, usim1_vcc_irqhandler); PIO_EnableIt(&pin_usim1_vcc); + usim1_vcc_irqhandler(&pin_usim1_vcc); /* obtain current VCC state */ +#else + do {} while (!adc_triggered); /* wait for first ADC reading */ #endif /* DETECT_VCC_BY_ADC */ - cardem_inst[0].ch = card_emu_init(0, 2, 0, SIMTRACE_CARDEM_USB_EP_USIM1_DATAIN, SIMTRACE_CARDEM_USB_EP_USIM1_INT, PIO_Get(&pin_usim1_vcc) ? true : false, PIO_Get(&pin_usim1_rst) ? false : true, PIO_Get(&pin_usim1_vcc) ? true : false); + + cardem_inst[0].ch = card_emu_init(0, 2, 0, SIMTRACE_CARDEM_USB_EP_USIM1_DATAIN, + SIMTRACE_CARDEM_USB_EP_USIM1_INT, cardem_inst[0].vcc_active, + cardem_inst[0].rst_active, cardem_inst[0].vcc_active); sim_switch_use_physical(0, 1); #ifdef CARDEMU_SECOND_UART @@ -431,11 +445,18 @@ NVIC_EnableIRQ(USART0_IRQn); PIO_ConfigureIt(&pin_usim2_rst, usim2_rst_irqhandler); PIO_EnableIt(&pin_usim2_rst); + usim2_rst_irqhandler(&pin_usim2_rst); /* obtain current RST state */ #ifndef DETECT_VCC_BY_ADC PIO_ConfigureIt(&pin_usim2_vcc, usim2_vcc_irqhandler); PIO_EnableIt(&pin_usim2_vcc); + usim2_vcc_irqhandler(&pin_usim2_vcc); /* obtain current VCC state */ +#else + do {} while (!adc_triggered); /* wait for first ADC reading */ #endif /* DETECT_VCC_BY_ADC */ - cardem_inst[1].ch = card_emu_init(1, 0, 1, SIMTRACE_CARDEM_USB_EP_USIM2_DATAIN, SIMTRACE_CARDEM_USB_EP_USIM2_INT, PIO_Get(&pin_usim2_vcc) ? true : false, PIO_Get(&pin_usim2_rst) ? false : true, PIO_Get(&pin_usim2_vcc) ? true : false); + + cardem_inst[1].ch = card_emu_init(1, 0, 1, SIMTRACE_CARDEM_USB_EP_USIM2_DATAIN, + SIMTRACE_CARDEM_USB_EP_USIM2_INT, cardem_inst[1].vcc_active, + cardem_inst[1].rst_active, cardem_inst[1].vcc_active); sim_switch_use_physical(1, 1); #endif /* CARDEMU_SECOND_UART */ } @@ -715,6 +736,8 @@ //TRACE_ERROR("%uRx%02x\r\n", i, byte); } + process_io_statechg(ci); + /* first try to send any pending messages on IRQ */ usb_refill_to_host(ci->ep_int); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16583 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I3983078396538f32bdff55611c41d2163be4d796 Gerrit-Change-Number: 16583 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 17:00:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 17:00:39 +0000 Subject: Change in simtrace2[master]: cardem: RST resets all state (including release of buffers) In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16584 ) Change subject: cardem: RST resets all state (including release of buffers) ...................................................................... cardem: RST resets all state (including release of buffers) When the Modem is asserting RST, the emulated card should set all of its state back to default/initial values and release any buffers it may still hold in its state. Change-Id: I66eca6afe4ff7d900c5b75df1e3ec6d52f6ef214 Related: OS#4251 --- M firmware/libcommon/source/card_emu.c 1 file changed, 19 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 7ce10a8..63bf0d3 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -236,8 +236,25 @@ /* reset all the 'dynamic' state of the card handle to the initial/default values */ static void card_handle_reset(struct card_handle *ch) { + struct msgb *msg; + + tc_etu_disable(ch->tc_chan); + ch->pts.state = PTS_S_WAIT_REQ_PTSS; ch->tpdu.state = TPDU_S_WAIT_CLA; + + /* release any buffers we may still own */ + if (ch->uart_tx_msg) { + usb_buf_free(ch->uart_tx_msg); + ch->uart_tx_msg = NULL; + } + if (ch->uart_rx_msg) { + usb_buf_free(ch->uart_rx_msg); + ch->uart_rx_msg = NULL; + } + while ((msg = msgb_dequeue(&ch->uart_tx_queue))) { + usb_buf_free(msg); + } } struct llist_head *card_emu_get_uart_tx_queue(struct card_handle *ch) @@ -1062,7 +1079,7 @@ case CARD_IO_VCC: if (active == 0 && ch->vcc_active == 1) { TRACE_INFO("%u: VCC deactivated\r\n", ch->num); - tc_etu_disable(ch->tc_chan); + card_handle_reset(ch); card_set_state(ch, ISO_S_WAIT_POWER); } else if (active == 1 && ch->vcc_active == 0) { TRACE_INFO("%u: VCC activated\r\n", ch->num); @@ -1091,7 +1108,7 @@ } } else if (active && !ch->in_reset) { TRACE_INFO("%u: RST asserted\r\n", ch->num); - tc_etu_disable(ch->tc_chan); + card_handle_reset(ch); } ch->in_reset = active; break; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I66eca6afe4ff7d900c5b75df1e3ec6d52f6ef214 Gerrit-Change-Number: 16584 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 19:16:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 19:16:37 +0000 Subject: Change in libosmocore[master]: libosmocore libusb integration References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16606 ) Change subject: libosmocore libusb integration ...................................................................... libosmocore libusb integration Osmocom applications typically use libosmocore select.[ch] event loop code as their main event dispatch mechanism. When they want to deal with libusb in a non-blocking/asynchronous way, they need to integrate libusb into that select(). The new libosmousb is doing exactly that: Providing a shared utility library for Osmocom programs that wish to use libusb. This is useful for example in simtrace2 host utilitie as well as osmo-e1d. Change-Id: I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3 --- M Makefile.am M configure.ac M debian/control A debian/libosmousb0.install M include/Makefile.am A include/osmocom/usb/libusb.h A libosmousb.pc.in A src/usb/Makefile.am A src/usb/osmo_libusb.c 9 files changed, 210 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/06/16606/1 diff --git a/Makefile.am b/Makefile.am index 7b6ba0a..7390f98 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,12 @@ ACLOCAL_AMFLAGS = -I m4 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -SUBDIRS = include src src/vty src/codec src/gsm src/coding src/gb src/ctrl src/sim src/pseudotalloc utils tests +SUBDIRS = include src src/vty src/codec src/gsm src/coding src/gb src/ctrl src/sim src/pseudotalloc src/usb utils tests pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc \ - libosmogb.pc libosmoctrl.pc libosmocoding.pc libosmosim.pc + libosmogb.pc libosmoctrl.pc libosmocoding.pc libosmosim.pc \ + libosmousb.pc aclocaldir = $(datadir)/aclocal dist_aclocal_DATA = m4/osmo_ac_code_coverage.m4 \ diff --git a/configure.ac b/configure.ac index 060d081..e45ec9f 100644 --- a/configure.ac +++ b/configure.ac @@ -146,6 +146,19 @@ AM_CONDITIONAL(ENABLE_PCSC, test "x$ENABLE_PCSC" = "xyes") AC_SUBST(ENABLE_PCSC) +AC_ARG_ENABLE([libusb], [AS_HELP_STRING([--disable-libusb], [Build without libusb support])], + [ + ENABLE_LIBUSB=$enableval + ], + [ + ENABLE_LIBUSB="yes" + ]) +AS_IF([test "x$ENABLE_LIBUSB" = "xyes"], [ + PKG_CHECK_MODULES(LIBUSB, libusb-1.0) +]) +AM_CONDITIONAL(ENABLE_LIBUSB, test "x$ENABLE_LIBUSB" = "xyes") +AC_SUBST(ENABLE_LIBUSB) + AC_ARG_ENABLE([gnutls], [AS_HELP_STRING([--disable-gnutls], [Do not use GnuTLS fallback for missing getrandom()])], [ENABLE_GNUTLS=$enableval], [ENABLE_GNUTLS="yes"]) AM_CONDITIONAL(ENABLE_GNUTLS, test x"$ENABLE_GNUTLS" = x"yes") @@ -398,12 +411,14 @@ libosmogb.pc libosmoctrl.pc libosmosim.pc + libosmousb.pc include/Makefile src/Makefile src/vty/Makefile src/codec/Makefile src/coding/Makefile src/sim/Makefile + src/usb/Makefile src/gsm/Makefile src/gb/Makefile src/ctrl/Makefile diff --git a/debian/control b/debian/control index cf7a853..d2c232f 100644 --- a/debian/control +++ b/debian/control @@ -34,6 +34,7 @@ libosmovty4 (= ${binary:Version}), libosmoctrl0 (= ${binary:Version}), libosmosim0 (= ${binary:Version}), + libosmousb0 (= ${binary:Version}), ${misc:Depends} Description: Open Source MObile COMmunications CORE library (metapackage) The libraries provided by this package contain various utility functions. @@ -293,6 +294,23 @@ . The libosmosim library in particular contains routines for SIM card access. +Package: libosmousb0 +Section: libs +Architecture: any +Multi-Arch: same +Depends: ${shlibs:Depends}, + ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Description: Osmo USB library + This is part of the libosmocore "meta"-library. The libosmocore library + contains various utility functions that were originally developed as part of + the OpenBSC project, but which are of a more generic nature and thus useful to + (at least) other programs that are developed in the sphere of Free Software / + Open Source mobile communication. + . + The libosmosub library in particular contains routines for USB device access + via libusb-1.0, integrated into the libosmocore select event loop. + Package: libosmocore-dev Architecture: any Multi-Arch: same diff --git a/debian/libosmousb0.install b/debian/libosmousb0.install new file mode 100644 index 0000000..4031b9f --- /dev/null +++ b/debian/libosmousb0.install @@ -0,0 +1 @@ +usr/lib/*/libosmousb*.so.* diff --git a/include/Makefile.am b/include/Makefile.am index d76addd..dc6eaa7 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -164,6 +164,11 @@ osmocom/ctrl/control_vty.h endif +if ENABLE_LIBUSB +nobase_include_HEADERS += \ + osmocom/usb/libusb.h +endif + noinst_HEADERS = \ osmocom/gsm/kasumi.h \ osmocom/gsm/gea.h \ diff --git a/include/osmocom/usb/libusb.h b/include/osmocom/usb/libusb.h new file mode 100644 index 0000000..7f10f74 --- /dev/null +++ b/include/osmocom/usb/libusb.h @@ -0,0 +1,6 @@ +#pragma once + +#include + +int osmo_libusb_init(libusb_context **luctx); +void osmo_libusb_exit(libusb_context *luctx); diff --git a/libosmousb.pc.in b/libosmousb.pc.in new file mode 100644 index 0000000..db8b2b4 --- /dev/null +++ b/libosmousb.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: Osmocom libusb (USB) integration +Description: C Utility Library +Version: @VERSION@ +Libs: -L${libdir} @TALLOC_LIBS@ -losmocore +Cflags: -I${includedir}/ + diff --git a/src/usb/Makefile.am b/src/usb/Makefile.am new file mode 100644 index 0000000..bca39bf --- /dev/null +++ b/src/usb/Makefile.am @@ -0,0 +1,21 @@ +# This is _NOT_ the library release version, it's an API version. +# Please read chapter "Library interface versions" of the libtool documentation +# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html +LIBVERSION=0:0:0 + +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CFLAGS = -fPIC -Wall $(LIBUSB_CFLAGS) $(TALLOC_CFLAGS) +AM_LDFLAGS = $(COVERAGE_LDFLAGS) + +if ENABLE_LIBUSB + +lib_LTLIBRARIES = libosmousb.la + +libosmousb_la_SOURCES = osmo_libusb.c +libosmosim_la_LDFLAGS = -version-info $(LIBVERSION) +libosmosim_la_LIBADD = \ + $(top_builddir)/src/libosmocore.la \ + $(TALLOC_LIBS) \ + $(LIBUSB_LIBS) + +endif diff --git a/src/usb/osmo_libusb.c b/src/usb/osmo_libusb.c new file mode 100644 index 0000000..79ab0ff --- /dev/null +++ b/src/usb/osmo_libusb.c @@ -0,0 +1,130 @@ +/* libosmocore integration with libusb-1.0 + * + * (C) 2019 by Harald Welte + * All Rights Reserved. + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include + +/*********************************************************************** + * logging integration + ***********************************************************************/ + +#define DLUSB DLINP + + +static const int usb2logl[] = { + [LIBUSB_LOG_LEVEL_NONE] = LOGL_FATAL, + [LIBUSB_LOG_LEVEL_ERROR] = LOGL_ERROR, + [LIBUSB_LOG_LEVEL_WARNING] = LOGL_NOTICE, + [LIBUSB_LOG_LEVEL_INFO] = LOGL_INFO, + [LIBUSB_LOG_LEVEL_DEBUG] = LOGL_DEBUG, +}; + + +/* called by libusb if it wants to log something */ +static void libosmo_usb_log_cb(libusb_context *luctx, enum libusb_log_level level_usb, const char *str) +{ + int level = LOGL_NOTICE; + + if (level_usb < ARRAY_SIZE(usb2logl)) + level = usb2logl[level_usb]; + + LOGP(DLUSB, level, "%s", str); +} + +/*********************************************************************** + * select loop integration + ***********************************************************************/ + +static int osmo_usb_fd_cb(struct osmo_fd *ofd, unsigned int what) +{ + libusb_context *luctx = ofd->data; + + /* we assume that we're running Linux v2.6.27 with timerfd support here + * and hence don't have to perform manual timeout handling. See + * "Notes on time-based events" at + * http://libusb.sourceforge.net/api-1.0/group__libusb__poll.html */ + struct timeval zero_tv = { 0, 0 }; + libusb_handle_events_timeout(luctx, &zero_tv); + + return 0; +} + +/* called by libusb if it wants to add a file-descriptor */ +static void osmo_usb_added_cb(int fd, short events, void *user_data) +{ + struct osmo_fd *ofd = talloc_zero(OTC_GLOBAL, struct osmo_fd); + libusb_context *luctx = user_data; + unsigned int when = 0; + + if (events & POLLIN) + when |= OSMO_FD_READ; + if (events & POLLOUT) + when |= OSMO_FD_WRITE; + + osmo_fd_setup(ofd, fd, when, osmo_usb_fd_cb, luctx, 0); + osmo_fd_register(ofd); +} + +/* called by libusb if it wants to remove a file-descriptor */ +static void osmo_usb_removed_cb(int fd, void *user_data) +{ + struct osmo_fd *ofd = osmo_fd_get_by_fd(fd); + if (!fd) + return; + osmo_fd_unregister(ofd); + talloc_free(ofd); +} + + +/*********************************************************************** + * initialization + ***********************************************************************/ + +int osmo_libusb_init(libusb_context **luctx) +{ + int rc; + rc = libusb_init(luctx); + if (rc != 0) + return rc; + + libusb_set_log_cb(*luctx, &libosmo_usb_log_cb, LIBUSB_LOG_CB_CONTEXT); + + libusb_set_pollfd_notifiers(*luctx, osmo_usb_added_cb, osmo_usb_removed_cb, *luctx); + + return 0; +} + +void osmo_libusb_exit(libusb_context *luctx) +{ + /* we just assume libusb is cleaning up all the osmo_Fd's we've allocated */ + libusb_exit(luctx); +} -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3 Gerrit-Change-Number: 16606 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 19:16:38 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 19:16:38 +0000 Subject: Change in libosmocore[master]: usb: Import a variety of libusb utility functions from simtrace References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16607 ) Change subject: usb: Import a variety of libusb utility functions from simtrace ...................................................................... usb: Import a variety of libusb utility functions from simtrace Those functions were originally developed as part of simtrace; let's import them to libosmousb as they are truly generic. Change-Id: I2c18b938e4e1ea5b8a521a386f00db3a7389e47a --- M include/osmocom/usb/libusb.h M src/usb/osmo_libusb.c 2 files changed, 384 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/07/16607/1 diff --git a/include/osmocom/usb/libusb.h b/include/osmocom/usb/libusb.h index 7f10f74..5b01847 100644 --- a/include/osmocom/usb/libusb.h +++ b/include/osmocom/usb/libusb.h @@ -1,6 +1,77 @@ #pragma once +/* libusb utilities + * + * (C) 2010-2019 by Harald Welte + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ #include +#define USB_MAX_PATH_LEN 20 + +struct dev_id { + uint16_t vendor_id; + uint16_t product_id; +}; + +/* structure describing a single matching interface found */ +struct usb_interface_match { + /* libusb device E*/ + libusb_device *usb_dev; + /* Vendor ID of the device running matching interface */ + uint16_t vendor; + /* Product ID of the device running matching interface */ + uint16_t product; + /* USB Bus Address */ + uint8_t addr; + /* physical path */ + char path[USB_MAX_PATH_LEN]; + /* configuration of matching interface */ + uint8_t configuration; + /* interface number of matching interface */ + uint8_t interface; + /* altsetting of matching interface */ + uint8_t altsetting; + /* bInterfaceClass of matching interface */ + uint8_t class; + /* bInterfaceSubClass of matching interface */ + uint8_t sub_class; + /* bInterfaceProtocol of matching interface */ + uint8_t protocol; + /* index of string descriptor of matching interface */ + uint8_t string_idx; +}; + + +char *osmo_libusb_dev_get_path_buf(char *buf, size_t bufsize, libusb_device *dev); +char *osmo_libusb_dev_get_path_c(void *ctx, libusb_device *dev); + +libusb_device **osmo_libusb_find_matching_usb_devs(void *ctx, struct libusb_context *luctx, + const struct dev_id *dev_ids); + +int osmo_libusb_dev_find_matching_interfaces(libusb_device *dev, int class, int sub_class, + int protocol, struct usb_interface_match *out, + unsigned int out_len); + +libusb_device_handle *osmo_libusb_open_claim_interface(void *ctx, libusb_context *luctx, + const struct usb_interface_match *ifm); + +int osmo_libusb_get_ep_addrs(libusb_device_handle *devh, unsigned int if_num, + uint8_t *out, uint8_t *in, uint8_t *irq); + + int osmo_libusb_init(libusb_context **luctx); void osmo_libusb_exit(libusb_context *luctx); diff --git a/src/usb/osmo_libusb.c b/src/usb/osmo_libusb.c index 79ab0ff..c8633b3 100644 --- a/src/usb/osmo_libusb.c +++ b/src/usb/osmo_libusb.c @@ -1,6 +1,6 @@ /* libosmocore integration with libusb-1.0 * - * (C) 2019 by Harald Welte + * (C) 2019-2019 by Harald Welte * All Rights Reserved. * * SPDX-License-Identifier: GPL-2.0+ @@ -33,6 +33,8 @@ #include +#include + /*********************************************************************** * logging integration ***********************************************************************/ @@ -104,7 +106,317 @@ talloc_free(ofd); } +/*********************************************************************** + * utility functions + ***********************************************************************/ +/*! obtain the string representation of the USB device path of given device. + * \param[out] buf Output string buffer + * \param[in] bufsize Size of output string buffer in bytes + * \param[in] dev USB device whose bus path we want to obtain + * \returns pointer to 'buf' in case of success; NULL in case of error */ +char *osmo_libusb_dev_get_path_buf(char *buf, size_t bufsize, libusb_device *dev) +{ +#if (defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102) || \ + (defined(LIBUSBX_API_VERSION) && LIBUSBX_API_VERSION >= 0x01000102) + struct osmo_strbuf sb = { .buf = buf, .len = bufsize }; + uint8_t path[8]; + int r,j; + r = libusb_get_port_numbers(dev, path, sizeof(path)); + if (r > 0) { + OSMO_STRBUF_PRINTF(sb, "%d-%d", libusb_get_bus_number(dev), path[0]); + for (j = 1; j < r; j++){ + OSMO_STRBUF_PRINTF(sb, ".%d", path[j]); + } + } + return buf; +#else +# warning "libusb too old - building without USB path support!" + return NULL; +#endif +} + +/*! obtain the string representation of the USB device path of given device. + * \param[in] talloc context from which to dynamically allocate output string buffer + * \param[in] dev USB device whose bus path we want to obtain + * \returns pointer to 'buf' in case of success; NULL in case of error */ +char *osmo_libusb_dev_get_path_c(void *ctx, libusb_device *dev) +{ + char *buf = talloc_zero_size(ctx, USB_MAX_PATH_LEN); + if (!buf) + return NULL; + return osmo_libusb_dev_get_path_buf(buf, USB_MAX_PATH_LEN, dev); +} + +static int match_dev_id(const struct libusb_device_descriptor *desc, const struct dev_id *id) +{ + if ((desc->idVendor == id->vendor_id) && (desc->idProduct == id->product_id)) + return 1; + return 0; +} + +static int match_dev_ids(const struct libusb_device_descriptor *desc, const struct dev_id *ids) +{ + const struct dev_id *id; + + for (id = ids; id->vendor_id || id->product_id; id++) { + if (match_dev_id(desc, id)) + return 1; + } + return 0; +} + +/*! Find USB devices matching the specified list of USB VendorID/ProductIDs + * \param[in] ctx talloc context from which to allocate output data + * \param[in] luctx libusb context on which to operate + * \param[in] dev_ids zero-terminated array of VendorId/ProductId tuples + * \returns array of up to 256 libusb_device pointers; NULL in case of error */ +libusb_device **osmo_libusb_find_matching_usb_devs(void *ctx, struct libusb_context *luctx, + const struct dev_id *dev_ids) +{ + libusb_device **list; + libusb_device **out = talloc_array(ctx, libusb_device *, 256); + libusb_device **cur = out; + unsigned int i; + int rc; + + if (!out) + return NULL; + + rc = libusb_get_device_list(luctx, &list); + if (rc <= 0) { + perror("No USB devices found"); + talloc_free(out); + return NULL; + } + + for (i = 0; list[i] != NULL; i++) { + struct libusb_device_descriptor dev_desc; + libusb_device *dev = list[i]; + + rc = libusb_get_device_descriptor(dev, &dev_desc); + if (rc < 0) { + perror("Couldn't get device descriptor\n"); + libusb_unref_device(dev); + continue; + } + + if (match_dev_ids(&dev_desc, dev_ids)) { + *cur = dev; + cur++; + /* overflow check */ + if (cur >= out + 256) + break; + } else + libusb_unref_device(dev); + } + if (cur == out) { + libusb_free_device_list(list, 1); + talloc_free(out); + return NULL; + } + + libusb_free_device_list(list, 0); + return out; +} + +/*! find a matching interface among all interfaces of the given USB device. + * \param[in] dev USB device in which we shall search + * \param[in] class USB Interface Class to look for + * \param[in] sub_class USB Interface Subclass to look for + * \param[in] protocol USB Interface Protocol to look for + * \param[out] out User-allocated array for storing matches + * \param[in] out_len Length of out array + * \returns number of matching interfaces; negative in case of error */ +int osmo_libusb_dev_find_matching_interfaces(libusb_device *dev, int class, int sub_class, + int protocol, struct usb_interface_match *out, + unsigned int out_len) +{ + struct libusb_device_descriptor dev_desc; + int rc, i, out_idx = 0; + uint8_t addr; + char pathbuf[USB_MAX_PATH_LEN]; + char *path; + + rc = libusb_get_device_descriptor(dev, &dev_desc); + if (rc < 0) { + perror("Couldn't get device descriptor\n"); + return -EIO; + } + + addr = libusb_get_device_address(dev); + path = osmo_libusb_dev_get_path_buf(pathbuf, sizeof(pathbuf), dev); + + /* iterate over all configurations */ + for (i = 0; i < dev_desc.bNumConfigurations; i++) { + struct libusb_config_descriptor *conf_desc; + int j; + + rc = libusb_get_config_descriptor(dev, i, &conf_desc); + if (rc < 0) { + fprintf(stderr, "Couldn't get config descriptor %u\n", i); + continue; + } + /* iterate over all interfaces */ + for (j = 0; j < conf_desc->bNumInterfaces; j++) { + const struct libusb_interface *intf = &conf_desc->interface[j]; + int k; + /* iterate over all alternate settings */ + for (k = 0; k < intf->num_altsetting; k++) { + const struct libusb_interface_descriptor *if_desc; + if_desc = &intf->altsetting[k]; + if (class >= 0 && if_desc->bInterfaceClass != class) + continue; + if (sub_class >= 0 && if_desc->bInterfaceSubClass != sub_class) + continue; + if (protocol >= 0 && if_desc->bInterfaceProtocol != protocol) + continue; + /* MATCH! */ + out[out_idx].usb_dev = dev; + out[out_idx].vendor = dev_desc.idVendor; + out[out_idx].product = dev_desc.idProduct; + out[out_idx].addr = addr; + strncpy(out[out_idx].path, path, sizeof(out[out_idx].path)-1); + out[out_idx].path[sizeof(out[out_idx].path)-1] = '\0'; + out[out_idx].configuration = conf_desc->bConfigurationValue; + out[out_idx].interface = if_desc->bInterfaceNumber; + out[out_idx].altsetting = if_desc->bAlternateSetting; + out[out_idx].class = if_desc->bInterfaceClass; + out[out_idx].sub_class = if_desc->bInterfaceSubClass; + out[out_idx].protocol = if_desc->bInterfaceProtocol; + out[out_idx].string_idx = if_desc->iInterface; + out_idx++; + if (out_idx >= out_len) + return out_idx; + } + } + } + return out_idx; +} + +/*! open matching USB device and claim interface + * \param[in] ctx talloc context to use for related allocations + * \param[in] luctx libusb context on which to operate + * \param[in] ifm interface match describing interface to claim + * \returns libusb device chandle on success; NULL on error */ +libusb_device_handle *osmo_libusb_open_claim_interface(void *ctx, libusb_context *luctx, + const struct usb_interface_match *ifm) +{ + int rc, config; + struct dev_id dev_ids[] = { { ifm->vendor, ifm->product }, { 0, 0 } }; + libusb_device **list; + libusb_device **dev; + libusb_device_handle *usb_devh = NULL; + + list = osmo_libusb_find_matching_usb_devs(ctx, luctx, dev_ids); + if (!list) { + perror("No USB device with matching VID/PID"); + return NULL; + } + + for (dev = list; *dev; dev++) { + int addr; + char pathbuf[USB_MAX_PATH_LEN]; + char *path; + + addr = libusb_get_device_address(*dev); + path = osmo_libusb_dev_get_path_buf(pathbuf, sizeof(pathbuf), *dev); + if ((ifm->addr && addr == ifm->addr) || + (strlen(ifm->path) && !strcmp(path, ifm->path))) { + rc = libusb_open(*dev, &usb_devh); + if (rc < 0) { + fprintf(stderr, "Cannot open device: %s\n", libusb_error_name(rc)); + usb_devh = NULL; + break; + } + rc = libusb_get_configuration(usb_devh, &config); + if (rc < 0) { + fprintf(stderr, "Cannot get current configuration: %s\n", libusb_error_name(rc)); + libusb_close(usb_devh); + usb_devh = NULL; + break; + } + if (config != ifm->configuration) { + rc = libusb_set_configuration(usb_devh, ifm->configuration); + if (rc < 0) { + fprintf(stderr, "Cannot set configuration: %s\n", libusb_error_name(rc)); + libusb_close(usb_devh); + usb_devh = NULL; + break; + } + } + rc = libusb_claim_interface(usb_devh, ifm->interface); + if (rc < 0) { + fprintf(stderr, "Cannot claim interface: %s\n", libusb_error_name(rc)); + libusb_close(usb_devh); + usb_devh = NULL; + break; + } + rc = libusb_set_interface_alt_setting(usb_devh, ifm->interface, ifm->altsetting); + if (rc < 0) { + fprintf(stderr, "Cannot set interface altsetting: %s\n", libusb_error_name(rc)); + libusb_release_interface(usb_devh, ifm->interface); + libusb_close(usb_devh); + usb_devh = NULL; + break; + } + } + } + + /* unref / free list */ + for (dev = list; *dev; dev++) + libusb_unref_device(*dev); + free(list); + + return usb_devh; +} + +/*! obtain the endpoint addresses for a given USB interface. + * \param[in] devh USB device handle on which to operate + * \param[in] if_num USB Interface number on which to operate + * \param[out] out user-provided storage for OUT endpoint number + * \param[out] in user-provided storage for IN endpoint number + * \param[out] irq user-provided storage for IRQ endpoint number + * \returns 0 in case of success; negative in case of error */ +int osmo_libusb_get_ep_addrs(libusb_device_handle *devh, unsigned int if_num, + uint8_t *out, uint8_t *in, uint8_t *irq) +{ + libusb_device *dev = libusb_get_device(devh); + struct libusb_config_descriptor *cdesc; + const struct libusb_interface_descriptor *idesc; + const struct libusb_interface *iface; + int rc, l; + + rc = libusb_get_active_config_descriptor(dev, &cdesc); + if (rc < 0) + return rc; + + iface = &cdesc->interface[if_num]; + /* FIXME: we assume there's no altsetting */ + idesc = &iface->altsetting[0]; + + for (l = 0; l < idesc->bNumEndpoints; l++) { + const struct libusb_endpoint_descriptor *edesc = &idesc->endpoint[l]; + switch (edesc->bmAttributes & 3) { + case LIBUSB_TRANSFER_TYPE_BULK: + if (edesc->bEndpointAddress & 0x80) { + if (in) + *in = edesc->bEndpointAddress; + } else { + if (out) + *out = edesc->bEndpointAddress; + } + break; + case LIBUSB_TRANSFER_TYPE_INTERRUPT: + if (irq) + *irq = edesc->bEndpointAddress; + break; + default: + break; + } + } + return 0; +} /*********************************************************************** * initialization ***********************************************************************/ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c18b938e4e1ea5b8a521a386f00db3a7389e47a Gerrit-Change-Number: 16607 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 19:50:10 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 19:50:10 +0000 Subject: Change in libosmocore[master]: usb: Import a variety of libusb utility functions from simtrace In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmocore/+/16607 ) Change subject: usb: Import a variety of libusb utility functions from simtrace ...................................................................... usb: Import a variety of libusb utility functions from simtrace Those functions were originally developed as part of simtrace; let's import them to libosmousb as they are truly generic. Change-Id: I2c18b938e4e1ea5b8a521a386f00db3a7389e47a --- M include/osmocom/usb/libusb.h M src/usb/osmo_libusb.c 2 files changed, 452 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/07/16607/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c18b938e4e1ea5b8a521a386f00db3a7389e47a Gerrit-Change-Number: 16607 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 20:01:40 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 20:01:40 +0000 Subject: Change in libosmocore[master]: libosmocore libusb integration In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmocore/+/16606 ) Change subject: libosmocore libusb integration ...................................................................... libosmocore libusb integration Osmocom applications typically use libosmocore select.[ch] event loop code as their main event dispatch mechanism. When they want to deal with libusb in a non-blocking/asynchronous way, they need to integrate libusb into that select(). The new libosmousb is doing exactly that: Providing a shared utility library for Osmocom programs that wish to use libusb. This is useful for example in simtrace2 host utilitie as well as osmo-e1d. Change-Id: I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3 Closes: OS#4299 --- M Makefile.am M configure.ac M debian/control A debian/libosmousb0.install M include/Makefile.am A include/osmocom/usb/libusb.h A libosmousb.pc.in A src/usb/Makefile.am A src/usb/osmo_libusb.c 9 files changed, 210 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/06/16606/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3 Gerrit-Change-Number: 16606 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 20:01:40 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 20:01:40 +0000 Subject: Change in libosmocore[master]: usb: Import a variety of libusb utility functions from simtrace In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/c/libosmocore/+/16607 ) Change subject: usb: Import a variety of libusb utility functions from simtrace ...................................................................... usb: Import a variety of libusb utility functions from simtrace Those functions were originally developed as part of simtrace; let's import them to libosmousb as they are truly generic. Change-Id: I2c18b938e4e1ea5b8a521a386f00db3a7389e47a Related: OS#4299 --- M include/osmocom/usb/libusb.h M src/usb/osmo_libusb.c 2 files changed, 452 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/07/16607/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c18b938e4e1ea5b8a521a386f00db3a7389e47a Gerrit-Change-Number: 16607 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 20:25:23 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 20:25:23 +0000 Subject: Change in libosmocore[master]: usb: Import a variety of libusb utility functions from simtrace In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#4). ( https://gerrit.osmocom.org/c/libosmocore/+/16607 ) Change subject: usb: Import a variety of libusb utility functions from simtrace ...................................................................... usb: Import a variety of libusb utility functions from simtrace Those functions were originally developed as part of simtrace; let's import them to libosmousb as they are truly generic. Change-Id: I2c18b938e4e1ea5b8a521a386f00db3a7389e47a Related: OS#4299 --- M include/osmocom/usb/libusb.h M src/usb/osmo_libusb.c 2 files changed, 452 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/07/16607/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c18b938e4e1ea5b8a521a386f00db3a7389e47a Gerrit-Change-Number: 16607 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 20:35:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 20:35:48 +0000 Subject: Change in libosmocore[master]: libosmocore libusb integration In-Reply-To: References: Message-ID: Hello tnt, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/16606 to look at the new patch set (#3). Change subject: libosmocore libusb integration ...................................................................... libosmocore libusb integration Osmocom applications typically use libosmocore select.[ch] event loop code as their main event dispatch mechanism. When they want to deal with libusb in a non-blocking/asynchronous way, they need to integrate libusb into that select(). The new libosmousb is doing exactly that: Providing a shared utility library for Osmocom programs that wish to use libusb. This is useful for example in simtrace2 host utilitie as well as osmo-e1d. Change-Id: I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3 Closes: OS#4299 --- M Makefile.am M configure.ac M contrib/jenkins_arm.sh M debian/control A debian/libosmousb0.install M include/Makefile.am A include/osmocom/usb/libusb.h A libosmousb.pc.in A src/usb/Makefile.am A src/usb/osmo_libusb.c 10 files changed, 213 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/06/16606/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3 Gerrit-Change-Number: 16606 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 20:57:09 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 20:57:09 +0000 Subject: Change in libosmocore[master]: gprs_bssgp: Work around gcc-9 claiming "error=stringop-overflow" References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16608 ) Change subject: gprs_bssgp: Work around gcc-9 claiming "error=stringop-overflow" ...................................................................... gprs_bssgp: Work around gcc-9 claiming "error=stringop-overflow" gcc-9.2.1 issues the following errror when compiling with -Werror: In function ?tl16v_put?, inlined from ?tvlv_put? at ../../include/osmocom/gsm/tlv.h:156:9, inlined from ?tvlv_put? at ../../include/osmocom/gsm/tlv.h:147:24, inlined from ?msgb_tvlv_put? at ../../include/osmocom/gsm/tlv.h:223:9, inlined from ?bssgp_tx_paging? at gprs_bssgp.c:1250:2: ../../include/osmocom/gsm/tlv.h:131:2: error: ?memcpy? reading between 128 and 65535 bytes from a region of size 9 [-Werror=stringop-overflow=] 131 | memcpy(buf, val, len); | ^~~~~~~~~~~~~~~~~~~~~ Unfortunately I've not been able to work around it with some nice GCC #pragma GCC diagnostic ignored "-Wstringop-overflow" Change-Id: I22a0c399c6c00eaf87277002096a82844c9e198e --- M src/gb/gprs_bssgp.c M src/gb/gprs_bssgp_bss.c 2 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/08/16608/1 diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c index 896f1c5..38794c2 100644 --- a/src/gb/gprs_bssgp.c +++ b/src/gb/gprs_bssgp.c @@ -1178,6 +1178,7 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Warray-bounds" int imsi_len = gsm48_generate_mid_from_imsi(mi, dup->imsi); + OSMO_ASSERT(imsi_len <= GSM48_MID_MAX_SIZE); if (imsi_len > 2) msgb_tvlv_push(msg, BSSGP_IE_IMSI, imsi_len-2, mi+2); @@ -1247,6 +1248,7 @@ * mi[131], which is wrong */ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Warray-bounds" + OSMO_ASSERT(imsi_len <= GSM48_MID_MAX_SIZE); msgb_tvlv_put(msg, BSSGP_IE_IMSI, imsi_len-2, mi+2); #pragma GCC diagnostic pop /* DRX Parameters */ diff --git a/src/gb/gprs_bssgp_bss.c b/src/gb/gprs_bssgp_bss.c index f06c403..5c9d11c 100644 --- a/src/gb/gprs_bssgp_bss.c +++ b/src/gb/gprs_bssgp_bss.c @@ -189,6 +189,7 @@ * mi[131], which is wrong */ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Warray-bounds" + OSMO_ASSERT(imsi_len <= GSM48_MID_MAX_SIZE); /* strip the MI type and length values (2 bytes) */ if (imsi_len > 2) msgb_tvlv_put(msg, BSSGP_IE_IMSI, imsi_len-2, mi+2); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16608 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I22a0c399c6c00eaf87277002096a82844c9e198e Gerrit-Change-Number: 16608 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 22:45:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 22:45:59 +0000 Subject: Change in osmo-remsim[master]: remsim-client: Port from local copy to libosmousb + libosmo-simtrace2 References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16609 ) Change subject: remsim-client: Port from local copy to libosmousb + libosmo-simtrace2 ...................................................................... remsim-client: Port from local copy to libosmousb + libosmo-simtrace2 We originally imported a copy of [most of] the code of simtrace2.git/host into this repository. That was a quick hack to get things going, but now that simtrace2.git is providing a shared library of simtrace2 utility functions, let's migrate over to it. At the same time, some functions (libusb_util) have been migrated to libosmousb (a new library in libosmocore.git), so we must add that as new dependency, too. This performs the minimally required changes and is *not* a proper port to the libosmousb osmocore select loop integration, whcih will follow in a separate patch. Change-Id: Idf5a861f4dacbec3c664f4ced6e03d8662c73112 Related: OS#4299 Depends: libosmocore.git I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3 --- M configure.ac M src/Makefile.am M src/simtrace2-remsim_client.c D src/simtrace2/apdu_dispatch.c D src/simtrace2/apdu_dispatch.h D src/simtrace2/libusb_util.c D src/simtrace2/libusb_util.h D src/simtrace2/simtrace2-discovery.c D src/simtrace2/simtrace2-discovery.h D src/simtrace2/simtrace_prot.h D src/simtrace2/simtrace_usb.h 11 files changed, 15 insertions(+), 1,119 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/09/16609/1 diff --git a/configure.ac b/configure.ac index 2fc603d..d041c1a 100644 --- a/configure.ac +++ b/configure.ac @@ -39,6 +39,8 @@ PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.11.0) PKG_CHECK_MODULES(OSMOABIS, libosmoabis) PKG_CHECK_MODULES(OSMOSIM, libosmosim) +PKG_CHECK_MODULES(OSMOUSB, libosmousb) +PKG_CHECK_MODULES(OSMOSIMTRACE2, libosmo-simtrace2) PKG_CHECK_MODULES(USB, libusb-1.0) AC_ARG_ENABLE([remsim-server],[AS_HELP_STRING([--disable-remsim-server], [Build osmo-remsim-server])], diff --git a/src/Makefile.am b/src/Makefile.am index 35da621..e1090fc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,12 +19,7 @@ libosmo_rspro_la_SOURCES = rspro_util.c asn1c_helpers.c noinst_HEADERS = debug.h client.h rspro_util.h slotmap.h rspro_client_fsm.h \ - asn1c_helpers.h \ - simtrace2/apdu_dispatch.h \ - simtrace2/libusb_util.h \ - simtrace2/simtrace2-discovery.h \ - simtrace2/simtrace_prot.h \ - simtrace2/simtrace_usb.h + asn1c_helpers.h bin_PROGRAMS = osmo-remsim-client-st2 @@ -33,9 +28,7 @@ libosmo-rspro.la osmo_remsim_client_st2_SOURCES = simtrace2-remsim_client.c \ - rspro_client_fsm.c debug.c \ - simtrace2/apdu_dispatch.c \ - simtrace2/simtrace2-discovery.c \ - simtrace2/libusb_util.c + rspro_client_fsm.c debug.c osmo_remsim_client_st2_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \ + $(OSMOUSB_LIBS) $(OSMOSIMTRACE2_LIBS) \ $(USB_LIBS) $(OSMOSIM_LIBS) libosmo-rspro.la diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index fc5ac55..30a9c5b 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -50,11 +50,10 @@ #include -#include "simtrace2/libusb_util.h" -#include "simtrace2/simtrace_prot.h" -#include "simtrace2/simtrace_usb.h" -#include "simtrace2/apdu_dispatch.h" -#include "simtrace2/simtrace2-discovery.h" +#include +#include +#include +#include #include #include @@ -406,7 +405,7 @@ return 0; } -static struct apdu_context ac; // this will hold the complete APDU (across calls) +static struct osmo_apdu_context ac; // this will hold the complete APDU (across calls) /*! \brief Process a RX-DATA indication message from the SIMtrace2 */ static int process_do_rx_da(struct cardem_inst *ci, uint8_t *buf, int len) @@ -417,8 +416,8 @@ printf("SIMtrace => DATA: flags=%x, %s: ", data->flags, osmo_hexdump(data->data, data->data_len)); - rc = apdu_segment_in(&ac, data->data, data->data_len, - data->flags & CEMU_DATA_F_TPDU_HDR); // parse the APDU data in the USB message + rc = osmo_apdu_segment_in(&ac, data->data, data->data_len, + data->flags & CEMU_DATA_F_TPDU_HDR); // parse the APDU data in the USB message if (rc & APDU_ACT_TX_CAPDU_TO_CARD) { // there is no pending data coming from the modem uint8_t apdu_command[sizeof(ac.hdr) + ac.lc.tot]; // to store the APDU command to send @@ -864,7 +863,7 @@ ifm->addr = addr; if (path) osmo_strlcpy(ifm->path, path, sizeof(ifm->path)); - transp->usb_devh = usb_open_claim_interface(NULL, ifm); + transp->usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, ifm); if (!transp->usb_devh) { fprintf(stderr, "can't open USB device\n"); goto close_exit; @@ -876,8 +875,8 @@ goto close_exit; } - rc = get_usb_ep_addrs(transp->usb_devh, if_num, &transp->usb_ep.out, - &transp->usb_ep.in, &transp->usb_ep.irq_in); + rc = osmo_libusb_get_ep_addrs(transp->usb_devh, if_num, &transp->usb_ep.out, + &transp->usb_ep.in, &transp->usb_ep.irq_in); if (rc < 0) { fprintf(stderr, "can't obtain EP addrs; rc=%d\n", rc); goto close_exit; diff --git a/src/simtrace2/apdu_dispatch.c b/src/simtrace2/apdu_dispatch.c deleted file mode 100644 index b9dc3b7..0000000 --- a/src/simtrace2/apdu_dispatch.c +++ /dev/null @@ -1,173 +0,0 @@ -/* apdu_dispatch - State machine to determine Rx/Tx phases of APDU - * - * (C) 2016 by Harald Welte - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "apdu_dispatch.h" - -/*! \brief Has the command-data phase been completed yet? */ -static inline bool is_dc_complete(struct apdu_context *ac) -{ - return (ac->lc.tot == ac->lc.cur); -} - -/*! \brief Has the expected-data phase been completed yet? */ -static inline bool is_de_complete(struct apdu_context *ac) -{ - return (ac->le.tot == ac->le.cur); -} - -static const char *dump_apdu_hdr(const struct osim_apdu_cmd_hdr *h) -{ - static char buf[256]; - sprintf(buf, "CLA=%02x INS=%02x P1=%02x P2=%02x P3=%02x", - h->cla, h->ins, h->p1, h->p2, h->p3); - - return buf; -} - -static void dump_apdu_ctx(const struct apdu_context *ac) -{ - printf("%s; case=%d, lc=%d(%d), le=%d(%d)\n", - dump_apdu_hdr(&ac->hdr), ac->apdu_case, - ac->lc.tot, ac->lc.cur, - ac->le.tot, ac->le.cur); -} - -/*! \brief input function for APDU segmentation - * \param ac APDU context across successive calls - * \param[in] apdu_buf APDU inpud data buffer - * \param[in] apdu_len Length of apdu_buf - * \param[in] new_apdu Is this the beginning of a new APDU? - * - * The function returns APDU_ACT_TX_CAPDU_TO_CARD once there is - * sufficient data of the APDU received to transmit the command-APDU to - * the actual card. - * - * The function retunrs APDU_ACT_RX_MORE_CAPDU_FROM_READER when there - * is more data to be received from the card reader (GSM Phone). - */ -int apdu_segment_in(struct apdu_context *ac, const uint8_t *apdu_buf, - unsigned int apdu_len, bool new_apdu) -{ - int rc = 0; - - if (new_apdu) { - /* initialize the apdu context structure */ - memset(ac, 0, sizeof(*ac)); - /* copy APDU header over */ - memcpy(&ac->hdr, apdu_buf, sizeof(ac->hdr)); - ac->apdu_case = osim_determine_apdu_case(&osim_uicc_sim_cic_profile, apdu_buf); - switch (ac->apdu_case) { - case 1: /* P3 == 0, No Lc/Le */ - ac->le.tot = ac->lc.tot = 0; - break; - case 2: /* P3 == Le */ - ac->le.tot = ac->hdr.p3; - break; - case 3: /* P3 = Lc */ - ac->lc.tot = ac->hdr.p3; - /* copy Dc */ - ac->lc.cur = apdu_len - sizeof(ac->hdr); - memcpy(ac->dc, apdu_buf + sizeof(ac->hdr), - ac->lc.cur); - break; - case 4: /* P3 = Lc; SW with Le */ - ac->lc.tot = ac->hdr.p3; - /* copy Dc */ - ac->lc.cur = apdu_len - sizeof(ac->hdr); - memcpy(ac->dc, apdu_buf + sizeof(ac->hdr), - ac->lc.cur); - break; - case 0: - default: - fprintf(stderr, "Unknown APDU case %d\n", ac->apdu_case); - return -1; - } - } else { - /* copy more data, if available */ - int cpy_len; - switch (ac->apdu_case) { - case 1: - case 2: - break; - case 3: - case 4: - cpy_len = ac->lc.tot - ac->lc.cur; - if (cpy_len > apdu_len) - cpy_len = apdu_len; - memcpy(ac->dc+ac->lc.cur, apdu_buf, cpy_len); - ac->lc.cur += cpy_len; - break; - default: - fprintf(stderr, "Unknown APDU case %d\n", ac->apdu_case); - break; - } - } - - /* take some decisions... */ - switch (ac->apdu_case) { - case 1: /* P3 == 0, No Lc/Le */ - /* send C-APDU to card */ - /* receive SW from card, forward to reader */ - rc |= APDU_ACT_TX_CAPDU_TO_CARD; - break; - case 2: /* P3 == Le */ - /* send C-APDU to card */ - /* receive Le bytes + SW from card, forward to reader */ - rc |= APDU_ACT_TX_CAPDU_TO_CARD; - break; - case 3: /* P3 = Lc */ - if (!is_dc_complete(ac)) { - /* send PB + read further Lc bytes from reader */ - rc |= APDU_ACT_RX_MORE_CAPDU_FROM_READER; - } else { - /* send C-APDU to card */ - /* receive SW from card, forward to reader */ - rc |= APDU_ACT_TX_CAPDU_TO_CARD; - } - break; - case 4: /* P3 = Lc; SW with Le */ - if (!is_dc_complete(ac)) { - /* send PB + read further Lc bytes from reader */ - rc |= APDU_ACT_RX_MORE_CAPDU_FROM_READER; - } else { - /* send C-APDU to card */ - /* receive SW from card, forward to reader */ - rc |= APDU_ACT_TX_CAPDU_TO_CARD; - } - break; - case 0: - default: - fprintf(stderr, "Unknown APDU case %d\n", ac->apdu_case); - break; - } - - dump_apdu_ctx(ac); - - return rc; -} diff --git a/src/simtrace2/apdu_dispatch.h b/src/simtrace2/apdu_dispatch.h deleted file mode 100644 index 2c99858..0000000 --- a/src/simtrace2/apdu_dispatch.h +++ /dev/null @@ -1,49 +0,0 @@ -/* apdu_dispatch - State machine to determine Rx/Tx phases of APDU - * - * (C) 2016 by Harald Welte - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#pragma once - -#include -#include - -#include - -struct apdu_context { - struct osim_apdu_cmd_hdr hdr; - uint8_t dc[256]; - uint8_t de[256]; - uint8_t sw[2]; - uint8_t apdu_case; - struct { - uint8_t tot; - uint8_t cur; - } lc; - struct { - uint8_t tot; - uint8_t cur; - } le; -}; - -enum apdu_action { - APDU_ACT_TX_CAPDU_TO_CARD = 0x0001, - APDU_ACT_RX_MORE_CAPDU_FROM_READER = 0x0002, -}; - - -int apdu_segment_in(struct apdu_context *ac, const uint8_t *apdu_buf, - unsigned int apdu_len, bool new_apdu); diff --git a/src/simtrace2/libusb_util.c b/src/simtrace2/libusb_util.c deleted file mode 100644 index 45e3f50..0000000 --- a/src/simtrace2/libusb_util.c +++ /dev/null @@ -1,297 +0,0 @@ -/* libisb utilities - * - * (C) 2010-2016 by Harald Welte - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#include -#include -#include -#include -#include -#include - -#include - -#include "libusb_util.h" - -static char path_buf[USB_MAX_PATH_LEN]; - -static char *get_path(libusb_device *dev) -{ -#if (defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102) || (defined(LIBUSBX_API_VERSION) && LIBUSBX_API_VERSION >= 0x01000102) - uint8_t path[8]; - int r,j; - r = libusb_get_port_numbers(dev, path, sizeof(path)); - if (r > 0) { - sprintf(path_buf,"%d-%d",libusb_get_bus_number(dev),path[0]); - for (j = 1; j < r; j++){ - sprintf(path_buf+strlen(path_buf),".%d",path[j]); - }; - } - return path_buf; -#else -# warning "libusb too old - building without USB path support!" - return NULL; -#endif -} - -static int match_dev_id(const struct libusb_device_descriptor *desc, const struct dev_id *id) -{ - if ((desc->idVendor == id->vendor_id) && (desc->idProduct == id->product_id)) - return 1; - return 0; -} - - -static int match_dev_ids(const struct libusb_device_descriptor *desc, const struct dev_id *ids) -{ - const struct dev_id *id; - - for (id = ids; id->vendor_id || id->product_id; id++) { - if (match_dev_id(desc, id)) - return 1; - } - return 0; -} - -libusb_device **find_matching_usb_devs(const struct dev_id *dev_ids) -{ - libusb_device **list; - libusb_device **out = calloc(256, sizeof(libusb_device *)); - libusb_device **cur = out; - unsigned int i; - int rc; - - if (!out) - return NULL; - - rc = libusb_get_device_list(NULL, &list); - if (rc <= 0) { - perror("No USB devices found"); - free(out); - return NULL; - } - - for (i = 0; list[i] != NULL; i++) { - struct libusb_device_descriptor dev_desc; - libusb_device *dev = list[i]; - - rc = libusb_get_device_descriptor(dev, &dev_desc); - if (rc < 0) { - perror("Couldn't get device descriptor\n"); - libusb_unref_device(dev); - continue; - } - - if (match_dev_ids(&dev_desc, dev_ids)) { - *cur = dev; - cur++; - /* FIXME: overflow check */ - } else - libusb_unref_device(dev); - } - if (cur == out) { - libusb_free_device_list(list, 1); - free(out); - return NULL; - } - - libusb_free_device_list(list, 0); - return out; -} - -int dev_find_matching_interfaces(libusb_device *dev, int class, int sub_class, int protocol, - struct usb_interface_match *out, unsigned int out_len) -{ - struct libusb_device_descriptor dev_desc; - int rc, i, out_idx = 0; - uint8_t addr; - char *path; - - rc = libusb_get_device_descriptor(dev, &dev_desc); - if (rc < 0) { - perror("Couldn't get device descriptor\n"); - return -EIO; - } - - addr = libusb_get_device_address(dev); - path = get_path(dev); - - /* iterate over all configurations */ - for (i = 0; i < dev_desc.bNumConfigurations; i++) { - struct libusb_config_descriptor *conf_desc; - int j; - - rc = libusb_get_config_descriptor(dev, i, &conf_desc); - if (rc < 0) { - fprintf(stderr, "Couldn't get config descriptor %u\n", i); - continue; - } - /* iterate over all interfaces */ - for (j = 0; j < conf_desc->bNumInterfaces; j++) { - const struct libusb_interface *intf = &conf_desc->interface[j]; - int k; - /* iterate over all alternate settings */ - for (k = 0; k < intf->num_altsetting; k++) { - const struct libusb_interface_descriptor *if_desc; - if_desc = &intf->altsetting[k]; - if (class >= 0 && if_desc->bInterfaceClass != class) - continue; - if (sub_class >= 0 && if_desc->bInterfaceSubClass != sub_class) - continue; - if (protocol >= 0 && if_desc->bInterfaceProtocol != protocol) - continue; - /* MATCH! */ - out[out_idx].usb_dev = dev; - out[out_idx].vendor = dev_desc.idVendor; - out[out_idx].product = dev_desc.idProduct; - out[out_idx].addr = addr; - strncpy(out[out_idx].path, path, sizeof(out[out_idx].path)-1); - out[out_idx].path[sizeof(out[out_idx].path)-1] = '\0'; - out[out_idx].configuration = conf_desc->bConfigurationValue; - out[out_idx].interface = if_desc->bInterfaceNumber; - out[out_idx].altsetting = if_desc->bAlternateSetting; - out[out_idx].class = if_desc->bInterfaceClass; - out[out_idx].sub_class = if_desc->bInterfaceSubClass; - out[out_idx].protocol = if_desc->bInterfaceProtocol; - out[out_idx].string_idx = if_desc->iInterface; - out_idx++; - if (out_idx >= out_len) - return out_idx; - } - } - } - return out_idx; -} - -int usb_match_interfaces(libusb_context *ctx, const struct dev_id *dev_ids, - int class, int sub_class, int protocol, - struct usb_interface_match *out, unsigned int out_len) -{ - struct usb_interface_match *out_cur = out; - unsigned int out_len_remain = out_len; - libusb_device **list; - libusb_device **dev; - - list = find_matching_usb_devs(dev_ids); - if (!list) - return 0; - - for (dev = list; *dev; dev++) { - int rc; - -#if 0 - struct libusb_device_descriptor dev_desc; - uint8_t ports[8]; - uint8_t addr; - rc = libusb_get_device_descriptor(*dev, &dev_desc); - if (rc < 0) { - perror("Cannot get device descriptor"); - continue; - } - - addr = libusb_get_device_address(*dev); - - rc = libusb_get_port_numbers(*dev, ports, sizeof(ports)); - if (rc < 0) { - perror("Cannot get device path"); - continue; - } - - printf("Found USB Device %04x:%04x at address %d\n", - dev_desc.idVendor, dev_desc.idProduct, addr); -#endif - - rc = dev_find_matching_interfaces(*dev, class, sub_class, protocol, out_cur, out_len_remain); - if (rc < 0) - continue; - out_cur += rc; - out_len_remain -= rc; - - } - return out_len - out_len_remain; -} - -libusb_device_handle *usb_open_claim_interface(libusb_context *ctx, - const struct usb_interface_match *ifm) -{ - int rc, config; - struct dev_id dev_ids[] = { { ifm->vendor, ifm->product }, { 0, 0 } }; - libusb_device **list; - libusb_device **dev; - libusb_device_handle *usb_devh = NULL; - - list = find_matching_usb_devs(dev_ids); - if (!list) { - perror("No USB device with matching VID/PID"); - return NULL; - } - - for (dev = list; *dev; dev++) { - int addr; - char *path; - - addr = libusb_get_device_address(*dev); - path = get_path(*dev); - if ((ifm->addr && addr == ifm->addr) || - (strlen(ifm->path) && !strcmp(path, ifm->path))) { - rc = libusb_open(*dev, &usb_devh); - if (rc < 0) { - fprintf(stderr, "Cannot open device: %s\n", libusb_error_name(rc)); - usb_devh = NULL; - break; - } - rc = libusb_get_configuration(usb_devh, &config); - if (rc < 0) { - fprintf(stderr, "Cannot get current configuration: %s\n", libusb_error_name(rc)); - libusb_close(usb_devh); - usb_devh = NULL; - break; - } - if (config != ifm->configuration) { - rc = libusb_set_configuration(usb_devh, ifm->configuration); - if (rc < 0) { - fprintf(stderr, "Cannot set configuration: %s\n", libusb_error_name(rc)); - libusb_close(usb_devh); - usb_devh = NULL; - break; - } - } - rc = libusb_claim_interface(usb_devh, ifm->interface); - if (rc < 0) { - fprintf(stderr, "Cannot claim interface: %s\n", libusb_error_name(rc)); - libusb_close(usb_devh); - usb_devh = NULL; - break; - } - rc = libusb_set_interface_alt_setting(usb_devh, ifm->interface, ifm->altsetting); - if (rc < 0) { - fprintf(stderr, "Cannot set interface altsetting: %s\n", libusb_error_name(rc)); - libusb_release_interface(usb_devh, ifm->interface); - libusb_close(usb_devh); - usb_devh = NULL; - break; - } - } - } - - /* unref / free list */ - for (dev = list; *dev; dev++) - libusb_unref_device(*dev); - free(list); - - return usb_devh; -} diff --git a/src/simtrace2/libusb_util.h b/src/simtrace2/libusb_util.h deleted file mode 100644 index 2b2d92e..0000000 --- a/src/simtrace2/libusb_util.h +++ /dev/null @@ -1,70 +0,0 @@ -/* libisb utilities - * - * (C) 2010-2016 by Harald Welte - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#pragma once - -#include - -#define USB_MAX_PATH_LEN 20 - -struct dev_id { - uint16_t vendor_id; - uint16_t product_id; -}; - -/* Find any USB devices in the system matching the given Vendor and - * Product ID */ -libusb_device **find_matching_usb_devs(const struct dev_id *dev_ids); - -/* structure describing a single matching interface found */ -struct usb_interface_match { - /* libusb device E*/ - libusb_device *usb_dev; - /* Vendor ID of the device running matching interface */ - uint16_t vendor; - /* Product ID of the device running matching interface */ - uint16_t product; - /* USB Bus Address */ - uint8_t addr; - /* physical path */ - char path[USB_MAX_PATH_LEN]; - /* configuration of matching interface */ - uint8_t configuration; - /* interface number of matching interface */ - uint8_t interface; - /* altsetting of matching interface */ - uint8_t altsetting; - /* bInterfaceClass of matching interface */ - uint8_t class; - /* bInterfaceSubClass of matching interface */ - uint8_t sub_class; - /* bInterfaceProtocol of matching interface */ - uint8_t protocol; - /* index of string descriptor of matching interface */ - uint8_t string_idx; -}; - -int dev_find_matching_interfaces(libusb_device *dev, int class, int sub_class, int protocol, - struct usb_interface_match *out, unsigned int out_len); - -int usb_match_interfaces(libusb_context *ctx, const struct dev_id *dev_ids, - int class, int sub_class, int protocol, - struct usb_interface_match *out, unsigned int out_len); - -libusb_device_handle *usb_open_claim_interface(libusb_context *ctx, - const struct usb_interface_match *ifm); diff --git a/src/simtrace2/simtrace2-discovery.c b/src/simtrace2/simtrace2-discovery.c deleted file mode 100644 index a7306ce..0000000 --- a/src/simtrace2/simtrace2-discovery.c +++ /dev/null @@ -1,94 +0,0 @@ -/* simtrace2-discovery - host PC library to scan for matching USB - * devices - * - * (C) 2016 by Harald Welte - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#include - -#include - -/*! \brief obtain the endpoint addresses for a given USB interface */ -int get_usb_ep_addrs(libusb_device_handle *devh, unsigned int if_num, - uint8_t *out, uint8_t *in, uint8_t *irq) -{ - libusb_device *dev = libusb_get_device(devh); - struct libusb_config_descriptor *cdesc; - const struct libusb_interface_descriptor *idesc; - const struct libusb_interface *iface; - int rc, l; - - rc = libusb_get_active_config_descriptor(dev, &cdesc); - if (rc < 0) - return rc; - - iface = &cdesc->interface[if_num]; - /* FIXME: we assume there's no altsetting */ - idesc = &iface->altsetting[0]; - - for (l = 0; l < idesc->bNumEndpoints; l++) { - const struct libusb_endpoint_descriptor *edesc = &idesc->endpoint[l]; - switch (edesc->bmAttributes & 3) { - case LIBUSB_TRANSFER_TYPE_BULK: - if (edesc->bEndpointAddress & 0x80) { - if (in) - *in = edesc->bEndpointAddress; - } else { - if (out) - *out = edesc->bEndpointAddress; - } - break; - case LIBUSB_TRANSFER_TYPE_INTERRUPT: - if (irq) - *irq = edesc->bEndpointAddress; - break; - default: - break; - } - } - return 0; -} - -#if 0 - struct libusb_device_descriptor ddesc; - int rc, i, j, k; - - rc = libusb_get_device_descriptor(devh, &ddesc); - if (rc < 0) - return; - - for (i = 0; i < ddesc.bNumConfigurations; i++) { - struct libusb_config_descriptor *cdesc; - rc = libusb_get_config_descriptor(devh, i, &cdesc); - if (rc < 0) - return; - - for (j = 0; j < cdesc->bNumInterfaces; j++) { - const struct libusb_interface *iface = cdesc->interface[j]; - for (k = 0; k < iface->num_altsetting; k++) { - const struct libusb_interface_descriptor *idesc = iface->altsetting[k]; - /* make sure this is the interface we're looking for */ - if (idesc->bInterfaceClass != 0xFF || - idesc->bInterfaceSubClass != if_class || - idsec->bInterfaceProtocol != if_proto) - continue; - /* FIXME */ - } - } - - libusb_free_config_descriptor(cdesc); - } -#endif diff --git a/src/simtrace2/simtrace2-discovery.h b/src/simtrace2/simtrace2-discovery.h deleted file mode 100644 index cfba956..0000000 --- a/src/simtrace2/simtrace2-discovery.h +++ /dev/null @@ -1,26 +0,0 @@ -/* simtrace2-discovery - host PC library to scan for matching USB - * devices - * - * (C) 2016 by Harald Welte - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#pragma once - -#include -#include - -int get_usb_ep_addrs(libusb_device_handle *devh, unsigned int if_num, - uint8_t *out, uint8_t *in, uint8_t *irq); diff --git a/src/simtrace2/simtrace_prot.h b/src/simtrace2/simtrace_prot.h deleted file mode 100644 index 878bc34..0000000 --- a/src/simtrace2/simtrace_prot.h +++ /dev/null @@ -1,322 +0,0 @@ -/* SIMtrace2 USB protocol - * - * (C) 2015-2017 by Harald Welte - * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA - */ -#pragma once - -#include -#include - -/*********************************************************************** - * COMMON HEADER - ***********************************************************************/ - -enum simtrace_msg_class { - SIMTRACE_MSGC_GENERIC = 0, - /* Card Emulation / Forwarding */ - SIMTRACE_MSGC_CARDEM, - /* Modem Control (if modem is attached next to device) */ - SIMTRACE_MSGC_MODEM, - /* Reader/phone-car/SIM communication sniff */ - SIMTRACE_MSGC_SNIFF, - - /* first vendor-specific request */ - _SIMTRACE_MGSC_VENDOR_FIRST = 127, -}; - -enum simtrace_msg_type_generic { - /* Generic Error Message */ - SIMTRACE_CMD_DO_ERROR = 0, - /* Request/Response for simtrace_board_info */ - SIMTRACE_CMD_BD_BOARD_INFO, -}; - -/* SIMTRACE_MSGC_CARDEM */ -enum simtrace_msg_type_cardem { - /* TPDU Data to be transmitted to phone */ - SIMTRACE_MSGT_DT_CEMU_TX_DATA = 1, - /* Set the ATR to be returned at phone-SIM reset */ - SIMTRACE_MSGT_DT_CEMU_SET_ATR, - /* Get Statistics Request / Response */ - SIMTRACE_MSGT_BD_CEMU_STATS, - /* Get Status Request / Response */ - SIMTRACE_MSGT_BD_CEMU_STATUS, - /* Request / Confirm emulated card insert */ - SIMTRACE_MSGT_DT_CEMU_CARDINSERT, - /* TPDU Data received from phomne */ - SIMTRACE_MSGT_DO_CEMU_RX_DATA, - /* Indicate PTS request from phone */ - SIMTRACE_MSGT_DO_CEMU_PTS, -}; - -/* SIMTRACE_MSGC_MODEM */ -enum simtrace_msg_type_modem { - /* Modem Control: Reset an attached modem */ - SIMTRACE_MSGT_DT_MODEM_RESET = 1, - /* Modem Control: Select local / remote SIM */ - SIMTRACE_MSGT_DT_MODEM_SIM_SELECT, - /* Modem Control: Status (WWAN LED, SIM Presence) */ - SIMTRACE_MSGT_BD_MODEM_STATUS, -}; - -/* SIMTRACE_MSGC_SNIFF */ -enum simtrace_msg_type_sniff { - /* Status change (card inserted, reset, ...) */ - SIMTRACE_MSGT_SNIFF_CHANGE = 0, - /* Fi/Di baudrate change */ - SIMTRACE_MSGT_SNIFF_FIDI, - /* ATR data */ - SIMTRACE_MSGT_SNIFF_ATR, - /* PPS (request or response) data */ - SIMTRACE_MSGT_SNIFF_PPS, - /* TPDU data */ - SIMTRACE_MSGT_SNIFF_TPDU, -}; - -/* common message header */ -struct simtrace_msg_hdr { - uint8_t msg_class; /* simtrace_msg_class */ - uint8_t msg_type; /* simtrace_msg_type_xxx */ - uint8_t seq_nr; - uint8_t slot_nr; /* SIM slot number */ - uint16_t _reserved; - uint16_t msg_len; /* length including header */ - uint8_t payload[0]; -} __attribute__ ((packed)); - -/*********************************************************************** - * Capabilities - ***********************************************************************/ - -/* generic capabilities */ -enum simtrace_capability_generic { - /* compatible with 5V SIM card interface */ - SIMTRACE_CAP_VOLT_5V, - /* compatible with 3.3V SIM card interface */ - SIMTRACE_CAP_VOLT_3V3, - /* compatible with 1.8V SIM card interface */ - SIMTRACE_CAP_VOLT_1V8, - /* Has LED1 */ - SIMTRACE_CAP_LED_1, - /* Has LED2 */ - SIMTRACE_CAP_LED_2, - /* Has Single-Pole Dual-Throw (local/remote SIM) */ - SIMTRACE_CAP_SPDT, - /* Has Bus-Switch (trace / MITM) */ - SIMTRACE_CAP_BUS_SWITCH, - /* Can read VSIM via ADC */ - SIMTRACE_CAP_VSIM_ADC, - /* Can read temperature via ADC */ - SIMTRACE_CAP_TEMP_ADC, - /* Supports DFU for firmware update */ - SIMTRACE_CAP_DFU, - /* Supports Ctrl EP command for erasing flash / return to SAM-BA */ - SIMTRACE_CAP_ERASE_FLASH, - /* Can read the status of card insert contact */ - SIMTRACE_CAP_READ_CARD_DET, - /* Can control the status of a simulated card insert */ - SIMTRACE_CAP_ASSERT_CARD_DET, - /* Can toggle the hardware reset of an attached modem */ - SIMTRACE_CAP_ASSERT_MODEM_RST, -}; - -/* vendor-specific capabilities of sysmocom devices */ -enum simtrace_capability_vendor { - /* Can erase a peer SAM3 controller */ - SIMTRACE_CAP_SYSMO_QMOD_ERASE_PEER, - /* Can read/write an attached EEPROM */ - SIMTRACE_CAP_SYSMO_QMOD_RW_EEPROM, - /* can reset an attached USB hub */ - SIMTRACE_CAP_SYSMO_QMOD_RESET_HUB, -}; - -/* SIMTRACE_CMD_BD_BOARD_INFO */ -struct simtrace_board_info { - struct { - char manufacturer[32]; - char model[32]; - char version[32]; - } hardware; - struct { - /* who provided this software? */ - char provider[32]; - /* name of software image */ - char name[32]; - /* (git) version at build time */ - char version[32]; - /* built on which machine? */ - char buildhost[32]; - /* CRC-32 over software image */ - uint32_t crc; - } software; - struct { - /* Maximum baud rate supported */ - uint32_t max_baud_rate; - } speed; - /* number of bytes of generic capability bit-mask */ - uint8_t cap_generic_bytes; - /* number of bytes of vendor capability bit-mask */ - uint8_t cap_vendor_bytes; - uint8_t data[0]; - /* cap_generic + cap_vendor */ -} __attribute__ ((packed)); - -/*********************************************************************** - * CARD EMULATOR / FORWARDER - ***********************************************************************/ - -/* indicates a TPDU header is present in this message */ -#define CEMU_DATA_F_TPDU_HDR 0x00000001 -/* indicates last part of transmission in this direction */ -#define CEMU_DATA_F_FINAL 0x00000002 -/* incdicates a PB is present and we should continue with TX */ -#define CEMU_DATA_F_PB_AND_TX 0x00000004 -/* incdicates a PB is present and we should continue with RX */ -#define CEMU_DATA_F_PB_AND_RX 0x00000008 - -/* CEMU_USB_MSGT_DT_CARDINSERT */ -struct cardemu_usb_msg_cardinsert { - uint8_t card_insert; -} __attribute__ ((packed)); - -/* CEMU_USB_MSGT_DT_SET_ATR */ -struct cardemu_usb_msg_set_atr { - uint8_t atr_len; - /* variable-length ATR data */ - uint8_t atr[0]; -} __attribute__ ((packed)); - -/* CEMU_USB_MSGT_DT_TX_DATA */ -struct cardemu_usb_msg_tx_data { - uint32_t flags; - uint16_t data_len; - /* variable-length TPDU data */ - uint8_t data[0]; -} __attribute__ ((packed)); - -/* CEMU_USB_MSGT_DO_RX_DATA */ -struct cardemu_usb_msg_rx_data { - uint32_t flags; - uint16_t data_len; - /* variable-length TPDU data */ - uint8_t data[0]; -} __attribute__ ((packed)); - -#define CEMU_STATUS_F_VCC_PRESENT 0x00000001 -#define CEMU_STATUS_F_CLK_ACTIVE 0x00000002 -#define CEMU_STATUS_F_RCEMU_ACTIVE 0x00000004 -#define CEMU_STATUS_F_CARD_INSERT 0x00000008 -#define CEMU_STATUS_F_RESET_ACTIVE 0x00000010 - -/* CEMU_USB_MSGT_DO_STATUS */ -struct cardemu_usb_msg_status { - uint32_t flags; - /* phone-applied target voltage in mV */ - uint16_t voltage_mv; - /* Fi/Di related information */ - uint8_t fi; - uint8_t di; - uint8_t wi; - uint32_t waiting_time; -} __attribute__ ((packed)); - -/* CEMU_USB_MSGT_DO_PTS */ -struct cardemu_usb_msg_pts_info { - uint8_t pts_len; - /* PTS request as sent from reader */ - uint8_t req[6]; - /* PTS response as sent by card */ - uint8_t resp[6]; -} __attribute__ ((packed)); - -/* CEMU_USB_MSGT_DO_ERROR */ -struct cardemu_usb_msg_error { - uint8_t severity; - uint8_t subsystem; - uint16_t code; - uint8_t msg_len; - /* human-readable error message */ - uint8_t msg[0]; -} __attribute__ ((packed)); - -/*********************************************************************** - * MODEM CONTROL - ***********************************************************************/ - -/* SIMTRACE_MSGT_DT_MODEM_RESET */ -struct st_modem_reset { - /* 0: de-assert reset, 1: assert reset, 2: pulse reset */ - uint8_t asserted; - /* if above is '2', duration of pulse in ms */ - uint16_t pulse_duration_msec; -} __attribute__((packed)); - -/* SIMTRACE_MSGT_DT_MODEM_SIM_SELECT */ -struct st_modem_sim_select { - /* remote (1), local (0) */ - uint8_t remote_sim; -} __attribute__((packed)); - -/* SIMTRACE_MSGT_BD_MODEM_STATUS */ -#define ST_MDM_STS_BIT_WWAN_LED (1 << 0) -#define ST_MDM_STS_BIT_CARD_INSERTED (1 << 1) -struct st_modem_status { - /* bit-field of supported status bits */ - uint8_t supported_mask; - /* bit-field of current status bits */ - uint8_t status_mask; - /* bit-field of changed status bits */ - uint8_t changed_mask; -} __attribute__((packed)); - -/*********************************************************************** - * SNIFF - ***********************************************************************/ - -/* SIMTRACE_MSGT_SNIFF_CHANGE flags */ -#define SNIFF_CHANGE_FLAG_CARD_INSERT (1<<0) -#define SNIFF_CHANGE_FLAG_CARD_EJECT (1<<1) -#define SNIFF_CHANGE_FLAG_RESET_ASSERT (1<<2) -#define SNIFF_CHANGE_FLAG_RESET_DEASSERT (1<<3) -#define SNIFF_CHANGE_FLAG_TIMEOUT_WT (1<<4) -/* SIMTRACE_MSGT_SNIFF_ATR, SIMTRACE_MSGT_SNIFF_PPS, SIMTRACE_MSGT_SNIFF_TPDU flags */ -#define SNIFF_DATA_FLAG_ERROR_INCOMPLETE (1<<5) -#define SNIFF_DATA_FLAG_ERROR_MALFORMED (1<<6) -#define SNIFF_DATA_FLAG_ERROR_CHECKSUM (1<<7) - -/* SIMTRACE_MSGT_SNIFF_CHANGE */ -struct sniff_change { - /* SIMTRACE_MSGT_SNIFF_CHANGE flags */ - uint32_t flags; -} __attribute__ ((packed)); - -/* SIMTRACE_MSGT_SNIFF_FIDI */ -struct sniff_fidi { - /* Fi/Di values as encoded in TA1 */ - uint8_t fidi; -} __attribute__ ((packed)); - -/* SIMTRACE_MSGT_SNIFF_ATR, SIMTRACE_MSGT_SNIFF_PPS, SIMTRACE_MSGT_SNIFF_TPDU */ -struct sniff_data { - /* data flags */ - uint32_t flags; - /* data length */ - uint16_t length; - /* data */ - uint8_t data[0]; -} __attribute__ ((packed)); diff --git a/src/simtrace2/simtrace_usb.h b/src/simtrace2/simtrace_usb.h deleted file mode 100644 index c0da9c5..0000000 --- a/src/simtrace2/simtrace_usb.h +++ /dev/null @@ -1,67 +0,0 @@ -/* SIMtrace 2 USB definitions - * - * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA - */ -/* SIMtrace USB IDs */ -#define USB_VENDOR_OPENMOKO 0x1d50 -#define USB_PRODUCT_OWHW_SAM3_DFU 0x4001 /* was 0x4000 */ -#define USB_PRODUCT_OWHW_SAM3 0x4001 -#define USB_PRODUCT_QMOD_HUB 0x4002 -#define USB_PRODUCT_QMOD_SAM3_DFU 0x4004 /* was 0x4003 */ -#define USB_PRODUCT_QMOD_SAM3 0x4004 -#define USB_PRODUCT_SIMTRACE2_DFU 0x60e3 /* was 0x60e2 */ -#define USB_PRODUCT_SIMTRACE2 0x60e3 - -/* USB proprietary class */ -#define USB_CLASS_PROPRIETARY 0xff - -/* SIMtrace USB sub-classes */ -/*! Sniffer USB sub-class */ -#define SIMTRACE_SNIFFER_USB_SUBCLASS 1 -/*! Card-emulation USB sub-class */ -#define SIMTRACE_CARDEM_USB_SUBCLASS 2 - -/* Generic USB endpoint numbers */ -/*! Card-side USB data out (host to device) endpoint number */ -#define SIMTRACE_USB_EP_CARD_DATAOUT 1 -/*! Card-side USB data in (device to host) endpoint number */ -#define SIMTRACE_USB_EP_CARD_DATAIN 2 -/*! Card-side USB interrupt endpoint number */ -#define SIMTRACE_USB_EP_CARD_INT 3 -/*! Phone-side USB data out (host to device) endpoint number */ -#define SIMTRACE_USB_EP_PHONE_DATAOUT 4 -/*! Phone-side USB data in (device to host) endpoint number */ -#define SIMTRACE_USB_EP_PHONE_DATAIN 5 -/*! Phone-side USB interrupt endpoint number */ -#define SIMTRACE_USB_EP_PHONE_INT 6 - -/* Card-emulation USB endpoint numbers */ -/*! USIM1 USB data out (host to device) endpoint number */ -#define SIMTRACE_CARDEM_USB_EP_USIM1_DATAOUT 4 -/*! USIM1 USB data in (device to host) endpoint number */ -#define SIMTRACE_CARDEM_USB_EP_USIM1_DATAIN 5 -/*! USIM1 USB interrupt endpoint number */ -#define SIMTRACE_CARDEM_USB_EP_USIM1_INT 6 -/*! USIM2 USB data out (host to device) endpoint number */ -#define SIMTRACE_CARDEM_USB_EP_USIM2_DATAOUT 1 -/*! USIM2 USB data in (device to host) endpoint number */ -#define SIMTRACE_CARDEM_USB_EP_USIM2_DATAIN 2 -/*! USIM2 USB interrupt endpoint number */ -#define SIMTRACE_CARDEM_USB_EP_USIM2_INT 3 - -/*! Maximum number of endpoints */ -#define BOARD_USB_NUMENDPOINTS 6 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Idf5a861f4dacbec3c664f4ced6e03d8662c73112 Gerrit-Change-Number: 16609 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 22:45:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 22:45:59 +0000 Subject: Change in osmo-remsim[master]: remsim_client: Port to async libosmousb select loop References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16610 ) Change subject: remsim_client: Port to async libosmousb select loop ...................................................................... remsim_client: Port to async libosmousb select loop By using the non-blocking / asynchronous libusb via the newly- introduced libosmousb (integration to libosmocore select loop), we can not only get a cleaner code-base, but we also get a considerable speed-up. In my tests with a Quectel E25 and a sysmoUSIM-SJS1 card, I am down from 41.4s to 4.7s for the initial reading of the SIM at start-up. Change-Id: Ic18690b3c2cbc5e99de0665c0b68b7555433b3cd Closes: OS#4299 Depends: libosmocore.git I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3 --- M src/simtrace2-remsim_client.c 1 file changed, 140 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/10/16610/1 diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index 30a9c5b..fa6b102 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -143,20 +143,50 @@ } #endif +static void usb_out_xfer_cb(struct libusb_transfer *xfer) +{ + struct msgb *msg = xfer->user_data; + + switch (xfer->status) { + case LIBUSB_TRANSFER_COMPLETED: + break; + case LIBUSB_TRANSFER_NO_DEVICE: + fprintf(stderr, "USB device disappeared\n"); + exit(23); + break; + default: + osmo_panic("USB OUT transfer failed, status=%u\n", xfer->status); + break; + } + + msgb_free(msg); + libusb_free_transfer(xfer); +} + /*! \brief Transmit a given command to the SIMtrace2 device */ int st_transp_tx_msg(struct st_transport *transp, struct msgb *msg) { + struct libusb_transfer *xfer; int rc; printf("SIMtrace <- %s\n", msgb_hexdump(msg)); - int xfer_len; + xfer = libusb_alloc_transfer(0); + OSMO_ASSERT(xfer); + xfer->dev_handle = transp->usb_devh; + xfer->flags = 0; + xfer->type = LIBUSB_TRANSFER_TYPE_BULK; + xfer->endpoint = transp->usb_ep.out; + xfer->timeout = 1000; + xfer->user_data = msg; + xfer->length = msgb_length(msg); + xfer->buffer = msgb_data(msg); + xfer->callback = usb_out_xfer_cb; - rc = libusb_bulk_transfer(transp->usb_devh, transp->usb_ep.out, - msgb_data(msg), msgb_length(msg), - &xfer_len, 1000); + /* submit the OUT transfer */ + rc = libusb_submit_transfer(xfer); + OSMO_ASSERT(rc == 0); - msgb_free(msg); return rc; } @@ -472,38 +502,106 @@ return rc; } -static void run_mainloop(struct cardem_inst *ci) +static void usb_in_xfer_cb(struct libusb_transfer *xfer) { - struct st_transport *transp = ci->slot->transp; - unsigned int msg_count, byte_count = 0; - uint8_t buf[16*265]; - int xfer_len; + struct cardem_inst *ci = xfer->user_data; int rc; - printf("Entering main loop\n"); - - while (1) { - /* read data from SIMtrace2 device (local or via USB) */ - rc = libusb_bulk_transfer(transp->usb_devh, transp->usb_ep.in, - buf, sizeof(buf), &xfer_len, 100); - if (rc < 0 && rc != LIBUSB_ERROR_TIMEOUT && - rc != LIBUSB_ERROR_INTERRUPTED && - rc != LIBUSB_ERROR_IO) { - fprintf(stderr, "BULK IN transfer error: %s\n", libusb_error_name(rc)); - return; - } - /* dispatch any incoming data */ - if (xfer_len > 0) { - process_usb_msg(ci, buf, xfer_len); - msg_count++; - byte_count += xfer_len; - } - // handle remote SIM client fsm - // TODO register the USB fd for this select - osmo_select_main(true); + switch (xfer->status) { + case LIBUSB_TRANSFER_COMPLETED: + /* hand the message up the stack */ + process_usb_msg(ci, xfer->buffer, xfer->actual_length); + break; + case LIBUSB_TRANSFER_NO_DEVICE: + fprintf(stderr, "USB device disappeared\n"); + exit(23); + break; + default: + osmo_panic("USB IN transfer failed, status=%u\n", xfer->status); + break; } + + /* re-submit the IN transfer */ + rc = libusb_submit_transfer(xfer); + OSMO_ASSERT(rc == 0); } + +static void allocate_and_submit_in(struct cardem_inst *ci) +{ + struct st_transport *transp = ci->slot->transp; + struct libusb_transfer *xfer; + int rc; + + xfer = libusb_alloc_transfer(0); + OSMO_ASSERT(xfer); + xfer->dev_handle = transp->usb_devh; + xfer->flags = 0; + xfer->type = LIBUSB_TRANSFER_TYPE_BULK; + xfer->endpoint = transp->usb_ep.in; + xfer->timeout = 0; + xfer->user_data = ci; + xfer->length = 16*256; + + xfer->buffer = libusb_dev_mem_alloc(xfer->dev_handle, xfer->length); + OSMO_ASSERT(xfer->buffer); + xfer->callback = usb_in_xfer_cb; + + /* submit the IN transfer */ + rc = libusb_submit_transfer(xfer); + OSMO_ASSERT(rc == 0); +} + + +static void usb_irq_xfer_cb(struct libusb_transfer *xfer) +{ + int rc; + + switch (xfer->status) { + case LIBUSB_TRANSFER_COMPLETED: + /* FIXME: do something with the received data */ + break; + case LIBUSB_TRANSFER_NO_DEVICE: + fprintf(stderr, "USB device disappeared\n"); + exit(23); + break; + default: + osmo_panic("USB IRQ transfer failed, status=%u\n", xfer->status); + break; + } + + /* re-submit the IN transfer */ + rc = libusb_submit_transfer(xfer); + OSMO_ASSERT(rc == 0); +} + + +static void allocate_and_submit_irq(struct cardem_inst *ci) +{ + struct st_transport *transp = ci->slot->transp; + struct libusb_transfer *xfer; + int rc; + + xfer = libusb_alloc_transfer(0); + OSMO_ASSERT(xfer); + xfer->dev_handle = transp->usb_devh; + xfer->flags = 0; + xfer->type = LIBUSB_TRANSFER_TYPE_INTERRUPT; + xfer->endpoint = transp->usb_ep.irq_in; + xfer->timeout = 0; + xfer->user_data = ci; + xfer->length = 64; + + xfer->buffer = libusb_dev_mem_alloc(xfer->dev_handle, xfer->length); + OSMO_ASSERT(xfer->buffer); + xfer->callback = usb_irq_xfer_cb; + + /* submit the IN transfer */ + rc = libusb_submit_transfer(xfer); + OSMO_ASSERT(rc == 0); +} + + static struct st_transport _transp; static struct st_slot _slot = { @@ -652,7 +750,7 @@ static void print_welcome(void) { printf("simtrace2-remsim-client - Remote SIM card client for SIMtrace\n" - "(C) 2010-2017, Harald Welte \n" + "(C) 2010-2019, Harald Welte \n" "(C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon \n\n"); } @@ -794,7 +892,7 @@ msgb_talloc_ctx_init(g_tall_ctx, 0); osmo_init_logging2(g_tall_ctx, &log_info); - rc = libusb_init(NULL); + rc = osmo_libusb_init(NULL); if (rc < 0) { fprintf(stderr, "libusb initialization failed\n"); goto do_exit; @@ -941,7 +1039,15 @@ /* select remote (forwarded) SIM */ st_modem_reset_pulse(ci->slot, 300); - run_mainloop(ci); + printf("Entering main loop\n"); + + allocate_and_submit_irq(ci); + allocate_and_submit_in(ci); + + while (1) { + osmo_select_main(false); + } + ret = 0; libusb_release_interface(transp->usb_devh, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ic18690b3c2cbc5e99de0665c0b68b7555433b3cd Gerrit-Change-Number: 16610 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 23:09:28 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 23:09:28 +0000 Subject: Change in simtrace2[master]: host_communication: Send zero-length-packet on wMaxPacketSize References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16611 ) Change subject: host_communication: Send zero-length-packet on wMaxPacketSize ...................................................................... host_communication: Send zero-length-packet on wMaxPacketSize We need to send zero-length packets on bulk endpoints whenever the transfer size is exactly a multiple of the wMaxPacketSize. See USB 2.0 Specification Section 5.8.3 titled "Bulk Transfer Packet Size constraints." Change-Id: Ice3842399d5a5c4a18383860f81074497c6e7c9b Closes: OS#4331 --- M firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c M firmware/atmel_softpack_libraries/usb/include/USBD.h M firmware/libcommon/source/host_communication.c 3 files changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/11/16611/1 diff --git a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c index 0eccc65..ac2595c 100644 --- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c +++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c @@ -1077,6 +1077,14 @@ * Exported functions *---------------------------------------------------------------------------*/ + +uint16_t USBD_GetEndpointSize(uint8_t bEndpoint) +{ + Endpoint *pEndpoint = &(endpoints[bEndpoint]); + + return pEndpoint->size; +} + /** * USBD (UDP) interrupt handler * Manages device resume, suspend, end of bus reset. diff --git a/firmware/atmel_softpack_libraries/usb/include/USBD.h b/firmware/atmel_softpack_libraries/usb/include/USBD.h index 15a6859..6fc931f 100644 --- a/firmware/atmel_softpack_libraries/usb/include/USBD.h +++ b/firmware/atmel_softpack_libraries/usb/include/USBD.h @@ -214,6 +214,8 @@ * Exported functions *------------------------------------------------------------------------------*/ +extern uint16_t USBD_GetEndpointSize(uint8_t bEndpoint); + //extern void USBD_IrqHandler(void); extern void USBD_Init(void); diff --git a/firmware/libcommon/source/host_communication.c b/firmware/libcommon/source/host_communication.c index 0e496c5..9a6e5b3 100644 --- a/firmware/libcommon/source/host_communication.c +++ b/firmware/libcommon/source/host_communication.c @@ -33,10 +33,18 @@ { struct msgb *msg = (struct msgb *) arg; struct usb_buffered_ep *bep = msg->dst; + uint16_t ep_size = USBD_GetEndpointSize(bep->ep); unsigned long x; TRACE_DEBUG("%s (EP=0x%02x)\r\n", __func__, bep->ep); + if (((msgb_length(msg) % ep_size) == 0) && (transferred == ep_size)) { + /* terminate with ZLP; pass in 'msg' again as 'arg' so we get + * called the second time and proceed with usb_buf_free below */ + USBD_Write(bep->ep, 0, 0, (TransferCallback) &usb_write_cb, msg); + return; + } + local_irq_save(x); bep->in_progress--; local_irq_restore(x); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ice3842399d5a5c4a18383860f81074497c6e7c9b Gerrit-Change-Number: 16611 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 23:10:21 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 23:10:21 +0000 Subject: Change in simtrace2[master]: host_communication: Send zero-length-packet on wMaxPacketSize In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16611 ) Change subject: host_communication: Send zero-length-packet on wMaxPacketSize ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ice3842399d5a5c4a18383860f81074497c6e7c9b Gerrit-Change-Number: 16611 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 15 Dec 2019 23:10:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 23:10:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 23:10:35 +0000 Subject: Change in simtrace2[master]: card_emu: Avoid recursive calls to card_set_state() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16602 ) Change subject: card_emu: Avoid recursive calls to card_set_state() ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ieefa1807099eb234cfd994bca83caaa0dcc919b6 Gerrit-Change-Number: 16602 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 15 Dec 2019 23:10:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 23:11:05 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 23:11:05 +0000 Subject: Change in osmo-remsim[master]: rspro_client_fsm: Fix handling of IPA keepalive In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16591 ) Change subject: rspro_client_fsm: Fix handling of IPA keepalive ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ia745ccb44c0d0224d1e7ab6b6da3713474111d41 Gerrit-Change-Number: 16591 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 15 Dec 2019 23:11:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 23:11:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 23:11:06 +0000 Subject: Change in osmo-remsim[master]: rspro_client_fsm: Fix uninitialized return variable use In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16596 ) Change subject: rspro_client_fsm: Fix uninitialized return variable use ...................................................................... rspro_client_fsm: Fix uninitialized return variable use rspro_client_fsm.c:180:9: warning: ?rc? may be used uninitialized in this function [-Wmaybe-uninitialized] 180 | return rc; | ^~ Change-Id: I64b275b06b2aa40bd7c6e1dd42afba5ffebd7b00 --- M src/rspro_client_fsm.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index 6be2fef..eea8471 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -162,8 +162,10 @@ case IPAC_PROTO_EXT_RSPRO: LOGPFSM(srvc->fi, "Received RSPRO %s\n", msgb_hexdump(msg)); pdu = rspro_dec_msg(msg); - if (!pdu) + if (!pdu) { + rc = -EIO; break; + } rc = srvc->handle_rx(srvc, pdu); ASN_STRUCT_FREE(asn_DEF_RsproPDU, pdu); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I64b275b06b2aa40bd7c6e1dd42afba5ffebd7b00 Gerrit-Change-Number: 16596 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 23:11:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 23:11:06 +0000 Subject: Change in osmo-remsim[master]: rspro_client_fsm: Fix handling of IPA keepalive In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16591 ) Change subject: rspro_client_fsm: Fix handling of IPA keepalive ...................................................................... rspro_client_fsm: Fix handling of IPA keepalive We cannot rely on the implicit IPA keepalive FSM termination, as that somehow gets the termination order wrong and we end up accessing free'd memory. Let's handle the termination explicitly: We register a callback with the IPA keepalive FSM, and once that callback gets hit, we ask the core to *not* terminate the FSM implicitly. We are anyway terminating it explicitly in st_reestablish_onenter(). Change-Id: Ia745ccb44c0d0224d1e7ab6b6da3713474111d41 --- M src/rspro_client_fsm.c M src/rspro_client_fsm.h 2 files changed, 11 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index eea8471..758bde7 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -113,6 +113,7 @@ OSMO_VALUE_STRING(SRVC_E_TCP_UP), OSMO_VALUE_STRING(SRVC_E_TCP_DOWN), OSMO_VALUE_STRING(SRVC_E_KA_TIMEOUT), + OSMO_VALUE_STRING(SRVC_E_KA_TERMINATED), OSMO_VALUE_STRING(SRVC_E_CLIENT_CONN_RES), OSMO_VALUE_STRING(SRVC_E_RSPRO_TX), { 0, NULL } @@ -261,6 +262,13 @@ } } +static int ipa_kaepalive_timeout_cb(struct osmo_fsm_inst *ka_fi, void *conn) +{ + struct osmo_fsm_inst *fi = ka_fi->proc.parent; + osmo_fsm_inst_dispatch(fi, SRVC_E_KA_TIMEOUT, NULL); + return 0; /* we will explicitly terminate it */ +} + static void srvc_st_reestablish_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct rspro_server_conn *srvc = (struct rspro_server_conn *) fi->priv; @@ -292,8 +300,9 @@ LOGPFSM(fi, "Unable to create keepalive FSM\n"); exit(1); } + ipa_keepalive_fsm_set_timeout_cb(srvc->keepalive_fi, ipa_kaepalive_timeout_cb); /* ensure parent is notified once keepalive FSM instance is dying */ - osmo_fsm_inst_change_parent(srvc->keepalive_fi, srvc->fi, SRVC_E_KA_TIMEOUT); + osmo_fsm_inst_change_parent(srvc->keepalive_fi, srvc->fi, SRVC_E_KA_TERMINATED); /* Attempt to connect TCP socket */ rc = ipa_client_conn_open(srvc->conn); diff --git a/src/rspro_client_fsm.h b/src/rspro_client_fsm.h index b1c14f8..ca59c77 100644 --- a/src/rspro_client_fsm.h +++ b/src/rspro_client_fsm.h @@ -9,6 +9,7 @@ SRVC_E_TCP_UP, SRVC_E_TCP_DOWN, SRVC_E_KA_TIMEOUT, + SRVC_E_KA_TERMINATED, SRVC_E_CLIENT_CONN_RES, SRVC_E_RSPRO_TX /* transmit a RSPRO PDU to the peer */ }; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ia745ccb44c0d0224d1e7ab6b6da3713474111d41 Gerrit-Change-Number: 16591 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 23:11:56 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 23:11:56 +0000 Subject: Change in simtrace2[master]: host_communication: Send zero-length-packet on wMaxPacketSize In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16611 ) Change subject: host_communication: Send zero-length-packet on wMaxPacketSize ...................................................................... host_communication: Send zero-length-packet on wMaxPacketSize We need to send zero-length packets on bulk endpoints whenever the transfer size is exactly a multiple of the wMaxPacketSize. See USB 2.0 Specification Section 5.8.3 titled "Bulk Transfer Packet Size constraints." Change-Id: Ice3842399d5a5c4a18383860f81074497c6e7c9b Closes: OS#4331 --- M firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c M firmware/atmel_softpack_libraries/usb/include/USBD.h M firmware/libcommon/source/host_communication.c 3 files changed, 18 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c index 0eccc65..ac2595c 100644 --- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c +++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c @@ -1077,6 +1077,14 @@ * Exported functions *---------------------------------------------------------------------------*/ + +uint16_t USBD_GetEndpointSize(uint8_t bEndpoint) +{ + Endpoint *pEndpoint = &(endpoints[bEndpoint]); + + return pEndpoint->size; +} + /** * USBD (UDP) interrupt handler * Manages device resume, suspend, end of bus reset. diff --git a/firmware/atmel_softpack_libraries/usb/include/USBD.h b/firmware/atmel_softpack_libraries/usb/include/USBD.h index 15a6859..6fc931f 100644 --- a/firmware/atmel_softpack_libraries/usb/include/USBD.h +++ b/firmware/atmel_softpack_libraries/usb/include/USBD.h @@ -214,6 +214,8 @@ * Exported functions *------------------------------------------------------------------------------*/ +extern uint16_t USBD_GetEndpointSize(uint8_t bEndpoint); + //extern void USBD_IrqHandler(void); extern void USBD_Init(void); diff --git a/firmware/libcommon/source/host_communication.c b/firmware/libcommon/source/host_communication.c index 0e496c5..9a6e5b3 100644 --- a/firmware/libcommon/source/host_communication.c +++ b/firmware/libcommon/source/host_communication.c @@ -33,10 +33,18 @@ { struct msgb *msg = (struct msgb *) arg; struct usb_buffered_ep *bep = msg->dst; + uint16_t ep_size = USBD_GetEndpointSize(bep->ep); unsigned long x; TRACE_DEBUG("%s (EP=0x%02x)\r\n", __func__, bep->ep); + if (((msgb_length(msg) % ep_size) == 0) && (transferred == ep_size)) { + /* terminate with ZLP; pass in 'msg' again as 'arg' so we get + * called the second time and proceed with usb_buf_free below */ + USBD_Write(bep->ep, 0, 0, (TransferCallback) &usb_write_cb, msg); + return; + } + local_irq_save(x); bep->in_progress--; local_irq_restore(x); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ice3842399d5a5c4a18383860f81074497c6e7c9b Gerrit-Change-Number: 16611 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 23:11:56 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 15 Dec 2019 23:11:56 +0000 Subject: Change in simtrace2[master]: card_emu: Initialize PTSS state every time we start PTS In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16601 ) Change subject: card_emu: Initialize PTSS state every time we start PTS ...................................................................... card_emu: Initialize PTSS state every time we start PTS Let's shift the responsibility from the caller side to the calee side. Change-Id: I39661ca93c87b2e2071765f69578eec5aaf90ce4 --- M firmware/libcommon/source/card_emu.c 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 63bf0d3..c3299de 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -240,7 +240,6 @@ tc_etu_disable(ch->tc_chan); - ch->pts.state = PTS_S_WAIT_REQ_PTSS; ch->tpdu.state = TPDU_S_WAIT_CLA; /* release any buffers we may still own */ @@ -534,8 +533,6 @@ /* update waiting time (see ISO 7816-3 10.2) */ ch->waiting_time = ch->wi * 960 * ch->fi; tc_etu_set_wtime(ch->tc_chan, ch->waiting_time); - /* reset PTS to initial state */ - set_pts_state(ch, PTS_S_WAIT_REQ_PTSS); /* go to next state */ card_set_state(ch, ISO_S_WAIT_TPDU); return 0; @@ -701,7 +698,6 @@ emu_update_fidi(ch); /* Wait for the next TPDU */ card_set_state(ch, ISO_S_WAIT_TPDU); - set_pts_state(ch, PTS_S_WAIT_REQ_PTSS); break; default: /* calculate the next state and set it */ @@ -979,6 +975,8 @@ switch (ch->state) { case ISO_S_WAIT_TPDU: if (byte == 0xff) { + /* reset PTS to initial state */ + set_pts_state(ch, PTS_S_WAIT_REQ_PTSS); new_state = process_byte_pts(ch, byte); ch->stats.pps++; goto out_silent; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I39661ca93c87b2e2071765f69578eec5aaf90ce4 Gerrit-Change-Number: 16601 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 15 23:14:23 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 15 Dec 2019 23:14:23 +0000 Subject: Change in libosmocore[master]: gprs_bssgp: Work around gcc-9 claiming "error=stringop-overflow" In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16608 ) Change subject: gprs_bssgp: Work around gcc-9 claiming "error=stringop-overflow" ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16608 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I22a0c399c6c00eaf87277002096a82844c9e198e Gerrit-Change-Number: 16608 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 15 Dec 2019 23:14:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Dec 16 01:39:36 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 16 Dec 2019 01:39:36 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5df6e0708934e_4ab62abaac3ec600365935@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 83s] /usr/src/packages/BUILD/firmware/apps/dfu/main.c:360: warning: undefined reference to `__stack_chk_guard' [ 83s] obj/simtrace/flash_dfu_desc.o: In function `set_usb_serial_str': [ 83s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_fail' [ 83s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_guard' [ 83s] obj/simtrace/flash_dfu_driver.o: In function `handle_getstate': [ 83s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_fail' [ 83s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_guard' [ 83s] collect2: error: ld returned 1 exit status [ 83s] % [ 83s] Makefile:233: recipe for target 'flash' failed [ 83s] make[2]: *** [flash] Error 1 [ 83s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 83s] Makefile:10: recipe for target 'fw-simtrace-dfu' failed [ 83s] make[1]: *** [fw-simtrace-dfu] Error 2 [ 83s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 83s] dh_auto_build: make -j1 returned exit code 2 [ 83s] debian/rules:16: recipe for target 'build' failed [ 83s] make: *** [build] Error 2 [ 83s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 83s] [ 83s] lamb61 failed "build simtrace2_0.7.0.24.02d0d.dsc" at Mon Dec 16 01:39:30 UTC 2019. [ 83s] [ 83s] ### VM INTERACTION START ### [ 87s] [ 75.986130] sysrq: SysRq : Power Off [ 87s] [ 75.992334] reboot: Power down [ 87s] ### VM INTERACTION END ### [ 87s] [ 87s] lamb61 failed "build simtrace2_0.7.0.24.02d0d.dsc" at Mon Dec 16 01:39:34 UTC 2019. [ 87s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Dec 16 01:39:53 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 16 Dec 2019 01:39:53 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5df6e07146ea6_4ab62abaac3ec6003660e3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 91s] /usr/src/packages/BUILD/firmware/apps/dfu/main.c:360: warning: undefined reference to `__stack_chk_guard' [ 91s] obj/simtrace/flash_dfu_desc.o: In function `set_usb_serial_str': [ 91s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_fail' [ 91s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_guard' [ 91s] obj/simtrace/flash_dfu_driver.o: In function `handle_getstate': [ 91s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_fail' [ 91s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_guard' [ 91s] collect2: error: ld returned 1 exit status [ 91s] % [ 91s] Makefile:233: recipe for target 'flash' failed [ 91s] make[2]: *** [flash] Error 1 [ 91s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 91s] Makefile:10: recipe for target 'fw-simtrace-dfu' failed [ 91s] make[1]: *** [fw-simtrace-dfu] Error 2 [ 91s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 91s] dh_auto_build: make -j1 returned exit code 2 [ 91s] debian/rules:16: recipe for target 'build' failed [ 91s] make: *** [build] Error 2 [ 91s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 91s] [ 91s] cloud101 failed "build simtrace2_0.7.0.24.02d0d.dsc" at Mon Dec 16 01:39:38 UTC 2019. [ 91s] [ 91s] ### VM INTERACTION START ### [ 95s] [ 81.620708] sysrq: SysRq : Power Off [ 95s] [ 81.625750] reboot: Power down [ 95s] ### VM INTERACTION END ### [ 95s] [ 95s] cloud101 failed "build simtrace2_0.7.0.24.02d0d.dsc" at Mon Dec 16 01:39:42 UTC 2019. [ 95s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Dec 16 04:03:45 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 16 Dec 2019 04:03:45 +0000 Subject: Build failure of network:osmocom:latest/libosmo-netif in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5df7022f5a3f8_4ab62abaac3ec6003805e3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-netif/Debian_Testing/x86_64 Package network:osmocom:latest/libosmo-netif failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-netif Last lines of build log: [ 165s] [ 165s] -non-reconnecting test step 0 [client OK, server OK], FD reg 0 [ 165s] +non-reconnecting test step 0 [client OK, server OK], FD reg 1 [ 165s] --- expout 2019-12-16 04:03:16.668000000 +0000 [ 165s] +++ /usr/src/packages/BUILD/tests/testsuite.dir/at-groups/1/stdout 2019-12-16 04:03:25.688000000 +0000 [ 165s] @@ -44,8 +44,6 @@ [ 165s] [OK|OK] Server's read_cb_srv(): received 29(29) bytes: 44 6f 68 2c 20 72 65 73 70 6f 6e 64 69 6e 67 20 74 6f 20 73 65 72 76 65 72 20 3a 2d 44 [ 165s] [OK|OK] Server's read_cb_srv(): sent 11 bytes message: 72 65 61 64 5f 63 62 5f 73 72 76 [ 165s] [OK|OK] Server's read_cb_srv(): force client disconnect on subsequent call [ 165s] -[OK] Client's read_cb_cli(): callback triggered [ 165s] -[OK] Client's read_cb_cli(): 0-byte read, auto-reconnect will be triggered if enabled [ 165s] non-reconnecting test complete. [ 165s] [ 165s] Stream tests completed [ 165s] 1. testsuite.at:4: 1. stream_test (testsuite.at:4): FAILED (testsuite.at:8) [ 165s] make[1]: *** [debian/rules:27: override_dh_auto_test] Error 1 [ 165s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 165s] make: *** [debian/rules:13: build] Error 2 [ 165s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 165s] [ 165s] lamb11 failed "build libosmo-netif_0.6.0.dsc" at Mon Dec 16 04:03:26 UTC 2019. [ 165s] [ 165s] ### VM INTERACTION START ### [ 167s] [ 153.313375] sysrq: SysRq : Power Off [ 167s] [ 153.322212] reboot: Power down [ 168s] ### VM INTERACTION END ### [ 168s] [ 168s] lamb11 failed "build libosmo-netif_0.6.0.dsc" at Mon Dec 16 04:03:30 UTC 2019. [ 168s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Dec 16 10:28:58 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 16 Dec 2019 10:28:58 +0000 Subject: Change in pysim[master]: Tests: Move Fairwaves-Sim from Reader #4 to Reader #0 In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16564 to look at the new patch set (#5). Change subject: Tests: Move Fairwaves-Sim from Reader #4 to Reader #0 ...................................................................... Tests: Move Fairwaves-Sim from Reader #4 to Reader #0 Hardware changes on the simcard tester require Fairwaves-Sim to be moved from Reader #4 (The last reader in the testbed) to reader #0. Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 --- M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/sysmoUSIM-SJS1.ok A test A testme 4 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/64/16564/5 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 Gerrit-Change-Number: 16564 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 16 10:42:23 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 16 Dec 2019 10:42:23 +0000 Subject: Change in pysim[master]: Tests: Move Fairwaves-Sim from Reader #4 to Reader #0 In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16564 to look at the new patch set (#6). Change subject: Tests: Move Fairwaves-Sim from Reader #4 to Reader #0 ...................................................................... Tests: Move Fairwaves-Sim from Reader #4 to Reader #0 Hardware changes on the simcard tester require Fairwaves-Sim to be moved from Reader #4 (The last reader in the testbed) to reader #0. Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 --- M pySim/cards.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/sysmoUSIM-SJS1.ok A test A testme 5 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/64/16564/6 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 Gerrit-Change-Number: 16564 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 16 10:58:06 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 16 Dec 2019 10:58:06 +0000 Subject: Change in pysim[master]: WIP References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16612 ) Change subject: WIP ...................................................................... WIP Change-Id: I4f8e9f581f22dbe95192e9e5a214f372c993cb1e --- M tests/pysim-test.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/12/16612/1 diff --git a/tests/pysim-test.sh b/tests/pysim-test.sh index f97722d..db59a0c 100755 --- a/tests/pysim-test.sh +++ b/tests/pysim-test.sh @@ -156,6 +156,7 @@ OPC=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF IMSI=001010000000001 ADM=00000000 + ADM_HEX="" ADM_OPT="-a" source "$CARD_NAME.data" -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4f8e9f581f22dbe95192e9e5a214f372c993cb1e Gerrit-Change-Number: 16612 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 16 11:02:43 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 16 Dec 2019 11:02:43 +0000 Subject: Change in pysim[master]: Tests: Move Fairwaves-Sim from Reader #4 to Reader #0 In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16564 to look at the new patch set (#9). Change subject: Tests: Move Fairwaves-Sim from Reader #4 to Reader #0 ...................................................................... Tests: Move Fairwaves-Sim from Reader #4 to Reader #0 Hardware changes on the simcard tester require Fairwaves-Sim to be moved from Reader #4 (The last reader in the testbed) to reader #0. Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 --- M pySim/cards.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/sysmoUSIM-SJS1.ok A test A testme M tests/pysim-test.sh 6 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/64/16564/9 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 Gerrit-Change-Number: 16564 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 16 11:57:53 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 16 Dec 2019 11:57:53 +0000 Subject: Change in pysim[master]: Tests: Move Fairwaves-Sim from Reader #4 to Reader #0 In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16564 to look at the new patch set (#10). Change subject: Tests: Move Fairwaves-Sim from Reader #4 to Reader #0 ...................................................................... Tests: Move Fairwaves-Sim from Reader #4 to Reader #0 Hardware changes on the simcard tester require Fairwaves-Sim to be moved from Reader #4 (The last reader in the testbed) to reader #0. Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 --- M pySim/cards.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/fakemagicsim.ok M pysim-testdata/sysmoUSIM-SJS1.ok M pysim-testdata/sysmosim-gr1.ok A test A testme M tests/pysim-test.sh 9 files changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/64/16564/10 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 Gerrit-Change-Number: 16564 Gerrit-PatchSet: 10 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 16 12:05:04 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 16 Dec 2019 12:05:04 +0000 Subject: Change in pysim[master]: Fix automated tests In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16564 to look at the new patch set (#11). Change subject: Fix automated tests ...................................................................... Fix automated tests - Hardware changes on the simcard tester changed the order of the simcards. Correct the order in the .ok testfiles so that it matches the physical setup again. - Fix bug in pysim-test.sh (test runner), so that the veriable $ADM_HEX gets reset after the execution of the tests. Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 --- M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/fakemagicsim.ok M pysim-testdata/sysmoUSIM-SJS1.ok M pysim-testdata/sysmosim-gr1.ok M tests/pysim-test.sh 6 files changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/64/16564/11 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 Gerrit-Change-Number: 16564 Gerrit-PatchSet: 11 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 16 12:14:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 16 Dec 2019 12:14:18 +0000 Subject: Change in osmo-remsim[master]: client: generate clientSlotStatusInd to bankd References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16613 ) Change subject: client: generate clientSlotStatusInd to bankd ...................................................................... client: generate clientSlotStatusInd to bankd * enable generation of CEMU_USB_MSGT_DO_STATUS on IRQ endpoint * translate that to clientSlotStatusInd towards bankd This will allow bankd to understand when to reset the card as requested by the modem. Change-Id: Ibe2266ffa473823e925d4e3afcf168353b11cdd8 Related: OS#4330 --- M src/simtrace2-remsim_client.c 1 file changed, 65 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/13/16613/1 diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index fa6b102..15dbf36 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -298,6 +298,22 @@ return st_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_DT_CEMU_TX_DATA); } +/*! \brief Request the SIMtrace2 to send a Status Word */ +static int cardem_request_config(struct cardem_inst *ci, uint32_t features) +{ + struct msgb *msg = st_msgb_alloc(); + struct cardemu_usb_msg_config *cfg; + + cfg = (struct cardemu_usb_msg_config *) msgb_put(msg, sizeof(*cfg)); + + printf("SIMtrace <= %s(%08x)\n", __func__, features); + + memset(cfg, 0, sizeof(*cfg)); + cfg->features = features; + + return st_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_BD_CEMU_CONFIG); +} + // FIXME check if the ATR actually includes a checksum __attribute__((unused)) static void atr_update_csum(uint8_t *atr, unsigned int atr_len) { @@ -502,6 +518,50 @@ return rc; } + +/*! \brief Process a STATUS message on IRQ endpoint from the SIMtrace2 */ +static int process_irq_status(struct cardem_inst *ci, const uint8_t *buf, int len) +{ + const struct cardemu_usb_msg_status *status = (struct cardemu_usb_msg_status *) buf; + + printf("SIMtrace IRQ STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u\n", + status->flags, status->fi, status->di, status->wi, + status->waiting_time); + + BankSlot_t bslot; + bank_slot2rspro(&bslot, &g_client->bankd_slot); + RsproPDU_t *pdu = rspro_gen_ClientSlotStatusInd(g_client->srv_conn.clslot, &bslot, + status->flags & CEMU_STATUS_F_RESET_ACTIVE, + status->flags & CEMU_STATUS_F_VCC_PRESENT, + status->flags & CEMU_STATUS_F_CLK_ACTIVE, + -1 /* FIXME: make this dependent on board */); + server_conn_send_rspro(&g_client->bankd_conn, pdu); + + return 0; +} + +static int process_usb_msg_irq(struct cardem_inst *ci, const uint8_t *buf, unsigned int len) +{ + struct simtrace_msg_hdr *sh = (struct simtrace_msg_hdr *)buf; + int rc; + + printf("SIMtrace IRQ %s\n", osmo_hexdump(buf, len)); + + buf += sizeof(*sh); + + switch (sh->msg_type) { + case SIMTRACE_MSGT_BD_CEMU_STATUS: + rc = process_irq_status(ci, buf, len); + break; + default: + printf("unknown simtrace msg type 0x%02x\n", sh->msg_type); + rc = -1; + break; + } + + return rc; +} + static void usb_in_xfer_cb(struct libusb_transfer *xfer) { struct cardem_inst *ci = xfer->user_data; @@ -555,11 +615,12 @@ static void usb_irq_xfer_cb(struct libusb_transfer *xfer) { + struct cardem_inst *ci = xfer->user_data; int rc; switch (xfer->status) { case LIBUSB_TRANSFER_COMPLETED: - /* FIXME: do something with the received data */ + process_usb_msg_irq(ci, xfer->buffer, xfer->actual_length); break; case LIBUSB_TRANSFER_NO_DEVICE: fprintf(stderr, "USB device disappeared\n"); @@ -1026,6 +1087,9 @@ printf("modem %d reset\n", modem); } + /* request firmware to generate STATUS on IRQ endpoint */ + cardem_request_config(ci, CEMU_FEAT_F_STATUS_IRQ); + /* simulate card-insert to modem (owhw, not qmod) */ cardem_request_card_insert(ci, true); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ibe2266ffa473823e925d4e3afcf168353b11cdd8 Gerrit-Change-Number: 16613 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 16 12:14:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 16 Dec 2019 12:14:18 +0000 Subject: Change in osmo-remsim[master]: bankd: Implement card reset based on clientSlotStatusInd References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16614 ) Change subject: bankd: Implement card reset based on clientSlotStatusInd ...................................................................... bankd: Implement card reset based on clientSlotStatusInd If a client is sending us a clientSlotStatusInd indicating that the modem has switched off VCC or activated RST, bankd will now issue a respective PC/SC command to perform a cold or warm reset of the card. Change-Id: Ifa615d239ec3ad6daebd8e99e4f7d5b99d32c0e1 Closes: OS#4330 --- M src/bankd/bankd.h M src/bankd/bankd_main.c M src/bankd/bankd_pcsc.c 3 files changed, 59 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/14/16614/1 diff --git a/src/bankd/bankd.h b/src/bankd/bankd.h index 7f4d687..d713ed1 100644 --- a/src/bankd/bankd.h +++ b/src/bankd/bankd.h @@ -102,6 +102,8 @@ struct bankd_driver_ops { /* open a given card/slot: called once client + mapping exists */ int (*open_card)(struct bankd_worker *worker); + /* reset a given card/slot with either cold or warm reset */ + int (*reset_card)(struct bankd_worker *worker, bool cold_reset); int (*transceive)(struct bankd_worker *worker, const uint8_t *out, size_t out_len, uint8_t *in, size_t *in_len); /* called at cleanup time of a worker thread: clear any driver related state */ diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index af25ded..b3e38b3 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -727,6 +727,26 @@ return 0; } +static int worker_handle_clientSlotStatusInd(struct bankd_worker *worker, const RsproPDU_t *pdu) +{ + const struct ClientSlotStatusInd *cssi = &pdu->msg.choice.clientSlotStatusInd; + const struct SlotPhysStatus *sps = &cssi->slotPhysStatus; + int rc = 0; + + LOGW(worker, "clientSlotStatusInd(RST=%s, VCC=%s, CLK=%s)\n", + sps->resetActive ? "ACTIVE" : "INACTIVE", + sps->vccPresent ? *sps->vccPresent ? "PRESENT" : "ABSENT" : "NULL", + sps->clkActive ? *sps->clkActive ? "ACTIVE" : "INACTIVE" : "NULL"); + + /* perform cold or warm reset */ + if (sps->vccPresent && *sps->vccPresent == 0) + rc = worker->ops->reset_card(worker, true); + else if (sps->resetActive) + rc = worker->ops->reset_card(worker, false); + + return rc; +} + /* handle one incoming RSPRO message from a client inside a worker thread */ static int worker_handle_rspro(struct bankd_worker *worker, const RsproPDU_t *pdu) { @@ -742,7 +762,7 @@ rc = worker_handle_tpduModemToCard(worker, pdu); break; case RsproPDUchoice_PR_clientSlotStatusInd: - /* FIXME */ + rc = worker_handle_clientSlotStatusInd(worker, pdu); rc = 0; break; case RsproPDUchoice_PR_setAtrRes: diff --git a/src/bankd/bankd_pcsc.c b/src/bankd/bankd_pcsc.c index a390782..f6e3683 100644 --- a/src/bankd/bankd_pcsc.c +++ b/src/bankd/bankd_pcsc.c @@ -152,6 +152,24 @@ LOGW((w), ": OK\n"); \ } +static int pcsc_get_atr(struct bankd_worker *worker) +{ + long rc; + char pbReader[MAX_READERNAME]; + /* use DWORD type as this is what the PC/SC API expects */ + DWORD dwReaderLen = sizeof(pbReader); + DWORD dwAtrLen = worker->card.atr_len = sizeof(worker->card.atr); + DWORD dwState, dwProt; + + rc = SCardStatus(worker->reader.pcsc.hCard, pbReader, &dwReaderLen, &dwState, &dwProt, + worker->card.atr, &dwAtrLen); + PCSC_ERROR(worker, rc, "SCardStatus") + worker->card.atr_len = dwAtrLen; + LOGW(worker, "Card ATR: %s\n", osmo_hexdump_nospc(worker->card.atr, worker->card.atr_len)); +end: + return rc; +} + static int pcsc_open_card(struct bankd_worker *worker) { long rc; @@ -171,16 +189,23 @@ PCSC_ERROR(worker, rc, "SCardConnect") } - /* use DWORD type as this is what the PC/SC API expects */ - char pbReader[MAX_READERNAME]; - DWORD dwReaderLen = sizeof(pbReader); - DWORD dwAtrLen = worker->card.atr_len = sizeof(worker->card.atr); - DWORD dwState, dwProt; - rc = SCardStatus(worker->reader.pcsc.hCard, pbReader, &dwReaderLen, &dwState, &dwProt, - worker->card.atr, &dwAtrLen); - PCSC_ERROR(worker, rc, "SCardStatus") - worker->card.atr_len = dwAtrLen; - LOGW(worker, "Card ATR: %s\n", osmo_hexdump_nospc(worker->card.atr, worker->card.atr_len)); + rc = pcsc_get_atr(worker); +end: + return rc; +} + +static int pcsc_reset_card(struct bankd_worker *worker, bool cold_reset) +{ + long rc; + DWORD dwActiveProtocol; + + LOGW(worker, "Resetting card in '%s' (%s)\n", worker->reader.name, + cold_reset ? "cold reset" : "warm reset"); + rc = SCardReconnect(worker->reader.pcsc.hCard, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0, + cold_reset ? SCARD_UNPOWER_CARD : SCARD_RESET_CARD, &dwActiveProtocol); + PCSC_ERROR(worker, rc, "SCardReconnect"); + + rc = pcsc_get_atr(worker); end: return rc; } @@ -213,6 +238,7 @@ const struct bankd_driver_ops pcsc_driver_ops = { .open_card = pcsc_open_card, + .reset_card = pcsc_reset_card, .transceive = pcsc_transceive, .cleanup = pcsc_cleanup, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ifa615d239ec3ad6daebd8e99e4f7d5b99d32c0e1 Gerrit-Change-Number: 16614 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 16 13:44:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 16 Dec 2019 13:44:18 +0000 Subject: Change in pysim[master]: Fix automated tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16564 ) Change subject: Fix automated tests ...................................................................... Patch Set 11: (1 comment) https://gerrit.osmocom.org/c/pysim/+/16564/11//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/pysim/+/16564/11//COMMIT_MSG at 9 PS11, Line 9: - Hardware changes on the simcard tester changed the order of the : simcards. Correct the order in the .ok testfiles so that it matches the : physical setup again. This sounds like an extremely fragile setup to begin with. Is it not possible to make this more reliable in some way? I know that currently there's no method to identify the USB physical path or iSerial of a given reader via pcsc-lite (I was tempted to work on that in the past)... but what about matching based on the ATR or some other criteria? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 Gerrit-Change-Number: 16564 Gerrit-PatchSet: 11 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 16 Dec 2019 13:44:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 16 13:52:11 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 16 Dec 2019 13:52:11 +0000 Subject: Change in simtrace2[master]: card_emu: Avoid recursive calls to card_set_state() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/16602 to look at the new patch set (#5). Change subject: card_emu: Avoid recursive calls to card_set_state() ...................................................................... card_emu: Avoid recursive calls to card_set_state() A function that is called to set the state should not in itself contain logic to issue further state changes. Let's shift the related block out to the end of card_emu_io_statechg(), which is the only source of card_set_state() calls for the WAIT_{POWER,CLK,RST} states anyway. As an added benefit, the block of statements is now also executed if there's no state change - something that was prevented by the "if old == new" state guard at the top of card_set_state(). I believe this may help us to cover more (non-standard) card activation sequences. Change-Id: Ieefa1807099eb234cfd994bca83caaa0dcc919b6 --- M firmware/libcommon/source/card_emu.c 1 file changed, 17 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/02/16602/5 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ieefa1807099eb234cfd994bca83caaa0dcc919b6 Gerrit-Change-Number: 16602 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 16 13:52:11 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 16 Dec 2019 13:52:11 +0000 Subject: Change in simtrace2[master]: card_emu: Remove extraneous code In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/16603 to look at the new patch set (#5). Change subject: card_emu: Remove extraneous code ...................................................................... card_emu: Remove extraneous code card_set_state(ch, ISO_S_WAIT_ATR) internally calls tc_etu_enable(), so there's no need for the caller to do the same, too. Change-Id: I2a2b4d64c40264623313a867957ffcefe57748f9 --- M firmware/libcommon/source/card_emu.c 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/03/16603/5 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2a2b4d64c40264623313a867957ffcefe57748f9 Gerrit-Change-Number: 16603 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 16 13:52:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 16 Dec 2019 13:52:13 +0000 Subject: Change in simtrace2[master]: card_emu: Always print state names in string representation References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16615 ) Change subject: card_emu: Always print state names in string representation ...................................................................... card_emu: Always print state names in string representation Change-Id: I81469e40f3720afdcb47048b45c63d6474887640 --- M firmware/libcommon/source/card_emu.c 1 file changed, 27 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/15/16615/1 diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 34fac1b..4c29d41 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -110,6 +110,22 @@ PTS_S_WAIT_RESP_PCK = PTS_S_WAIT_REQ_PCK | 0x10, }; +const struct value_string pts_state_names[] = { + { PTS_S_WAIT_REQ_PTSS, "WAIT_REQ_PTSS" }, + { PTS_S_WAIT_REQ_PTS0, "WAIT_REQ_PTS0" }, + { PTS_S_WAIT_REQ_PTS1, "WAIT_REQ_PTS1" }, + { PTS_S_WAIT_REQ_PTS2, "WAIT_REQ_PTS2" }, + { PTS_S_WAIT_REQ_PTS3, "WAIT_REQ_PTS3" }, + { PTS_S_WAIT_REQ_PCK, "WAIT_REQ_PCK" }, + { PTS_S_WAIT_RESP_PTSS, "WAIT_RESP_PTSS" }, + { PTS_S_WAIT_RESP_PTS0, "WAIT_RESP_PTS0" }, + { PTS_S_WAIT_RESP_PTS1, "WAIT_RESP_PTS1" }, + { PTS_S_WAIT_RESP_PTS2, "WAIT_RESP_PTS2" }, + { PTS_S_WAIT_RESP_PTS3, "WAIT_RESP_PTS3" }, + { PTS_S_WAIT_RESP_PCK, "WAIT_RESP_PCK" }, + { 0, NULL } +}; + /* PTS field byte index */ #define _PTSS 0 #define _PTS0 1 @@ -542,8 +558,9 @@ /* Update the PTS sub-state */ static void set_pts_state(struct card_handle *ch, enum pts_state new_ptss) { - TRACE_DEBUG("%u: 7816 PTS state %u -> %u\r\n", - ch->num, ch->pts.state, new_ptss); + TRACE_DEBUG("%u: 7816 PTS state %s -> %s\r\n", ch->num, + get_value_string(pts_state_names, ch->pts.state), + get_value_string(pts_state_names, new_ptss)); ch->pts.state = new_ptss; } @@ -623,8 +640,8 @@ memcpy(ch->pts.resp, ch->pts.req, sizeof(ch->pts.resp)); break; default: - TRACE_ERROR("%u: process_byte_pts() in invalid state %u\r\n", - ch->num, ch->pts.state); + TRACE_ERROR("%u: process_byte_pts() in invalid PTS state %s\r\n", ch->num, + get_value_string(pts_state_names, ch->pts.state)); break; } /* calculate the next state and set it */ @@ -674,8 +691,8 @@ byte = ch->pts.resp[_PCK]; break; default: - TRACE_ERROR("%u: get_byte_pts() in invalid state %u\r\n", - ch->num, ch->pts.state); + TRACE_ERROR("%u: get_byte_pts() in invalid PTS state %s\r\n", ch->num, + get_value_string(pts_state_names, ch->pts.state)); return 0; } @@ -880,8 +897,8 @@ add_tpdu_byte(ch, byte); break; default: - TRACE_ERROR("%u: process_byte_tpdu() in invalid state %u\r\n", - ch->num, ch->tpdu.state); + TRACE_ERROR("%u: process_byte_tpdu() in invalid TPDU state %s\r\n", ch->num, + get_value_string(tpdu_state_names, ch->tpdu.state)); } /* ensure we stay in TPDU ISO state */ @@ -982,8 +999,8 @@ new_state = process_byte_pts(ch, byte); goto out_silent; default: - TRACE_ERROR("%u: Received UART char in invalid 7816 state " - "%u\r\n", ch->num, ch->state); + TRACE_ERROR("%u: Received UART char in invalid 7816 state %s\r\n", ch->num, + get_value_string(iso7816_3_card_state_names, ch->state)); break; } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I81469e40f3720afdcb47048b45c63d6474887640 Gerrit-Change-Number: 16615 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 16 13:52:14 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 16 Dec 2019 13:52:14 +0000 Subject: Change in simtrace2[master]: cardem: Make card_emu_report_status() optionally use IRQ endpoint References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16616 ) Change subject: cardem: Make card_emu_report_status() optionally use IRQ endpoint ...................................................................... cardem: Make card_emu_report_status() optionally use IRQ endpoint This just introduces the capability to report on IRQ, but we don't actually use it yet. Change-Id: I83db4463b7010ba243a8adbda3ac9393975b4814 --- M firmware/libcommon/include/card_emu.h M firmware/libcommon/include/simtrace_usb.h M firmware/libcommon/source/card_emu.c M firmware/libcommon/source/mode_cardemu.c 4 files changed, 9 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/16/16616/1 diff --git a/firmware/libcommon/include/card_emu.h b/firmware/libcommon/include/card_emu.h index e545593..aaa07c5 100644 --- a/firmware/libcommon/include/card_emu.h +++ b/firmware/libcommon/include/card_emu.h @@ -56,7 +56,7 @@ struct llist_head *card_emu_get_uart_tx_queue(struct card_handle *ch); void card_emu_have_new_uart_tx(struct card_handle *ch); -void card_emu_report_status(struct card_handle *ch); +void card_emu_report_status(struct card_handle *ch, bool report_on_irq); #define ENABLE_TX 0x01 #define ENABLE_RX 0x02 diff --git a/firmware/libcommon/include/simtrace_usb.h b/firmware/libcommon/include/simtrace_usb.h index c0da9c5..be2da9f 100644 --- a/firmware/libcommon/include/simtrace_usb.h +++ b/firmware/libcommon/include/simtrace_usb.h @@ -64,4 +64,4 @@ #define SIMTRACE_CARDEM_USB_EP_USIM2_INT 3 /*! Maximum number of endpoints */ -#define BOARD_USB_NUMENDPOINTS 6 +#define BOARD_USB_NUMENDPOINTS 7 /* 0 (control) + 2 (interfaces) * 3 (endpoints) */ diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index ced6b14..352284f 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -1051,13 +1051,16 @@ } } -void card_emu_report_status(struct card_handle *ch) +void card_emu_report_status(struct card_handle *ch, bool report_on_irq) { struct msgb *msg; struct cardemu_usb_msg_status *sts; + uint8_t ep = ch->in_ep; - msg = usb_buf_alloc_st(ch->in_ep, SIMTRACE_MSGC_CARDEM, - SIMTRACE_MSGT_BD_CEMU_STATUS); + if (report_on_irq) + ep = ch->irq_ep; + + msg = usb_buf_alloc_st(ep, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_BD_CEMU_STATUS); if (!msg) return; diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c index 1d074cb..fbc042f 100644 --- a/firmware/libcommon/source/mode_cardemu.c +++ b/firmware/libcommon/source/mode_cardemu.c @@ -538,7 +538,7 @@ usb_buf_free(msg); break; case SIMTRACE_MSGT_BD_CEMU_STATUS: - card_emu_report_status(ci->ch); + card_emu_report_status(ci->ch, false); usb_buf_free(msg); break; case SIMTRACE_MSGT_BD_CEMU_STATS: -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I83db4463b7010ba243a8adbda3ac9393975b4814 Gerrit-Change-Number: 16616 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 16 13:52:15 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 16 Dec 2019 13:52:15 +0000 Subject: Change in simtrace2[master]: cardem: Add SIMTRACE_MSGT_BD_CEMU_CONFIG References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16617 ) Change subject: cardem: Add SIMTRACE_MSGT_BD_CEMU_CONFIG ...................................................................... cardem: Add SIMTRACE_MSGT_BD_CEMU_CONFIG The new SIMTRACE_MSGT_BD_CEMU_CONFIG command can be used to set/change a bitmask of optional features that can be enabled in the simtrace by the host software. This is useful for enabling features in the firmware which are not supported by older host utilities. The firmware will return the actually set/configured features in response. The feature bitmask is not yet used anywhere; it will be by subequent patches. Change-Id: I7cdd3f9171dbed45de0089defe29d2b59044bd84 --- M firmware/libcommon/include/card_emu.h M firmware/libcommon/include/simtrace_prot.h M firmware/libcommon/source/card_emu.c M firmware/libcommon/source/mode_cardemu.c 4 files changed, 54 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/17/16617/1 diff --git a/firmware/libcommon/include/card_emu.h b/firmware/libcommon/include/card_emu.h index aaa07c5..8a73d5c 100644 --- a/firmware/libcommon/include/card_emu.h +++ b/firmware/libcommon/include/card_emu.h @@ -66,3 +66,7 @@ void card_emu_uart_enable(uint8_t uart_chan, uint8_t rxtx); void card_emu_uart_wait_tx_idle(uint8_t uart_chan); void card_emu_uart_interrupt(uint8_t uart_chan); + +struct cardemu_usb_msg_config; +int card_emu_set_config(struct card_handle *ch, const struct cardemu_usb_msg_config *scfg, + unsigned int scfg_len); diff --git a/firmware/libcommon/include/simtrace_prot.h b/firmware/libcommon/include/simtrace_prot.h index 878bc34..eca844a 100644 --- a/firmware/libcommon/include/simtrace_prot.h +++ b/firmware/libcommon/include/simtrace_prot.h @@ -62,6 +62,8 @@ SIMTRACE_MSGT_DO_CEMU_RX_DATA, /* Indicate PTS request from phone */ SIMTRACE_MSGT_DO_CEMU_PTS, + /* Set configurable parameters */ + SIMTRACE_MSGT_BD_CEMU_CONFIG, }; /* SIMTRACE_MSGC_MODEM */ @@ -254,6 +256,15 @@ uint8_t msg[0]; } __attribute__ ((packed)); +/* enable/disable the generation of DO_STATUS on IRQ endpoint */ +#define CEMU_FEAT_F_STATUS_IRQ 0x00000001 + +/* SIMTRACE_MSGT_BD_CEMU_CONFIG */ +struct cardemu_usb_msg_config { + /* bit-mask of CEMU_FEAT_F flags */ + uint32_t features; +} __attribute__ ((packed)); + /*********************************************************************** * MODEM CONTROL ***********************************************************************/ diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 352284f..8da844f 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -37,6 +37,9 @@ #define NUM_SLOTS 2 +/* bit-mask of supported CEMU_FEAT_F_ flags */ +#define SUPPORTED_FEATURES 0 + #define ISO7816_3_INIT_WTIME 9600 #define ISO7816_3_DEFAULT_WI 10 #define ISO7816_3_ATR_LEN_MAX (1+32) /* TS plus 32 chars */ @@ -195,6 +198,9 @@ struct card_handle { unsigned int num; + /* bit-mask of enabled optional features (CEMU_FEAT_F_*) */ + uint32_t features; + enum iso7816_3_card_state state; /* signal levels */ @@ -1081,6 +1087,22 @@ usb_buf_upd_len_and_submit(msg); } +static void card_emu_report_config(struct card_handle *ch) +{ + struct msgb *msg; + struct cardemu_usb_msg_config *cfg; + uint8_t ep = ch->in_ep; + + msg = usb_buf_alloc_st(ch->in_ep, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_BD_CEMU_CONFIG); + if (!msg) + return; + + cfg = (struct cardemu_usb_msg_config *) msgb_put(msg, sizeof(*cfg)); + cfg->features = ch->features; + + usb_buf_upd_len_and_submit(msg); +} + /* hardware driver informs us that a card I/O signal has changed */ void card_emu_io_statechg(struct card_handle *ch, enum card_io io, int active) { @@ -1204,6 +1226,18 @@ static struct card_handle card_handles[NUM_SLOTS]; +int card_emu_set_config(struct card_handle *ch, const struct cardemu_usb_msg_config *scfg, + unsigned int scfg_len) +{ + if (scfg_len >= sizeof(uint32_t)) + ch->features = (scfg->features & SUPPORTED_FEATURES); + + /* send back a report of our current configuration */ + card_emu_report_config(ch); + + return 0; +} + struct card_handle *card_emu_init(uint8_t slot_num, uint8_t tc_chan, uint8_t uart_chan, uint8_t in_ep, uint8_t irq_ep, bool vcc_active, bool in_reset, bool clocked) { struct card_handle *ch; diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c index fbc042f..c5c173f 100644 --- a/firmware/libcommon/source/mode_cardemu.c +++ b/firmware/libcommon/source/mode_cardemu.c @@ -507,6 +507,7 @@ struct simtrace_msg_hdr *hdr; struct cardemu_usb_msg_set_atr *atr; struct cardemu_usb_msg_cardinsert *cardins; + struct cardemu_usb_msg_config *cfg; struct llist_head *queue; hdr = (struct simtrace_msg_hdr *) msg->l1h; @@ -541,6 +542,10 @@ card_emu_report_status(ci->ch, false); usb_buf_free(msg); break; + case SIMTRACE_MSGT_BD_CEMU_CONFIG: + cfg = (struct cardemu_usb_msg_config *) msg->l2h; + card_emu_set_config(ci->ch, cfg, msgb_l2len(msg)); + break; case SIMTRACE_MSGT_BD_CEMU_STATS: default: /* FIXME: Send Error */ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I7cdd3f9171dbed45de0089defe29d2b59044bd84 Gerrit-Change-Number: 16617 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 16 13:52:16 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 16 Dec 2019 13:52:16 +0000 Subject: Change in simtrace2[master]: cardem: Implement support for CEMU_FEAT_F_STATUS_IRQ References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16618 ) Change subject: cardem: Implement support for CEMU_FEAT_F_STATUS_IRQ ...................................................................... cardem: Implement support for CEMU_FEAT_F_STATUS_IRQ If this feature flag is set by the host application, we will start generating SIMTRACE_MSGT_BD_CEMU_STATUS towards the interrupt endpoint on any changes to the SIM card status, such as change of VCC/CLK/RST Change-Id: I832b4ac4aeb6152195d985067ffdd64fa5a7d4cc Related: OS#4330 --- M firmware/libcommon/source/card_emu.c 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/18/16618/1 diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 8da844f..7a541e5 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -38,7 +38,7 @@ #define NUM_SLOTS 2 /* bit-mask of supported CEMU_FEAT_F_ flags */ -#define SUPPORTED_FEATURES 0 +#define SUPPORTED_FEATURES (CEMU_FEAT_F_STATUS_IRQ) #define ISO7816_3_INIT_WTIME 9600 #define ISO7816_3_DEFAULT_WI 10 @@ -1106,15 +1106,19 @@ /* hardware driver informs us that a card I/O signal has changed */ void card_emu_io_statechg(struct card_handle *ch, enum card_io io, int active) { + uint32_t chg_mask = 0; + switch (io) { case CARD_IO_VCC: if (active == 0 && ch->vcc_active == 1) { TRACE_INFO("%u: VCC deactivated\r\n", ch->num); card_handle_reset(ch); card_set_state(ch, ISO_S_WAIT_POWER); + chg_mask |= CEMU_STATUS_F_VCC_PRESENT; } else if (active == 1 && ch->vcc_active == 0) { TRACE_INFO("%u: VCC activated\r\n", ch->num); card_set_state(ch, ISO_S_WAIT_CLK); + chg_mask |= CEMU_STATUS_F_VCC_PRESENT; } ch->vcc_active = active; break; @@ -1123,8 +1127,10 @@ TRACE_INFO("%u: CLK activated\r\n", ch->num); if (ch->state == ISO_S_WAIT_CLK) card_set_state(ch, ISO_S_WAIT_RST); + chg_mask |= CEMU_STATUS_F_CLK_ACTIVE; } else if (active == 0 && ch->clocked == 1) { TRACE_INFO("%u: CLK deactivated\r\n", ch->num); + chg_mask |= CEMU_STATUS_F_CLK_ACTIVE; } ch->clocked = active; break; @@ -1137,9 +1143,11 @@ /* prepare to send the ATR */ card_set_state(ch, ISO_S_WAIT_ATR); } + chg_mask |= CEMU_STATUS_F_RESET_ACTIVE; } else if (active && !ch->in_reset) { TRACE_INFO("%u: RST asserted\r\n", ch->num); card_handle_reset(ch); + chg_mask |= CEMU_STATUS_F_RESET_ACTIVE; } ch->in_reset = active; break; @@ -1159,6 +1167,10 @@ default: break; } + + /* notify the host about the state change */ + if ((ch->features & CEMU_FEAT_F_STATUS_IRQ) && chg_mask) + card_emu_report_status(ch, true); } /* User sets a new ATR to be returned during next card reset */ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I832b4ac4aeb6152195d985067ffdd64fa5a7d4cc Gerrit-Change-Number: 16618 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 16 14:06:57 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 16 Dec 2019 14:06:57 +0000 Subject: Change in osmo-hlr[master]: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16205 ) Change subject: 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name ...................................................................... Patch Set 22: (3 comments) This actually changes coding of the Routing Error message: So far a Routing Error sent back Source Name and Destination Name unchanged. In a setup with possibly a GSUP proxy between request and response, that is very cumbersome. It makes much more sense to put the requesting source in Destination Name, so that the error is implicitly routed back to the entity that requested the unreachable peer. Related: "add version IE?" https://osmocom.org/issues/4333 Places that introduce the "swap" of Destination and Source are... https://gerrit.osmocom.org/c/osmo-hlr/+/16205/22/src/gsup_server.c File src/gsup_server.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/22/src/gsup_server.c at 108 PS22, Line 108: osmo_gsup_req_respond_msgt(req, OSMO_GSUP_MSGT_ROUTING_ERROR, true); here https://gerrit.osmocom.org/c/osmo-hlr/+/16205/22/src/gsupclient/gsup_req.c File src/gsupclient/gsup_req.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/22/src/gsupclient/gsup_req.c at 85 PS22, Line 85: osmo_gsup_req_respond_msgt(req, OSMO_GSUP_MSGT_ROUTING_ERROR, true); here https://gerrit.osmocom.org/c/osmo-hlr/+/16205/22/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16205/22/src/hlr.c at 474 PS22, Line 474: .source_name_len = gsup->destination_name_len, here -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9 Gerrit-Change-Number: 16205 Gerrit-PatchSet: 22 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 16 Dec 2019 14:06:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 16 14:15:55 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 16 Dec 2019 14:15:55 +0000 Subject: Change in pysim[master]: Fix automated tests In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/16564 to look at the new patch set (#12). Change subject: Fix automated tests ...................................................................... Fix automated tests - The .ok files currently dictate in which pysical reader device the card must be placed. Lets remove this dependncy to make the setup more reliable. Testing in which reade a card is placed is not in the scope of our tests. - Fix bug in pysim-test.sh (test runner), so that the veriable $ADM_HEX gets reset after the execution of the tests. Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 --- M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/fakemagicsim.ok M pysim-testdata/sysmoUSIM-SJS1.ok M pysim-testdata/sysmosim-gr1.ok M tests/pysim-test.sh 6 files changed, 11 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/64/16564/12 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 Gerrit-Change-Number: 16564 Gerrit-PatchSet: 12 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 16 14:56:29 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 16 Dec 2019 14:56:29 +0000 Subject: Change in libosmocore[master]: gprs_bssgp: Work around gcc-9 claiming "error=stringop-overflow" In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16608 ) Change subject: gprs_bssgp: Work around gcc-9 claiming "error=stringop-overflow" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16608 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I22a0c399c6c00eaf87277002096a82844c9e198e Gerrit-Change-Number: 16608 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 16 Dec 2019 14:56:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 16 14:56:46 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 16 Dec 2019 14:56:46 +0000 Subject: Change in osmo-pcu[master]: Fix trailing whitespace In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16535 ) Change subject: Fix trailing whitespace ...................................................................... Fix trailing whitespace Change-Id: I0515b5c8f6744fa501de88fa7808b7fc91981f0e --- M src/encoding.cpp M src/gprs_rlcmac.cpp M src/gprs_rlcmac.h 3 files changed, 8 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/encoding.cpp b/src/encoding.cpp index b46f568..d4a7ae0 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -868,15 +868,15 @@ ..1. .... = ACKNACK: (Union) 0 0000 000 Length Desc - + ...0 .... = FINAL_ACK_INDICATION: False - + .... 1... = BEGINNING_OF_WINDOW: 1 - + .... .1.. = END_OF_WINDOW: 1 - + .... ..10 0101 0001 1... .... = STARTING_SEQUENCE_NUMBER: 1187 - + .0.. .... = CRBB Exist: 0 minimal size is 24 rest_bits */ rest_bits -= 24; diff --git a/src/gprs_rlcmac.cpp b/src/gprs_rlcmac.cpp index 7a98a25..e381b11 100644 --- a/src/gprs_rlcmac.cpp +++ b/src/gprs_rlcmac.cpp @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + #include #include #include diff --git a/src/gprs_rlcmac.h b/src/gprs_rlcmac.h index 16cb05f..5361a1c 100644 --- a/src/gprs_rlcmac.h +++ b/src/gprs_rlcmac.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + #ifndef GPRS_RLCMAC_H #define GPRS_RLCMAC_H @@ -85,7 +85,7 @@ /* TS 44.060 Section 10.4.7 Table 10.4.7.1: Payload Type field */ enum gprs_rlcmac_block_type { GPRS_RLCMAC_DATA_BLOCK = 0x0, - GPRS_RLCMAC_CONTROL_BLOCK = 0x1, + GPRS_RLCMAC_CONTROL_BLOCK = 0x1, GPRS_RLCMAC_CONTROL_BLOCK_OPT = 0x2, GPRS_RLCMAC_RESERVED = 0x3 }; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16535 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0515b5c8f6744fa501de88fa7808b7fc91981f0e Gerrit-Change-Number: 16535 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 16 22:35:31 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 16 Dec 2019 22:35:31 +0000 Subject: Change in libosmocore[master]: libosmocore libusb integration In-Reply-To: References: Message-ID: Hello tnt, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/16606 to look at the new patch set (#4). Change subject: libosmocore libusb integration ...................................................................... libosmocore libusb integration Osmocom applications typically use libosmocore select.[ch] event loop code as their main event dispatch mechanism. When they want to deal with libusb in a non-blocking/asynchronous way, they need to integrate libusb into that select(). The new libosmousb is doing exactly that: Providing a shared utility library for Osmocom programs that wish to use libusb. This is useful for example in simtrace2 host utilitie as well as osmo-e1d. Change-Id: I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3 Closes: OS#4299 --- M Makefile.am M configure.ac M contrib/jenkins_arm.sh M debian/control A debian/libosmousb0.install M include/Makefile.am A include/osmocom/usb/libusb.h A libosmousb.pc.in A src/usb/Makefile.am A src/usb/osmo_libusb.c 10 files changed, 218 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/06/16606/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3 Gerrit-Change-Number: 16606 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 16 22:35:31 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 16 Dec 2019 22:35:31 +0000 Subject: Change in libosmocore[master]: Introduce helper functions for safe fork+exec of processes References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16619 ) Change subject: Introduce helper functions for safe fork+exec of processes ...................................................................... Introduce helper functions for safe fork+exec of processes In some situations, we want to execute an external shell command in a non-blocking way. Similar to 'system', but without waiting for the child to complete. We also want to close all file descriptors ahead of the exec() and filter + modify the environment. Change-Id: Ib24ac8a083db32e55402ce496a5eabd8749cc888 Related: OS#4332 --- M src/Makefile.am A src/exec.c M tests/Makefile.am A tests/exec/exec_test.c A tests/exec/exec_test.err A tests/exec/exec_test.ok M tests/testsuite.at 7 files changed, 413 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/19/16619/1 diff --git a/src/Makefile.am b/src/Makefile.am index 9943281..eeb3f7d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,6 +27,7 @@ tdef.c \ sockaddr_str.c \ use_count.c \ + exec.c \ $(NULL) if HAVE_SSSE3 diff --git a/src/exec.c b/src/exec.c new file mode 100644 index 0000000..e0d97c3 --- /dev/null +++ b/src/exec.c @@ -0,0 +1,198 @@ +/* (C) 2019 by Harald Welte + * + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +/* list of environment variables that we pass (if they exist) to the sub-process/script */ +static const char *environment_whitelist[] = { + "USER", "LOGNAME", "HOME", + "LANG", "LC_ALL", "LC_COLLATE", "LC_CTYPE", "LC_MESSAGES", "LC_MONETARY", "LC_NUMERIC", "LC_TIME", + "PATH", + "PWD", + "SHELL", + "TERM", + "TMPDIR", + "LD_LIBRARY_PATH", + "LD_PRELOAD", + "POSIXLY_CORRECT", + "HOSTALIASES", + "TZ", "TZDIR", + "TERMCAP", + "COLUMNS", "LINES", + NULL +}; + +static bool str_in_list(const char **list, const char *key) +{ + const char **ent; + + for (ent = list; *ent; ent++) { + if (!strcmp(*ent, key)) + return true; + } + return false; +} + +/*! generate a filtered version of the process environment containing only entries of whitelisted keys. + * \oaram[out] out caller-allocated array of pointers for the generated output + * \param[in] out_len size of out (number of pointers) + * \param[in] in input environment (NULL-terminated list of pointers like **environment) + * \param[in] whitelist whitelist of permitted keys in environment (like **environment) + * \returns number of entries filled in 'out'; negtive on error */ +int osmo_environment_filter(char **out, size_t out_len, char **in, const char **whitelist) +{ + char tmp[256]; + char **ent; + size_t out_used = 0; + + /* invalid calls */ + if (!out || out_len == 0 || !whitelist) + return -EINVAL; + + /* legal, but unusual: no input to filter should generate empty, terminated out */ + if (!in) { + out[0] = NULL; + return 1; + } + + /* iterate over input entries */ + for (ent = in; *ent; ent++) { + char *eq = strchr(*ent, '='); + unsigned long eq_pos; + if (!eq) { + /* no '=' in string, skip it */ + continue; + } + eq_pos = eq - *ent; + if (eq_pos >= ARRAY_SIZE(tmp)) + continue; + strncpy(tmp, *ent, eq_pos); + tmp[eq_pos] = '\0'; + if (str_in_list(whitelist, tmp)) { + if (out_used == out_len-1) + break; + /* append to output */ + out[out_used++] = *ent; + } + } + OSMO_ASSERT(out_used < out_len); + out[out_used++] = NULL; + return out_used; +} + +/*! append one environment to another; only copying pointers, not actual strings. + * \oaram[out] out caller-allocated array of pointers for the generated output + * \param[in] out_len size of out (number of pointers) + * \param[in] in input environment (NULL-terminated list of pointers like **environment) + * \returns number of entries filled in 'out'; negative on error */ +int osmo_environment_append(char **out, size_t out_len, char **in) +{ + size_t out_used = 0; + + if (!out || out_len == 0) + return -EINVAL; + + /* seek to end of existing output */ + for (out_used = 0; out[out_used]; out_used++) {} + + if (!in) { + if (out_used == 0) + out[out_used++] = NULL; + return out_used; + } + + for (; *in && out_used < out_len-1; in++) + out[out_used++] = *in; + + OSMO_ASSERT(out_used < out_len); + out[out_used++] = NULL; + + return out_used; +} + +/* Iterate over files in /proc/self/fd and close all above lst_fd_to_keep */ +int osmo_close_all_fds_above(int last_fd_to_keep) +{ + struct dirent *ent; + DIR *dir; + int rc; + + dir = opendir("/proc/self/fd"); + if (!dir) { + LOGP(DLGLOBAL, LOGL_ERROR, "Cannot open /proc/self/fd: %s\n", strerror(errno)); + return -ENODEV; + } + + while ((ent = readdir(dir))) { + int fd = atoi(ent->d_name); + if (fd <= last_fd_to_keep) + continue; + if (fd == dirfd(dir)) + continue; + rc = close(fd); + if (rc) + LOGP(DLGLOBAL, LOGL_ERROR, "Error closing fd=%d: %s\n", fd, strerror(errno)); + } + closedir(dir); + return 0; +} + +/* Seems like POSIX has no header file for this? */ +extern char **environ; + +/* mimic the behavior of system(3), but don't wait for completion */ +int osmo_system_nowait(const char *command, char **addl_env) +{ + int rc; + + rc = fork(); + if (rc == 0) { + /* we are in the child */ + char *new_env[1024]; + + /* close all file descriptors above stdio */ + osmo_close_all_fds_above(2); + + /* build the new environment */ + osmo_environment_filter(new_env, ARRAY_SIZE(new_env), environ, environment_whitelist); + osmo_environment_append(new_env, ARRAY_SIZE(new_env), addl_env); + + /* if we want to behave like system(3), we must go via the shell */ + execle("/bin/sh", "sh", "-c", command, (char *) NULL, new_env); + /* only reached in case of error */ + LOGP(DLGLOBAL, LOGL_ERROR, "Error executing command '%s' after fork: %s\n", + command, strerror(errno)); + return -EIO; + } else { + /* we are in the parent */ + return rc; + } +} diff --git a/tests/Makefile.am b/tests/Makefile.am index 3a3ea37..498f6a8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -34,6 +34,7 @@ use_count/use_count_test \ context/context_test \ gsm0502/gsm0502_test \ + exec/exec_test \ $(NULL) if ENABLE_MSGFILE @@ -259,6 +260,9 @@ context_context_test_SOURCES = context/context_test.c context_context_test_LDADD = $(LDADD) +exec_exec_test_SOURCES = exec/exec_test.c +exec_exec_test_LDADD = $(LDADD) + # The `:;' works around a Bash 3.2 bug when the output is not writeable. $(srcdir)/package.m4: $(top_srcdir)/configure.ac :;{ \ @@ -334,6 +338,7 @@ use_count/use_count_test.ok use_count/use_count_test.err \ context/context_test.ok \ gsm0502/gsm0502_test.ok \ + exec/exec_test.ok \ $(NULL) DISTCLEANFILES = atconfig atlocal conv/gsm0503_test_vectors.c diff --git a/tests/exec/exec_test.c b/tests/exec/exec_test.c new file mode 100644 index 0000000..7559360 --- /dev/null +++ b/tests/exec/exec_test.c @@ -0,0 +1,155 @@ +#include +#include + +#include +#include +#include +#include +#include +#include + +static void env_dump(char **env) +{ + char **ent; + + for (ent = env; *ent; ent++) + printf("\t%s\n", *ent); +} + +static void test_env_filter(void) +{ + char *out[256]; + char *env_in[] = { + "FOO=1", + "BAR=2", + "USER=mahlzeit", + "BAZ=3", + "SHELL=/bin/sh", + NULL + }; + const char *filter[] = { + "SHELL", + "USER", + NULL + }; + int rc; + + printf("\n==== osmo_environment_filter ====\n"); + + printf("Input Environment:\n"); + env_dump(env_in); + printf("Input Whitelist:\n"); + env_dump((char **) filter); + rc = osmo_environment_filter(out, ARRAY_SIZE(out), env_in, filter); + printf("Output Environment (%d):\n", rc); + env_dump(out); + OSMO_ASSERT(rc == 3); + + printf("Testing for NULL out\n"); + rc = osmo_environment_filter(NULL, 123, env_in, filter); + OSMO_ASSERT(rc < 0); + + printf("Testing for zero-length out\n"); + rc = osmo_environment_filter(out, 0, env_in, filter); + OSMO_ASSERT(rc < 0); + + printf("Testing for one-length out\n"); + rc = osmo_environment_filter(out, 1, env_in, filter); + OSMO_ASSERT(rc == 1 && out[0] == NULL); + + printf("Testing for no filter\n"); + rc = osmo_environment_filter(out, ARRAY_SIZE(out), env_in, NULL); + OSMO_ASSERT(rc < 0); + + printf("Testing for no input\n"); + rc = osmo_environment_filter(out, ARRAY_SIZE(out), NULL, filter); + OSMO_ASSERT(rc == 1 && out[0] == NULL); + printf("Success!\n"); +} + +static void test_env_append(void) +{ + char *out[256] = { + "FOO=a", + "BAR=b", + "BAZ=c", + NULL, + }; + char *add[] = { + "MAHL=zeit", + "GSM=global", + "UMTS=universal", + "LTE=evolved", + NULL, + }; + int rc; + + printf("\n==== osmo_environment_append ====\n"); + + printf("Input Environment:\n"); + env_dump(out); + printf("Input Addition:\n"); + env_dump(add); + rc = osmo_environment_append(out, ARRAY_SIZE(out), add); + printf("Output Environment (%d)\n", rc); + env_dump(out); + OSMO_ASSERT(rc == 8); + printf("Success!\n"); +} + +static void test_close_fd(void) +{ + struct stat st; + int fds[2]; + int rc; + + printf("\n==== osmo_close_all_fds_above ====\n"); + + /* create some extra fds */ + rc = socketpair(AF_UNIX, SOCK_STREAM, 0, fds); + OSMO_ASSERT(rc == 0); + + rc = fstat(fds[0], &st); + OSMO_ASSERT(rc == 0); + + osmo_close_all_fds_above(2); + + rc = fstat(fds[0], &st); + OSMO_ASSERT(rc == -1 && errno == EBADF); + rc = fstat(fds[1], &st); + OSMO_ASSERT(rc == -1 && errno == EBADF); + printf("Success!\n"); +} + +static void test_system_nowait(void) +{ + char *addl_env[] = { + "MAHLZEIT=spaet", + NULL + }; + int rc, pid, i; + + printf("\n==== osmo_system_nowait ====\n"); + + pid = osmo_system_nowait("env | grep MAHLZEIT 1>&2", addl_env); + OSMO_ASSERT(pid > 0); + for (i = 0; i < 10; i++) { + sleep(1); + rc = waitpid(pid, NULL, WNOHANG); + if (rc == pid) { + printf("Success!\n"); + return; + } + } + printf("ERROR: child didn't terminate within 10s\n"); +} + +int main(int argc, char **argv) +{ + test_env_filter(); + test_env_append(); + test_close_fd(); + test_system_nowait(); + + exit(0); +} diff --git a/tests/exec/exec_test.err b/tests/exec/exec_test.err new file mode 100644 index 0000000..4edc61d --- /dev/null +++ b/tests/exec/exec_test.err @@ -0,0 +1 @@ +MAHLZEIT=spaet diff --git a/tests/exec/exec_test.ok b/tests/exec/exec_test.ok new file mode 100644 index 0000000..45a20f0 --- /dev/null +++ b/tests/exec/exec_test.ok @@ -0,0 +1,46 @@ + +==== osmo_environment_filter ==== +Input Environment: + FOO=1 + BAR=2 + USER=mahlzeit + BAZ=3 + SHELL=/bin/sh +Input Whitelist: + SHELL + USER +Output Environment (3): + USER=mahlzeit + SHELL=/bin/sh +Testing for NULL out +Testing for zero-length out +Testing for one-length out +Testing for no filter +Testing for no input +Success! + +==== osmo_environment_append ==== +Input Environment: + FOO=a + BAR=b + BAZ=c +Input Addition: + MAHL=zeit + GSM=global + UMTS=universal + LTE=evolved +Output Environment (8) + FOO=a + BAR=b + BAZ=c + MAHL=zeit + GSM=global + UMTS=universal + LTE=evolved +Success! + +==== osmo_close_all_fds_above ==== +Success! + +==== osmo_system_nowait ==== +Success! diff --git a/tests/testsuite.at b/tests/testsuite.at index c231b96..cb83ab9 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -362,3 +362,10 @@ cat $abs_srcdir/context/context_test.ok > expout AT_CHECK([$abs_top_builddir/tests/context/context_test], [0], [expout], [ignore]) AT_CLEANUP + +AT_SETUP([exec]) +AT_KEYWORDS([exec]) +cat $abs_srcdir/exec/exec_test.ok > expout +cat $abs_srcdir/exec/exec_test.err > experr +AT_CHECK([$abs_top_builddir/tests/exec/exec_test], [0], [expout], [experr]) +AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib24ac8a083db32e55402ce496a5eabd8749cc888 Gerrit-Change-Number: 16619 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 00:19:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 00:19:33 +0000 Subject: Change in osmo-remsim[master]: client: generate clientSlotStatusInd to bankd In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-remsim/+/16613 to look at the new patch set (#2). Change subject: client: generate clientSlotStatusInd to bankd ...................................................................... client: generate clientSlotStatusInd to bankd * enable generation of CEMU_USB_MSGT_DO_STATUS on IRQ endpoint * translate that to clientSlotStatusInd towards bankd This will allow bankd to understand when to reset the card as requested by the modem. Change-Id: Ibe2266ffa473823e925d4e3afcf168353b11cdd8 Related: OS#4330 --- M src/simtrace2-remsim_client.c 1 file changed, 68 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/13/16613/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ibe2266ffa473823e925d4e3afcf168353b11cdd8 Gerrit-Change-Number: 16613 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 00:19:34 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 00:19:34 +0000 Subject: Change in osmo-remsim[master]: rspro_util: Add functions generating {Bank, Client}SlotStatusInd References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16620 ) Change subject: rspro_util: Add functions generating {Bank,Client}SlotStatusInd ...................................................................... rspro_util: Add functions generating {Bank,Client}SlotStatusInd Change-Id: Ib07d397d80310f94dd6357b895455a1897e01cf3 --- M src/rspro_util.c M src/rspro_util.h 2 files changed, 84 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/20/16620/1 diff --git a/src/rspro_util.c b/src/rspro_util.c index 422aef4..1d95aee 100644 --- a/src/rspro_util.c +++ b/src/rspro_util.c @@ -385,6 +385,84 @@ return pdu; } +RsproPDU_t *rspro_gen_BankSlotStatusInd(const BankSlot_t *bank, const ClientSlot_t *client, + bool rst_active, int vcc_present, int clk_active, + int card_present) +{ + SlotPhysStatus_t *pstatus; + RsproPDU_t *pdu = CALLOC(1, sizeof(*pdu)); + if (!pdu) + return NULL; + pdu->version = 2; + pdu->msg.present = RsproPDUchoice_PR_bankSlotStatusInd; + OSMO_ASSERT(bank); + pdu->msg.choice.bankSlotStatusInd.fromBankSlot = *bank; + OSMO_ASSERT(client) + pdu->msg.choice.bankSlotStatusInd.toClientSlot = *client; + + pstatus = &pdu->msg.choice.bankSlotStatusInd.slotPhysStatus; + pstatus->resetActive = rst_active ? 1 : 0; + + if (vcc_present >= 0) { + pstatus->vccPresent = CALLOC(1, sizeof(BOOLEAN_t)); + OSMO_ASSERT(pstatus->vccPresent); + *pstatus->vccPresent = vcc_present; + } + + if (clk_active >= 0) { + pstatus->clkActive = CALLOC(1, sizeof(BOOLEAN_t)); + OSMO_ASSERT(pstatus->clkActive); + *pstatus->clkActive = clk_active; + } + + if (card_present >= 0) { + pstatus->cardPresent = CALLOC(1, sizeof(BOOLEAN_t)); + OSMO_ASSERT(pstatus->cardPresent); + *pstatus->cardPresent = card_present; + } + + return pdu; +} + +RsproPDU_t *rspro_gen_ClientSlotStatusInd(const ClientSlot_t *client, const BankSlot_t *bank, + bool rst_active, int vcc_present, int clk_active, + int card_present) +{ + SlotPhysStatus_t *pstatus; + RsproPDU_t *pdu = CALLOC(1, sizeof(*pdu)); + if (!pdu) + return NULL; + pdu->version = 2; + pdu->msg.present = RsproPDUchoice_PR_clientSlotStatusInd; + OSMO_ASSERT(client) + pdu->msg.choice.clientSlotStatusInd.fromClientSlot = *client; + OSMO_ASSERT(bank); + pdu->msg.choice.clientSlotStatusInd.toBankSlot = *bank; + + pstatus = &pdu->msg.choice.clientSlotStatusInd.slotPhysStatus; + pstatus->resetActive = rst_active ? 1 : 0; + + if (vcc_present >= 0) { + pstatus->vccPresent = CALLOC(1, sizeof(BOOLEAN_t)); + OSMO_ASSERT(pstatus->vccPresent); + *pstatus->vccPresent = vcc_present; + } + + if (clk_active >= 0) { + pstatus->clkActive = CALLOC(1, sizeof(BOOLEAN_t)); + OSMO_ASSERT(pstatus->clkActive); + *pstatus->clkActive = clk_active; + } + + if (card_present >= 0) { + pstatus->cardPresent = CALLOC(1, sizeof(BOOLEAN_t)); + OSMO_ASSERT(pstatus->cardPresent); + *pstatus->cardPresent = card_present; + } + + return pdu; +} + RsproPDU_t *rspro_gen_ResetStateReq(void) { RsproPDU_t *pdu = CALLOC(1, sizeof(*pdu)); diff --git a/src/rspro_util.h b/src/rspro_util.h index 8c6ae3b..3c5de0d 100644 --- a/src/rspro_util.h +++ b/src/rspro_util.h @@ -42,6 +42,12 @@ const uint8_t *tpdu, unsigned int tpdu_len); RsproPDU_t *rspro_gen_TpduCard2Modem(const BankSlot_t *bank, const ClientSlot_t *client, const uint8_t *tpdu, unsigned int tpdu_len); +RsproPDU_t *rspro_gen_BankSlotStatusInd(const BankSlot_t *bank, const ClientSlot_t *client, + bool rst_active, int vcc_present, int clk_active, + int card_present); +RsproPDU_t *rspro_gen_ClientSlotStatusInd(const ClientSlot_t *client, const BankSlot_t *bank, + bool rst_active, int vcc_present, int clk_active, + int card_present); RsproPDU_t *rspro_gen_ResetStateReq(void); RsproPDU_t *rspro_gen_ResetStateRes(e_ResultCode res); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ib07d397d80310f94dd6357b895455a1897e01cf3 Gerrit-Change-Number: 16620 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 00:19:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 00:19:35 +0000 Subject: Change in osmo-remsim[master]: remsim-client: Introduce 'struct client_config' References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16621 ) Change subject: remsim-client: Introduce 'struct client_config' ...................................................................... remsim-client: Introduce 'struct client_config' Introduce a dedicated structure for the parsed command line options converted into the configuration for the client. This reduces the amount of spaghetti code and paves the way for a later VTY / config file. Change-Id: I59980a78f0344602f9fa5b2277c99dfbf0b7815c --- M src/simtrace2-remsim_client.c 1 file changed, 142 insertions(+), 79 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/21/16621/1 diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index 1798df9..79eb32b 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -840,44 +840,83 @@ ); } -static const struct option opts[] = { - { "server-host", 1, 0, 's' }, - { "server-port", 1, 0, 'p' }, - { "client-id", 1, 0, 'c' }, - { "client-slot", 1, 0, 'n' }, - { "help", 0, 0, 'h' }, - { "version", 0, 0, 'v' }, - { "gsmtap-ip", 1, 0, 'i' }, - { "keep-running", 0, 0, 'k' }, - { "usb-vendor", 1, 0, 'V' }, - { "usb-product", 1, 0, 'P' }, - { "usb-config", 1, 0, 'C' }, - { "usb-interface", 1, 0, 'I' }, - { "usb-altsetting", 1, 0, 'S' }, - { "usb-address", 1, 0, 'A' }, - { "usb-path", 1, 0, 'H' }, - { "atr", 1, 0, 'a' }, - { NULL, 0, 0, 0 } +#define ATR_SIZE_MAX 55 +struct client_config { + char *server_host; + int server_port; + + int client_id; + int client_slot; + + char *gsmtap_host; + bool keep_running; + + struct { + uint8_t data[ATR_SIZE_MAX]; + uint8_t len; + } atr; + + struct { + int vendor_id; + int product_id; + int config_id; + int if_num; + int altsetting; + int addr; + char *path; + } usb; }; -int main(int argc, char **argv) +static struct client_config *client_config_init(void *ctx) { - struct rspro_server_conn *srvc, *bankdc; - struct st_transport *transp = ci->slot->transp; - char *gsmtap_host = "127.0.0.1"; - int rc; - int c, ret = 1; - int keep_running = 0; - int server_port = 9998; - int if_num = 0, vendor_id = -1, product_id = -1; - int config_id = -1, altsetting = 0, addr = -1; - int client_id = -1, client_slot = -1; - char *server_host = "127.0.0.1"; - char *path = NULL; - uint8_t atr_data[33] = { 0x3B, 0x00 }; // the shortest simplest ATR possible - uint8_t atr_len = 2; + struct client_config *cfg = talloc_zero(ctx, struct client_config); + if (!cfg) + return NULL; - print_welcome(); + cfg->server_host = talloc_strdup(cfg, "127.0.0.1"); + cfg->server_port = 9998; + cfg->client_id = -1; + cfg->client_slot = -1; + cfg->gsmtap_host = talloc_strdup(cfg, "127.0.0.1"); + cfg->keep_running = false; + + cfg->usb.vendor_id = -1; + cfg->usb.product_id = -1; + cfg->usb.config_id = -1; + cfg->usb.if_num = -1; + cfg->usb.altsetting = 0; + cfg->usb.addr = -1; + cfg->usb.path = NULL; + + cfg->atr.data[0] = 0x3B; + cfg->atr.data[1] = 0x00; // the shortest simplest ATR possible + cfg->atr.len = 2; + + return cfg; +}; + +static void handle_options(struct client_config *cfg, int argc, char **argv) +{ + const struct option opts[] = { + { "server-host", 1, 0, 's' }, + { "server-port", 1, 0, 'p' }, + { "client-id", 1, 0, 'c' }, + { "client-slot", 1, 0, 'n' }, + { "help", 0, 0, 'h' }, + { "version", 0, 0, 'v' }, + { "gsmtap-ip", 1, 0, 'i' }, + { "keep-running", 0, 0, 'k' }, + { "usb-vendor", 1, 0, 'V' }, + { "usb-product", 1, 0, 'P' }, + { "usb-config", 1, 0, 'C' }, + { "usb-interface", 1, 0, 'I' }, + { "usb-altsetting", 1, 0, 'S' }, + { "usb-address", 1, 0, 'A' }, + { "usb-path", 1, 0, 'H' }, + { "atr", 1, 0, 'a' }, + { NULL, 0, 0, 0 } + }; + int c, rc; while (1) { int option_index = 0; @@ -887,16 +926,16 @@ break; switch (c) { case 's': - server_host = optarg; + osmo_talloc_replace_string(cfg, &cfg->server_host, optarg); break; case 'p': - server_port = atoi(optarg); + cfg->server_port = atoi(optarg); break; case 'c': - client_id = atoi(optarg); + cfg->client_id = atoi(optarg); break; case 'n': - client_slot = atoi(optarg); + cfg->client_slot = atoi(optarg); break; case 'h': print_help(); @@ -907,62 +946,82 @@ exit(0); break; case 'i': - gsmtap_host = optarg; + osmo_talloc_replace_string(cfg, &cfg->gsmtap_host, optarg); break; case 'k': - keep_running = 1; + cfg->keep_running = 1; break; case 'V': - vendor_id = strtol(optarg, NULL, 16); + cfg->usb.vendor_id = strtol(optarg, NULL, 16); break; case 'P': - product_id = strtol(optarg, NULL, 16); + cfg->usb.product_id = strtol(optarg, NULL, 16); break; case 'C': - config_id = atoi(optarg); + cfg->usb.config_id = atoi(optarg); break; case 'I': - if_num = atoi(optarg); + cfg->usb.if_num = atoi(optarg); break; case 'S': - altsetting = atoi(optarg); + cfg->usb.altsetting = atoi(optarg); break; case 'A': - addr = atoi(optarg); + cfg->usb.addr = atoi(optarg); break; case 'H': - path = optarg; + cfg->usb.path = optarg; break; case 'a': - rc = osmo_hexparse(optarg, atr_data, ARRAY_SIZE(atr_data)); - if (rc < 2 || rc > ARRAY_SIZE(atr_data)) { - fprintf(stderr, "ATR matlformed\n"); - goto do_exit; + rc = osmo_hexparse(optarg, cfg->atr.data, ARRAY_SIZE(cfg->atr.data)); + if (rc < 2 || rc > ARRAY_SIZE(cfg->atr.data)) { + fprintf(stderr, "ATR malformed\n"); + exit(2); } - atr_len = rc; + cfg->atr.len = rc; break; } } - if (vendor_id < 0 || product_id < 0) { - fprintf(stderr, "You have to specify the vendor and product ID\n"); - goto do_exit; + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments on command line\n"); + exit(2); } +} - signal(SIGUSR1, handle_sig_usr1); + +int main(int argc, char **argv) +{ + struct rspro_server_conn *srvc, *bankdc; + struct st_transport *transp = ci->slot->transp; + struct client_config *cfg; + int rc; + int ret = 1; + + print_welcome(); g_tall_ctx = talloc_named_const(NULL, 0, "global"); talloc_asn1_ctx = talloc_named_const(g_tall_ctx, 0, "asn1"); msgb_talloc_ctx_init(g_tall_ctx, 0); osmo_init_logging2(g_tall_ctx, &log_info); + cfg = client_config_init(g_tall_ctx); + handle_options(cfg, argc, argv); + + if (cfg->usb.vendor_id < 0 || cfg->usb.product_id < 0) { + fprintf(stderr, "You have to specify the vendor and product ID\n"); + goto do_exit; + } + + signal(SIGUSR1, handle_sig_usr1); + rc = osmo_libusb_init(NULL); if (rc < 0) { fprintf(stderr, "libusb initialization failed\n"); goto do_exit; } - g_gti = gsmtap_source_init(gsmtap_host, GSMTAP_UDP_PORT, 0); + g_gti = gsmtap_source_init(cfg->gsmtap_host, GSMTAP_UDP_PORT, 0); if (!g_gti) { perror("unable to open GSMTAP"); goto close_exit; @@ -975,20 +1034,22 @@ g_client = talloc_zero(g_tall_ctx, struct bankd_client); - if (client_id != -1) { - /* default to client slot 0 */ - if (client_slot == -1) - client_slot = 0; + if (cfg->client_id != -1) { g_client->srv_conn.clslot = talloc_zero(g_client, ClientSlot_t); - g_client->srv_conn.clslot->clientId = client_id; - g_client->srv_conn.clslot->slotNr = client_slot; + g_client->srv_conn.clslot->clientId = cfg->client_id; + /* default to client slot 0 */ + if (cfg->client_slot == -1) + g_client->srv_conn.clslot->slotNr = 0; + else + g_client->srv_conn.clslot->slotNr = cfg->client_slot; g_client->bankd_conn.clslot = talloc_zero(g_client, ClientSlot_t); *g_client->bankd_conn.clslot = *g_client->srv_conn.clslot; } + /* create and [attempt to] establish connection to remsim-server */ srvc = &g_client->srv_conn; - srvc->server_host = server_host; - srvc->server_port = server_port; + srvc->server_host = cfg->server_host; + srvc->server_port = cfg->server_port; srvc->handle_rx = srvc_handle_rx; srvc->own_comp_id.type = ComponentType_remsimClient; OSMO_STRLCPY_ARRAY(srvc->own_comp_id.name, "simtrace2-remsim-client"); @@ -1001,6 +1062,8 @@ } osmo_fsm_inst_dispatch(srvc->fi, SRVC_E_ESTABLISH, NULL); + /* create and not yet establish connection to remsim-bankd */ + srvc = &g_client->srv_conn; bankdc = &g_client->bankd_conn; /* server_host / server_port are configured from remsim-server */ bankdc->handle_rx = bankd_handle_rx; @@ -1017,27 +1080,27 @@ // connect to SIMtrace2 cardem do { struct usb_interface_match _ifm, *ifm = &_ifm; - ifm->vendor = vendor_id; - ifm->product = product_id; - ifm->configuration = config_id; - ifm->interface = if_num; - ifm->altsetting = altsetting; - ifm->addr = addr; - if (path) - osmo_strlcpy(ifm->path, path, sizeof(ifm->path)); + ifm->vendor = cfg->usb.vendor_id; + ifm->product = cfg->usb.product_id; + ifm->configuration = cfg->usb.config_id; + ifm->interface = cfg->usb.if_num; + ifm->altsetting = cfg->usb.altsetting; + ifm->addr = cfg->usb.addr; + if (cfg->usb.path) + osmo_strlcpy(ifm->path, cfg->usb.path, sizeof(ifm->path)); transp->usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, ifm); if (!transp->usb_devh) { fprintf(stderr, "can't open USB device\n"); goto close_exit; } - rc = libusb_claim_interface(transp->usb_devh, if_num); + rc = libusb_claim_interface(transp->usb_devh, cfg->usb.if_num); if (rc < 0) { - fprintf(stderr, "can't claim interface %d; rc=%d\n", if_num, rc); + fprintf(stderr, "can't claim interface %d; rc=%d\n", cfg->usb.if_num, rc); goto close_exit; } - rc = osmo_libusb_get_ep_addrs(transp->usb_devh, if_num, &transp->usb_ep.out, + rc = osmo_libusb_get_ep_addrs(transp->usb_devh, cfg->usb.if_num, &transp->usb_ep.out, &transp->usb_ep.in, &transp->usb_ep.irq_in); if (rc < 0) { fprintf(stderr, "can't obtain EP addrs; rc=%d\n", rc); @@ -1101,7 +1164,7 @@ /* set the ATR */ //atr_update_csum(real_atr, sizeof(real_atr)); - cardem_request_set_atr(ci, atr_data, atr_len); + cardem_request_set_atr(ci, cfg->atr.data, cfg->atr.len); /* select remote (forwarded) SIM */ st_modem_reset_pulse(ci->slot, 300); @@ -1121,9 +1184,9 @@ close_exit: if (transp->usb_devh) libusb_close(transp->usb_devh); - if (keep_running) + if (cfg->keep_running) sleep(1); - } while (keep_running); + } while (cfg->keep_running); libusb_exit(NULL); do_exit: -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I59980a78f0344602f9fa5b2277c99dfbf0b7815c Gerrit-Change-Number: 16621 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 00:19:36 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 00:19:36 +0000 Subject: Change in osmo-remsim[master]: remsim_client: Move body of main() loop to separate function References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16622 ) Change subject: remsim_client: Move body of main() loop to separate function ...................................................................... remsim_client: Move body of main() loop to separate function I rally don't like the existing spaghetti-style code. Change-Id: I85c166e8aa95bb3f2e5d60d14f60caa94f3116fb --- M src/simtrace2-remsim_client.c 1 file changed, 115 insertions(+), 109 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/22/16622/1 diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index 077275a..ac78dd4 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -992,10 +992,120 @@ } +static void main_body(struct client_config *cfg) +{ + struct st_transport *transp = ci->slot->transp; + struct usb_interface_match _ifm, *ifm = &_ifm; + int rc; + + ifm->vendor = cfg->usb.vendor_id; + ifm->product = cfg->usb.product_id; + ifm->configuration = cfg->usb.config_id; + ifm->interface = cfg->usb.if_num; + ifm->altsetting = cfg->usb.altsetting; + ifm->addr = cfg->usb.addr; + if (cfg->usb.path) + osmo_strlcpy(ifm->path, cfg->usb.path, sizeof(ifm->path)); + transp->usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, ifm); + if (!transp->usb_devh) { + fprintf(stderr, "can't open USB device\n"); + return; + } + + rc = libusb_claim_interface(transp->usb_devh, cfg->usb.if_num); + if (rc < 0) { + fprintf(stderr, "can't claim interface %d; rc=%d\n", cfg->usb.if_num, rc); + goto close_exit; + } + + rc = osmo_libusb_get_ep_addrs(transp->usb_devh, cfg->usb.if_num, &transp->usb_ep.out, + &transp->usb_ep.in, &transp->usb_ep.irq_in); + if (rc < 0) { + fprintf(stderr, "can't obtain EP addrs; rc=%d\n", rc); + goto close_exit; + } + + // switch modem SIM port to emulated SIM on OWHW + if (USB_VENDOR_OPENMOKO == ifm->vendor && USB_PRODUCT_OWHW_SAM3 == ifm->product) { // we are on the OWHW + int modem = -1; + switch (ifm->interface) { // the USB interface indicates for which modem we want to emulate the SIM + case 0: + modem = 1; + break; + case 1: + modem = 2; + break; + default: + fprintf(stderr, "unknown GPIO for SIMtrace interface %d\n", ifm->interface); + goto close_exit; + } + // + char gpio_path[PATH_MAX]; + snprintf(gpio_path, sizeof(gpio_path), "/dev/gpio/connect_st_usim%d/value", modem); + int connec_st_usim = open(gpio_path, O_WRONLY); + if (-1 == connec_st_usim) { + fprintf(stderr, "can't open GPIO %s to switch modem %d to emulated USIM\n", gpio_path, modem); + goto close_exit; + } + if (1 != write(connec_st_usim, "1", 1)) { + fprintf(stderr, "can't write GPIO %s to switch modem %d to emulated USIM\n", gpio_path, modem); + goto close_exit; + } + printf("switched modem %d to emulated USIM\n", modem); + + snprintf(gpio_path, sizeof(gpio_path), "/dev/gpio/mdm%d_rst/value", modem); + int mdm_rst = open(gpio_path, O_WRONLY); + if (-1 == mdm_rst) { + fprintf(stderr, "can't open GPIO %s to reset modem %d\n", gpio_path, modem); + goto close_exit; + } + if (1 != write(mdm_rst, "1", 1)) { + fprintf(stderr, "can't write GPIO %s to reset modem %d\n", gpio_path, modem); + goto close_exit; + } + sleep(1); // wait a bit to ensure reset is effective + if (1 != write(mdm_rst, "0", 1)) { + fprintf(stderr, "can't write GPIO %s to reset modem %d\n", gpio_path, modem); + goto close_exit; + } + printf("modem %d reset\n", modem); + } + + /* request firmware to generate STATUS on IRQ endpoint */ + cardem_request_config(ci, CEMU_FEAT_F_STATUS_IRQ); + + /* simulate card-insert to modem (owhw, not qmod) */ + cardem_request_card_insert(ci, true); + + /* select remote (forwarded) SIM */ + st_modem_sim_select_remote(ci->slot); + + /* set the ATR */ + //atr_update_csum(real_atr, sizeof(real_atr)); + cardem_request_set_atr(ci, cfg->atr.data, cfg->atr.len); + + /* select remote (forwarded) SIM */ + st_modem_reset_pulse(ci->slot, 300); + + printf("Entering main loop\n"); + + allocate_and_submit_irq(ci); + allocate_and_submit_in(ci); + + while (1) { + osmo_select_main(false); + } + + libusb_release_interface(transp->usb_devh, 0); + +close_exit: + if (transp->usb_devh) + libusb_close(transp-> usb_devh); +} + int main(int argc, char **argv) { struct rspro_server_conn *srvc, *bankdc; - struct st_transport *transp = ci->slot->transp; struct client_config *cfg; int rc; int ret = 1; @@ -1082,116 +1192,12 @@ // connect to SIMtrace2 cardem do { - struct usb_interface_match _ifm, *ifm = &_ifm; - ifm->vendor = cfg->usb.vendor_id; - ifm->product = cfg->usb.product_id; - ifm->configuration = cfg->usb.config_id; - ifm->interface = cfg->usb.if_num; - ifm->altsetting = cfg->usb.altsetting; - ifm->addr = cfg->usb.addr; - if (cfg->usb.path) - osmo_strlcpy(ifm->path, cfg->usb.path, sizeof(ifm->path)); - transp->usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, ifm); - if (!transp->usb_devh) { - fprintf(stderr, "can't open USB device\n"); - goto close_exit; - } - - rc = libusb_claim_interface(transp->usb_devh, cfg->usb.if_num); - if (rc < 0) { - fprintf(stderr, "can't claim interface %d; rc=%d\n", cfg->usb.if_num, rc); - goto close_exit; - } - - rc = osmo_libusb_get_ep_addrs(transp->usb_devh, cfg->usb.if_num, &transp->usb_ep.out, - &transp->usb_ep.in, &transp->usb_ep.irq_in); - if (rc < 0) { - fprintf(stderr, "can't obtain EP addrs; rc=%d\n", rc); - goto close_exit; - } - - // switch modem SIM port to emulated SIM on OWHW - if (USB_VENDOR_OPENMOKO == ifm->vendor && USB_PRODUCT_OWHW_SAM3 == ifm->product) { // we are on the OWHW - int modem = -1; - switch (ifm->interface) { // the USB interface indicates for which modem we want to emulate the SIM - case 0: - modem = 1; - break; - case 1: - modem = 2; - break; - default: - fprintf(stderr, "unknown GPIO for SIMtrace interface %d\n", ifm->interface); - goto close_exit; - } - // - char gpio_path[PATH_MAX]; - snprintf(gpio_path, sizeof(gpio_path), "/dev/gpio/connect_st_usim%d/value", modem); - int connec_st_usim = open(gpio_path, O_WRONLY); - if (-1 == connec_st_usim) { - fprintf(stderr, "can't open GPIO %s to switch modem %d to emulated USIM\n", gpio_path, modem); - goto close_exit; - } - if (1 != write(connec_st_usim, "1", 1)) { - fprintf(stderr, "can't write GPIO %s to switch modem %d to emulated USIM\n", gpio_path, modem); - goto close_exit; - } - printf("switched modem %d to emulated USIM\n", modem); - - snprintf(gpio_path, sizeof(gpio_path), "/dev/gpio/mdm%d_rst/value", modem); - int mdm_rst = open(gpio_path, O_WRONLY); - if (-1 == mdm_rst) { - fprintf(stderr, "can't open GPIO %s to reset modem %d\n", gpio_path, modem); - goto close_exit; - } - if (1 != write(mdm_rst, "1", 1)) { - fprintf(stderr, "can't write GPIO %s to reset modem %d\n", gpio_path, modem); - goto close_exit; - } - sleep(1); // wait a bit to ensure reset is effective - if (1 != write(mdm_rst, "0", 1)) { - fprintf(stderr, "can't write GPIO %s to reset modem %d\n", gpio_path, modem); - goto close_exit; - } - printf("modem %d reset\n", modem); - } - - /* request firmware to generate STATUS on IRQ endpoint */ - cardem_request_config(ci, CEMU_FEAT_F_STATUS_IRQ); - - /* simulate card-insert to modem (owhw, not qmod) */ - cardem_request_card_insert(ci, true); - - /* select remote (forwarded) SIM */ - st_modem_sim_select_remote(ci->slot); - - /* set the ATR */ - //atr_update_csum(real_atr, sizeof(real_atr)); - cardem_request_set_atr(ci, cfg->atr.data, cfg->atr.len); - - /* select remote (forwarded) SIM */ - st_modem_reset_pulse(ci->slot, 300); - - printf("Entering main loop\n"); - - allocate_and_submit_irq(ci); - allocate_and_submit_in(ci); - - while (1) { - osmo_select_main(false); - } - - ret = 0; - - libusb_release_interface(transp->usb_devh, 0); -close_exit: - if (transp->usb_devh) - libusb_close(transp->usb_devh); - if (cfg->keep_running) - sleep(1); + main_body(cfg); + sleep(1); } while (cfg->keep_running); - libusb_exit(NULL); +close_exit: + osmo_libusb_exit(NULL); do_exit: return ret; } -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I85c166e8aa95bb3f2e5d60d14f60caa94f3116fb Gerrit-Change-Number: 16622 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 00:19:36 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 00:19:36 +0000 Subject: Change in osmo-remsim[master]: remsim-client: Fix the -k/ --keep-running option References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16623 ) Change subject: remsim-client: Fix the -k/ --keep-running option ...................................................................... remsim-client: Fix the -k/ --keep-running option When introducing asynchronous USB support in Change-Id Ic18690b3c2cbc5e99de0665c0b68b7555433b3cd, we accidentially broke the --keep-running behavior, where even a disappearing USB device will not terminate the remsim-client process. Change-Id: I67a3a5941434f09f7099c2cdb19c126cea305a73 --- M src/simtrace2-remsim_client.c 1 file changed, 14 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/23/16623/1 diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index ac78dd4..1af3274 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -96,6 +96,9 @@ void __thread *talloc_asn1_ctx; int asn_debug; +/* should we leave main loop processing? */ +bool g_leave_main = false; + __attribute__((unused)) static int gsmtap_send_sim(const uint8_t *apdu, unsigned int len) { struct gsmtap_hdr *gh; @@ -152,10 +155,11 @@ break; case LIBUSB_TRANSFER_NO_DEVICE: fprintf(stderr, "USB device disappeared\n"); - exit(23); + g_leave_main = true; break; default: - osmo_panic("USB OUT transfer failed, status=%u\n", xfer->status); + fprintf(stderr, "USB OUT transfer failed, status=%u\n", xfer->status); + g_leave_main = true; break; } @@ -577,10 +581,11 @@ break; case LIBUSB_TRANSFER_NO_DEVICE: fprintf(stderr, "USB device disappeared\n"); - exit(23); + g_leave_main = true; break; default: - osmo_panic("USB IN transfer failed, status=%u\n", xfer->status); + fprintf(stderr, "USB IN transfer failed, status=%u\n", xfer->status); + g_leave_main = true; break; } @@ -627,10 +632,11 @@ break; case LIBUSB_TRANSFER_NO_DEVICE: fprintf(stderr, "USB device disappeared\n"); - exit(23); + g_leave_main = true; break; default: - osmo_panic("USB IRQ transfer failed, status=%u\n", xfer->status); + fprintf(stderr, "USB IRQ transfer failed, status=%u\n", xfer->status); + g_leave_main = true; break; } @@ -1092,9 +1098,10 @@ allocate_and_submit_irq(ci); allocate_and_submit_in(ci); - while (1) { + while (!g_leave_main) { osmo_select_main(false); } + g_leave_main = false; libusb_release_interface(transp->usb_devh, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I67a3a5941434f09f7099c2cdb19c126cea305a73 Gerrit-Change-Number: 16623 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 00:19:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 00:19:37 +0000 Subject: Change in osmo-remsim[master]: remsim_client: move to 'client' subdirectory; add --disable-remsim-cl... References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16624 ) Change subject: remsim_client: move to 'client' subdirectory; add --disable-remsim-client ...................................................................... remsim_client: move to 'client' subdirectory; add --disable-remsim-client We already had the bankd and server in sub-directories and had their build conditional by ./configure flags. Let's do the same for the client. Change-Id: I7541a0b6c698896f3f039a1daa49d869e78b374f --- M configure.ac M src/Makefile.am M src/bankd/bankd.h R src/client/client.h R src/client/remsim_client.c R src/client/simtrace2-remsim_client.c M src/rspro_client_fsm.c M src/rspro_client_fsm.h 8 files changed, 24 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/24/16624/1 diff --git a/configure.ac b/configure.ac index d041c1a..de3c170 100644 --- a/configure.ac +++ b/configure.ac @@ -38,10 +38,6 @@ PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 0.11.0) PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.11.0) PKG_CHECK_MODULES(OSMOABIS, libosmoabis) -PKG_CHECK_MODULES(OSMOSIM, libosmosim) -PKG_CHECK_MODULES(OSMOUSB, libosmousb) -PKG_CHECK_MODULES(OSMOSIMTRACE2, libosmo-simtrace2) -PKG_CHECK_MODULES(USB, libusb-1.0) AC_ARG_ENABLE([remsim-server],[AS_HELP_STRING([--disable-remsim-server], [Build osmo-remsim-server])], [osmo_ac_build_server="$enableval"],[osmo_ac_build_server="yes"]) @@ -58,11 +54,24 @@ [osmo_ac_build_bankd="$enableval"],[osmo_ac_build_bankd="yes"]) if test "$osmo_ac_build_bankd" = "yes"; then AC_DEFINE(BUILD_BANKD, 1, [Define if we want to build osmo-remsim-bankd]) + PKG_CHECK_MODULES(OSMOSIM, libosmosim) + PKG_CHECK_MODULES(PCSC, libpcsclite) fi AM_CONDITIONAL(BUILD_BANKD, test "x$osmo_ac_build_bankd" = "xyes") - PKG_CHECK_MODULES(PCSC, libpcsclite) AC_SUBST(BUILD_BANKD) +AC_ARG_ENABLE([remsim-client],[AS_HELP_STRING([--disable-remsim-client], [Build osmo-remsim-client])], + [osmo_ac_build_client="$enableval"],[osmo_ac_build_client="yes"]) +if test "$osmo_ac_build_client" = "yes"; then + AC_DEFINE(BUILD_CLIENT, 1, [Define if we want to build osmo-remsim-client]) + PKG_CHECK_MODULES(OSMOSIM, libosmosim) + PKG_CHECK_MODULES(OSMOUSB, libosmousb) + PKG_CHECK_MODULES(OSMOSIMTRACE2, libosmo-simtrace2) + PKG_CHECK_MODULES(USB, libusb-1.0) +fi +AM_CONDITIONAL(BUILD_CLIENT, test "x$osmo_ac_build_client" = "xyes") +AC_SUBST(BUILD_CLIENT) + AC_CONFIG_MACRO_DIR([m4]) @@ -155,6 +164,7 @@ src/Makefile src/rspro/Makefile src/bankd/Makefile + src/client/Makefile src/server/Makefile include/Makefile include/osmocom/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index e1090fc..c954db2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,10 +5,12 @@ if BUILD_SERVER SUBDIRS += server endif +if BUILD_CLIENT +SUBDIRS += client +endif AM_CFLAGS = -Wall -I$(top_srcdir)/include -I$(top_builddir)/include \ $(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMOABIS_CFLAGS) \ - $(PCSC_CFLAGS) $(USB_CFLAGS) $(OSMOSIM_CFLAGS) \ -I$(top_srcdir)/include/osmocom/rspro RSPRO_LIBVERSION=1:0:0 @@ -18,17 +20,5 @@ rspro/libosmo-asn1-rspro.la libosmo_rspro_la_SOURCES = rspro_util.c asn1c_helpers.c -noinst_HEADERS = debug.h client.h rspro_util.h slotmap.h rspro_client_fsm.h \ +noinst_HEADERS = debug.h rspro_util.h slotmap.h rspro_client_fsm.h \ asn1c_helpers.h - -bin_PROGRAMS = osmo-remsim-client-st2 - -remsim_client_SOURCES = remsim_client.c rspro_client_fsm.c debug.c -remsim_client_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \ - libosmo-rspro.la - -osmo_remsim_client_st2_SOURCES = simtrace2-remsim_client.c \ - rspro_client_fsm.c debug.c -osmo_remsim_client_st2_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \ - $(OSMOUSB_LIBS) $(OSMOSIMTRACE2_LIBS) \ - $(USB_LIBS) $(OSMOSIM_LIBS) libosmo-rspro.la diff --git a/src/bankd/bankd.h b/src/bankd/bankd.h index d713ed1..6de3213 100644 --- a/src/bankd/bankd.h +++ b/src/bankd/bankd.h @@ -14,7 +14,7 @@ #include "rspro_util.h" #include "slotmap.h" -#include "client.h" +#include "rspro_client_fsm.h" #include "debug.h" extern struct value_string worker_state_names[]; diff --git a/src/client.h b/src/client/client.h similarity index 100% rename from src/client.h rename to src/client/client.h diff --git a/src/remsim_client.c b/src/client/remsim_client.c similarity index 100% rename from src/remsim_client.c rename to src/client/remsim_client.c diff --git a/src/simtrace2-remsim_client.c b/src/client/simtrace2-remsim_client.c similarity index 100% rename from src/simtrace2-remsim_client.c rename to src/client/simtrace2-remsim_client.c diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index 758bde7..d5cf04b 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -35,8 +35,8 @@ #include #include -#include "client.h" -#include "rspro_util.h" +#include "debug.h" +#include "rspro_client_fsm.h" #define S(x) (1 << (x)) diff --git a/src/rspro_client_fsm.h b/src/rspro_client_fsm.h index ca59c77..2f3f7fc 100644 --- a/src/rspro_client_fsm.h +++ b/src/rspro_client_fsm.h @@ -4,6 +4,8 @@ #include #include +#include "rspro_util.h" + enum server_conn_fsm_event { SRVC_E_ESTABLISH, /* instruct SRVC to (re)etablish TCP connection to bankd */ SRVC_E_TCP_UP, -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I7541a0b6c698896f3f039a1daa49d869e78b374f Gerrit-Change-Number: 16624 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 00:19:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 00:19:37 +0000 Subject: Change in osmo-remsim[master]: remsim-client: Avoid using 'ci' global variable References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16625 ) Change subject: remsim-client: Avoid using 'ci' global variable ...................................................................... remsim-client: Avoid using 'ci' global variable Rather, pass it around between functions and attach it to other state. Also, make it a talloc contxt so other objects can be allocated off it. Change-Id: I25f592581382238d5640c1f6326dec745f8d1d40 --- M src/client/client.h M src/client/simtrace2-remsim_client.c 2 files changed, 16 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/25/16625/1 diff --git a/src/client/client.h b/src/client/client.h index 96a454f..f36e2e3 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -11,6 +11,8 @@ /* main.c */ +struct cardem_inst; + struct bankd_client { /* connection to the remsim-server (control) */ struct rspro_server_conn srv_conn; @@ -21,4 +23,6 @@ struct app_comp_id peer_comp_id; struct bank_slot bankd_slot; + + struct cardem_inst *cardem; }; diff --git a/src/client/simtrace2-remsim_client.c b/src/client/simtrace2-remsim_client.c index 1af3274..190eb90 100644 --- a/src/client/simtrace2-remsim_client.c +++ b/src/client/simtrace2-remsim_client.c @@ -679,17 +679,13 @@ .slot_nr = 0, }; -struct cardem_inst _ci = { - .slot = &_slot, -}; - -struct cardem_inst *ci = &_ci; +static struct cardem_inst *g_ci; static void signal_handler(int signal) { switch (signal) { case SIGINT: - cardem_request_card_insert(ci, false); + cardem_request_card_insert(g_ci, false); exit(0); break; default: @@ -714,9 +710,9 @@ ac.sw[1] = card2modem->data.buf[card2modem->data.size - 1]; printf("SIMtrace <= SW=0x%02x%02x, len_rx=%d\n", ac.sw[0], ac.sw[1], card2modem->data.size - 2); if (card2modem->data.size > 2) { // send PB and data to modem - cardem_request_pb_and_tx(ci, ac.hdr.ins, card2modem->data.buf, card2modem->data.size - 2); + cardem_request_pb_and_tx(bc->cardem, ac.hdr.ins, card2modem->data.buf, card2modem->data.size - 2); } - cardem_request_sw_tx(ci, ac.sw); // send SW to modem + cardem_request_sw_tx(bc->cardem, ac.sw); // send SW to modem return 0; } @@ -730,7 +726,7 @@ OSMO_ASSERT(RsproPDUchoice_PR_setAtrReq == pdu->msg.present); /* FIXME: is this permitted at any time by the SIMtrace2 cardemfirmware? */ - rc = cardem_request_set_atr(ci, pdu->msg.choice.setAtrReq.atr.buf, + rc = cardem_request_set_atr(bc->cardem, pdu->msg.choice.setAtrReq.atr.buf, pdu->msg.choice.setAtrReq.atr.size); if (rc == 0) resp = rspro_gen_SetAtrRes(ResultCode_ok); @@ -998,7 +994,7 @@ } -static void main_body(struct client_config *cfg) +static void main_body(struct cardem_inst *ci, struct client_config *cfg) { struct st_transport *transp = ci->slot->transp; struct usb_interface_match _ifm, *ifm = &_ifm; @@ -1125,7 +1121,10 @@ msgb_talloc_ctx_init(g_tall_ctx, 0); osmo_init_logging2(g_tall_ctx, &log_info); - cfg = client_config_init(g_tall_ctx); + g_ci = talloc_zero(g_tall_ctx, struct cardem_inst); + g_ci->slot = &_slot; + + cfg = client_config_init(g_ci); handle_options(cfg, argc, argv); if (cfg->usb.vendor_id < 0 || cfg->usb.product_id < 0) { @@ -1153,6 +1152,7 @@ // initialize remote SIM client g_client = talloc_zero(g_tall_ctx, struct bankd_client); + g_client->cardem = g_ci; if (cfg->client_id != -1) { g_client->srv_conn.clslot = talloc_zero(g_client, ClientSlot_t); @@ -1199,7 +1199,7 @@ // connect to SIMtrace2 cardem do { - main_body(cfg); + main_body(g_ci, cfg); sleep(1); } while (cfg->keep_running); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I25f592581382238d5640c1f6326dec745f8d1d40 Gerrit-Change-Number: 16625 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 00:19:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 00:19:37 +0000 Subject: Change in osmo-remsim[master]: remsim-client: Move client_cnfig from .c to .h file References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16626 ) Change subject: remsim-client: Move client_cnfig from .c to .h file ...................................................................... remsim-client: Move client_cnfig from .c to .h file Change-Id: I158fe0f2791c164adc74cf851d5a139990bce852 --- M src/client/client.h M src/client/simtrace2-remsim_client.c 2 files changed, 31 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/26/16626/1 diff --git a/src/client/client.h b/src/client/client.h index f36e2e3..7cc7ec1 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -13,6 +13,35 @@ struct cardem_inst; +#define ATR_SIZE_MAX 55 +struct client_config { + char *server_host; + int server_port; + + int client_id; + int client_slot; + + char *gsmtap_host; + bool keep_running; + + char *event_script; + + struct { + uint8_t data[ATR_SIZE_MAX]; + uint8_t len; + } atr; + + struct { + int vendor_id; + int product_id; + int config_id; + int if_num; + int altsetting; + int addr; + char *path; + } usb; +}; + struct bankd_client { /* connection to the remsim-server (control) */ struct rspro_server_conn srv_conn; @@ -24,5 +53,6 @@ struct bank_slot bankd_slot; + struct client_config *cfg; struct cardem_inst *cardem; }; diff --git a/src/client/simtrace2-remsim_client.c b/src/client/simtrace2-remsim_client.c index 190eb90..515fd50 100644 --- a/src/client/simtrace2-remsim_client.c +++ b/src/client/simtrace2-remsim_client.c @@ -844,33 +844,6 @@ ); } -#define ATR_SIZE_MAX 55 -struct client_config { - char *server_host; - int server_port; - - int client_id; - int client_slot; - - char *gsmtap_host; - bool keep_running; - - struct { - uint8_t data[ATR_SIZE_MAX]; - uint8_t len; - } atr; - - struct { - int vendor_id; - int product_id; - int config_id; - int if_num; - int altsetting; - int addr; - char *path; - } usb; -}; - static struct client_config *client_config_init(void *ctx) { struct client_config *cfg = talloc_zero(ctx, struct client_config); @@ -1152,6 +1125,7 @@ // initialize remote SIM client g_client = talloc_zero(g_tall_ctx, struct bankd_client); + g_client->cfg = cfg; g_client->cardem = g_ci; if (cfg->client_id != -1) { -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16626 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I158fe0f2791c164adc74cf851d5a139990bce852 Gerrit-Change-Number: 16626 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 00:19:38 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 00:19:38 +0000 Subject: Change in osmo-remsim[master]: remsim-client: stoare last 'status' References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16627 ) Change subject: remsim-client: stoare last 'status' ...................................................................... remsim-client: stoare last 'status' Keep a local copy of the last status message of the cardem firmware. Change-Id: I5b348035da8f0905364b67f21f5c7be112b20e70 --- M src/client/simtrace2-remsim_client.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/27/16627/1 diff --git a/src/client/simtrace2-remsim_client.c b/src/client/simtrace2-remsim_client.c index 515fd50..173b890 100644 --- a/src/client/simtrace2-remsim_client.c +++ b/src/client/simtrace2-remsim_client.c @@ -86,6 +86,7 @@ struct cardem_inst { /* slot on which this card emulation instance runs */ struct st_slot *slot; + struct cardemu_usb_msg_status last_status; }; /* global GSMTAP instance */ @@ -544,6 +545,11 @@ -1 /* FIXME: make this dependent on board */); server_conn_send_rspro(&g_client->bankd_conn, pdu); + if (ci->last_status.flags != status->flags) { + ci->last_status = *status; + } else + ci->last_status = *status; + return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I5b348035da8f0905364b67f21f5c7be112b20e70 Gerrit-Change-Number: 16627 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 00:19:38 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 00:19:38 +0000 Subject: Change in osmo-remsim[master]: remsim-client: Query + Store the USB device path References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16628 ) Change subject: remsim-client: Query + Store the USB device path ...................................................................... remsim-client: Query + Store the USB device path While the user may have specified a USB path at the command line (or not), let's make sure we obtain the actual path after opening the respective USB device. Change-Id: I7e707c74647f4c5db06d495d369b2e69e2fc7c97 --- M src/client/simtrace2-remsim_client.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/28/16628/1 diff --git a/src/client/simtrace2-remsim_client.c b/src/client/simtrace2-remsim_client.c index 173b890..846ce85 100644 --- a/src/client/simtrace2-remsim_client.c +++ b/src/client/simtrace2-remsim_client.c @@ -87,6 +87,7 @@ /* slot on which this card emulation instance runs */ struct st_slot *slot; struct cardemu_usb_msg_status last_status; + char *usb_path; }; /* global GSMTAP instance */ @@ -993,6 +994,10 @@ return; } + /* (re)determine the USB path of the opened device */ + talloc_free(ci->usb_path); + ci->usb_path = osmo_libusb_dev_get_path_c(ci, libusb_get_device(transp->usb_devh)); + rc = libusb_claim_interface(transp->usb_devh, cfg->usb.if_num); if (rc < 0) { fprintf(stderr, "can't claim interface %d; rc=%d\n", cfg->usb.if_num, rc); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16628 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I7e707c74647f4c5db06d495d369b2e69e2fc7c97 Gerrit-Change-Number: 16628 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 00:19:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 00:19:39 +0000 Subject: Change in osmo-remsim[master]: remsim-client: Call an external script in specific situations References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16629 ) Change subject: remsim-client: Call an external script in specific situations ...................................................................... remsim-client: Call an external script in specific situations There are some situations where remsim-client would want to make its surrounding system aware of, e.g. to take specific action. This is particularly important on platforms where the simtrace2 firmware doesn't have direct control over modem reset/poweron or the like. Change-Id: I61cf4d93c669db137de801f8b147dcffaa6f3abd Depends: libosmocore.git Ib24ac8a083db32e55402ce496a5eabd8749cc888 Closes: OS#4332 --- M src/client/simtrace2-remsim_client.c 1 file changed, 85 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/29/16629/1 diff --git a/src/client/simtrace2-remsim_client.c b/src/client/simtrace2-remsim_client.c index 846ce85..90e2371 100644 --- a/src/client/simtrace2-remsim_client.c +++ b/src/client/simtrace2-remsim_client.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -130,6 +131,77 @@ return 0; } +/* build the (additional) environment for executing a script */ +static char **build_script_env(struct bankd_client *clnt, const char *event) +{ + struct cardem_inst *ci = clnt->cardem; + char **env = talloc_zero_size(clnt, 256*sizeof(char *)); + int i = 0; + + if (!env) + return NULL; + + env[i++] = talloc_asprintf(env, "REMSIM_CLIENT_VERSION=%s", VERSION); + + env[i++] = talloc_asprintf(env, "REMSIM_SERVER_ADDR=%s:%u", + clnt->srv_conn.server_host, clnt->srv_conn.server_port); + env[i++] = talloc_asprintf(env, "REMSIM_SERVER_STATE=%s", + osmo_fsm_inst_state_name(clnt->srv_conn.fi)); + + env[i++] = talloc_asprintf(env, "REMSIM_BANKD_ADDR=%s:%u", + clnt->bankd_conn.server_host, clnt->bankd_conn.server_port); + env[i++] = talloc_asprintf(env, "REMSIM_BANKD_STATE=%s", + osmo_fsm_inst_state_name(clnt->bankd_conn.fi)); + + + if (clnt->srv_conn.clslot) { + env[i++] = talloc_asprintf(env, "REMSIM_CLIENT_SLOT=%lu:%lu", + g_client->srv_conn.clslot->clientId, + g_client->srv_conn.clslot->slotNr); + } + env[i++] = talloc_asprintf(env, "REMSIM_BANKD_SLOT=%u:%u", + clnt->bankd_slot.bank_id, clnt->bankd_slot.slot_nr); + + env[i++] = talloc_asprintf(env, "REMSIM_USB_PATH=%s", ci->usb_path); + env[i++] = talloc_asprintf(env, "REMSIM_USB_INTERFACE=%u", clnt->cfg->usb.if_num); + + /* TODO: SIM card state VCC/CLK/RST */ + env[i++] = talloc_asprintf(env, "REMSIM_SIM_VCC=%u", + !!(ci->last_status.flags & CEMU_STATUS_F_VCC_PRESENT)); + env[i++] = talloc_asprintf(env, "REMSIM_SIM_RST=%u", + !!(ci->last_status.flags & CEMU_STATUS_F_RESET_ACTIVE)); + + env[i++] = talloc_asprintf(env, "REMSIM_EVENT=%s", event); + + /* terminate last entry */ + env[i++] = NULL; + return env; +} + +static int call_script(struct bankd_client *clnt, const char *event) +{ + char **env, *cmd; + int rc; + + if (!clnt->cfg->event_script) + return 0; + + env = build_script_env(clnt, event); + if (!env) + return -ENOMEM; + + cmd = talloc_asprintf(env, "%s %s", clnt->cfg->event_script, event); + if (!cmd) { + talloc_free(env); + return -ENOMEM; + } + + rc = osmo_system_nowait(cmd, env); + talloc_free(env); + + return rc; +} + /*********************************************************************** * SIMTRACE core protocol ***********************************************************************/ @@ -548,6 +620,7 @@ if (ci->last_status.flags != status->flags) { ci->last_status = *status; + call_script(g_client, "event-modem-status"); } else ci->last_status = *status; @@ -754,6 +827,7 @@ /* Store 'identity' of bankd to in peer_comp_id */ rspro_comp_id_retrieve(&bankdc->peer_comp_id, &pdu->msg.choice.connectClientRes.identity); osmo_fsm_inst_dispatch(bankdc->fi, SRVC_E_CLIENT_CONN_RES, (void *) pdu); + call_script(g_client, "event-bankd-connect"); break; case RsproPDUchoice_PR_tpduCardToModem: // APDU response from card received bankd_handle_tpduCardToModem(g_client, pdu); @@ -780,6 +854,7 @@ /* Store 'identity' of server in srvc->peer_comp_id */ rspro_comp_id_retrieve(&srvc->peer_comp_id, &pdu->msg.choice.connectClientRes.identity); osmo_fsm_inst_dispatch(srvc->fi, SRVC_E_CLIENT_CONN_RES, (void *) pdu); + call_script(g_client, "event-server-connect"); break; case RsproPDUchoice_PR_configClientIdReq: /* store/set the clientID as instructed by the server */ @@ -804,6 +879,7 @@ /* send response to server */ resp = rspro_gen_ConfigClientBankRes(ResultCode_ok); server_conn_send_rspro(srvc, resp); + call_script(g_client, "event-config-bankd"); break; default: LOGPFSML(srvc->fi, LOGL_ERROR, "Unknown/Unsupported RSPRO PDU type: %s\n", @@ -847,6 +923,7 @@ "\t-A\t--usb-address\tADDRESS\n" "\t-H\t--usb-path\tPATH\n" "\t-a\t--atr\tATR\n" + "\t-e\t--event-script\tPATH\n" "\n" ); } @@ -898,6 +975,7 @@ { "usb-address", 1, 0, 'A' }, { "usb-path", 1, 0, 'H' }, { "atr", 1, 0, 'a' }, + { "event-script", 1, 0, 'e' }, { NULL, 0, 0, 0 } }; int c, rc; @@ -905,7 +983,7 @@ while (1) { int option_index = 0; - c = getopt_long(argc, argv, "s:p:c:n:hvi:kV:P:C:I:S:A:H:a:", opts, &option_index); + c = getopt_long(argc, argv, "s:p:c:n:hvi:kV:P:C:I:S:A:H:a:e:", opts, &option_index); if (c == -1) break; switch (c) { @@ -964,6 +1042,9 @@ } cfg->atr.len = rc; break; + case 'e': + osmo_talloc_replace_string(cfg, &cfg->event_script, optarg); + break; } } @@ -1062,9 +1143,11 @@ /* simulate card-insert to modem (owhw, not qmod) */ cardem_request_card_insert(ci, true); + call_script(g_client, "request-card-insert"); /* select remote (forwarded) SIM */ st_modem_sim_select_remote(ci->slot); + call_script(g_client, "request-sim-remote"); /* set the ATR */ //atr_update_csum(real_atr, sizeof(real_atr)); @@ -1072,6 +1155,7 @@ /* select remote (forwarded) SIM */ st_modem_reset_pulse(ci->slot, 300); + call_script(g_client, "request-modem-reset"); printf("Entering main loop\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I61cf4d93c669db137de801f8b147dcffaa6f3abd Gerrit-Change-Number: 16629 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 00:58:27 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 00:58:27 +0000 Subject: Change in simtrace2[master]: card_emu: Remove extraneous initialization of ch->pts.state In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16605 ) Change subject: card_emu: Remove extraneous initialization of ch->pts.state ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I5ff8b2671c3c893cc5f6542d48b65487ae8c5be1 Gerrit-Change-Number: 16605 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 00:58:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 00:58:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 00:58:53 +0000 Subject: Change in simtrace2[master]: card_emu: Avoid recursive calls to card_set_state() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16602 ) Change subject: card_emu: Avoid recursive calls to card_set_state() ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ieefa1807099eb234cfd994bca83caaa0dcc919b6 Gerrit-Change-Number: 16602 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 00:58:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 00:59:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 00:59:06 +0000 Subject: Change in simtrace2[master]: card_emu: Avoid recursive calls to card_set_state() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16602 ) Change subject: card_emu: Avoid recursive calls to card_set_state() ...................................................................... card_emu: Avoid recursive calls to card_set_state() A function that is called to set the state should not in itself contain logic to issue further state changes. Let's shift the related block out to the end of card_emu_io_statechg(), which is the only source of card_set_state() calls for the WAIT_{POWER,CLK,RST} states anyway. As an added benefit, the block of statements is now also executed if there's no state change - something that was prevented by the "if old == new" state guard at the top of card_set_state(). I believe this may help us to cover more (non-standard) card activation sequences. Change-Id: Ieefa1807099eb234cfd994bca83caaa0dcc919b6 --- M firmware/libcommon/source/card_emu.c 1 file changed, 17 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index c3299de..34fac1b 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -426,13 +426,6 @@ case ISO_S_WAIT_RST: /* disable Rx and Tx of UART */ card_emu_uart_enable(ch->uart_chan, 0); - /* check end activation state (only necessary if the reader to not respect the activation sequence) */ - if (ch->vcc_active && ch->clocked && !ch->in_reset) { - /* enable the TC/ETU counter once reset has been released */ - tc_etu_enable(ch->tc_chan); - /* prepare to send the ATR */ - card_set_state(ch, ISO_S_WAIT_ATR); - } break; case ISO_S_WAIT_ATR: /* Reset to initial Fi / Di ratio */ @@ -1111,6 +1104,23 @@ ch->in_reset = active; break; } + + switch (ch->state) { + case ISO_S_WAIT_POWER: + case ISO_S_WAIT_CLK: + case ISO_S_WAIT_RST: + /* check end activation state (even if the reader does + * not respect the activation sequence) */ + if (ch->vcc_active && ch->clocked && !ch->in_reset) { + /* enable the TC/ETU counter once reset has been released */ + tc_etu_enable(ch->tc_chan); + /* prepare to send the ATR */ + card_set_state(ch, ISO_S_WAIT_ATR); + } + break; + default: + break; + } } /* User sets a new ATR to be returned during next card reset */ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ieefa1807099eb234cfd994bca83caaa0dcc919b6 Gerrit-Change-Number: 16602 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 00:59:29 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 00:59:29 +0000 Subject: Change in simtrace2[master]: [lib] apdu_dispatch: Use DLGLOBAL and don't printf() directly References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16630 ) Change subject: [lib] apdu_dispatch: Use DLGLOBAL and don't printf() directly ...................................................................... [lib] apdu_dispatch: Use DLGLOBAL and don't printf() directly Change-Id: I2f3ec49d34b6806e13af185fb629cabc486891fb --- M host/lib/apdu_dispatch.c 1 file changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/30/16630/1 diff --git a/host/lib/apdu_dispatch.c b/host/lib/apdu_dispatch.c index 62a75aa..835b8bc 100644 --- a/host/lib/apdu_dispatch.c +++ b/host/lib/apdu_dispatch.c @@ -1,6 +1,6 @@ /* apdu_dispatch - State machine to determine Rx/Tx phases of APDU * - * (C) 2016 by Harald Welte + * (C) 2016-2019 by Harald Welte * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -24,6 +24,7 @@ #include #include +#include #include #include @@ -105,7 +106,7 @@ break; case 0: default: - fprintf(stderr, "Unknown APDU case %d\n", ac->apdu_case); + LOGP(DLGLOBAL, LOGL_ERROR, "Unknown APDU case %d\n", ac->apdu_case); return -1; } } else { @@ -124,8 +125,8 @@ ac->lc.cur += cpy_len; break; default: - fprintf(stderr, "Unknown APDU case %d\n", ac->apdu_case); - break; + LOGP(DLGLOBAL, LOGL_ERROR, "Unknown APDU case %d\n", ac->apdu_case); + return -1; } } @@ -163,8 +164,8 @@ break; case 0: default: - fprintf(stderr, "Unknown APDU case %d\n", ac->apdu_case); - break; + LOGP(DLGLOBAL, LOGL_ERROR, "Unknown APDU case %d\n", ac->apdu_case); + return -1; } dump_apdu_ctx(ac); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16630 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2f3ec49d34b6806e13af185fb629cabc486891fb Gerrit-Change-Number: 16630 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 00:59:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 00:59:30 +0000 Subject: Change in simtrace2[master]: [lib] apdu_dispatch: Don't print APDU state to stdout References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16631 ) Change subject: [lib] apdu_dispatch: Don't print APDU state to stdout ...................................................................... [lib] apdu_dispatch: Don't print APDU state to stdout The printing was always only done at the end of osmo_apdu_segment_in(), so let's leave the decision up to the user if he wants to print the state at every iteration or not. We now provide osmo_apdu_dump_context_buf() to the user so he can obtain a string representation of the internal state for logging at any time he requires. Change-Id: Id3e3cf1605dec84077b158c1c5715f8eef2641d5 --- M host/include/osmocom/simtrace2/apdu_dispatch.h M host/lib/apdu_dispatch.c 2 files changed, 16 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/31/16631/1 diff --git a/host/include/osmocom/simtrace2/apdu_dispatch.h b/host/include/osmocom/simtrace2/apdu_dispatch.h index af9c989..42a097a 100644 --- a/host/include/osmocom/simtrace2/apdu_dispatch.h +++ b/host/include/osmocom/simtrace2/apdu_dispatch.h @@ -1,6 +1,6 @@ /* apdu_dispatch - State machine to determine Rx/Tx phases of APDU * - * (C) 2016 by Harald Welte + * (C) 2016-2019 by Harald Welte * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -44,6 +44,8 @@ APDU_ACT_RX_MORE_CAPDU_FROM_READER = 0x0002, }; +const char *osmo_apdu_dump_context_buf(char *buf, unsigned int buf_len, + const struct osmo_apdu_context *ac); int osmo_apdu_segment_in(struct osmo_apdu_context *ac, const uint8_t *apdu_buf, unsigned int apdu_len, bool new_apdu); diff --git a/host/lib/apdu_dispatch.c b/host/lib/apdu_dispatch.c index 835b8bc..ec368b2 100644 --- a/host/lib/apdu_dispatch.c +++ b/host/lib/apdu_dispatch.c @@ -42,7 +42,7 @@ return (ac->le.tot == ac->le.cur); } -static const char *dump_apdu_hdr(const struct osim_apdu_cmd_hdr *h) +static const char *stringify_apdu_hdr(const struct osim_apdu_cmd_hdr *h) { static char buf[256]; sprintf(buf, "CLA=%02x INS=%02x P1=%02x P2=%02x P3=%02x", @@ -51,12 +51,19 @@ return buf; } -static void dump_apdu_ctx(const struct osmo_apdu_context *ac) +/*! generate string representation of APDU context in specified output buffer. + * \param[in] buf output string buffer provided by caller + * \param[in] buf_len size of buf in bytes + * \param[in] ac APDU context to dump in buffer + * \returns pointer to buf on success */ +const char *osmo_apdu_dump_context_buf(char *buf, unsigned int buf_len, + const struct osmo_apdu_context *ac) { - printf("%s; case=%d, lc=%d(%d), le=%d(%d)\n", - dump_apdu_hdr(&ac->hdr), ac->apdu_case, - ac->lc.tot, ac->lc.cur, - ac->le.tot, ac->le.cur); + snprintf(buf, buf_len, "%s; case=%d, lc=%d(%d), le=%d(%d)\n", + stringify_apdu_hdr(&ac->hdr), ac->apdu_case, + ac->lc.tot, ac->lc.cur, + ac->le.tot, ac->le.cur); + return buf; } /*! \brief input function for APDU segmentation @@ -168,7 +175,5 @@ return -1; } - dump_apdu_ctx(ac); - return rc; } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Id3e3cf1605dec84077b158c1c5715f8eef2641d5 Gerrit-Change-Number: 16631 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 00:59:41 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 00:59:41 +0000 Subject: Change in simtrace2[master]: card_emu: Always print state names in string representation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16615 ) Change subject: card_emu: Always print state names in string representation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I81469e40f3720afdcb47048b45c63d6474887640 Gerrit-Change-Number: 16615 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 00:59:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 00:59:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 00:59:47 +0000 Subject: Change in simtrace2[master]: card_emu: Remove extraneous code In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16603 ) Change subject: card_emu: Remove extraneous code ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2a2b4d64c40264623313a867957ffcefe57748f9 Gerrit-Change-Number: 16603 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 00:59:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:00:10 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:00:10 +0000 Subject: Change in simtrace2[master]: cardem: Make card_emu_report_status() optionally use IRQ endpoint In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16616 ) Change subject: cardem: Make card_emu_report_status() optionally use IRQ endpoint ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I83db4463b7010ba243a8adbda3ac9393975b4814 Gerrit-Change-Number: 16616 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 01:00:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:00:24 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:00:24 +0000 Subject: Change in simtrace2[master]: cardem: Add SIMTRACE_MSGT_BD_CEMU_CONFIG In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16617 ) Change subject: cardem: Add SIMTRACE_MSGT_BD_CEMU_CONFIG ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I7cdd3f9171dbed45de0089defe29d2b59044bd84 Gerrit-Change-Number: 16617 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 01:00:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:00:34 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:00:34 +0000 Subject: Change in simtrace2[master]: cardem: Implement support for CEMU_FEAT_F_STATUS_IRQ In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16618 ) Change subject: cardem: Implement support for CEMU_FEAT_F_STATUS_IRQ ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I832b4ac4aeb6152195d985067ffdd64fa5a7d4cc Gerrit-Change-Number: 16618 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 01:00:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:00:38 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:00:38 +0000 Subject: Change in simtrace2[master]: card_emu: Always print state names in string representation In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16615 ) Change subject: card_emu: Always print state names in string representation ...................................................................... card_emu: Always print state names in string representation Change-Id: I81469e40f3720afdcb47048b45c63d6474887640 --- M firmware/libcommon/source/card_emu.c 1 file changed, 27 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 34fac1b..4c29d41 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -110,6 +110,22 @@ PTS_S_WAIT_RESP_PCK = PTS_S_WAIT_REQ_PCK | 0x10, }; +const struct value_string pts_state_names[] = { + { PTS_S_WAIT_REQ_PTSS, "WAIT_REQ_PTSS" }, + { PTS_S_WAIT_REQ_PTS0, "WAIT_REQ_PTS0" }, + { PTS_S_WAIT_REQ_PTS1, "WAIT_REQ_PTS1" }, + { PTS_S_WAIT_REQ_PTS2, "WAIT_REQ_PTS2" }, + { PTS_S_WAIT_REQ_PTS3, "WAIT_REQ_PTS3" }, + { PTS_S_WAIT_REQ_PCK, "WAIT_REQ_PCK" }, + { PTS_S_WAIT_RESP_PTSS, "WAIT_RESP_PTSS" }, + { PTS_S_WAIT_RESP_PTS0, "WAIT_RESP_PTS0" }, + { PTS_S_WAIT_RESP_PTS1, "WAIT_RESP_PTS1" }, + { PTS_S_WAIT_RESP_PTS2, "WAIT_RESP_PTS2" }, + { PTS_S_WAIT_RESP_PTS3, "WAIT_RESP_PTS3" }, + { PTS_S_WAIT_RESP_PCK, "WAIT_RESP_PCK" }, + { 0, NULL } +}; + /* PTS field byte index */ #define _PTSS 0 #define _PTS0 1 @@ -542,8 +558,9 @@ /* Update the PTS sub-state */ static void set_pts_state(struct card_handle *ch, enum pts_state new_ptss) { - TRACE_DEBUG("%u: 7816 PTS state %u -> %u\r\n", - ch->num, ch->pts.state, new_ptss); + TRACE_DEBUG("%u: 7816 PTS state %s -> %s\r\n", ch->num, + get_value_string(pts_state_names, ch->pts.state), + get_value_string(pts_state_names, new_ptss)); ch->pts.state = new_ptss; } @@ -623,8 +640,8 @@ memcpy(ch->pts.resp, ch->pts.req, sizeof(ch->pts.resp)); break; default: - TRACE_ERROR("%u: process_byte_pts() in invalid state %u\r\n", - ch->num, ch->pts.state); + TRACE_ERROR("%u: process_byte_pts() in invalid PTS state %s\r\n", ch->num, + get_value_string(pts_state_names, ch->pts.state)); break; } /* calculate the next state and set it */ @@ -674,8 +691,8 @@ byte = ch->pts.resp[_PCK]; break; default: - TRACE_ERROR("%u: get_byte_pts() in invalid state %u\r\n", - ch->num, ch->pts.state); + TRACE_ERROR("%u: get_byte_pts() in invalid PTS state %s\r\n", ch->num, + get_value_string(pts_state_names, ch->pts.state)); return 0; } @@ -880,8 +897,8 @@ add_tpdu_byte(ch, byte); break; default: - TRACE_ERROR("%u: process_byte_tpdu() in invalid state %u\r\n", - ch->num, ch->tpdu.state); + TRACE_ERROR("%u: process_byte_tpdu() in invalid TPDU state %s\r\n", ch->num, + get_value_string(tpdu_state_names, ch->tpdu.state)); } /* ensure we stay in TPDU ISO state */ @@ -982,8 +999,8 @@ new_state = process_byte_pts(ch, byte); goto out_silent; default: - TRACE_ERROR("%u: Received UART char in invalid 7816 state " - "%u\r\n", ch->num, ch->state); + TRACE_ERROR("%u: Received UART char in invalid 7816 state %s\r\n", ch->num, + get_value_string(iso7816_3_card_state_names, ch->state)); break; } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I81469e40f3720afdcb47048b45c63d6474887640 Gerrit-Change-Number: 16615 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:00:38 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:00:38 +0000 Subject: Change in simtrace2[master]: card_emu: Remove extraneous code In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16603 ) Change subject: card_emu: Remove extraneous code ...................................................................... card_emu: Remove extraneous code card_set_state(ch, ISO_S_WAIT_ATR) internally calls tc_etu_enable(), so there's no need for the caller to do the same, too. Change-Id: I2a2b4d64c40264623313a867957ffcefe57748f9 --- M firmware/libcommon/source/card_emu.c 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 4c29d41..5488fad 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -453,7 +453,7 @@ * since the initial ETU is Fd=372/Dd=1 clock cycles long, we have to wait 2-107 ETU. */ tc_etu_set_wtime(ch->tc_chan, 2); - /* ensure the TC_ETU timer is enabled */ + /* enable the TC/ETU counter once reset has been released */ tc_etu_enable(ch->tc_chan); break; case ISO_S_IN_ATR: @@ -1129,8 +1129,6 @@ /* check end activation state (even if the reader does * not respect the activation sequence) */ if (ch->vcc_active && ch->clocked && !ch->in_reset) { - /* enable the TC/ETU counter once reset has been released */ - tc_etu_enable(ch->tc_chan); /* prepare to send the ATR */ card_set_state(ch, ISO_S_WAIT_ATR); } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2a2b4d64c40264623313a867957ffcefe57748f9 Gerrit-Change-Number: 16603 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:00:40 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:00:40 +0000 Subject: Change in simtrace2[master]: cardem: Implement support for CEMU_FEAT_F_STATUS_IRQ In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16618 ) Change subject: cardem: Implement support for CEMU_FEAT_F_STATUS_IRQ ...................................................................... cardem: Implement support for CEMU_FEAT_F_STATUS_IRQ If this feature flag is set by the host application, we will start generating SIMTRACE_MSGT_BD_CEMU_STATUS towards the interrupt endpoint on any changes to the SIM card status, such as change of VCC/CLK/RST Change-Id: I832b4ac4aeb6152195d985067ffdd64fa5a7d4cc Related: OS#4330 --- M firmware/libcommon/source/card_emu.c 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 8da844f..7a541e5 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -38,7 +38,7 @@ #define NUM_SLOTS 2 /* bit-mask of supported CEMU_FEAT_F_ flags */ -#define SUPPORTED_FEATURES 0 +#define SUPPORTED_FEATURES (CEMU_FEAT_F_STATUS_IRQ) #define ISO7816_3_INIT_WTIME 9600 #define ISO7816_3_DEFAULT_WI 10 @@ -1106,15 +1106,19 @@ /* hardware driver informs us that a card I/O signal has changed */ void card_emu_io_statechg(struct card_handle *ch, enum card_io io, int active) { + uint32_t chg_mask = 0; + switch (io) { case CARD_IO_VCC: if (active == 0 && ch->vcc_active == 1) { TRACE_INFO("%u: VCC deactivated\r\n", ch->num); card_handle_reset(ch); card_set_state(ch, ISO_S_WAIT_POWER); + chg_mask |= CEMU_STATUS_F_VCC_PRESENT; } else if (active == 1 && ch->vcc_active == 0) { TRACE_INFO("%u: VCC activated\r\n", ch->num); card_set_state(ch, ISO_S_WAIT_CLK); + chg_mask |= CEMU_STATUS_F_VCC_PRESENT; } ch->vcc_active = active; break; @@ -1123,8 +1127,10 @@ TRACE_INFO("%u: CLK activated\r\n", ch->num); if (ch->state == ISO_S_WAIT_CLK) card_set_state(ch, ISO_S_WAIT_RST); + chg_mask |= CEMU_STATUS_F_CLK_ACTIVE; } else if (active == 0 && ch->clocked == 1) { TRACE_INFO("%u: CLK deactivated\r\n", ch->num); + chg_mask |= CEMU_STATUS_F_CLK_ACTIVE; } ch->clocked = active; break; @@ -1137,9 +1143,11 @@ /* prepare to send the ATR */ card_set_state(ch, ISO_S_WAIT_ATR); } + chg_mask |= CEMU_STATUS_F_RESET_ACTIVE; } else if (active && !ch->in_reset) { TRACE_INFO("%u: RST asserted\r\n", ch->num); card_handle_reset(ch); + chg_mask |= CEMU_STATUS_F_RESET_ACTIVE; } ch->in_reset = active; break; @@ -1159,6 +1167,10 @@ default: break; } + + /* notify the host about the state change */ + if ((ch->features & CEMU_FEAT_F_STATUS_IRQ) && chg_mask) + card_emu_report_status(ch, true); } /* User sets a new ATR to be returned during next card reset */ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I832b4ac4aeb6152195d985067ffdd64fa5a7d4cc Gerrit-Change-Number: 16618 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:00:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:00:39 +0000 Subject: Change in simtrace2[master]: card_emu: Remove extraneous initialization of ch->pts.state In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16605 ) Change subject: card_emu: Remove extraneous initialization of ch->pts.state ...................................................................... card_emu: Remove extraneous initialization of ch->pts.state ch->pts.state is initialized every time we enter ISO_S_WAIT_TPDU state, so there's no need to reset it at other locations. KISS. Change-Id: I5ff8b2671c3c893cc5f6542d48b65487ae8c5be1 --- M firmware/libcommon/source/card_emu.c 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 5488fad..ced6b14 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -256,8 +256,6 @@ tc_etu_disable(ch->tc_chan); - ch->tpdu.state = TPDU_S_WAIT_CLA; - /* release any buffers we may still own */ if (ch->uart_tx_msg) { usb_buf_free(ch->uart_tx_msg); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I5ff8b2671c3c893cc5f6542d48b65487ae8c5be1 Gerrit-Change-Number: 16605 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:00:40 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:00:40 +0000 Subject: Change in simtrace2[master]: cardem: Add SIMTRACE_MSGT_BD_CEMU_CONFIG In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16617 ) Change subject: cardem: Add SIMTRACE_MSGT_BD_CEMU_CONFIG ...................................................................... cardem: Add SIMTRACE_MSGT_BD_CEMU_CONFIG The new SIMTRACE_MSGT_BD_CEMU_CONFIG command can be used to set/change a bitmask of optional features that can be enabled in the simtrace by the host software. This is useful for enabling features in the firmware which are not supported by older host utilities. The firmware will return the actually set/configured features in response. The feature bitmask is not yet used anywhere; it will be by subequent patches. Change-Id: I7cdd3f9171dbed45de0089defe29d2b59044bd84 --- M firmware/libcommon/include/card_emu.h M firmware/libcommon/include/simtrace_prot.h M firmware/libcommon/source/card_emu.c M firmware/libcommon/source/mode_cardemu.c 4 files changed, 54 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/include/card_emu.h b/firmware/libcommon/include/card_emu.h index aaa07c5..8a73d5c 100644 --- a/firmware/libcommon/include/card_emu.h +++ b/firmware/libcommon/include/card_emu.h @@ -66,3 +66,7 @@ void card_emu_uart_enable(uint8_t uart_chan, uint8_t rxtx); void card_emu_uart_wait_tx_idle(uint8_t uart_chan); void card_emu_uart_interrupt(uint8_t uart_chan); + +struct cardemu_usb_msg_config; +int card_emu_set_config(struct card_handle *ch, const struct cardemu_usb_msg_config *scfg, + unsigned int scfg_len); diff --git a/firmware/libcommon/include/simtrace_prot.h b/firmware/libcommon/include/simtrace_prot.h index 878bc34..eca844a 100644 --- a/firmware/libcommon/include/simtrace_prot.h +++ b/firmware/libcommon/include/simtrace_prot.h @@ -62,6 +62,8 @@ SIMTRACE_MSGT_DO_CEMU_RX_DATA, /* Indicate PTS request from phone */ SIMTRACE_MSGT_DO_CEMU_PTS, + /* Set configurable parameters */ + SIMTRACE_MSGT_BD_CEMU_CONFIG, }; /* SIMTRACE_MSGC_MODEM */ @@ -254,6 +256,15 @@ uint8_t msg[0]; } __attribute__ ((packed)); +/* enable/disable the generation of DO_STATUS on IRQ endpoint */ +#define CEMU_FEAT_F_STATUS_IRQ 0x00000001 + +/* SIMTRACE_MSGT_BD_CEMU_CONFIG */ +struct cardemu_usb_msg_config { + /* bit-mask of CEMU_FEAT_F flags */ + uint32_t features; +} __attribute__ ((packed)); + /*********************************************************************** * MODEM CONTROL ***********************************************************************/ diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 352284f..8da844f 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -37,6 +37,9 @@ #define NUM_SLOTS 2 +/* bit-mask of supported CEMU_FEAT_F_ flags */ +#define SUPPORTED_FEATURES 0 + #define ISO7816_3_INIT_WTIME 9600 #define ISO7816_3_DEFAULT_WI 10 #define ISO7816_3_ATR_LEN_MAX (1+32) /* TS plus 32 chars */ @@ -195,6 +198,9 @@ struct card_handle { unsigned int num; + /* bit-mask of enabled optional features (CEMU_FEAT_F_*) */ + uint32_t features; + enum iso7816_3_card_state state; /* signal levels */ @@ -1081,6 +1087,22 @@ usb_buf_upd_len_and_submit(msg); } +static void card_emu_report_config(struct card_handle *ch) +{ + struct msgb *msg; + struct cardemu_usb_msg_config *cfg; + uint8_t ep = ch->in_ep; + + msg = usb_buf_alloc_st(ch->in_ep, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_BD_CEMU_CONFIG); + if (!msg) + return; + + cfg = (struct cardemu_usb_msg_config *) msgb_put(msg, sizeof(*cfg)); + cfg->features = ch->features; + + usb_buf_upd_len_and_submit(msg); +} + /* hardware driver informs us that a card I/O signal has changed */ void card_emu_io_statechg(struct card_handle *ch, enum card_io io, int active) { @@ -1204,6 +1226,18 @@ static struct card_handle card_handles[NUM_SLOTS]; +int card_emu_set_config(struct card_handle *ch, const struct cardemu_usb_msg_config *scfg, + unsigned int scfg_len) +{ + if (scfg_len >= sizeof(uint32_t)) + ch->features = (scfg->features & SUPPORTED_FEATURES); + + /* send back a report of our current configuration */ + card_emu_report_config(ch); + + return 0; +} + struct card_handle *card_emu_init(uint8_t slot_num, uint8_t tc_chan, uint8_t uart_chan, uint8_t in_ep, uint8_t irq_ep, bool vcc_active, bool in_reset, bool clocked) { struct card_handle *ch; diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c index fbc042f..c5c173f 100644 --- a/firmware/libcommon/source/mode_cardemu.c +++ b/firmware/libcommon/source/mode_cardemu.c @@ -507,6 +507,7 @@ struct simtrace_msg_hdr *hdr; struct cardemu_usb_msg_set_atr *atr; struct cardemu_usb_msg_cardinsert *cardins; + struct cardemu_usb_msg_config *cfg; struct llist_head *queue; hdr = (struct simtrace_msg_hdr *) msg->l1h; @@ -541,6 +542,10 @@ card_emu_report_status(ci->ch, false); usb_buf_free(msg); break; + case SIMTRACE_MSGT_BD_CEMU_CONFIG: + cfg = (struct cardemu_usb_msg_config *) msg->l2h; + card_emu_set_config(ci->ch, cfg, msgb_l2len(msg)); + break; case SIMTRACE_MSGT_BD_CEMU_STATS: default: /* FIXME: Send Error */ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I7cdd3f9171dbed45de0089defe29d2b59044bd84 Gerrit-Change-Number: 16617 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:00:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:00:39 +0000 Subject: Change in simtrace2[master]: cardem: Make card_emu_report_status() optionally use IRQ endpoint In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16616 ) Change subject: cardem: Make card_emu_report_status() optionally use IRQ endpoint ...................................................................... cardem: Make card_emu_report_status() optionally use IRQ endpoint This just introduces the capability to report on IRQ, but we don't actually use it yet. Change-Id: I83db4463b7010ba243a8adbda3ac9393975b4814 --- M firmware/libcommon/include/card_emu.h M firmware/libcommon/include/simtrace_usb.h M firmware/libcommon/source/card_emu.c M firmware/libcommon/source/mode_cardemu.c 4 files changed, 9 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/include/card_emu.h b/firmware/libcommon/include/card_emu.h index e545593..aaa07c5 100644 --- a/firmware/libcommon/include/card_emu.h +++ b/firmware/libcommon/include/card_emu.h @@ -56,7 +56,7 @@ struct llist_head *card_emu_get_uart_tx_queue(struct card_handle *ch); void card_emu_have_new_uart_tx(struct card_handle *ch); -void card_emu_report_status(struct card_handle *ch); +void card_emu_report_status(struct card_handle *ch, bool report_on_irq); #define ENABLE_TX 0x01 #define ENABLE_RX 0x02 diff --git a/firmware/libcommon/include/simtrace_usb.h b/firmware/libcommon/include/simtrace_usb.h index c0da9c5..be2da9f 100644 --- a/firmware/libcommon/include/simtrace_usb.h +++ b/firmware/libcommon/include/simtrace_usb.h @@ -64,4 +64,4 @@ #define SIMTRACE_CARDEM_USB_EP_USIM2_INT 3 /*! Maximum number of endpoints */ -#define BOARD_USB_NUMENDPOINTS 6 +#define BOARD_USB_NUMENDPOINTS 7 /* 0 (control) + 2 (interfaces) * 3 (endpoints) */ diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index ced6b14..352284f 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -1051,13 +1051,16 @@ } } -void card_emu_report_status(struct card_handle *ch) +void card_emu_report_status(struct card_handle *ch, bool report_on_irq) { struct msgb *msg; struct cardemu_usb_msg_status *sts; + uint8_t ep = ch->in_ep; - msg = usb_buf_alloc_st(ch->in_ep, SIMTRACE_MSGC_CARDEM, - SIMTRACE_MSGT_BD_CEMU_STATUS); + if (report_on_irq) + ep = ch->irq_ep; + + msg = usb_buf_alloc_st(ep, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_BD_CEMU_STATUS); if (!msg) return; diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c index 1d074cb..fbc042f 100644 --- a/firmware/libcommon/source/mode_cardemu.c +++ b/firmware/libcommon/source/mode_cardemu.c @@ -538,7 +538,7 @@ usb_buf_free(msg); break; case SIMTRACE_MSGT_BD_CEMU_STATUS: - card_emu_report_status(ci->ch); + card_emu_report_status(ci->ch, false); usb_buf_free(msg); break; case SIMTRACE_MSGT_BD_CEMU_STATS: -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I83db4463b7010ba243a8adbda3ac9393975b4814 Gerrit-Change-Number: 16616 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:01:02 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:01:02 +0000 Subject: Change in libosmocore[master]: libosmocore libusb integration In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16606 ) Change subject: libosmocore libusb integration ...................................................................... libosmocore libusb integration Osmocom applications typically use libosmocore select.[ch] event loop code as their main event dispatch mechanism. When they want to deal with libusb in a non-blocking/asynchronous way, they need to integrate libusb into that select(). The new libosmousb is doing exactly that: Providing a shared utility library for Osmocom programs that wish to use libusb. This is useful for example in simtrace2 host utilitie as well as osmo-e1d. Change-Id: I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3 Closes: OS#4299 --- M Makefile.am M configure.ac M contrib/jenkins_arm.sh M debian/control A debian/libosmousb0.install M include/Makefile.am A include/osmocom/usb/libusb.h A libosmousb.pc.in A src/usb/Makefile.am A src/usb/osmo_libusb.c 10 files changed, 218 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 7b6ba0a..7390f98 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,12 @@ ACLOCAL_AMFLAGS = -I m4 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -SUBDIRS = include src src/vty src/codec src/gsm src/coding src/gb src/ctrl src/sim src/pseudotalloc utils tests +SUBDIRS = include src src/vty src/codec src/gsm src/coding src/gb src/ctrl src/sim src/pseudotalloc src/usb utils tests pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc \ - libosmogb.pc libosmoctrl.pc libosmocoding.pc libosmosim.pc + libosmogb.pc libosmoctrl.pc libosmocoding.pc libosmosim.pc \ + libosmousb.pc aclocaldir = $(datadir)/aclocal dist_aclocal_DATA = m4/osmo_ac_code_coverage.m4 \ diff --git a/configure.ac b/configure.ac index 060d081..e45ec9f 100644 --- a/configure.ac +++ b/configure.ac @@ -146,6 +146,19 @@ AM_CONDITIONAL(ENABLE_PCSC, test "x$ENABLE_PCSC" = "xyes") AC_SUBST(ENABLE_PCSC) +AC_ARG_ENABLE([libusb], [AS_HELP_STRING([--disable-libusb], [Build without libusb support])], + [ + ENABLE_LIBUSB=$enableval + ], + [ + ENABLE_LIBUSB="yes" + ]) +AS_IF([test "x$ENABLE_LIBUSB" = "xyes"], [ + PKG_CHECK_MODULES(LIBUSB, libusb-1.0) +]) +AM_CONDITIONAL(ENABLE_LIBUSB, test "x$ENABLE_LIBUSB" = "xyes") +AC_SUBST(ENABLE_LIBUSB) + AC_ARG_ENABLE([gnutls], [AS_HELP_STRING([--disable-gnutls], [Do not use GnuTLS fallback for missing getrandom()])], [ENABLE_GNUTLS=$enableval], [ENABLE_GNUTLS="yes"]) AM_CONDITIONAL(ENABLE_GNUTLS, test x"$ENABLE_GNUTLS" = x"yes") @@ -398,12 +411,14 @@ libosmogb.pc libosmoctrl.pc libosmosim.pc + libosmousb.pc include/Makefile src/Makefile src/vty/Makefile src/codec/Makefile src/coding/Makefile src/sim/Makefile + src/usb/Makefile src/gsm/Makefile src/gb/Makefile src/ctrl/Makefile diff --git a/contrib/jenkins_arm.sh b/contrib/jenkins_arm.sh index 8ee90f0..c9cd922 100755 --- a/contrib/jenkins_arm.sh +++ b/contrib/jenkins_arm.sh @@ -19,6 +19,7 @@ --disable-doxygen \ --disable-shared \ --disable-libsctp \ + --disable-libusb \ --enable-external-tests \ CFLAGS="-Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs $WERROR_FLAGS" diff --git a/debian/control b/debian/control index cf7a853..d2c232f 100644 --- a/debian/control +++ b/debian/control @@ -34,6 +34,7 @@ libosmovty4 (= ${binary:Version}), libosmoctrl0 (= ${binary:Version}), libosmosim0 (= ${binary:Version}), + libosmousb0 (= ${binary:Version}), ${misc:Depends} Description: Open Source MObile COMmunications CORE library (metapackage) The libraries provided by this package contain various utility functions. @@ -293,6 +294,23 @@ . The libosmosim library in particular contains routines for SIM card access. +Package: libosmousb0 +Section: libs +Architecture: any +Multi-Arch: same +Depends: ${shlibs:Depends}, + ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Description: Osmo USB library + This is part of the libosmocore "meta"-library. The libosmocore library + contains various utility functions that were originally developed as part of + the OpenBSC project, but which are of a more generic nature and thus useful to + (at least) other programs that are developed in the sphere of Free Software / + Open Source mobile communication. + . + The libosmosub library in particular contains routines for USB device access + via libusb-1.0, integrated into the libosmocore select event loop. + Package: libosmocore-dev Architecture: any Multi-Arch: same diff --git a/debian/libosmousb0.install b/debian/libosmousb0.install new file mode 100644 index 0000000..4031b9f --- /dev/null +++ b/debian/libosmousb0.install @@ -0,0 +1 @@ +usr/lib/*/libosmousb*.so.* diff --git a/include/Makefile.am b/include/Makefile.am index d76addd..dc6eaa7 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -164,6 +164,11 @@ osmocom/ctrl/control_vty.h endif +if ENABLE_LIBUSB +nobase_include_HEADERS += \ + osmocom/usb/libusb.h +endif + noinst_HEADERS = \ osmocom/gsm/kasumi.h \ osmocom/gsm/gea.h \ diff --git a/include/osmocom/usb/libusb.h b/include/osmocom/usb/libusb.h new file mode 100644 index 0000000..7f10f74 --- /dev/null +++ b/include/osmocom/usb/libusb.h @@ -0,0 +1,6 @@ +#pragma once + +#include + +int osmo_libusb_init(libusb_context **luctx); +void osmo_libusb_exit(libusb_context *luctx); diff --git a/libosmousb.pc.in b/libosmousb.pc.in new file mode 100644 index 0000000..ce6d271 --- /dev/null +++ b/libosmousb.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: Osmocom libusb (USB) integration +Description: C Utility Library +Version: @VERSION@ +Libs: -L${libdir} @TALLOC_LIBS@ -losmousb -losmocore +Cflags: -I${includedir}/ + diff --git a/src/usb/Makefile.am b/src/usb/Makefile.am new file mode 100644 index 0000000..bca39bf --- /dev/null +++ b/src/usb/Makefile.am @@ -0,0 +1,21 @@ +# This is _NOT_ the library release version, it's an API version. +# Please read chapter "Library interface versions" of the libtool documentation +# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html +LIBVERSION=0:0:0 + +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CFLAGS = -fPIC -Wall $(LIBUSB_CFLAGS) $(TALLOC_CFLAGS) +AM_LDFLAGS = $(COVERAGE_LDFLAGS) + +if ENABLE_LIBUSB + +lib_LTLIBRARIES = libosmousb.la + +libosmousb_la_SOURCES = osmo_libusb.c +libosmosim_la_LDFLAGS = -version-info $(LIBVERSION) +libosmosim_la_LIBADD = \ + $(top_builddir)/src/libosmocore.la \ + $(TALLOC_LIBS) \ + $(LIBUSB_LIBS) + +endif diff --git a/src/usb/osmo_libusb.c b/src/usb/osmo_libusb.c new file mode 100644 index 0000000..fda9573 --- /dev/null +++ b/src/usb/osmo_libusb.c @@ -0,0 +1,137 @@ +/* libosmocore integration with libusb-1.0 + * + * (C) 2019 by Harald Welte + * All Rights Reserved. + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include + +/*********************************************************************** + * logging integration + ***********************************************************************/ + +#define DLUSB DLINP + +#ifdef LIBUSB_LOG_CB_CONTEXT /* introduced in 1.0.23 */ +static const int usb2logl[] = { + [LIBUSB_LOG_LEVEL_NONE] = LOGL_FATAL, + [LIBUSB_LOG_LEVEL_ERROR] = LOGL_ERROR, + [LIBUSB_LOG_LEVEL_WARNING] = LOGL_NOTICE, + [LIBUSB_LOG_LEVEL_INFO] = LOGL_INFO, + [LIBUSB_LOG_LEVEL_DEBUG] = LOGL_DEBUG, +}; + +/* called by libusb if it wants to log something */ +static void libosmo_usb_log_cb(libusb_context *luctx, enum libusb_log_level level_usb, const char *str) +{ + int level = LOGL_NOTICE; + + if (level_usb < ARRAY_SIZE(usb2logl)) + level = usb2logl[level_usb]; + + LOGP(DLUSB, level, "%s", str); +} +#endif /* LIBUSB_LOG_CB_CONTEXT */ + +/*********************************************************************** + * select loop integration + ***********************************************************************/ + +static int osmo_usb_fd_cb(struct osmo_fd *ofd, unsigned int what) +{ + libusb_context *luctx = ofd->data; + + /* we assume that we're running Linux v2.6.27 with timerfd support here + * and hence don't have to perform manual timeout handling. See + * "Notes on time-based events" at + * http://libusb.sourceforge.net/api-1.0/group__libusb__poll.html */ + struct timeval zero_tv = { 0, 0 }; + libusb_handle_events_timeout(luctx, &zero_tv); + + return 0; +} + +/* called by libusb if it wants to add a file-descriptor */ +static void osmo_usb_added_cb(int fd, short events, void *user_data) +{ + struct osmo_fd *ofd = talloc_zero(OTC_GLOBAL, struct osmo_fd); + libusb_context *luctx = user_data; + unsigned int when = 0; + + if (events & POLLIN) + when |= OSMO_FD_READ; + if (events & POLLOUT) + when |= OSMO_FD_WRITE; + + osmo_fd_setup(ofd, fd, when, osmo_usb_fd_cb, luctx, 0); + osmo_fd_register(ofd); +} + +/* called by libusb if it wants to remove a file-descriptor */ +static void osmo_usb_removed_cb(int fd, void *user_data) +{ + struct osmo_fd *ofd = osmo_fd_get_by_fd(fd); + if (!fd) + return; + osmo_fd_unregister(ofd); + talloc_free(ofd); +} + + +/*********************************************************************** + * initialization + ***********************************************************************/ + +int osmo_libusb_init(libusb_context **pluctx) +{ + libusb_context *luctx = NULL; + int rc; + + rc = libusb_init(pluctx); + if (rc != 0) + return rc; + + if (pluctx) + luctx = *pluctx; + +#ifdef LIBUSB_LOG_CB_CONTEXT /* introduced in 1.0.23 */ + libusb_set_log_cb(luctx, &libosmo_usb_log_cb, LIBUSB_LOG_CB_CONTEXT); +#endif + + libusb_set_pollfd_notifiers(luctx, osmo_usb_added_cb, osmo_usb_removed_cb, luctx); + + return 0; +} + +void osmo_libusb_exit(libusb_context *luctx) +{ + /* we just assume libusb is cleaning up all the osmo_Fd's we've allocated */ + libusb_exit(luctx); +} -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3 Gerrit-Change-Number: 16606 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:01:00 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:01:00 +0000 Subject: Change in libosmocore[master]: usb: Import a variety of libusb utility functions from simtrace In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16607 ) Change subject: usb: Import a variety of libusb utility functions from simtrace ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c18b938e4e1ea5b8a521a386f00db3a7389e47a Gerrit-Change-Number: 16607 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 01:01:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:01:01 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:01:01 +0000 Subject: Change in libosmocore[master]: gprs_bssgp: Work around gcc-9 claiming "error=stringop-overflow" In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16608 ) Change subject: gprs_bssgp: Work around gcc-9 claiming "error=stringop-overflow" ...................................................................... gprs_bssgp: Work around gcc-9 claiming "error=stringop-overflow" gcc-9.2.1 issues the following errror when compiling with -Werror: In function ?tl16v_put?, inlined from ?tvlv_put? at ../../include/osmocom/gsm/tlv.h:156:9, inlined from ?tvlv_put? at ../../include/osmocom/gsm/tlv.h:147:24, inlined from ?msgb_tvlv_put? at ../../include/osmocom/gsm/tlv.h:223:9, inlined from ?bssgp_tx_paging? at gprs_bssgp.c:1250:2: ../../include/osmocom/gsm/tlv.h:131:2: error: ?memcpy? reading between 128 and 65535 bytes from a region of size 9 [-Werror=stringop-overflow=] 131 | memcpy(buf, val, len); | ^~~~~~~~~~~~~~~~~~~~~ Unfortunately I've not been able to work around it with some nice GCC #pragma GCC diagnostic ignored "-Wstringop-overflow" Change-Id: I22a0c399c6c00eaf87277002096a82844c9e198e --- M src/gb/gprs_bssgp.c M src/gb/gprs_bssgp_bss.c 2 files changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c index 896f1c5..38794c2 100644 --- a/src/gb/gprs_bssgp.c +++ b/src/gb/gprs_bssgp.c @@ -1178,6 +1178,7 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Warray-bounds" int imsi_len = gsm48_generate_mid_from_imsi(mi, dup->imsi); + OSMO_ASSERT(imsi_len <= GSM48_MID_MAX_SIZE); if (imsi_len > 2) msgb_tvlv_push(msg, BSSGP_IE_IMSI, imsi_len-2, mi+2); @@ -1247,6 +1248,7 @@ * mi[131], which is wrong */ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Warray-bounds" + OSMO_ASSERT(imsi_len <= GSM48_MID_MAX_SIZE); msgb_tvlv_put(msg, BSSGP_IE_IMSI, imsi_len-2, mi+2); #pragma GCC diagnostic pop /* DRX Parameters */ diff --git a/src/gb/gprs_bssgp_bss.c b/src/gb/gprs_bssgp_bss.c index f06c403..5c9d11c 100644 --- a/src/gb/gprs_bssgp_bss.c +++ b/src/gb/gprs_bssgp_bss.c @@ -189,6 +189,7 @@ * mi[131], which is wrong */ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Warray-bounds" + OSMO_ASSERT(imsi_len <= GSM48_MID_MAX_SIZE); /* strip the MI type and length values (2 bytes) */ if (imsi_len > 2) msgb_tvlv_put(msg, BSSGP_IE_IMSI, imsi_len-2, mi+2); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16608 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I22a0c399c6c00eaf87277002096a82844c9e198e Gerrit-Change-Number: 16608 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:01:02 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:01:02 +0000 Subject: Change in libosmocore[master]: usb: Import a variety of libusb utility functions from simtrace In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16607 ) Change subject: usb: Import a variety of libusb utility functions from simtrace ...................................................................... usb: Import a variety of libusb utility functions from simtrace Those functions were originally developed as part of simtrace; let's import them to libosmousb as they are truly generic. Change-Id: I2c18b938e4e1ea5b8a521a386f00db3a7389e47a Related: OS#4299 --- M include/osmocom/usb/libusb.h M src/usb/osmo_libusb.c 2 files changed, 452 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/usb/libusb.h b/include/osmocom/usb/libusb.h index 7f10f74..382c86e 100644 --- a/include/osmocom/usb/libusb.h +++ b/include/osmocom/usb/libusb.h @@ -1,6 +1,81 @@ #pragma once +/* libusb utilities + * + * (C) 2010-2019 by Harald Welte + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ #include +#define USB_MAX_PATH_LEN 20 + +struct dev_id { + uint16_t vendor_id; + uint16_t product_id; +}; + +/* structure describing a single matching interface found */ +struct usb_interface_match { + /* libusb device E*/ + libusb_device *usb_dev; + /* Vendor ID of the device running matching interface */ + uint16_t vendor; + /* Product ID of the device running matching interface */ + uint16_t product; + /* USB Bus Address */ + uint8_t addr; + /* physical path */ + char path[USB_MAX_PATH_LEN]; + /* configuration of matching interface */ + uint8_t configuration; + /* interface number of matching interface */ + uint8_t interface; + /* altsetting of matching interface */ + uint8_t altsetting; + /* bInterfaceClass of matching interface */ + uint8_t class; + /* bInterfaceSubClass of matching interface */ + uint8_t sub_class; + /* bInterfaceProtocol of matching interface */ + uint8_t protocol; + /* index of string descriptor of matching interface */ + uint8_t string_idx; +}; + + +char *osmo_libusb_dev_get_path_buf(char *buf, size_t bufsize, libusb_device *dev); +char *osmo_libusb_dev_get_path_c(void *ctx, libusb_device *dev); + +libusb_device **osmo_libusb_find_matching_usb_devs(void *ctx, struct libusb_context *luctx, + const struct dev_id *dev_ids); + +int osmo_libusb_dev_find_matching_interfaces(libusb_device *dev, int class, int sub_class, + int protocol, struct usb_interface_match *out, + unsigned int out_len); + +int osmo_libusb_find_matching_interfaces(libusb_context *luctx, const struct dev_id *dev_ids, + int class, int sub_class, int protocol, + struct usb_interface_match *out, unsigned int out_len); + +libusb_device_handle *osmo_libusb_open_claim_interface(void *ctx, libusb_context *luctx, + const struct usb_interface_match *ifm); + +int osmo_libusb_get_ep_addrs(libusb_device_handle *devh, unsigned int if_num, + uint8_t *out, uint8_t *in, uint8_t *irq); + + int osmo_libusb_init(libusb_context **luctx); void osmo_libusb_exit(libusb_context *luctx); diff --git a/src/usb/osmo_libusb.c b/src/usb/osmo_libusb.c index fda9573..5b012b8 100644 --- a/src/usb/osmo_libusb.c +++ b/src/usb/osmo_libusb.c @@ -1,6 +1,6 @@ /* libosmocore integration with libusb-1.0 * - * (C) 2019 by Harald Welte + * (C) 2019-2019 by Harald Welte * All Rights Reserved. * * SPDX-License-Identifier: GPL-2.0+ @@ -33,6 +33,8 @@ #include +#include + /*********************************************************************** * logging integration ***********************************************************************/ @@ -104,7 +106,381 @@ talloc_free(ofd); } +/*********************************************************************** + * utility functions + ***********************************************************************/ +/*! obtain the string representation of the USB device path of given device. + * \param[out] buf Output string buffer + * \param[in] bufsize Size of output string buffer in bytes + * \param[in] dev USB device whose bus path we want to obtain + * \returns pointer to 'buf' in case of success; NULL in case of error */ +char *osmo_libusb_dev_get_path_buf(char *buf, size_t bufsize, libusb_device *dev) +{ +#if (defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102) || \ + (defined(LIBUSBX_API_VERSION) && LIBUSBX_API_VERSION >= 0x01000102) + struct osmo_strbuf sb = { .buf = buf, .len = bufsize }; + uint8_t path[8]; + int r,j; + r = libusb_get_port_numbers(dev, path, sizeof(path)); + if (r > 0) { + OSMO_STRBUF_PRINTF(sb, "%d-%d", libusb_get_bus_number(dev), path[0]); + for (j = 1; j < r; j++){ + OSMO_STRBUF_PRINTF(sb, ".%d", path[j]); + } + } + return buf; +#else +# warning "libusb too old - building without USB path support!" + return NULL; +#endif +} + +/*! obtain the string representation of the USB device path of given device. + * \param[in] talloc context from which to dynamically allocate output string buffer + * \param[in] dev USB device whose bus path we want to obtain + * \returns pointer to 'buf' in case of success; NULL in case of error */ +char *osmo_libusb_dev_get_path_c(void *ctx, libusb_device *dev) +{ + char *buf = talloc_zero_size(ctx, USB_MAX_PATH_LEN); + if (!buf) + return NULL; + return osmo_libusb_dev_get_path_buf(buf, USB_MAX_PATH_LEN, dev); +} + +static int match_dev_id(const struct libusb_device_descriptor *desc, const struct dev_id *id) +{ + if ((desc->idVendor == id->vendor_id) && (desc->idProduct == id->product_id)) + return 1; + return 0; +} + +static int match_dev_ids(const struct libusb_device_descriptor *desc, const struct dev_id *ids) +{ + const struct dev_id *id; + + for (id = ids; id->vendor_id || id->product_id; id++) { + if (match_dev_id(desc, id)) + return 1; + } + return 0; +} + +/*! Find USB devices matching the specified list of USB VendorID/ProductIDs + * \param[in] ctx talloc context from which to allocate output data + * \param[in] luctx libusb context on which to operate + * \param[in] dev_ids zero-terminated array of VendorId/ProductId tuples + * \returns array of up to 256 libusb_device pointers; NULL in case of error */ +libusb_device **osmo_libusb_find_matching_usb_devs(void *ctx, struct libusb_context *luctx, + const struct dev_id *dev_ids) +{ + libusb_device **list; + libusb_device **out = talloc_zero_array(ctx, libusb_device *, 256); + libusb_device **cur = out; + unsigned int i; + int rc; + + if (!out) + return NULL; + + rc = libusb_get_device_list(luctx, &list); + if (rc <= 0) { + perror("No USB devices found"); + talloc_free(out); + return NULL; + } + + for (i = 0; list[i] != NULL; i++) { + struct libusb_device_descriptor dev_desc; + libusb_device *dev = list[i]; + + rc = libusb_get_device_descriptor(dev, &dev_desc); + if (rc < 0) { + perror("Couldn't get device descriptor\n"); + libusb_unref_device(dev); + continue; + } + + if (match_dev_ids(&dev_desc, dev_ids)) { + *cur = dev; + cur++; + /* overflow check */ + if (cur >= out + 256) + break; + } else + libusb_unref_device(dev); + } + if (cur == out) { + libusb_free_device_list(list, 1); + talloc_free(out); + return NULL; + } + + libusb_free_device_list(list, 0); + return out; +} + +/*! find a matching interface among all interfaces of the given USB device. + * \param[in] dev USB device in which we shall search + * \param[in] class USB Interface Class to look for + * \param[in] sub_class USB Interface Subclass to look for + * \param[in] protocol USB Interface Protocol to look for + * \param[out] out User-allocated array for storing matches + * \param[in] out_len Length of out array + * \returns number of matching interfaces; negative in case of error */ +int osmo_libusb_dev_find_matching_interfaces(libusb_device *dev, int class, int sub_class, + int protocol, struct usb_interface_match *out, + unsigned int out_len) +{ + struct libusb_device_descriptor dev_desc; + int rc, i, out_idx = 0; + uint8_t addr; + char pathbuf[USB_MAX_PATH_LEN]; + char *path; + + rc = libusb_get_device_descriptor(dev, &dev_desc); + if (rc < 0) { + perror("Couldn't get device descriptor\n"); + return -EIO; + } + + addr = libusb_get_device_address(dev); + path = osmo_libusb_dev_get_path_buf(pathbuf, sizeof(pathbuf), dev); + + /* iterate over all configurations */ + for (i = 0; i < dev_desc.bNumConfigurations; i++) { + struct libusb_config_descriptor *conf_desc; + int j; + + rc = libusb_get_config_descriptor(dev, i, &conf_desc); + if (rc < 0) { + fprintf(stderr, "Couldn't get config descriptor %u\n", i); + continue; + } + /* iterate over all interfaces */ + for (j = 0; j < conf_desc->bNumInterfaces; j++) { + const struct libusb_interface *intf = &conf_desc->interface[j]; + int k; + /* iterate over all alternate settings */ + for (k = 0; k < intf->num_altsetting; k++) { + const struct libusb_interface_descriptor *if_desc; + if_desc = &intf->altsetting[k]; + if (class >= 0 && if_desc->bInterfaceClass != class) + continue; + if (sub_class >= 0 && if_desc->bInterfaceSubClass != sub_class) + continue; + if (protocol >= 0 && if_desc->bInterfaceProtocol != protocol) + continue; + /* MATCH! */ + out[out_idx].usb_dev = dev; + out[out_idx].vendor = dev_desc.idVendor; + out[out_idx].product = dev_desc.idProduct; + out[out_idx].addr = addr; + strncpy(out[out_idx].path, path, sizeof(out[out_idx].path)-1); + out[out_idx].path[sizeof(out[out_idx].path)-1] = '\0'; + out[out_idx].configuration = conf_desc->bConfigurationValue; + out[out_idx].interface = if_desc->bInterfaceNumber; + out[out_idx].altsetting = if_desc->bAlternateSetting; + out[out_idx].class = if_desc->bInterfaceClass; + out[out_idx].sub_class = if_desc->bInterfaceSubClass; + out[out_idx].protocol = if_desc->bInterfaceProtocol; + out[out_idx].string_idx = if_desc->iInterface; + out_idx++; + if (out_idx >= out_len) + return out_idx; + } + } + } + return out_idx; +} + +/*! find matching interfaces among a list devices of specified VendorId/ProductID tuples. + * \param[in] luctx libusb context on which to operate + * \param[in] dev_ids zero-terminated array of VendorId/ProductId tuples + * \param[in] class USB Interface Class to look for + * \param[in] sub_class USB Interface Subclass to look for + * \param[in] protocol USB Interface Protocol to look for + * \param[out] out User-allocated array for storing matches + * \param[in] out_len Length of out array + * \returns number of matching interfaces; negative in case of error */ +int osmo_libusb_find_matching_interfaces(libusb_context *luctx, const struct dev_id *dev_ids, + int class, int sub_class, int protocol, + struct usb_interface_match *out, unsigned int out_len) +{ + struct usb_interface_match *out_cur = out; + unsigned int out_len_remain = out_len; + libusb_device **list; + libusb_device **dev; + + list = osmo_libusb_find_matching_usb_devs(NULL, luctx, dev_ids); + if (!list) + return 0; + + for (dev = list; *dev; dev++) { + int rc; + +#if 0 + struct libusb_device_descriptor dev_desc; + uint8_t ports[8]; + uint8_t addr; + rc = libusb_get_device_descriptor(*dev, &dev_desc); + if (rc < 0) { + perror("Cannot get device descriptor"); + continue; + } + + addr = libusb_get_device_address(*dev); + + rc = libusb_get_port_numbers(*dev, ports, sizeof(ports)); + if (rc < 0) { + perror("Cannot get device path"); + continue; + } + + printf("Found USB Device %04x:%04x at address %d\n", + dev_desc.idVendor, dev_desc.idProduct, addr); +#endif + + rc = osmo_libusb_dev_find_matching_interfaces(*dev, class, sub_class, + protocol, out_cur, out_len_remain); + if (rc < 0) + continue; + out_cur += rc; + out_len_remain -= rc; + + } + + /* unref / free list */ + for (dev = list; *dev; dev++) + libusb_unref_device(*dev); + talloc_free(list); + + return out_len - out_len_remain; +} + +/*! open matching USB device and claim interface + * \param[in] ctx talloc context to use for related allocations + * \param[in] luctx libusb context on which to operate + * \param[in] ifm interface match describing interface to claim + * \returns libusb device chandle on success; NULL on error */ +libusb_device_handle *osmo_libusb_open_claim_interface(void *ctx, libusb_context *luctx, + const struct usb_interface_match *ifm) +{ + int rc, config; + struct dev_id dev_ids[] = { { ifm->vendor, ifm->product }, { 0, 0 } }; + libusb_device **list; + libusb_device **dev; + libusb_device_handle *usb_devh = NULL; + + list = osmo_libusb_find_matching_usb_devs(ctx, luctx, dev_ids); + if (!list) { + perror("No USB device with matching VID/PID"); + return NULL; + } + + for (dev = list; *dev; dev++) { + int addr; + char pathbuf[USB_MAX_PATH_LEN]; + char *path; + + addr = libusb_get_device_address(*dev); + path = osmo_libusb_dev_get_path_buf(pathbuf, sizeof(pathbuf), *dev); + if ((ifm->addr && addr == ifm->addr) || + (strlen(ifm->path) && !strcmp(path, ifm->path))) { + rc = libusb_open(*dev, &usb_devh); + if (rc < 0) { + fprintf(stderr, "Cannot open device: %s\n", libusb_error_name(rc)); + usb_devh = NULL; + break; + } + rc = libusb_get_configuration(usb_devh, &config); + if (rc < 0) { + fprintf(stderr, "Cannot get current configuration: %s\n", libusb_error_name(rc)); + libusb_close(usb_devh); + usb_devh = NULL; + break; + } + if (config != ifm->configuration) { + rc = libusb_set_configuration(usb_devh, ifm->configuration); + if (rc < 0) { + fprintf(stderr, "Cannot set configuration: %s\n", libusb_error_name(rc)); + libusb_close(usb_devh); + usb_devh = NULL; + break; + } + } + rc = libusb_claim_interface(usb_devh, ifm->interface); + if (rc < 0) { + fprintf(stderr, "Cannot claim interface: %s\n", libusb_error_name(rc)); + libusb_close(usb_devh); + usb_devh = NULL; + break; + } + rc = libusb_set_interface_alt_setting(usb_devh, ifm->interface, ifm->altsetting); + if (rc < 0) { + fprintf(stderr, "Cannot set interface altsetting: %s\n", libusb_error_name(rc)); + libusb_release_interface(usb_devh, ifm->interface); + libusb_close(usb_devh); + usb_devh = NULL; + break; + } + } + } + + /* unref / free list */ + for (dev = list; *dev; dev++) + libusb_unref_device(*dev); + talloc_free(list); + + return usb_devh; +} + +/*! obtain the endpoint addresses for a given USB interface. + * \param[in] devh USB device handle on which to operate + * \param[in] if_num USB Interface number on which to operate + * \param[out] out user-provided storage for OUT endpoint number + * \param[out] in user-provided storage for IN endpoint number + * \param[out] irq user-provided storage for IRQ endpoint number + * \returns 0 in case of success; negative in case of error */ +int osmo_libusb_get_ep_addrs(libusb_device_handle *devh, unsigned int if_num, + uint8_t *out, uint8_t *in, uint8_t *irq) +{ + libusb_device *dev = libusb_get_device(devh); + struct libusb_config_descriptor *cdesc; + const struct libusb_interface_descriptor *idesc; + const struct libusb_interface *iface; + int rc, l; + + rc = libusb_get_active_config_descriptor(dev, &cdesc); + if (rc < 0) + return rc; + + iface = &cdesc->interface[if_num]; + /* FIXME: we assume there's no altsetting */ + idesc = &iface->altsetting[0]; + + for (l = 0; l < idesc->bNumEndpoints; l++) { + const struct libusb_endpoint_descriptor *edesc = &idesc->endpoint[l]; + switch (edesc->bmAttributes & 3) { + case LIBUSB_TRANSFER_TYPE_BULK: + if (edesc->bEndpointAddress & 0x80) { + if (in) + *in = edesc->bEndpointAddress; + } else { + if (out) + *out = edesc->bEndpointAddress; + } + break; + case LIBUSB_TRANSFER_TYPE_INTERRUPT: + if (irq) + *irq = edesc->bEndpointAddress; + break; + default: + break; + } + } + return 0; +} /*********************************************************************** * initialization ***********************************************************************/ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c18b938e4e1ea5b8a521a386f00db3a7389e47a Gerrit-Change-Number: 16607 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:00:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:00:57 +0000 Subject: Change in libosmocore[master]: libosmocore libusb integration In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16606 ) Change subject: libosmocore libusb integration ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3 Gerrit-Change-Number: 16606 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Tue, 17 Dec 2019 01:00:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:02:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:02:48 +0000 Subject: Change in osmo-remsim[master]: bankd: Introduce SIGMAPADD to tell worker about new mapping In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16595 ) Change subject: bankd: Introduce SIGMAPADD to tell worker about new mapping ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: If0130ab4b49ffcae6ab7a8b9926a6d9477eb3981 Gerrit-Change-Number: 16595 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 01:02:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:02:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:02:50 +0000 Subject: Change in osmo-remsim[master]: bankd: Factor out signal-sending from bankd_srvc_remove_mapping() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16594 ) Change subject: bankd: Factor out signal-sending from bankd_srvc_remove_mapping() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I86744554187d5bcee75592427990d404889f29fe Gerrit-Change-Number: 16594 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 01:02:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:03:03 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:03:03 +0000 Subject: Change in osmo-remsim[master]: bankd: Factor out signal-sending from bankd_srvc_remove_mapping() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16594 ) Change subject: bankd: Factor out signal-sending from bankd_srvc_remove_mapping() ...................................................................... bankd: Factor out signal-sending from bankd_srvc_remove_mapping() This way we can also deliver other signals to workers. Change-Id: I86744554187d5bcee75592427990d404889f29fe --- M src/bankd/bankd_main.c 1 file changed, 19 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 194baef..29a13ed 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -125,6 +125,24 @@ static bool terminate = false; +/* deliver given signal 'sig' to the firts worker matching bs and cs (if given) */ +static void send_signal_to_worker(const struct bank_slot *bs, const struct client_slot *cs, int sig) +{ + struct bankd_worker *worker; + pthread_mutex_lock(&g_bankd->workers_mutex); + llist_for_each_entry(worker, &g_bankd->workers, list) { + if (bs && (bs->bank_id != worker->slot.bank_id || bs->slot_nr != worker->slot.slot_nr)) + continue; + if (cs && (cs->client_id != worker->client.clslot.client_id || + cs->slot_nr != worker->client.clslot.slot_nr)) + continue; + + pthread_kill(worker->thread, sig); + break; + } + pthread_mutex_unlock(&g_bankd->workers_mutex); +} + /* Remove a mapping */ static void bankd_srvc_remove_mapping(struct slot_mapping *map) { @@ -133,16 +151,7 @@ slotmap_del(g_bankd->slotmaps, map); /* kill/reset the respective worker, if any! */ - struct bankd_worker *worker; - pthread_mutex_lock(&g_bankd->workers_mutex); - llist_for_each_entry(worker, &g_bankd->workers, list) { - if (bs.bank_id == worker->slot.bank_id && - bs.slot_nr == worker->slot.slot_nr) { - pthread_kill(worker->thread, SIGMAPDEL); - break; - } - } - pthread_mutex_unlock(&g_bankd->workers_mutex); + send_signal_to_worker(&bs, NULL, SIGMAPDEL); } /* handle incoming messages from server */ -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I86744554187d5bcee75592427990d404889f29fe Gerrit-Change-Number: 16594 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:03:03 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:03:03 +0000 Subject: Change in osmo-remsim[master]: bankd: Introduce SIGMAPADD to tell worker about new mapping In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16595 ) Change subject: bankd: Introduce SIGMAPADD to tell worker about new mapping ...................................................................... bankd: Introduce SIGMAPADD to tell worker about new mapping So far the wokrer used to sleep 10s and only check in those intervals if [finally] a mapping had arrived. Using SIGMAPADD, we can directly break the worker out of its select() call and hence make it pick up a new mapping instantaneously. This also makes RemsimBankd_Tests.TC_removeMapping_connected() pass Change-Id: If0130ab4b49ffcae6ab7a8b9926a6d9477eb3981 --- M src/bankd/bankd_main.c 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 29a13ed..af25ded 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -53,9 +53,11 @@ /* signal indicates to worker thread that its map has been deleted */ #define SIGMAPDEL SIGRTMIN+1 +#define SIGMAPADD SIGRTMIN+2 static void handle_sig_usr1(int sig); static void handle_sig_mapdel(int sig); +static void handle_sig_mapadd(int sig); __thread void *talloc_asn1_ctx; struct bankd *g_bankd; @@ -203,8 +205,10 @@ if (!map) { LOGPFSML(srvc->fi, LOGL_ERROR, "could not create slotmap\n"); resp = rspro_gen_CreateMappingRes(ResultCode_illegalSlotId); - } else + } else { + send_signal_to_worker(NULL, &cs, SIGMAPADD); resp = rspro_gen_CreateMappingRes(ResultCode_ok); + } } send_resp: server_conn_send_rspro(srvc, resp); @@ -359,6 +363,7 @@ g_bankd->main = pthread_self(); signal(SIGMAPDEL, handle_sig_mapdel); + signal(SIGMAPADD, handle_sig_mapadd); signal(SIGUSR1, handle_sig_usr1); /* Np lock or mutex required for the pcsc_slot_names list, as this is only @@ -448,6 +453,13 @@ } } +/* signal handler for receiving SIGMAPADD from main thread */ +static void handle_sig_mapadd(int sig) +{ + LOGW(g_worker, "SIGMAPADD received\n"); + /* do nothing */ +} + static void handle_sig_usr1(int sig) { OSMO_ASSERT(sig == SIGUSR1); @@ -769,6 +781,8 @@ if (rc == -1 && errno == EINTR) { if (worker->state == BW_ST_CONN_CLIENT_UNMAPPED) return -23; + else + worker_try_slotmap(worker); goto restart_wait; } else if (rc < 0) return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: If0130ab4b49ffcae6ab7a8b9926a6d9477eb3981 Gerrit-Change-Number: 16595 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:08:26 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:08:26 +0000 Subject: Change in osmo-remsim[master]: remsim_client: move to 'client' subdirectory; add --disable-remsim-cl... In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-remsim/+/16624 to look at the new patch set (#2). Change subject: remsim_client: move to 'client' subdirectory; add --disable-remsim-client ...................................................................... remsim_client: move to 'client' subdirectory; add --disable-remsim-client We already had the bankd and server in sub-directories and had their build conditional by ./configure flags. Let's do the same for the client. Change-Id: I7541a0b6c698896f3f039a1daa49d869e78b374f --- M configure.ac M src/Makefile.am M src/bankd/bankd.h A src/client/Makefile.am R src/client/client.h R src/client/remsim_client.c R src/client/simtrace2-remsim_client.c M src/rspro_client_fsm.c M src/rspro_client_fsm.h 9 files changed, 43 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/24/16624/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I7541a0b6c698896f3f039a1daa49d869e78b374f Gerrit-Change-Number: 16624 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:38:23 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:38:23 +0000 Subject: Change in osmo-ci[master]: implement osmo_source_subdir() for simtrace2 References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16632 ) Change subject: implement osmo_source_subdir() for simtrace2 ...................................................................... implement osmo_source_subdir() for simtrace2 Change-Id: I3afad11991d2e8bd72f44bed05f7204653e63133 --- M scripts/common.sh 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/32/16632/1 diff --git a/scripts/common.sh b/scripts/common.sh index 6d91101..6d28cfc 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -106,6 +106,9 @@ openbsc) echo "openbsc" ;; + simtrace2) + echo "host" + ;; esac } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16632 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3afad11991d2e8bd72f44bed05f7204653e63133 Gerrit-Change-Number: 16632 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:39:36 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:39:36 +0000 Subject: Change in osmo-ci[master]: implement osmo_source_subdir() for simtrace2 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16632 ) Change subject: implement osmo_source_subdir() for simtrace2 ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16632 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3afad11991d2e8bd72f44bed05f7204653e63133 Gerrit-Change-Number: 16632 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 01:39:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:39:38 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:39:38 +0000 Subject: Change in osmo-ci[master]: implement osmo_source_subdir() for simtrace2 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16632 ) Change subject: implement osmo_source_subdir() for simtrace2 ...................................................................... implement osmo_source_subdir() for simtrace2 Change-Id: I3afad11991d2e8bd72f44bed05f7204653e63133 --- M scripts/common.sh 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/scripts/common.sh b/scripts/common.sh index 6d91101..6d28cfc 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -106,6 +106,9 @@ openbsc) echo "openbsc" ;; + simtrace2) + echo "host" + ;; esac } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16632 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3afad11991d2e8bd72f44bed05f7204653e63133 Gerrit-Change-Number: 16632 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:42:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:42:35 +0000 Subject: Change in libosmocore[master]: Introduce helper functions for safe fork+exec of processes In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/16619 to look at the new patch set (#2). Change subject: Introduce helper functions for safe fork+exec of processes ...................................................................... Introduce helper functions for safe fork+exec of processes In some situations, we want to execute an external shell command in a non-blocking way. Similar to 'system', but without waiting for the child to complete. We also want to close all file descriptors ahead of the exec() and filter + modify the environment. Change-Id: Ib24ac8a083db32e55402ce496a5eabd8749cc888 Related: OS#4332 --- M include/Makefile.am A include/osmocom/core/exec.h M src/Makefile.am A src/exec.c M tests/Makefile.am A tests/exec/exec_test.c A tests/exec/exec_test.err A tests/exec/exec_test.ok M tests/testsuite.at 9 files changed, 441 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/19/16619/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib24ac8a083db32e55402ce496a5eabd8749cc888 Gerrit-Change-Number: 16619 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:43:00 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:43:00 +0000 Subject: Change in osmo-remsim[master]: remsim-client: Port from local copy to libosmousb + libosmo-simtrace2 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16609 ) Change subject: remsim-client: Port from local copy to libosmousb + libosmo-simtrace2 ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Idf5a861f4dacbec3c664f4ced6e03d8662c73112 Gerrit-Change-Number: 16609 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 17 Dec 2019 01:43:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 01:43:02 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 01:43:02 +0000 Subject: Change in osmo-remsim[master]: remsim_client: Port to async libosmousb select loop In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16610 ) Change subject: remsim_client: Port to async libosmousb select loop ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ic18690b3c2cbc5e99de0665c0b68b7555433b3cd Gerrit-Change-Number: 16610 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 17 Dec 2019 01:43:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Dec 17 01:44:09 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 01:44:09 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5df832f45732d_56622b14e4fa25fc2848eb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_16.04/i586 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 110s] #define HAVE_NETINET_TCP_H 1 [ 110s] #define HAVE_NETINET_IN_H 1 [ 110s] #define HAVE_ALLOCA_H 1 [ 110s] #define HAVE_ALLOCA 1 [ 110s] #define HAVE_PTHREAD_PRIO_INHERIT 1 [ 110s] #define HAVE_PTHREAD 1 [ 110s] #define HAVE_DECL_SYS_GETRANDOM 1 [ 110s] #define HAVE_CLOCK_GETTIME 1 [ 110s] #define HAVE_LOCALTIME_R 1 [ 110s] #define HAVE_TM_GMTOFF_IN_TM 1 [ 110s] [ 110s] configure: exit 1 [ 110s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-static returned exit code 1 [ 110s] debian/rules:29: recipe for target 'override_dh_auto_configure' failed [ 110s] make[1]: *** [override_dh_auto_configure] Error 255 [ 110s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 110s] debian/rules:15: recipe for target 'build' failed [ 110s] make: *** [build] Error 2 [ 110s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 110s] [ 110s] lamb12 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:43:47 UTC 2019. [ 110s] [ 110s] ### VM INTERACTION START ### [ 113s] [ 100.922717] sysrq: SysRq : Power Off [ 113s] [ 100.929174] reboot: Power down [ 113s] ### VM INTERACTION END ### [ 113s] [ 113s] lamb12 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:43:52 UTC 2019. [ 113s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 01:43:52 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 01:43:52 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_10/aarch64 In-Reply-To: References: Message-ID: <5df832f33227c_56622b14e4fa25fc2847c0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_10/aarch64 Package network:osmocom:nightly/libosmocore failed to build in Debian_10/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 114s] #define HAVE_SYSLOG_H 1 [ 114s] #define HAVE_CTYPE_H 1 [ 114s] #define HAVE_NETINET_TCP_H 1 [ 114s] #define HAVE_NETINET_IN_H 1 [ 114s] #define HAVE_ALLOCA_H 1 [ 114s] #define HAVE_ALLOCA 1 [ 114s] #define HAVE_PTHREAD_PRIO_INHERIT 1 [ 114s] #define HAVE_PTHREAD 1 [ 114s] #define HAVE_DECL_SYS_GETRANDOM 1 [ 114s] #define HAVE_CLOCK_GETTIME 1 [ 114s] #define HAVE_LOCALTIME_R 1 [ 114s] #define HAVE_TM_GMTOFF_IN_TM 1 [ 114s] [ 114s] configure: exit 1 [ 114s] dh_auto_configure: ./configure --build=aarch64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/aarch64-linux-gnu --libexecdir=\${prefix}/lib/aarch64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-static returned exit code 1 [ 114s] make[1]: *** [debian/rules:29: override_dh_auto_configure] Error 2 [ 114s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 114s] make: *** [debian/rules:15: build] Error 2 [ 114s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 114s] [ 114s] obs-arm-9 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:43:43 UTC 2019. [ 114s] [ 114s] ### VM INTERACTION START ### [ 116s] [ 104.148954] sysrq: Power Off [ 116s] [ 104.150984] reboot: Power down [ 116s] ### VM INTERACTION END ### [ 116s] [ 116s] obs-arm-9 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:43:46 UTC 2019. [ 116s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 01:44:45 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 01:44:45 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5df8332da5400_56622b14e4fa25fc285068@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_18.10/i586 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 155s] #define HAVE_SYSLOG_H 1 [ 155s] #define HAVE_CTYPE_H 1 [ 155s] #define HAVE_NETINET_TCP_H 1 [ 155s] #define HAVE_NETINET_IN_H 1 [ 155s] #define HAVE_ALLOCA_H 1 [ 155s] #define HAVE_ALLOCA 1 [ 155s] #define HAVE_PTHREAD_PRIO_INHERIT 1 [ 155s] #define HAVE_PTHREAD 1 [ 155s] #define HAVE_DECL_SYS_GETRANDOM 1 [ 155s] #define HAVE_CLOCK_GETTIME 1 [ 155s] #define HAVE_LOCALTIME_R 1 [ 155s] #define HAVE_TM_GMTOFF_IN_TM 1 [ 155s] [ 155s] configure: exit 1 [ 155s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-static returned exit code 1 [ 155s] make[1]: *** [debian/rules:29: override_dh_auto_configure] Error 2 [ 155s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 155s] make: *** [debian/rules:15: build] Error 2 [ 155s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 155s] [ 155s] lamb23 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:44:36 UTC 2019. [ 155s] [ 155s] ### VM INTERACTION START ### [ 158s] [ 144.587940] sysrq: SysRq : Power Off [ 158s] [ 144.595603] reboot: Power down [ 158s] ### VM INTERACTION END ### [ 158s] [ 158s] lamb23 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:44:40 UTC 2019. [ 158s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 01:44:45 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 01:44:45 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5df8332e20f99_56622b14e4fa25fc285146@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_18.04/i586 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 141s] #define HAVE_NETINET_TCP_H 1 [ 141s] #define HAVE_NETINET_IN_H 1 [ 141s] #define HAVE_ALLOCA_H 1 [ 141s] #define HAVE_ALLOCA 1 [ 141s] #define HAVE_PTHREAD_PRIO_INHERIT 1 [ 141s] #define HAVE_PTHREAD 1 [ 141s] #define HAVE_DECL_SYS_GETRANDOM 1 [ 141s] #define HAVE_CLOCK_GETTIME 1 [ 141s] #define HAVE_LOCALTIME_R 1 [ 141s] #define HAVE_TM_GMTOFF_IN_TM 1 [ 141s] [ 141s] configure: exit 1 [ 141s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-static returned exit code 1 [ 141s] debian/rules:29: recipe for target 'override_dh_auto_configure' failed [ 141s] make[1]: *** [override_dh_auto_configure] Error 2 [ 141s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 141s] debian/rules:15: recipe for target 'build' failed [ 141s] make: *** [build] Error 2 [ 141s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 141s] [ 141s] lamb56 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:44:22 UTC 2019. [ 141s] [ 141s] ### VM INTERACTION START ### [ 144s] [ 131.312841] sysrq: SysRq : Power Off [ 145s] [ 131.323627] reboot: Power down [ 145s] ### VM INTERACTION END ### [ 145s] [ 145s] lamb56 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:44:26 UTC 2019. [ 145s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 01:44:45 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 01:44:45 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5df8332eda3df_56622b14e4fa25fc285288@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 115s] #define HAVE_NETINET_TCP_H 1 [ 115s] #define HAVE_NETINET_IN_H 1 [ 115s] #define HAVE_ALLOCA_H 1 [ 115s] #define HAVE_ALLOCA 1 [ 115s] #define HAVE_PTHREAD_PRIO_INHERIT 1 [ 115s] #define HAVE_PTHREAD 1 [ 115s] #define HAVE_DECL_SYS_GETRANDOM 1 [ 115s] #define HAVE_CLOCK_GETTIME 1 [ 115s] #define HAVE_LOCALTIME_R 1 [ 115s] #define HAVE_TM_GMTOFF_IN_TM 1 [ 115s] [ 115s] configure: exit 1 [ 115s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-static returned exit code 1 [ 115s] debian/rules:29: recipe for target 'override_dh_auto_configure' failed [ 115s] make[1]: *** [override_dh_auto_configure] Error 255 [ 115s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 115s] debian/rules:15: recipe for target 'build' failed [ 115s] make: *** [build] Error 2 [ 115s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 115s] [ 115s] lamb53 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:44:31 UTC 2019. [ 115s] [ 115s] ### VM INTERACTION START ### [ 118s] [ 106.984108] sysrq: SysRq : Power Off [ 118s] [ 106.993815] reboot: Power down [ 118s] ### VM INTERACTION END ### [ 118s] [ 118s] lamb53 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:44:34 UTC 2019. [ 118s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 01:45:36 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 01:45:36 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5df8334c38870_56622b14e4fa25fc28548c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_8.0/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 188s] #define HAVE_NETINET_TCP_H 1 [ 188s] #define HAVE_NETINET_IN_H 1 [ 188s] #define HAVE_ALLOCA_H 1 [ 188s] #define HAVE_ALLOCA 1 [ 188s] #define HAVE_PTHREAD_PRIO_INHERIT 1 [ 188s] #define HAVE_PTHREAD 1 [ 188s] #define HAVE_DECL_SYS_GETRANDOM 0 [ 188s] #define HAVE_CLOCK_GETTIME 1 [ 188s] #define HAVE_LOCALTIME_R 1 [ 188s] #define HAVE_TM_GMTOFF_IN_TM 1 [ 188s] [ 188s] configure: exit 1 [ 188s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-static returned exit code 1 [ 188s] debian/rules:29: recipe for target 'override_dh_auto_configure' failed [ 188s] make[1]: *** [override_dh_auto_configure] Error 255 [ 188s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 188s] debian/rules:15: recipe for target 'build' failed [ 188s] make: *** [build] Error 2 [ 188s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 188s] [ 188s] lamb18 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:45:34 UTC 2019. [ 188s] [ 188s] ### VM INTERACTION START ### [ 189s] Powering off. [ 189s] [ 175.082347] reboot: Power down [ 190s] ### VM INTERACTION END ### [ 190s] [ 190s] lamb18 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:45:35 UTC 2019. [ 190s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 01:45:19 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 01:45:19 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_10/i586 In-Reply-To: References: Message-ID: <5df8334a219ed_56622b14e4fa25fc2853a4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_10/i586 Package network:osmocom:nightly/libosmocore failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 170s] #define HAVE_SYSLOG_H 1 [ 170s] #define HAVE_CTYPE_H 1 [ 170s] #define HAVE_NETINET_TCP_H 1 [ 170s] #define HAVE_NETINET_IN_H 1 [ 170s] #define HAVE_ALLOCA_H 1 [ 170s] #define HAVE_ALLOCA 1 [ 170s] #define HAVE_PTHREAD_PRIO_INHERIT 1 [ 170s] #define HAVE_PTHREAD 1 [ 170s] #define HAVE_DECL_SYS_GETRANDOM 1 [ 170s] #define HAVE_CLOCK_GETTIME 1 [ 170s] #define HAVE_LOCALTIME_R 1 [ 170s] #define HAVE_TM_GMTOFF_IN_TM 1 [ 170s] [ 170s] configure: exit 1 [ 170s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-static returned exit code 1 [ 170s] make[1]: *** [debian/rules:29: override_dh_auto_configure] Error 2 [ 170s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 170s] make: *** [debian/rules:15: build] Error 2 [ 170s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 170s] [ 170s] lamb57 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:45:13 UTC 2019. [ 170s] [ 170s] ### VM INTERACTION START ### [ 173s] [ 158.314355] sysrq: SysRq : Power Off [ 173s] [ 158.334082] reboot: Power down [ 173s] ### VM INTERACTION END ### [ 173s] [ 173s] lamb57 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:45:17 UTC 2019. [ 173s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 01:46:10 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 01:46:10 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5df833683a950_56622b14e4fa25fc28573e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Raspbian_10/armv7l Package network:osmocom:nightly/libosmocore failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 252s] configure:10759: $PKG_CONFIG --exists --print-errors "libpcsclite" [ 252s] configure:10762: $? = 0 [ 252s] configure:10820: result: yes [ 252s] configure:10851: checking for LIBUSB [ 252s] configure:10858: $PKG_CONFIG --exists --print-errors "libusb-1.0" [ 252s] Package libusb-1.0 was not found in the pkg-config search path. [ 252s] Perhaps you should add the directory containing `libusb-1.0.pc' [ 252s] to the PKG_CONFIG_PATH environment variable [ 252s] No package 'libusb-1.0' found [ 252s] configure:10861: $? = 1 [ 252s] configure:10875: $PKG_CONFIG --exists --print-errors "libusb-1.0" [ 252s] Package libusb-1.0 was not found in the pkg-config search path. [ 252s] Perhaps you should add the directory containing `libusb-1.0.pc' [ 252s] to the PKG_CONFIG_PATH environment variable [ 252s] No package 'libusb-1.0' found [ 252s] configure:10878: $? = 1 [ 252s] configure:10892: result: no [ 252s] No package 'libusb-1.0' found [ 252s] configure:10908: error: Package requirements (libusb-1.0) were not met: [ 252s] [ 252s] No package 'libusb-1.0' found [ 252s] [ 252s] Consider adjusting the PKG_CONFIG_PATH environment variable if you [ 254s] installed software in a non-standard prefix[ 204.020855] sysrq: SysRq : Power Off [ 254s] [ 204.022969] reboot: Power down [ 254s] ### VM INTERACTION END ### [ 254s] [ 254s] armbuild15 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:46:03 UTC 2019. [ 254s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 01:46:10 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 01:46:10 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5df8336885f3a_56622b14e4fa25fc2858e6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_8.0/i586 Package network:osmocom:nightly/libosmocore failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 242s] #define HAVE_NETINET_TCP_H 1 [ 242s] #define HAVE_NETINET_IN_H 1 [ 242s] #define HAVE_ALLOCA_H 1 [ 242s] #define HAVE_ALLOCA 1 [ 242s] #define HAVE_PTHREAD_PRIO_INHERIT 1 [ 242s] #define HAVE_PTHREAD 1 [ 242s] #define HAVE_DECL_SYS_GETRANDOM 0 [ 242s] #define HAVE_CLOCK_GETTIME 1 [ 242s] #define HAVE_LOCALTIME_R 1 [ 242s] #define HAVE_TM_GMTOFF_IN_TM 1 [ 242s] [ 242s] configure: exit 1 [ 242s] dh_auto_configure: ./configure --build=i586-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-static returned exit code 1 [ 242s] debian/rules:29: recipe for target 'override_dh_auto_configure' failed [ 242s] make[1]: *** [override_dh_auto_configure] Error 255 [ 242s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 242s] debian/rules:15: recipe for target 'build' failed [ 242s] make: *** [build] Error 2 [ 242s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 242s] [ 242s] lamb03 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:46:01 UTC 2019. [ 242s] [ 242s] ### VM INTERACTION START ### [ 244s] Powering off. [ 244s] [ 226.060796] reboot: Power down [ 244s] ### VM INTERACTION END ### [ 244s] [ 244s] lamb03 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:46:04 UTC 2019. [ 244s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 01:46:10 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 01:46:10 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5df83368efa8a_56622b14e4fa25fc285962@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 95s] #define HAVE_NETINET_IN_H 1 [ 95s] #define HAVE_ALLOCA_H 1 [ 95s] #define HAVE_ALLOCA 1 [ 95s] #define HAVE_PTHREAD_PRIO_INHERIT 1 [ 95s] #define HAVE_PTHREAD 1 [ 95s] #define HAVE_DECL_SYS_GETRANDOM 1 [ 95s] #define HAVE_CLOCK_GETTIME 1 [ 95s] #define HAVE_LOCALTIME_R 1 [ 95s] #define HAVE_TM_GMTOFF_IN_TM 1 [ 95s] [ 95s] configure: exit 1 [ 95s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-static returned exit code 1 [ 95s] debian/rules:29: rec[ 81.948107] serial8250: too much work for irq4 [ 95s] ipe for target 'override_dh_auto_configure' failed [ 95s] make[1]: *** [override_dh_auto_configure] Error 2 [ 95s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 95s] debian/rules:15: recipe for target 'build' failed [ 95s] make: *** [build] Error 2 [ 95s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 95s] [ 95s] lamb09 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:46:01 UTC 2019. [ 95s] [ 95s] ### VM INTERACTION START ### [ 98s] [ 84.972988] sysrq: SysRq : Power Off [ 98s] [ 84.979672] reboot: Power down [ 98s] ### VM INTERACTION END ### [ 98s] [ 98s] lamb09 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:46:05 UTC 2019. [ 98s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 01:46:27 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 01:46:27 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5df833879f046_56622b14e4fa25fc286040@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/i586 Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 245s] #define HAVE_NETINET_TCP_H 1 [ 245s] #define HAVE_NETINET_IN_H 1 [ 245s] #define HAVE_ALLOCA_H 1 [ 245s] #define HAVE_ALLOCA 1 [ 245s] #define HAVE_PTHREAD_PRIO_INHERIT 1 [ 245s] #define HAVE_PTHREAD 1 [ 245s] #define HAVE_DECL_SYS_GETRANDOM 1 [ 245s] #define HAVE_CLOCK_GETTIME 1 [ 245s] #define HAVE_LOCALTIME_R 1 [ 245s] #define HAVE_TM_GMTOFF_IN_TM 1 [ 245s] [ 245s] configure: exit 1 [ 245s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-static returned exit code 1 [ 245s] debian/rules:29: recipe for target 'override_dh_auto_configure' failed [ 245s] make[1]: *** [override_dh_auto_configure] Error 2 [ 245s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 245s] debian/rules:15: recipe for target 'build' failed [ 245s] make: *** [build] Error 2 [ 245s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 245s] [ 245s] lamb21 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:46:08 UTC 2019. [ 245s] [ 245s] ### VM INTERACTION START ### [ 248s] [ 225.412733] sysrq: SysRq : Power Off [ 248s] [ 225.480966] reboot: Power down [ 248s] ### VM INTERACTION END ### [ 248s] [ 248s] lamb21 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:46:12 UTC 2019. [ 248s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 01:46:44 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 01:46:44 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_10/armv7l In-Reply-To: References: Message-ID: <5df83389747b0_56622b14e4fa25fc28620@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_10/armv7l Package network:osmocom:nightly/libosmocore failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 287s] #define HAVE_SYSLOG_H 1 [ 287s] #define HAVE_CTYPE_H 1 [ 287s] #define HAVE_NETINET_TCP_H 1 [ 287s] #define HAVE_NETINET_IN_H 1 [ 287s] #define HAVE_ALLOCA_H 1 [ 287s] #define HAVE_ALLOCA 1 [ 287s] #define HAVE_PTHREAD_PRIO_INHERIT 1 [ 287s] #define HAVE_PTHREAD 1 [ 287s] #define HAVE_DECL_SYS_GETRANDOM 1 [ 287s] #define HAVE_CLOCK_GETTIME 1 [ 287s] #define HAVE_LOCALTIME_R 1 [ 287s] #define HAVE_TM_GMTOFF_IN_TM 1 [ 287s] [ 287s] configure: exit 1 [ 287s] dh_auto_configure: ./configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --libexecdir=\${prefix}/lib/arm-linux-gnueabihf --disable-maintainer-mode --disable-dependency-tracking --enable-static returned exit code 1 [ 287s] make[1]: *** [debian/rules:29: override_dh_auto_configure] Error 2 [ 287s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 287s] make: *** [debian/rules:15: build] Error 2 [ 287s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 287s] [ 287s] obs-arm-5 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:46:31 UTC 2019. [ 287s] [ 287s] ### VM INTERACTION START ### [ 289s] [ 259.538786] sysrq: SysRq : Power Off [ 289s] [ 259.548017] reboot: Power down [ 290s] ### VM INTERACTION END ### [ 290s] [ 290s] obs-arm-5 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:46:35 UTC 2019. [ 290s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 01:47:18 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 01:47:18 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5df833c3dc2d0_56622b14e4fa25fc286421@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_10/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 152s] am__quote='' [ 152s] am__tar='$${TAR-tar} chof - "$$tardir"' [ 152s] am__untar='$${TAR-tar} xf -' [ 152s] ax_pthread_config='' [ 152s] bindir='${exec_prefix}/bin' [ 152s] build='x86_64-pc-linux-gnu' [ 152s] build_alias='x86_64-linux-gnu' [ 152s] build_cpu='x86_64' [ 152s] build_os='linux-gnu' [ 152s] build_vendor='pc' [ 152s] datadir='${datarootdir}' [ 152s] datarootdir='${prefix}/share' [ 152s] docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' [ 152s] dvidir='${docdir}' [ 152s] exec_prefix='NONE' [ 152s] host='x86_64-pc-linux-gnu' [ 152s] host_alias='' [ 152s] host_cpu='x86_64' [ 152s] host_os='linux-gnu' [ 152s] host_vendor='pc' [ 152s] htmldir='${docdir}' [ 152s] includedir='${prefix}/include' [ 152s] infodir='${prefix}/share/info' [ 154s] install_sh='${SHELL} /usr/src/packages/BUILD/[ 135.667630] sysrq: SysRq : Power Off [ 154s] [ 135.671802] reboot: Power down [ 154s] ### VM INTERACTION END ### [ 154s] [ 154s] cloud108 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:47:10 UTC 2019. [ 154s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 01:47:35 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 01:47:35 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5df833c568c2e_56622b14e4fa25fc2865cb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 181s] #define HAVE_SYSLOG_H 1 [ 181s] #define HAVE_CTYPE_H 1 [ 181s] #define HAVE_NETINET_TCP_H 1 [ 181s] #define HAVE_NETINET_IN_H 1 [ 181s] #define HAVE_ALLOCA_H 1 [ 181s] #define HAVE_ALLOCA 1 [ 181s] #define HAVE_PTHREAD_PRIO_INHERIT 1 [ 181s] #define HAVE_PTHREAD 1 [ 181s] #define HAVE_DECL_SYS_GETRANDOM 1 [ 181s] #define HAVE_CLOCK_GETTIME 1 [ 181s] #define HAVE_LOCALTIME_R 1 [ 181s] #define HAVE_TM_GMTOFF_IN_TM 1 [ 181s] [ 181s] configure: exit 1 [ 181s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-static returned exit code 1 [ 181s] make[1]: *** [debian/rules:29: override_dh_auto_configure] Error 255 [ 181s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 181s] make: *** [debian/rules:15: build] Error 2 [ 181s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 181s] [ 181s] lamb59 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:47:26 UTC 2019. [ 181s] [ 181s] ### VM INTERACTION START ### [ 184s] [ 166.822127] sysrq: SysRq : Power Off [ 184s] [ 166.828419] reboot: Power down [ 184s] ### VM INTERACTION END ### [ 184s] [ 184s] lamb59 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:47:31 UTC 2019. [ 184s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 01:48:09 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 01:48:09 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5df833e0d6d9a_56622b14e4fa25fc2866b7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 247s] configure:9066: gcc -c -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -o out/conftest2.o conftest.c >&5 [ 247s] configure:9070: $? = 0 [ 247s] configure:9092: result: yes [ 247s] configure:9100: checking if gcc supports -c -o file.o [ 247s] configure:9147: result: yes [ 247s] configure:9180: checking whether the gcc linker (/usr/bin/ld) supports shared libraries [ 247s] configure:10443: result: yes [ 247s] configure:10480: checking whether -lc should be explicitly linked in [ 247s] configure:10488: gcc -c -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 conftest.c >&5 [ 247s] configure:10491: $? = 0 [ 247s] configure:10506: gcc -shared -fPIC -DPIC conftest.o -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| /bin/grep -lc \>/dev/null 2\>\&1 [ 247s] configure:10509: $? = 0 [ 247s] configure:10523: result: no [ 247s] configure:10683: checking dynamic linker characteristics [ 247s] configure:11264: gcc -o conftest -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wl,-z,relro -Wl,-z,now -Wl,-rpath -Wl,/foo conftest.c >&5 [ 247s] configure:11264: $? = 0 [ 247s] configure:11513: result: GNU/Linux ld.so [ 247s] configure:11635: checking how to hardcode library paths into programs [ 247s] configure:11660: result: immediate [ 247s] configure:12208: checking whether stripping libraries is possible [ 247s] configure:12213: result: yes [ 247s] configure:12248: checking if libtool supports shared libraries [ 247s] configure:12250: result: yes [ 249s] configure:12253[ 229.057759] sysrq: Power Off [ 249s] [ 229.081898] reboot: Power down [ 249s] ### VM INTERACTION END ### [ 249s] [ 249s] obs-arm-1 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:47:58 UTC 2019. [ 249s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 01:49:18 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 01:49:18 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5df8343b3874a_56622b14e4fa25fc28704a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_Unstable/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 283s] #define HAVE_SYSLOG_H 1 [ 283s] #define HAVE_CTYPE_H 1 [ 283s] #define HAVE_NETINET_TCP_H 1 [ 283s] #define HAVE_NETINET_IN_H 1 [ 283s] #define HAVE_ALLOCA_H 1 [ 283s] #define HAVE_ALLOCA 1 [ 283s] #define HAVE_PTHREAD_PRIO_INHERIT 1 [ 283s] #define HAVE_PTHREAD 1 [ 283s] #define HAVE_DECL_SYS_GETRANDOM 1 [ 283s] #define HAVE_CLOCK_GETTIME 1 [ 283s] #define HAVE_LOCALTIME_R 1 [ 283s] #define HAVE_TM_GMTOFF_IN_TM 1 [ 283s] [ 283s] configure: exit 1 [ 283s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-static returned exit code 1 [ 283s] make[1]: *** [debian/rules:29: override_dh_auto_configure] Error 255 [ 283s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 283s] make: *** [debian/rules:15: build] Error 2 [ 283s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 283s] [ 283s] lamb61 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:49:07 UTC 2019. [ 283s] [ 283s] ### VM INTERACTION START ### [ 287s] [ 268.406682] sysrq: SysRq : Power Off [ 287s] [ 268.415450] reboot: Power down [ 287s] ### VM INTERACTION END ### [ 287s] [ 287s] lamb61 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:49:12 UTC 2019. [ 287s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 01:49:52 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 01:49:52 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5df834564f9ff_56622b14e4fa25fc287191@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 314s] #define HAVE_CTYPE_H 1 [ 314s] #define HAVE_NETINET_TCP_H 1 [ 314s] #define HAVE_NETINET_IN_H 1 [ 314s] #define HAVE_[ 297.792274] serial8250: too much work for irq4 [ 314s] ALLOCA_H 1 [ 314s] #define HAVE_ALLOCA 1 [ 314s] #define HAVE_PTHREAD_PRIO_INHERIT 1 [ 314s] #define HAVE_PTHREAD 1 [ 314s] #define HAVE_DECL_SYS_GETRANDOM 1 [ 314s] #define HAVE_CLOCK_GETTIME 1 [ 314s] #define HAVE_LOCALTIME_R 1 [ 314s] #define HAVE_TM_GMTOFF_IN_TM 1 [ 314s] [ 314s] configure: exit 1 [ 314s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-static returned exit code 1 [ 314s] make[1]: *** [debian/rules:29: override_dh_auto_configure] Error 255 [ 314s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 314s] make: *** [debian/rules:15: build] Error 2 [ 314s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 314s] [ 314s] lamb14 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:49:42 UTC 2019. [ 314s] [ 314s] ### VM INTERACTION START ### [ 317s] [ 300.953855] sysrq: SysRq : Power Off [ 317s] [ 300.967299] reboot: Power down [ 317s] ### VM INTERACTION END ### [ 317s] [ 317s] lamb14 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:49:46 UTC 2019. [ 317s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 01:50:09 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 01:50:09 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5df8345899705_56622b14e4fa25fc28727e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 333s] #define HAVE_SYSLOG_H 1 [ 333s] #define HAVE_CTYPE_H 1 [ 333s] #define HAVE_NETINET_TCP_H 1 [ 333s] #define HAVE_NETINET_IN_H 1 [ 333s] #define HAVE_ALLOCA_H 1 [ 333s] #define HAVE_ALLOCA 1 [ 333s] #define HAVE_PTHREAD_PRIO_INHERIT 1 [ 333s] #define HAVE_PTHREAD 1 [ 333s] #define HAVE_DECL_SYS_GETRANDOM 1 [ 333s] #define HAVE_CLOCK_GETTIME 1 [ 333s] #define HAVE_LOCALTIME_R 1 [ 333s] #define HAVE_TM_GMTOFF_IN_TM 1 [ 333s] [ 333s] configure: exit 1 [ 333s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-static returned exit code 1 [ 333s] make[1]: *** [debian/rules:29: override_dh_auto_configure] Error 2 [ 333s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 333s] make: *** [debian/rules:15: build] Error 2 [ 333s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 333s] [ 333s] lamb19 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:49:57 UTC 2019. [ 333s] [ 333s] ### VM INTERACTION START ### [ 336s] [ 322.593901] sysrq: SysRq : Power Off [ 336s] [ 322.623598] reboot: Power down [ 336s] ### VM INTERACTION END ### [ 336s] [ 336s] lamb19 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:50:01 UTC 2019. [ 336s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 01:51:52 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 01:51:52 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5df834ceb1620_56622b14e4fa25fc2873c2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 426s] #define HAVE_CTYPE_H 1 [ 426s] #define [ 405.896123] serial8250: too much work for irq4 [ 426s] HAVE_NETINET_TCP_H 1 [ 426s] #define HAVE_NETINET_IN_H 1 [ 426s] #define HAVE_ALLOCA_H 1 [ 426s] #define HAVE_ALLOCA 1 [ 426s] #define HAVE_PTHREAD_PRIO_INHERIT 1 [ 426s] #define HAVE_PTHREAD 1 [ 426s] #define HAVE_DECL_SYS_GETRANDOM 1 [ 426s] #define HAVE_CLOCK_GETTIME 1 [ 426s] #define HAVE_LOCALTIME_R 1 [ 426s] #define HAVE_TM_GMTOFF_IN_TM 1 [ 426s] [ 426s] configure: exit 1 [ 426s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-static returned exit code 1 [ 426s] make[1]: *** [debian/rules:29: override_dh_auto_configure] Error 2 [ 426s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 426s] make: *** [debian/rules:15: build] Error 2 [ 426s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 426s] [ 426s] lamb26 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:51:33 UTC 2019. [ 426s] [ 426s] ### VM INTERACTION START ### [ 429s] [ 409.113017] sysrq: SysRq : Power Off [ 429s] [ 409.121691] reboot: Power down [ 429s] ### VM INTERACTION END ### [ 429s] [ 429s] lamb26 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:51:36 UTC 2019. [ 429s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 01:53:01 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 01:53:01 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5df8350a983e3_56622b14e4fa25fc287527@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/armv7l Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 293s] #define HAVE_NETINET_TCP_H 1 [ 293s] #define HAVE_NETINET_IN_H 1 [ 293s] #define HAVE_ALLOCA_H 1 [ 293s] #define HAVE_ALLOCA 1 [ 293s] #define HAVE_PTHREAD_PRIO_INHERIT 1 [ 293s] #define HAVE_PTHREAD 1 [ 293s] #define HAVE_DECL_SYS_GETRANDOM 1 [ 293s] #define HAVE_CLOCK_GETTIME 1 [ 293s] #define HAVE_LOCALTIME_R 1 [ 293s] #define HAVE_TM_GMTOFF_IN_TM 1 [ 293s] [ 293s] configure: exit 1 [ 293s] dh_auto_configure: ./configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/arm-linux-gnueabihf --libexecdir=${prefix}/lib/arm-linux-gnueabihf --disable-maintainer-mode --disable-dependency-tracking --enable-static returned exit code 1 [ 293s] debian/rules:29: recipe for target 'override_dh_auto_configure' failed [ 293s] make[1]: *** [override_dh_auto_configure] Error 2 [ 293s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 293s] debian/rules:15: recipe for target 'build' failed [ 293s] make: *** [build] Error 2 [ 293s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 293s] [ 293s] obs-arm-5 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:52:50 UTC 2019. [ 293s] [ 293s] ### VM INTERACTION START ### [ 296s] [ 266.978463] sysrq: SysRq : Power Off [ 296s] [ 266.992728] reboot: Power down [ 297s] ### VM INTERACTION END ### [ 297s] [ 297s] obs-arm-5 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:52:55 UTC 2019. [ 297s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 01:59:18 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 01:59:18 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5df836933b0b9_56622b14e4fa25fc2897cd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 876s] #define HAVE_NETINET_TCP_H 1 [ 876s] #define HAVE_NETINET_IN_H 1 [ 876s] #define HAVE_ALLOCA_H 1 [ 876s] #define HAVE_ALLOCA 1 [ 876s] #define HAVE_PTHREAD_PRIO_INHERIT 1 [ 876s] #define HAVE_PTHREAD 1 [ 876s] #define HAVE_DECL_SYS_GETRANDOM 1 [ 876s] #define HAVE_CLOCK_GETTIME 1 [ 876s] #define HAVE_LOCALTIME_R 1 [ 876s] #define HAVE_TM_GMTOFF_IN_TM 1 [ 876s] [ 876s] configure: exit 1 [ 876s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-static returned exit code 1 [ 876s] debian/rules:29: recipe for target 'override_dh_auto_configure' failed [ 876s] make[1]: *** [override_dh_auto_configure] Error 2 [ 876s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 876s] debian/rules:15: recipe for target 'build' failed [ 876s] make: *** [build] Error 2 [ 876s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 876s] [ 876s] lamb25 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:59:09 UTC 2019. [ 876s] [ 876s] ### VM INTERACTION START ### [ 878s] [ 810.245491] sysrq: SysRq : Power Off [ 878s] [ 810.275711] reboot: Power down [ 878s] ### VM INTERACTION END ### [ 878s] [ 878s] lamb25 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 01:59:13 UTC 2019. [ 878s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 02:31:52 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 02:31:52 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5df83e2f2bed3_56622b14e4fa25fc29789b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 157s] /usr/src/packages/BUILD/firmware/apps/dfu/main.c:360: warning: undefined reference to `__stack_chk_guard' [ 157s] obj/simtrace/flash_dfu_desc.o: In function `set_usb_serial_str': [ 157s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_fail' [ 157s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_guard' [ 157s] obj/simtrace/flash_dfu_driver.o: In function `handle_getstate': [ 157s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_fail' [ 157s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_guard' [ 157s] collect2: error: ld returned 1 exit status [ 157s] % [ 157s] Makefile:233: recipe for target 'flash' failed [ 157s] make[2]: *** [flash] Error 1 [ 157s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 157s] Makefile:10: recipe for target 'fw-simtrace-dfu' failed [ 157s] make[1]: *** [fw-simtrace-dfu] Error 2 [ 157s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 157s] dh_auto_build: make -j1 returned exit code 2 [ 157s] debian/rules:16: recipe for target 'build' failed [ 157s] make: *** [build] Error 2 [ 157s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 157s] [ 157s] lamb24 failed "build simtrace2_0.7.0.31.e213.dsc" at Tue Dec 17 02:31:31 UTC 2019. [ 157s] [ 157s] ### VM INTERACTION START ### [ 161s] [ 142.500741] sysrq: SysRq : Power Off [ 161s] [ 142.518489] reboot: Power down [ 161s] ### VM INTERACTION END ### [ 161s] [ 161s] lamb24 failed "build simtrace2_0.7.0.31.e213.dsc" at Tue Dec 17 02:31:35 UTC 2019. [ 161s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 03:03:52 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 03:03:52 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5df845b0c1a75_56622b14e4fa25fc30308@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 84s] /usr/src/packages/BUILD/firmware/apps/dfu/main.c:360: warning: undefined reference to `__stack_chk_guard' [ 84s] obj/simtrace/flash_dfu_desc.o: In function `set_usb_serial_str': [ 84s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_fail' [ 84s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_guard' [ 84s] obj/simtrace/flash_dfu_driver.o: In function `handle_getstate': [ 84s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_fail' [ 84s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_guard' [ 84s] collect2: error: ld returned 1 exit status [ 84s] % [ 84s] Makefile:233: recipe for target 'flash' failed [ 84s] make[2]: *** [flash] Error 1 [ 84s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 84s] Makefile:10: recipe for target 'fw-simtrace-dfu' failed [ 84s] make[1]: *** [fw-simtrace-dfu] Error 2 [ 84s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 84s] dh_auto_build: make -j1 returned exit code 2 [ 84s] debian/rules:16: recipe for target 'build' failed [ 84s] make: *** [build] Error 2 [ 84s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 84s] [ 84s] lamb18 failed "build simtrace2_0.7.0.31.e213.dsc" at Tue Dec 17 03:03:42 UTC 2019. [ 84s] [ 84s] ### VM INTERACTION START ### [ 88s] [ 76.764737] sysrq: SysRq : Power Off [ 88s] [ 76.770581] reboot: Power down [ 88s] ### VM INTERACTION END ### [ 88s] [ 88s] lamb18 failed "build simtrace2_0.7.0.31.e213.dsc" at Tue Dec 17 03:03:46 UTC 2019. [ 88s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 05:22:35 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 05:22:35 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5df866291f4ee_56622b14e4fa25fc316544@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_Unstable/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 144s] #define HAVE_SYSLOG_H 1 [ 144s] #define HAVE_CTYPE_H 1 [ 144s] #define HAVE_NETINET_TCP_H 1 [ 144s] #define HAVE_NETINET_IN_H 1 [ 144s] #define HAVE_ALLOCA_H 1 [ 144s] #define HAVE_ALLOCA 1 [ 144s] #define HAVE_PTHREAD_PRIO_INHERIT 1 [ 144s] #define HAVE_PTHREAD 1 [ 144s] #define HAVE_DECL_SYS_GETRANDOM 1 [ 144s] #define HAVE_CLOCK_GETTIME 1 [ 144s] #define HAVE_LOCALTIME_R 1 [ 144s] #define HAVE_TM_GMTOFF_IN_TM 1 [ 144s] [ 144s] configure: exit 1 [ 144s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-static returned exit code 1 [ 144s] make[1]: *** [debian/rules:29: override_dh_auto_configure] Error 255 [ 144s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 144s] make: *** [debian/rules:15: build] Error 2 [ 144s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 144s] [ 144s] lamb64 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 05:22:24 UTC 2019. [ 144s] [ 144s] ### VM INTERACTION START ### [ 147s] [ 133.150429] sysrq: SysRq : Power Off [ 147s] [ 133.158461] reboot: Power down [ 147s] ### VM INTERACTION END ### [ 147s] [ 147s] lamb64 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 05:22:28 UTC 2019. [ 147s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 05:24:52 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 05:24:52 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5df866beb6006_56622b14e4fa25fc3168d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 284s] #define HAVE_CTYPE_H 1 [ 284s] #define HAVE_NETINET_TCP_H 1 [ 284s] #define HAVE_NETINET_IN_H 1 [ 284s] #define HAVE_ALLOCA_H 1 [ 284s] #define HAVE_ALLOCA 1 [ 284s] #define HAVE_PTHREAD_PRIO_INHERIT 1 [ 284s] #define HAVE_PTHREAD 1 [ 284s] #define HAVE_DECL_SYS_GETRANDOM 1 [ 284s] #define HAVE_CLOCK_GETTIME 1 [ 284s] #define HAVE_LOCALTIME_R 1 [ 284s] #define HAVE_TM_GMTOFF_IN[ 251.503814] serial8250: too much work for irq4 [ 284s] _TM 1 [ 284s] [ 284s] configure: exit 1 [ 284s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-static returned exit code 1 [ 284s] make[1]: *** [debian/rules:29: override_dh_auto_configure] Error 255 [ 284s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 284s] make: *** [debian/rules:15: build] Error 2 [ 284s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 284s] [ 284s] build71 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 05:24:31 UTC 2019. [ 284s] [ 284s] ### VM INTERACTION START ### [ 287s] [ 254.679032] sysrq: SysRq : Power Off [ 287s] [ 254.691390] reboot: Power down [ 287s] ### VM INTERACTION END ### [ 287s] [ 287s] build71 failed "build libosmocore_1.2.0.106.d462.dsc" at Tue Dec 17 05:24:35 UTC 2019. [ 287s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Tue Dec 17 09:07:55 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 17 Dec 2019 09:07:55 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_maste?= =?UTF-8?Q?r-osmo-ccid-firmware_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,a4=3Ddef?= =?UTF-8?Q?ault,osmocom-master-debian9_#22?= Message-ID: <2097582027.724.1576573676014.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 92.25 KB...] CC application.lo CC rbtree.lo CC strrb.lo CC loggingrb.lo CC crc8gen.lo CC crc16gen.lo CC crc32gen.lo CC crc64gen.lo CC macaddr.lo CC stat_item.lo CC stats.lo CC stats_statsd.lo CC prim.lo CC conv_acc.lo CC conv_acc_generic.lo CC sercomm.lo CC prbs.lo CC isdnhdlc.lo CC tdef.lo CC sockaddr_str.lo CC use_count.lo CCLD libosmocore.la make[4]: Entering directory '/build/deps/libosmocore/src' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/install/stow/libosmocore/lib' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmocore.la '/build/install/stow/libosmocore/lib' libtool: install: /usr/bin/install -c .libs/libosmocore.lai /build/install/stow/libosmocore/lib/libosmocore.la libtool: install: /usr/bin/install -c .libs/libosmocore.a /build/install/stow/libosmocore/lib/libosmocore.a libtool: install: chmod 644 /build/install/stow/libosmocore/lib/libosmocore.a libtool: install: arm-none-eabi-ranlib /build/install/stow/libosmocore/lib/libosmocore.a make[4]: Leaving directory '/build/deps/libosmocore/src' make[3]: Leaving directory '/build/deps/libosmocore/src' make[2]: Leaving directory '/build/deps/libosmocore/src' Making install in src/vty make[2]: Entering directory '/build/deps/libosmocore/src/vty' make[3]: Entering directory '/build/deps/libosmocore/src/vty' make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory '/build/deps/libosmocore/src/vty' make[2]: Leaving directory '/build/deps/libosmocore/src/vty' Making install in src/codec make[2]: Entering directory '/build/deps/libosmocore/src/codec' CC gsm610.lo CC gsm620.lo CC gsm660.lo CC gsm690.lo CC ecu.lo CC ecu_fr.lo CCLD libosmocodec.la make[3]: Entering directory '/build/deps/libosmocore/src/codec' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocodec.la '/build/install/stow/libosmocore/lib' libtool: install: /usr/bin/install -c .libs/libosmocodec.lai /build/install/stow/libosmocore/lib/libosmocodec.la libtool: install: /usr/bin/install -c .libs/libosmocodec.a /build/install/stow/libosmocore/lib/libosmocodec.a libtool: install: chmod 644 /build/install/stow/libosmocore/lib/libosmocodec.a libtool: install: arm-none-eabi-ranlib /build/install/stow/libosmocore/lib/libosmocodec.a make[3]: Leaving directory '/build/deps/libosmocore/src/codec' make[2]: Leaving directory '/build/deps/libosmocore/src/codec' Making install in src/gsm make[2]: Entering directory '/build/deps/libosmocore/src/gsm' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/src/gsm' CC a5.lo CC rxlev_stat.lo CC tlv_parser.lo CC comp128.lo CC comp128v23.lo CC gsm_utils.lo CC rsl.lo CC gsm48.lo CC gsm48_arfcn_range_encode.lo CC gsm48_ie.lo CC gsm0808.lo CC sysinfo.lo CC gprs_cipher_core.lo CC gprs_rlc.lo CC gsm0480.lo CC abis_nm.lo CC gsm0502.lo CC gsm0411_utils.lo CC gsm0411_smc.lo CC gsm0411_smr.lo CC gsm0414.lo gsm0411_utils.c: In function 'gsm340_gen_scts': gsm0411_utils.c:104:9: note: #pragma message: find a portable way to obtain timezone offset #pragma message ("find a portable way to obtain timezone offset") ^ CC lapd_core.lo CC lapdm.lo CC kasumi.lo CC gsm29205.lo CC gsm_04_08_gprs.lo CC auth_core.lo CC auth_comp128v1.lo CC auth_comp128v23.lo CC auth_xor.lo CC auth_milenage.lo CC gea.lo CC milenage/aes-internal.lo CC milenage/aes-internal-enc.lo CC milenage/milenage.lo CC gan.lo CC ipa.lo CC gsm0341.lo CC apn.lo ipa.c: In function 'ipa_ccm_idtag_parse': ipa.c:104:2: warning: 'ipa_ccm_idtag_parse_off' is deprecated: Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 1); ^ In file included from ipa.c:45:0: ../../include/osmocom/gsm/ipa.h:31:5: note: declared here int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset) ^ CC gsup.lo CC gsup_sms.lo CC gprs_gea.lo CC gsm0503_conv.lo CC oap.lo CC gsm0808_utils.lo CC gsm23003.lo CC mncc.lo CC bts_features.lo CC oap_client.lo CC gsm29118.lo CC gsm48_rest_octets.lo CC cbsp.lo CC gsm48049.lo CC milenage/aes-encblock.lo CCLD libgsmint.la CCLD libosmogsm.la make[4]: Entering directory '/build/deps/libosmocore/src/gsm' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la '/build/install/stow/libosmocore/lib' libtool: install: /usr/bin/install -c .libs/libosmogsm.lai /build/install/stow/libosmocore/lib/libosmogsm.la libtool: install: /usr/bin/install -c .libs/libosmogsm.a /build/install/stow/libosmocore/lib/libosmogsm.a libtool: install: chmod 644 /build/install/stow/libosmocore/lib/libosmogsm.a libtool: install: arm-none-eabi-ranlib /build/install/stow/libosmocore/lib/libosmogsm.a make[4]: Leaving directory '/build/deps/libosmocore/src/gsm' make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' make[2]: Leaving directory '/build/deps/libosmocore/src/gsm' Making install in src/coding make[2]: Entering directory '/build/deps/libosmocore/src/coding' CC gsm0503_interleaving.lo CC gsm0503_mapping.lo CC gsm0503_tables.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory '/build/deps/libosmocore/src/coding' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la '/build/install/stow/libosmocore/lib' libtool: install: /usr/bin/install -c .libs/libosmocoding.lai /build/install/stow/libosmocore/lib/libosmocoding.la libtool: install: /usr/bin/install -c .libs/libosmocoding.a /build/install/stow/libosmocore/lib/libosmocoding.a libtool: install: chmod 644 /build/install/stow/libosmocore/lib/libosmocoding.a libtool: install: arm-none-eabi-ranlib /build/install/stow/libosmocore/lib/libosmocoding.a make[3]: Leaving directory '/build/deps/libosmocore/src/coding' make[2]: Leaving directory '/build/deps/libosmocore/src/coding' Making install in src/gb make[2]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Entering directory '/build/deps/libosmocore/src/gb' make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory '/build/deps/libosmocore/src/gb' make[2]: Leaving directory '/build/deps/libosmocore/src/gb' Making install in src/ctrl make[2]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Entering directory '/build/deps/libosmocore/src/ctrl' make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory '/build/deps/libosmocore/src/ctrl' make[2]: Leaving directory '/build/deps/libosmocore/src/ctrl' Making install in src/sim make[2]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Entering directory '/build/deps/libosmocore/src/sim' make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory '/build/deps/libosmocore/src/sim' make[2]: Leaving directory '/build/deps/libosmocore/src/sim' Making install in src/pseudotalloc make[2]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' CC pseudotalloc.lo CCLD libpseudotalloc.la make[3]: Entering directory '/build/deps/libosmocore/src/pseudotalloc' /bin/mkdir -p '/build/install/stow/libosmocore/lib' /bin/mkdir -p '/build/install/stow/libosmocore/include' /bin/bash ../../libtool --mode=install /usr/bin/install -c libpseudotalloc.la '/build/install/stow/libosmocore/lib' /usr/bin/install -c -m 644 talloc.h '/build/install/stow/libosmocore/include/.' libtool: install: /usr/bin/install -c .libs/libpseudotalloc.lai /build/install/stow/libosmocore/lib/libpseudotalloc.la libtool: install: /usr/bin/install -c .libs/libpseudotalloc.a /build/install/stow/libosmocore/lib/libpseudotalloc.a libtool: install: chmod 644 /build/install/stow/libosmocore/lib/libpseudotalloc.a libtool: install: arm-none-eabi-ranlib /build/install/stow/libosmocore/lib/libpseudotalloc.a make[3]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' make[2]: Leaving directory '/build/deps/libosmocore/src/pseudotalloc' Making install in src/usb make[2]: Entering directory '/build/deps/libosmocore/src/usb' CC osmo_libusb.lo osmo_libusb.c:27:18: fatal error: poll.h: No such file or directory compilation terminated. make[2]: *** [osmo_libusb.lo] Error 1 Makefile:498: recipe for target 'osmo_libusb.lo' failed make[2]: Leaving directory '/build/deps/libosmocore/src/usb' make[1]: *** [install-recursive] Error 1 Makefile:687: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' Makefile:986: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Dec 17 09:39:33 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 17 Dec 2019 09:39:33 +0000 Subject: Change in docker-playground[master]: pcu-master: Remove non-existent --enable-trx configure option from Do... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16526 ) Change subject: pcu-master: Remove non-existent --enable-trx configure option from Dockerfile ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I24f10e2b99771cdd5a1e72a1ad5626aff649258f Gerrit-Change-Number: 16526 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 17 Dec 2019 09:39:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 10:21:11 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 17 Dec 2019 10:21:11 +0000 Subject: Change in libosmocore[master]: Introduce helper functions for safe fork+exec of processes In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16619 ) Change subject: Introduce helper functions for safe fork+exec of processes ...................................................................... Patch Set 2: (6 comments) https://gerrit.osmocom.org/c/libosmocore/+/16619/2/src/exec.c File src/exec.c: https://gerrit.osmocom.org/c/libosmocore/+/16619/2/src/exec.c at 64 PS2, Line 64: /*! generate a filtered version of the process environment containing only entries of whitelisted keys. Worth mentioning that strings in our are shared from in, ie strings are not copied. https://gerrit.osmocom.org/c/libosmocore/+/16619/2/src/exec.c at 67 PS2, Line 67: * \param[in] in input environment (NULL-terminated list of pointers like **environment) worth mentioning where does this **environment come from. https://gerrit.osmocom.org/c/libosmocore/+/16619/2/src/exec.c at 116 PS2, Line 116: int osmo_environment_append(char **out, size_t out_len, char **in) Not sure if appending an already existing key to the list makes it really overwrite it. It could be process expects keys not to be duplicated and hence takes first one it finds? https://gerrit.osmocom.org/c/libosmocore/+/16619/2/src/exec.c at 124 PS2, Line 124: for (out_used = 0; out[out_used]; out_used++) {} for (out_used = 0; out[out_used]; out_used++); https://gerrit.osmocom.org/c/libosmocore/+/16619/2/src/exec.c at 169 PS2, Line 169: extern char **environ; unistd.h: /* NULL-terminated array of "NAME=VALUE" environment variables. */ extern char **__environ; #ifdef __USE_GNU extern char **environ; #endif https://gerrit.osmocom.org/c/libosmocore/+/16619/2/src/exec.c at 172 PS2, Line 172: int osmo_system_nowait(const char *command, char **addl_env) addl_env? Please document the params. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib24ac8a083db32e55402ce496a5eabd8749cc888 Gerrit-Change-Number: 16619 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 17 Dec 2019 10:21:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 10:21:52 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 17 Dec 2019 10:21:52 +0000 Subject: Change in docker-playground[master]: ttcn3-ggsn: Log osmo-ggsn stdout+stderr to file References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16633 ) Change subject: ttcn3-ggsn: Log osmo-ggsn stdout+stderr to file ...................................................................... ttcn3-ggsn: Log osmo-ggsn stdout+stderr to file Fixes: c3f157b939784f19f0337ac92ac727063c8d3452 Change-Id: Ia4c4589902bd72918f1d114afa890b049d6e8fd7 --- M ttcn3-ggsn-test/jenkins.sh 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/33/16633/1 diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index c4fac9d..66239f8 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -28,7 +28,8 @@ --network $NET_NAME --ip 172.18.3.201 \ -v $VOL_BASE_DIR/ggsn:/data \ --name ${BUILD_TAG}-ggsn -d \ - $REPO_USER/osmo-ggsn-$IMAGE_SUFFIX + $REPO_USER/osmo-ggsn-$IMAGE_SUFFIX \ + /bin/sh -c "osmo-ggsn -c /data/osmo-ggsn.cfg >/data/osmo-ggsn.log 2>&1" # start docker container with testsuite in foreground docker run --rm \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16633 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia4c4589902bd72918f1d114afa890b049d6e8fd7 Gerrit-Change-Number: 16633 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 10:53:54 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 10:53:54 +0000 Subject: Change in osmo-ccid-firmware[master]: Add --disable-libusb for libosmocore cross-compile References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16634 ) Change subject: Add --disable-libusb for libosmocore cross-compile ...................................................................... Add --disable-libusb for libosmocore cross-compile libosmocore.git after I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3 includes support for USB (and a new dependency to libusb). But there's no libusb1 in the Cortex-M4 anyway :) Change-Id: I68da7985001f4f9018995166458006ee47cdf216 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/34/16634/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 6fd8469..c2802f8 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -41,7 +41,7 @@ autoreconf --install --force ./configure --enable-static --prefix="$inst/stow/libosmocore" --host=arm-none-eabi \ --enable-embedded --disable-doxygen --disable-shared --disable-pseudotalloc \ - --disable-libsctp --enable-external-tests \ + --disable-libsctp --disable-libusb --enable-external-tests \ CFLAGS="-Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -mthumb -Os -mlong-calls -g3 -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -I /home/laforge/projects/git/osmo-ccid-firmware/sysmoOCTSIM -Wno-error=format" make $PARALLEL_MAKE install make clean -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I68da7985001f4f9018995166458006ee47cdf216 Gerrit-Change-Number: 16634 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 10:57:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 10:57:57 +0000 Subject: Change in osmo-remsim[master]: remsim-client: Port from local copy to libosmousb + libosmo-simtrace2 In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-remsim/+/16609 to look at the new patch set (#4). Change subject: remsim-client: Port from local copy to libosmousb + libosmo-simtrace2 ...................................................................... remsim-client: Port from local copy to libosmousb + libosmo-simtrace2 We originally imported a copy of [most of] the code of simtrace2.git/host into this repository. That was a quick hack to get things going, but now that simtrace2.git is providing a shared library of simtrace2 utility functions, let's migrate over to it. At the same time, some functions (libusb_util) have been migrated to libosmousb (a new library in libosmocore.git), so we must add that as new dependency, too. This performs the minimally required changes and is *not* a proper port to the libosmousb osmocore select loop integration, whcih will follow in a separate patch. Change-Id: Idf5a861f4dacbec3c664f4ced6e03d8662c73112 Closes: OS#4298 Related: OS#4299 Depends: libosmocore.git I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3 --- M configure.ac M contrib/jenkins.sh M src/Makefile.am M src/simtrace2-remsim_client.c D src/simtrace2/apdu_dispatch.c D src/simtrace2/apdu_dispatch.h D src/simtrace2/libusb_util.c D src/simtrace2/libusb_util.h D src/simtrace2/simtrace2-discovery.c D src/simtrace2/simtrace2-discovery.h D src/simtrace2/simtrace_prot.h D src/simtrace2/simtrace_usb.h 12 files changed, 17 insertions(+), 1,119 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/09/16609/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Idf5a861f4dacbec3c664f4ced6e03d8662c73112 Gerrit-Change-Number: 16609 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 11:05:22 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 11:05:22 +0000 Subject: Change in simtrace2[master]: simtrace2-sniff: Reformat value_string to pass our validation scripts References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16635 ) Change subject: simtrace2-sniff: Reformat value_string to pass our validation scripts ...................................................................... simtrace2-sniff: Reformat value_string to pass our validation scripts This is a purely cosmetic change in terms of coding style, but it fixes an [invalid] detection for unterminated value_string arrays by our verify_value_string_arrays_are_terminated.py script: Change-Id: Iee905c744065df1dc54f04be752a65700897a92c ERROR: file contains unterminated value_string 'struct value_string change_flags[]': './deps/simtrace2/host/src/simtrace2-sniff.c' ERROR: file contains unterminated value_string 'struct value_string data_flags[]': './deps/simtrace2/host/src/simtrace2-sniff.c' --- M host/src/simtrace2-sniff.c 1 file changed, 10 insertions(+), 40 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/35/16635/1 diff --git a/host/src/simtrace2-sniff.c b/host/src/simtrace2-sniff.c index b2ce4a0..c4cec1e 100644 --- a/host/src/simtrace2-sniff.c +++ b/host/src/simtrace2-sniff.c @@ -61,49 +61,19 @@ }; const struct value_string change_flags[] = { - { - .value = SNIFF_CHANGE_FLAG_CARD_INSERT, - .str = "card inserted", - }, - { - .value = SNIFF_CHANGE_FLAG_CARD_EJECT, - .str = "card ejected", - }, - { - .value = SNIFF_CHANGE_FLAG_RESET_ASSERT, - .str = "reset asserted", - }, - { - .value = SNIFF_CHANGE_FLAG_RESET_DEASSERT, - .str = "reset de-asserted", - }, - { - .value = SNIFF_CHANGE_FLAG_TIMEOUT_WT, - .str = "data transfer timeout", - }, - { - .value = 0, - .str = NULL, - }, + { SNIFF_CHANGE_FLAG_CARD_INSERT, "card inserted" }, + { SNIFF_CHANGE_FLAG_CARD_EJECT, "card ejected" }, + { SNIFF_CHANGE_FLAG_RESET_ASSERT, "reset asserted" }, + { SNIFF_CHANGE_FLAG_RESET_DEASSERT, "reset de-asserted" }, + { SNIFF_CHANGE_FLAG_TIMEOUT_WT, "data transfer timeout" }, + { 0, NULL } }; const struct value_string data_flags[] = { - { - .value = SNIFF_DATA_FLAG_ERROR_INCOMPLETE, - .str = "incomplete", - }, - { - .value = SNIFF_DATA_FLAG_ERROR_MALFORMED, - .str = "malformed", - }, - { - .value = SNIFF_DATA_FLAG_ERROR_CHECKSUM, - .str = "checksum error", - }, - { - .value = 0, - .str = NULL, - }, + { SNIFF_DATA_FLAG_ERROR_INCOMPLETE, "incomplete" }, + { SNIFF_DATA_FLAG_ERROR_MALFORMED, "malformed" }, + { SNIFF_DATA_FLAG_ERROR_CHECKSUM, "checksum error" }, + { 0, NULL } }; static void print_flags(const struct value_string* flag_meanings, uint32_t nb_flags, uint32_t flags) { -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Iee905c744065df1dc54f04be752a65700897a92c Gerrit-Change-Number: 16635 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 11:07:20 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 11:07:20 +0000 Subject: Change in simtrace2[master]: simtrace2-sniff: Reformat value_string to pass our validation scripts In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16635 ) Change subject: simtrace2-sniff: Reformat value_string to pass our validation scripts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Iee905c744065df1dc54f04be752a65700897a92c Gerrit-Change-Number: 16635 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 11:07:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 11:07:21 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 11:07:21 +0000 Subject: Change in simtrace2[master]: simtrace2-sniff: Reformat value_string to pass our validation scripts In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16635 ) Change subject: simtrace2-sniff: Reformat value_string to pass our validation scripts ...................................................................... simtrace2-sniff: Reformat value_string to pass our validation scripts This is a purely cosmetic change in terms of coding style, but it fixes an [invalid] detection for unterminated value_string arrays by our verify_value_string_arrays_are_terminated.py script: Change-Id: Iee905c744065df1dc54f04be752a65700897a92c ERROR: file contains unterminated value_string 'struct value_string change_flags[]': './deps/simtrace2/host/src/simtrace2-sniff.c' ERROR: file contains unterminated value_string 'struct value_string data_flags[]': './deps/simtrace2/host/src/simtrace2-sniff.c' --- M host/src/simtrace2-sniff.c 1 file changed, 10 insertions(+), 40 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/host/src/simtrace2-sniff.c b/host/src/simtrace2-sniff.c index b2ce4a0..c4cec1e 100644 --- a/host/src/simtrace2-sniff.c +++ b/host/src/simtrace2-sniff.c @@ -61,49 +61,19 @@ }; const struct value_string change_flags[] = { - { - .value = SNIFF_CHANGE_FLAG_CARD_INSERT, - .str = "card inserted", - }, - { - .value = SNIFF_CHANGE_FLAG_CARD_EJECT, - .str = "card ejected", - }, - { - .value = SNIFF_CHANGE_FLAG_RESET_ASSERT, - .str = "reset asserted", - }, - { - .value = SNIFF_CHANGE_FLAG_RESET_DEASSERT, - .str = "reset de-asserted", - }, - { - .value = SNIFF_CHANGE_FLAG_TIMEOUT_WT, - .str = "data transfer timeout", - }, - { - .value = 0, - .str = NULL, - }, + { SNIFF_CHANGE_FLAG_CARD_INSERT, "card inserted" }, + { SNIFF_CHANGE_FLAG_CARD_EJECT, "card ejected" }, + { SNIFF_CHANGE_FLAG_RESET_ASSERT, "reset asserted" }, + { SNIFF_CHANGE_FLAG_RESET_DEASSERT, "reset de-asserted" }, + { SNIFF_CHANGE_FLAG_TIMEOUT_WT, "data transfer timeout" }, + { 0, NULL } }; const struct value_string data_flags[] = { - { - .value = SNIFF_DATA_FLAG_ERROR_INCOMPLETE, - .str = "incomplete", - }, - { - .value = SNIFF_DATA_FLAG_ERROR_MALFORMED, - .str = "malformed", - }, - { - .value = SNIFF_DATA_FLAG_ERROR_CHECKSUM, - .str = "checksum error", - }, - { - .value = 0, - .str = NULL, - }, + { SNIFF_DATA_FLAG_ERROR_INCOMPLETE, "incomplete" }, + { SNIFF_DATA_FLAG_ERROR_MALFORMED, "malformed" }, + { SNIFF_DATA_FLAG_ERROR_CHECKSUM, "checksum error" }, + { 0, NULL } }; static void print_flags(const struct value_string* flag_meanings, uint32_t nb_flags, uint32_t flags) { -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Iee905c744065df1dc54f04be752a65700897a92c Gerrit-Change-Number: 16635 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 11:07:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 11:07:33 +0000 Subject: Change in osmo-ccid-firmware[master]: Add --disable-libusb for libosmocore cross-compile In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16634 ) Change subject: Add --disable-libusb for libosmocore cross-compile ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I68da7985001f4f9018995166458006ee47cdf216 Gerrit-Change-Number: 16634 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 11:07:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 11:07:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 11:07:58 +0000 Subject: Change in osmo-ccid-firmware[master]: Add --disable-libusb for libosmocore cross-compile In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16634 ) Change subject: Add --disable-libusb for libosmocore cross-compile ...................................................................... Add --disable-libusb for libosmocore cross-compile libosmocore.git after I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3 includes support for USB (and a new dependency to libusb). But there's no libusb1 in the Cortex-M4 anyway :) Change-Id: I68da7985001f4f9018995166458006ee47cdf216 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 6fd8469..c2802f8 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -41,7 +41,7 @@ autoreconf --install --force ./configure --enable-static --prefix="$inst/stow/libosmocore" --host=arm-none-eabi \ --enable-embedded --disable-doxygen --disable-shared --disable-pseudotalloc \ - --disable-libsctp --enable-external-tests \ + --disable-libsctp --disable-libusb --enable-external-tests \ CFLAGS="-Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -mthumb -Os -mlong-calls -g3 -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -I /home/laforge/projects/git/osmo-ccid-firmware/sysmoOCTSIM -Wno-error=format" make $PARALLEL_MAKE install make clean -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I68da7985001f4f9018995166458006ee47cdf216 Gerrit-Change-Number: 16634 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 11:12:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 11:12:47 +0000 Subject: Change in osmo-remsim[master]: remsim-client: Port from local copy to libosmousb + libosmo-simtrace2 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16609 ) Change subject: remsim-client: Port from local copy to libosmousb + libosmo-simtrace2 ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Idf5a861f4dacbec3c664f4ced6e03d8662c73112 Gerrit-Change-Number: 16609 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 11:12:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 11:12:49 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 11:12:49 +0000 Subject: Change in osmo-remsim[master]: remsim-client: Port from local copy to libosmousb + libosmo-simtrace2 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16609 ) Change subject: remsim-client: Port from local copy to libosmousb + libosmo-simtrace2 ...................................................................... remsim-client: Port from local copy to libosmousb + libosmo-simtrace2 We originally imported a copy of [most of] the code of simtrace2.git/host into this repository. That was a quick hack to get things going, but now that simtrace2.git is providing a shared library of simtrace2 utility functions, let's migrate over to it. At the same time, some functions (libusb_util) have been migrated to libosmousb (a new library in libosmocore.git), so we must add that as new dependency, too. This performs the minimally required changes and is *not* a proper port to the libosmousb osmocore select loop integration, whcih will follow in a separate patch. Change-Id: Idf5a861f4dacbec3c664f4ced6e03d8662c73112 Closes: OS#4298 Related: OS#4299 Depends: libosmocore.git I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3 --- M configure.ac M contrib/jenkins.sh M src/Makefile.am M src/simtrace2-remsim_client.c D src/simtrace2/apdu_dispatch.c D src/simtrace2/apdu_dispatch.h D src/simtrace2/libusb_util.c D src/simtrace2/libusb_util.h D src/simtrace2/simtrace2-discovery.c D src/simtrace2/simtrace2-discovery.h D src/simtrace2/simtrace_prot.h D src/simtrace2/simtrace_usb.h 12 files changed, 17 insertions(+), 1,119 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 2fc603d..d041c1a 100644 --- a/configure.ac +++ b/configure.ac @@ -39,6 +39,8 @@ PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.11.0) PKG_CHECK_MODULES(OSMOABIS, libosmoabis) PKG_CHECK_MODULES(OSMOSIM, libosmosim) +PKG_CHECK_MODULES(OSMOUSB, libosmousb) +PKG_CHECK_MODULES(OSMOSIMTRACE2, libosmo-simtrace2) PKG_CHECK_MODULES(USB, libusb-1.0) AC_ARG_ENABLE([remsim-server],[AS_HELP_STRING([--disable-remsim-server], [Build osmo-remsim-server])], diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 249df64..c36626e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -25,6 +25,7 @@ osmo-build-dep.sh libosmocore "" --disable-doxygen osmo-build-dep.sh libosmo-abis osmo-build-dep.sh libosmo-netif +osmo-build-dep.sh simtrace2 set +x echo diff --git a/src/Makefile.am b/src/Makefile.am index 35da621..58f02e8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,6 +9,7 @@ AM_CFLAGS = -Wall -I$(top_srcdir)/include -I$(top_builddir)/include \ $(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMOABIS_CFLAGS) \ $(PCSC_CFLAGS) $(USB_CFLAGS) $(OSMOSIM_CFLAGS) \ + $(OSMOSIMTRACE2_CFLAGS) \ -I$(top_srcdir)/include/osmocom/rspro RSPRO_LIBVERSION=1:0:0 @@ -19,12 +20,7 @@ libosmo_rspro_la_SOURCES = rspro_util.c asn1c_helpers.c noinst_HEADERS = debug.h client.h rspro_util.h slotmap.h rspro_client_fsm.h \ - asn1c_helpers.h \ - simtrace2/apdu_dispatch.h \ - simtrace2/libusb_util.h \ - simtrace2/simtrace2-discovery.h \ - simtrace2/simtrace_prot.h \ - simtrace2/simtrace_usb.h + asn1c_helpers.h bin_PROGRAMS = osmo-remsim-client-st2 @@ -33,9 +29,7 @@ libosmo-rspro.la osmo_remsim_client_st2_SOURCES = simtrace2-remsim_client.c \ - rspro_client_fsm.c debug.c \ - simtrace2/apdu_dispatch.c \ - simtrace2/simtrace2-discovery.c \ - simtrace2/libusb_util.c + rspro_client_fsm.c debug.c osmo_remsim_client_st2_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \ + $(OSMOUSB_LIBS) $(OSMOSIMTRACE2_LIBS) \ $(USB_LIBS) $(OSMOSIM_LIBS) libosmo-rspro.la diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index fc5ac55..30a9c5b 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -50,11 +50,10 @@ #include -#include "simtrace2/libusb_util.h" -#include "simtrace2/simtrace_prot.h" -#include "simtrace2/simtrace_usb.h" -#include "simtrace2/apdu_dispatch.h" -#include "simtrace2/simtrace2-discovery.h" +#include +#include +#include +#include #include #include @@ -406,7 +405,7 @@ return 0; } -static struct apdu_context ac; // this will hold the complete APDU (across calls) +static struct osmo_apdu_context ac; // this will hold the complete APDU (across calls) /*! \brief Process a RX-DATA indication message from the SIMtrace2 */ static int process_do_rx_da(struct cardem_inst *ci, uint8_t *buf, int len) @@ -417,8 +416,8 @@ printf("SIMtrace => DATA: flags=%x, %s: ", data->flags, osmo_hexdump(data->data, data->data_len)); - rc = apdu_segment_in(&ac, data->data, data->data_len, - data->flags & CEMU_DATA_F_TPDU_HDR); // parse the APDU data in the USB message + rc = osmo_apdu_segment_in(&ac, data->data, data->data_len, + data->flags & CEMU_DATA_F_TPDU_HDR); // parse the APDU data in the USB message if (rc & APDU_ACT_TX_CAPDU_TO_CARD) { // there is no pending data coming from the modem uint8_t apdu_command[sizeof(ac.hdr) + ac.lc.tot]; // to store the APDU command to send @@ -864,7 +863,7 @@ ifm->addr = addr; if (path) osmo_strlcpy(ifm->path, path, sizeof(ifm->path)); - transp->usb_devh = usb_open_claim_interface(NULL, ifm); + transp->usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, ifm); if (!transp->usb_devh) { fprintf(stderr, "can't open USB device\n"); goto close_exit; @@ -876,8 +875,8 @@ goto close_exit; } - rc = get_usb_ep_addrs(transp->usb_devh, if_num, &transp->usb_ep.out, - &transp->usb_ep.in, &transp->usb_ep.irq_in); + rc = osmo_libusb_get_ep_addrs(transp->usb_devh, if_num, &transp->usb_ep.out, + &transp->usb_ep.in, &transp->usb_ep.irq_in); if (rc < 0) { fprintf(stderr, "can't obtain EP addrs; rc=%d\n", rc); goto close_exit; diff --git a/src/simtrace2/apdu_dispatch.c b/src/simtrace2/apdu_dispatch.c deleted file mode 100644 index b9dc3b7..0000000 --- a/src/simtrace2/apdu_dispatch.c +++ /dev/null @@ -1,173 +0,0 @@ -/* apdu_dispatch - State machine to determine Rx/Tx phases of APDU - * - * (C) 2016 by Harald Welte - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "apdu_dispatch.h" - -/*! \brief Has the command-data phase been completed yet? */ -static inline bool is_dc_complete(struct apdu_context *ac) -{ - return (ac->lc.tot == ac->lc.cur); -} - -/*! \brief Has the expected-data phase been completed yet? */ -static inline bool is_de_complete(struct apdu_context *ac) -{ - return (ac->le.tot == ac->le.cur); -} - -static const char *dump_apdu_hdr(const struct osim_apdu_cmd_hdr *h) -{ - static char buf[256]; - sprintf(buf, "CLA=%02x INS=%02x P1=%02x P2=%02x P3=%02x", - h->cla, h->ins, h->p1, h->p2, h->p3); - - return buf; -} - -static void dump_apdu_ctx(const struct apdu_context *ac) -{ - printf("%s; case=%d, lc=%d(%d), le=%d(%d)\n", - dump_apdu_hdr(&ac->hdr), ac->apdu_case, - ac->lc.tot, ac->lc.cur, - ac->le.tot, ac->le.cur); -} - -/*! \brief input function for APDU segmentation - * \param ac APDU context across successive calls - * \param[in] apdu_buf APDU inpud data buffer - * \param[in] apdu_len Length of apdu_buf - * \param[in] new_apdu Is this the beginning of a new APDU? - * - * The function returns APDU_ACT_TX_CAPDU_TO_CARD once there is - * sufficient data of the APDU received to transmit the command-APDU to - * the actual card. - * - * The function retunrs APDU_ACT_RX_MORE_CAPDU_FROM_READER when there - * is more data to be received from the card reader (GSM Phone). - */ -int apdu_segment_in(struct apdu_context *ac, const uint8_t *apdu_buf, - unsigned int apdu_len, bool new_apdu) -{ - int rc = 0; - - if (new_apdu) { - /* initialize the apdu context structure */ - memset(ac, 0, sizeof(*ac)); - /* copy APDU header over */ - memcpy(&ac->hdr, apdu_buf, sizeof(ac->hdr)); - ac->apdu_case = osim_determine_apdu_case(&osim_uicc_sim_cic_profile, apdu_buf); - switch (ac->apdu_case) { - case 1: /* P3 == 0, No Lc/Le */ - ac->le.tot = ac->lc.tot = 0; - break; - case 2: /* P3 == Le */ - ac->le.tot = ac->hdr.p3; - break; - case 3: /* P3 = Lc */ - ac->lc.tot = ac->hdr.p3; - /* copy Dc */ - ac->lc.cur = apdu_len - sizeof(ac->hdr); - memcpy(ac->dc, apdu_buf + sizeof(ac->hdr), - ac->lc.cur); - break; - case 4: /* P3 = Lc; SW with Le */ - ac->lc.tot = ac->hdr.p3; - /* copy Dc */ - ac->lc.cur = apdu_len - sizeof(ac->hdr); - memcpy(ac->dc, apdu_buf + sizeof(ac->hdr), - ac->lc.cur); - break; - case 0: - default: - fprintf(stderr, "Unknown APDU case %d\n", ac->apdu_case); - return -1; - } - } else { - /* copy more data, if available */ - int cpy_len; - switch (ac->apdu_case) { - case 1: - case 2: - break; - case 3: - case 4: - cpy_len = ac->lc.tot - ac->lc.cur; - if (cpy_len > apdu_len) - cpy_len = apdu_len; - memcpy(ac->dc+ac->lc.cur, apdu_buf, cpy_len); - ac->lc.cur += cpy_len; - break; - default: - fprintf(stderr, "Unknown APDU case %d\n", ac->apdu_case); - break; - } - } - - /* take some decisions... */ - switch (ac->apdu_case) { - case 1: /* P3 == 0, No Lc/Le */ - /* send C-APDU to card */ - /* receive SW from card, forward to reader */ - rc |= APDU_ACT_TX_CAPDU_TO_CARD; - break; - case 2: /* P3 == Le */ - /* send C-APDU to card */ - /* receive Le bytes + SW from card, forward to reader */ - rc |= APDU_ACT_TX_CAPDU_TO_CARD; - break; - case 3: /* P3 = Lc */ - if (!is_dc_complete(ac)) { - /* send PB + read further Lc bytes from reader */ - rc |= APDU_ACT_RX_MORE_CAPDU_FROM_READER; - } else { - /* send C-APDU to card */ - /* receive SW from card, forward to reader */ - rc |= APDU_ACT_TX_CAPDU_TO_CARD; - } - break; - case 4: /* P3 = Lc; SW with Le */ - if (!is_dc_complete(ac)) { - /* send PB + read further Lc bytes from reader */ - rc |= APDU_ACT_RX_MORE_CAPDU_FROM_READER; - } else { - /* send C-APDU to card */ - /* receive SW from card, forward to reader */ - rc |= APDU_ACT_TX_CAPDU_TO_CARD; - } - break; - case 0: - default: - fprintf(stderr, "Unknown APDU case %d\n", ac->apdu_case); - break; - } - - dump_apdu_ctx(ac); - - return rc; -} diff --git a/src/simtrace2/apdu_dispatch.h b/src/simtrace2/apdu_dispatch.h deleted file mode 100644 index 2c99858..0000000 --- a/src/simtrace2/apdu_dispatch.h +++ /dev/null @@ -1,49 +0,0 @@ -/* apdu_dispatch - State machine to determine Rx/Tx phases of APDU - * - * (C) 2016 by Harald Welte - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#pragma once - -#include -#include - -#include - -struct apdu_context { - struct osim_apdu_cmd_hdr hdr; - uint8_t dc[256]; - uint8_t de[256]; - uint8_t sw[2]; - uint8_t apdu_case; - struct { - uint8_t tot; - uint8_t cur; - } lc; - struct { - uint8_t tot; - uint8_t cur; - } le; -}; - -enum apdu_action { - APDU_ACT_TX_CAPDU_TO_CARD = 0x0001, - APDU_ACT_RX_MORE_CAPDU_FROM_READER = 0x0002, -}; - - -int apdu_segment_in(struct apdu_context *ac, const uint8_t *apdu_buf, - unsigned int apdu_len, bool new_apdu); diff --git a/src/simtrace2/libusb_util.c b/src/simtrace2/libusb_util.c deleted file mode 100644 index 45e3f50..0000000 --- a/src/simtrace2/libusb_util.c +++ /dev/null @@ -1,297 +0,0 @@ -/* libisb utilities - * - * (C) 2010-2016 by Harald Welte - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#include -#include -#include -#include -#include -#include - -#include - -#include "libusb_util.h" - -static char path_buf[USB_MAX_PATH_LEN]; - -static char *get_path(libusb_device *dev) -{ -#if (defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102) || (defined(LIBUSBX_API_VERSION) && LIBUSBX_API_VERSION >= 0x01000102) - uint8_t path[8]; - int r,j; - r = libusb_get_port_numbers(dev, path, sizeof(path)); - if (r > 0) { - sprintf(path_buf,"%d-%d",libusb_get_bus_number(dev),path[0]); - for (j = 1; j < r; j++){ - sprintf(path_buf+strlen(path_buf),".%d",path[j]); - }; - } - return path_buf; -#else -# warning "libusb too old - building without USB path support!" - return NULL; -#endif -} - -static int match_dev_id(const struct libusb_device_descriptor *desc, const struct dev_id *id) -{ - if ((desc->idVendor == id->vendor_id) && (desc->idProduct == id->product_id)) - return 1; - return 0; -} - - -static int match_dev_ids(const struct libusb_device_descriptor *desc, const struct dev_id *ids) -{ - const struct dev_id *id; - - for (id = ids; id->vendor_id || id->product_id; id++) { - if (match_dev_id(desc, id)) - return 1; - } - return 0; -} - -libusb_device **find_matching_usb_devs(const struct dev_id *dev_ids) -{ - libusb_device **list; - libusb_device **out = calloc(256, sizeof(libusb_device *)); - libusb_device **cur = out; - unsigned int i; - int rc; - - if (!out) - return NULL; - - rc = libusb_get_device_list(NULL, &list); - if (rc <= 0) { - perror("No USB devices found"); - free(out); - return NULL; - } - - for (i = 0; list[i] != NULL; i++) { - struct libusb_device_descriptor dev_desc; - libusb_device *dev = list[i]; - - rc = libusb_get_device_descriptor(dev, &dev_desc); - if (rc < 0) { - perror("Couldn't get device descriptor\n"); - libusb_unref_device(dev); - continue; - } - - if (match_dev_ids(&dev_desc, dev_ids)) { - *cur = dev; - cur++; - /* FIXME: overflow check */ - } else - libusb_unref_device(dev); - } - if (cur == out) { - libusb_free_device_list(list, 1); - free(out); - return NULL; - } - - libusb_free_device_list(list, 0); - return out; -} - -int dev_find_matching_interfaces(libusb_device *dev, int class, int sub_class, int protocol, - struct usb_interface_match *out, unsigned int out_len) -{ - struct libusb_device_descriptor dev_desc; - int rc, i, out_idx = 0; - uint8_t addr; - char *path; - - rc = libusb_get_device_descriptor(dev, &dev_desc); - if (rc < 0) { - perror("Couldn't get device descriptor\n"); - return -EIO; - } - - addr = libusb_get_device_address(dev); - path = get_path(dev); - - /* iterate over all configurations */ - for (i = 0; i < dev_desc.bNumConfigurations; i++) { - struct libusb_config_descriptor *conf_desc; - int j; - - rc = libusb_get_config_descriptor(dev, i, &conf_desc); - if (rc < 0) { - fprintf(stderr, "Couldn't get config descriptor %u\n", i); - continue; - } - /* iterate over all interfaces */ - for (j = 0; j < conf_desc->bNumInterfaces; j++) { - const struct libusb_interface *intf = &conf_desc->interface[j]; - int k; - /* iterate over all alternate settings */ - for (k = 0; k < intf->num_altsetting; k++) { - const struct libusb_interface_descriptor *if_desc; - if_desc = &intf->altsetting[k]; - if (class >= 0 && if_desc->bInterfaceClass != class) - continue; - if (sub_class >= 0 && if_desc->bInterfaceSubClass != sub_class) - continue; - if (protocol >= 0 && if_desc->bInterfaceProtocol != protocol) - continue; - /* MATCH! */ - out[out_idx].usb_dev = dev; - out[out_idx].vendor = dev_desc.idVendor; - out[out_idx].product = dev_desc.idProduct; - out[out_idx].addr = addr; - strncpy(out[out_idx].path, path, sizeof(out[out_idx].path)-1); - out[out_idx].path[sizeof(out[out_idx].path)-1] = '\0'; - out[out_idx].configuration = conf_desc->bConfigurationValue; - out[out_idx].interface = if_desc->bInterfaceNumber; - out[out_idx].altsetting = if_desc->bAlternateSetting; - out[out_idx].class = if_desc->bInterfaceClass; - out[out_idx].sub_class = if_desc->bInterfaceSubClass; - out[out_idx].protocol = if_desc->bInterfaceProtocol; - out[out_idx].string_idx = if_desc->iInterface; - out_idx++; - if (out_idx >= out_len) - return out_idx; - } - } - } - return out_idx; -} - -int usb_match_interfaces(libusb_context *ctx, const struct dev_id *dev_ids, - int class, int sub_class, int protocol, - struct usb_interface_match *out, unsigned int out_len) -{ - struct usb_interface_match *out_cur = out; - unsigned int out_len_remain = out_len; - libusb_device **list; - libusb_device **dev; - - list = find_matching_usb_devs(dev_ids); - if (!list) - return 0; - - for (dev = list; *dev; dev++) { - int rc; - -#if 0 - struct libusb_device_descriptor dev_desc; - uint8_t ports[8]; - uint8_t addr; - rc = libusb_get_device_descriptor(*dev, &dev_desc); - if (rc < 0) { - perror("Cannot get device descriptor"); - continue; - } - - addr = libusb_get_device_address(*dev); - - rc = libusb_get_port_numbers(*dev, ports, sizeof(ports)); - if (rc < 0) { - perror("Cannot get device path"); - continue; - } - - printf("Found USB Device %04x:%04x at address %d\n", - dev_desc.idVendor, dev_desc.idProduct, addr); -#endif - - rc = dev_find_matching_interfaces(*dev, class, sub_class, protocol, out_cur, out_len_remain); - if (rc < 0) - continue; - out_cur += rc; - out_len_remain -= rc; - - } - return out_len - out_len_remain; -} - -libusb_device_handle *usb_open_claim_interface(libusb_context *ctx, - const struct usb_interface_match *ifm) -{ - int rc, config; - struct dev_id dev_ids[] = { { ifm->vendor, ifm->product }, { 0, 0 } }; - libusb_device **list; - libusb_device **dev; - libusb_device_handle *usb_devh = NULL; - - list = find_matching_usb_devs(dev_ids); - if (!list) { - perror("No USB device with matching VID/PID"); - return NULL; - } - - for (dev = list; *dev; dev++) { - int addr; - char *path; - - addr = libusb_get_device_address(*dev); - path = get_path(*dev); - if ((ifm->addr && addr == ifm->addr) || - (strlen(ifm->path) && !strcmp(path, ifm->path))) { - rc = libusb_open(*dev, &usb_devh); - if (rc < 0) { - fprintf(stderr, "Cannot open device: %s\n", libusb_error_name(rc)); - usb_devh = NULL; - break; - } - rc = libusb_get_configuration(usb_devh, &config); - if (rc < 0) { - fprintf(stderr, "Cannot get current configuration: %s\n", libusb_error_name(rc)); - libusb_close(usb_devh); - usb_devh = NULL; - break; - } - if (config != ifm->configuration) { - rc = libusb_set_configuration(usb_devh, ifm->configuration); - if (rc < 0) { - fprintf(stderr, "Cannot set configuration: %s\n", libusb_error_name(rc)); - libusb_close(usb_devh); - usb_devh = NULL; - break; - } - } - rc = libusb_claim_interface(usb_devh, ifm->interface); - if (rc < 0) { - fprintf(stderr, "Cannot claim interface: %s\n", libusb_error_name(rc)); - libusb_close(usb_devh); - usb_devh = NULL; - break; - } - rc = libusb_set_interface_alt_setting(usb_devh, ifm->interface, ifm->altsetting); - if (rc < 0) { - fprintf(stderr, "Cannot set interface altsetting: %s\n", libusb_error_name(rc)); - libusb_release_interface(usb_devh, ifm->interface); - libusb_close(usb_devh); - usb_devh = NULL; - break; - } - } - } - - /* unref / free list */ - for (dev = list; *dev; dev++) - libusb_unref_device(*dev); - free(list); - - return usb_devh; -} diff --git a/src/simtrace2/libusb_util.h b/src/simtrace2/libusb_util.h deleted file mode 100644 index 2b2d92e..0000000 --- a/src/simtrace2/libusb_util.h +++ /dev/null @@ -1,70 +0,0 @@ -/* libisb utilities - * - * (C) 2010-2016 by Harald Welte - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#pragma once - -#include - -#define USB_MAX_PATH_LEN 20 - -struct dev_id { - uint16_t vendor_id; - uint16_t product_id; -}; - -/* Find any USB devices in the system matching the given Vendor and - * Product ID */ -libusb_device **find_matching_usb_devs(const struct dev_id *dev_ids); - -/* structure describing a single matching interface found */ -struct usb_interface_match { - /* libusb device E*/ - libusb_device *usb_dev; - /* Vendor ID of the device running matching interface */ - uint16_t vendor; - /* Product ID of the device running matching interface */ - uint16_t product; - /* USB Bus Address */ - uint8_t addr; - /* physical path */ - char path[USB_MAX_PATH_LEN]; - /* configuration of matching interface */ - uint8_t configuration; - /* interface number of matching interface */ - uint8_t interface; - /* altsetting of matching interface */ - uint8_t altsetting; - /* bInterfaceClass of matching interface */ - uint8_t class; - /* bInterfaceSubClass of matching interface */ - uint8_t sub_class; - /* bInterfaceProtocol of matching interface */ - uint8_t protocol; - /* index of string descriptor of matching interface */ - uint8_t string_idx; -}; - -int dev_find_matching_interfaces(libusb_device *dev, int class, int sub_class, int protocol, - struct usb_interface_match *out, unsigned int out_len); - -int usb_match_interfaces(libusb_context *ctx, const struct dev_id *dev_ids, - int class, int sub_class, int protocol, - struct usb_interface_match *out, unsigned int out_len); - -libusb_device_handle *usb_open_claim_interface(libusb_context *ctx, - const struct usb_interface_match *ifm); diff --git a/src/simtrace2/simtrace2-discovery.c b/src/simtrace2/simtrace2-discovery.c deleted file mode 100644 index a7306ce..0000000 --- a/src/simtrace2/simtrace2-discovery.c +++ /dev/null @@ -1,94 +0,0 @@ -/* simtrace2-discovery - host PC library to scan for matching USB - * devices - * - * (C) 2016 by Harald Welte - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#include - -#include - -/*! \brief obtain the endpoint addresses for a given USB interface */ -int get_usb_ep_addrs(libusb_device_handle *devh, unsigned int if_num, - uint8_t *out, uint8_t *in, uint8_t *irq) -{ - libusb_device *dev = libusb_get_device(devh); - struct libusb_config_descriptor *cdesc; - const struct libusb_interface_descriptor *idesc; - const struct libusb_interface *iface; - int rc, l; - - rc = libusb_get_active_config_descriptor(dev, &cdesc); - if (rc < 0) - return rc; - - iface = &cdesc->interface[if_num]; - /* FIXME: we assume there's no altsetting */ - idesc = &iface->altsetting[0]; - - for (l = 0; l < idesc->bNumEndpoints; l++) { - const struct libusb_endpoint_descriptor *edesc = &idesc->endpoint[l]; - switch (edesc->bmAttributes & 3) { - case LIBUSB_TRANSFER_TYPE_BULK: - if (edesc->bEndpointAddress & 0x80) { - if (in) - *in = edesc->bEndpointAddress; - } else { - if (out) - *out = edesc->bEndpointAddress; - } - break; - case LIBUSB_TRANSFER_TYPE_INTERRUPT: - if (irq) - *irq = edesc->bEndpointAddress; - break; - default: - break; - } - } - return 0; -} - -#if 0 - struct libusb_device_descriptor ddesc; - int rc, i, j, k; - - rc = libusb_get_device_descriptor(devh, &ddesc); - if (rc < 0) - return; - - for (i = 0; i < ddesc.bNumConfigurations; i++) { - struct libusb_config_descriptor *cdesc; - rc = libusb_get_config_descriptor(devh, i, &cdesc); - if (rc < 0) - return; - - for (j = 0; j < cdesc->bNumInterfaces; j++) { - const struct libusb_interface *iface = cdesc->interface[j]; - for (k = 0; k < iface->num_altsetting; k++) { - const struct libusb_interface_descriptor *idesc = iface->altsetting[k]; - /* make sure this is the interface we're looking for */ - if (idesc->bInterfaceClass != 0xFF || - idesc->bInterfaceSubClass != if_class || - idsec->bInterfaceProtocol != if_proto) - continue; - /* FIXME */ - } - } - - libusb_free_config_descriptor(cdesc); - } -#endif diff --git a/src/simtrace2/simtrace2-discovery.h b/src/simtrace2/simtrace2-discovery.h deleted file mode 100644 index cfba956..0000000 --- a/src/simtrace2/simtrace2-discovery.h +++ /dev/null @@ -1,26 +0,0 @@ -/* simtrace2-discovery - host PC library to scan for matching USB - * devices - * - * (C) 2016 by Harald Welte - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#pragma once - -#include -#include - -int get_usb_ep_addrs(libusb_device_handle *devh, unsigned int if_num, - uint8_t *out, uint8_t *in, uint8_t *irq); diff --git a/src/simtrace2/simtrace_prot.h b/src/simtrace2/simtrace_prot.h deleted file mode 100644 index 878bc34..0000000 --- a/src/simtrace2/simtrace_prot.h +++ /dev/null @@ -1,322 +0,0 @@ -/* SIMtrace2 USB protocol - * - * (C) 2015-2017 by Harald Welte - * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA - */ -#pragma once - -#include -#include - -/*********************************************************************** - * COMMON HEADER - ***********************************************************************/ - -enum simtrace_msg_class { - SIMTRACE_MSGC_GENERIC = 0, - /* Card Emulation / Forwarding */ - SIMTRACE_MSGC_CARDEM, - /* Modem Control (if modem is attached next to device) */ - SIMTRACE_MSGC_MODEM, - /* Reader/phone-car/SIM communication sniff */ - SIMTRACE_MSGC_SNIFF, - - /* first vendor-specific request */ - _SIMTRACE_MGSC_VENDOR_FIRST = 127, -}; - -enum simtrace_msg_type_generic { - /* Generic Error Message */ - SIMTRACE_CMD_DO_ERROR = 0, - /* Request/Response for simtrace_board_info */ - SIMTRACE_CMD_BD_BOARD_INFO, -}; - -/* SIMTRACE_MSGC_CARDEM */ -enum simtrace_msg_type_cardem { - /* TPDU Data to be transmitted to phone */ - SIMTRACE_MSGT_DT_CEMU_TX_DATA = 1, - /* Set the ATR to be returned at phone-SIM reset */ - SIMTRACE_MSGT_DT_CEMU_SET_ATR, - /* Get Statistics Request / Response */ - SIMTRACE_MSGT_BD_CEMU_STATS, - /* Get Status Request / Response */ - SIMTRACE_MSGT_BD_CEMU_STATUS, - /* Request / Confirm emulated card insert */ - SIMTRACE_MSGT_DT_CEMU_CARDINSERT, - /* TPDU Data received from phomne */ - SIMTRACE_MSGT_DO_CEMU_RX_DATA, - /* Indicate PTS request from phone */ - SIMTRACE_MSGT_DO_CEMU_PTS, -}; - -/* SIMTRACE_MSGC_MODEM */ -enum simtrace_msg_type_modem { - /* Modem Control: Reset an attached modem */ - SIMTRACE_MSGT_DT_MODEM_RESET = 1, - /* Modem Control: Select local / remote SIM */ - SIMTRACE_MSGT_DT_MODEM_SIM_SELECT, - /* Modem Control: Status (WWAN LED, SIM Presence) */ - SIMTRACE_MSGT_BD_MODEM_STATUS, -}; - -/* SIMTRACE_MSGC_SNIFF */ -enum simtrace_msg_type_sniff { - /* Status change (card inserted, reset, ...) */ - SIMTRACE_MSGT_SNIFF_CHANGE = 0, - /* Fi/Di baudrate change */ - SIMTRACE_MSGT_SNIFF_FIDI, - /* ATR data */ - SIMTRACE_MSGT_SNIFF_ATR, - /* PPS (request or response) data */ - SIMTRACE_MSGT_SNIFF_PPS, - /* TPDU data */ - SIMTRACE_MSGT_SNIFF_TPDU, -}; - -/* common message header */ -struct simtrace_msg_hdr { - uint8_t msg_class; /* simtrace_msg_class */ - uint8_t msg_type; /* simtrace_msg_type_xxx */ - uint8_t seq_nr; - uint8_t slot_nr; /* SIM slot number */ - uint16_t _reserved; - uint16_t msg_len; /* length including header */ - uint8_t payload[0]; -} __attribute__ ((packed)); - -/*********************************************************************** - * Capabilities - ***********************************************************************/ - -/* generic capabilities */ -enum simtrace_capability_generic { - /* compatible with 5V SIM card interface */ - SIMTRACE_CAP_VOLT_5V, - /* compatible with 3.3V SIM card interface */ - SIMTRACE_CAP_VOLT_3V3, - /* compatible with 1.8V SIM card interface */ - SIMTRACE_CAP_VOLT_1V8, - /* Has LED1 */ - SIMTRACE_CAP_LED_1, - /* Has LED2 */ - SIMTRACE_CAP_LED_2, - /* Has Single-Pole Dual-Throw (local/remote SIM) */ - SIMTRACE_CAP_SPDT, - /* Has Bus-Switch (trace / MITM) */ - SIMTRACE_CAP_BUS_SWITCH, - /* Can read VSIM via ADC */ - SIMTRACE_CAP_VSIM_ADC, - /* Can read temperature via ADC */ - SIMTRACE_CAP_TEMP_ADC, - /* Supports DFU for firmware update */ - SIMTRACE_CAP_DFU, - /* Supports Ctrl EP command for erasing flash / return to SAM-BA */ - SIMTRACE_CAP_ERASE_FLASH, - /* Can read the status of card insert contact */ - SIMTRACE_CAP_READ_CARD_DET, - /* Can control the status of a simulated card insert */ - SIMTRACE_CAP_ASSERT_CARD_DET, - /* Can toggle the hardware reset of an attached modem */ - SIMTRACE_CAP_ASSERT_MODEM_RST, -}; - -/* vendor-specific capabilities of sysmocom devices */ -enum simtrace_capability_vendor { - /* Can erase a peer SAM3 controller */ - SIMTRACE_CAP_SYSMO_QMOD_ERASE_PEER, - /* Can read/write an attached EEPROM */ - SIMTRACE_CAP_SYSMO_QMOD_RW_EEPROM, - /* can reset an attached USB hub */ - SIMTRACE_CAP_SYSMO_QMOD_RESET_HUB, -}; - -/* SIMTRACE_CMD_BD_BOARD_INFO */ -struct simtrace_board_info { - struct { - char manufacturer[32]; - char model[32]; - char version[32]; - } hardware; - struct { - /* who provided this software? */ - char provider[32]; - /* name of software image */ - char name[32]; - /* (git) version at build time */ - char version[32]; - /* built on which machine? */ - char buildhost[32]; - /* CRC-32 over software image */ - uint32_t crc; - } software; - struct { - /* Maximum baud rate supported */ - uint32_t max_baud_rate; - } speed; - /* number of bytes of generic capability bit-mask */ - uint8_t cap_generic_bytes; - /* number of bytes of vendor capability bit-mask */ - uint8_t cap_vendor_bytes; - uint8_t data[0]; - /* cap_generic + cap_vendor */ -} __attribute__ ((packed)); - -/*********************************************************************** - * CARD EMULATOR / FORWARDER - ***********************************************************************/ - -/* indicates a TPDU header is present in this message */ -#define CEMU_DATA_F_TPDU_HDR 0x00000001 -/* indicates last part of transmission in this direction */ -#define CEMU_DATA_F_FINAL 0x00000002 -/* incdicates a PB is present and we should continue with TX */ -#define CEMU_DATA_F_PB_AND_TX 0x00000004 -/* incdicates a PB is present and we should continue with RX */ -#define CEMU_DATA_F_PB_AND_RX 0x00000008 - -/* CEMU_USB_MSGT_DT_CARDINSERT */ -struct cardemu_usb_msg_cardinsert { - uint8_t card_insert; -} __attribute__ ((packed)); - -/* CEMU_USB_MSGT_DT_SET_ATR */ -struct cardemu_usb_msg_set_atr { - uint8_t atr_len; - /* variable-length ATR data */ - uint8_t atr[0]; -} __attribute__ ((packed)); - -/* CEMU_USB_MSGT_DT_TX_DATA */ -struct cardemu_usb_msg_tx_data { - uint32_t flags; - uint16_t data_len; - /* variable-length TPDU data */ - uint8_t data[0]; -} __attribute__ ((packed)); - -/* CEMU_USB_MSGT_DO_RX_DATA */ -struct cardemu_usb_msg_rx_data { - uint32_t flags; - uint16_t data_len; - /* variable-length TPDU data */ - uint8_t data[0]; -} __attribute__ ((packed)); - -#define CEMU_STATUS_F_VCC_PRESENT 0x00000001 -#define CEMU_STATUS_F_CLK_ACTIVE 0x00000002 -#define CEMU_STATUS_F_RCEMU_ACTIVE 0x00000004 -#define CEMU_STATUS_F_CARD_INSERT 0x00000008 -#define CEMU_STATUS_F_RESET_ACTIVE 0x00000010 - -/* CEMU_USB_MSGT_DO_STATUS */ -struct cardemu_usb_msg_status { - uint32_t flags; - /* phone-applied target voltage in mV */ - uint16_t voltage_mv; - /* Fi/Di related information */ - uint8_t fi; - uint8_t di; - uint8_t wi; - uint32_t waiting_time; -} __attribute__ ((packed)); - -/* CEMU_USB_MSGT_DO_PTS */ -struct cardemu_usb_msg_pts_info { - uint8_t pts_len; - /* PTS request as sent from reader */ - uint8_t req[6]; - /* PTS response as sent by card */ - uint8_t resp[6]; -} __attribute__ ((packed)); - -/* CEMU_USB_MSGT_DO_ERROR */ -struct cardemu_usb_msg_error { - uint8_t severity; - uint8_t subsystem; - uint16_t code; - uint8_t msg_len; - /* human-readable error message */ - uint8_t msg[0]; -} __attribute__ ((packed)); - -/*********************************************************************** - * MODEM CONTROL - ***********************************************************************/ - -/* SIMTRACE_MSGT_DT_MODEM_RESET */ -struct st_modem_reset { - /* 0: de-assert reset, 1: assert reset, 2: pulse reset */ - uint8_t asserted; - /* if above is '2', duration of pulse in ms */ - uint16_t pulse_duration_msec; -} __attribute__((packed)); - -/* SIMTRACE_MSGT_DT_MODEM_SIM_SELECT */ -struct st_modem_sim_select { - /* remote (1), local (0) */ - uint8_t remote_sim; -} __attribute__((packed)); - -/* SIMTRACE_MSGT_BD_MODEM_STATUS */ -#define ST_MDM_STS_BIT_WWAN_LED (1 << 0) -#define ST_MDM_STS_BIT_CARD_INSERTED (1 << 1) -struct st_modem_status { - /* bit-field of supported status bits */ - uint8_t supported_mask; - /* bit-field of current status bits */ - uint8_t status_mask; - /* bit-field of changed status bits */ - uint8_t changed_mask; -} __attribute__((packed)); - -/*********************************************************************** - * SNIFF - ***********************************************************************/ - -/* SIMTRACE_MSGT_SNIFF_CHANGE flags */ -#define SNIFF_CHANGE_FLAG_CARD_INSERT (1<<0) -#define SNIFF_CHANGE_FLAG_CARD_EJECT (1<<1) -#define SNIFF_CHANGE_FLAG_RESET_ASSERT (1<<2) -#define SNIFF_CHANGE_FLAG_RESET_DEASSERT (1<<3) -#define SNIFF_CHANGE_FLAG_TIMEOUT_WT (1<<4) -/* SIMTRACE_MSGT_SNIFF_ATR, SIMTRACE_MSGT_SNIFF_PPS, SIMTRACE_MSGT_SNIFF_TPDU flags */ -#define SNIFF_DATA_FLAG_ERROR_INCOMPLETE (1<<5) -#define SNIFF_DATA_FLAG_ERROR_MALFORMED (1<<6) -#define SNIFF_DATA_FLAG_ERROR_CHECKSUM (1<<7) - -/* SIMTRACE_MSGT_SNIFF_CHANGE */ -struct sniff_change { - /* SIMTRACE_MSGT_SNIFF_CHANGE flags */ - uint32_t flags; -} __attribute__ ((packed)); - -/* SIMTRACE_MSGT_SNIFF_FIDI */ -struct sniff_fidi { - /* Fi/Di values as encoded in TA1 */ - uint8_t fidi; -} __attribute__ ((packed)); - -/* SIMTRACE_MSGT_SNIFF_ATR, SIMTRACE_MSGT_SNIFF_PPS, SIMTRACE_MSGT_SNIFF_TPDU */ -struct sniff_data { - /* data flags */ - uint32_t flags; - /* data length */ - uint16_t length; - /* data */ - uint8_t data[0]; -} __attribute__ ((packed)); diff --git a/src/simtrace2/simtrace_usb.h b/src/simtrace2/simtrace_usb.h deleted file mode 100644 index c0da9c5..0000000 --- a/src/simtrace2/simtrace_usb.h +++ /dev/null @@ -1,67 +0,0 @@ -/* SIMtrace 2 USB definitions - * - * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA - */ -/* SIMtrace USB IDs */ -#define USB_VENDOR_OPENMOKO 0x1d50 -#define USB_PRODUCT_OWHW_SAM3_DFU 0x4001 /* was 0x4000 */ -#define USB_PRODUCT_OWHW_SAM3 0x4001 -#define USB_PRODUCT_QMOD_HUB 0x4002 -#define USB_PRODUCT_QMOD_SAM3_DFU 0x4004 /* was 0x4003 */ -#define USB_PRODUCT_QMOD_SAM3 0x4004 -#define USB_PRODUCT_SIMTRACE2_DFU 0x60e3 /* was 0x60e2 */ -#define USB_PRODUCT_SIMTRACE2 0x60e3 - -/* USB proprietary class */ -#define USB_CLASS_PROPRIETARY 0xff - -/* SIMtrace USB sub-classes */ -/*! Sniffer USB sub-class */ -#define SIMTRACE_SNIFFER_USB_SUBCLASS 1 -/*! Card-emulation USB sub-class */ -#define SIMTRACE_CARDEM_USB_SUBCLASS 2 - -/* Generic USB endpoint numbers */ -/*! Card-side USB data out (host to device) endpoint number */ -#define SIMTRACE_USB_EP_CARD_DATAOUT 1 -/*! Card-side USB data in (device to host) endpoint number */ -#define SIMTRACE_USB_EP_CARD_DATAIN 2 -/*! Card-side USB interrupt endpoint number */ -#define SIMTRACE_USB_EP_CARD_INT 3 -/*! Phone-side USB data out (host to device) endpoint number */ -#define SIMTRACE_USB_EP_PHONE_DATAOUT 4 -/*! Phone-side USB data in (device to host) endpoint number */ -#define SIMTRACE_USB_EP_PHONE_DATAIN 5 -/*! Phone-side USB interrupt endpoint number */ -#define SIMTRACE_USB_EP_PHONE_INT 6 - -/* Card-emulation USB endpoint numbers */ -/*! USIM1 USB data out (host to device) endpoint number */ -#define SIMTRACE_CARDEM_USB_EP_USIM1_DATAOUT 4 -/*! USIM1 USB data in (device to host) endpoint number */ -#define SIMTRACE_CARDEM_USB_EP_USIM1_DATAIN 5 -/*! USIM1 USB interrupt endpoint number */ -#define SIMTRACE_CARDEM_USB_EP_USIM1_INT 6 -/*! USIM2 USB data out (host to device) endpoint number */ -#define SIMTRACE_CARDEM_USB_EP_USIM2_DATAOUT 1 -/*! USIM2 USB data in (device to host) endpoint number */ -#define SIMTRACE_CARDEM_USB_EP_USIM2_DATAIN 2 -/*! USIM2 USB interrupt endpoint number */ -#define SIMTRACE_CARDEM_USB_EP_USIM2_INT 3 - -/*! Maximum number of endpoints */ -#define BOARD_USB_NUMENDPOINTS 6 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Idf5a861f4dacbec3c664f4ced6e03d8662c73112 Gerrit-Change-Number: 16609 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Dec 17 11:13:13 2019 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 17 Dec 2019 11:13:13 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:?= =?UTF-8?Q?_master-osmo-ccid-firmware_=C2=BB_a1=3Dd?= =?UTF-8?Q?efault,a2=3Ddefault,a3=3Ddefault,a4=3Dd?= =?UTF-8?Q?efault,osmocom-master-debian9_#23?= In-Reply-To: <2097582027.724.1576573676014.JavaMail.jenkins@jenkins.osmocom.org> References: <2097582027.724.1576573676014.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <63868986.726.1576581193585.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue Dec 17 11:13:27 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 11:13:27 +0000 Subject: Change in osmo-remsim[master]: remsim-client: Fix the -k/ --keep-running option In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-remsim/+/16623 to look at the new patch set (#2). Change subject: remsim-client: Fix the -k/ --keep-running option ...................................................................... remsim-client: Fix the -k/ --keep-running option When introducing asynchronous USB support in Change-Id Ic18690b3c2cbc5e99de0665c0b68b7555433b3cd, we accidentially broke the --keep-running behavior, where even a disappearing USB device will not terminate the remsim-client process. Change-Id: I67a3a5941434f09f7099c2cdb19c126cea305a73 --- M configure.ac M src/Makefile.am M src/bankd/bankd.h A src/client/Makefile.am R src/client/client.h R src/client/remsim_client.c R src/client/simtrace2-remsim_client.c M src/rspro_client_fsm.c M src/rspro_client_fsm.h 9 files changed, 58 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/23/16623/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I67a3a5941434f09f7099c2cdb19c126cea305a73 Gerrit-Change-Number: 16623 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 11:27:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 11:27:35 +0000 Subject: Change in libosmocore[master]: Introduce helper functions for safe fork+exec of processes In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16619 ) Change subject: Introduce helper functions for safe fork+exec of processes ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/16619/2/src/exec.c File src/exec.c: https://gerrit.osmocom.org/c/libosmocore/+/16619/2/src/exec.c at 116 PS2, Line 116: int osmo_environment_append(char **out, size_t out_len, char **in) > Not sure if appending an already existing key to the list makes it really overwrite it. [?] I'll simply document that constraint to avoid spending more time on this right now. https://gerrit.osmocom.org/c/libosmocore/+/16619/2/src/exec.c at 124 PS2, Line 124: for (out_used = 0; out[out_used]; out_used++) {} > for (out_used = 0; out[out_used]; out_used++); what's wrong with the {} ? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib24ac8a083db32e55402ce496a5eabd8749cc888 Gerrit-Change-Number: 16619 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 17 Dec 2019 11:27:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 11:35:51 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 17 Dec 2019 11:35:51 +0000 Subject: Change in docker-playground[master]: pcu-master: Remove non-existent --enable-trx configure option from Do... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16526 ) Change subject: pcu-master: Remove non-existent --enable-trx configure option from Dockerfile ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I24f10e2b99771cdd5a1e72a1ad5626aff649258f Gerrit-Change-Number: 16526 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 17 Dec 2019 11:35:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 11:38:06 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 11:38:06 +0000 Subject: Change in libosmocore[master]: Introduce helper functions for safe fork+exec of processes In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16619 ) Change subject: Introduce helper functions for safe fork+exec of processes ...................................................................... Patch Set 2: (4 comments) https://gerrit.osmocom.org/c/libosmocore/+/16619/2/src/exec.c File src/exec.c: https://gerrit.osmocom.org/c/libosmocore/+/16619/2/src/exec.c at 64 PS2, Line 64: /*! generate a filtered version of the process environment containing only entries of whitelisted keys. > Worth mentioning that strings in our are shared from in, ie strings are not copied. Done https://gerrit.osmocom.org/c/libosmocore/+/16619/2/src/exec.c at 67 PS2, Line 67: * \param[in] in input environment (NULL-terminated list of pointers like **environment) > worth mentioning where does this **environment come from. Done https://gerrit.osmocom.org/c/libosmocore/+/16619/2/src/exec.c at 169 PS2, Line 169: extern char **environ; > unistd.h: [?] I can see that in my unistd.h, too - but somehow it simply doesn't work. https://gerrit.osmocom.org/c/libosmocore/+/16619/2/src/exec.c at 172 PS2, Line 172: int osmo_system_nowait(const char *command, char **addl_env) > addl_env? Please document the params. Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib24ac8a083db32e55402ce496a5eabd8749cc888 Gerrit-Change-Number: 16619 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 17 Dec 2019 11:38:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 11:39:31 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 11:39:31 +0000 Subject: Change in libosmocore[master]: Introduce helper functions for safe fork+exec of processes In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/16619 to look at the new patch set (#3). Change subject: Introduce helper functions for safe fork+exec of processes ...................................................................... Introduce helper functions for safe fork+exec of processes In some situations, we want to execute an external shell command in a non-blocking way. Similar to 'system', but without waiting for the child to complete. We also want to close all file descriptors ahead of the exec() and filter + modify the environment. Change-Id: Ib24ac8a083db32e55402ce496a5eabd8749cc888 Related: OS#4332 --- M include/Makefile.am A include/osmocom/core/exec.h M src/Makefile.am A src/exec.c M tests/Makefile.am A tests/exec/exec_test.c A tests/exec/exec_test.err A tests/exec/exec_test.ok M tests/testsuite.at 9 files changed, 477 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/19/16619/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib24ac8a083db32e55402ce496a5eabd8749cc888 Gerrit-Change-Number: 16619 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 11:43:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 11:43:53 +0000 Subject: Change in ...osmo-python-tests[master]: update version to 0.2.0 to mark python2 deprecation References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16636 ) Change subject: update version to 0.2.0 to mark python2 deprecation ...................................................................... update version to 0.2.0 to mark python2 deprecation Change-Id: Ie0e0bef3167648ad54e191378dfe170e1493c27e --- M osmopy/__init__.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/36/16636/1 diff --git a/osmopy/__init__.py b/osmopy/__init__.py index 18362ec..d3c714b 100644 --- a/osmopy/__init__.py +++ b/osmopy/__init__.py @@ -1,4 +1,4 @@ #!/usr/bin/env python3 -__version__ = '0.1.0' +__version__ = '0.2.0' __all__ = ['obscvty', 'osmoutil', 'osmo_ipa', 'osmo_interact', 'trap_helper', 'twisted_ipa'] -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Ie0e0bef3167648ad54e191378dfe170e1493c27e Gerrit-Change-Number: 16636 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 11:48:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 11:48:37 +0000 Subject: Change in ...osmo-python-tests[master]: update version to 0.2.0 to mark python2 deprecation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16636 ) Change subject: update version to 0.2.0 to mark python2 deprecation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Ie0e0bef3167648ad54e191378dfe170e1493c27e Gerrit-Change-Number: 16636 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 11:48:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 11:48:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 11:48:39 +0000 Subject: Change in ...osmo-python-tests[master]: update version to 0.2.0 to mark python2 deprecation In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16636 ) Change subject: update version to 0.2.0 to mark python2 deprecation ...................................................................... update version to 0.2.0 to mark python2 deprecation Change-Id: Ie0e0bef3167648ad54e191378dfe170e1493c27e --- M osmopy/__init__.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/osmopy/__init__.py b/osmopy/__init__.py index 18362ec..d3c714b 100644 --- a/osmopy/__init__.py +++ b/osmopy/__init__.py @@ -1,4 +1,4 @@ #!/usr/bin/env python3 -__version__ = '0.1.0' +__version__ = '0.2.0' __all__ = ['obscvty', 'osmoutil', 'osmo_ipa', 'osmo_interact', 'trap_helper', 'twisted_ipa'] -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/16636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Ie0e0bef3167648ad54e191378dfe170e1493c27e Gerrit-Change-Number: 16636 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 11:48:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 11:48:51 +0000 Subject: Change in docker-playground[master]: pcu-master: Remove non-existent --enable-trx configure option from Do... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16526 ) Change subject: pcu-master: Remove non-existent --enable-trx configure option from Dockerfile ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I24f10e2b99771cdd5a1e72a1ad5626aff649258f Gerrit-Change-Number: 16526 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 17 Dec 2019 11:48:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 11:48:56 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 11:48:56 +0000 Subject: Change in docker-playground[master]: pcu-master: Remove non-existent --enable-trx configure option from Do... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16526 ) Change subject: pcu-master: Remove non-existent --enable-trx configure option from Dockerfile ...................................................................... pcu-master: Remove non-existent --enable-trx configure option from Dockerfile configure: WARNING: unrecognized options: --enable-trx Change-Id: I24f10e2b99771cdd5a1e72a1ad5626aff649258f --- M osmo-pcu-master/Dockerfile 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve; Verified diff --git a/osmo-pcu-master/Dockerfile b/osmo-pcu-master/Dockerfile index 01f7755..1aed8c9 100644 --- a/osmo-pcu-master/Dockerfile +++ b/osmo-pcu-master/Dockerfile @@ -32,7 +32,7 @@ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_PCU_BRANCH || exit 1); \ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ - ./configure --enable-trx && \ + ./configure && \ make -j8 install VOLUME /data @@ -42,4 +42,4 @@ WORKDIR /data CMD ["/usr/local/bin/osmo-pcu", "-i", "172.18.0.230"] -#EXPOSE +#EXPOSE -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I24f10e2b99771cdd5a1e72a1ad5626aff649258f Gerrit-Change-Number: 16526 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 11:58:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 11:58:30 +0000 Subject: Change in simtrace2[master]: firmware: Reformat value_string to pass our validation scripts References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16637 ) Change subject: firmware: Reformat value_string to pass our validation scripts ...................................................................... firmware: Reformat value_string to pass our validation scripts This is a purely cosmetic change in terms of coding style, but it fixes an [invalid] detection for unterminated value_string arrays by our verify_value_string_arrays_are_terminated.py script: Change-Id: I2f2370a673074f6bf5380106b6254b4aa1e8a792 ERROR: file contains unterminated value_string 'struct value_string iso7816_3_card_state_names[]': './deps/simtrace2/firmware/libcommon/source/card_emu.c' ERROR: file contains unterminated value_string 'struct value_string tpdu_state_names[]': './deps/simtrace2/firmware/libcommon/source/card_emu.c' --- M firmware/libcommon/source/card_emu.c M firmware/libcommon/source/sniffer.c 2 files changed, 22 insertions(+), 88 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/37/16637/1 diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 7a541e5..cad24b8 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -58,42 +58,15 @@ }; const struct value_string iso7816_3_card_state_names[] = { - { - .value = ISO_S_WAIT_POWER, - .str = "WAIT_POWER", - }, - { - .value = ISO_S_WAIT_CLK, - .str = "WAIT_CLK", - }, - { - .value = ISO_S_WAIT_RST, - .str = "WAIT_RST", - }, - { - .value = ISO_S_WAIT_ATR, - .str = "WAIT_ATR", - }, - { - .value = ISO_S_IN_ATR, - .str = "IN_ATR", - }, - { - .value = ISO_S_IN_PTS, - .str = "IN_PTS", - }, - { - .value = ISO_S_WAIT_TPDU, - .str = "WAIT_TPDU", - }, - { - .value = ISO_S_IN_TPDU, - .str = "IN_TPDU", - }, - { - .value = 0, - .str = NULL, - }, + { ISO_S_WAIT_POWER, "WAIT_POWER" }, + { ISO_S_WAIT_CLK, "WAIT_CLK" }, + { ISO_S_WAIT_RST, "WAIT_RST" }, + { ISO_S_WAIT_ATR, "WAIT_ATR" }, + { ISO_S_IN_ATR, "IN_ATR" }, + { ISO_S_IN_PTS, "IN_PTS" }, + { ISO_S_WAIT_TPDU, "WAIT_TPDU" }, + { ISO_S_IN_TPDU, "IN_TPDU" }, + { 0, NULL } }; @@ -150,42 +123,15 @@ }; const struct value_string tpdu_state_names[] = { - { - .value = TPDU_S_WAIT_CLA, - .str = "WAIT_CLA", - }, - { - .value = TPDU_S_WAIT_INS, - .str = "WAIT_INS", - }, - { - .value = TPDU_S_WAIT_P1, - .str = "WAIT_P1", - }, - { - .value = TPDU_S_WAIT_P2, - .str = "WAIT_P2", - }, - { - .value = TPDU_S_WAIT_P3, - .str = "WAIT_P3", - }, - { - .value = TPDU_S_WAIT_PB, - .str = "WAIT_PB", - }, - { - .value = TPDU_S_WAIT_RX, - .str = "WAIT_RX", - }, - { - .value = TPDU_S_WAIT_TX, - .str = "WAIT_TX", - }, - { - .value = 0, - .str = NULL, - }, + { TPDU_S_WAIT_CLA, "WAIT_CLA" }, + { TPDU_S_WAIT_INS, "WAIT_INS" }, + { TPDU_S_WAIT_P1, "WAIT_P1" }, + { TPDU_S_WAIT_P2, "WAIT_P2" }, + { TPDU_S_WAIT_P3, "WAIT_P3" }, + { TPDU_S_WAIT_PB, "WAIT_PB" }, + { TPDU_S_WAIT_RX, "WAIT_RX" }, + { TPDU_S_WAIT_TX, "WAIT_TX" }, + { 0, NULL } }; /* TPDU field byte index */ diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c index 82c4b3f..08770e2 100644 --- a/firmware/libcommon/source/sniffer.c +++ b/firmware/libcommon/source/sniffer.c @@ -303,22 +303,10 @@ } const struct value_string data_flags[] = { - { - .value = SNIFF_DATA_FLAG_ERROR_INCOMPLETE, - .str = "incomplete", - }, - { - .value = SNIFF_DATA_FLAG_ERROR_MALFORMED, - .str = "malformed", - }, - { - .value = SNIFF_DATA_FLAG_ERROR_CHECKSUM, - .str = "checksum error", - }, - { - .value = 0, - .str = NULL, - }, + { SNIFF_DATA_FLAG_ERROR_INCOMPLETE, "incomplete" }, + { SNIFF_DATA_FLAG_ERROR_MALFORMED, "malformed" }, + { SNIFF_DATA_FLAG_ERROR_CHECKSUM, "checksum error" }, + { 0, NULL } }; static void print_flags(const struct value_string* flag_meanings, uint32_t nb_flags, uint32_t flags) { -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2f2370a673074f6bf5380106b6254b4aa1e8a792 Gerrit-Change-Number: 16637 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:00:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:00:57 +0000 Subject: Change in simtrace2[master]: firmware: Reformat value_string to pass our validation scripts In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16637 ) Change subject: firmware: Reformat value_string to pass our validation scripts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2f2370a673074f6bf5380106b6254b4aa1e8a792 Gerrit-Change-Number: 16637 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 12:00:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:01:03 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:01:03 +0000 Subject: Change in simtrace2[master]: firmware: Reformat value_string to pass our validation scripts In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16637 ) Change subject: firmware: Reformat value_string to pass our validation scripts ...................................................................... firmware: Reformat value_string to pass our validation scripts This is a purely cosmetic change in terms of coding style, but it fixes an [invalid] detection for unterminated value_string arrays by our verify_value_string_arrays_are_terminated.py script: Change-Id: I2f2370a673074f6bf5380106b6254b4aa1e8a792 ERROR: file contains unterminated value_string 'struct value_string iso7816_3_card_state_names[]': './deps/simtrace2/firmware/libcommon/source/card_emu.c' ERROR: file contains unterminated value_string 'struct value_string tpdu_state_names[]': './deps/simtrace2/firmware/libcommon/source/card_emu.c' --- M firmware/libcommon/source/card_emu.c M firmware/libcommon/source/sniffer.c 2 files changed, 22 insertions(+), 88 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 7a541e5..cad24b8 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -58,42 +58,15 @@ }; const struct value_string iso7816_3_card_state_names[] = { - { - .value = ISO_S_WAIT_POWER, - .str = "WAIT_POWER", - }, - { - .value = ISO_S_WAIT_CLK, - .str = "WAIT_CLK", - }, - { - .value = ISO_S_WAIT_RST, - .str = "WAIT_RST", - }, - { - .value = ISO_S_WAIT_ATR, - .str = "WAIT_ATR", - }, - { - .value = ISO_S_IN_ATR, - .str = "IN_ATR", - }, - { - .value = ISO_S_IN_PTS, - .str = "IN_PTS", - }, - { - .value = ISO_S_WAIT_TPDU, - .str = "WAIT_TPDU", - }, - { - .value = ISO_S_IN_TPDU, - .str = "IN_TPDU", - }, - { - .value = 0, - .str = NULL, - }, + { ISO_S_WAIT_POWER, "WAIT_POWER" }, + { ISO_S_WAIT_CLK, "WAIT_CLK" }, + { ISO_S_WAIT_RST, "WAIT_RST" }, + { ISO_S_WAIT_ATR, "WAIT_ATR" }, + { ISO_S_IN_ATR, "IN_ATR" }, + { ISO_S_IN_PTS, "IN_PTS" }, + { ISO_S_WAIT_TPDU, "WAIT_TPDU" }, + { ISO_S_IN_TPDU, "IN_TPDU" }, + { 0, NULL } }; @@ -150,42 +123,15 @@ }; const struct value_string tpdu_state_names[] = { - { - .value = TPDU_S_WAIT_CLA, - .str = "WAIT_CLA", - }, - { - .value = TPDU_S_WAIT_INS, - .str = "WAIT_INS", - }, - { - .value = TPDU_S_WAIT_P1, - .str = "WAIT_P1", - }, - { - .value = TPDU_S_WAIT_P2, - .str = "WAIT_P2", - }, - { - .value = TPDU_S_WAIT_P3, - .str = "WAIT_P3", - }, - { - .value = TPDU_S_WAIT_PB, - .str = "WAIT_PB", - }, - { - .value = TPDU_S_WAIT_RX, - .str = "WAIT_RX", - }, - { - .value = TPDU_S_WAIT_TX, - .str = "WAIT_TX", - }, - { - .value = 0, - .str = NULL, - }, + { TPDU_S_WAIT_CLA, "WAIT_CLA" }, + { TPDU_S_WAIT_INS, "WAIT_INS" }, + { TPDU_S_WAIT_P1, "WAIT_P1" }, + { TPDU_S_WAIT_P2, "WAIT_P2" }, + { TPDU_S_WAIT_P3, "WAIT_P3" }, + { TPDU_S_WAIT_PB, "WAIT_PB" }, + { TPDU_S_WAIT_RX, "WAIT_RX" }, + { TPDU_S_WAIT_TX, "WAIT_TX" }, + { 0, NULL } }; /* TPDU field byte index */ diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c index 82c4b3f..08770e2 100644 --- a/firmware/libcommon/source/sniffer.c +++ b/firmware/libcommon/source/sniffer.c @@ -303,22 +303,10 @@ } const struct value_string data_flags[] = { - { - .value = SNIFF_DATA_FLAG_ERROR_INCOMPLETE, - .str = "incomplete", - }, - { - .value = SNIFF_DATA_FLAG_ERROR_MALFORMED, - .str = "malformed", - }, - { - .value = SNIFF_DATA_FLAG_ERROR_CHECKSUM, - .str = "checksum error", - }, - { - .value = 0, - .str = NULL, - }, + { SNIFF_DATA_FLAG_ERROR_INCOMPLETE, "incomplete" }, + { SNIFF_DATA_FLAG_ERROR_MALFORMED, "malformed" }, + { SNIFF_DATA_FLAG_ERROR_CHECKSUM, "checksum error" }, + { 0, NULL } }; static void print_flags(const struct value_string* flag_meanings, uint32_t nb_flags, uint32_t flags) { -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2f2370a673074f6bf5380106b6254b4aa1e8a792 Gerrit-Change-Number: 16637 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:03:26 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:03:26 +0000 Subject: Change in osmo-remsim[master]: remsim_client: Port to async libosmousb select loop In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16610 ) Change subject: remsim_client: Port to async libosmousb select loop ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ic18690b3c2cbc5e99de0665c0b68b7555433b3cd Gerrit-Change-Number: 16610 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 12:03:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:03:45 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:03:45 +0000 Subject: Change in osmo-remsim[master]: rspro_util: Add functions generating {Bank, Client}SlotStatusInd In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16620 ) Change subject: rspro_util: Add functions generating {Bank,Client}SlotStatusInd ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ib07d397d80310f94dd6357b895455a1897e01cf3 Gerrit-Change-Number: 16620 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 12:03:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:19:41 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:19:41 +0000 Subject: Change in osmo-ci[master]: verify_*.py: Ignore UTF-8 decoding errors References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16638 ) Change subject: verify_*.py: Ignore UTF-8 decoding errors ...................................................................... verify_*.py: Ignore UTF-8 decoding errors Some of our source files are inherited from other sources, particularly for microcontroller firmware projects. We cannot assume they're all clean UTF-8. Let's ignore any decoder errors when verifying log statements and value_string arrays. Closes: OS#4334 Change-Id: I1e19f4bc6bee46481c6ea743e8334bd4485909be --- M scripts/verify_log_statements.py M scripts/verify_value_string_arrays_are_terminated.py 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/38/16638/1 diff --git a/scripts/verify_log_statements.py b/scripts/verify_log_statements.py index 9a9cd1b..064df73 100755 --- a/scripts/verify_log_statements.py +++ b/scripts/verify_log_statements.py @@ -66,7 +66,7 @@ try: errors_found = [] - file_content = codecs.open(f, "r", "utf-8").read() + file_content = codecs.open(f, "r", "utf-8", errors='ignore').read() for log in log_statement_re.finditer(file_content): quoted = log.group(2) diff --git a/scripts/verify_value_string_arrays_are_terminated.py b/scripts/verify_value_string_arrays_are_terminated.py index 9f0ad82..f6dc545 100755 --- a/scripts/verify_value_string_arrays_are_terminated.py +++ b/scripts/verify_value_string_arrays_are_terminated.py @@ -27,7 +27,7 @@ global errors_found if not (f.endswith('.h') or f.endswith('.c') or f.endswith('.cpp')): return - arrays = value_string_array_re.findall(codecs.open(f, "r", "utf-8").read()) + arrays = value_string_array_re.findall(codecs.open(f, "r", "utf-8", errors='ignore').read()) for array_def, name in arrays: if not terminator_re.search(array_def): print('ERROR: file contains unterminated value_string %r: %r' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1e19f4bc6bee46481c6ea743e8334bd4485909be Gerrit-Change-Number: 16638 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:20:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:20:37 +0000 Subject: Change in osmo-ci[master]: verify_*.py: Ignore UTF-8 decoding errors In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16638 ) Change subject: verify_*.py: Ignore UTF-8 decoding errors ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1e19f4bc6bee46481c6ea743e8334bd4485909be Gerrit-Change-Number: 16638 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 12:20:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:20:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:20:39 +0000 Subject: Change in osmo-ci[master]: verify_*.py: Ignore UTF-8 decoding errors In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16638 ) Change subject: verify_*.py: Ignore UTF-8 decoding errors ...................................................................... verify_*.py: Ignore UTF-8 decoding errors Some of our source files are inherited from other sources, particularly for microcontroller firmware projects. We cannot assume they're all clean UTF-8. Let's ignore any decoder errors when verifying log statements and value_string arrays. Closes: OS#4334 Change-Id: I1e19f4bc6bee46481c6ea743e8334bd4485909be --- M scripts/verify_log_statements.py M scripts/verify_value_string_arrays_are_terminated.py 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/scripts/verify_log_statements.py b/scripts/verify_log_statements.py index 9a9cd1b..064df73 100755 --- a/scripts/verify_log_statements.py +++ b/scripts/verify_log_statements.py @@ -66,7 +66,7 @@ try: errors_found = [] - file_content = codecs.open(f, "r", "utf-8").read() + file_content = codecs.open(f, "r", "utf-8", errors='ignore').read() for log in log_statement_re.finditer(file_content): quoted = log.group(2) diff --git a/scripts/verify_value_string_arrays_are_terminated.py b/scripts/verify_value_string_arrays_are_terminated.py index 9f0ad82..f6dc545 100755 --- a/scripts/verify_value_string_arrays_are_terminated.py +++ b/scripts/verify_value_string_arrays_are_terminated.py @@ -27,7 +27,7 @@ global errors_found if not (f.endswith('.h') or f.endswith('.c') or f.endswith('.cpp')): return - arrays = value_string_array_re.findall(codecs.open(f, "r", "utf-8").read()) + arrays = value_string_array_re.findall(codecs.open(f, "r", "utf-8", errors='ignore').read()) for array_def, name in arrays: if not terminator_re.search(array_def): print('ERROR: file contains unterminated value_string %r: %r' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1e19f4bc6bee46481c6ea743e8334bd4485909be Gerrit-Change-Number: 16638 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:28:42 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:28:42 +0000 Subject: Change in simtrace2[master]: jenkins.sh: Add verify_value_string_arrays_are_terminated.py References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16639 ) Change subject: jenkins.sh: Add verify_value_string_arrays_are_terminated.py ...................................................................... jenkins.sh: Add verify_value_string_arrays_are_terminated.py Change-Id: I15f13e12711b87ce71b38b16ef17620850fd8eb7 --- M contrib/jenkins.sh 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/39/16639/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index a8426bd..3ed1345 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -21,6 +21,9 @@ osmo-build-dep.sh libosmocore "" '--disable-doxygen --enable-gnutls' +# verify only after building the dependency (to ensure we have most recent source of dependency) +verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") + export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16639 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I15f13e12711b87ce71b38b16ef17620850fd8eb7 Gerrit-Change-Number: 16639 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:31:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:31:43 +0000 Subject: Change in osmo-remsim[master]: jenkins.sh: don't verify (possibly outdated) deps References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16640 ) Change subject: jenkins.sh: don't verify (possibly outdated) deps ...................................................................... jenkins.sh: don't verify (possibly outdated) deps When we call a script for verification of our source code, let'sn not check the (old, previous) code from the ./deps directory, too. We should either only verify our own code (solution implemented here) or alternatively verify only after we updated all dependencies to the latest stage. Change-Id: I20e6a3b7b4109b99c91a4921285cacb168c5796b --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/40/16640/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index c36626e..347ea9b 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -17,7 +17,7 @@ mkdir "$deps" || true -verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") +verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]" -not -path "./deps/*") export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I20e6a3b7b4109b99c91a4921285cacb168c5796b Gerrit-Change-Number: 16640 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:32:01 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:32:01 +0000 Subject: Change in simtrace2[master]: jenkins.sh: Add verify_value_string_arrays_are_terminated.py In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16639 ) Change subject: jenkins.sh: Add verify_value_string_arrays_are_terminated.py ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16639 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I15f13e12711b87ce71b38b16ef17620850fd8eb7 Gerrit-Change-Number: 16639 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 12:32:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:32:04 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:32:04 +0000 Subject: Change in simtrace2[master]: jenkins.sh: Add verify_value_string_arrays_are_terminated.py In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16639 ) Change subject: jenkins.sh: Add verify_value_string_arrays_are_terminated.py ...................................................................... jenkins.sh: Add verify_value_string_arrays_are_terminated.py Change-Id: I15f13e12711b87ce71b38b16ef17620850fd8eb7 --- M contrib/jenkins.sh 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index a8426bd..3ed1345 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -21,6 +21,9 @@ osmo-build-dep.sh libosmocore "" '--disable-doxygen --enable-gnutls' +# verify only after building the dependency (to ensure we have most recent source of dependency) +verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") + export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16639 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I15f13e12711b87ce71b38b16ef17620850fd8eb7 Gerrit-Change-Number: 16639 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:32:22 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:32:22 +0000 Subject: Change in osmo-ccid-firmware[master]: jenkins.sh: Add verify_value_string_arrays_are_terminated.py References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16641 ) Change subject: jenkins.sh: Add verify_value_string_arrays_are_terminated.py ...................................................................... jenkins.sh: Add verify_value_string_arrays_are_terminated.py Change-Id: I214bd21212b696d1aa9357b57b545d15bdf74e7f --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/41/16641/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index c2802f8..1597a30 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -26,6 +26,7 @@ echo "=============== CCID usb_gadget build ===========" cd $TOPDIR/ccid_host make clean +verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") make $PARALLEL_MAKE make clean @@ -55,6 +56,7 @@ cd $TOPDIR/sysmoOCTSIM cd gcc make mrproper +verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") make SYSTEM_PREFIX="$inst" $PARALLEL_MAKE if [ "x$publish" = "x--publish" ]; then -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I214bd21212b696d1aa9357b57b545d15bdf74e7f Gerrit-Change-Number: 16641 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:40:49 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:40:49 +0000 Subject: Change in osmo-remsim[master]: jenkins.sh: don't verify (possibly outdated) deps In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16640 ) Change subject: jenkins.sh: don't verify (possibly outdated) deps ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I20e6a3b7b4109b99c91a4921285cacb168c5796b Gerrit-Change-Number: 16640 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 12:40:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:41:02 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:41:02 +0000 Subject: Change in osmo-remsim[master]: client: generate clientSlotStatusInd to bankd In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16613 ) Change subject: client: generate clientSlotStatusInd to bankd ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ibe2266ffa473823e925d4e3afcf168353b11cdd8 Gerrit-Change-Number: 16613 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 12:41:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:41:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:41:13 +0000 Subject: Change in osmo-remsim[master]: bankd: Implement card reset based on clientSlotStatusInd In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16614 ) Change subject: bankd: Implement card reset based on clientSlotStatusInd ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ifa615d239ec3ad6daebd8e99e4f7d5b99d32c0e1 Gerrit-Change-Number: 16614 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 12:41:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:41:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:41:33 +0000 Subject: Change in osmo-remsim[master]: jenkins.sh: don't verify (possibly outdated) deps In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16640 ) Change subject: jenkins.sh: don't verify (possibly outdated) deps ...................................................................... jenkins.sh: don't verify (possibly outdated) deps When we call a script for verification of our source code, let'sn not check the (old, previous) code from the ./deps directory, too. We should either only verify our own code (solution implemented here) or alternatively verify only after we updated all dependencies to the latest stage. Change-Id: I20e6a3b7b4109b99c91a4921285cacb168c5796b --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index c36626e..347ea9b 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -17,7 +17,7 @@ mkdir "$deps" || true -verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") +verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]" -not -path "./deps/*") export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I20e6a3b7b4109b99c91a4921285cacb168c5796b Gerrit-Change-Number: 16640 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:41:33 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:41:33 +0000 Subject: Change in osmo-remsim[master]: remsim_client: Port to async libosmousb select loop In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16610 ) Change subject: remsim_client: Port to async libosmousb select loop ...................................................................... remsim_client: Port to async libosmousb select loop By using the non-blocking / asynchronous libusb via the newly- introduced libosmousb (integration to libosmocore select loop), we can not only get a cleaner code-base, but we also get a considerable speed-up. In my tests with a Quectel E25 and a sysmoUSIM-SJS1 card, I am down from 41.4s to 4.7s for the initial reading of the SIM at start-up. Change-Id: Ic18690b3c2cbc5e99de0665c0b68b7555433b3cd Closes: OS#4299 Depends: libosmocore.git I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3 --- M src/simtrace2-remsim_client.c 1 file changed, 140 insertions(+), 34 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index 30a9c5b..fa6b102 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -143,20 +143,50 @@ } #endif +static void usb_out_xfer_cb(struct libusb_transfer *xfer) +{ + struct msgb *msg = xfer->user_data; + + switch (xfer->status) { + case LIBUSB_TRANSFER_COMPLETED: + break; + case LIBUSB_TRANSFER_NO_DEVICE: + fprintf(stderr, "USB device disappeared\n"); + exit(23); + break; + default: + osmo_panic("USB OUT transfer failed, status=%u\n", xfer->status); + break; + } + + msgb_free(msg); + libusb_free_transfer(xfer); +} + /*! \brief Transmit a given command to the SIMtrace2 device */ int st_transp_tx_msg(struct st_transport *transp, struct msgb *msg) { + struct libusb_transfer *xfer; int rc; printf("SIMtrace <- %s\n", msgb_hexdump(msg)); - int xfer_len; + xfer = libusb_alloc_transfer(0); + OSMO_ASSERT(xfer); + xfer->dev_handle = transp->usb_devh; + xfer->flags = 0; + xfer->type = LIBUSB_TRANSFER_TYPE_BULK; + xfer->endpoint = transp->usb_ep.out; + xfer->timeout = 1000; + xfer->user_data = msg; + xfer->length = msgb_length(msg); + xfer->buffer = msgb_data(msg); + xfer->callback = usb_out_xfer_cb; - rc = libusb_bulk_transfer(transp->usb_devh, transp->usb_ep.out, - msgb_data(msg), msgb_length(msg), - &xfer_len, 1000); + /* submit the OUT transfer */ + rc = libusb_submit_transfer(xfer); + OSMO_ASSERT(rc == 0); - msgb_free(msg); return rc; } @@ -472,38 +502,106 @@ return rc; } -static void run_mainloop(struct cardem_inst *ci) +static void usb_in_xfer_cb(struct libusb_transfer *xfer) { - struct st_transport *transp = ci->slot->transp; - unsigned int msg_count, byte_count = 0; - uint8_t buf[16*265]; - int xfer_len; + struct cardem_inst *ci = xfer->user_data; int rc; - printf("Entering main loop\n"); - - while (1) { - /* read data from SIMtrace2 device (local or via USB) */ - rc = libusb_bulk_transfer(transp->usb_devh, transp->usb_ep.in, - buf, sizeof(buf), &xfer_len, 100); - if (rc < 0 && rc != LIBUSB_ERROR_TIMEOUT && - rc != LIBUSB_ERROR_INTERRUPTED && - rc != LIBUSB_ERROR_IO) { - fprintf(stderr, "BULK IN transfer error: %s\n", libusb_error_name(rc)); - return; - } - /* dispatch any incoming data */ - if (xfer_len > 0) { - process_usb_msg(ci, buf, xfer_len); - msg_count++; - byte_count += xfer_len; - } - // handle remote SIM client fsm - // TODO register the USB fd for this select - osmo_select_main(true); + switch (xfer->status) { + case LIBUSB_TRANSFER_COMPLETED: + /* hand the message up the stack */ + process_usb_msg(ci, xfer->buffer, xfer->actual_length); + break; + case LIBUSB_TRANSFER_NO_DEVICE: + fprintf(stderr, "USB device disappeared\n"); + exit(23); + break; + default: + osmo_panic("USB IN transfer failed, status=%u\n", xfer->status); + break; } + + /* re-submit the IN transfer */ + rc = libusb_submit_transfer(xfer); + OSMO_ASSERT(rc == 0); } + +static void allocate_and_submit_in(struct cardem_inst *ci) +{ + struct st_transport *transp = ci->slot->transp; + struct libusb_transfer *xfer; + int rc; + + xfer = libusb_alloc_transfer(0); + OSMO_ASSERT(xfer); + xfer->dev_handle = transp->usb_devh; + xfer->flags = 0; + xfer->type = LIBUSB_TRANSFER_TYPE_BULK; + xfer->endpoint = transp->usb_ep.in; + xfer->timeout = 0; + xfer->user_data = ci; + xfer->length = 16*256; + + xfer->buffer = libusb_dev_mem_alloc(xfer->dev_handle, xfer->length); + OSMO_ASSERT(xfer->buffer); + xfer->callback = usb_in_xfer_cb; + + /* submit the IN transfer */ + rc = libusb_submit_transfer(xfer); + OSMO_ASSERT(rc == 0); +} + + +static void usb_irq_xfer_cb(struct libusb_transfer *xfer) +{ + int rc; + + switch (xfer->status) { + case LIBUSB_TRANSFER_COMPLETED: + /* FIXME: do something with the received data */ + break; + case LIBUSB_TRANSFER_NO_DEVICE: + fprintf(stderr, "USB device disappeared\n"); + exit(23); + break; + default: + osmo_panic("USB IRQ transfer failed, status=%u\n", xfer->status); + break; + } + + /* re-submit the IN transfer */ + rc = libusb_submit_transfer(xfer); + OSMO_ASSERT(rc == 0); +} + + +static void allocate_and_submit_irq(struct cardem_inst *ci) +{ + struct st_transport *transp = ci->slot->transp; + struct libusb_transfer *xfer; + int rc; + + xfer = libusb_alloc_transfer(0); + OSMO_ASSERT(xfer); + xfer->dev_handle = transp->usb_devh; + xfer->flags = 0; + xfer->type = LIBUSB_TRANSFER_TYPE_INTERRUPT; + xfer->endpoint = transp->usb_ep.irq_in; + xfer->timeout = 0; + xfer->user_data = ci; + xfer->length = 64; + + xfer->buffer = libusb_dev_mem_alloc(xfer->dev_handle, xfer->length); + OSMO_ASSERT(xfer->buffer); + xfer->callback = usb_irq_xfer_cb; + + /* submit the IN transfer */ + rc = libusb_submit_transfer(xfer); + OSMO_ASSERT(rc == 0); +} + + static struct st_transport _transp; static struct st_slot _slot = { @@ -652,7 +750,7 @@ static void print_welcome(void) { printf("simtrace2-remsim-client - Remote SIM card client for SIMtrace\n" - "(C) 2010-2017, Harald Welte \n" + "(C) 2010-2019, Harald Welte \n" "(C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon \n\n"); } @@ -794,7 +892,7 @@ msgb_talloc_ctx_init(g_tall_ctx, 0); osmo_init_logging2(g_tall_ctx, &log_info); - rc = libusb_init(NULL); + rc = osmo_libusb_init(NULL); if (rc < 0) { fprintf(stderr, "libusb initialization failed\n"); goto do_exit; @@ -941,7 +1039,15 @@ /* select remote (forwarded) SIM */ st_modem_reset_pulse(ci->slot, 300); - run_mainloop(ci); + printf("Entering main loop\n"); + + allocate_and_submit_irq(ci); + allocate_and_submit_in(ci); + + while (1) { + osmo_select_main(false); + } + ret = 0; libusb_release_interface(transp->usb_devh, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ic18690b3c2cbc5e99de0665c0b68b7555433b3cd Gerrit-Change-Number: 16610 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:41:34 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:41:34 +0000 Subject: Change in osmo-remsim[master]: rspro_util: Add functions generating {Bank, Client}SlotStatusInd In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16620 ) Change subject: rspro_util: Add functions generating {Bank,Client}SlotStatusInd ...................................................................... rspro_util: Add functions generating {Bank,Client}SlotStatusInd Change-Id: Ib07d397d80310f94dd6357b895455a1897e01cf3 --- M src/rspro_util.c M src/rspro_util.h 2 files changed, 84 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/rspro_util.c b/src/rspro_util.c index 422aef4..1d95aee 100644 --- a/src/rspro_util.c +++ b/src/rspro_util.c @@ -385,6 +385,84 @@ return pdu; } +RsproPDU_t *rspro_gen_BankSlotStatusInd(const BankSlot_t *bank, const ClientSlot_t *client, + bool rst_active, int vcc_present, int clk_active, + int card_present) +{ + SlotPhysStatus_t *pstatus; + RsproPDU_t *pdu = CALLOC(1, sizeof(*pdu)); + if (!pdu) + return NULL; + pdu->version = 2; + pdu->msg.present = RsproPDUchoice_PR_bankSlotStatusInd; + OSMO_ASSERT(bank); + pdu->msg.choice.bankSlotStatusInd.fromBankSlot = *bank; + OSMO_ASSERT(client) + pdu->msg.choice.bankSlotStatusInd.toClientSlot = *client; + + pstatus = &pdu->msg.choice.bankSlotStatusInd.slotPhysStatus; + pstatus->resetActive = rst_active ? 1 : 0; + + if (vcc_present >= 0) { + pstatus->vccPresent = CALLOC(1, sizeof(BOOLEAN_t)); + OSMO_ASSERT(pstatus->vccPresent); + *pstatus->vccPresent = vcc_present; + } + + if (clk_active >= 0) { + pstatus->clkActive = CALLOC(1, sizeof(BOOLEAN_t)); + OSMO_ASSERT(pstatus->clkActive); + *pstatus->clkActive = clk_active; + } + + if (card_present >= 0) { + pstatus->cardPresent = CALLOC(1, sizeof(BOOLEAN_t)); + OSMO_ASSERT(pstatus->cardPresent); + *pstatus->cardPresent = card_present; + } + + return pdu; +} + +RsproPDU_t *rspro_gen_ClientSlotStatusInd(const ClientSlot_t *client, const BankSlot_t *bank, + bool rst_active, int vcc_present, int clk_active, + int card_present) +{ + SlotPhysStatus_t *pstatus; + RsproPDU_t *pdu = CALLOC(1, sizeof(*pdu)); + if (!pdu) + return NULL; + pdu->version = 2; + pdu->msg.present = RsproPDUchoice_PR_clientSlotStatusInd; + OSMO_ASSERT(client) + pdu->msg.choice.clientSlotStatusInd.fromClientSlot = *client; + OSMO_ASSERT(bank); + pdu->msg.choice.clientSlotStatusInd.toBankSlot = *bank; + + pstatus = &pdu->msg.choice.clientSlotStatusInd.slotPhysStatus; + pstatus->resetActive = rst_active ? 1 : 0; + + if (vcc_present >= 0) { + pstatus->vccPresent = CALLOC(1, sizeof(BOOLEAN_t)); + OSMO_ASSERT(pstatus->vccPresent); + *pstatus->vccPresent = vcc_present; + } + + if (clk_active >= 0) { + pstatus->clkActive = CALLOC(1, sizeof(BOOLEAN_t)); + OSMO_ASSERT(pstatus->clkActive); + *pstatus->clkActive = clk_active; + } + + if (card_present >= 0) { + pstatus->cardPresent = CALLOC(1, sizeof(BOOLEAN_t)); + OSMO_ASSERT(pstatus->cardPresent); + *pstatus->cardPresent = card_present; + } + + return pdu; +} + RsproPDU_t *rspro_gen_ResetStateReq(void) { RsproPDU_t *pdu = CALLOC(1, sizeof(*pdu)); diff --git a/src/rspro_util.h b/src/rspro_util.h index 8c6ae3b..3c5de0d 100644 --- a/src/rspro_util.h +++ b/src/rspro_util.h @@ -42,6 +42,12 @@ const uint8_t *tpdu, unsigned int tpdu_len); RsproPDU_t *rspro_gen_TpduCard2Modem(const BankSlot_t *bank, const ClientSlot_t *client, const uint8_t *tpdu, unsigned int tpdu_len); +RsproPDU_t *rspro_gen_BankSlotStatusInd(const BankSlot_t *bank, const ClientSlot_t *client, + bool rst_active, int vcc_present, int clk_active, + int card_present); +RsproPDU_t *rspro_gen_ClientSlotStatusInd(const ClientSlot_t *client, const BankSlot_t *bank, + bool rst_active, int vcc_present, int clk_active, + int card_present); RsproPDU_t *rspro_gen_ResetStateReq(void); RsproPDU_t *rspro_gen_ResetStateRes(e_ResultCode res); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ib07d397d80310f94dd6357b895455a1897e01cf3 Gerrit-Change-Number: 16620 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:41:34 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:41:34 +0000 Subject: Change in osmo-remsim[master]: client: generate clientSlotStatusInd to bankd In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16613 ) Change subject: client: generate clientSlotStatusInd to bankd ...................................................................... client: generate clientSlotStatusInd to bankd * enable generation of CEMU_USB_MSGT_DO_STATUS on IRQ endpoint * translate that to clientSlotStatusInd towards bankd This will allow bankd to understand when to reset the card as requested by the modem. Change-Id: Ibe2266ffa473823e925d4e3afcf168353b11cdd8 Related: OS#4330 --- M src/simtrace2-remsim_client.c 1 file changed, 68 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index fa6b102..1798df9 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -298,6 +298,22 @@ return st_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_DT_CEMU_TX_DATA); } +/*! \brief Request the SIMtrace2 to send a Status Word */ +static int cardem_request_config(struct cardem_inst *ci, uint32_t features) +{ + struct msgb *msg = st_msgb_alloc(); + struct cardemu_usb_msg_config *cfg; + + cfg = (struct cardemu_usb_msg_config *) msgb_put(msg, sizeof(*cfg)); + + printf("SIMtrace <= %s(%08x)\n", __func__, features); + + memset(cfg, 0, sizeof(*cfg)); + cfg->features = features; + + return st_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_BD_CEMU_CONFIG); +} + // FIXME check if the ATR actually includes a checksum __attribute__((unused)) static void atr_update_csum(uint8_t *atr, unsigned int atr_len) { @@ -493,6 +509,53 @@ case SIMTRACE_MSGT_DO_CEMU_RX_DATA: rc = process_do_rx_da(ci, buf, len); break; + case SIMTRACE_MSGT_BD_CEMU_CONFIG: + /* firmware confirms configuration change; ignore */ + break; + default: + printf("unknown simtrace msg type 0x%02x\n", sh->msg_type); + rc = -1; + break; + } + + return rc; +} + + +/*! \brief Process a STATUS message on IRQ endpoint from the SIMtrace2 */ +static int process_irq_status(struct cardem_inst *ci, const uint8_t *buf, int len) +{ + const struct cardemu_usb_msg_status *status = (struct cardemu_usb_msg_status *) buf; + + printf("SIMtrace IRQ STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u\n", + status->flags, status->fi, status->di, status->wi, + status->waiting_time); + + BankSlot_t bslot; + bank_slot2rspro(&bslot, &g_client->bankd_slot); + RsproPDU_t *pdu = rspro_gen_ClientSlotStatusInd(g_client->srv_conn.clslot, &bslot, + status->flags & CEMU_STATUS_F_RESET_ACTIVE, + status->flags & CEMU_STATUS_F_VCC_PRESENT, + status->flags & CEMU_STATUS_F_CLK_ACTIVE, + -1 /* FIXME: make this dependent on board */); + server_conn_send_rspro(&g_client->bankd_conn, pdu); + + return 0; +} + +static int process_usb_msg_irq(struct cardem_inst *ci, const uint8_t *buf, unsigned int len) +{ + struct simtrace_msg_hdr *sh = (struct simtrace_msg_hdr *)buf; + int rc; + + printf("SIMtrace IRQ %s\n", osmo_hexdump(buf, len)); + + buf += sizeof(*sh); + + switch (sh->msg_type) { + case SIMTRACE_MSGT_BD_CEMU_STATUS: + rc = process_irq_status(ci, buf, len); + break; default: printf("unknown simtrace msg type 0x%02x\n", sh->msg_type); rc = -1; @@ -555,11 +618,12 @@ static void usb_irq_xfer_cb(struct libusb_transfer *xfer) { + struct cardem_inst *ci = xfer->user_data; int rc; switch (xfer->status) { case LIBUSB_TRANSFER_COMPLETED: - /* FIXME: do something with the received data */ + process_usb_msg_irq(ci, xfer->buffer, xfer->actual_length); break; case LIBUSB_TRANSFER_NO_DEVICE: fprintf(stderr, "USB device disappeared\n"); @@ -1026,6 +1090,9 @@ printf("modem %d reset\n", modem); } + /* request firmware to generate STATUS on IRQ endpoint */ + cardem_request_config(ci, CEMU_FEAT_F_STATUS_IRQ); + /* simulate card-insert to modem (owhw, not qmod) */ cardem_request_card_insert(ci, true); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ibe2266ffa473823e925d4e3afcf168353b11cdd8 Gerrit-Change-Number: 16613 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:41:34 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:41:34 +0000 Subject: Change in osmo-remsim[master]: bankd: Implement card reset based on clientSlotStatusInd In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16614 ) Change subject: bankd: Implement card reset based on clientSlotStatusInd ...................................................................... bankd: Implement card reset based on clientSlotStatusInd If a client is sending us a clientSlotStatusInd indicating that the modem has switched off VCC or activated RST, bankd will now issue a respective PC/SC command to perform a cold or warm reset of the card. Change-Id: Ifa615d239ec3ad6daebd8e99e4f7d5b99d32c0e1 Closes: OS#4330 --- M src/bankd/bankd.h M src/bankd/bankd_main.c M src/bankd/bankd_pcsc.c 3 files changed, 59 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/bankd/bankd.h b/src/bankd/bankd.h index 7f4d687..d713ed1 100644 --- a/src/bankd/bankd.h +++ b/src/bankd/bankd.h @@ -102,6 +102,8 @@ struct bankd_driver_ops { /* open a given card/slot: called once client + mapping exists */ int (*open_card)(struct bankd_worker *worker); + /* reset a given card/slot with either cold or warm reset */ + int (*reset_card)(struct bankd_worker *worker, bool cold_reset); int (*transceive)(struct bankd_worker *worker, const uint8_t *out, size_t out_len, uint8_t *in, size_t *in_len); /* called at cleanup time of a worker thread: clear any driver related state */ diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index af25ded..b3e38b3 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -727,6 +727,26 @@ return 0; } +static int worker_handle_clientSlotStatusInd(struct bankd_worker *worker, const RsproPDU_t *pdu) +{ + const struct ClientSlotStatusInd *cssi = &pdu->msg.choice.clientSlotStatusInd; + const struct SlotPhysStatus *sps = &cssi->slotPhysStatus; + int rc = 0; + + LOGW(worker, "clientSlotStatusInd(RST=%s, VCC=%s, CLK=%s)\n", + sps->resetActive ? "ACTIVE" : "INACTIVE", + sps->vccPresent ? *sps->vccPresent ? "PRESENT" : "ABSENT" : "NULL", + sps->clkActive ? *sps->clkActive ? "ACTIVE" : "INACTIVE" : "NULL"); + + /* perform cold or warm reset */ + if (sps->vccPresent && *sps->vccPresent == 0) + rc = worker->ops->reset_card(worker, true); + else if (sps->resetActive) + rc = worker->ops->reset_card(worker, false); + + return rc; +} + /* handle one incoming RSPRO message from a client inside a worker thread */ static int worker_handle_rspro(struct bankd_worker *worker, const RsproPDU_t *pdu) { @@ -742,7 +762,7 @@ rc = worker_handle_tpduModemToCard(worker, pdu); break; case RsproPDUchoice_PR_clientSlotStatusInd: - /* FIXME */ + rc = worker_handle_clientSlotStatusInd(worker, pdu); rc = 0; break; case RsproPDUchoice_PR_setAtrRes: diff --git a/src/bankd/bankd_pcsc.c b/src/bankd/bankd_pcsc.c index a390782..f6e3683 100644 --- a/src/bankd/bankd_pcsc.c +++ b/src/bankd/bankd_pcsc.c @@ -152,6 +152,24 @@ LOGW((w), ": OK\n"); \ } +static int pcsc_get_atr(struct bankd_worker *worker) +{ + long rc; + char pbReader[MAX_READERNAME]; + /* use DWORD type as this is what the PC/SC API expects */ + DWORD dwReaderLen = sizeof(pbReader); + DWORD dwAtrLen = worker->card.atr_len = sizeof(worker->card.atr); + DWORD dwState, dwProt; + + rc = SCardStatus(worker->reader.pcsc.hCard, pbReader, &dwReaderLen, &dwState, &dwProt, + worker->card.atr, &dwAtrLen); + PCSC_ERROR(worker, rc, "SCardStatus") + worker->card.atr_len = dwAtrLen; + LOGW(worker, "Card ATR: %s\n", osmo_hexdump_nospc(worker->card.atr, worker->card.atr_len)); +end: + return rc; +} + static int pcsc_open_card(struct bankd_worker *worker) { long rc; @@ -171,16 +189,23 @@ PCSC_ERROR(worker, rc, "SCardConnect") } - /* use DWORD type as this is what the PC/SC API expects */ - char pbReader[MAX_READERNAME]; - DWORD dwReaderLen = sizeof(pbReader); - DWORD dwAtrLen = worker->card.atr_len = sizeof(worker->card.atr); - DWORD dwState, dwProt; - rc = SCardStatus(worker->reader.pcsc.hCard, pbReader, &dwReaderLen, &dwState, &dwProt, - worker->card.atr, &dwAtrLen); - PCSC_ERROR(worker, rc, "SCardStatus") - worker->card.atr_len = dwAtrLen; - LOGW(worker, "Card ATR: %s\n", osmo_hexdump_nospc(worker->card.atr, worker->card.atr_len)); + rc = pcsc_get_atr(worker); +end: + return rc; +} + +static int pcsc_reset_card(struct bankd_worker *worker, bool cold_reset) +{ + long rc; + DWORD dwActiveProtocol; + + LOGW(worker, "Resetting card in '%s' (%s)\n", worker->reader.name, + cold_reset ? "cold reset" : "warm reset"); + rc = SCardReconnect(worker->reader.pcsc.hCard, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0, + cold_reset ? SCARD_UNPOWER_CARD : SCARD_RESET_CARD, &dwActiveProtocol); + PCSC_ERROR(worker, rc, "SCardReconnect"); + + rc = pcsc_get_atr(worker); end: return rc; } @@ -213,6 +238,7 @@ const struct bankd_driver_ops pcsc_driver_ops = { .open_card = pcsc_open_card, + .reset_card = pcsc_reset_card, .transceive = pcsc_transceive, .cleanup = pcsc_cleanup, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ifa615d239ec3ad6daebd8e99e4f7d5b99d32c0e1 Gerrit-Change-Number: 16614 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:46:05 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 17 Dec 2019 12:46:05 +0000 Subject: Change in libosmocore[master]: Introduce helper functions for safe fork+exec of processes In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16619 ) Change subject: Introduce helper functions for safe fork+exec of processes ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/16619/2/src/exec.c File src/exec.c: https://gerrit.osmocom.org/c/libosmocore/+/16619/2/src/exec.c at 169 PS2, Line 169: extern char **environ; > I can see that in my unistd.h, too - but somehow it simply doesn't work. I think you need to: #define _GNU_SOURCE #include -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib24ac8a083db32e55402ce496a5eabd8749cc888 Gerrit-Change-Number: 16619 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 17 Dec 2019 12:46:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:46:19 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:46:19 +0000 Subject: Change in simtrace2[master]: [lib] apdu_dispatch: Use DLGLOBAL and don't printf() directly In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16630 ) Change subject: [lib] apdu_dispatch: Use DLGLOBAL and don't printf() directly ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16630 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2f3ec49d34b6806e13af185fb629cabc486891fb Gerrit-Change-Number: 16630 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 12:46:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:46:20 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:46:20 +0000 Subject: Change in simtrace2[master]: [lib] apdu_dispatch: Don't print APDU state to stdout In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16631 ) Change subject: [lib] apdu_dispatch: Don't print APDU state to stdout ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Id3e3cf1605dec84077b158c1c5715f8eef2641d5 Gerrit-Change-Number: 16631 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 12:46:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:46:21 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:46:21 +0000 Subject: Change in simtrace2[master]: [lib] apdu_dispatch: Use DLGLOBAL and don't printf() directly In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16630 ) Change subject: [lib] apdu_dispatch: Use DLGLOBAL and don't printf() directly ...................................................................... [lib] apdu_dispatch: Use DLGLOBAL and don't printf() directly Change-Id: I2f3ec49d34b6806e13af185fb629cabc486891fb --- M host/lib/apdu_dispatch.c 1 file changed, 7 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/host/lib/apdu_dispatch.c b/host/lib/apdu_dispatch.c index 62a75aa..835b8bc 100644 --- a/host/lib/apdu_dispatch.c +++ b/host/lib/apdu_dispatch.c @@ -1,6 +1,6 @@ /* apdu_dispatch - State machine to determine Rx/Tx phases of APDU * - * (C) 2016 by Harald Welte + * (C) 2016-2019 by Harald Welte * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -24,6 +24,7 @@ #include #include +#include #include #include @@ -105,7 +106,7 @@ break; case 0: default: - fprintf(stderr, "Unknown APDU case %d\n", ac->apdu_case); + LOGP(DLGLOBAL, LOGL_ERROR, "Unknown APDU case %d\n", ac->apdu_case); return -1; } } else { @@ -124,8 +125,8 @@ ac->lc.cur += cpy_len; break; default: - fprintf(stderr, "Unknown APDU case %d\n", ac->apdu_case); - break; + LOGP(DLGLOBAL, LOGL_ERROR, "Unknown APDU case %d\n", ac->apdu_case); + return -1; } } @@ -163,8 +164,8 @@ break; case 0: default: - fprintf(stderr, "Unknown APDU case %d\n", ac->apdu_case); - break; + LOGP(DLGLOBAL, LOGL_ERROR, "Unknown APDU case %d\n", ac->apdu_case); + return -1; } dump_apdu_ctx(ac); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16630 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2f3ec49d34b6806e13af185fb629cabc486891fb Gerrit-Change-Number: 16630 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:46:22 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:46:22 +0000 Subject: Change in simtrace2[master]: [lib] apdu_dispatch: Don't print APDU state to stdout In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16631 ) Change subject: [lib] apdu_dispatch: Don't print APDU state to stdout ...................................................................... [lib] apdu_dispatch: Don't print APDU state to stdout The printing was always only done at the end of osmo_apdu_segment_in(), so let's leave the decision up to the user if he wants to print the state at every iteration or not. We now provide osmo_apdu_dump_context_buf() to the user so he can obtain a string representation of the internal state for logging at any time he requires. Change-Id: Id3e3cf1605dec84077b158c1c5715f8eef2641d5 --- M host/include/osmocom/simtrace2/apdu_dispatch.h M host/lib/apdu_dispatch.c 2 files changed, 16 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/host/include/osmocom/simtrace2/apdu_dispatch.h b/host/include/osmocom/simtrace2/apdu_dispatch.h index af9c989..42a097a 100644 --- a/host/include/osmocom/simtrace2/apdu_dispatch.h +++ b/host/include/osmocom/simtrace2/apdu_dispatch.h @@ -1,6 +1,6 @@ /* apdu_dispatch - State machine to determine Rx/Tx phases of APDU * - * (C) 2016 by Harald Welte + * (C) 2016-2019 by Harald Welte * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -44,6 +44,8 @@ APDU_ACT_RX_MORE_CAPDU_FROM_READER = 0x0002, }; +const char *osmo_apdu_dump_context_buf(char *buf, unsigned int buf_len, + const struct osmo_apdu_context *ac); int osmo_apdu_segment_in(struct osmo_apdu_context *ac, const uint8_t *apdu_buf, unsigned int apdu_len, bool new_apdu); diff --git a/host/lib/apdu_dispatch.c b/host/lib/apdu_dispatch.c index 835b8bc..ec368b2 100644 --- a/host/lib/apdu_dispatch.c +++ b/host/lib/apdu_dispatch.c @@ -42,7 +42,7 @@ return (ac->le.tot == ac->le.cur); } -static const char *dump_apdu_hdr(const struct osim_apdu_cmd_hdr *h) +static const char *stringify_apdu_hdr(const struct osim_apdu_cmd_hdr *h) { static char buf[256]; sprintf(buf, "CLA=%02x INS=%02x P1=%02x P2=%02x P3=%02x", @@ -51,12 +51,19 @@ return buf; } -static void dump_apdu_ctx(const struct osmo_apdu_context *ac) +/*! generate string representation of APDU context in specified output buffer. + * \param[in] buf output string buffer provided by caller + * \param[in] buf_len size of buf in bytes + * \param[in] ac APDU context to dump in buffer + * \returns pointer to buf on success */ +const char *osmo_apdu_dump_context_buf(char *buf, unsigned int buf_len, + const struct osmo_apdu_context *ac) { - printf("%s; case=%d, lc=%d(%d), le=%d(%d)\n", - dump_apdu_hdr(&ac->hdr), ac->apdu_case, - ac->lc.tot, ac->lc.cur, - ac->le.tot, ac->le.cur); + snprintf(buf, buf_len, "%s; case=%d, lc=%d(%d), le=%d(%d)\n", + stringify_apdu_hdr(&ac->hdr), ac->apdu_case, + ac->lc.tot, ac->lc.cur, + ac->le.tot, ac->le.cur); + return buf; } /*! \brief input function for APDU segmentation @@ -168,7 +175,5 @@ return -1; } - dump_apdu_ctx(ac); - return rc; } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Id3e3cf1605dec84077b158c1c5715f8eef2641d5 Gerrit-Change-Number: 16631 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:47:16 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:47:16 +0000 Subject: Change in libosmocore[master]: Introduce helper functions for safe fork+exec of processes In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/16619 to look at the new patch set (#4). Change subject: Introduce helper functions for safe fork+exec of processes ...................................................................... Introduce helper functions for safe fork+exec of processes In some situations, we want to execute an external shell command in a non-blocking way. Similar to 'system', but without waiting for the child to complete. We also want to close all file descriptors ahead of the exec() and filter + modify the environment. Change-Id: Ib24ac8a083db32e55402ce496a5eabd8749cc888 Related: OS#4332 --- M configure.ac M include/Makefile.am A include/osmocom/core/exec.h M src/Makefile.am A src/exec.c M tests/Makefile.am A tests/exec/exec_test.c A tests/exec/exec_test.err A tests/exec/exec_test.ok M tests/testsuite.at 10 files changed, 487 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/19/16619/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib24ac8a083db32e55402ce496a5eabd8749cc888 Gerrit-Change-Number: 16619 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:49:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:49:48 +0000 Subject: Change in libosmocore[master]: debian/control: Add missing libusb-1.0-0-dev dependency References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16642 ) Change subject: debian/control: Add missing libusb-1.0-0-dev dependency ...................................................................... debian/control: Add missing libusb-1.0-0-dev dependency In Change-Id I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3 we introduced USB support and also updated debian pacakaging informatio for this new package - however, I missed to add a realted Build-Depends line :( Change-Id: Ib0446510c8ba49623914b6103ea9cfa88c208d50 Related: #4299 --- M debian/control 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/42/16642/1 diff --git a/debian/control b/debian/control index d2c232f..cdf26bb 100644 --- a/debian/control +++ b/debian/control @@ -16,6 +16,7 @@ pkg-config, libtalloc-dev, libsctp-dev, + libusb-1.0-0-dev, python3 Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/libosmocore.git -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib0446510c8ba49623914b6103ea9cfa88c208d50 Gerrit-Change-Number: 16642 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:51:05 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 17 Dec 2019 12:51:05 +0000 Subject: Change in libosmocore[master]: debian/control: Add missing libusb-1.0-0-dev dependency In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16642 ) Change subject: debian/control: Add missing libusb-1.0-0-dev dependency ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib0446510c8ba49623914b6103ea9cfa88c208d50 Gerrit-Change-Number: 16642 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 17 Dec 2019 12:51:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 12:54:38 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 12:54:38 +0000 Subject: Change in libosmocore[master]: debian/control: Add missing libusb-1.0-0-dev dependency In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16642 ) Change subject: debian/control: Add missing libusb-1.0-0-dev dependency ...................................................................... debian/control: Add missing libusb-1.0-0-dev dependency In Change-Id I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3 we introduced USB support and also updated debian pacakaging informatio for this new package - however, I missed to add a realted Build-Depends line :( Change-Id: Ib0446510c8ba49623914b6103ea9cfa88c208d50 Related: #4299 --- M debian/control 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/control b/debian/control index d2c232f..cdf26bb 100644 --- a/debian/control +++ b/debian/control @@ -16,6 +16,7 @@ pkg-config, libtalloc-dev, libsctp-dev, + libusb-1.0-0-dev, python3 Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/libosmocore.git -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib0446510c8ba49623914b6103ea9cfa88c208d50 Gerrit-Change-Number: 16642 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:39:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:39:30 +0000 Subject: Change in osmo-ci[master]: osmo-depcheck: Skip comment lines containing PKG_CHECK_CONFIG References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/16643 ) Change subject: osmo-depcheck: Skip comment lines containing PKG_CHECK_CONFIG ...................................................................... osmo-depcheck: Skip comment lines containing PKG_CHECK_CONFIG This is a problem e.g. with current osmo-hlr containing "\t# FIXME: PKG_CHECK_MODULES() may return cached result here!" Change-Id: I30d539a895bf39aaabe907be9eb52d7e4b3977a7 --- M scripts/osmo-depcheck/parse.py 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/43/16643/1 diff --git a/scripts/osmo-depcheck/parse.py b/scripts/osmo-depcheck/parse.py index 06f932e..e9914f8 100644 --- a/scripts/osmo-depcheck/parse.py +++ b/scripts/osmo-depcheck/parse.py @@ -3,6 +3,7 @@ import sys import fnmatch +import re # Same folder import config @@ -53,6 +54,8 @@ # Only look at PKG_CHECK_MODULES lines if "PKG_CHECK_MODULES" not in line: return + if re.search('#.*PKG_CHECK_MODULES', line): + return # Extract the condition ret = line.split(",")[1].split(")")[0].strip() -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I30d539a895bf39aaabe907be9eb52d7e4b3977a7 Gerrit-Change-Number: 16643 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:42:15 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 17 Dec 2019 13:42:15 +0000 Subject: Change in osmo-ci[master]: osmo-depcheck: Skip comment lines containing PKG_CHECK_CONFIG In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16643 ) Change subject: osmo-depcheck: Skip comment lines containing PKG_CHECK_CONFIG ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I30d539a895bf39aaabe907be9eb52d7e4b3977a7 Gerrit-Change-Number: 16643 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 17 Dec 2019 13:42:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:43:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:43:13 +0000 Subject: Change in osmo-ci[master]: osmo-depcheck: Skip comment lines containing PKG_CHECK_CONFIG In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16643 ) Change subject: osmo-depcheck: Skip comment lines containing PKG_CHECK_CONFIG ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I30d539a895bf39aaabe907be9eb52d7e4b3977a7 Gerrit-Change-Number: 16643 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 17 Dec 2019 13:43:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:43:15 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:43:15 +0000 Subject: Change in osmo-ci[master]: osmo-depcheck: Skip comment lines containing PKG_CHECK_CONFIG In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16643 ) Change subject: osmo-depcheck: Skip comment lines containing PKG_CHECK_CONFIG ...................................................................... osmo-depcheck: Skip comment lines containing PKG_CHECK_CONFIG This is a problem e.g. with current osmo-hlr containing "\t# FIXME: PKG_CHECK_MODULES() may return cached result here!" Change-Id: I30d539a895bf39aaabe907be9eb52d7e4b3977a7 --- M scripts/osmo-depcheck/parse.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved laforge: Verified diff --git a/scripts/osmo-depcheck/parse.py b/scripts/osmo-depcheck/parse.py index 06f932e..e9914f8 100644 --- a/scripts/osmo-depcheck/parse.py +++ b/scripts/osmo-depcheck/parse.py @@ -3,6 +3,7 @@ import sys import fnmatch +import re # Same folder import config @@ -53,6 +54,8 @@ # Only look at PKG_CHECK_MODULES lines if "PKG_CHECK_MODULES" not in line: return + if re.search('#.*PKG_CHECK_MODULES', line): + return # Extract the condition ret = line.split(",")[1].split(")")[0].strip() -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I30d539a895bf39aaabe907be9eb52d7e4b3977a7 Gerrit-Change-Number: 16643 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:43:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:43:47 +0000 Subject: Change in osmo-ccid-firmware[master]: jenkins.sh: Add verify_value_string_arrays_are_terminated.py In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16641 ) Change subject: jenkins.sh: Add verify_value_string_arrays_are_terminated.py ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I214bd21212b696d1aa9357b57b545d15bdf74e7f Gerrit-Change-Number: 16641 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 13:43:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:43:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:43:48 +0000 Subject: Change in osmo-ccid-firmware[master]: jenkins.sh: Add verify_value_string_arrays_are_terminated.py In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16641 ) Change subject: jenkins.sh: Add verify_value_string_arrays_are_terminated.py ...................................................................... jenkins.sh: Add verify_value_string_arrays_are_terminated.py Change-Id: I214bd21212b696d1aa9357b57b545d15bdf74e7f --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index c2802f8..1597a30 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -26,6 +26,7 @@ echo "=============== CCID usb_gadget build ===========" cd $TOPDIR/ccid_host make clean +verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") make $PARALLEL_MAKE make clean @@ -55,6 +56,7 @@ cd $TOPDIR/sysmoOCTSIM cd gcc make mrproper +verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") make SYSTEM_PREFIX="$inst" $PARALLEL_MAKE if [ "x$publish" = "x--publish" ]; then -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I214bd21212b696d1aa9357b57b545d15bdf74e7f Gerrit-Change-Number: 16641 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:46:11 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:46:11 +0000 Subject: Change in docker-playground[master]: ttcn3-ggsn: Log osmo-ggsn stdout+stderr to file In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16633 ) Change subject: ttcn3-ggsn: Log osmo-ggsn stdout+stderr to file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16633 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia4c4589902bd72918f1d114afa890b049d6e8fd7 Gerrit-Change-Number: 16633 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 13:46:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:46:25 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:46:25 +0000 Subject: Change in docker-playground[master]: ttcn3-ggsn: Log osmo-ggsn stdout+stderr to file In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16633 ) Change subject: ttcn3-ggsn: Log osmo-ggsn stdout+stderr to file ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16633 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia4c4589902bd72918f1d114afa890b049d6e8fd7 Gerrit-Change-Number: 16633 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 13:46:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:46:26 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:46:26 +0000 Subject: Change in docker-playground[master]: ttcn3-ggsn: Log osmo-ggsn stdout+stderr to file In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16633 ) Change subject: ttcn3-ggsn: Log osmo-ggsn stdout+stderr to file ...................................................................... ttcn3-ggsn: Log osmo-ggsn stdout+stderr to file Fixes: c3f157b939784f19f0337ac92ac727063c8d3452 Change-Id: Ia4c4589902bd72918f1d114afa890b049d6e8fd7 --- M ttcn3-ggsn-test/jenkins.sh 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index c4fac9d..66239f8 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -28,7 +28,8 @@ --network $NET_NAME --ip 172.18.3.201 \ -v $VOL_BASE_DIR/ggsn:/data \ --name ${BUILD_TAG}-ggsn -d \ - $REPO_USER/osmo-ggsn-$IMAGE_SUFFIX + $REPO_USER/osmo-ggsn-$IMAGE_SUFFIX \ + /bin/sh -c "osmo-ggsn -c /data/osmo-ggsn.cfg >/data/osmo-ggsn.log 2>&1" # start docker container with testsuite in foreground docker run --rm \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16633 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia4c4589902bd72918f1d114afa890b049d6e8fd7 Gerrit-Change-Number: 16633 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:46:56 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:46:56 +0000 Subject: Change in pysim[master]: Fix automated tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16564 ) Change subject: Fix automated tests ...................................................................... Patch Set 12: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 Gerrit-Change-Number: 16564 Gerrit-PatchSet: 12 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 13:46:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:46:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:46:58 +0000 Subject: Change in pysim[master]: Fix automated tests In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/16564 ) Change subject: Fix automated tests ...................................................................... Fix automated tests - The .ok files currently dictate in which pysical reader device the card must be placed. Lets remove this dependncy to make the setup more reliable. Testing in which reade a card is placed is not in the scope of our tests. - Fix bug in pysim-test.sh (test runner), so that the veriable $ADM_HEX gets reset after the execution of the tests. Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 --- M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/fakemagicsim.ok M pysim-testdata/sysmoUSIM-SJS1.ok M pysim-testdata/sysmosim-gr1.ok M tests/pysim-test.sh 6 files changed, 11 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pysim-testdata/Fairwaves-SIM.ok b/pysim-testdata/Fairwaves-SIM.ok index 7f60765..6150469 100644 --- a/pysim-testdata/Fairwaves-SIM.ok +++ b/pysim-testdata/Fairwaves-SIM.ok @@ -1,4 +1,4 @@ -Using PC/SC reader (dev=4) interface +Using PC/SC reader (dev=0) interface Reading ... ICCID: 8988219000000117833 IMSI: 001010000000111 diff --git a/pysim-testdata/Wavemobile-SIM.ok b/pysim-testdata/Wavemobile-SIM.ok index 5f5b360..b0ea8be 100644 --- a/pysim-testdata/Wavemobile-SIM.ok +++ b/pysim-testdata/Wavemobile-SIM.ok @@ -1,4 +1,4 @@ -Using PC/SC reader (dev=3) interface +Using PC/SC reader (dev=4) interface Reading ... ICCID: 89445310150011013678 IMSI: 001010000000102 diff --git a/pysim-testdata/fakemagicsim.ok b/pysim-testdata/fakemagicsim.ok index a1d9e9c..d9bff94 100644 --- a/pysim-testdata/fakemagicsim.ok +++ b/pysim-testdata/fakemagicsim.ok @@ -1,4 +1,4 @@ -Using PC/SC reader (dev=1) interface +Using PC/SC reader (dev=2) interface Reading ... ICCID: 1122334455667788990 IMSI: 001010000000102 diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok b/pysim-testdata/sysmoUSIM-SJS1.ok index 3bbdc90..b6a5391 100644 --- a/pysim-testdata/sysmoUSIM-SJS1.ok +++ b/pysim-testdata/sysmoUSIM-SJS1.ok @@ -1,4 +1,4 @@ -Using PC/SC reader (dev=0) interface +Using PC/SC reader (dev=1) interface Reading ... ICCID: 1122334455667788990 IMSI: 001010000000102 diff --git a/pysim-testdata/sysmosim-gr1.ok b/pysim-testdata/sysmosim-gr1.ok index a1a49fd..d4c3dd9 100644 --- a/pysim-testdata/sysmosim-gr1.ok +++ b/pysim-testdata/sysmosim-gr1.ok @@ -1,4 +1,4 @@ -Using PC/SC reader (dev=2) interface +Using PC/SC reader (dev=3) interface Reading ... ICCID: 1122334455667788990 IMSI: 001010000000102 diff --git a/tests/pysim-test.sh b/tests/pysim-test.sh index f97722d..c3e1747 100755 --- a/tests/pysim-test.sh +++ b/tests/pysim-test.sh @@ -78,7 +78,11 @@ stat ./$CARD_NAME.ok > /dev/null python $PYSIM_READ -p $TERMINAL > $TEMPFILE set +e - CARD_DIFF=$(diff $TEMPFILE ./$CARD_NAME.ok) + # Note: We ignore the first line of output in the diff because here + # pysim would print the device number of the reader and we do not + # want the test to fail just because the card is put into a different + # reader device. + CARD_DIFF=$(diff + 1 $TEMPFILE ./$CARD_NAME.ok) set -e if [ "$CARD_DIFF" != "" ]; then @@ -156,6 +160,7 @@ OPC=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF IMSI=001010000000001 ADM=00000000 + ADM_HEX="" ADM_OPT="-a" source "$CARD_NAME.data" -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I12e6b46787efb39c5745f4e7f3cdcca9209881b8 Gerrit-Change-Number: 16564 Gerrit-PatchSet: 12 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:47:16 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:47:16 +0000 Subject: Change in pysim[master]: WIP In-Reply-To: References: Message-ID: laforge has abandoned this change. ( https://gerrit.osmocom.org/c/pysim/+/16612 ) Change subject: WIP ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4f8e9f581f22dbe95192e9e5a214f372c993cb1e Gerrit-Change-Number: 16612 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:47:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:47:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC/BSC_ConnectionHandler: only keep SMSC address in SmsParametersRp In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16597 ) Change subject: MSC/BSC_ConnectionHandler: only keep SMSC address in SmsParametersRp ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia60bdd2498034b6b849f874cf1eee272abef2b47 Gerrit-Change-Number: 16597 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 13:47:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:48:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:48:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: fix MSISDN / SMSC coding in SM-RP-OA/DA In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16565 ) Change subject: library/GSUP_Types.ttcn: fix MSISDN / SMSC coding in SM-RP-OA/DA ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3f55834489f3e613f541cf1e216027e8d48ccaf0 Gerrit-Change-Number: 16565 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 13:48:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:48:27 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:48:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: fix: verify the contents of SM-RP-DA/OA for MO/MT SMS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16566 ) Change subject: MSC_Tests.ttcn: fix: verify the contents of SM-RP-DA/OA for MO/MT SMS ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16566 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib467eeca6439bc6cce72293fbb5bb48f6d233db9 Gerrit-Change-Number: 16566 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 13:48:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:49:15 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:49:15 +0000 Subject: Change in osmo-remsim[master]: client: Enable libusb logging In-Reply-To: References: Message-ID: laforge has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16593 ) Change subject: client: Enable libusb logging ...................................................................... Abandoned we will do this via libosmousb -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16593 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I4818a3cd405ff042bb5748ec377c9042b825a395 Gerrit-Change-Number: 16593 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:52:20 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:52:20 +0000 Subject: Change in osmo-sip-connector[master]: logging from sofia: add missing newline In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16220 ) Change subject: logging from sofia: add missing newline ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ia26c0b57a0166cf7de87c49471ce6f528a366dd5 Gerrit-Change-Number: 16220 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 17 Dec 2019 13:52:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:52:21 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:52:21 +0000 Subject: Change in osmo-sip-connector[master]: logging from sofia: add missing newline In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16220 ) Change subject: logging from sofia: add missing newline ...................................................................... logging from sofia: add missing newline Sometimes, logging from sofia lacks the final newline character, messing up log output. First snprintf() to a buffer, add '\n' if necessary and then log. Change-Id: Ia26c0b57a0166cf7de87c49471ce6f528a366dd5 --- M src/sip.c 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/sip.c b/src/sip.c index 2b28b4e..c635542 100644 --- a/src/sip.c +++ b/src/sip.c @@ -666,7 +666,19 @@ * the log handler call-back function, so we have no clue what log level the * currently logged message was sent for :( As a result, we can only use one * hard-coded LOGL_NOTICE here */ - osmo_vlogp(DSIP, LOGL_NOTICE, "", 0, 0, fmt, ap); + if (!log_check_level(DSIP, LOGL_NOTICE)) + return; + /* The sofia-sip log line *sometimes* lacks a terminating '\n'. Add it. */ + char log_line[256]; + int rc = vsnprintf(log_line, sizeof(log_line), fmt, ap); + if (rc > 0) { + /* since we're explicitly checking for sizeof(log_line), we can use vsnprintf()'s return value (which, + * alone, would possibly cause writing past the buffer's end). */ + char *end = log_line + OSMO_MIN(rc, sizeof(log_line) - 2); + osmo_strlcpy(end, "\n", 2); + LOGP(DSIP, LOGL_NOTICE, "%s", log_line); + } else + LOGP(DSIP, LOGL_NOTICE, "unknown logging from sip\n"); } void sip_agent_init(struct sip_agent *agent, struct app_config *app) -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ia26c0b57a0166cf7de87c49471ce6f528a366dd5 Gerrit-Change-Number: 16220 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:52:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:52:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: add TC_paging_cs_from_bts In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623 ) Change subject: pcu: add TC_paging_cs_from_bts ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia3ad503c243c9b3b162e204683fa4fa5447bbab3 Gerrit-Change-Number: 15623 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Assignee: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 17 Dec 2019 13:52:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:52:52 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:52:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_t3193 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16508 ) Change subject: pcu: Introduce test TC_t3193 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16508 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib11cd1793d985ff609b10b0e60bddadd5fcfa6d2 Gerrit-Change-Number: 16508 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 13:52:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:52:54 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:52:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_imm_ass_dl_block_retrans In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16507 ) Change subject: pcu: Introduce test TC_imm_ass_dl_block_retrans ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16507 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icc60cebb8583c9dc97b658def69f17e6efced384 Gerrit-Change-Number: 16507 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 13:52:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:53:14 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:53:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce helpers to update AckNackDescription In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502 ) Change subject: pcu: Introduce helpers to update AckNackDescription ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic62ab9e4a854239b95c434068543d95c5352f1c6 Gerrit-Change-Number: 16502 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 17 Dec 2019 13:53:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:53:34 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:53:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: send UL CONTROL ACK triggered by DL ACK/NACK In-Reply-To: References: Message-ID: laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16501 ) Change subject: pcu: send UL CONTROL ACK triggered by DL ACK/NACK ...................................................................... Removed Code-Review-1 by fixeria -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16501 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib409394257427cfc62da08fe06ce6c001dcf608a Gerrit-Change-Number: 16501 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:53:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:53:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: send UL CONTROL ACK triggered by DL ACK/NACK In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16501 ) Change subject: pcu: send UL CONTROL ACK triggered by DL ACK/NACK ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16501 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib409394257427cfc62da08fe06ce6c001dcf608a Gerrit-Change-Number: 16501 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 17 Dec 2019 13:53:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:53:44 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:53:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: send UL CONTROL ACK triggered by DL ACK/NACK In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16501 ) Change subject: pcu: send UL CONTROL ACK triggered by DL ACK/NACK ...................................................................... pcu: send UL CONTROL ACK triggered by DL ACK/NACK Change-Id: Ib409394257427cfc62da08fe06ce6c001dcf608a --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 15 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index e4b03c1..bc0cb7f 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -741,7 +741,7 @@ dl_fn := pcu_msg.u.data_req.fn; } -private function f_rx_rlcmac_dl_block_exp_ack_nack(out RlcmacDlBlock dl_block) +private function f_rx_rlcmac_dl_block_exp_ack_nack(out RlcmacDlBlock dl_block, out uint32_t poll_fn) runs on RAW_PCU_Test_CT { var uint32_t dl_fn; @@ -750,6 +750,8 @@ setverdict(fail, "Failed to match Packet Uplink ACK / NACK"); mtc.stop; } + + poll_fn := dl_fn + f_rrbp_fn_delay(dl_block.ctrl.mac_hdr.rrbp); } private function f_rx_rlcmac_dl_block_exp_dummy(out RlcmacDlBlock dl_block) @@ -1084,6 +1086,7 @@ var PCUIF_Message pcu_msg; var octetstring data; var boolean ok; + var uint32_t unused_fn; /* Initialize the PCU interface abstraction */ f_init_raw(testcasename()); @@ -1135,7 +1138,7 @@ f_tx_rlcmac_ul_block(ul_data, lqual * 10); /* Enqueue RTS.req, expect DATA.req with UL ACK from the PCU */ - f_rx_rlcmac_dl_block_exp_ack_nack(dl_block); + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, unused_fn); log("Rx Packet Uplink ACK / NACK with Channel Coding Command: ", dl_block.ctrl.payload.u.ul_ack_nack.gprs.ch_coding_cmd); @@ -1167,6 +1170,7 @@ var boolean ok; var integer lqual_cb; var ChCodingCommand last_ch_coding; + var uint32_t unused_fn; /* Initialize the PCU interface abstraction */ f_init_raw(testcasename()); @@ -1211,7 +1215,7 @@ f_tx_rlcmac_ul_block(ul_data, lqual_cb); /* Enqueue RTS.req, expect DATA.req with UL ACK from the PCU */ - f_rx_rlcmac_dl_block_exp_ack_nack(dl_block); + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, unused_fn); last_ch_coding := dl_block.ctrl.payload.u.ul_ack_nack.gprs.ch_coding_cmd; } @@ -1235,7 +1239,7 @@ f_tx_rlcmac_ul_block(ul_data, 0); /* 0 dB, make sure we downgrade CS */ /* Enqueue RTS.req, expect DATA.req with UL ACK from the PCU */ - f_rx_rlcmac_dl_block_exp_ack_nack(dl_block); + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, unused_fn); last_ch_coding := dl_block.ctrl.payload.u.ul_ack_nack.gprs.ch_coding_cmd; } @@ -1254,6 +1258,7 @@ var RlcmacDlBlock dl_block; var boolean ok; var ChCodingCommand last_ch_coding; + var uint32_t unused_fn; /* Initialize the PCU interface abstraction */ f_init_raw(testcasename()); @@ -1295,7 +1300,7 @@ f_tx_rlcmac_ul_block(ul_data, 40*10); /* 40 dB */ /* Enqueue RTS.req, expect DATA.req with UL ACK from the PCU */ - f_rx_rlcmac_dl_block_exp_ack_nack(dl_block); + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, unused_fn); last_ch_coding := dl_block.ctrl.payload.u.ul_ack_nack.gprs.ch_coding_cmd; } @@ -1316,6 +1321,7 @@ var PCUIF_Message pcu_msg; var octetstring data; var boolean ok; + var uint32_t unused_fn; var OCT4 tlli := '00000001'O; /* Initialize NS/BSSGP side */ @@ -1347,7 +1353,7 @@ /* Send one UL block and make sure it is ACKED fine */ f_tx_rlcmac_ul_n_blocks(ul_tbf_ass, 1); - f_rx_rlcmac_dl_block_exp_ack_nack(dl_block); + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, unused_fn); /* UL block should be received in SGSN */ BSSGP[0].receive(tr_BSSGP_UL_UD(tlli, mp_gb_cfg.cell_id)); @@ -1403,7 +1409,9 @@ /* Send one UL block and make sure it is ACKED fine */ f_tx_rlcmac_ul_n_blocks(ul_tbf_ass, 1); - f_rx_rlcmac_dl_block_exp_ack_nack(dl_block); + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn); + /* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + f_tx_rlcmac_ul_block(ts_RLCMAC_CTRL_ACK(tlli), 0, sched_fn); /* UL block should be received in SGSN */ BSSGP[0].receive(tr_BSSGP_UL_UD(tlli, mp_gb_cfg.cell_id)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16501 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib409394257427cfc62da08fe06ce6c001dcf608a Gerrit-Change-Number: 16501 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:53:45 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:53:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce helpers to update AckNackDescription In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502 ) Change subject: pcu: Introduce helpers to update AckNackDescription ...................................................................... pcu: Introduce helpers to update AckNackDescription Change-Id: Ic62ab9e4a854239b95c434068543d95c5352f1c6 --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 41 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index bc0cb7f..cf630d3 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -574,6 +574,38 @@ BTS.receive(tr_RAW_PCU_EV(BTS_EV_SI13_NEGO)); } +template AckNackDescription t_AckNackDescription_init := { + final_ack := '0'B, + starting_seq_nr := 0, + receive_block_bitmap := '0000000000000000000000000000000000000000000000000000000000000000'B +} + +/* TS 44.060 sec 12.3 Ack/Nack Description */ +private function f_acknackdesc_ack_block(inout AckNackDescription desc, uint7_t bsn, BIT1 final_ack := '0'B) +{ + var integer i; + var integer inc := bsn - desc.starting_seq_nr + 1; + /* Filling hole? */ + if (bsn < desc.starting_seq_nr) { + desc.receive_block_bitmap[lengthof(desc.receive_block_bitmap) - (desc.starting_seq_nr - bsn)] := int2bit(1, 1); + return; + } + + /* SSN is increased, and so RBB values need to be moved */ + for (i := 0; i < lengthof(desc.receive_block_bitmap) - inc; i := i+1) { + desc.receive_block_bitmap[i] := desc.receive_block_bitmap[i + inc]; + } + for (i := lengthof(desc.receive_block_bitmap) - inc; i < lengthof(desc.receive_block_bitmap) - 1; i := i+1) { + desc.receive_block_bitmap[i] := int2bit(0, 1); + } + /* Now we can set current bit and update SSN */ + desc.starting_seq_nr := bsn + 1; + desc.receive_block_bitmap[lengthof(desc.receive_block_bitmap) - 1] := int2bit(1, 1); + + /* Finally update the final_ack bit as requested: */ + desc.final_ack := final_ack; +} + /* FIXME: properly encode RA (see TS 24.060, table 11.2.5.2) */ private function f_establish_tbf(out GsmRrMessage rr_imm_ass, uint8_t bts_nr := 0, uint16_t ra := oct2int('3A'O), uint8_t is_11bit := 0, @@ -765,7 +797,7 @@ } } -private function f_rx_rlcmac_dl_block_exp_data(out RlcmacDlBlock dl_block, out uint32_t ack_fn, octetstring data) +private function f_rx_rlcmac_dl_block_exp_data(out RlcmacDlBlock dl_block, out uint32_t ack_fn, octetstring data, template (present) uint7_t exp_bsn := ?) runs on RAW_PCU_Test_CT { var PCUIF_Message pcu_msg; var uint32_t dl_fn; @@ -780,6 +812,11 @@ ack_fn := dl_fn + f_rrbp_fn_delay(dl_block.data.mac_hdr.mac_hdr.rrbp); + if (not match(dl_block.data.mac_hdr.hdr_ext.bsn, exp_bsn)) { + setverdict(fail, "DL block BSN doesn't match: ", + dl_block.data.blocks[0].hdr.length_ind, " vs exp ", exp_bsn); + } + if (lengthof(dl_block.data.blocks) < 1) { setverdict(fail, "DL block has no LLC payload: ", dl_block); mtc.stop; @@ -1378,12 +1415,7 @@ var boolean ok; var uint32_t sched_fn; var OCT4 tlli := '00000001'O; - var AckNackDescription ack_nack_desc; - - ack_nack_desc.final_ack := '0'B; - ack_nack_desc.starting_seq_nr := 0; - ack_nack_desc.receive_block_bitmap := '0000000000000000000000000000000000000000000000000000000000000000'B; - + var AckNackDescription ack_nack_desc := valueof(t_AckNackDescription_init); /* Initialize NS/BSSGP side */ f_init_bssgp(); @@ -1428,9 +1460,10 @@ /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ f_sleep(X2002); - f_rx_rlcmac_dl_block_exp_data(dl_block, sched_fn, data); + f_rx_rlcmac_dl_block_exp_data(dl_block, sched_fn, data, 0); /* ACK the DL block */ + f_acknackdesc_ack_block(ack_nack_desc, dl_block.data.mac_hdr.hdr_ext.bsn, '1'B); f_tx_rlcmac_ul_block(ts_RLCMAC_DL_ACK_NACK(dl_block.data.mac_hdr.hdr_ext.tfi, ack_nack_desc), 0, sched_fn); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic62ab9e4a854239b95c434068543d95c5352f1c6 Gerrit-Change-Number: 16502 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:53:46 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:53:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_imm_ass_dl_block_retrans In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16507 ) Change subject: pcu: Introduce test TC_imm_ass_dl_block_retrans ...................................................................... pcu: Introduce test TC_imm_ass_dl_block_retrans Change-Id: Icc60cebb8583c9dc97b658def69f17e6efced384 --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 55 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index cf630d3..51b8ddf 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -1467,6 +1467,60 @@ f_tx_rlcmac_ul_block(ts_RLCMAC_DL_ACK_NACK(dl_block.data.mac_hdr.hdr_ext.tfi, ack_nack_desc), 0, sched_fn); } +/* Verify that if PCU doesn't get an ACK for first DL block after IMM ASS, it + * will retry by retransmitting both the IMM ASS + DL block after poll (ack) + * timeout occurs (specified by sent RRBP on DL block). */ +testcase TC_imm_ass_dl_block_retrans() runs on RAW_PCU_Test_CT { + var GsmRrMessage rr_imm_ass; + var PacketDlAssign dl_tbf_ass; + var RlcmacDlBlock dl_block; + var octetstring data := f_rnd_octstring(10); + var boolean ok; + var uint32_t sched_fn; + var OCT4 tlli := '00000001'O; + var AckNackDescription ack_nack_desc := valueof(t_AckNackDescription_init); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename()); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign('FFFFFFFF'O, tlli); + + /* SGSN sends some DL data, PCU will page on CCCH (PCH) */ + BSSGP[0].send(ts_BSSGP_DL_UD(tlli, data)); + f_pcuif_rx_pch_imm_tbf_ass(rr_imm_ass); + ok := f_imm_ass_verify_dl_tbf_ass(rr_imm_ass, dl_tbf_ass); + if (not ok) { + setverdict(fail, "Immediate Assignment not a Downlink TBF"); + mtc.stop; + } + + /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ + f_sleep(X2002); + f_rx_rlcmac_dl_block_exp_data(dl_block, sched_fn, data, 0); + + /* Now we don't ack the dl block (emulate MS failed receiveing IMM ASS + * or GPRS DL, or DL ACK was lost for some reason). As a result, PCU + * should retrigger IMM ASS + GPRS DL procedure after poll timeout. */ + f_pcuif_rx_pch_imm_tbf_ass(rr_imm_ass); + ok := f_imm_ass_verify_dl_tbf_ass(rr_imm_ass, dl_tbf_ass); + if (not ok) { + setverdict(fail, "Immediate Assignment not a Downlink TBF"); + mtc.stop; + } + /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ + f_sleep(X2002); + f_rx_rlcmac_dl_block_exp_data(dl_block, sched_fn, data, 0); + + /* ACK the DL block */ + f_acknackdesc_ack_block(ack_nack_desc, dl_block.data.mac_hdr.hdr_ext.bsn, '1'B); + f_tx_rlcmac_ul_block(ts_RLCMAC_DL_ACK_NACK(dl_block.data.mac_hdr.hdr_ext.tfi, ack_nack_desc), 0, sched_fn); +} + control { execute( TC_ns_reset() ); execute( TC_ns_reset_retrans() ); @@ -1486,6 +1540,7 @@ execute( TC_cs_max_ul() ); execute( TC_t3169() ); execute( TC_mo_ping_pong() ); + execute( TC_imm_ass_dl_block_retrans() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16507 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icc60cebb8583c9dc97b658def69f17e6efced384 Gerrit-Change-Number: 16507 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:53:46 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:53:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_t3193 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16508 ) Change subject: pcu: Introduce test TC_t3193 ...................................................................... pcu: Introduce test TC_t3193 Change-Id: Ib11cd1793d985ff609b10b0e60bddadd5fcfa6d2 --- M library/RLCMAC_Types.ttcn M pcu/PCU_Tests_RAW.ttcn 2 files changed, 91 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/RLCMAC_Types.ttcn b/library/RLCMAC_Types.ttcn index 3a1ecb1..7043785 100644 --- a/library/RLCMAC_Types.ttcn +++ b/library/RLCMAC_Types.ttcn @@ -361,6 +361,29 @@ } } + template RlcmacDlBlock tr_RLCMAC_DL_PACKET_ASS(template uint3_t usf := ?) := { + ctrl := { + mac_hdr := { + payload_type := (MAC_PT_RLCMAC_NO_OPT, MAC_PT_RLCMAC_OPT), + rrbp:= ?, + rrbp_valid := ?, + usf := usf + }, + opt := *, + payload := { + msg_type := PACKET_DL_ASSIGNMENT, + u := { + dl_assignment := { + page_mode := ?, + pres1 := ?, + persistence_levels := *, + tfi_or_tlli := ? + } + } + } + } + } + /* Receive Template for Uplink ACK/NACK */ template RlcmacDlBlock tr_RLCMAC_UL_ACK_NACK(template uint5_t ul_tfi, template GprsTlli tlli := ?) := { ctrl := { diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index 51b8ddf..2fc42c1 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -797,6 +797,19 @@ } } +private function f_rx_rlcmac_dl_block_exp_pkt_ass(out RlcmacDlBlock dl_block, out uint32_t poll_fn) +runs on RAW_PCU_Test_CT { + var uint32_t dl_fn; + + f_rx_rlcmac_dl_block(dl_block, dl_fn); + if (not match(dl_block, tr_RLCMAC_DL_PACKET_ASS())) { + setverdict(fail, "Failed to match Packet Downlink Assignment"); + mtc.stop; + } + + poll_fn := dl_fn + f_rrbp_fn_delay(dl_block.ctrl.mac_hdr.rrbp); +} + private function f_rx_rlcmac_dl_block_exp_data(out RlcmacDlBlock dl_block, out uint32_t ack_fn, octetstring data, template (present) uint7_t exp_bsn := ?) runs on RAW_PCU_Test_CT { var PCUIF_Message pcu_msg; @@ -1402,6 +1415,60 @@ f_rx_rlcmac_dl_block_exp_dummy(dl_block); } +/* Verify that a Downlink TBF can be assigned using PACCH shortly after the + * release of prev DL TBF due to MS staying in PDCH for a while (T3192, in PCU + * T3193) after DL TBF release */ +testcase TC_t3193() runs on RAW_PCU_Test_CT { + var GsmRrMessage rr_imm_ass; + var PacketDlAssign dl_tbf_ass; + var RlcmacDlBlock dl_block; + var octetstring data := f_rnd_octstring(10); + var boolean ok; + var uint32_t sched_fn; + var OCT4 tlli := '00000001'O; + var AckNackDescription ack_nack_desc := valueof(t_AckNackDescription_init); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename()); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign('FFFFFFFF'O, tlli); + + /* SGSN sends some DL data, PCU will page on CCCH (PCH) */ + BSSGP[0].send(ts_BSSGP_DL_UD(tlli, data)); + f_pcuif_rx_pch_imm_tbf_ass(rr_imm_ass); + ok := f_imm_ass_verify_dl_tbf_ass(rr_imm_ass, dl_tbf_ass); + if (not ok) { + setverdict(fail, "Immediate Assignment not a Downlink TBF"); + mtc.stop; + } + /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ + f_sleep(X2002); + f_rx_rlcmac_dl_block_exp_data(dl_block, sched_fn, data, 0); + + /* ACK the DL block */ + f_acknackdesc_ack_block(ack_nack_desc, dl_block.data.mac_hdr.hdr_ext.bsn, '1'B); + f_tx_rlcmac_ul_block(ts_RLCMAC_DL_ACK_NACK(dl_block.data.mac_hdr.hdr_ext.tfi, ack_nack_desc), 0, sched_fn); + /* we are done with the DL-TBF here so far, let's clean up our local state: */ + ack_nack_desc := valueof(t_AckNackDescription_init) + + /* Now that final DL block is ACKED and TBF is released, T3193 in PCU + (T3192 in MS) was started and until it fires the MS will be abailable + on PDCH in case new data arrives from SGSN. Let's verify it: */ + BSSGP[0].send(ts_BSSGP_DL_UD(tlli, data)); + f_rx_rlcmac_dl_block_exp_pkt_ass(dl_block, sched_fn); + f_tx_rlcmac_ul_block(ts_RLCMAC_CTRL_ACK(tlli), 0, sched_fn); + + /* Now that we confirmed the new assignment in the dl-tbf, lets receive the data and ack it */ + f_rx_rlcmac_dl_block_exp_data(dl_block, sched_fn, data, 0); + f_acknackdesc_ack_block(ack_nack_desc, dl_block.data.mac_hdr.hdr_ext.bsn, '1'B); + f_tx_rlcmac_ul_block(ts_RLCMAC_DL_ACK_NACK(dl_block.data.mac_hdr.hdr_ext.tfi, ack_nack_desc), 0, sched_fn); +} + /* Test scenario where MS wants to send some data on PDCH against SGSN and it is * answered, so TBFs for uplink and later for downlink are created. */ @@ -1539,6 +1606,7 @@ execute( TC_cs_initial_ul() ); execute( TC_cs_max_ul() ); execute( TC_t3169() ); + execute( TC_t3193() ); execute( TC_mo_ping_pong() ); execute( TC_imm_ass_dl_block_retrans() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16508 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib11cd1793d985ff609b10b0e60bddadd5fcfa6d2 Gerrit-Change-Number: 16508 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:53:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:53:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: add TC_paging_cs_from_bts In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623 ) Change subject: pcu: add TC_paging_cs_from_bts ...................................................................... pcu: add TC_paging_cs_from_bts 1. BTS send a CS paging Request over pcu socket 2. Expect a CS paging frame Related: OS#3927 Change-Id: Ia3ad503c243c9b3b162e204683fa4fa5447bbab3 --- M library/RLCMAC_CSN1_Types.ttcn M library/RLCMAC_Types.ttcn M pcu/PCU_Tests_RAW.ttcn 3 files changed, 111 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index a2f9a92..ea2edf6 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -235,11 +235,13 @@ BIT1 persistence_levels_present, PersistenceLevels persistence_levels optional, BIT1 nln_present, - uint2_t nln optional - /* TODO: Repeated PageInfo */ + uint2_t nln optional, + BIT1 repeated_pageinfo_present, + PageInfo repeated_pageinfo optional } with { variant (persistence_levels) "PRESENCE(persistence_levels_present = '1'B)" variant (nln) "PRESENCE(nln_present = '1'B)" + variant (repeated_pageinfo) "PRESENCE(repeated_pageinfo_present = '1'B)" }; /* 11.2.28 Uplink Ack/Nack */ diff --git a/library/RLCMAC_Types.ttcn b/library/RLCMAC_Types.ttcn index 7043785..8f9f2a5 100644 --- a/library/RLCMAC_Types.ttcn +++ b/library/RLCMAC_Types.ttcn @@ -339,7 +339,7 @@ usf := usf } - template RlcmacDlBlock tr_RLCMAC_DUMMY_CTRL(template uint3_t usf := ?) := { + template RlcmacDlBlock tr_RLCMAC_DUMMY_CTRL(template uint3_t usf := ?, template PageMode page_mode := ?) := { ctrl := { mac_hdr := { payload_type := (MAC_PT_RLCMAC_NO_OPT, MAC_PT_RLCMAC_OPT), @@ -352,7 +352,7 @@ msg_type := PACKET_DL_DUMMY_CTRL, u := { dl_dummy := { - page_mode := ?, + page_mode := page_mode, persistence_levels_present := ?, persistence_levels := * } @@ -418,6 +418,32 @@ } } + template RlcmacDlBlock tr_RLCMAC_PACKET_PAG_REQ(template uint3_t usf := ?) := { + ctrl := { + mac_hdr := { + payload_type := MAC_PT_RLCMAC_NO_OPT, + rrbp:= ?, + rrbp_valid := ?, + usf := usf + }, + opt := *, + payload := { + msg_type := PACKET_PAGING_REQUEST, + u := { + paging := { + page_mode := ?, + persistence_levels_present := ?, + persistence_levels := *, + nln_present := ?, + nln := *, + repeated_pageinfo_present := ?, + repeated_pageinfo := * + } + } + } + } + } + template RlcmacDlBlock tr_RLCMAC_DATA_RRBP := { data := { mac_hdr := { diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index 2fc42c1..c41a244 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -27,6 +27,9 @@ import from RLCMAC_CSN1_Types all; import from RLCMAC_Types all; +import from MobileL3_CommonIE_Types all; +import from L3_Templates all; + import from NS_Types all; import from BSSGP_Types all; import from Osmocom_Gb_Types all; @@ -810,6 +813,17 @@ poll_fn := dl_fn + f_rrbp_fn_delay(dl_block.ctrl.mac_hdr.rrbp); } +private function f_rx_rlcmac_dl_block_exp_pkt_pag_req(out RlcmacDlBlock dl_block) +runs on RAW_PCU_Test_CT { + var uint32_t dl_fn; + + f_rx_rlcmac_dl_block(dl_block, dl_fn); + if (not match(dl_block, tr_RLCMAC_PACKET_PAG_REQ())) { + setverdict(fail, "Failed to match Packet Paging Request: ", dl_block, " vs ", tr_RLCMAC_PACKET_PAG_REQ()); + mtc.stop; + } +} + private function f_rx_rlcmac_dl_block_exp_data(out RlcmacDlBlock dl_block, out uint32_t ack_fn, octetstring data, template (present) uint7_t exp_bsn := ?) runs on RAW_PCU_Test_CT { var PCUIF_Message pcu_msg; @@ -1588,6 +1602,70 @@ f_tx_rlcmac_ul_block(ts_RLCMAC_DL_ACK_NACK(dl_block.data.mac_hdr.hdr_ext.tfi, ack_nack_desc), 0, sched_fn); } +/* Test CS paging over the BTS<->PCU socket. + * When a (class B or C, not A) MS has an active TBF (or is on the PDCH), the MS can not react on CS paging over CCCH. + * Paging should be send on the PACCH. + * + * 1. Send a Paging Request over PCU socket. + * 2. Send a Ready-To-Send message over PCU socket + * 3. Expect a Paging Frame + */ +testcase TC_paging_cs_from_bts() runs on RAW_PCU_Test_CT { + var GsmRrMessage rr_imm_ass; + var PacketUlAssign ul_tbf_ass; + var RlcmacDlBlock dl_block; + var boolean ok; + var OCT4 tlli := '00000001'O; + var MobileL3_CommonIE_Types.MobileIdentityLV mi; + var octetstring mi_enc_lv; + var MobileIdentityLV_Paging mi_res; + var hexstring imsi := f_gen_imsi(42); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename()); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign('FFFFFFFF'O, tlli); + + /* Establish an Uplink TBF */ + ok := f_establish_tbf(rr_imm_ass); + if (not ok) { + setverdict(fail, "Failed to establish TBF"); + mtc.stop; + } + + ok := f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass); + if (not ok) { + setverdict(fail, "Immediate Assignment not an Uplink TBF"); + mtc.stop; + } + + + /* build mobile Identity */ + mi := valueof(ts_MI_IMSI_LV(imsi)); + mi_enc_lv := enc_MobileIdentityLV(mi); + /* Send paging request */ + BTS.send(ts_PCUIF_PAG_REQ(bts_nr := 0, id_lv := mi_enc_lv, chan_needed := 0, + sapi :=PCU_IF_SAPI_PDTCH)); + + /* Receive it on BTS side towards MS */ + f_rx_rlcmac_dl_block_exp_pkt_pag_req(dl_block); + /* FIXME: we must use .ps. here instead of .cs. (the one actually sent) + because TTCN3 counts length up to octet boundary and thinks it's a + PageInfoPs: */ + mi_res := dl_block.ctrl.payload.u.paging.repeated_pageinfo.ps.mobile_identity; + if (oct2int(substr(mi_enc_lv, 0, 1)) != mi_res.len) { + /* TODO: Verify MI contents encoded match */ + setverdict(fail, "Mobile Identity not matching (imsi=", imsi, ")"); + mtc.stop; + } + setverdict(pass); +} + control { execute( TC_ns_reset() ); execute( TC_ns_reset_retrans() ); @@ -1609,6 +1687,7 @@ execute( TC_t3193() ); execute( TC_mo_ping_pong() ); execute( TC_imm_ass_dl_block_retrans() ); + execute( TC_paging_cs_from_bts() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia3ad503c243c9b3b162e204683fa4fa5447bbab3 Gerrit-Change-Number: 15623 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Assignee: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:54:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:54:32 +0000 Subject: Change in libosmo-sccp[master]: ASP FSM: Permit DOWN -> DOWN "transition" In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/15976 ) Change subject: ASP FSM: Permit DOWN -> DOWN "transition" ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iabbcf92e3022a4c3f165ce19be929915f92b455c Gerrit-Change-Number: 15976 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 17 Dec 2019 13:54:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:55:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 13:55:43 +0000 Subject: Change in libosmo-sccp[master]: stp: exit(2) on unsupported positional arguments on command line References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16644 ) Change subject: stp: exit(2) on unsupported positional arguments on command line ...................................................................... stp: exit(2) on unsupported positional arguments on command line Change-Id: I70390948943fe42469b8c6d63babc232e857e60c --- M stp/stp_main.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/44/16644/1 diff --git a/stp/stp_main.c b/stp/stp_main.c index 3923ed2..61502c8 100644 --- a/stp/stp_main.c +++ b/stp/stp_main.c @@ -127,6 +127,11 @@ break; } } + + if (argc > optind) { + fprintf(stderr, "Unsuppoerted positional arguments in command line\n"); + exit(2); + } } static void signal_handler(int signal) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I70390948943fe42469b8c6d63babc232e857e60c Gerrit-Change-Number: 16644 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 13:57:34 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 17 Dec 2019 13:57:34 +0000 Subject: Change in libosmo-sccp[master]: stp: exit(2) on unsupported positional arguments on command line In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16644 ) Change subject: stp: exit(2) on unsupported positional arguments on command line ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/16644/1/stp/stp_main.c File stp/stp_main.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/16644/1/stp/stp_main.c at 132 PS1, Line 132: fprintf(stderr, "Unsuppoerted positional arguments in command line\n"); typo: Unsupported -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I70390948943fe42469b8c6d63babc232e857e60c Gerrit-Change-Number: 16644 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 17 Dec 2019 13:57:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Dec 17 13:58:15 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 13:58:15 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_10/aarch64 In-Reply-To: References: Message-ID: <5df8df0341cfe_55a92ab3271245f81801d0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_10/aarch64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_10/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 352s] #define HAVE_STDLIB_H 1 [ 352s] #define HAVE_STRING_H 1 [ 352s] #define HAVE_MEMORY_H 1 [ 352s] #define HAVE_STRINGS_H 1 [ 352s] #define HAVE_INTTYPES_H 1 [ 352s] #define HAVE_STDINT_H 1 [ 352s] #define HAVE_UNISTD_H 1 [ 352s] #define HAVE_DLFCN_H 1 [ 352s] #define LT_OBJDIR ".libs/" [ 352s] #define PACKAGE "osmo-remsim" [ 352s] #define VERSION "0.2.2.26-bbd1" [ 352s] #define HAVE_CSV_H 1 [ 352s] [ 352s] configure: exit 1 [ 352s] dh_auto_configure: ./configure --build=aarch64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/aarch64-linux-gnu --libexecdir=\${prefix}/lib/aarch64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 352s] make[1]: *** [debian/rules:15: override_dh_auto_configure] Error 2 [ 352s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 352s] make: *** [debian/rules:12: build] Error 2 [ 352s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 352s] [ 352s] obs-arm-7 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 13:58:06 UTC 2019. [ 352s] [ 352s] ### VM INTERACTION START ### [ 355s] [ 337.192047] sysrq: Power Off [ 355s] [ 337.218389] reboot: Power down [ 356s] ### VM INTERACTION END ### [ 356s] [ 356s] obs-arm-7 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 13:58:11 UTC 2019. [ 356s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 14:00:50 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 14:00:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5df8df9a238d1_55a92ab3271245f81815ed@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 377s] #define HAVE_MEMORY_H 1 [ 377s] #define HAVE_STRINGS_H 1 [ 377s] #define HAVE_INTTYPES_H 1 [ 377s] #define HAVE_STDINT_H 1 [ 377s] #define HAVE_UNISTD_H 1 [ 377s] #define HAVE_DLFCN_H 1 [ 377s] #define LT_OBJDIR ".libs/" [ 377s] #define PACKAGE "osmo-remsim" [ 377s] #define VERSION "0.2.2.26-bbd1" [ 377s] #define HAVE_CSV_H 1 [ 377s] [ 377s] configure: exit 1 [ 378s] dh_auto_configure: ./configure --build=aarch64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/aarch64-linux-gnu --libexecdir=${prefix}/lib/aarch64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 378s] debian/rules:15: recipe for target 'override_dh_auto_configure' failed [ 378s] make[1]: *** [override_dh_auto_configure] Error 2 [ 378s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 378s] debian/rules:12: recipe for target 'build' failed [ 378s] make: *** [build] Error 2 [ 378s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 378s] [ 378s] obs-arm-9 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 14:00:33 UTC 2019. [ 378s] [ 378s] ### VM INTERACTION START ### [ 380s] [ 362.802677] sysrq: Power Off [ 380s] [ 362.868750] reboot: Power down [ 380s] ### VM INTERACTION END ### [ 380s] [ 380s] obs-arm-9 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 14:00:37 UTC 2019. [ 380s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Dec 17 14:01:41 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 14:01:41 +0000 Subject: Change in libosmo-sccp[master]: ASP: Stop re-transmitting un-acknowledged messages on SCTP down event In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/15977 ) Change subject: ASP: Stop re-transmitting un-acknowledged messages on SCTP down event ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/c/libosmo-sccp/+/15977/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmo-sccp/+/15977/3//COMMIT_MSG at 9 PS3, Line 9: We don't want to attempt to re-transimt if we lots the connection: > If we have lots of connections it's fine re-transimting! [?] Done https://gerrit.osmocom.org/c/libosmo-sccp/+/15977/3/src/xua_asp_fsm.c File src/xua_asp_fsm.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/15977/3/src/xua_asp_fsm.c at 605 PS3, Line 605: osmo_timer_del(&xafp->t_ack.timer); > will the timer be armed again when we re-gain connectivity? or are we simply dropping everything on [?] which queue are you referring to? This timer has no queue associated with it, it is simply storing the message type of the last to-be-acknowledged message we sent, so we know what to re-transmit in case it wasn't ACKed by the peer. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ic8da646d22d3120121d9af43a890762a879f9d74 Gerrit-Change-Number: 15977 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 17 Dec 2019 14:01:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 14:01:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 14:01:53 +0000 Subject: Change in libosmo-sccp[master]: ASP: Stop re-transmitting un-acknowledged messages on SCTP down event In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15977 to look at the new patch set (#5). Change subject: ASP: Stop re-transmitting un-acknowledged messages on SCTP down event ...................................................................... ASP: Stop re-transmitting un-acknowledged messages on SCTP down event We don't want to attempt to re-transmit if we lost the connection: DLSS7 <000c> xua_asp_fsm.c:251 XUA_ASP(asp-client0){ASP_DOWN}: T(ack) callback: re-transmitting event ASPSM-ASP_UP DLSS7 <000c> osmo_ss7.c:1833 0: asp-asp-client0: Cannot transmit, asp->client not connected DLSS7 <000c> xua_asp_fsm.c:251 XUA_ASP(asp-client0){ASP_DOWN}: T(ack) callback: re-transmitting event ASPSM-ASP_UP DLSS7 <000c> osmo_ss7.c:1833 0: asp-asp-client0: Cannot transmit, asp->client not connected DLSS7 <000c> xua_asp_fsm.c:251 XUA_ASP(asp-client0){ASP_DOWN}: T(ack) callback: re-transmitting event ASPSM-ASP_UP DLSS7 <000c> osmo_ss7.c:1833 0: asp-asp-client0: Cannot transmit, asp->client not connected DLSS7 <000c> xua_asp_fsm.c:251 XUA_ASP(asp-client0){ASP_DOWN}: T(ack) callback: re-transmitting event ASPSM-ASP_UP DLSS7 <000c> osmo_ss7.c:1833 0: asp-asp-client0: Cannot transmit, asp->client not connected DLSS7 <000c> xua_asp_fsm.c:251 XUA_ASP(asp-client0){ASP_DOWN}: T(ack) callback: re-transmitting event ASPSM-ASP_UP Change-Id: Ic8da646d22d3120121d9af43a890762a879f9d74 --- M src/xua_asp_fsm.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/77/15977/5 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ic8da646d22d3120121d9af43a890762a879f9d74 Gerrit-Change-Number: 15977 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 14:02:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 14:02:51 +0000 Subject: Change in libosmo-sccp[master]: stp: exit(2) on unsupported positional arguments on command line In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16644 to look at the new patch set (#2). Change subject: stp: exit(2) on unsupported positional arguments on command line ...................................................................... stp: exit(2) on unsupported positional arguments on command line Change-Id: I70390948943fe42469b8c6d63babc232e857e60c --- M stp/stp_main.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/44/16644/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I70390948943fe42469b8c6d63babc232e857e60c Gerrit-Change-Number: 16644 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Dec 17 14:04:33 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 14:04:33 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5df8e08529852_55a92ab3271245f81844eb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 73s] /usr/src/packages/BUILD/firmware/apps/dfu/main.c:360: warning: undefined reference to `__stack_chk_guard' [ 73s] obj/simtrace/flash_dfu_desc.o: In function `set_usb_serial_str': [ 73s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_fail' [ 73s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_guard' [ 73s] obj/simtrace/flash_dfu_driver.o: In function `handle_getstate': [ 73s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_fail' [ 73s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_guard' [ 73s] collect2: error: ld returned 1 exit status [ 73s] % [ 73s] Makefile:233: recipe for target 'flash' failed [ 73s] make[2]: *** [flash] Error 1 [ 73s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 74s] Makefile:10: recipe for target 'fw-simtrace-dfu' failed [ 74s] make[1]: *** [fw-simtrace-dfu] Error 2 [ 74s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 74s] dh_auto_build: make -j1 returned exit code 2 [ 74s] debian/rules:16: recipe for target 'build' failed [ 74s] make: *** [build] Error 2 [ 74s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 74s] [ 74s] build82 failed "build simtrace2_0.7.0.36.56360.dsc" at Tue Dec 17 14:04:20 UTC 2019. [ 74s] [ 74s] ### VM INTERACTION START ### [ 77s] [ 66.097401] sysrq: SysRq : Power Off [ 77s] [ 66.100845] reboot: Power down [ 77s] ### VM INTERACTION END ### [ 77s] [ 77s] build82 failed "build simtrace2_0.7.0.36.56360.dsc" at Tue Dec 17 14:04:24 UTC 2019. [ 77s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 14:07:07 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 14:07:07 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5df8e11d2eed1_55a92ab3271245f8184943@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_9.0/i586 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 236s] #define HAVE_MEMORY_H 1 [ 236s] #define HAVE_STRINGS_H 1 [ 236s] #define HAVE_INTTYPES_H 1 [ 236s] #define HAVE_STDINT_H 1 [ 236s] #define HAVE_UNISTD_H 1 [ 236s] #define HAVE_DLFCN_H 1 [ 236s] #define LT_OBJDIR ".libs/" [ 236s] #define PACKAGE "osmo-remsim" [ 236s] #define VERSION "0.2.2.26-bbd1" [ 236s] #define HAVE_CSV_H 1 [ 236s] [ 236s] configure: exit 1 [ 236s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 236s] debian/rules:15: recipe for target 'override_dh_auto_configure' failed [ 236s] make[1]: *** [override_dh_auto_configure] Error 2 [ 236s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 236s] debian/rules:12: recipe for target 'build' failed [ 236s] make: *** [build] Error 2 [ 236s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 236s] [ 236s] lamb15 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 14:06:48 UTC 2019. [ 236s] [ 236s] ### VM INTERACTION START ### [ 240s] [ 224.390482] sysrq: SysRq : Power Off [ 240s] [ 224.400408] reboot: Power down [ 240s] ### VM INTERACTION END ### [ 240s] [ 240s] lamb15 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 14:06:52 UTC 2019. [ 240s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 14:07:58 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 14:07:58 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5df8e156ad550_55a92ab3271245f818537a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 238s] /usr/src/packages/BUILD/firmware/apps/dfu/main.c:360: warning: undefined reference to `__stack_chk_guard' [ 238s] obj/simtrace/flash_dfu_desc.o: In function `set_usb_serial_str': [ 238s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_fail' [ 238s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c:186: warning: undefined reference to `__stack_chk_guard' [ 238s] obj/simtrace/flash_dfu_driver.o: In function `handle_getstate': [ 238s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_fail' [ 238s] /usr/src/packages/BUILD/firmware/./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c:91: warning: undefined reference to `__stack_chk_guard' [ 238s] collect2: error: ld returned 1 exit status [ 238s] % [ 238s] Makefile:233: recipe for target 'flash' failed [ 238s] make[2]: *** [flash] Error 1 [ 238s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 238s] Makefile:10: recipe for target 'fw-simtrace-dfu' failed [ 238s] make[1]: *** [fw-simtrace-dfu] Error 2 [ 238s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 238s] dh_auto_build: make -j1 returned exit code 2 [ 238s] debian/rules:16: recipe for target 'build' failed [ 238s] make: *** [build] Error 2 [ 238s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 238s] [ 238s] lamb52 failed "build simtrace2_0.7.0.36.56360.dsc" at Tue Dec 17 14:07:44 UTC 2019. [ 238s] [ 238s] ### VM INTERACTION START ### [ 241s] [ 209.761090] sysrq: SysRq : Power Off [ 241s] [ 209.786347] reboot: Power down [ 241s] ### VM INTERACTION END ### [ 241s] [ 241s] lamb52 failed "build simtrace2_0.7.0.36.56360.dsc" at Tue Dec 17 14:07:47 UTC 2019. [ 241s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Dec 17 14:09:41 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 14:09:41 +0000 Subject: Change in osmo-ccid-firmware[master]: add talloc_log_fn() to print talloc errors In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16037 to look at the new patch set (#2). Change subject: add talloc_log_fn() to print talloc errors ...................................................................... add talloc_log_fn() to print talloc errors Change-Id: I7c7dac94eb813d963fc0312d808bd0674243f9e2 --- M sysmoOCTSIM/main.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/37/16037/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I7c7dac94eb813d963fc0312d808bd0674243f9e2 Gerrit-Change-Number: 16037 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 14:09:41 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 14:09:41 +0000 Subject: Change in osmo-ccid-firmware[master]: add panic handler printing talloc context In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16038 to look at the new patch set (#2). Change subject: add panic handler printing talloc context ...................................................................... add panic handler printing talloc context Change-Id: I0f3a112b67dc94aaee2ee788976e14eeda4e452d --- M sysmoOCTSIM/main.c 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/38/16038/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I0f3a112b67dc94aaee2ee788976e14eeda4e452d Gerrit-Change-Number: 16038 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 14:12:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 14:12:39 +0000 Subject: Change in libosmo-sccp[master]: stp: exit(2) on unsupported positional arguments on command line In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16644 ) Change subject: stp: exit(2) on unsupported positional arguments on command line ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I70390948943fe42469b8c6d63babc232e857e60c Gerrit-Change-Number: 16644 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 17 Dec 2019 14:12:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 14:12:42 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 14:12:42 +0000 Subject: Change in libosmo-sccp[master]: stp: exit(2) on unsupported positional arguments on command line In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16644 ) Change subject: stp: exit(2) on unsupported positional arguments on command line ...................................................................... stp: exit(2) on unsupported positional arguments on command line Change-Id: I70390948943fe42469b8c6d63babc232e857e60c --- M stp/stp_main.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/stp/stp_main.c b/stp/stp_main.c index 3923ed2..19420c0 100644 --- a/stp/stp_main.c +++ b/stp/stp_main.c @@ -127,6 +127,11 @@ break; } } + + if (argc > optind) { + fprintf(stderr, "Unsupported positional arguments in command line\n"); + exit(2); + } } static void signal_handler(int signal) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I70390948943fe42469b8c6d63babc232e857e60c Gerrit-Change-Number: 16644 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 14:12:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 14:12:43 +0000 Subject: Change in libosmo-sccp[master]: ASP FSM: Permit DOWN -> DOWN "transition" In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/15976 ) Change subject: ASP FSM: Permit DOWN -> DOWN "transition" ...................................................................... ASP FSM: Permit DOWN -> DOWN "transition" let's avoid messages like DLSS7 <000c> xua_asp_fsm.c:600 XUA_ASP(asp-client0){ASP_DOWN}: transition to state ASP_DOWN not permitted! Change-Id: Iabbcf92e3022a4c3f165ce19be929915f92b455c --- M src/xua_asp_fsm.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 9f30559..2fe2c8a 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -705,7 +705,8 @@ S(XUA_ASP_E_ASPSM_ASPUP_ACK) | S(XUA_ASP_E_ASPSM_ASPDN) | S(XUA_ASP_E_SCTP_EST_IND), - .out_state_mask = S(XUA_ASP_S_INACTIVE), + .out_state_mask = S(XUA_ASP_S_INACTIVE) | + S(XUA_ASP_S_DOWN), .name = "ASP_DOWN", .action = xua_asp_fsm_down, .onenter = xua_asp_fsm_down_onenter, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iabbcf92e3022a4c3f165ce19be929915f92b455c Gerrit-Change-Number: 15976 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Dec 17 14:21:08 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 14:21:08 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5df8e46448378_55a92ab3271245f8188878@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-remsim failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 349s] #define HAVE_STDLIB_H 1 [ 349s] #define HAVE_STRING_H 1 [ 349s] #define HAVE_MEMORY_H 1 [ 349s] #define HAVE_STRINGS_H 1 [ 349s] #define HAVE_INTTYPES_H 1 [ 349s] #define HAVE_STDINT_H 1 [ 349s] #define HAVE_UNISTD_H 1 [ 349s] #define HAVE_DLFCN_H 1 [ 349s] #define LT_OBJDIR ".libs/" [ 349s] #define PACKAGE "osmo-remsim" [ 349s] #define VERSION "0.2.2.26-bbd1" [ 349s] #define HAVE_CSV_H 1 [ 349s] [ 349s] configure: exit 1 [ 349s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 349s] make[1]: *** [debian/rules:15: override_dh_auto_configure] Error 2 [ 349s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 349s] make: *** [debian/rules:12: build] Error 2 [ 349s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 349s] [ 349s] lamb08 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 14:21:01 UTC 2019. [ 349s] [ 349s] ### VM INTERACTION START ### [ 352s] [ 335.986302] sysrq: SysRq : Power Off [ 352s] [ 335.998938] reboot: Power down [ 352s] ### VM INTERACTION END ### [ 352s] [ 352s] lamb08 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 14:21:04 UTC 2019. [ 352s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Dec 17 14:22:09 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 14:22:09 +0000 Subject: Change in osmo-e1d[master]: port to new libosmousb References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/16645 ) Change subject: port to new libosmousb ...................................................................... port to new libosmousb libosmousb, recently introduced to libosmocore.git, is taking care of main loop integration of libusb into osmo_select_main(). This means we don't need to do any polling here anymore. Change-Id: I3f3b61dfa217d6ef8c17970b2cf1cc627bb13bbe --- M configure.ac M src/Makefile.am M src/osmo-e1d.c M src/usb.c 4 files changed, 6 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/45/16645/1 diff --git a/configure.ac b/configure.ac index 91d34e8..c0508eb 100644 --- a/configure.ac +++ b/configure.ac @@ -33,6 +33,7 @@ PKG_CHECK_MODULES(TALLOC, [talloc >= 2.0.1]) PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.1.120) +PKG_CHECK_MODULES(LIBOSMOUSB, libosmousb) PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.21) AC_CONFIG_MACRO_DIR([m4]) diff --git a/src/Makefile.am b/src/Makefile.am index fd9ec35..2890554 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,7 +4,7 @@ LIBVERSION=0:0:0 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS=-Wall -Wno-unused-result $(LIBOSMOCORE_CFLAGS) $(LIBUSB_CFLAGS) +AM_CFLAGS=-Wall -Wno-unused-result $(LIBOSMOCORE_CFLAGS) $(LIBOSMOUSB_LIBS) $(LIBUSB_CFLAGS) lib_LTLIBRARIES = libosmo-e1d.la @@ -35,4 +35,4 @@ usb.c \ $(NULL) -osmo_e1d_LDADD = $(LIBOSMOCORE_LIBS) $(LIBUSB_LIBS) libosmo-e1d.la +osmo_e1d_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOUSB_LIBS) $(LIBUSB_LIBS) libosmo-e1d.la diff --git a/src/osmo-e1d.c b/src/osmo-e1d.c index fa3fc6c..92d98d3 100644 --- a/src/osmo-e1d.c +++ b/src/osmo-e1d.c @@ -42,7 +42,6 @@ extern struct osmo_e1dp_server_handler e1d_ctl_handlers[]; extern int e1_usb_probe(struct e1_daemon *e1d); -extern int e1_usb_poll(void); @@ -122,8 +121,7 @@ /* main loop */ while (!g_shutdown) { - osmo_select_main(1); - e1_usb_poll(); + osmo_select_main(0); } /* cleanup */ diff --git a/src/usb.c b/src/usb.c index 18e3053..19855f8 100644 --- a/src/usb.c +++ b/src/usb.c @@ -30,6 +30,7 @@ #include #include +#include #include @@ -572,7 +573,7 @@ int i, ret; if (!g_usb) { - ret = libusb_init(&g_usb); + ret = osmo_libusb_init(&g_usb); if (ret) { LOGP(DE1D, LOGL_ERROR, "Failed to initialize libusb\n"); return -EIO; @@ -602,15 +603,3 @@ return 0; } - -int -e1_usb_poll(void) -{ - int rv; - - rv = libusb_handle_events(g_usb); - if (rv != LIBUSB_SUCCESS) - return -EIO; - - return 0; -} -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/16645 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I3f3b61dfa217d6ef8c17970b2cf1cc627bb13bbe Gerrit-Change-Number: 16645 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Dec 17 14:32:15 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 14:32:15 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_10/i586 In-Reply-To: References: Message-ID: <5df8e6fb7f0fb_55a92ab3271245f8190531@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_10/i586 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 275s] #define HAVE_STDLIB_H 1 [ 275s] #define HAVE_STRING_H 1 [ 275s] #define HAVE_MEMORY_H 1 [ 275s] #define HAVE_STRINGS_H 1 [ 275s] #define HAVE_INTTYPES_H 1 [ 275s] #define HAVE_STDINT_H 1 [ 275s] #define HAVE_UNISTD_H 1 [ 275s] #define HAVE_DLFCN_H 1 [ 275s] #define LT_OBJDIR ".libs/" [ 275s] #define PACKAGE "osmo-remsim" [ 275s] #define VERSION "0.2.2.26-bbd1" [ 275s] #define HAVE_CSV_H 1 [ 275s] [ 275s] configure: exit 1 [ 275s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 275s] make[1]: *** [debian/rules:15: override_dh_auto_configure] Error 2 [ 275s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 275s] make: *** [debian/rules:12: build] Error 2 [ 275s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 275s] [ 275s] wildcard2 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 14:32:02 UTC 2019. [ 275s] [ 275s] ### VM INTERACTION START ### [ 278s] [ 259.973569] sysrq: SysRq : Power Off [ 278s] [ 259.976878] reboot: Power down [ 278s] ### VM INTERACTION END ### [ 278s] [ 278s] wildcard2 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 14:32:06 UTC 2019. [ 278s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 14:35:25 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 14:35:25 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5df8e7ca934d3_55a92ab3271245f819098d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_10/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 309s] #define HAVE_STDLIB_H 1 [ 309s] #define HAVE_STRING_H 1 [ 309s] #define HAVE_MEMORY_H 1 [ 309s] #define HAVE_STRINGS_H 1 [ 309s] #define HAVE_INTTYPES_H 1 [ 309s] #define HAVE_STDINT_H 1 [ 309s] #define HAVE_UNISTD_H 1 [ 309s] #define HAVE_DLFCN_H 1 [ 309s] #define LT_OBJDIR ".libs/" [ 309s] #define PACKAGE "osmo-remsim" [ 309s] #define VERSION "0.2.2.26-bbd1" [ 309s] #define HAVE_CSV_H 1 [ 309s] [ 309s] configure: exit 1 [ 309s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 309s] make[1]: *** [debian/rules:15: override_dh_auto_configure] Error 2 [ 309s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 309s] make: *** [debian/rules:12: build] Error 2 [ 309s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 309s] [ 309s] lamb19 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 14:35:09 UTC 2019. [ 309s] [ 309s] ### VM INTERACTION START ### [ 312s] [ 293.939931] sysrq: SysRq : Power Off [ 312s] [ 293.953299] reboot: Power down [ 312s] ### VM INTERACTION END ### [ 312s] [ 312s] lamb19 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 14:35:13 UTC 2019. [ 312s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 14:37:08 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 14:37:08 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5df8e822db4cd_55a92ab3271245f819148a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-remsim failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 571s] #define HAVE_MEMORY_H 1 [ 571s] #define HAVE_STRINGS_H 1 [ 571s] #define HAVE_INTTYPES_H 1 [ 571s] #define HAVE_STDINT_H 1 [ 571s] #define HAVE_UNISTD_H 1 [ 571s] #define HAVE_DLFCN_H 1 [ 571s] #define LT_OBJDIR ".libs/" [ 571s] #define PACKAGE "osmo-remsim" [ 571s] #define VERSION "0.2.2.26-bbd1" [ 571s] #define HAVE_CSV_H 1 [ 571s] [ 571s] configure: exit 1 [ 571s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 571s] debian/rules:15: recipe for target 'override_dh_auto_configure' failed [ 571s] make[1]: *** [override_dh_auto_configure] Error 2 [ 571s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 571s] debian/rules:12: recipe for target 'build' failed [ 571s] make: *** [build] Error 2 [ 571s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 571s] [ 571s] lamb04 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 14:36:52 UTC 2019. [ 571s] [ 571s] ### VM INTERACTION START ### [ 574s] [ 557.783072] sysrq: SysRq : Power Off [ 574s] [ 557.802692] reboot: Power down [ 574s] ### VM INTERACTION END ### [ 574s] [ 574s] lamb04 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 14:36:56 UTC 2019. [ 574s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Dec 17 14:40:10 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 14:40:10 +0000 Subject: Change in osmo-remsim[master]: debian/control: Add missing Build-Requires libosmo-simtrace2 References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16646 ) Change subject: debian/control: Add missing Build-Requires libosmo-simtrace2 ...................................................................... debian/control: Add missing Build-Requires libosmo-simtrace2 In Change-Id Idf5a861f4dacbec3c664f4ced6e03d8662c73112 we introduced the use of libosmo-simtrace2 (from simtrace2.git). Our configure script checks for it properly, but the debian/control wasn't updated. Change-Id: I875f9d6d06d806fb9f9264840a65934fb0e99972 --- M debian/control 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/46/16646/1 diff --git a/debian/control b/debian/control index 7638015..468fb0a 100644 --- a/debian/control +++ b/debian/control @@ -12,6 +12,7 @@ libcsv-dev, libosmocore-dev, libosmo-abis-dev, + libosmo-simtrace2, libpcsclite-dev, libusb-1.0-0-dev, libulfius-dev, -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I875f9d6d06d806fb9f9264840a65934fb0e99972 Gerrit-Change-Number: 16646 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 14:43:20 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 17 Dec 2019 14:43:20 +0000 Subject: Change in libosmo-sccp[master]: ASP: Stop re-transmitting un-acknowledged messages on SCTP down event In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/15977 ) Change subject: ASP: Stop re-transmitting un-acknowledged messages on SCTP down event ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ic8da646d22d3120121d9af43a890762a879f9d74 Gerrit-Change-Number: 15977 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 17 Dec 2019 14:43:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Dec 17 14:46:16 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 14:46:16 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5df8ea414bc25_55a92ab3271245f8193240@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 953s] #define HAVE_STDLIB_H 1 [ 953s] #define HAVE_STRING_H 1 [ 953s] #define HAVE_MEMORY_H 1 [ 953s] #define HAVE_STRINGS_H 1 [ 953s] #define HAVE_INTTYPES_H 1 [ 953s] #define HAVE_STDINT_H 1 [ 953s] #define HAVE_UNISTD_H 1 [ 953s] #define HAVE_DLFCN_H 1 [ 953s] #define LT_OBJDIR ".libs/" [ 953s] #define PACKAGE "osmo-remsim" [ 953s] #define VERSION "0.2.2.26-bbd1" [ 953s] #define HAVE_CSV_H 1 [ 953s] [ 953s] configure: exit 1 [ 953s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 953s] make[1]: *** [debian/rules:15: override_dh_auto_configure] Error 255 [ 953s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 953s] make: *** [debian/rules:12: build] Error 2 [ 953s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 953s] [ 953s] lamb21 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 14:46:03 UTC 2019. [ 953s] [ 953s] ### VM INTERACTION START ### [ 956s] [ 934.639880] sysrq: SysRq : Power Off [ 956s] [ 934.672863] reboot: Power down [ 956s] ### VM INTERACTION END ### [ 956s] [ 956s] lamb21 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 14:46:07 UTC 2019. [ 956s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 14:47:24 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 14:47:24 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5df8ea994bd34_55a92ab3271245f819343@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 414s] #define HAVE_STRING_H 1 [ 414s] #define HAVE_MEMORY_H 1 [ 414s] #define HAVE_STRINGS_H 1 [ 414s] #define HAVE_INTTYPES_H 1 [ 414s] #define HAVE_STDINT_H 1 [ 414s] #define HAVE_UNISTD_H 1 [ 414s] #define HAVE_DLFCN_H 1 [ 414s] #define LT_OBJDIR ".libs/" [ 414s] #define PACKAGE "osmo-remsim" [ 414s] #define VERSION "0.2.2.26-bbd1" [ 414s] #define HAVE_CS[ 397.694657] serial8250: too much work for irq4 [ 414s] V_H 1 [ 414s] [ 414s] configure: exit 1 [ 414s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 414s] make[1]: *** [debian/rules:15: override_dh_auto_configure] Error 255 [ 414s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 414s] make: *** [debian/rules:12: build] Error 2 [ 414s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 414s] [ 414s] lamb13 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 14:47:14 UTC 2019. [ 414s] [ 414s] ### VM INTERACTION START ### [ 417s] [ 400.999124] sysrq: SysRq : Power Off [ 417s] [ 401.004766] reboot: Power down [ 417s] ### VM INTERACTION END ### [ 417s] [ 417s] lamb13 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 14:47:19 UTC 2019. [ 417s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 14:53:07 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 14:53:07 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5df8ebe15c081_55a92ab3271245f81939dc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 322s] #define HAVE_STDLIB_H 1 [ 322s] #define HAVE_STRING_H 1 [ 322s] #define HAVE_MEMORY_H 1 [ 322s] #define HAVE_STRINGS_H 1 [ 322s] #define HAVE_INTTYPES_H 1 [ 322s] #define HAVE_STDINT_H 1 [ 322s] #define HAVE_UNISTD_H 1 [ 322s] #define HAVE_DLFCN_H 1 [ 322s] #define LT_OBJDIR ".libs/" [ 322s] #define PACKAGE "osmo-remsim" [ 322s] #define VERSION "0.2.2.26-bbd1" [ 322s] #define HAVE_CSV_H 1 [ 322s] [ 322s] configure: exit 1 [ 322s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 322s] make[1]: *** [debian/rules:15: override_dh_auto_configure] Error 2 [ 322s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 322s] make: *** [debian/rules:12: build] Error 2 [ 322s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 322s] [ 322s] lamb22 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 14:52:45 UTC 2019. [ 322s] [ 322s] ### VM INTERACTION START ### [ 325s] [ 302.084492] sysrq: SysRq : Power Off [ 325s] [ 302.090597] reboot: Power down [ 325s] ### VM INTERACTION END ### [ 325s] [ 325s] lamb22 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 14:52:50 UTC 2019. [ 325s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 14:54:32 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 14:54:32 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5df8ec3f73f1d_55a92ab3271245f81941a4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 396s] #define HAVE_STRINGS_H 1 [ 396s] #define HAVE_INTTYPES_H 1 [ 396s] #define HAVE_STDINT_H 1 [ 396s] #define HAVE_UNISTD_H 1 [ 396s] #define HAVE_DLFCN_H 1 [ 396s] #define LT_OBJDIR ".libs/" [ 396s] #define PACKAGE "osmo-remsim" [ 396s] #define VERSION "0[ 363.731055] serial8250: too much work for irq4 [ 396s] .2.2.26-bbd1" [ 396s] #define HAVE_CSV_H 1 [ 396s] [ 396s] configure: exit 1 [ 396s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 396s] debian/rules:15: recipe for target 'override_dh_auto_configure' failed [ 396s] make[1]: *** [override_dh_auto_configure] Error 2 [ 396s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 396s] debian/rules:12: recipe for target 'build' failed [ 396s] make: *** [build] Error 2 [ 396s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 396s] [ 396s] lamb60 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 14:54:25 UTC 2019. [ 396s] [ 396s] ### VM INTERACTION START ### [ 399s] [ 367.336530] sysrq: SysRq : Power Off [ 400s] [ 367.344362] reboot: Power down [ 400s] ### VM INTERACTION END ### [ 400s] [ 400s] lamb60 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 14:54:29 UTC 2019. [ 400s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 14:58:33 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 14:58:33 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5df8ed2ddd2c1_55a92ab3271245f819515@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 657s] #define HAVE_STDLIB_H 1 [ 657s] #define HAVE_STRING_H 1 [ 657s] #define HAVE_MEMORY_H 1 [ 657s] #define HAVE_STRINGS_H 1 [ 657s] #define HAVE_INTTYPES_H 1 [ 657s] #define HAVE_STDINT_H 1 [ 657s] #define HAVE_UNISTD_H 1 [ 657s] #define HAVE_DLFCN_H 1 [ 657s] #define LT_OBJDIR ".libs/" [ 657s] #define PACKAGE "osmo-remsim" [ 657s] #define VERSION "0.2.2.26-bbd1" [ 657s] #define HAVE_CSV_H 1 [ 657s] [ 657s] configure: exit 1 [ 657s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 657s] make[1]: *** [debian/rules:15: override_dh_auto_configure] Error 2 [ 657s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 657s] make: *** [debian/rules:12: build] Error 2 [ 657s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 657s] [ 657s] lamb53 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 14:58:20 UTC 2019. [ 657s] [ 657s] ### VM INTERACTION START ### [ 661s] [ 634.931730] sysrq: SysRq : Power Off [ 661s] [ 634.974951] reboot: Power down [ 661s] ### VM INTERACTION END ### [ 661s] [ 661s] lamb53 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 14:58:24 UTC 2019. [ 661s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 15:26:50 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 15:26:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5df8f3c0611ec_55a92ab3271245f820303c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 234s] #define HAVE_MEMORY_H 1 [ 234s] #define HAVE_STRINGS_H 1 [ 234s] #define HAVE_INTTYPES_H 1 [ 234s] #define HAVE_STDINT_H 1 [ 234s] #define HAVE_UNISTD_H 1 [ 234s] #define HAVE_DLFCN_H 1 [ 234s] #define LT_OBJDIR ".libs/" [ 234s] #define PACKAGE "osmo-remsim" [ 234s] #define VERSION "0.2.2.26-bbd1" [ 234s] #define HAVE_CSV_H 1 [ 234s] [ 234s] configure: exit 1 [ 234s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 234s] debian/rules:15: recipe for target 'override_dh_auto_configure' failed [ 234s] make[1]: *** [override_dh_auto_configure] Error 2 [ 234s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 234s] debian/rules:12: recipe for target 'build' failed [ 234s] make: *** [build] Error 2 [ 234s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 234s] [ 234s] lamb02 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 15:26:30 UTC 2019. [ 234s] [ 234s] ### VM INTERACTION START ### [ 237s] [ 221.349689] sysrq: SysRq : Power Off [ 237s] [ 221.356668] reboot: Power down [ 237s] ### VM INTERACTION END ### [ 237s] [ 237s] lamb02 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 15:26:34 UTC 2019. [ 237s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 15:41:08 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 15:41:08 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5df8f725e7034_55a92ab3271245f8207543@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 404s] #define HAVE_STDLIB_H 1 [ 404s] #define HAVE_STRING_H 1 [ 404s] #define HAVE_MEMORY_H 1 [ 404s] #define HAVE_STRINGS_H 1 [ 404s] #define HAVE_INTTYPES_H 1 [ 404s] #define HAVE_STDINT_H 1 [ 404s] #define HAVE_UNISTD_H 1 [ 404s] #define HAVE_DLFCN_H 1 [ 404s] #define LT_OBJDIR ".libs/" [ 404s] #define PACKAGE "osmo-remsim" [ 404s] #define VERSION "0.2.2.26-bbd1" [ 404s] #define HAVE_CSV_H 1 [ 404s] [ 404s] configure: exit 1 [ 404s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 404s] make[1]: *** [debian/rules:15: override_dh_auto_configure] Error 255 [ 404s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 404s] make: *** [debian/rules:12: build] Error 2 [ 404s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 404s] [ 404s] lamb19 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 15:40:51 UTC 2019. [ 404s] [ 404s] ### VM INTERACTION START ### [ 408s] [ 389.820389] sysrq: SysRq : Power Off [ 408s] [ 389.825961] reboot: Power down [ 408s] ### VM INTERACTION END ### [ 408s] [ 408s] lamb19 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 15:40:55 UTC 2019. [ 408s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Dec 17 16:00:49 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 16:00:49 +0000 Subject: Change in libosmo-sccp[master]: ASP: Stop re-transmitting un-acknowledged messages on SCTP down event In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/15977 ) Change subject: ASP: Stop re-transmitting un-acknowledged messages on SCTP down event ...................................................................... ASP: Stop re-transmitting un-acknowledged messages on SCTP down event We don't want to attempt to re-transmit if we lost the connection: DLSS7 <000c> xua_asp_fsm.c:251 XUA_ASP(asp-client0){ASP_DOWN}: T(ack) callback: re-transmitting event ASPSM-ASP_UP DLSS7 <000c> osmo_ss7.c:1833 0: asp-asp-client0: Cannot transmit, asp->client not connected DLSS7 <000c> xua_asp_fsm.c:251 XUA_ASP(asp-client0){ASP_DOWN}: T(ack) callback: re-transmitting event ASPSM-ASP_UP DLSS7 <000c> osmo_ss7.c:1833 0: asp-asp-client0: Cannot transmit, asp->client not connected DLSS7 <000c> xua_asp_fsm.c:251 XUA_ASP(asp-client0){ASP_DOWN}: T(ack) callback: re-transmitting event ASPSM-ASP_UP DLSS7 <000c> osmo_ss7.c:1833 0: asp-asp-client0: Cannot transmit, asp->client not connected DLSS7 <000c> xua_asp_fsm.c:251 XUA_ASP(asp-client0){ASP_DOWN}: T(ack) callback: re-transmitting event ASPSM-ASP_UP DLSS7 <000c> osmo_ss7.c:1833 0: asp-asp-client0: Cannot transmit, asp->client not connected DLSS7 <000c> xua_asp_fsm.c:251 XUA_ASP(asp-client0){ASP_DOWN}: T(ack) callback: re-transmitting event ASPSM-ASP_UP Change-Id: Ic8da646d22d3120121d9af43a890762a879f9d74 --- M src/xua_asp_fsm.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 2fe2c8a..64892ad 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -663,11 +663,13 @@ static void xua_asp_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct xua_asp_fsm_priv *xafp = fi->priv; struct xua_msg *xua; switch (event) { case XUA_ASP_E_SCTP_COMM_DOWN_IND: case XUA_ASP_E_SCTP_RESTART_IND: + osmo_timer_del(&xafp->t_ack.timer); osmo_fsm_inst_state_chg(fi, XUA_ASP_S_DOWN, 0, 0); send_xlm_prim_simple(fi, OSMO_XLM_PRIM_M_ASP_DOWN, PRIM_OP_INDICATION); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ic8da646d22d3120121d9af43a890762a879f9d74 Gerrit-Change-Number: 15977 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 16:58:49 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 17 Dec 2019 16:58:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Remove trailing whitespace References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16647 ) Change subject: msc: Remove trailing whitespace ...................................................................... msc: Remove trailing whitespace Change-Id: I934dd3504fa91e2006fbc9b1133836060eb0591e --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/16647/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 0846c04..cd1a114 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1837,5 +1837,3 @@ } - - diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index a083606..e2728d3 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1736,7 +1736,7 @@ setverdict(fail, "no BSSMAP RESET ACK seen!"); mtc.stop; } - } + } } /* Test MO Call with no response to RAN-side CRCX or DTAP Release */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16647 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I934dd3504fa91e2006fbc9b1133836060eb0591e Gerrit-Change-Number: 16647 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 16:58:49 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 17 Dec 2019 16:58:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Introduce test TC_lu_imsi_timeout_tmsi_realloc References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16648 ) Change subject: msc: Introduce test TC_lu_imsi_timeout_tmsi_realloc ...................................................................... msc: Introduce test TC_lu_imsi_timeout_tmsi_realloc Change-Id: I603b2b2b1ae7edd6360ea38c6bbbfedc46e9fa5d --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/MSC_Tests_Iu.ttcn 3 files changed, 64 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/48/16648/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index cd1a114..1ce0b69 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -642,13 +642,13 @@ setverdict(pass); } -function f_expect_lu_reject() runs on BSC_ConnHdlr { +function f_expect_lu_reject(template OCT1 cause := ?) runs on BSC_ConnHdlr { var PDU_DTAP_MT dtap_mt; timer T := 5.0; T.start; alt { - [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) { + [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej(cause))) { setverdict(pass); } [] BSSAP.receive(tr_PDU_DTAP_MT(?)) -> value dtap_mt { diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index e2728d3..02786eb 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -561,6 +561,57 @@ vc_conn.done; } +/* Proceed with LU but never receive an TMSI Realloc from MS after LU Accept. +/* MSC sends a LU REJECT after X1 times out (5 seconds by default) */ +friend function f_tc_lu_imsi_timeout_tmsi_realloc(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + + f_init_handler(pars); + + var PDU_ML3_MS_NW l3_lu := f_build_lu_imsi(g_pars.imsi); + var PDU_DTAP_MT dtap_mt; + + /* tell GSUP dispatcher to send this IMSI to us */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Send BSSAP_Conn_Req with COMPL L3 INFO to MSC */ + if (g_pars.ran_is_geran) { + f_bssap_compl_l3(l3_lu); + if (g_pars.send_early_cm) { + BSSAP.send(ts_BSSMAP_ClassmarkUpd(g_pars.cm2, g_pars.cm3)); + } + } else { + f_ranap_initial_ue(l3_lu); + } + + f_mm_imei_early(); + f_mm_common(); + f_msc_lu_hlr(); + f_mm_imei(); + + alt { + [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Acc)) -> value dtap_mt {} + [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) { + setverdict(fail, "Expected LU ACK, but received LU REJ"); + mtc.stop; + } + } + + /* f_expect_lu_reject() already waits for T"-1" (X1, 5 seconds), but give some + extra time to avoid race conditons... */ + f_sleep(1.0) + f_expect_lu_reject('16'O); /* Cause: congestion */ + f_expect_clear(); + + setverdict(pass); +} +testcase TC_lu_imsi_timeout_tmsi_realloc() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + + vc_conn := f_start_handler(refers(f_tc_lu_imsi_timeout_tmsi_realloc), 5); + vc_conn.done; +} + /* Send CM SERVICE REQ for IMSI that has never performed LU before */ friend function f_tc_cmserv_imsi_unknown(charstring id, BSC_ConnHdlrPars pars) @@ -5719,6 +5770,7 @@ execute( TC_lu_imsi_timeout_gsup() ); execute( TC_lu_imsi_auth_tmsi() ); execute( TC_lu_imsi_auth3g_tmsi() ); + execute( TC_lu_imsi_timeout_tmsi_realloc() ); execute( TC_cmserv_imsi_unknown() ); execute( TC_lu_and_mo_call() ); execute( TC_lu_auth_sai_timeout() ); diff --git a/msc/MSC_Tests_Iu.ttcn b/msc/MSC_Tests_Iu.ttcn index 9ea0c76..b80005e 100644 --- a/msc/MSC_Tests_Iu.ttcn +++ b/msc/MSC_Tests_Iu.ttcn @@ -56,6 +56,15 @@ vc_conn.done; } +testcase TC_iu_lu_imsi_timeout_tmsi_realloc() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(3); + f_vty_config(MSCVTY, "network", "authentication required"); + + vc_conn := f_start_handler(refers(f_tc_lu_imsi_timeout_tmsi_realloc), 1005, ran_idx := 2, ran_is_geran := false); + vc_conn.done; +} + testcase TC_iu_cmserv_imsi_unknown() runs on MTC_CT { var BSC_ConnHdlr vc_conn; f_init(3); @@ -424,6 +433,7 @@ execute( TC_iu_lu_imsi_reject() ); execute( TC_iu_lu_imsi_timeout_gsup() ); execute( TC_iu_lu_imsi_auth3g_tmsi() ); + execute( TC_iu_lu_imsi_timeout_tmsi_realloc() ); execute( TC_iu_cmserv_imsi_unknown() ); execute( TC_iu_lu_and_mo_call() ); execute( TC_iu_lu_auth_sai_timeout() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I603b2b2b1ae7edd6360ea38c6bbbfedc46e9fa5d Gerrit-Change-Number: 16648 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 17:29:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 17:29:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Remove trailing whitespace In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16647 ) Change subject: msc: Remove trailing whitespace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16647 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I934dd3504fa91e2006fbc9b1133836060eb0591e Gerrit-Change-Number: 16647 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 17 Dec 2019 17:29:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 17:30:05 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 17 Dec 2019 17:30:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Remove trailing whitespace In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16647 ) Change subject: msc: Remove trailing whitespace ...................................................................... msc: Remove trailing whitespace Change-Id: I934dd3504fa91e2006fbc9b1133836060eb0591e --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 1 insertion(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 0846c04..cd1a114 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1837,5 +1837,3 @@ } - - diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index a083606..e2728d3 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1736,7 +1736,7 @@ setverdict(fail, "no BSSMAP RESET ACK seen!"); mtc.stop; } - } + } } /* Test MO Call with no response to RAN-side CRCX or DTAP Release */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16647 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I934dd3504fa91e2006fbc9b1133836060eb0591e Gerrit-Change-Number: 16647 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 17:41:08 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 17 Dec 2019 17:41:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Introduce test TC_lu_imsi_timeout_tmsi_realloc In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16648 ) Change subject: msc: Introduce test TC_lu_imsi_timeout_tmsi_realloc ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16648/1/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16648/1/msc/MSC_Tests.ttcn at 565 PS1, Line 565: /* MSC sends a LU REJECT after X1 times out (5 seconds by default) */ (opening comment inside a still open comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16648/1/msc/MSC_Tests.ttcn at 603 PS1, Line 603: f_expect_clear(); The "Congestion" cause was just a wild guess, assuming that the last message failed to get processed in time. We could write '?' as cause here to not make it appear like cast in stone in the specs. It could be easier to tweak the f_perform_lu() function with optional parameters. IIUC all you need is the same f_perform_lu(), only with a flag that skips sending the 'TMSI Reallocation Complete' and exits early (in f_accept_reject_lu()); then you can f_expect_lu_reject() here? (OTOH, this is unlikely to get refactored / change ordering, so it's also fine like this) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I603b2b2b1ae7edd6360ea38c6bbbfedc46e9fa5d Gerrit-Change-Number: 16648 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Tue, 17 Dec 2019 17:41:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 17 17:43:44 2019 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 17 Dec 2019 17:43:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: add tests for SMS and voice call while Paging In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297 ) Change subject: msc: add tests for SMS and voice call while Paging ...................................................................... Patch Set 4: (1 comment) thx, will address all comments as I find the time https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297/4/msc/BSC_ConnectionHandler.ttcn File msc/BSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297/4/msc/BSC_ConnectionHandler.ttcn at 1757 PS4, Line 1757: expect_deliver_pdu > This naming is confusing. We don't 'expect' (to receive) anything in this function. [?] "f_mt_sms_expected_deliver_pdu()" ? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ieeae6322d4e80893ea3408c6b74bf8e32bea8e46 Gerrit-Change-Number: 16297 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 17 Dec 2019 17:43:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Dec 17 20:06:45 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 20:06:45 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5df9356974519_55a92ab3271245f82510c1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Raspbian_10/armv7l Package network:osmocom:nightly/osmo-remsim failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 733s] compilation terminated. [ 733s] configure:9320: $? = 1 [ 733s] configure:9324: checking whether we are using the GNU C compiler [ 733s] configure:9352: result: yes [ 733s] configure:9361: checking whether gcc accepts -g [ 733s] configure:9422: result: yes [ 733s] configure:9439: checking for gcc option to accept ISO C89 [ 733s] configure:9515: result: none needed [ 733s] configure:9540: checking whether gcc understands -c and -o together [ 733s] configure:9577: result: yes [ 733s] configure:9598: checking for pkg-config [ 733s] configure:9616: found /usr/bin/pkg-config [ 733s] configure:9629: result: /usr/bin/pkg-config [ 733s] configure:9695: checking for pkg-config [ 733s] configure:9713: found /usr/bin/pkg-config [ 733s] configure:9725: result: /usr/bin/pkg-config [ 733s] configure:9750: checking pkg-config is at least version 0.20 [ 733s] configure:9753: result: yes [ 733s] configure:9762: checking for csv_init in -lcsv [ 733s] configure:9787: gcc -o conftest -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wl,-z,relro -Wl,-z,now conftest.c -lcsv >&5 [ 733s] configure:9787: $? = 0 [ 733s] configure:9796: result: yes [ 733s] configure:9806: checking csv.h usability [ 735s] configure:9806: gcc -c -g -O2 -fdebug-prefix-map=/usr/src/packa[ 690.005136] sysrq: SysRq : Power Off [ 735s] [ 690.006753] reboot: Power down [ 735s] ### VM INTERACTION END ### [ 735s] [ 735s] armbuild02 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 20:06:40 UTC 2019. [ 735s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 20:21:36 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 20:21:36 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_10/armv7l In-Reply-To: References: Message-ID: <5df938eb8b173_55a92ab3271245f8254468@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_10/armv7l Package network:osmocom:nightly/osmo-remsim failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 666s] #define HAVE_STDLIB_H 1 [ 666s] #define HAVE_STRING_H 1 [ 666s] #define HAVE_MEMORY_H 1 [ 666s] #define HAVE_STRINGS_H 1 [ 666s] #define HAVE_INTTYPES_H 1 [ 666s] #define HAVE_STDINT_H 1 [ 666s] #define HAVE_UNISTD_H 1 [ 666s] #define HAVE_DLFCN_H 1 [ 666s] #define LT_OBJDIR ".libs/" [ 666s] #define PACKAGE "osmo-remsim" [ 666s] #define VERSION "0.2.2.26-bbd1" [ 666s] #define HAVE_CSV_H 1 [ 666s] [ 666s] configure: exit 1 [ 666s] dh_auto_configure: ./configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --libexecdir=\${prefix}/lib/arm-linux-gnueabihf --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 666s] make[1]: *** [debian/rules:15: override_dh_auto_configure] Error 2 [ 666s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 666s] make: *** [debian/rules:12: build] Error 2 [ 666s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 666s] [ 666s] obs-arm-6 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 20:21:24 UTC 2019. [ 666s] [ 666s] ### VM INTERACTION START ### [ 669s] [ 624.972550] sysrq: SysRq : Power Off [ 669s] [ 625.002144] reboot: Power down [ 670s] ### VM INTERACTION END ### [ 670s] [ 670s] obs-arm-6 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 20:21:29 UTC 2019. [ 670s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Dec 17 20:39:02 2019 From: admin at opensuse.org (OBS Notification) Date: Tue, 17 Dec 2019 20:39:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5df93cec533e4_55a92ab3271245f825774e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-remsim failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 509s] am__nodep='' [ 509s] am__quote='' [ 509s] am__tar='tar --format=ustar -chf - "$$tardir"' [ 509s] am__untar='tar -xf -' [ 509s] bindir='${exec_prefix}/bin' [ 509s] build='arm-unknown-linux-gnueabihf' [ 509s] build_alias='arm-linux-gnueabihf' [ 509s] build_cpu='arm' [ 509s] build_os='linux-gnueabihf' [ 509s] build_vendor='unknown' [ 509s] datadir='${datarootdir}' [ 509s] datarootdir='${prefix}/share' [ 509s] docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' [ 509s] dvidir='${docdir}' [ 509s] exec_prefix='NONE' [ 509s] host='arm-unknown-linux-gnueabihf' [ 509s] host_alias='' [ 509s] host_cpu='arm' [ 509s] host_os='linux-gnueabihf' [ 509s] host_vendor='unknown' [ 509s] htmldir='${docdir}' [ 509s] includedir='${prefix}/include' [ 509s] infodir='${prefix}/share/info' [ 511s] install_sh='${SHELL} /usr/sr[ 471.893209] sysrq: SysRq : Power Off [ 511s] [ 471.895829] reboot: Power down [ 511s] ### VM INTERACTION END ### [ 511s] [ 511s] armbuild02 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Tue Dec 17 20:38:46 UTC 2019. [ 511s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 18 01:47:18 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 18 Dec 2019 01:47:18 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5df9853644694_55a92ab3271245f832979e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 383s] configure:12599: $? = 1 [ 383s] configure:12588: gcc -qversion >&5 [ 383s] gcc: error: unrecognized command line option '-qversion'; did you mean '--version'? [ 383s] gcc: fatal error: no input files [ 383s] compilation terminated. [ 383s] configure:12599: $? = 1 [ 383s] configure:12603: checking whether we are using the GNU C compiler [ 383s] configure:12631: result: yes [ 383s] configure:12640: checking whether gcc accepts -g [ 383s] configure:12701: result: yes [ 383s] configure:12718: checking for gcc option to accept ISO C89 [ 383s] configure:12794: result: none needed [ 383s] configure:12819: checking whether gcc understands -c and -o together [ 383s] configure:12856: result: yes [ 383s] configure:12877: checking for pkg-config [ 383s] configure:12895: found /usr/bin/pkg-config [ 383s] configure:12908: result: /usr/bin/pkg-config [ 383s] configure:12974: checking for pkg-config [ 383s] configure:12992: found /usr/bin/pkg-config [ 383s] configure:13004: result: /usr/bin/pkg-config [ 383s] configure:13029: checking pkg-config is at least version 0.20 [ 383s] configure:13032: result: yes [ 383s] configure:13041: checking for csv_init in -lcsv [ 385s] configure:13066: gcc -o conftest -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTI[ 357.365859] sysrq: SysRq : Power Off [ 385s] [ 357.369353] reboot: Power down [ 385s] ### VM INTERACTION END ### [ 385s] [ 385s] obs-arm-4 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 01:47:16 UTC 2019. [ 385s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 18 01:49:35 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 18 Dec 2019 01:49:35 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5df985ce30b49_55a92ab3271245f833033e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_9.0/i586 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 250s] #define HAVE_MEMORY_H 1 [ 250s] #define HAVE_STRINGS_H 1 [ 250s] #define HAVE_INTTYPES_H 1 [ 250s] #define HAVE_STDINT_H 1 [ 250s] #define HAVE_UNISTD_H 1 [ 250s] #define HAVE_DLFCN_H 1 [ 250s] #define LT_OBJDIR ".libs/" [ 250s] #define PACKAGE "osmo-remsim" [ 250s] #define VERSION "0.2.2.26-bbd1" [ 250s] #define HAVE_CSV_H 1 [ 250s] [ 250s] configure: exit 1 [ 250s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 250s] debian/rules:15: recipe for target 'override_dh_auto_configure' failed [ 250s] make[1]: *** [override_dh_auto_configure] Error 2 [ 250s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 250s] debian/rules:12: recipe for target 'build' failed [ 250s] make: *** [build] Error 2 [ 250s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 250s] [ 250s] lamb15 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 01:49:18 UTC 2019. [ 250s] [ 250s] ### VM INTERACTION START ### [ 253s] [ 236.417516] sysrq: SysRq : Power Off [ 253s] [ 236.428448] reboot: Power down [ 253s] ### VM INTERACTION END ### [ 253s] [ 253s] lamb15 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 01:49:22 UTC 2019. [ 253s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 18 01:51:18 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 18 Dec 2019 01:51:18 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_10/aarch64 In-Reply-To: References: Message-ID: <5df986256f947_55a92ab3271245f83306d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_10/aarch64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_10/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 258s] #define HAVE_STDLIB_H 1 [ 258s] #define HAVE_STRING_H 1 [ 258s] #define HAVE_MEMORY_H 1 [ 258s] #define HAVE_STRINGS_H 1 [ 258s] #define HAVE_INTTYPES_H 1 [ 258s] #define HAVE_STDINT_H 1 [ 258s] #define HAVE_UNISTD_H 1 [ 258s] #define HAVE_DLFCN_H 1 [ 258s] #define LT_OBJDIR ".libs/" [ 258s] #define PACKAGE "osmo-remsim" [ 258s] #define VERSION "0.2.2.26-bbd1" [ 258s] #define HAVE_CSV_H 1 [ 258s] [ 258s] configure: exit 1 [ 258s] dh_auto_configure: ./configure --build=aarch64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/aarch64-linux-gnu --libexecdir=\${prefix}/lib/aarch64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 258s] make[1]: *** [debian/rules:15: override_dh_auto_configure] Error 2 [ 258s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 258s] make: *** [debian/rules:12: build] Error 2 [ 258s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 258s] [ 258s] obs-arm-7 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 01:51:06 UTC 2019. [ 258s] [ 258s] ### VM INTERACTION START ### [ 260s] [ 245.649333] sysrq: Power Off [ 260s] [ 245.698287] reboot: Power down [ 261s] ### VM INTERACTION END ### [ 261s] [ 261s] obs-arm-7 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 01:51:10 UTC 2019. [ 261s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 18 01:56:26 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 18 Dec 2019 01:56:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_10/i586 In-Reply-To: References: Message-ID: <5df98752a7fd9_55a92ab3271245f8331397@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_10/i586 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 192s] #define HAVE_STDLIB_H 1 [ 192s] #define HAVE_STRING_H 1 [ 192s] #define HAVE_MEMORY_H 1 [ 192s] #define HAVE_STRINGS_H 1 [ 192s] #define HAVE_INTTYPES_H 1 [ 192s] #define HAVE_STDINT_H 1 [ 192s] #define HAVE_UNISTD_H 1 [ 192s] #define HAVE_DLFCN_H 1 [ 192s] #define LT_OBJDIR ".libs/" [ 192s] #define PACKAGE "osmo-remsim" [ 192s] #define VERSION "0.2.2.26-bbd1" [ 192s] #define HAVE_CSV_H 1 [ 192s] [ 192s] configure: exit 1 [ 192s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 192s] make[1]: *** [debian/rules:15: override_dh_auto_configure] Error 2 [ 192s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 192s] make: *** [debian/rules:12: build] Error 2 [ 192s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 192s] [ 192s] build72 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 01:56:19 UTC 2019. [ 192s] [ 192s] ### VM INTERACTION START ### [ 195s] [ 184.194350] sysrq: SysRq : Power Off [ 195s] [ 184.196804] reboot: Power down [ 195s] ### VM INTERACTION END ### [ 195s] [ 195s] build72 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 01:56:22 UTC 2019. [ 195s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 18 01:58:10 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 18 Dec 2019 01:58:10 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <5df987c9626dc_55a92ab3271245f8331619@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 419s] #define HAVE_STDLIB_H 1 [ 419s] #define HAVE_STRING_H 1 [ 419s] #define HAVE_MEMORY_H 1 [ 419s] #define HAVE_STRINGS_H 1 [ 419s] #define HAVE_INTTYPES_H 1 [ 419s] #define HAVE_STDINT_H 1 [ 419s] #define HAVE_UNISTD_H 1 [ 419s] #define HAVE_DLFCN_H 1 [ 419s] #define LT_OBJDIR ".libs/" [ 419s] #define PACKAGE "osmo-remsim" [ 419s] #define VERSION "0.2.2.26-bbd1" [ 419s] #define HAVE_CSV_H 1 [ 419s] [ 419s] configure: exit 1 [ 419s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 419s] make[1]: *** [debian/rules:15: override_dh_auto_configure] Error 255 [ 419s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 419s] make: *** [debian/rules:12: build] Error 2 [ 419s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 419s] [ 419s] lamb28 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 01:57:52 UTC 2019. [ 419s] [ 419s] ### VM INTERACTION START ### [ 423s] [ 403.994766] sysrq: SysRq : Power Off [ 423s] [ 404.006106] reboot: Power down [ 423s] ### VM INTERACTION END ### [ 423s] [ 423s] lamb28 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 01:57:57 UTC 2019. [ 423s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 18 01:59:18 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 18 Dec 2019 01:59:18 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_18.10/i586 In-Reply-To: References: Message-ID: <5df988075c023_55a92ab3271245f833199e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-remsim failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 390s] #define HAVE_STDLIB_H 1 [ 390s] #define HAVE_STRING_H 1 [ 390s] #define HAVE_MEMORY_H 1 [ 390s] #define HAVE_STRINGS_H 1 [ 390s] #define HAVE_INTTYPES_H 1 [ 390s] #define HAVE_STDINT_H 1 [ 390s] #define HAVE_UNISTD_H 1 [ 390s] #define HAVE_DLFCN_H 1 [ 390s] #define LT_OBJDIR ".libs/" [ 390s] #define PACKAGE "osmo-remsim" [ 390s] #define VERSION "0.2.2.26-bbd1" [ 390s] #define HAVE_CSV_H 1 [ 390s] [ 390s] configure: exit 1 [ 390s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 390s] make[1]: *** [debian/rules:15: override_dh_auto_configure] Error 2 [ 390s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 390s] make: *** [debian/rules:12: build] Error 2 [ 390s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 390s] [ 390s] lamb54 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 01:59:07 UTC 2019. [ 390s] [ 390s] ### VM INTERACTION START ### [ 393s] [ 374.851262] sysrq: SysRq : Power Off [ 393s] [ 374.857048] reboot: Power down [ 393s] ### VM INTERACTION END ### [ 393s] [ 393s] lamb54 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 01:59:10 UTC 2019. [ 393s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 18 02:00:09 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 18 Dec 2019 02:00:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5df988414b9d_55a92ab3271245f833204@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-remsim failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 518s] #define HAVE_MEMORY_H 1 [ 518s] #define HAVE_STRINGS_H 1 [ 518s] #define HAVE_INTTYPES_H 1 [ 518s] #define HAVE_STDINT_H 1 [ 518s] #define HAVE_UNISTD_H 1 [ 518s] #define HAVE_DLFCN_H 1 [ 518s] #define LT_OBJDIR ".libs/" [ 518s] #define PACKAGE "osmo-remsim" [ 518s] #define VERSION "0.2.2.26-bbd1" [ 518s] #define HAVE_CSV_H 1 [ 518s] [ 518s] configure: exit 1 [ 518s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 518s] debian/rules:15: recipe for target 'override_dh_auto_configure' failed [ 518s] make[1]: *** [override_dh_auto_configure] Error 2 [ 518s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 518s] debian/rules:12: recipe for target 'build' failed [ 518s] make: *** [build] Error 2 [ 518s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 518s] [ 518s] lamb60 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 01:59:54 UTC 2019. [ 518s] [ 518s] ### VM INTERACTION START ### [ 521s] [ 472.339146] sysrq: SysRq : Power Off [ 521s] [ 472.345258] reboot: Power down [ 521s] ### VM INTERACTION END ### [ 521s] [ 521s] lamb60 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 01:59:58 UTC 2019. [ 521s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 18 02:04:26 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 18 Dec 2019 02:04:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5df98932f28bb_55a92ab3271245f833326d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 296s] #define HAVE_STDLIB_H 1 [ 296s] #define HAVE_STRING_H 1 [ 296s] #define HAVE_MEMORY_H 1 [ 296s] #define HAVE_STRINGS_H 1 [ 296s] #define HAVE_INTTYPES_H 1 [ 296s] #define HAVE_STDINT_H 1 [ 296s] #define HAVE_UNISTD_H 1 [ 296s] #define HAVE_DLFCN_H 1 [ 296s] #define LT_OBJDIR ".libs/" [ 296s] #define PACKAGE "osmo-remsim" [ 296s] #define VERSION "0.2.2.26-bbd1" [ 296s] #define HAVE_CSV_H 1 [ 296s] [ 296s] configure: exit 1 [ 296s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 296s] make[1]: *** [debian/rules:15: override_dh_auto_configure] Error 2 [ 296s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 296s] make: *** [debian/rules:12: build] Error 2 [ 296s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 296s] [ 296s] build84 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 02:04:13 UTC 2019. [ 296s] [ 296s] ### VM INTERACTION START ### [ 299s] [ 286.671738] sysrq: SysRq : Power Off [ 299s] [ 286.674213] reboot: Power down [ 299s] ### VM INTERACTION END ### [ 299s] [ 299s] build84 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 02:04:17 UTC 2019. [ 299s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 18 02:04:43 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 18 Dec 2019 02:04:43 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5df9894eb766b_55a92ab3271245f8333553@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 305s] #define HAVE_MEMORY_H 1 [ 305s] #define HAVE_STRINGS_H 1 [ 305s] #define HAVE_INTTYPES_H 1 [ 305s] #define HAVE_STDINT_H 1 [ 305s] #define HAVE_UNISTD_H 1 [ 305s] #define HAVE_DLFCN_H 1 [ 305s] #define LT_OBJDIR ".libs/" [ 305s] #define PACKAGE "osmo-remsim" [ 305s] #define VERSION "0.2.2.26-bbd1" [ 305s] #define HAVE_CSV_H 1 [ 305s] [ 305s] configure: exit 1 [ 305s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 305s] debian/rules:15: recipe for target 'override_dh_auto_configure' failed [ 305s] make[1]: *** [override_dh_auto_configure] Error 2 [ 305s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 305s] debian/rules:12: recipe for target 'build' failed [ 305s] make: *** [build] Error 2 [ 305s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 305s] [ 305s] cloud106 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 02:04:30 UTC 2019. [ 305s] [ 305s] ### VM INTERACTION START ### [ 309s] [ 286.214670] sysrq: SysRq : Power Off [ 309s] [ 286.230033] reboot: Power down [ 309s] ### VM INTERACTION END ### [ 309s] [ 309s] cloud106 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 02:04:33 UTC 2019. [ 309s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 18 02:08:26 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 18 Dec 2019 02:08:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_18.10/x86_64 In-Reply-To: References: Message-ID: <5df98a21dfae6_55a92ab3271245f8334643@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_18.10/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in xUbuntu_18.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 526s] #define HAVE_STRING_H 1 [ 526s] #define HAVE_MEMORY_H 1 [ 526s] #define HAVE_STRINGS_H 1 [ 526s] #define HAVE_INTTYPES_H 1 [ 526s] #define HAVE_STDINT_H 1 [ 526s] #define HAVE_UNISTD_H 1 [ 526s] #define HAVE_DLFCN_H 1 [ 526s] #define LT_OBJDIR ".libs/" [ 526s] #define PACKAGE "osmo-remsim" [ 526s] #define VERSION "0.2.2.26-bbd1" [ 526s] #define HAVE_CSV_H 1 [ 526s] [ 526s] configure: exit 1 [ 526s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 526s] make[1]: *** [debian/rules:15: override_dh_auto_c[ 495.668172] serial8250: too much work for irq4 [ 526s] onfigure] Error 2 [ 526s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 526s] make: *** [debian/rules:12: build] Error 2 [ 526s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 526s] [ 526s] build30 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 02:08:18 UTC 2019. [ 526s] [ 526s] ### VM INTERACTION START ### [ 529s] [ 498.848403] sysrq: SysRq : Power Off [ 529s] [ 498.853038] reboot: Power down [ 530s] ### VM INTERACTION END ### [ 530s] [ 530s] build30 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 02:08:22 UTC 2019. [ 530s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 18 02:09:02 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 18 Dec 2019 02:09:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5df98a4282f76_55a92ab3271245f83348b4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 205s] #define HAVE_MEMORY_H 1 [ 205s] #define HAVE_STRINGS_H 1 [ 205s] #define HAVE_INTTYPES_H 1 [ 205s] #define HAVE_STDINT_H 1 [ 205s] #define HAVE_UNISTD_H 1 [ 205s] #define HAVE_DLFCN_H 1 [ 205s] #define LT_OBJDIR ".libs/" [ 205s] #define PACKAGE "osmo-remsim" [ 205s] #define VERSION "0.2.2.26-bbd1" [ 205s] #define HAVE_CSV_H 1 [ 205s] [ 205s] configure: exit 1 [ 205s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 205s] debian/rules:15: recipe for target 'override_dh_auto_configure' failed [ 205s] make[1]: *** [override_dh_auto_configure] Error 2 [ 205s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 205s] debian/rules:12: recipe for target 'build' failed [ 205s] make: *** [build] Error 2 [ 205s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 205s] [ 205s] build35 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 02:08:46 UTC 2019. [ 205s] [ 205s] ### VM INTERACTION START ### [ 209s] [ 192.098978] sysrq: SysRq : Power Off [ 209s] [ 192.103323] reboot: Power down [ 209s] ### VM INTERACTION END ### [ 209s] [ 209s] build35 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 02:08:50 UTC 2019. [ 209s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 18 02:12:09 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 18 Dec 2019 02:12:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <5df98b0fa80bb_55a92ab3271245f83354d6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 278s] #define HAVE_STRING_H 1 [ 278s] #define HAVE_MEMORY_H 1 [ 278s] #define HAVE_STRINGS_H 1 [ 278s] #define HAVE_INTTYPES_H 1 [ 278s] #define HAVE_STDINT_H 1 [ 278s] #define HAVE_UNISTD_H 1 [ 278s] #define HAVE_DLFCN_H 1 [ 278s] #define LT_OBJDIR ".libs/" [ 278s] #define PACKAGE "osmo-remsim" [ 278s] #define VERSION "0.2.2.26-bbd1" [ 278s] #define HAVE_CSV_H 1 [ 278s] [ 278s] configure: exit 1 [ 278s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localsta[ 265.741815] serial8250: too much work for irq4 [ 278s] tedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 278s] make[1]: *** [debian/rules:15: override_dh_auto_configure] Error 255 [ 278s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 278s] make: *** [debian/rules:12: build] Error 2 [ 278s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 278s] [ 278s] sheep82 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 02:12:02 UTC 2019. [ 278s] [ 278s] ### VM INTERACTION START ### [ 281s] [ 269.026889] sysrq: SysRq : Power Off [ 281s] [ 269.036191] reboot: Power down [ 281s] ### VM INTERACTION END ### [ 281s] [ 281s] sheep82 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 02:12:06 UTC 2019. [ 281s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 18 02:12:09 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 18 Dec 2019 02:12:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_10/x86_64 In-Reply-To: References: Message-ID: <5df98b1079f3f_55a92ab3271245f833552a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_10/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 738s] #define HAVE_STDLIB_H 1 [ 738s] #define HAVE_STRING_H 1 [ 738s] #define HAVE_MEMORY_H 1 [ 738s] #define HAVE_STRINGS_H 1 [ 738s] #define HAVE_INTTYPES_H 1 [ 738s] #define HAVE_STDINT_H 1 [ 738s] #define HAVE_UNISTD_H 1 [ 738s] #define HAVE_DLFCN_H 1 [ 738s] #define LT_OBJDIR ".libs/" [ 738s] #define PACKAGE "osmo-remsim" [ 738s] #define VERSION "0.2.2.26-bbd1" [ 738s] #define HAVE_CSV_H 1 [ 738s] [ 738s] configure: exit 1 [ 738s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 738s] make[1]: *** [debian/rules:15: override_dh_auto_configure] Error 2 [ 738s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 738s] make: *** [debian/rules:12: build] Error 2 [ 738s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 738s] [ 738s] lamb21 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 02:11:52 UTC 2019. [ 738s] [ 738s] ### VM INTERACTION START ### [ 741s] [ 703.573061] sysrq: SysRq : Power Off [ 741s] [ 703.578272] reboot: Power down [ 741s] ### VM INTERACTION END ### [ 741s] [ 741s] lamb21 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 02:11:56 UTC 2019. [ 741s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 18 02:48:09 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 18 Dec 2019 02:48:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <5df99383f0248_55a92ab3271245f8345058@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 420s] #define HAVE_STDLIB_H 1 [ 420s] #define HAVE_STRING_H 1 [ 420s] #define HAVE_MEMORY_H 1 [ 420s] #define HAVE_STRINGS_H 1 [ 420s] #define HAVE_INTTYPES_H 1 [ 420s] #define HAVE_STDINT_H 1 [ 420s] #define HAVE_UNISTD_H 1 [ 420s] #define HAVE_DLFCN_H 1 [ 420s] #define LT_OBJDIR ".libs/" [ 420s] #define PACKAGE "osmo-remsim" [ 420s] #define VERSION "0.2.2.26-bbd1" [ 420s] #define HAVE_CSV_H 1 [ 420s] [ 420s] configure: exit 1 [ 420s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 420s] make[1]: *** [debian/rules:15: override_dh_auto_configure] Error 255 [ 420s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 420s] make: *** [debian/rules:12: build] Error 2 [ 420s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 420s] [ 420s] lamb20 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 02:47:49 UTC 2019. [ 420s] [ 420s] ### VM INTERACTION START ### [ 423s] [ 404.381946] sysrq: SysRq : Power Off [ 423s] [ 404.391026] reboot: Power down [ 423s] ### VM INTERACTION END ### [ 423s] [ 423s] lamb20 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 02:47:53 UTC 2019. [ 423s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 18 04:12:27 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 18 Dec 2019 04:12:27 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5df9a7322a9ef_55a92ab3271245f83632e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-remsim failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 633s] ac_cv_env_ULFIUS_LIBS_value= [ 633s] ac_cv_env_USB_CFLAGS_set= [ 633s] ac_cv_env_USB_CFLAGS_value= [ 633s] ac_cv_env_USB_LIBS_set= [ 633s] ac_cv_env_USB_LIBS_value= [ 633s] ac_cv_env_build_alias_set=set [ 633s] ac_cv_env_build_alias_value=arm-linux-gnueabihf [ 633s] ac_cv_env_host_alias_set= [ 633s] ac_cv_env_host_alias_value= [ 633s] ac_cv_env_target_alias_set= [ 633s] ac_cv_env_target_alias_value= [ 633s] ac_cv_header_csv_h=yes [ 633s] ac_cv_header_dlfcn_h=yes [ 633s] ac_cv_header_inttypes_h=yes [ 633s] ac_cv_header_memory_h=yes [ 633s] ac_cv_header_stdc=yes [ 633s] ac_cv_header_stdint_h=yes [ 633s] ac_cv_header_stdlib_h=yes [ 633s] ac_cv_header_string_h=yes [ 633s] ac_cv_header_strings_h=yes [ 633s] ac_cv_header_sys_stat_h=yes [ 633s] ac_cv_header_sys_types_h=yes [ 633s] ac_cv_header_unistd_h=yes [ 635s] ac_cv_host=arm-unknown-linux-gnueabi[ 590.137969] sysrq: SysRq : Power Off [ 635s] [ 590.142956] reboot: Power down [ 636s] ### VM INTERACTION END ### [ 636s] [ 636s] armbuild01 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 04:12:13 UTC 2019. [ 636s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 18 04:30:26 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 18 Dec 2019 04:30:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_10/armv7l In-Reply-To: References: Message-ID: <5df9ab6b84495_55a92ab3271245f83671ec@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_10/armv7l Package network:osmocom:nightly/osmo-remsim failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 612s] #define HAVE_STDLIB_H 1 [ 612s] #define HAVE_STRING_H 1 [ 612s] #define HAVE_MEMORY_H 1 [ 612s] #define HAVE_STRINGS_H 1 [ 612s] #define HAVE_INTTYPES_H 1 [ 612s] #define HAVE_STDINT_H 1 [ 612s] #define HAVE_UNISTD_H 1 [ 612s] #define HAVE_DLFCN_H 1 [ 612s] #define LT_OBJDIR ".libs/" [ 612s] #define PACKAGE "osmo-remsim" [ 612s] #define VERSION "0.2.2.26-bbd1" [ 612s] #define HAVE_CSV_H 1 [ 612s] [ 612s] configure: exit 1 [ 612s] dh_auto_configure: ./configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --libexecdir=\${prefix}/lib/arm-linux-gnueabihf --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 612s] make[1]: *** [debian/rules:15: override_dh_auto_configure] Error 2 [ 612s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 612s] make: *** [debian/rules:12: build] Error 2 [ 612s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 612s] [ 612s] obs-arm-6 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 04:30:17 UTC 2019. [ 612s] [ 612s] ### VM INTERACTION START ### [ 615s] [ 567.032672] sysrq: SysRq : Power Off [ 615s] [ 567.050798] reboot: Power down [ 616s] ### VM INTERACTION END ### [ 616s] [ 616s] obs-arm-6 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 04:30:22 UTC 2019. [ 616s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Dec 18 04:33:01 2019 From: admin at opensuse.org (OBS Notification) Date: Wed, 18 Dec 2019 04:33:01 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5df9ac03ab402_55a92ab3271245f83678b3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Raspbian_10/armv7l Package network:osmocom:nightly/osmo-remsim failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 658s] #define HAVE_STDLIB_H 1 [ 658s] #define HAVE_STRING_H 1 [ 658s] #define HAVE_MEMORY_H 1 [ 658s] #define HAVE_STRINGS_H 1 [ 658s] #define HAVE_INTTYPES_H 1 [ 658s] #define HAVE_STDINT_H 1 [ 658s] #define HAVE_UNISTD_H 1 [ 658s] #define HAVE_DLFCN_H 1 [ 658s] #define LT_OBJDIR ".libs/" [ 658s] #define PACKAGE "osmo-remsim" [ 658s] #define VERSION "0.2.2.26-bbd1" [ 658s] #define HAVE_CSV_H 1 [ 658s] [ 658s] configure: exit 1 [ 658s] dh_auto_configure: ./configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --libexecdir=\${prefix}/lib/arm-linux-gnueabihf --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1 [ 658s] make[1]: *** [debian/rules:15: override_dh_auto_configure] Error 2 [ 658s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 659s] make: *** [debian/rules:12: build] Error 2 [ 659s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 659s] [ 659s] obs-arm-5 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 04:32:49 UTC 2019. [ 659s] [ 659s] ### VM INTERACTION START ### [ 661s] [ 615.987464] sysrq: SysRq : Power Off [ 661s] [ 616.009361] reboot: Power down [ 662s] ### VM INTERACTION END ### [ 662s] [ 662s] obs-arm-5 failed "build osmo-remsim_0.2.2.26.bbd1.dsc" at Wed Dec 18 04:32:53 UTC 2019. [ 662s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Dec 18 09:58:26 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 18 Dec 2019 09:58:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: tolerate empty measurement result on chan est. References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 ) Change subject: BTS_Tests: tolerate empty measurement result on chan est. ...................................................................... BTS_Tests: tolerate empty measurement result on chan est. On channel establishment the first measurement result may lack the measurement reports from the MS. This is normal behavior, so lets tolerate that. Change-Id: Ib2f511991349ab15e02db9c5e45f0df3645835a4 Related: OS#2975 --- M bts/BTS_Tests.ttcn M library/RSL_Types.ttcn 2 files changed, 75 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/49/16649/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 779f7c3..50cb7bb 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1730,10 +1730,49 @@ ?, t_toffs); } +/* build a template for matching measurement results that do not contain any + * MS related measurement (l1_info, l3_info and ms timing offset. */ +private function f_build_meas_res_tmpl_empty() runs on ConnHdlr return template RSL_Message { + var ConnL1Pars l1p := g_pars.l1_pars; + var template RSL_IE_UplinkMeas ul_meas := { + len := 3, + rfu := '0'B, + dtx_d := l1p.dtx_enabled, + rxlev_f_u := ?, + reserved1 := '00'B, + rxlev_s_u := ?, + reserved2 := '00'B, + rxq_f_u := ?, + rxq_s_u := ?, + supp_meas_info := omit + }; + if (l1p.toa256_enabled) { + ul_meas.len := (3+8); + ul_meas.supp_meas_info := { + toa256_mean := f_tolerance(l1p.timing_offset_256syms, -63*256, 192*256, mp_tolerance_timing_offset_256syms), + toa256_min := ?, + toa256_max := ?, + toa256_std_dev := ? + } + } + var template RSL_IE_BS_Power bs_power := { + reserved := 0, + epc := false, + fpc := false, + power_level := l1p.bs_power_level + }; + + return tr_RSL_MEAS_RES_EMPTY(g_chan_nr, g_next_meas_res_nr, ul_meas, bs_power); +} + /* verify we regularly receive measurement reports with incrementing numbers */ altstep as_meas_res(boolean verify_meas := true) runs on ConnHdlr { var RSL_Message rsl; [not verify_meas] RSL.receive(tr_RSL_MEAS_RES(?)) { repeat; } + + /* Receive osmocom specific measurement reports. This is the normal + * case. Here we verify that the measurement reports we sent are + * comming back as we expect them. */ [] RSL.receive(f_build_meas_res_tmpl()) -> value rsl { /* increment counter of next to-be-expected meas rep */ g_next_meas_res_nr := (g_next_meas_res_nr + 1) mod 256; @@ -1741,9 +1780,29 @@ f_timer_safe_restart(g_Tmeas_exp); repeat; } + + /* When the BTS has established the channel, the MS might need slightly + * more time to establish the channel and actually start sending. The + * result is then a measurement report that just lacks the measurement + * information of the MS. This is normal and we tolerate this behavior. */ + [] RSL.receive(f_build_meas_res_tmpl_empty()) -> value rsl { + /* increment counter of next to-be-expected meas rep */ + g_next_meas_res_nr := (g_next_meas_res_nr + 1) mod 256; + /* Re-start the timer expecting the next MEAS RES */ + f_timer_safe_restart(g_Tmeas_exp); + repeat; + } + + /* Due to the TDMA nature of GSM, TRXCON implements a way to emit dummy + * measurements if the TTCN3 side does not supply measurement input in + * time. In those cases TRXCON will either use a cached measurement + * report or a hardcoded one. If TRXCON picks the hardcoded measurement + * report the templates above will not match. We tolerate this + * behavior, but only once. */ [] RSL.receive(tr_RSL_MEAS_RES(g_chan_nr, g_next_meas_res_nr)) -> value rsl { /* increment counter of next to-be-expected meas rep */ g_next_meas_res_nr := (g_next_meas_res_nr + 1) mod 256; + if (g_first_meas_res) { g_first_meas_res := false; repeat; diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index d982e02..f905973 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -1363,6 +1363,22 @@ } } + /* Receive template for a measurement report that lacks the measurement report + * from the MS (l1_info, l3_info and ms timing offset */ + template RSL_Message tr_RSL_MEAS_RES_EMPTY(template RslChannelNr chan_nr, + template uint8_t meas_res_nr := ?, + template RSL_IE_UplinkMeas ul_meas := ?, + template RSL_IE_BS_Power bs_power := ?) := { + msg_disc := tr_RSL_MsgDisc(RSL_MDISC_DCHAN, false), + msg_type := RSL_MT_MEAS_RES, + ies := { + tr_RSL_IE(RSL_IE_Body:{chan_nr := chan_nr}), + tr_RSL_IE(RSL_IE_Body:{meas_res_nr := meas_res_nr}), + tr_RSL_IE(RSL_IE_Body:{uplink_meas := ul_meas}), + tr_RSL_IE(RSL_IE_Body:{bs_power := bs_power}) + } + } + /* Osmocom specific template, require lots of optional fields to be present */ template RSL_Message tr_RSL_MEAS_RES_OSMO(template RslChannelNr chan_nr, template uint8_t meas_res_nr := ?, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib2f511991349ab15e02db9c5e45f0df3645835a4 Gerrit-Change-Number: 16649 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 18 10:10:01 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 18 Dec 2019 10:10:01 +0000 Subject: Change in osmo-bts[master]: rsl: ensure measurement reports are sent In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16170 ) Change subject: rsl: ensure measurement reports are sent ...................................................................... Patch Set 6: (6 comments) This change is ready for review. https://gerrit.osmocom.org/c/osmo-bts/+/16170/1/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/16170/1/src/common/l1sap.c at 1252 PS1, Line 1252: return -EINVAL; > That means in this case lchan_ms_pwr_ctrl() is not called and the MS power loop is missing informati [?] This is indeed a problem but it is unrelated to this patch. The bug exists for longer. I have created a ticket now: https://osmocom.org/issues/4281 https://gerrit.osmocom.org/c/osmo-bts/+/16170/3/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/16170/3/src/common/l1sap.c at 1246 PS3, Line 1246: le = &lchan->lapdm_ch.lapdm_acch; > Why restrict this to tch? sdcch do have a sacch, too. [?] I have changed it now but I do not know if this is now correct. see comment in scheduler.c https://gerrit.osmocom.org/c/osmo-bts/+/16170/4/src/common/rsl.c File src/common/rsl.c: https://gerrit.osmocom.org/c/osmo-bts/+/16170/4/src/common/rsl.c at 2905 PS4, Line 2905: if (l3 && l3_len > 0) > How RSL_IE_MS_TIMING_OFFSET is related to the presence of l3? Am I missing something? I am not entirely sure, but when I include it and the L3 Info is missing then wireshark complains about malformed packets. I have looked at the hexdump, it looks ok. In 3GPP TS 08.58 version 8.6.0: I can read: "MS Timing Offset can be optionally included to increase the accuracy of possible distance measurements." >From the spec I can not see if it is related to L3 Info but since the IE is optional I think we can just skip it. https://gerrit.osmocom.org/c/osmo-bts/+/16170/1/src/common/scheduler.c File src/common/scheduler.c: https://gerrit.osmocom.org/c/osmo-bts/+/16170/1/src/common/scheduler.c at 194 PS1, Line 194: rx_tchf_fn > How about TCH/H? [?] We do not need TCH/H and TCH/F. The reason for this is that only the SACCH is crucial to keep the measurement processing going. Missing TCH measurements are compensated by the code that calculates the result. I did not know that the buffer in the NOPE.ind is uninitalized. For rx_data_fn I now check on bi->burst_len to see if there is data or not. If there is no data I make sure that the buffer is initalized. This is for sure not perfect. Actually we should indeed skip all decoding steps if one of the bursts (or two, i do not know when the redundancy is exhausted) is bad, but I do not think that the CPU time we would safe would be all that much as it is only the SACCH that is affected here. https://gerrit.osmocom.org/c/osmo-bts/+/16170/3/src/common/scheduler.c File src/common/scheduler.c: https://gerrit.osmocom.org/c/osmo-bts/+/16170/3/src/common/scheduler.c at 368 PS3, Line 368: .nope_fn = rx_data_fn, > Again, why only SACCH/TF? We also have SACCH on TCH/H and on SDCCH... First of all for TRXC_SACCHTH_0 and TRXC_SACCHTH_1 I indeed forgot to put the .nope_fn. In the beginning I thought that limiting the mechanism to TCH channels only would be a good idea as I was experiencing problems with unrelated NOPE indications that where uncontrollably streaming in (I don't know how this happend). I have now extended everything to the other SACCH channels and it seems to work fine now. I don't know what went wrong last time. However I am still unsure if it is fully correct now. I do not know if the SACCH in uplink always carries measurement reports. On TCH/F and TCH/H i know each SACCH interval produces one measurement report but how about the other SACCH channels? Do we need some additional logic in l1sap.c to determine if the incoming bad SACCH did carry a measurement report? https://gerrit.osmocom.org/c/osmo-bts/+/16170/4/src/common/scheduler.c File src/common/scheduler.c: https://gerrit.osmocom.org/c/osmo-bts/+/16170/4/src/common/scheduler.c at 430 PS4, Line 430: TRXC_SACCH4_3 > This is also SACCH, please assign .nope_fn here too. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idfa8ef94e8cf131ff234dac8f93f337051663ae2 Gerrit-Change-Number: 16170 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 18 Dec 2019 10:10:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 18 10:15:01 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 18 Dec 2019 10:15:01 +0000 Subject: Change in osmo-bts[master]: rsl: ensure measurement reports are sent In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16170 ) Change subject: rsl: ensure measurement reports are sent ...................................................................... Patch Set 6: (looks like gerrit did held up some review comments again.) I have added the missing .nope_fn now. I checked twice now and I hope that I haven't overseen anything again. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idfa8ef94e8cf131ff234dac8f93f337051663ae2 Gerrit-Change-Number: 16170 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 18 Dec 2019 10:15:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 18 11:12:40 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 18 Dec 2019 11:12:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: tolerate empty measurement result on chan est. In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 ) Change subject: BTS_Tests: tolerate empty measurement result on chan est. ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649/1/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649/1/bts/BTS_Tests.ttcn at 1734 PS1, Line 1734: * MS related measurement (l1_info, l3_info and ms timing offset. */ missing ). -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib2f511991349ab15e02db9c5e45f0df3645835a4 Gerrit-Change-Number: 16649 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 18 Dec 2019 11:12:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 18 12:07:01 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 18 Dec 2019 12:07:01 +0000 Subject: Change in osmo-bts[master]: l1sap.c: ensure ms power control loop is running In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16233 ) Change subject: l1sap.c: ensure ms power control loop is running ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4fb85754b1a69376b02da7f4b175c6e8ec9cc35c Gerrit-Change-Number: 16233 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 18 Dec 2019 12:07:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 18 12:12:21 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 18 Dec 2019 12:12:21 +0000 Subject: Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/l1sap.c at 74 PS1, Line 74: static bool tch_data_meas_present = true; > AFAIU You don't need to do any switching, simply have an API bool bts_model_tch_data_meas_present() [?] we do already have the BTS_FEAT_* constants and the gsm_bts_set_feature() API. That would be the most logical way for me to deal with this. Adding a single call to gsm_bts_set_feature() in all existing backends is also certainly not requiring a full re-test with all hardware. https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/scheduler.c File src/common/scheduler.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/scheduler.c at 760 PS1, Line 760: l1sap->u.tch. > I am also a bit confused about the is_sub struct member. [?] I believe I explained this elsewhere here in gerrit or in redmine. is_sub must at the very least be set for all SACCH frames, and is set on other frames depending on the codec that's being used. It controls which frames count into RXLEV/QUAL "SUB". https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/osmo-bts-trx/scheduler_trx.c at a205 PS1, Line 205: /* FIXME: use actual values for BER etc */ > The problem here is that we can not use actual values for BER. [?] the best would be if those values simply wouldn't count. Let's say you normally expect 23 values every measurement interval. Then you compute the average by dividing by 23. But if only 20 valid measurements were received and 3 were in bad frames, then the average should simply be computed by dividing by 20, and not by 23. At this point you don't need to "invent" any values. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 18 Dec 2019 12:12:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 18 12:12:48 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 18 Dec 2019 12:12:48 +0000 Subject: Change in libosmocore[master]: Introduce helper functions for safe fork+exec of processes In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16619 ) Change subject: Introduce helper functions for safe fork+exec of processes ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib24ac8a083db32e55402ce496a5eabd8749cc888 Gerrit-Change-Number: 16619 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 18 Dec 2019 12:12:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 18 12:13:21 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 18 Dec 2019 12:13:21 +0000 Subject: Change in libosmocore[master]: Introduce helper functions for safe fork+exec of processes In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16619 ) Change subject: Introduce helper functions for safe fork+exec of processes ...................................................................... Patch Set 5: merging this now, as there was no follow-up other than that of pau which I elieve have adressed. Also, it's not touching any existing code and hence cannot break any existing users. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib24ac8a083db32e55402ce496a5eabd8749cc888 Gerrit-Change-Number: 16619 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 18 Dec 2019 12:13:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 18 12:13:22 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 18 Dec 2019 12:13:22 +0000 Subject: Change in libosmocore[master]: Introduce helper functions for safe fork+exec of processes In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16619 ) Change subject: Introduce helper functions for safe fork+exec of processes ...................................................................... Introduce helper functions for safe fork+exec of processes In some situations, we want to execute an external shell command in a non-blocking way. Similar to 'system', but without waiting for the child to complete. We also want to close all file descriptors ahead of the exec() and filter + modify the environment. Change-Id: Ib24ac8a083db32e55402ce496a5eabd8749cc888 Related: OS#4332 --- M configure.ac M include/Makefile.am A include/osmocom/core/exec.h M src/Makefile.am A src/exec.c M tests/Makefile.am A tests/exec/exec_test.c A tests/exec/exec_test.err A tests/exec/exec_test.ok M tests/testsuite.at 10 files changed, 487 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index e45ec9f..1056a0a 100644 --- a/configure.ac +++ b/configure.ac @@ -282,7 +282,7 @@ )], [embedded=$enableval], [embedded="no"]) -AM_CONDITIONAL(ENABLE_STATS_TEST, true) +AM_CONDITIONAL(EMBEDDED, false) AM_CONDITIONAL(ENABLE_SERCOM_STUB, false) if test x"$embedded" = x"yes" @@ -301,7 +301,7 @@ AM_CONDITIONAL(ENABLE_PCSC, false) AM_CONDITIONAL(ENABLE_PSEUDOTALLOC, true) AM_CONDITIONAL(ENABLE_SERCOM_STUB, true) - AM_CONDITIONAL(ENABLE_STATS_TEST, false) + AM_CONDITIONAL(EMBEDDED, true) AC_DEFINE([USE_GNUTLS], [0]) AC_DEFINE([PANIC_INFLOOP],[1],[Use infinite loop on panic rather than fprintf/abort]) fi diff --git a/include/Makefile.am b/include/Makefile.am index dc6eaa7..b341ee3 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -23,6 +23,7 @@ osmocom/core/crcgen.h \ osmocom/core/endian.h \ osmocom/core/defs.h \ + osmocom/core/exec.h \ osmocom/core/fsm.h \ osmocom/core/gsmtap.h \ osmocom/core/gsmtap_util.h \ diff --git a/include/osmocom/core/exec.h b/include/osmocom/core/exec.h new file mode 100644 index 0000000..6bbd352 --- /dev/null +++ b/include/osmocom/core/exec.h @@ -0,0 +1,28 @@ +#pragma once +/* (C) 2019 by Harald Welte + * + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ +extern const char *osmo_environment_whitelist[]; + +int osmo_environment_filter(char **out, size_t out_len, char **in, const char **whitelist); +int osmo_environment_append(char **out, size_t out_len, char **in); +int osmo_close_all_fds_above(int last_fd_to_keep); +int osmo_system_nowait(const char *command, const char **env_whitelist, char **addl_env); diff --git a/src/Makefile.am b/src/Makefile.am index 9943281..eeb3f7d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,6 +27,7 @@ tdef.c \ sockaddr_str.c \ use_count.c \ + exec.c \ $(NULL) if HAVE_SSSE3 diff --git a/src/exec.c b/src/exec.c new file mode 100644 index 0000000..a9d8ce0 --- /dev/null +++ b/src/exec.c @@ -0,0 +1,238 @@ +/* (C) 2019 by Harald Welte + * + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include "config.h" +#ifndef EMBEDDED + +#include + +#include +#include + +#include +#include +#include + +#include +#include +#include + +/*! suggested list of environment variables to pass (if they exist) to a sub-process/script */ +const char *osmo_environment_whitelist[] = { + "USER", "LOGNAME", "HOME", + "LANG", "LC_ALL", "LC_COLLATE", "LC_CTYPE", "LC_MESSAGES", "LC_MONETARY", "LC_NUMERIC", "LC_TIME", + "PATH", + "PWD", + "SHELL", + "TERM", + "TMPDIR", + "LD_LIBRARY_PATH", + "LD_PRELOAD", + "POSIXLY_CORRECT", + "HOSTALIASES", + "TZ", "TZDIR", + "TERMCAP", + "COLUMNS", "LINES", + NULL +}; + +static bool str_in_list(const char **list, const char *key) +{ + const char **ent; + + for (ent = list; *ent; ent++) { + if (!strcmp(*ent, key)) + return true; + } + return false; +} + +/*! filtered a process environment by whitelist; only copying pointers, no actual strings. + * + * This function is useful if you'd like to generate an environment to pass exec*e() + * functions. It will create a new environment containing only those entries whose + * keys (as per environment convention KEY=VALUE) are contained in the whitelist. The + * function will not copy the actual strings, but just create a new pointer array, pointing + * to the same memory as the input strings. + * + * Constraints: Keys up to a maximum length of 255 characters are supported. + * + * \oaram[out] out caller-allocated array of pointers for the generated output + * \param[in] out_len size of out (number of pointers) + * \param[in] in input environment (NULL-terminated list of pointers like **environ) + * \param[in] whitelist whitelist of permitted keys in environment (like **environ) + * \returns number of entries filled in 'out'; negtive on error */ +int osmo_environment_filter(char **out, size_t out_len, char **in, const char **whitelist) +{ + char tmp[256]; + char **ent; + size_t out_used = 0; + + /* invalid calls */ + if (!out || out_len == 0 || !whitelist) + return -EINVAL; + + /* legal, but unusual: no input to filter should generate empty, terminated out */ + if (!in) { + out[0] = NULL; + return 1; + } + + /* iterate over input entries */ + for (ent = in; *ent; ent++) { + char *eq = strchr(*ent, '='); + unsigned long eq_pos; + if (!eq) { + /* no '=' in string, skip it */ + continue; + } + eq_pos = eq - *ent; + if (eq_pos >= ARRAY_SIZE(tmp)) + continue; + strncpy(tmp, *ent, eq_pos); + tmp[eq_pos] = '\0'; + if (str_in_list(whitelist, tmp)) { + if (out_used == out_len-1) + break; + /* append to output */ + out[out_used++] = *ent; + } + } + OSMO_ASSERT(out_used < out_len); + out[out_used++] = NULL; + return out_used; +} + +/*! append one environment to another; only copying pointers, not actual strings. + * + * This function is useful if you'd like to append soem entries to an environment + * befoer passing it to exec*e() functions. + * + * It will append all entries from 'in' to the environment in 'out', as long as + * 'out' has space (determined by 'out_len'). + * + * Constraints: If the same key exists in 'out' and 'in', duplicate keys are + * generated. It is a simple append, without any duplicate checks. + * + * \oaram[out] out caller-allocated array of pointers for the generated output + * \param[in] out_len size of out (number of pointers) + * \param[in] in input environment (NULL-terminated list of pointers like **environ) + * \returns number of entries filled in 'out'; negative on error */ +int osmo_environment_append(char **out, size_t out_len, char **in) +{ + size_t out_used = 0; + + if (!out || out_len == 0) + return -EINVAL; + + /* seek to end of existing output */ + for (out_used = 0; out[out_used]; out_used++) {} + + if (!in) { + if (out_used == 0) + out[out_used++] = NULL; + return out_used; + } + + for (; *in && out_used < out_len-1; in++) + out[out_used++] = *in; + + OSMO_ASSERT(out_used < out_len); + out[out_used++] = NULL; + + return out_used; +} + +/* Iterate over files in /proc/self/fd and close all above lst_fd_to_keep */ +int osmo_close_all_fds_above(int last_fd_to_keep) +{ + struct dirent *ent; + DIR *dir; + int rc; + + dir = opendir("/proc/self/fd"); + if (!dir) { + LOGP(DLGLOBAL, LOGL_ERROR, "Cannot open /proc/self/fd: %s\n", strerror(errno)); + return -ENODEV; + } + + while ((ent = readdir(dir))) { + int fd = atoi(ent->d_name); + if (fd <= last_fd_to_keep) + continue; + if (fd == dirfd(dir)) + continue; + rc = close(fd); + if (rc) + LOGP(DLGLOBAL, LOGL_ERROR, "Error closing fd=%d: %s\n", fd, strerror(errno)); + } + closedir(dir); + return 0; +} + +/* Seems like POSIX has no header file for this, and even glibc + __USE_GNU doesn't help */ +extern char **environ; + +/*! call an external shell command without waiting for it. + * + * This mimics the behavior of system(3), with the following differences: + * - it doesn't wait for completion of the child process + * - it closes all non-stdio file descriptors by iterating /proc/self/fd + * - it constructs a reduced environment where only whitelisted keys survive + * - it (optionally) appends additional variables to the environment + * + * \param[in] command the shell command to be executed, see system(3) + * \param[in] env_whitelist A white-list of keys for environment variables + * \param[in] addl_env any additional environment variables to be appended + * \returns PID of generated child process; negative on error + */ +int osmo_system_nowait(const char *command, const char **env_whitelist, char **addl_env) +{ + int rc; + + rc = fork(); + if (rc == 0) { + /* we are in the child */ + char *new_env[1024]; + + /* close all file descriptors above stdio */ + osmo_close_all_fds_above(2); + + /* build the new environment */ + if (env_whitelist) + osmo_environment_filter(new_env, ARRAY_SIZE(new_env), environ, env_whitelist); + if (addl_env) + osmo_environment_append(new_env, ARRAY_SIZE(new_env), addl_env); + + /* if we want to behave like system(3), we must go via the shell */ + execle("/bin/sh", "sh", "-c", command, (char *) NULL, new_env); + /* only reached in case of error */ + LOGP(DLGLOBAL, LOGL_ERROR, "Error executing command '%s' after fork: %s\n", + command, strerror(errno)); + return -EIO; + } else { + /* we are in the parent */ + return rc; + } +} + +#endif /* EMBEDDED */ diff --git a/tests/Makefile.am b/tests/Makefile.am index 3a3ea37..bf7017b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -60,8 +60,10 @@ $(NULL) endif -if ENABLE_STATS_TEST -check_PROGRAMS += stats/stats_test +if !EMBEDDED +check_PROGRAMS += \ + stats/stats_test \ + exec/exec_test endif if ENABLE_GB @@ -259,6 +261,9 @@ context_context_test_SOURCES = context/context_test.c context_context_test_LDADD = $(LDADD) +exec_exec_test_SOURCES = exec/exec_test.c +exec_exec_test_LDADD = $(LDADD) + # The `:;' works around a Bash 3.2 bug when the output is not writeable. $(srcdir)/package.m4: $(top_srcdir)/configure.ac :;{ \ @@ -334,6 +339,7 @@ use_count/use_count_test.ok use_count/use_count_test.err \ context/context_test.ok \ gsm0502/gsm0502_test.ok \ + exec/exec_test.ok exec/exec_test.err \ $(NULL) DISTCLEANFILES = atconfig atlocal conv/gsm0503_test_vectors.c diff --git a/tests/exec/exec_test.c b/tests/exec/exec_test.c new file mode 100644 index 0000000..5f4b460 --- /dev/null +++ b/tests/exec/exec_test.c @@ -0,0 +1,155 @@ +#include +#include + +#include +#include +#include +#include +#include +#include + +static void env_dump(char **env) +{ + char **ent; + + for (ent = env; *ent; ent++) + printf("\t%s\n", *ent); +} + +static void test_env_filter(void) +{ + char *out[256]; + char *env_in[] = { + "FOO=1", + "BAR=2", + "USER=mahlzeit", + "BAZ=3", + "SHELL=/bin/sh", + NULL + }; + const char *filter[] = { + "SHELL", + "USER", + NULL + }; + int rc; + + printf("\n==== osmo_environment_filter ====\n"); + + printf("Input Environment:\n"); + env_dump(env_in); + printf("Input Whitelist:\n"); + env_dump((char **) filter); + rc = osmo_environment_filter(out, ARRAY_SIZE(out), env_in, filter); + printf("Output Environment (%d):\n", rc); + env_dump(out); + OSMO_ASSERT(rc == 3); + + printf("Testing for NULL out\n"); + rc = osmo_environment_filter(NULL, 123, env_in, filter); + OSMO_ASSERT(rc < 0); + + printf("Testing for zero-length out\n"); + rc = osmo_environment_filter(out, 0, env_in, filter); + OSMO_ASSERT(rc < 0); + + printf("Testing for one-length out\n"); + rc = osmo_environment_filter(out, 1, env_in, filter); + OSMO_ASSERT(rc == 1 && out[0] == NULL); + + printf("Testing for no filter\n"); + rc = osmo_environment_filter(out, ARRAY_SIZE(out), env_in, NULL); + OSMO_ASSERT(rc < 0); + + printf("Testing for no input\n"); + rc = osmo_environment_filter(out, ARRAY_SIZE(out), NULL, filter); + OSMO_ASSERT(rc == 1 && out[0] == NULL); + printf("Success!\n"); +} + +static void test_env_append(void) +{ + char *out[256] = { + "FOO=a", + "BAR=b", + "BAZ=c", + NULL, + }; + char *add[] = { + "MAHL=zeit", + "GSM=global", + "UMTS=universal", + "LTE=evolved", + NULL, + }; + int rc; + + printf("\n==== osmo_environment_append ====\n"); + + printf("Input Environment:\n"); + env_dump(out); + printf("Input Addition:\n"); + env_dump(add); + rc = osmo_environment_append(out, ARRAY_SIZE(out), add); + printf("Output Environment (%d)\n", rc); + env_dump(out); + OSMO_ASSERT(rc == 8); + printf("Success!\n"); +} + +static void test_close_fd(void) +{ + struct stat st; + int fds[2]; + int rc; + + printf("\n==== osmo_close_all_fds_above ====\n"); + + /* create some extra fds */ + rc = socketpair(AF_UNIX, SOCK_STREAM, 0, fds); + OSMO_ASSERT(rc == 0); + + rc = fstat(fds[0], &st); + OSMO_ASSERT(rc == 0); + + osmo_close_all_fds_above(2); + + rc = fstat(fds[0], &st); + OSMO_ASSERT(rc == -1 && errno == EBADF); + rc = fstat(fds[1], &st); + OSMO_ASSERT(rc == -1 && errno == EBADF); + printf("Success!\n"); +} + +static void test_system_nowait(void) +{ + char *addl_env[] = { + "MAHLZEIT=spaet", + NULL + }; + int rc, pid, i; + + printf("\n==== osmo_system_nowait ====\n"); + + pid = osmo_system_nowait("env | grep MAHLZEIT 1>&2", osmo_environment_whitelist, addl_env); + OSMO_ASSERT(pid > 0); + for (i = 0; i < 10; i++) { + sleep(1); + rc = waitpid(pid, NULL, WNOHANG); + if (rc == pid) { + printf("Success!\n"); + return; + } + } + printf("ERROR: child didn't terminate within 10s\n"); +} + +int main(int argc, char **argv) +{ + test_env_filter(); + test_env_append(); + test_close_fd(); + test_system_nowait(); + + exit(0); +} diff --git a/tests/exec/exec_test.err b/tests/exec/exec_test.err new file mode 100644 index 0000000..4edc61d --- /dev/null +++ b/tests/exec/exec_test.err @@ -0,0 +1 @@ +MAHLZEIT=spaet diff --git a/tests/exec/exec_test.ok b/tests/exec/exec_test.ok new file mode 100644 index 0000000..45a20f0 --- /dev/null +++ b/tests/exec/exec_test.ok @@ -0,0 +1,46 @@ + +==== osmo_environment_filter ==== +Input Environment: + FOO=1 + BAR=2 + USER=mahlzeit + BAZ=3 + SHELL=/bin/sh +Input Whitelist: + SHELL + USER +Output Environment (3): + USER=mahlzeit + SHELL=/bin/sh +Testing for NULL out +Testing for zero-length out +Testing for one-length out +Testing for no filter +Testing for no input +Success! + +==== osmo_environment_append ==== +Input Environment: + FOO=a + BAR=b + BAZ=c +Input Addition: + MAHL=zeit + GSM=global + UMTS=universal + LTE=evolved +Output Environment (8) + FOO=a + BAR=b + BAZ=c + MAHL=zeit + GSM=global + UMTS=universal + LTE=evolved +Success! + +==== osmo_close_all_fds_above ==== +Success! + +==== osmo_system_nowait ==== +Success! diff --git a/tests/testsuite.at b/tests/testsuite.at index c231b96..cb83ab9 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -362,3 +362,10 @@ cat $abs_srcdir/context/context_test.ok > expout AT_CHECK([$abs_top_builddir/tests/context/context_test], [0], [expout], [ignore]) AT_CLEANUP + +AT_SETUP([exec]) +AT_KEYWORDS([exec]) +cat $abs_srcdir/exec/exec_test.ok > expout +cat $abs_srcdir/exec/exec_test.err > experr +AT_CHECK([$abs_top_builddir/tests/exec/exec_test], [0], [expout], [experr]) +AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib24ac8a083db32e55402ce496a5eabd8749cc888 Gerrit-Change-Number: 16619 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 18 12:14:05 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 18 Dec 2019 12:14:05 +0000 Subject: Change in osmo-remsim[master]: debian/control: Add missing Build-Requires libosmo-simtrace2 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16646 ) Change subject: debian/control: Add missing Build-Requires libosmo-simtrace2 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I875f9d6d06d806fb9f9264840a65934fb0e99972 Gerrit-Change-Number: 16646 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 18 Dec 2019 12:14:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 18 12:14:07 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 18 Dec 2019 12:14:07 +0000 Subject: Change in osmo-remsim[master]: debian/control: Add missing Build-Requires libosmo-simtrace2 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16646 ) Change subject: debian/control: Add missing Build-Requires libosmo-simtrace2 ...................................................................... debian/control: Add missing Build-Requires libosmo-simtrace2 In Change-Id Idf5a861f4dacbec3c664f4ced6e03d8662c73112 we introduced the use of libosmo-simtrace2 (from simtrace2.git). Our configure script checks for it properly, but the debian/control wasn't updated. Change-Id: I875f9d6d06d806fb9f9264840a65934fb0e99972 --- M debian/control 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/control b/debian/control index 7638015..468fb0a 100644 --- a/debian/control +++ b/debian/control @@ -12,6 +12,7 @@ libcsv-dev, libosmocore-dev, libosmo-abis-dev, + libosmo-simtrace2, libpcsclite-dev, libusb-1.0-0-dev, libulfius-dev, -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I875f9d6d06d806fb9f9264840a65934fb0e99972 Gerrit-Change-Number: 16646 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 18 12:32:02 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 18 Dec 2019 12:32:02 +0000 Subject: Change in osmo-remsim[master]: fix the package we depend on: libosmosimtrace2-0 References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16650 ) Change subject: fix the package we depend on: libosmosimtrace2-0 ...................................................................... fix the package we depend on: libosmosimtrace2-0 Change-Id: If7d4f8c5901ea1e34fb6c85bc6e6f1211c7f7bf7 --- M debian/control 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/50/16650/1 diff --git a/debian/control b/debian/control index 468fb0a..7ee08b7 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ libcsv-dev, libosmocore-dev, libosmo-abis-dev, - libosmo-simtrace2, + libosmo-simtrace2-0, libpcsclite-dev, libusb-1.0-0-dev, libulfius-dev, -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16650 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: If7d4f8c5901ea1e34fb6c85bc6e6f1211c7f7bf7 Gerrit-Change-Number: 16650 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 18 12:33:19 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 18 Dec 2019 12:33:19 +0000 Subject: Change in osmo-remsim[master]: fix the package we depend on: libosmosimtrace2-0 In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-remsim/+/16650 ) Change subject: fix the package we depend on: libosmosimtrace2-0 ...................................................................... fix the package we depend on: libosmosimtrace2-0 Change-Id: If7d4f8c5901ea1e34fb6c85bc6e6f1211c7f7bf7 --- M debian/control 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/50/16650/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16650 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: If7d4f8c5901ea1e34fb6c85bc6e6f1211c7f7bf7 Gerrit-Change-Number: 16650 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 18 12:33:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 18 Dec 2019 12:33:50 +0000 Subject: Change in osmo-remsim[master]: fix the package we depend on: libosmosimtrace2-dev In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/c/osmo-remsim/+/16650 ) Change subject: fix the package we depend on: libosmosimtrace2-dev ...................................................................... fix the package we depend on: libosmosimtrace2-dev Change-Id: If7d4f8c5901ea1e34fb6c85bc6e6f1211c7f7bf7 --- M debian/control 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/50/16650/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16650 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: If7d4f8c5901ea1e34fb6c85bc6e6f1211c7f7bf7 Gerrit-Change-Number: 16650 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 18 12:33:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 18 Dec 2019 12:33:57 +0000 Subject: Change in osmo-remsim[master]: fix the package we depend on: libosmosimtrace2-dev In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16650 ) Change subject: fix the package we depend on: libosmosimtrace2-dev ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16650 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: If7d4f8c5901ea1e34fb6c85bc6e6f1211c7f7bf7 Gerrit-Change-Number: 16650 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 18 Dec 2019 12:33:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 18 12:38:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 18 Dec 2019 12:38:13 +0000 Subject: Change in osmo-remsim[master]: fix the package we depend on: libosmosimtrace2-dev In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16650 ) Change subject: fix the package we depend on: libosmosimtrace2-dev ...................................................................... Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16650 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: If7d4f8c5901ea1e34fb6c85bc6e6f1211c7f7bf7 Gerrit-Change-Number: 16650 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 18 Dec 2019 12:38:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 18 12:38:15 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 18 Dec 2019 12:38:15 +0000 Subject: Change in osmo-remsim[master]: fix the package we depend on: libosmosimtrace2-dev In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/16650 ) Change subject: fix the package we depend on: libosmosimtrace2-dev ...................................................................... fix the package we depend on: libosmosimtrace2-dev Change-Id: If7d4f8c5901ea1e34fb6c85bc6e6f1211c7f7bf7 --- M debian/control 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/debian/control b/debian/control index 468fb0a..e7f52f3 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ libcsv-dev, libosmocore-dev, libosmo-abis-dev, - libosmo-simtrace2, + libosmo-simtrace2-dev, libpcsclite-dev, libusb-1.0-0-dev, libulfius-dev, -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16650 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: If7d4f8c5901ea1e34fb6c85bc6e6f1211c7f7bf7 Gerrit-Change-Number: 16650 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 18 13:02:05 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 18 Dec 2019 13:02:05 +0000 Subject: Change in docker-playground[master]: osmo-remsim-master: Add libosmo-simtrace2-dev to container References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16651 ) Change subject: osmo-remsim-master: Add libosmo-simtrace2-dev to container ...................................................................... osmo-remsim-master: Add libosmo-simtrace2-dev to container This is a new build requirement. Change-Id: Idd85dcd3802fcf75f65ea36fc5d13030c1b0662b --- M osmo-remsim-master/Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/51/16651/1 diff --git a/osmo-remsim-master/Dockerfile b/osmo-remsim-master/Dockerfile index 18df831..3c5c5cc 100644 --- a/osmo-remsim-master/Dockerfile +++ b/osmo-remsim-master/Dockerfile @@ -16,6 +16,7 @@ apt-get install -y --no-install-recommends \ telnet \ libosmocore-dev \ + libosmo-simtrace2-dev \ libosmo-abis-dev \ libosmo-netif-dev \ libpcsclite-dev \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Idd85dcd3802fcf75f65ea36fc5d13030c1b0662b Gerrit-Change-Number: 16651 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 18 13:02:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 18 Dec 2019 13:02:18 +0000 Subject: Change in docker-playground[master]: osmo-remsim-master: Add libosmo-simtrace2-dev to container In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16651 ) Change subject: osmo-remsim-master: Add libosmo-simtrace2-dev to container ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Idd85dcd3802fcf75f65ea36fc5d13030c1b0662b Gerrit-Change-Number: 16651 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 18 Dec 2019 13:02:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 18 13:03:15 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 18 Dec 2019 13:03:15 +0000 Subject: Change in docker-playground[master]: osmo-remsim-master: Add libosmo-simtrace2-dev to container In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16651 ) Change subject: osmo-remsim-master: Add libosmo-simtrace2-dev to container ...................................................................... osmo-remsim-master: Add libosmo-simtrace2-dev to container This is a new build requirement. Change-Id: Idd85dcd3802fcf75f65ea36fc5d13030c1b0662b --- M osmo-remsim-master/Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/osmo-remsim-master/Dockerfile b/osmo-remsim-master/Dockerfile index 18df831..3c5c5cc 100644 --- a/osmo-remsim-master/Dockerfile +++ b/osmo-remsim-master/Dockerfile @@ -16,6 +16,7 @@ apt-get install -y --no-install-recommends \ telnet \ libosmocore-dev \ + libosmo-simtrace2-dev \ libosmo-abis-dev \ libosmo-netif-dev \ libpcsclite-dev \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Idd85dcd3802fcf75f65ea36fc5d13030c1b0662b Gerrit-Change-Number: 16651 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 18 13:26:12 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 18 Dec 2019 13:26:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Introduce test TC_lu_imsi_timeout_tmsi_realloc In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16648 to look at the new patch set (#2). Change subject: msc: Introduce test TC_lu_imsi_timeout_tmsi_realloc ...................................................................... msc: Introduce test TC_lu_imsi_timeout_tmsi_realloc Related: OS#4336, OS#4337 Change-Id: I603b2b2b1ae7edd6360ea38c6bbbfedc46e9fa5d --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/MSC_Tests_Iu.ttcn M msc/expected-results.xml 4 files changed, 73 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/48/16648/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I603b2b2b1ae7edd6360ea38c6bbbfedc46e9fa5d Gerrit-Change-Number: 16648 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 18 13:40:41 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 18 Dec 2019 13:40:41 +0000 Subject: Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH In-Reply-To: References: Message-ID: Hello pespin, fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 to look at the new patch set (#5). Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH ...................................................................... l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH The MPH INFO MEAS IND indication, which contains the uplink measurement data is sent in parallel to the PH DATA and TCH indications as a separate indications. This makes the overall uplink measurement data processing unnecessarly complex. So lets put the data that is relevant for measurement into the PH DATA and TCH indications directly. This change only affects osmo-bts-trx at the moment. In order to keep the upper layers (l1sap.c) compatible we add an autodection to switch between separate measurement indications and included measurement data. Related: OS#2977 Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42 Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/scheduler_backend.h M src/common/bts.c M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c 9 files changed, 121 insertions(+), 99 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/15918/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 18 22:57:52 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 18 Dec 2019 22:57:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Introduce test TC_lu_imsi_timeout_tmsi_realloc In-Reply-To: References: Message-ID: Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16648 to look at the new patch set (#3). Change subject: msc: Introduce test TC_lu_imsi_timeout_tmsi_realloc ...................................................................... msc: Introduce test TC_lu_imsi_timeout_tmsi_realloc Related: OS#4336, OS#4337 Change-Id: I603b2b2b1ae7edd6360ea38c6bbbfedc46e9fa5d --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/MSC_Tests_Iu.ttcn M msc/expected-results.xml 4 files changed, 78 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/48/16648/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I603b2b2b1ae7edd6360ea38c6bbbfedc46e9fa5d Gerrit-Change-Number: 16648 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 00:35:49 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 19 Dec 2019 00:35:49 +0000 Subject: Change in osmo-bts[master]: rsl: ensure measurement reports are sent In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16170 ) Change subject: rsl: ensure measurement reports are sent ...................................................................... Patch Set 6: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/16170/4/src/common/rsl.c File src/common/rsl.c: https://gerrit.osmocom.org/c/osmo-bts/+/16170/4/src/common/rsl.c at 2905 PS4, Line 2905: if (l3 && l3_len > 0) > [...] wireshark complains about malformed packets [...] That could be a bug in Wireshark ;) But we can go back to this later. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idfa8ef94e8cf131ff234dac8f93f337051663ae2 Gerrit-Change-Number: 16170 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 19 Dec 2019 00:35:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: dexter Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 00:46:43 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 19 Dec 2019 00:46:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: tolerate empty measurement result on chan est. In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 ) Change subject: BTS_Tests: tolerate empty measurement result on chan est. ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649/1/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649/1/bts/BTS_Tests.ttcn at 1805 PS1, Line 1805: ws -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib2f511991349ab15e02db9c5e45f0df3645835a4 Gerrit-Change-Number: 16649 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 19 Dec 2019 00:46:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Dec 19 01:52:09 2019 From: admin at opensuse.org (OBS Notification) Date: Thu, 19 Dec 2019 01:52:09 +0000 Subject: Build failure of network:osmocom:nightly/rtl-sdr in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5dfad7ce68fd2_8222aac4e6525f01581f9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/rtl-sdr/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/rtl-sdr failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly rtl-sdr Last lines of build log: [ 79s] Processing triggers for man-db (2.7.5-1) ... [ 79s] [210/217] installing procps-2:3.3.10-4ubuntu2 [ 79s] update-alternatives: using /usr/bin/w.procps to provide /usr/bin/w (w) in auto mode [ 79s] update-rc.d: warning: start and stop actions are no longer supported; falling back to defaults [ 79s] /usr/sbin/invoke-rc.d: 1: /usr/sbin/invoke-rc.d: /sbin/runlevel: not found [ 79s] invoke-rc.d: policy-rc.d denied execution of start. [ 79s] Processing triggers for man-db (2.7.5-1) ... [ 80s] [211/217] installing util-linux-2.27.1-6ubuntu3 [ 80s] Processing triggers for man-db (2.7.5-1) ... [ 80s] [212/217] installing cmake-3.5.1-1ubuntu1 [ 80s] Processing triggers for man-db (2.7.5-1) ... [ 81s] [213/217] installing udev-229-4ubuntu4 [ 81s] dpkg-deb (subprocess): decompressing archive member: lzma error: compressed data is corrupt [ 81s] dpkg-deb: error: subprocess returned error exit status 2 [ 81s] dpkg: error processing archive .init_b_cache/udev.deb (--install): [ 81s] cannot copy extracted data for './bin/udevadm' to '/bin/udevadm.dpkg-new': unexpected end of file or stream [ 81s] Errors were encountered while processing: [ 81s] .init_b_cache/udev.deb [ 81s] exit ... [ 81s] [ 81s] lamb14 failed "build rtl-sdr_0.5.4.21.b5af.dsc" at Thu Dec 19 01:51:56 UTC 2019. [ 81s] [ 81s] ### VM INTERACTION START ### [ 84s] [ 72.415405] sysrq: SysRq : Power Off [ 84s] [ 72.421419] reboot: Power down [ 84s] ### VM INTERACTION END ### [ 84s] [ 84s] lamb14 failed "build rtl-sdr_0.5.4.21.b5af.dsc" at Thu Dec 19 01:52:00 UTC 2019. [ 84s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Dec 19 02:22:15 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 19 Dec 2019 02:22:15 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/oml: fix osmo-bts.cfg: osmo-bts-trx has no DSP/HW MS P... References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16652 ) Change subject: ttcn3-bts-test/oml: fix osmo-bts.cfg: osmo-bts-trx has no DSP/HW MS Power Control ...................................................................... ttcn3-bts-test/oml: fix osmo-bts.cfg: osmo-bts-trx has no DSP/HW MS Power Control It was noticed that most of the OML related TTCN-3 test cases do not pass anymore, while some of them are green for the release builds. The culprit is I49706926b1e962b18791174627bc3cc0cd0cd9d5, which did not ensure backwards compatibility with older configuration files. Let's remove 'ms-power-control dsp' and use the defaults. Change-Id: I940df510d803d0eaa063dd5145c2f9a4c5d0543f --- M ttcn3-bts-test/oml/osmo-bts.cfg 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/52/16652/1 diff --git a/ttcn3-bts-test/oml/osmo-bts.cfg b/ttcn3-bts-test/oml/osmo-bts.cfg index a6e3a23..ff21431 100644 --- a/ttcn3-bts-test/oml/osmo-bts.cfg +++ b/ttcn3-bts-test/oml/osmo-bts.cfg @@ -83,7 +83,6 @@ power-ramp max-initial 0 mdBm power-ramp step-size 2000 mdB power-ramp step-interval 1 - ms-power-control dsp phy 0 instance 0 ctrl bind 0.0.0.0 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I940df510d803d0eaa063dd5145c2f9a4c5d0543f Gerrit-Change-Number: 16652 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 02:23:16 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 19 Dec 2019 02:23:16 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/oml: fix osmo-bts.cfg: osmo-bts-trx has no DSP/HW MS P... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16652 ) Change subject: ttcn3-bts-test/oml: fix osmo-bts.cfg: osmo-bts-trx has no DSP/HW MS Power Control ...................................................................... Patch Set 1: See the tail of e.g. https://jenkins.osmocom.org/jenkins/view/TTCN3/job/ttcn3-bts-test/739/artifact/logs/bts/osmo-bts.log. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I940df510d803d0eaa063dd5145c2f9a4c5d0543f Gerrit-Change-Number: 16652 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 19 Dec 2019 02:23:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 02:41:04 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 19 Dec 2019 02:41:04 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/vty: ensure backwards compatibility with older config files References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/16653 ) Change subject: osmo-bts-trx/vty: ensure backwards compatibility with older config files ...................................................................... osmo-bts-trx/vty: ensure backwards compatibility with older config files osmo-bts-trx used to have its own (low-level) MS Power Control loop, but recently it has been ripped out. Since [1], the process fails to start if the configuration file still contains 'ms-power-control dsp'. Let's be more tolerant: override 'dsp' by 'osmo' and print a warning. [1] I49706926b1e962b18791174627bc3cc0cd0cd9d5 Change-Id: I4facd21bca3d8cb80d21e83ea267bc013e474533 --- M src/common/vty.c 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/53/16653/1 diff --git a/src/common/vty.c b/src/common/vty.c index 8b947a7..e7af520 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -792,8 +792,18 @@ bool soft = !strcmp(argv[0], "osmo"); if (!soft && !gsm_bts_has_feature(trx->bts, BTS_FEAT_MS_PWR_CTRL_DSP)) { - vty_out(vty, "This BTS model has no DSP/HW MS Power Control support%s", VTY_NEWLINE); - return CMD_WARNING; + /* NOTE: osmo-bts-trx used to have its own (low-level) MS Power Control loop, + * which has been ripped out recently. Configuration files may still contain + * 'dsp', so let's be tolerant: override 'dsp' by 'osmo' and print a warning. */ + if (trx->bts->variant == BTS_OSMO_TRX && vty->type == VTY_FILE) { + vty_out(vty, "BTS model 'osmo-bts-trx' has no DSP/HW MS Power Control support, " + "consider updating your configuration file!%s", VTY_NEWLINE); + soft = true; /* override */ + return CMD_SUCCESS; + } else { + vty_out(vty, "This BTS model has no DSP/HW MS Power Control support%s", VTY_NEWLINE); + return CMD_WARNING; + } } trx->ms_pwr_ctl_soft = soft; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4facd21bca3d8cb80d21e83ea267bc013e474533 Gerrit-Change-Number: 16653 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 08:02:06 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 19 Dec 2019 08:02:06 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: further documentation for SM-RP-DA/OA IE coding References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16654 ) Change subject: chapters/gsup.adoc: further documentation for SM-RP-DA/OA IE coding ...................................................................... chapters/gsup.adoc: further documentation for SM-RP-DA/OA IE coding Change-Id: I315ae412c83de80f09284c8c1f28faf360ac4662 Related: OS#4324 --- M common/chapters/gsup.adoc 1 file changed, 30 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/54/16654/1 diff --git a/common/chapters/gsup.adoc b/common/chapters/gsup.adoc index 1c18ae1..2742e0f 100644 --- a/common/chapters/gsup.adoc +++ b/common/chapters/gsup.adoc @@ -1685,21 +1685,44 @@ |=== |Field|Presence|Length|Description |T|M|1|Identity type -|V|O|...|Encoded identity itself +|V|O|1|ToN/NPI header +|V|O|...|BCD encoded (or alphanumeric) identity |=== where the identity type can be one of the following: .Identity types of SM-RP-DA / SM-RP-OA IEs -[options="header",cols="15%,85%"] +[options="header",cols="15%,15%,70%"] |=== -|Type|Description -|0x01|IMSI (see 3GPP TS 29.002, clause 7.6.2.1) -|0x02|MSISDN (see 3GPP TS 29.002, clause 7.6.2.17) -|0x03|Service centre address (see 3GPP TS 29.002, clause 7.6.2.27) -|0xff|Omit value for noSM-RP-DA and noSM-RP-OA +|Type|ToN/NPI Header|Description +|0x01|No|IMSI (see 3GPP TS 29.002, clause 7.6.2.1) +|0x02|Yes|MSISDN (see 3GPP TS 29.002, clause 7.6.2.17) +|0x03|Yes|Service centre address (see 3GPP TS 29.002, clause 7.6.2.27) +|0xff|No|Omit value for noSM-RP-DA and noSM-RP-OA |=== +Coding of the optional ToN/NPI header, as well as all possible ToN/NPI values, +is described in 3GPP TS 129.002, section 17.7.8 "Common data types", and +can be summarized as follows: + +.ToN/NPI header coding (as per 3GPP TS 129.002, MSB first) +[packetdiag] +---- +{ + colwidth = 32 + node_height = 40 + + 0: extension + 1-3: nature of address indicator + 4-7: numbering plan indicator +} +---- + +Please note that unlike both <> and <>, where the value +part is encoded as LV (i.e. contains an additional length), an identity in both +<> / <> IEs shall not contain the redundant +length octet. + [[gsup-ie-sm-rp-ui]] ==== SM-RP-UI (SM TPDU) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I315ae412c83de80f09284c8c1f28faf360ac4662 Gerrit-Change-Number: 16654 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 08:36:28 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 19 Dec 2019 08:36:28 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11_gsup.c: fix SM-RP-OA encoding for MO SMS over GSUP References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16655 ) Change subject: libmsc/gsm_04_11_gsup.c: fix SM-RP-OA encoding for MO SMS over GSUP ...................................................................... libmsc/gsm_04_11_gsup.c: fix SM-RP-OA encoding for MO SMS over GSUP We shall not include additional BCD length octet into the value part of SM-RP-OA (Originating Address) IE. Instead, there should be ToA/NPI header (1 octet). Since we do not get ToN/NPI fields from the VLR/HLR, let's assume the following default values: 1... .... = Extension: No extension .001 .... = Type of number: International (1) .... 0001 = Numbering plan: ISDN/telephone (E.164/E.163) (1) Change-Id: I0f32e2af0ed2d2fea6addf45efbdfee120c2425d TTCN-3 test case: Ib467eeca6439bc6cce72293fbb5bb48f6d233db9 Related: OS#4324 --- M src/libmsc/gsm_04_11_gsup.c 1 file changed, 13 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/55/16655/1 diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c index 2abfc92..88c303e 100644 --- a/src/libmsc/gsm_04_11_gsup.c +++ b/src/libmsc/gsm_04_11_gsup.c @@ -1,5 +1,5 @@ /* - * (C) 2018 by Vadim Yanitskiy + * (C) 2018-2019 by Vadim Yanitskiy * * All Rights Reserved * @@ -53,7 +53,7 @@ int gsm411_gsup_mo_fwd_sm_req(struct gsm_trans *trans, struct msgb *msg, uint8_t sm_rp_mr, uint8_t *sm_rp_da, uint8_t sm_rp_da_len) { - uint8_t bcd_buf[GSM48_MI_SIZE] = { 0 }; + uint8_t bcd_buf[GSM48_MI_SIZE]; struct osmo_gsup_message gsup_msg; size_t bcd_len; @@ -65,22 +65,28 @@ /* Assign SM-RP-MR to transaction state */ trans->sms.sm_rp_mr = sm_rp_mr; - /* Encode subscriber's MSISDN */ + /* Encode subscriber's MSISDN as LHV */ bcd_len = gsm48_encode_bcd_number(bcd_buf, sizeof(bcd_buf), - 0, trans->vsub->msisdn); + 1, trans->vsub->msisdn); if (bcd_len <= 0 || bcd_len > sizeof(bcd_buf)) { LOG_TRANS(trans, LOGL_ERROR, "Failed to encode subscriber's MSISDN\n"); return -EINVAL; } + /* NOTE: assuming default ToN/NPI values as we don't have this info */ + bcd_buf[1] = 0x01 /* NPI: ISDN/Telephony Numbering (ITU-T Rec. E.164 / ITU-T Rec. E.163) */ + | (0x01 << 4) /* ToN: International Number */ + | (0x01 << 7); /* No Extension */ + /* Initialize a new GSUP message */ gsup_sm_msg_init(&gsup_msg, OSMO_GSUP_MSGT_MO_FORWARD_SM_REQUEST, trans->vsub->imsi, &sm_rp_mr); - /* According to 12.2.3, the MSISDN from VLR is inserted here */ + /* According to 12.2.3, the MSISDN from VLR is inserted here. + * NOTE: redundant BCD length octet is not included. */ gsup_msg.sm_rp_oa_type = OSMO_GSUP_SMS_SM_RP_ODA_MSISDN; - gsup_msg.sm_rp_oa_len = bcd_len; - gsup_msg.sm_rp_oa = bcd_buf; + gsup_msg.sm_rp_oa_len = bcd_len - 1; + gsup_msg.sm_rp_oa = bcd_buf + 1; /* SM-RP-DA should (already) contain SMSC address */ gsup_msg.sm_rp_da_type = OSMO_GSUP_SMS_SM_RP_ODA_SMSC_ADDR; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0f32e2af0ed2d2fea6addf45efbdfee120c2425d Gerrit-Change-Number: 16655 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 09:44:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 19 Dec 2019 09:44:12 +0000 Subject: Change in osmo-remsim[master]: remsim-client: Call an external script in specific situations In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-remsim/+/16629 to look at the new patch set (#5). Change subject: remsim-client: Call an external script in specific situations ...................................................................... remsim-client: Call an external script in specific situations There are some situations where remsim-client would want to make its surrounding system aware of, e.g. to take specific action. This is particularly important on platforms where the simtrace2 firmware doesn't have direct control over modem reset/poweron or the like. Change-Id: I61cf4d93c669db137de801f8b147dcffaa6f3abd Depends: libosmocore.git Ib24ac8a083db32e55402ce496a5eabd8749cc888 Closes: OS#4332 --- M doc/manuals/chapters/remsim-client.adoc M src/client/simtrace2-remsim_client.c 2 files changed, 141 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/29/16629/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/16629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I61cf4d93c669db137de801f8b147dcffaa6f3abd Gerrit-Change-Number: 16629 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 11:47:54 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 19 Dec 2019 11:47:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: tolerate empty measurement result on chan est. In-Reply-To: References: Message-ID: Hello fixeria, pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 to look at the new patch set (#2). Change subject: BTS_Tests: tolerate empty measurement result on chan est. ...................................................................... BTS_Tests: tolerate empty measurement result on chan est. On channel establishment the first measurement result may lack the measurement reports from the MS. This is normal behavior, so lets tolerate that. Change-Id: Ib2f511991349ab15e02db9c5e45f0df3645835a4 Related: OS#2975 --- M bts/BTS_Tests.ttcn M library/RSL_Types.ttcn 2 files changed, 74 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/49/16649/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib2f511991349ab15e02db9c5e45f0df3645835a4 Gerrit-Change-Number: 16649 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 12:08:05 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 19 Dec 2019 12:08:05 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/oml: fix osmo-bts.cfg: osmo-bts-trx has no DSP/HW MS P... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16652 ) Change subject: ttcn3-bts-test/oml: fix osmo-bts.cfg: osmo-bts-trx has no DSP/HW MS Power Control ...................................................................... Patch Set 1: Code-Review+2 Oh I'm sorry, I removed it from BTS_Tests already but I thought OML was using the same cfg file. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I940df510d803d0eaa063dd5145c2f9a4c5d0543f Gerrit-Change-Number: 16652 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 19 Dec 2019 12:08:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 12:11:40 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 19 Dec 2019 12:11:40 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/vty: ensure backwards compatibility with older config files In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16653 ) Change subject: osmo-bts-trx/vty: ensure backwards compatibility with older config files ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/c/osmo-bts/+/16653/1/src/common/vty.c File src/common/vty.c: https://gerrit.osmocom.org/c/osmo-bts/+/16653/1/src/common/vty.c at 796 PS1, Line 796: * which has been ripped out recently. Configuration files may still contain "recently" may be confusing when someone reads this after a while ;) https://gerrit.osmocom.org/c/osmo-bts/+/16653/1/src/common/vty.c at 802 PS1, Line 802: return CMD_SUCCESS; iiuc this return should be removed. Otherwise there's no sense in setting soft. But anyway, since it's set to "osmo" by default in case of osmo-bts-trx (because dsp doesn't exist anymore), it means we can simply return CMD_SUCCESS as in ignoring the CMD. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4facd21bca3d8cb80d21e83ea267bc013e474533 Gerrit-Change-Number: 16653 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 19 Dec 2019 12:11:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 12:13:06 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 19 Dec 2019 12:13:06 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: further documentation for SM-RP-DA/OA IE coding In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16654 ) Change subject: chapters/gsup.adoc: further documentation for SM-RP-DA/OA IE coding ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I315ae412c83de80f09284c8c1f28faf360ac4662 Gerrit-Change-Number: 16654 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 19 Dec 2019 12:13:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 12:17:34 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 19 Dec 2019 12:17:34 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11_gsup.c: fix SM-RP-OA encoding for MO SMS over GSUP In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16655 ) Change subject: libmsc/gsm_04_11_gsup.c: fix SM-RP-OA encoding for MO SMS over GSUP ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/16655/1/src/libmsc/gsm_04_11_gsup.c File src/libmsc/gsm_04_11_gsup.c: https://gerrit.osmocom.org/c/osmo-msc/+/16655/1/src/libmsc/gsm_04_11_gsup.c at 56 PS1, Line 56: uint8_t bcd_buf[GSM48_MI_SIZE]; this change looks not related. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0f32e2af0ed2d2fea6addf45efbdfee120c2425d Gerrit-Change-Number: 16655 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 19 Dec 2019 12:17:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 12:18:12 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 19 Dec 2019 12:18:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: tolerate empty measurement result on chan est. In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 ) Change subject: BTS_Tests: tolerate empty measurement result on chan est. ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib2f511991349ab15e02db9c5e45f0df3645835a4 Gerrit-Change-Number: 16649 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 19 Dec 2019 12:18:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 12:49:10 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 19 Dec 2019 12:49:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: tolerate empty measurement result on chan est. In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 ) Change subject: BTS_Tests: tolerate empty measurement result on chan est. ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib2f511991349ab15e02db9c5e45f0df3645835a4 Gerrit-Change-Number: 16649 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 19 Dec 2019 12:49:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 12:53:23 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 19 Dec 2019 12:53:23 +0000 Subject: Change in osmo-trx[master]: uhd: use value already cached in tmp variable References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/16656 ) Change subject: uhd: use value already cached in tmp variable ...................................................................... uhd: use value already cached in tmp variable Change-Id: I4568eaed6db3da12f83f2f503a50032f7bfb482c --- M Transceiver52M/device/uhd/UHDDevice.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/56/16656/1 diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index 604bb44..59eb8a7 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -742,7 +742,7 @@ for (size_t i = 0; i < rx_buffers.size(); i++) { rc = rx_buffers[i]->write((short *) &pkt_bufs[i].front(), num_smpls, - metadata.time_spec.to_ticks(rx_rate)); + ts.to_ticks(rx_rate)); // Continue on local overrun, exit on other errors if ((rc < 0)) { -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4568eaed6db3da12f83f2f503a50032f7bfb482c Gerrit-Change-Number: 16656 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 12:57:31 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 19 Dec 2019 12:57:31 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/oml: fix osmo-bts.cfg: osmo-bts-trx has no DSP/HW MS P... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16652 ) Change subject: ttcn3-bts-test/oml: fix osmo-bts.cfg: osmo-bts-trx has no DSP/HW MS Power Control ...................................................................... Patch Set 1: Verified+1 Code-Review+1 We all make mistakes, no worries ;) -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I940df510d803d0eaa063dd5145c2f9a4c5d0543f Gerrit-Change-Number: 16652 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 19 Dec 2019 12:57:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 12:57:38 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 19 Dec 2019 12:57:38 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test/oml: fix osmo-bts.cfg: osmo-bts-trx has no DSP/HW MS P... In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16652 ) Change subject: ttcn3-bts-test/oml: fix osmo-bts.cfg: osmo-bts-trx has no DSP/HW MS Power Control ...................................................................... ttcn3-bts-test/oml: fix osmo-bts.cfg: osmo-bts-trx has no DSP/HW MS Power Control It was noticed that most of the OML related TTCN-3 test cases do not pass anymore, while some of them are green for the release builds. The culprit is I49706926b1e962b18791174627bc3cc0cd0cd9d5, which did not ensure backwards compatibility with older configuration files. Let's remove 'ms-power-control dsp' and use the defaults. Change-Id: I940df510d803d0eaa063dd5145c2f9a4c5d0543f --- M ttcn3-bts-test/oml/osmo-bts.cfg 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve; Verified diff --git a/ttcn3-bts-test/oml/osmo-bts.cfg b/ttcn3-bts-test/oml/osmo-bts.cfg index a6e3a23..ff21431 100644 --- a/ttcn3-bts-test/oml/osmo-bts.cfg +++ b/ttcn3-bts-test/oml/osmo-bts.cfg @@ -83,7 +83,6 @@ power-ramp max-initial 0 mdBm power-ramp step-size 2000 mdB power-ramp step-interval 1 - ms-power-control dsp phy 0 instance 0 ctrl bind 0.0.0.0 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I940df510d803d0eaa063dd5145c2f9a4c5d0543f Gerrit-Change-Number: 16652 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 13:12:42 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 19 Dec 2019 13:12:42 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11_gsup.c: fix SM-RP-OA encoding for MO SMS over GSUP In-Reply-To: References: Message-ID: Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/16655 to look at the new patch set (#2). Change subject: libmsc/gsm_04_11_gsup.c: fix SM-RP-OA encoding for MO SMS over GSUP ...................................................................... libmsc/gsm_04_11_gsup.c: fix SM-RP-OA encoding for MO SMS over GSUP We shall not include additional BCD length octet into the value part of SM-RP-OA (Originating Address) IE. Instead, there should be ToA/NPI header (1 octet). Since we do not get ToN/NPI fields from the VLR/HLR, let's assume the following default values: 1... .... = Extension: No extension .001 .... = Type of number: International (1) .... 0001 = Numbering plan: ISDN/telephone (E.164/E.163) (1) Change-Id: I0f32e2af0ed2d2fea6addf45efbdfee120c2425d TTCN-3 test case: Ib467eeca6439bc6cce72293fbb5bb48f6d233db9 Related: OS#4324 --- M src/libmsc/gsm_04_11_gsup.c 1 file changed, 12 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/55/16655/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0f32e2af0ed2d2fea6addf45efbdfee120c2425d Gerrit-Change-Number: 16655 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 13:12:43 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 19 Dec 2019 13:12:43 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11_gsup.c: do not init a buffer in gsm411_gsup_mo_fwd_s... References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16657 ) Change subject: libmsc/gsm_04_11_gsup.c: do not init a buffer in gsm411_gsup_mo_fwd_sm_req() ...................................................................... libmsc/gsm_04_11_gsup.c: do not init a buffer in gsm411_gsup_mo_fwd_sm_req() Because there is no real need for that. Change-Id: I19d4d0de0d5a46bf1de194b966f18ea8a84ced94 --- M src/libmsc/gsm_04_11_gsup.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/57/16657/1 diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c index 2abfc92..d7edd2f 100644 --- a/src/libmsc/gsm_04_11_gsup.c +++ b/src/libmsc/gsm_04_11_gsup.c @@ -53,7 +53,7 @@ int gsm411_gsup_mo_fwd_sm_req(struct gsm_trans *trans, struct msgb *msg, uint8_t sm_rp_mr, uint8_t *sm_rp_da, uint8_t sm_rp_da_len) { - uint8_t bcd_buf[GSM48_MI_SIZE] = { 0 }; + uint8_t bcd_buf[GSM48_MI_SIZE]; struct osmo_gsup_message gsup_msg; size_t bcd_len; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I19d4d0de0d5a46bf1de194b966f18ea8a84ced94 Gerrit-Change-Number: 16657 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 13:28:23 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 19 Dec 2019 13:28:23 +0000 Subject: Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH In-Reply-To: References: Message-ID: Hello pespin, fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 to look at the new patch set (#6). Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH ...................................................................... l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH The MPH INFO MEAS IND indication, which contains the uplink measurement data is sent in parallel to the PH DATA and TCH indications as a separate indications. This makes the overall uplink measurement data processing unnecessarly complex. So lets put the data that is relevant for measurement into the PH DATA and TCH indications directly. This change only affects osmo-bts-trx at the moment. In order to keep the upper layers (l1sap.c) compatible we add an autodection to switch between separate measurement indications and included measurement data. Related: OS#2977 Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42 Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/scheduler_backend.h M src/common/gsm_data_shared.c M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c 9 files changed, 119 insertions(+), 99 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/15918/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 13:51:06 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 19 Dec 2019 13:51:06 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11_gsup.c: fix SM-RP-OA encoding for MO SMS over GSUP In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16655 ) Change subject: libmsc/gsm_04_11_gsup.c: fix SM-RP-OA encoding for MO SMS over GSUP ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0f32e2af0ed2d2fea6addf45efbdfee120c2425d Gerrit-Change-Number: 16655 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 19 Dec 2019 13:51:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 13:51:17 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 19 Dec 2019 13:51:17 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11_gsup.c: do not init a buffer in gsm411_gsup_mo_fwd_s... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16657 ) Change subject: libmsc/gsm_04_11_gsup.c: do not init a buffer in gsm411_gsup_mo_fwd_sm_req() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I19d4d0de0d5a46bf1de194b966f18ea8a84ced94 Gerrit-Change-Number: 16657 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 19 Dec 2019 13:51:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 14:21:05 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 19 Dec 2019 14:21:05 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/vty: ensure backwards compatibility with older config files In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/16653 to look at the new patch set (#2). Change subject: osmo-bts-trx/vty: ensure backwards compatibility with older config files ...................................................................... osmo-bts-trx/vty: ensure backwards compatibility with older config files osmo-bts-trx used to have its own (low-level) MS Power Control loop, but recently it has been ripped out. Since [1], the process fails to start if the configuration file still contains 'ms-power-control dsp'. Let's be more tolerant: override 'dsp' by 'osmo' and print a warning. [1] I49706926b1e962b18791174627bc3cc0cd0cd9d5 Change-Id: I4facd21bca3d8cb80d21e83ea267bc013e474533 --- M src/common/vty.c 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/53/16653/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4facd21bca3d8cb80d21e83ea267bc013e474533 Gerrit-Change-Number: 16653 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 15:34:04 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 19 Dec 2019 15:34:04 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/vty: ensure backwards compatibility with older config files In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16653 ) Change subject: osmo-bts-trx/vty: ensure backwards compatibility with older config files ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4facd21bca3d8cb80d21e83ea267bc013e474533 Gerrit-Change-Number: 16653 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 19 Dec 2019 15:34:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 17:17:06 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 19 Dec 2019 17:17:06 +0000 Subject: Change in osmocom-bb[master]: mobile: Send correct ARFCN in UL gsmtap References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16658 ) Change subject: mobile: Send correct ARFCN in UL gsmtap ...................................................................... mobile: Send correct ARFCN in UL gsmtap Change-Id: I9f677866095413a0efeb8a336ce15a2dbca2228c --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/58/16658/1 diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 5d6d9c0..ac9e76f 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -298,8 +298,9 @@ /* send copy via GSMTAP */ rsl_dec_chan_nr(chan_nr, &chan_type, &chan_ss, &chan_ts); gsmtap_chan_type = chantype_rsl2gsmtap(chan_type, link_id); - gsmtap_send(gsmtap_inst, 0|0x4000, chan_ts, gsmtap_chan_type, - chan_ss, 0, 127, 255, msg->l2h, msgb_l2len(msg)); + gsmtap_send(gsmtap_inst, ms->rrlayer.cd_now.arfcn | GSMTAP_ARFCN_F_UPLINK, + chan_ts, gsmtap_chan_type, chan_ss, 0, 127, 255, + msg->l2h, msgb_l2len(msg)); /* prepend uplink info header */ l1i_ul = (struct l1ctl_info_ul *) msgb_push(msg, sizeof(*l1i_ul)); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9f677866095413a0efeb8a336ce15a2dbca2228c Gerrit-Change-Number: 16658 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 20:15:06 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 19 Dec 2019 20:15:06 +0000 Subject: Change in osmo-trx[master]: Transceiver.cpp: Introduce and use new logging categories References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/16659 ) Change subject: Transceiver.cpp: Introduce and use new logging categories ...................................................................... Transceiver.cpp: Introduce and use new logging categories Take the chance to clean up logging lines in this file: * Use LOGCHAN in more places where chan is useful * Replace inherited (old osmo-trx) categories such as WARNING with osmocom ones. Change-Id: Ic8c218f050f35d48046ccf1561fb0bfc505d4f63 --- M CommonLibs/debug.c M CommonLibs/debug.h M Transceiver52M/Transceiver.cpp 3 files changed, 56 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/59/16659/1 diff --git a/CommonLibs/debug.c b/CommonLibs/debug.c index 09dab2b..cc5be44 100644 --- a/CommonLibs/debug.c +++ b/CommonLibs/debug.c @@ -35,12 +35,30 @@ .color = NULL, .enabled = 1, .loglevel = LOGL_NOTICE, }, + [DTRXCLK] = { + .name = "DTRXCLK", + .description = "TRX Master Clock", + .color = NULL, + .enabled = 1, .loglevel = LOGL_NOTICE, + }, [DTRXCTRL] = { .name = "DTRXCTRL", .description = "TRX CTRL interface", .color = "\033[1;33m", .enabled = 1, .loglevel = LOGL_NOTICE, }, + [DTRXDDL] = { + .name = "DTRXDDL", + .description = "TRX Data interface Downlink", + .color = NULL, + .enabled = 1, .loglevel = LOGL_NOTICE, + }, + [DTRXDUL] = { + .name = "DTRXDUL", + .description = "TRX CTRL interface Uplink", + .color = NULL, + .enabled = 1, .loglevel = LOGL_NOTICE, + }, [DDEV] = { .name = "DDEV", .description = "Device/Driver specific code", diff --git a/CommonLibs/debug.h b/CommonLibs/debug.h index ad12bb8..3837329 100644 --- a/CommonLibs/debug.h +++ b/CommonLibs/debug.h @@ -10,7 +10,10 @@ /* Debug Areas of the code */ enum { DMAIN, + DTRXCLK, DTRXCTRL, + DTRXDDL, + DTRXDUL, DDEV, DLMS, }; diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 27049b9..beed033 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -180,12 +180,12 @@ int d_srcport, d_dstport, c_srcport, c_dstport; if (!mChans) { - LOG(ALERT) << "No channels assigned"; + LOG(FATAL) << "No channels assigned"; return false; } if (!sigProcLibSetup()) { - LOG(ALERT) << "Failed to initialize signal processing library"; + LOG(FATAL) << "Failed to initialize signal processing library"; return false; } @@ -285,7 +285,7 @@ mLatencyUpdateTime = time; if (!mRadioInterface->start()) { - LOG(ALERT) << "Device failed to start"; + LOG(FATAL) << "Device failed to start"; return false; } @@ -371,12 +371,12 @@ radioVector *radio_burst; if (chan >= mTxPriorityQueues.size()) { - LOG(ALERT) << "Invalid channel " << chan; + LOGCHAN(chan, DTRXDDL, FATAL) << "Invalid channel"; return; } if (wTime.TN() > 7) { - LOG(ALERT) << "Received burst with invalid slot " << wTime.TN(); + LOGCHAN(chan, DTRXDDL, FATAL) << "Received burst with invalid slot " << wTime.TN(); return; } @@ -419,7 +419,7 @@ state = &mStates[i]; while ((burst = mTxPriorityQueues[i].getStaleBurst(nowTime))) { - LOGCHAN(i, DMAIN, NOTICE) << "dumping STALE burst in TRX->SDR interface (" + LOGCHAN(i, DTRXDDL, NOTICE) << "dumping STALE burst in TRX->SDR interface (" << burst->getTime() <<" vs " << nowTime << "), retrans=" << state->mRetrans; if (state->mRetrans) updateFillerTable(i, burst); @@ -606,7 +606,7 @@ /* Blocking FIFO read */ radioVector *radio_burst = mReceiveFIFO[chan]->read(); if (!radio_burst) { - LOGCHAN(chan, DMAIN, ERROR) << "ReceiveFIFO->read() returned no burst"; + LOGCHAN(chan, DTRXDUL, ERROR) << "ReceiveFIFO->read() returned no burst"; return -EIO; } @@ -651,7 +651,7 @@ } if (max_i < 0) { - LOG(ALERT) << "Received empty burst"; + LOGCHAN(chan, DTRXDUL, FATAL) << "Received empty burst"; goto ret_idle; } @@ -678,9 +678,9 @@ rc = detectAnyBurst(*burst, mTSC, BURST_THRESH, mSPSRx, type, max_toa, &ebp); if (rc <= 0) { if (rc == -SIGERR_CLIP) - LOG(WARNING) << "Clipping detected on received RACH or Normal Burst"; + LOGCHAN(chan, DTRXDUL, NOTICE) << "Clipping detected on received RACH or Normal Burst"; else if (rc != SIGERR_NONE) - LOG(WARNING) << "Unhandled RACH or Normal Burst detection error"; + LOGCHAN(chan, DTRXDUL, NOTICE) << "Unhandled RACH or Normal Burst detection error"; goto ret_idle; } @@ -760,7 +760,7 @@ /* Attempt to read from control socket */ msgLen = read(mCtrlSockets[chan], buffer, MAX_PACKET_LENGTH); if (msgLen <= 0) { - LOGCHAN(chan, DTRXCTRL, WARNING) << "mCtrlSockets read(" << mCtrlSockets[chan] << ") failed: " << msgLen; + LOGCHAN(chan, DTRXCTRL, NOTICE) << "mCtrlSockets read(" << mCtrlSockets[chan] << ") failed: " << msgLen; return false; } @@ -769,7 +769,7 @@ /* Verify a command signature */ if (strncmp(buffer, "CMD ", 4)) { - LOGC(DTRXCTRL, WARNING) << "bogus message on control interface"; + LOGCHAN(chan, DTRXCTRL, NOTICE) << "bogus message on control interface"; return false; } @@ -854,7 +854,7 @@ sscanf(params, "%d", &freqKhz); mRxFreq = freqKhz * 1e3; if (!mRadioInterface->tuneRx(mRxFreq, chan)) { - LOGC(DTRXCTRL, ALERT) << "RX failed to tune"; + LOGCHAN(chan, DTRXCTRL, FATAL) << "RX failed to tune"; sprintf(response,"RSP RXTUNE 1 %d",freqKhz); } else @@ -865,7 +865,7 @@ sscanf(params, "%d", &freqKhz); mTxFreq = freqKhz * 1e3; if (!mRadioInterface->tuneTx(mTxFreq, chan)) { - LOGC(DTRXCTRL, ALERT) << "TX failed to tune"; + LOGCHAN(chan, DTRXCTRL, FATAL) << "TX failed to tune"; sprintf(response,"RSP TXTUNE 1 %d",freqKhz); } else @@ -887,7 +887,7 @@ int timeslot; sscanf(params, "%d %d", ×lot, &corrCode); if ((timeslot < 0) || (timeslot > 7)) { - LOGC(DTRXCTRL, WARNING) << "bogus message on control interface"; + LOGCHAN(chan, DTRXCTRL, NOTICE) << "bogus message on control interface"; sprintf(response,"RSP SETSLOT 1 %d %d",timeslot,corrCode); return true; } @@ -916,14 +916,14 @@ mWriteBurstToDiskMask = mask; sprintf(response,"RSP _SETBURSTTODISKMASK 0 %d",mask); } else { - LOGC(DTRXCTRL, WARNING) << "bogus command " << command << " on control interface."; + LOGCHAN(chan, DTRXCTRL, NOTICE) << "bogus command " << command << " on control interface."; sprintf(response,"RSP ERR 1"); } LOGCHAN(chan, DTRXCTRL, INFO) << "response is '" << response << "'"; msgLen = write(mCtrlSockets[chan], response, strlen(response) + 1); if (msgLen <= 0) { - LOGCHAN(chan, DTRXCTRL, WARNING) << "mCtrlSockets write(" << mCtrlSockets[chan] << ") failed: " << msgLen; + LOGCHAN(chan, DTRXCTRL, NOTICE) << "mCtrlSockets write(" << mCtrlSockets[chan] << ") failed: " << msgLen; return false; } return true; @@ -940,7 +940,7 @@ // check data socket msgLen = read(mDataSockets[chan], buffer, sizeof(buffer)); if (msgLen <= 0) { - LOGCHAN(chan, DTRXCTRL, WARNING) << "mDataSockets read(" << mCtrlSockets[chan] << ") failed: " << msgLen; + LOGCHAN(chan, DTRXDDL, NOTICE) << "mDataSockets read(" << mCtrlSockets[chan] << ") failed: " << msgLen; return false; } @@ -950,13 +950,13 @@ break; case sizeof(*dl) + EDGE_BURST_NBITS: /* EDGE burst */ if (mSPSTx != 4) { - LOG(ERR) << "EDGE burst received but SPS is set to " << mSPSTx; + LOGCHAN(chan, DTRXDDL, ERROR) << "EDGE burst received but SPS is set to " << mSPSTx; return false; } burstLen = EDGE_BURST_NBITS; break; default: - LOG(ERR) << "badly formatted packet on GSM->TRX interface (len="<< msgLen << ")"; + LOGCHAN(chan, DTRXDDL, ERROR) << "badly formatted packet on GSM->TRX interface (len="<< msgLen << ")"; return false; } @@ -972,13 +972,12 @@ case 1: break; default: - LOG(ERR) << "Rx TRXD message with unknown header version " << unsigned(dl->common.version); + LOGCHAN(chan, DTRXDDL, ERROR) << "Rx TRXD message with unknown header version " << unsigned(dl->common.version); return false; } - LOG(DEBUG) << "Rx TRXD message (hdr_ver=" << unsigned(dl->common.version) << "): " - << "fn=" << fn << ", tn=" << unsigned(dl->common.tn) << ", " - << "burst_len=" << burstLen; + LOGCHAN(chan, DTRXDDL, DEBUG) << "Rx TRXD message (hdr_ver=" << unsigned(dl->common.version) + << "): fn=" << fn << ", tn=" << unsigned(dl->common.tn) << ", burst_len=" << burstLen; BitVector newBurst(burstLen); BitVector::iterator itr = newBurst.begin(); @@ -1020,7 +1019,7 @@ else os << "-"; } - LOGCHAN(chan, DMAIN, DEBUG) << std::fixed << std::right + LOGCHAN(chan, DTRXDUL, DEBUG) << std::fixed << std::right << " time: " << unsigned(bi->tn) << ":" << bi->fn << " RSSI: " << std::setw(5) << std::setprecision(1) << (bi->rssi - rssiOffset) << "dBFS/" << std::setw(6) << -bi->rssi << "dBm" @@ -1038,7 +1037,7 @@ if ((rc = pullRadioVector(chan, &bi)) < 0) { if (rc == -ENOENT) { /* timeslot off, continue processing */ - LOGCHAN(chan, DMAIN, DEBUG) << unsigned(bi.tn) << ":" << bi.fn << " timeslot is off"; + LOGCHAN(chan, DTRXDUL, DEBUG) << unsigned(bi.tn) << ":" << bi.fn << " timeslot is off"; return true; } return false; /* other errors: we want to stop the process */ @@ -1075,7 +1074,7 @@ if (mOn) { //radioClock->wait(); // wait until clock updates - LOG(DEBUG) << "radio clock " << radioClock->get(); + LOGC(DTRXDDL, DEBUG) << "radio clock " << radioClock->get(); while (radioClock->get() + mTransmitLatency > mTransmitDeadlineClock) { // if underrun, then we're not providing bursts to radio/USRP fast // enough. Need to increase latency by one GSM frame. @@ -1084,8 +1083,9 @@ // only update latency at the defined frame interval if (radioClock->get() > mLatencyUpdateTime + GSM::Time(USB_LATENCY_INTRVL)) { mTransmitLatency = mTransmitLatency + GSM::Time(1,0); - LOG(INFO) << "new latency: " << mTransmitLatency << " (underrun " - << radioClock->get() << " vs " << mLatencyUpdateTime + GSM::Time(USB_LATENCY_INTRVL) << ")"; + LOGC(DTRXDDL, INFO) << "new latency: " << mTransmitLatency << " (underrun " + << radioClock->get() << " vs " + << mLatencyUpdateTime + GSM::Time(USB_LATENCY_INTRVL) << ")"; mLatencyUpdateTime = radioClock->get(); } } @@ -1095,7 +1095,7 @@ if (mTransmitLatency > mRadioInterface->minLatency()) { if (radioClock->get() > mLatencyUpdateTime + GSM::Time(216,0)) { mTransmitLatency.decTN(); - LOG(INFO) << "reduced latency: " << mTransmitLatency; + LOGC(DTRXDDL, INFO) << "reduced latency: " << mTransmitLatency; mLatencyUpdateTime = radioClock->get(); } } @@ -1119,11 +1119,11 @@ // FIXME -- This should be adaptive. sprintf(command,"IND CLOCK %llu",(unsigned long long) (mTransmitDeadlineClock.FN()+2)); - LOG(INFO) << "ClockInterface: sending " << command; + LOGC(DTRXCLK, INFO) << "sending " << command; msgLen = write(mClockSocket, command, strlen(command) + 1); if (msgLen <= 0) { - LOG(ERROR) << "mClockSocket write(" << mClockSocket << ") failed: " << msgLen; + LOGC(DTRXCLK, ERROR) << "mClockSocket write(" << mClockSocket << ") failed: " << msgLen; return false; } @@ -1144,7 +1144,7 @@ while (1) { if (!trx->driveReceiveFIFO(num)) { - LOGCHAN(num, DMAIN, FATAL) << "Something went wrong in thread " << thread_name << ", requesting stop"; + LOGCHAN(num, DTRXDUL, FATAL) << "Something went wrong in thread " << thread_name << ", requesting stop"; osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL); break; } @@ -1159,7 +1159,7 @@ while (1) { if (!transceiver->driveReceiveRadio()) { - LOG(FATAL) << "Something went wrong in thread RxLower, requesting stop"; + LOGC(DTRXDUL, FATAL) << "Something went wrong in thread RxLower, requesting stop"; osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL); break; } @@ -1214,7 +1214,7 @@ while (1) { if (!trx->driveTxPriorityQueue(num)) { - LOGCHAN(num, DMAIN, FATAL) << "Something went wrong in thread " << thread_name << ", requesting stop"; + LOGCHAN(num, DTRXDDL, FATAL) << "Something went wrong in thread " << thread_name << ", requesting stop"; osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL); break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ic8c218f050f35d48046ccf1561fb0bfc505d4f63 Gerrit-Change-Number: 16659 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 19 22:48:32 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 19 Dec 2019 22:48:32 +0000 Subject: Change in osmocom-bb[master]: mobile: Send correct ARFCN in UL gsmtap In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16658 ) Change subject: mobile: Send correct ARFCN in UL gsmtap ...................................................................... Patch Set 1: I believe it was intentionally set to 0, because this gets more complicated when Frequency Hopping is in use. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9f677866095413a0efeb8a336ce15a2dbca2228c Gerrit-Change-Number: 16658 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 19 Dec 2019 22:48:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 01:54:10 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 20 Dec 2019 01:54:10 +0000 Subject: Change in osmo-trx[master]: uhd: use value already cached in tmp variable In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16656 ) Change subject: uhd: use value already cached in tmp variable ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4568eaed6db3da12f83f2f503a50032f7bfb482c Gerrit-Change-Number: 16656 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 20 Dec 2019 01:54:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 02:13:45 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 20 Dec 2019 02:13:45 +0000 Subject: Change in osmo-trx[master]: Transceiver.cpp: Introduce and use new logging categories In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16659 ) Change subject: Transceiver.cpp: Introduce and use new logging categories ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/16659/1/Transceiver52M/Transceiver.cpp File Transceiver52M/Transceiver.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/16659/1/Transceiver52M/Transceiver.cpp at 1077 PS1, Line 1077: DTRXDDL Shouldn't we use DTRXCLK here? -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ic8c218f050f35d48046ccf1561fb0bfc505d4f63 Gerrit-Change-Number: 16659 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 20 Dec 2019 02:13:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 12:44:03 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 20 Dec 2019 12:44:03 +0000 Subject: Change in pysim[master]: commands: fix __record_len() References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16660 ) Change subject: commands: fix __record_len() ...................................................................... commands: fix __record_len() When working with USIM/ISIMs, The method __record_len() that is used by the record_count() method returns the length of the file instead the actual record count. This causes record_count() to return always 1 Change-Id: If810c691893c022e9e9d87218dd0a334c5b2d579 --- M pySim/commands.py 1 file changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/60/16660/1 diff --git a/pySim/commands.py b/pySim/commands.py index 03540b6..f2bdf7a 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -30,8 +30,8 @@ self._cla_byte = "a0" self.sel_ctrl = "0000" - # Get file size from FCP - def __get_len_from_tlv(self, fcp): + # Extract a single FCP item from TLV + def __parse_fcp(self, fcp): # see also: ETSI TS 102 221, chapter 11.1.1.3.1 Response for MF, # DF or ADF from pytlv.TLV import TLV @@ -58,9 +58,7 @@ # Skip FCP tag and length tlv = fcp[skip:] - tlv_parsed = tlvparser.parse(tlv) - - return int(tlv_parsed['80'], 16) + return tlvparser.parse(tlv) # Tell the length of a record by the card response # USIMs respond with an FCP template, which is different @@ -69,7 +67,10 @@ # SIM: GSM 11.11, chapter 9.2.1 SELECT def __record_len(self, r): if self.sel_ctrl == "0004": - return self.__get_len_from_tlv(r[-1]) + tlv_parsed = self.__parse_fcp(r[-1]) + file_descriptor = tlv_parsed['82'] + # See also ETSI TS 102 221, chapter 11.1.1.4.3 File Descriptor + return int(file_descriptor[4:8], 16) else: return int(r[-1][28:30], 16) @@ -77,7 +78,8 @@ # above. def __len(self, r): if self.sel_ctrl == "0004": - return self.__get_len_from_tlv(r[-1]) + tlv_parsed = self.__parse_fcp(r[-1]) + return int(tlv_parsed['80'], 16) else: return int(r[-1][4:8], 16) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If810c691893c022e9e9d87218dd0a334c5b2d579 Gerrit-Change-Number: 16660 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 13:19:48 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 20 Dec 2019 13:19:48 +0000 Subject: Change in osmo-trx[master]: Transceiver.cpp: Introduce and use new logging categories In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/16659 to look at the new patch set (#2). Change subject: Transceiver.cpp: Introduce and use new logging categories ...................................................................... Transceiver.cpp: Introduce and use new logging categories Take the chance to clean up logging lines in this file: * Use LOGCHAN in more places where chan is useful * Replace inherited (old osmo-trx) categories such as WARNING with osmocom ones. Change-Id: Ic8c218f050f35d48046ccf1561fb0bfc505d4f63 --- M CommonLibs/debug.c M CommonLibs/debug.h M Transceiver52M/Transceiver.cpp 3 files changed, 56 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/59/16659/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ic8c218f050f35d48046ccf1561fb0bfc505d4f63 Gerrit-Change-Number: 16659 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 13:55:00 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 20 Dec 2019 13:55:00 +0000 Subject: Change in osmocom-bb[master]: contrib/jenkins.sh: also run unit tests for TRX Toolkit In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/16567 to look at the new patch set (#2). Change subject: contrib/jenkins.sh: also run unit tests for TRX Toolkit ...................................................................... contrib/jenkins.sh: also run unit tests for TRX Toolkit Change-Id: Ia3990dc8e1ff98b83d3ee25fafa5b029f46646cd --- M contrib/jenkins.sh 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/67/16567/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia3990dc8e1ff98b83d3ee25fafa5b029f46646cd Gerrit-Change-Number: 16567 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 14:38:32 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 20 Dec 2019 14:38:32 +0000 Subject: Change in osmo-trx[master]: Transceiver.cpp: Introduce and use new logging categories In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16659 ) Change subject: Transceiver.cpp: Introduce and use new logging categories ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ic8c218f050f35d48046ccf1561fb0bfc505d4f63 Gerrit-Change-Number: 16659 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 20 Dec 2019 14:38:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 14:52:24 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 20 Dec 2019 14:52:24 +0000 Subject: Change in osmocom-bb[master]: contrib/jenkins.sh: also run unit tests for TRX Toolkit In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/16567 to look at the new patch set (#3). Change subject: contrib/jenkins.sh: also run unit tests for TRX Toolkit ...................................................................... contrib/jenkins.sh: also run unit tests for TRX Toolkit Python's unittest module will automatically discover all unit tests in a given directory (files starting with 'test*.py'). The existing tests will be rewritten in subsequent changes. Change-Id: Ia3990dc8e1ff98b83d3ee25fafa5b029f46646cd --- M contrib/jenkins.sh 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/67/16567/3 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia3990dc8e1ff98b83d3ee25fafa5b029f46646cd Gerrit-Change-Number: 16567 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 14:52:24 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 20 Dec 2019 14:52:24 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_msg.py: rewrite unit tests to use unittest framework In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/16568 to look at the new patch set (#4). Change subject: trx_toolkit/data_msg.py: rewrite unit tests to use unittest framework ...................................................................... trx_toolkit/data_msg.py: rewrite unit tests to use unittest framework Change-Id: Ia0cc7447b193a705e994078d16f3902339219916 --- M src/target/trx_toolkit/data_msg.py A src/target/trx_toolkit/test_data_msg.py 2 files changed, 193 insertions(+), 212 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/68/16568/4 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia0cc7447b193a705e994078d16f3902339219916 Gerrit-Change-Number: 16568 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 15:00:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 20 Dec 2019 15:00:09 +0000 Subject: Change in osmocom-bb[master]: contrib/jenkins.sh: also run unit tests for TRX Toolkit In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16567 ) Change subject: contrib/jenkins.sh: also run unit tests for TRX Toolkit ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia3990dc8e1ff98b83d3ee25fafa5b029f46646cd Gerrit-Change-Number: 16567 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 20 Dec 2019 15:00:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 15:00:54 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 20 Dec 2019 15:00:54 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_msg.py: rewrite unit tests to use unittest framework In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16568 ) Change subject: trx_toolkit/data_msg.py: rewrite unit tests to use unittest framework ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia0cc7447b193a705e994078d16f3902339219916 Gerrit-Change-Number: 16568 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 20 Dec 2019 15:00:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 15:36:32 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 20 Dec 2019 15:36:32 +0000 Subject: Change in osmo-bts[master]: l1sap: is_fille_frame(): assert len of data compared References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/16661 ) Change subject: l1sap: is_fille_frame(): assert len of data compared ...................................................................... l1sap: is_fille_frame(): assert len of data compared Change-Id: Id3d1725ff36091ed5c57927caad09a8baea6f52e --- M src/common/l1sap.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/61/16661/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 213099d..d8848c2 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -460,10 +460,12 @@ { switch (chan_type) { case GSMTAP_CHANNEL_AGCH: + OSMO_ASSERT(len == GSM_MACBLOCK_LEN); if (!memcmp(data, fill_frame, GSM_MACBLOCK_LEN)) return true; break; case GSMTAP_CHANNEL_PCH: + OSMO_ASSERT(len == GSM_MACBLOCK_LEN); if (!memcmp(data, paging_fill, GSM_MACBLOCK_LEN)) return true; break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id3d1725ff36091ed5c57927caad09a8baea6f52e Gerrit-Change-Number: 16661 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 15:48:40 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 20 Dec 2019 15:48:40 +0000 Subject: Change in osmocom-bb[master]: layer23: Fix trailing whitespace References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16662 ) Change subject: layer23: Fix trailing whitespace ...................................................................... layer23: Fix trailing whitespace Change-Id: I295f285e5fc3cdc372723f6b4de2415a94d4979a --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/62/16662/1 diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 5d6d9c0..ddde7d2 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -63,7 +63,7 @@ msg->l1h = msgb_put(msg, sizeof(*l1h)); l1h = (struct l1ctl_hdr *) msg->l1h; l1h->msg_type = msg_type; - + return msg; } @@ -636,7 +636,7 @@ LOGP(DL1C, LOGL_INFO, "SIM %s\n", osmo_hexdump(data, len)); sim_apdu_resp(ms, msg); - + return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I295f285e5fc3cdc372723f6b4de2415a94d4979a Gerrit-Change-Number: 16662 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 15:48:41 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 20 Dec 2019 15:48:41 +0000 Subject: Change in osmocom-bb[master]: layer23: Identify AGCH from PCH on tx of GSMTAP downlink messages References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16663 ) Change subject: layer23: Identify AGCH from PCH on tx of GSMTAP downlink messages ...................................................................... layer23: Identify AGCH from PCH on tx of GSMTAP downlink messages Some bits are taken from osmo-bts l1sap.c Change-Id: I0adab003a4060c9cef730e0432859659c51bd087 --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 46 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/63/16663/1 diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 9664561..014e4f8 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -50,6 +50,51 @@ extern struct gsmtap_inst *gsmtap_inst; +#define CB_FCCH -1 +#define CB_SCH -2 +#define CB_BCCH -3 +#define CB_IDLE -4 + +/* according to TS 05.02 Clause 7 Table 3 of 9 an Figure 8a */ +static const int ccch_block_table[51] = { + CB_FCCH, CB_SCH,/* 0..1 */ + CB_BCCH, CB_BCCH, CB_BCCH, CB_BCCH, /* 2..5: BCCH */ + 0, 0, 0, 0, /* 6..9: B0 */ + CB_FCCH, CB_SCH,/* 10..11 */ + 1, 1, 1, 1, /* 12..15: B1 */ + 2, 2, 2, 2, /* 16..19: B2 */ + CB_FCCH, CB_SCH,/* 20..21 */ + 3, 3, 3, 3, /* 22..25: B3 */ + 4, 4, 4, 4, /* 26..29: B4 */ + CB_FCCH, CB_SCH,/* 30..31 */ + 5, 5, 5, 5, /* 32..35: B5 */ + 6, 6, 6, 6, /* 36..39: B6 */ + CB_FCCH, CB_SCH,/* 40..41 */ + 7, 7, 7, 7, /* 42..45: B7 */ + 8, 8, 8, 8, /* 46..49: B8 */ + -4 /* 50: Idle */ +}; + +/* determine the CCCH block number based on the frame number */ +static unsigned int fn2ccch_block(uint32_t fn) +{ + int rc = ccch_block_table[fn%51]; + /* if FN is negative, we were called for something that's not CCCH! */ + OSMO_ASSERT(rc >= 0); + return rc; +} + +static uint8_t chantype_rsl2gsmtap_ext(uint8_t rsl_chantype, uint8_t link_id, uint32_t fn, uint8_t num_agch) +{ + uint8_t ret = chantype_rsl2gsmtap(rsl_chantype, link_id); + if (ret != GSMTAP_CHANNEL_PCH) + return ret; + + if (fn2ccch_block(fn) >= num_agch) + return GSMTAP_CHANNEL_PCH; + return GSMTAP_CHANNEL_AGCH; +} + static struct msgb *osmo_l1_alloc(uint8_t msg_type) { struct l1ctl_hdr *l1h; @@ -230,7 +275,7 @@ } /* send CCCH data via GSMTAP */ - gsmtap_chan_type = chantype_rsl2gsmtap(chan_type, dl->link_id); + gsmtap_chan_type = chantype_rsl2gsmtap_ext(chan_type, dl->link_id, tm.fn, ms->cellsel.si->bs_ag_blks_res); gsmtap_send(gsmtap_inst, ntohs(dl->band_arfcn), chan_ts, gsmtap_chan_type, chan_ss, tm.fn, dl->rx_level-110, dl->snr, ccch->data, sizeof(ccch->data)); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0adab003a4060c9cef730e0432859659c51bd087 Gerrit-Change-Number: 16663 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 15:48:41 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 20 Dec 2019 15:48:41 +0000 Subject: Change in osmocom-bb[master]: layer23: Avoid sending downlink AGCH/PCH fill frames over GSMTAP References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16664 ) Change subject: layer23: Avoid sending downlink AGCH/PCH fill frames over GSMTAP ...................................................................... layer23: Avoid sending downlink AGCH/PCH fill frames over GSMTAP Some bits are taken from osmo-bts l1sap.c. Change-Id: Id21e9334b620b8ab3ad404708bfd5358e3555ab6 --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 36 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/64/16664/1 diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 014e4f8..aece3bf 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -95,6 +95,34 @@ return GSMTAP_CHANNEL_AGCH; } +static const uint8_t fill_frame[GSM_MACBLOCK_LEN] = { + 0x03, 0x03, 0x01, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, + 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, + 0x2B, 0x2B, 0x2B +}; + +/* Paging Request 1 with "no identity" content, i.e. empty/dummy paging */ +static const uint8_t paging_fill[GSM_MACBLOCK_LEN] = { + 0x15, 0x06, 0x21, 0x00, 0x01, 0xf0, 0x2b, 0x2b, 0x2b, 0x2b, + 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, + 0x2b, 0x2b, 0x2b }; + +static bool is_fill_frame(uint8_t chan_type, const uint8_t *data) +{ + switch (chan_type) { + case GSMTAP_CHANNEL_AGCH: + if (!memcmp(data, fill_frame, GSM_MACBLOCK_LEN)) + return true; + break; + case GSMTAP_CHANNEL_PCH: + if (!memcmp(data, paging_fill, GSM_MACBLOCK_LEN)) + return true; + break; + /* don't use 'default' case here as the above only conditionally return true */ + } + return false; +} + static struct msgb *osmo_l1_alloc(uint8_t msg_type) { struct l1ctl_hdr *l1h; @@ -274,11 +302,15 @@ return 0; } - /* send CCCH data via GSMTAP */ gsmtap_chan_type = chantype_rsl2gsmtap_ext(chan_type, dl->link_id, tm.fn, ms->cellsel.si->bs_ag_blks_res); - gsmtap_send(gsmtap_inst, ntohs(dl->band_arfcn), chan_ts, - gsmtap_chan_type, chan_ss, tm.fn, dl->rx_level-110, - dl->snr, ccch->data, sizeof(ccch->data)); + /* don't log fill frames via GSMTAP; they serve no purpose other than + * to clog up your logs */ + if (!is_fill_frame(gsmtap_chan_type, ccch->data)) { + /* send CCCH data via GSMTAP */ + gsmtap_send(gsmtap_inst, ntohs(dl->band_arfcn), chan_ts, + gsmtap_chan_type, chan_ss, tm.fn, dl->rx_level-110, + dl->snr, ccch->data, sizeof(ccch->data)); + } /* determine LAPDm entity based on SACCH or not */ if (dl->link_id & 0x40) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id21e9334b620b8ab3ad404708bfd5358e3555ab6 Gerrit-Change-Number: 16664 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 16:27:32 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 20 Dec 2019 16:27:32 +0000 Subject: Change in osmocom-bb[master]: layer23: Fix trailing whitespace In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16662 ) Change subject: layer23: Fix trailing whitespace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I295f285e5fc3cdc372723f6b4de2415a94d4979a Gerrit-Change-Number: 16662 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 20 Dec 2019 16:27:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 16:31:04 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 20 Dec 2019 16:31:04 +0000 Subject: Change in osmocom-bb[master]: layer23: Identify AGCH from PCH on tx of GSMTAP downlink messages In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16663 ) Change subject: layer23: Identify AGCH from PCH on tx of GSMTAP downlink messages ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmocom-bb/+/16663/1/src/host/layer23/src/common/l1ctl.c File src/host/layer23/src/common/l1ctl.c: https://gerrit.osmocom.org/c/osmocom-bb/+/16663/1/src/host/layer23/src/common/l1ctl.c at 94 PS1, Line 94: ws -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0adab003a4060c9cef730e0432859659c51bd087 Gerrit-Change-Number: 16663 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 20 Dec 2019 16:31:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 16:41:10 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 20 Dec 2019 16:41:10 +0000 Subject: Change in osmocom-bb[master]: layer23: Avoid sending downlink AGCH/PCH fill frames over GSMTAP In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16664 ) Change subject: layer23: Avoid sending downlink AGCH/PCH fill frames over GSMTAP ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmocom-bb/+/16664/1/src/host/layer23/src/common/l1ctl.c File src/host/layer23/src/common/l1ctl.c: https://gerrit.osmocom.org/c/osmocom-bb/+/16664/1/src/host/layer23/src/common/l1ctl.c at 99 PS1, Line 99: 0x03, 0x03, 0x01 We probably don't need to compare more than first three octets. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id21e9334b620b8ab3ad404708bfd5358e3555ab6 Gerrit-Change-Number: 16664 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 20 Dec 2019 16:41:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 16:47:57 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 20 Dec 2019 16:47:57 +0000 Subject: Change in osmocom-bb[master]: layer23: Fix trailing whitespace In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16662 ) Change subject: layer23: Fix trailing whitespace ...................................................................... layer23: Fix trailing whitespace Change-Id: I295f285e5fc3cdc372723f6b4de2415a94d4979a --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 5d6d9c0..ddde7d2 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -63,7 +63,7 @@ msg->l1h = msgb_put(msg, sizeof(*l1h)); l1h = (struct l1ctl_hdr *) msg->l1h; l1h->msg_type = msg_type; - + return msg; } @@ -636,7 +636,7 @@ LOGP(DL1C, LOGL_INFO, "SIM %s\n", osmo_hexdump(data, len)); sim_apdu_resp(ms, msg); - + return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I295f285e5fc3cdc372723f6b4de2415a94d4979a Gerrit-Change-Number: 16662 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 16:49:09 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 20 Dec 2019 16:49:09 +0000 Subject: Change in osmocom-bb[master]: mobile: Send correct ARFCN in UL gsmtap In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16658 ) Change subject: mobile: Send correct ARFCN in UL gsmtap ...................................................................... Patch Set 2: > Patch Set 1: > > I believe it was intentionally set to 0, because this gets more complicated when Frequency Hopping is in use. Well at least it provides more useful information when hoping is not in use. I found having this really useful to debug with mobile's GSMTAP, so I think it should go in an maybe improved in the future. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9f677866095413a0efeb8a336ce15a2dbca2228c Gerrit-Change-Number: 16658 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 20 Dec 2019 16:49:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 16:50:24 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 20 Dec 2019 16:50:24 +0000 Subject: Change in osmocom-bb[master]: layer23: Identify AGCH from PCH on tx of GSMTAP downlink messages In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/16663 to look at the new patch set (#2). Change subject: layer23: Identify AGCH from PCH on tx of GSMTAP downlink messages ...................................................................... layer23: Identify AGCH from PCH on tx of GSMTAP downlink messages Some bits are taken from osmo-bts l1sap.c Change-Id: I0adab003a4060c9cef730e0432859659c51bd087 --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 46 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/63/16663/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0adab003a4060c9cef730e0432859659c51bd087 Gerrit-Change-Number: 16663 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 16:52:58 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 20 Dec 2019 16:52:58 +0000 Subject: Change in osmocom-bb[master]: mobile: Send correct ARFCN in UL gsmtap In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16658 ) Change subject: mobile: Send correct ARFCN in UL gsmtap ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9f677866095413a0efeb8a336ce15a2dbca2228c Gerrit-Change-Number: 16658 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 20 Dec 2019 16:52:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 16:53:29 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 20 Dec 2019 16:53:29 +0000 Subject: Change in osmocom-bb[master]: layer23: Identify AGCH from PCH on tx of GSMTAP downlink messages In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16663 ) Change subject: layer23: Identify AGCH from PCH on tx of GSMTAP downlink messages ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0adab003a4060c9cef730e0432859659c51bd087 Gerrit-Change-Number: 16663 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 20 Dec 2019 16:53:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 21:47:49 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 20 Dec 2019 21:47:49 +0000 Subject: Change in osmo-trx[master]: uhd: Introduce UHD log category and support UHD >=3.11 logging framework References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/16665 ) Change subject: uhd: Introduce UHD log category and support UHD >=3.11 logging framework ...................................................................... uhd: Introduce UHD log category and support UHD >=3.11 logging framework Change-Id: I36f1ff7d425a2144fb512ff393af02741eb4a3d4 --- M CommonLibs/Logger.h M CommonLibs/debug.c M CommonLibs/debug.h M Transceiver52M/device/uhd/UHDDevice.cpp 4 files changed, 58 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/65/16665/1 diff --git a/CommonLibs/Logger.h b/CommonLibs/Logger.h index ab72303..b752e51 100644 --- a/CommonLibs/Logger.h +++ b/CommonLibs/Logger.h @@ -58,6 +58,9 @@ #define LOGLV(category, level) \ Log(category, level, __BASE_FILE__, __LINE__).get() << "[tid=" << pthread_self() << "] " +#define LOGSRC(category, level, file, line) \ + Log(category, level, file, line).get() << "[tid=" << pthread_self() << "] " + #define LOGCHAN(chan, category, level) \ Log(category, LOGL_##level, __BASE_FILE__, __LINE__).get() << "[tid=" << pthread_self() << "][chan=" << chan << "] " diff --git a/CommonLibs/debug.c b/CommonLibs/debug.c index cc5be44..ee5270d 100644 --- a/CommonLibs/debug.c +++ b/CommonLibs/debug.c @@ -71,6 +71,12 @@ .color = NULL, .enabled = 1, .loglevel = LOGL_NOTICE, }, + [DUHD] = { + .name = "DUHD", + .description = "Logging from within libuhd itself", + .color = NULL, + .enabled = 1, .loglevel = LOGL_NOTICE, + }, }; const struct log_info log_info = { diff --git a/CommonLibs/debug.h b/CommonLibs/debug.h index 3837329..2b7be23 100644 --- a/CommonLibs/debug.h +++ b/CommonLibs/debug.h @@ -16,6 +16,7 @@ DTRXDUL, DDEV, DLMS, + DUHD, }; #define CLOGC(category, level, fmt, args...) do { \ diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index 59eb8a7..0a47616 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -33,11 +33,12 @@ #include "config.h" #endif -#ifndef USE_UHD_3_11 +#ifdef USE_UHD_3_11 +#include +#include +#else #include #include -#else -#include #endif #define USRP_TX_AMPL 0.3 @@ -134,23 +135,52 @@ return NULL; } -#ifndef USE_UHD_3_11 +#ifdef USE_UHD_3_11 +static void uhd_log_handler(const uhd::log::logging_info &info) +{ + int level; + + switch(info.verbosity) + { + case uhd::log::trace: + case uhd::log::debug: + level = LOGL_DEBUG; + break; + case uhd::log::info: + level = LOGL_INFO; + break; + case uhd::log::warning: + level = LOGL_NOTICE; + break; + case uhd::log::error: + level = LOGL_ERROR; + break; + case uhd::log::fatal: + level = LOGL_FATAL; + break; + default: + level = LOGL_NOTICE; + } + + LOGSRC(DUHD, level, info.file.c_str(), info.line) << "[" << info.component << "] " << info.message; +} +#else /* Catch and drop underrun 'U' and overrun 'O' messages from stdout since we already report using the logging facility. Direct everything else appropriately. */ -void uhd_msg_handler(uhd::msg::type_t type, const std::string &msg) +static void uhd_msg_handler(uhd::msg::type_t type, const std::string &msg) { switch (type) { case uhd::msg::status: - LOGC(DDEV, INFO) << msg; + LOGC(UHD, INFO) << msg; break; case uhd::msg::warning: - LOGC(DDEV, WARNING) << msg; + LOGC(UHD, NOTICE) << msg; break; case uhd::msg::error: - LOGC(DDEV, ERROR) << msg; + LOGC(UHD, ERROR) << msg; break; case uhd::msg::fastpath: break; @@ -418,6 +448,16 @@ { const char *refstr; + /* Register msg handler. Different APIs depending on UHD version */ +#ifdef USE_UHD_3_11 + uhd::log::add_logger("OsmoTRX", &uhd_log_handler); + uhd::log::set_log_level(uhd::log::debug); + uhd::log::set_console_level(uhd::log::off); + uhd::log::set_logger_level("OsmoTRX", uhd::log::debug); +#else + uhd::msg::register_handler(&uhd_msg_handler); +#endif + // Find UHD devices uhd::device_addr_t addr(args); uhd::device_addrs_t dev_addrs = uhd::device::find(addr); @@ -604,10 +644,6 @@ return false; } -#ifndef USE_UHD_3_11 - // Register msg handler - uhd::msg::register_handler(&uhd_msg_handler); -#endif // Start asynchronous event (underrun check) loop async_event_thrd = new Thread(); async_event_thrd->start((void * (*)(void*))async_event_loop, (void*)this); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I36f1ff7d425a2144fb512ff393af02741eb4a3d4 Gerrit-Change-Number: 16665 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 22:03:03 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 20 Dec 2019 22:03:03 +0000 Subject: Change in osmo-trx[master]: uhd: Introduce UHD log category and support UHD >=3.11 logging framework In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/16665 to look at the new patch set (#2). Change subject: uhd: Introduce UHD log category and support UHD >=3.11 logging framework ...................................................................... uhd: Introduce UHD log category and support UHD >=3.11 logging framework Change-Id: I36f1ff7d425a2144fb512ff393af02741eb4a3d4 --- M CommonLibs/Logger.h M CommonLibs/debug.c M CommonLibs/debug.h M Transceiver52M/device/uhd/UHDDevice.cpp 4 files changed, 58 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/65/16665/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I36f1ff7d425a2144fb512ff393af02741eb4a3d4 Gerrit-Change-Number: 16665 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 22:03:04 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 20 Dec 2019 22:03:04 +0000 Subject: Change in osmo-trx[master]: uhd: Improve some logging lines printing UHD pretty-print output References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/16666 ) Change subject: uhd: Improve some logging lines printing UHD pretty-print output ...................................................................... uhd: Improve some logging lines printing UHD pretty-print output Change-Id: If5aba28aaf8a3312d89b3e963184f9f20966d199 --- M Transceiver52M/device/uhd/UHDDevice.cpp 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/66/16666/1 diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index 224808d..169dc20 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -566,7 +566,7 @@ init_gains(); // Print configuration - LOGC(DDEV, INFO) << "\n" << usrp_dev->get_pp_string(); + LOGC(DDEV, INFO) << "Device configuration: " << usrp_dev->get_pp_string(); if (iface == MULTI_ARFCN) return MULTI_ARFCN; @@ -919,15 +919,18 @@ std::vector freqs; uhd::tune_result_t tres; uhd::tune_request_t treq = select_freq(freq, chan, tx); + std::string str_dir; if (tx) { tres = usrp_dev->set_tx_freq(treq, chan); tx_freqs[chan] = usrp_dev->get_tx_freq(chan); + str_dir = "Tx"; } else { tres = usrp_dev->set_rx_freq(treq, chan); rx_freqs[chan] = usrp_dev->get_rx_freq(chan); + str_dir = "Rx"; } - LOGC(DDEV, INFO) << "\n" << tres.to_pp_string() << std::endl; + LOGCHAN(chan, DDEV, INFO) << "set_freq(" << freq << ", " << str_dir << "): " << tres.to_pp_string() << std::endl; if ((chans == 1) || ((chans == 2) && dev_type == UMTRX)) return true; @@ -947,7 +950,7 @@ rx_freqs[!chan] = usrp_dev->get_rx_freq(!chan); } - LOGC(DDEV, INFO) << "\n" << tres.to_pp_string() << std::endl; + LOGCHAN(chan, DDEV, INFO) << "set_freq(" << freq << ", " << str_dir << "): " << tres.to_pp_string() << std::endl; } return true; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: If5aba28aaf8a3312d89b3e963184f9f20966d199 Gerrit-Change-Number: 16666 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 22:31:34 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 20 Dec 2019 22:31:34 +0000 Subject: Change in osmo-trx[master]: doc: clarify number of channels on B210 with multi-arfcn enabled References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/16667 ) Change subject: doc: clarify number of channels on B210 with multi-arfcn enabled ...................................................................... doc: clarify number of channels on B210 with multi-arfcn enabled Change-Id: I082d4d8c346f1be1569fe63baa856029e439cb2c --- M doc/manuals/chapters/configuration.adoc 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/67/16667/1 diff --git a/doc/manuals/chapters/configuration.adoc b/doc/manuals/chapters/configuration.adoc index 2f4986f..6b0ff66 100644 --- a/doc/manuals/chapters/configuration.adoc +++ b/doc/manuals/chapters/configuration.adoc @@ -46,9 +46,10 @@ added specifically in commit `76764278169d252980853251daeb9f1ba0c246e1`. This feature is useful for instance if you want to run more than 1 TRX with an -Ettus B200 device, or 2 TRX with an Ettus B210 device, since they support only 1 -and 2 physical RF channels respectively. No device from other providers or even -other devices than B200 and B210 from Ettus are known to support this feature. +Ettus B200 device, or 2 more than TRX with an Ettus B210 device, since they +support only 1 and 2 physical RF channels respectively. No device from other +providers or even other devices than B200 and B210 from Ettus are known to +support this feature. With multi-ARFCN enabled, ARFCN spacing is fixed at 800 kHz or 4 GSM channels. So if TRX-0 is set to ARFCN 51, TRX-1 _must_ be set to 55, and so on. Up to -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I082d4d8c346f1be1569fe63baa856029e439cb2c Gerrit-Change-Number: 16667 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 20 23:49:02 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 20 Dec 2019 23:49:02 +0000 Subject: Change in osmo-trx[master]: radioInterfaceMulti: Fail to tune on freq not following multi-arfcn r... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/16668 ) Change subject: radioInterfaceMulti: Fail to tune on freq not following multi-arfcn restrictions ...................................................................... radioInterfaceMulti: Fail to tune on freq not following multi-arfcn restrictions multi-arfcn feature uses a hardcoded disposition of logical channels on a physical channel. Logical channels in the phisical channel are separated by MCBTS_SPACING Hz, that is 4 GSM ARFCNs. As a result, multi-arfcn restricts the TRX ARFCN setup to the following: ARFCN(TRX0)=N, ARFCN(TRX1)=N+1*4, ARFCN(TRX2)=N+2*4, ... Let's make sure radioInterfaceMulti verifies the requested Rx/Tx frequencies for each logical channel over TRXC match the restriction explained above. It will check freq going to be set is indeed separated by MCBTS_SPACING from already set channels, making sure the ARFCN series is consistent. Otherwise, before this patch, one could set in osmo-bsc: ARFCN(TRX0)=N, ARFCN(TRX1)=N+2 and osmo-trx would silently ack the related Rx/TxTUNE TRXC commands, but actually still transmit on ARFCN N+4 instead. As a result, in this scenario TRX!=0 were unusable with multi-arfcn. Related: OS#4207 Change-Id: I2f3d66a611d3a489b3e4d9431994f4ec77b4460f --- M Transceiver52M/radioInterface.h M Transceiver52M/radioInterfaceMulti.cpp 2 files changed, 59 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/68/16668/1 diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h index d9fa414..e62441b 100644 --- a/Transceiver52M/radioInterface.h +++ b/Transceiver52M/radioInterface.h @@ -156,16 +156,24 @@ void close(); }; +struct freq_cfg_state { + bool set; + double freq_hz; +}; + class RadioInterfaceMulti : public RadioInterface { private: bool pushBuffer(); int pullBuffer(); + bool verify_arfcn_consistency(double freq, size_t chan, bool tx); virtual double setTxGain(double dB, size_t chan); signalVector *outerSendBuffer; signalVector *outerRecvBuffer; std::vector history; std::vector active; + std::vector rxtune_st; + std::vector txtune_st; Resampler *dnsampler; Resampler *upsampler; diff --git a/Transceiver52M/radioInterfaceMulti.cpp b/Transceiver52M/radioInterfaceMulti.cpp index 668305c..81a7c77 100644 --- a/Transceiver52M/radioInterfaceMulti.cpp +++ b/Transceiver52M/radioInterfaceMulti.cpp @@ -73,6 +73,8 @@ powerScaling.resize(0); history.resize(0); active.resize(0); + rxtune_st.resize(0); + txtune_st.resize(0); RadioInterface::close(); } @@ -148,6 +150,8 @@ mReceiveFIFO.resize(mChans); powerScaling.resize(mChans); history.resize(mChans); + rxtune_st.resize(mChans); + txtune_st.resize(mChans); active.resize(MCHANS, false); inchunk = RESAMP_INRATE * 4; @@ -362,42 +366,67 @@ return fabs(a - b) < FREQ_DELTA_LIMIT ? true : false; } +bool RadioInterfaceMulti::verify_arfcn_consistency(double freq, size_t chan, bool tx) +{ + double freq_i; + std::string str_dir = tx ? "Tx" : "Rx"; + std::vector &v = tx ? txtune_st : rxtune_st; + + for (size_t i = 0; i < mChans; i++) { + if (i == chan) + continue; + if (!v[i].set) + continue; + + freq_i = v[i].freq_hz + (double) ((int)chan - (int)i) * MCBTS_SPACING; + if (!fltcmp(freq, freq_i)) { + LOGCHAN(chan, DMAIN, ERROR) + << "Setting " << str_dir << " frequency " << freq + << " is incompatible: already configured channel " + << i << " uses frequency " << v[i].freq_hz + << " (expected " << freq_i << ")"; + return false; + } + } + v[chan].set = true; + v[chan].freq_hz = freq; + return true; +} + bool RadioInterfaceMulti::tuneTx(double freq, size_t chan) { - if (chan >= mChans) - return false; + double shift; - double shift = (double) getFreqShift(mChans); + if (chan >= mChans) + return false; - if (!chan) - return mDevice->setTxFreq(freq + shift * MCBTS_SPACING); + if (!verify_arfcn_consistency(freq, chan, true)) + return false; - double center = mDevice->getTxFreq(); - if (!fltcmp(freq, center + (double) (chan - shift) * MCBTS_SPACING)) { - LOG(NOTICE) << "Channel " << chan << " RF Tx frequency offset is " - << freq / 1e6 << " MHz"; - } + if (chan == 0) { + shift = (double) getFreqShift(mChans); + return mDevice->setTxFreq(freq + shift * MCBTS_SPACING); + } - return true; + return true; } bool RadioInterfaceMulti::tuneRx(double freq, size_t chan) { - if (chan >= mChans) - return false; + double shift; - double shift = (double) getFreqShift(mChans); + if (chan >= mChans) + return false; - if (!chan) - return mDevice->setRxFreq(freq + shift * MCBTS_SPACING); + if (!verify_arfcn_consistency(freq, chan, false)) + return false; - double center = mDevice->getRxFreq(); - if (!fltcmp(freq, center + (double) (chan - shift) * MCBTS_SPACING)) { - LOG(NOTICE) << "Channel " << chan << " RF Rx frequency offset is " - << freq / 1e6 << " MHz"; - } + if (chan == 0) { + shift = (double) getFreqShift(mChans); + return mDevice->setRxFreq(freq + shift * MCBTS_SPACING); + } - return true; + return true; } double RadioInterfaceMulti::setRxGain(double db, size_t chan) -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2f3d66a611d3a489b3e4d9431994f4ec77b4460f Gerrit-Change-Number: 16668 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 21 00:08:31 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 21 Dec 2019 00:08:31 +0000 Subject: Change in osmo-trx[master]: uhd: Introduce UHD log category and support UHD >=3.11 logging framework In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16665 ) Change subject: uhd: Introduce UHD log category and support UHD >=3.11 logging framework ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/16665/2/Transceiver52M/device/uhd/UHDDevice.cpp File Transceiver52M/device/uhd/UHDDevice.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/16665/2/Transceiver52M/device/uhd/UHDDevice.cpp at 452 PS2, Line 452: USE_UHD_3_11 Shouldn't we do this once in a separate __constructor__ function? -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I36f1ff7d425a2144fb512ff393af02741eb4a3d4 Gerrit-Change-Number: 16665 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sat, 21 Dec 2019 00:08:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 21 00:09:28 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 21 Dec 2019 00:09:28 +0000 Subject: Change in osmo-trx[master]: uhd: Improve some logging lines printing UHD pretty-print output In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16666 ) Change subject: uhd: Improve some logging lines printing UHD pretty-print output ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: If5aba28aaf8a3312d89b3e963184f9f20966d199 Gerrit-Change-Number: 16666 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sat, 21 Dec 2019 00:09:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 21 00:10:40 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 21 Dec 2019 00:10:40 +0000 Subject: Change in osmo-trx[master]: doc: clarify number of channels on B210 with multi-arfcn enabled In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16667 ) Change subject: doc: clarify number of channels on B210 with multi-arfcn enabled ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/16667/1/doc/manuals/chapters/configuration.adoc File doc/manuals/chapters/configuration.adoc: https://gerrit.osmocom.org/c/osmo-trx/+/16667/1/doc/manuals/chapters/configuration.adoc at 49 PS1, Line 49: 2 more than TRX more than 2...? -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I082d4d8c346f1be1569fe63baa856029e439cb2c Gerrit-Change-Number: 16667 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Sat, 21 Dec 2019 00:10:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 21 00:16:07 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 21 Dec 2019 00:16:07 +0000 Subject: Change in osmo-trx[master]: radioInterfaceMulti: Fail to tune on freq not following multi-arfcn r... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16668 ) Change subject: radioInterfaceMulti: Fail to tune on freq not following multi-arfcn restrictions ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/16668/1/Transceiver52M/radioInterface.h File Transceiver52M/radioInterface.h: https://gerrit.osmocom.org/c/osmo-trx/+/16668/1/Transceiver52M/radioInterface.h at 175 PS1, Line 175: rxtune_st Cosmetic: how about 'rx_freq_state' and 'tx_freq_state'? Both 'rxtune' and 'txtune' are TRXC commands. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2f3d66a611d3a489b3e4d9431994f4ec77b4460f Gerrit-Change-Number: 16668 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Reviewer: ttsou Gerrit-Comment-Date: Sat, 21 Dec 2019 00:16:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Dec 21 08:50:30 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 21 Dec 2019 08:50:30 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Raspbian_9.0/armv7l In-Reply-To: References: Message-ID: <5dfddcdf46f02_8222aac4e6525f07128c7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Raspbian_9.0/armv7l Package network:osmocom:latest/osmo-remsim failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 593s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc' [ 593s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 593s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 593s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 593s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 593s] make[4]: Nothing to be done for 'install-exec-am'. [ 593s] /bin/mkdir -p '/usr/src/packages/BUILD/debian/tmp/usr/lib/arm-linux-gnueabihf/pkgconfig' [ 593s] /usr/bin/install -c -m 644 libosmo-rspro.pc '/usr/src/packages/BUILD/debian/tmp/usr/lib/arm-linux-gnueabihf/pkgconfig' [ 594s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 594s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 594s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 594s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 594s] dh_install -O--fail-missing [ 594s] dh_install: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 594s] dh_install: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 594s] dh_install: missing files, aborting [ 594s] debian/rules:12: recipe for target 'binary' failed [ 594s] make: *** [binary] Error 2 [ 594s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 594s] [ 594s] obs-arm-5 failed "build osmo-remsim_0.2.2.dsc" at Sat Dec 21 08:50:16 UTC 2019. [ 594s] [ 594s] ### VM INTERACTION START ### [ 597s] [ 569.591870] sysrq: SysRq : Power Off [ 597s] [ 569.595569] reboot: Power down [ 599s] ### VM INTERACTION END ### [ 599s] [ 599s] obs-arm-5 failed "build osmo-remsim_0.2.2.dsc" at Sat Dec 21 08:50:20 UTC 2019. [ 599s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 21 08:50:30 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 21 Dec 2019 08:50:30 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <5dfddcdfaf143_8222aac4e6525f0712956@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Raspbian_10/armv7l Package network:osmocom:latest/osmo-remsim failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 784s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 784s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 784s] dh_install -O--fail-missing [ 784s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 784s] dh_install: This feature will be removed in compat 12. [ 784s] dh_missing: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 784s] dh_missing: usr/lib/arm-linux-gnueabihf/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 785s] dh_missing: missing files, aborting [ 785s] The following debhelper tools have reported what they installed (with files per package) [ 785s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 785s] If the missing files are installed by another tool, please file a bug against it. [ 785s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 785s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 785s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 785s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 785s] For a short-term work-around: Add the files to debian/not-installed [ 785s] dh_install: dh_missing --fail-missing returned exit code 2 [ 785s] make: *** [debian/rules:12: binary] Error 25 [ 785s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 785s] [ 785s] armbuild15 failed "build osmo-remsim_0.2.2.dsc" at Sat Dec 21 08:50:20 UTC 2019. [ 785s] [ 785s] ### VM INTERACTION START ### [ 788s] [ 705.444041] sysrq: SysRq : Power Off [ 788s] [ 705.446212] reboot: Power down [ 788s] ### VM INTERACTION END ### [ 788s] [ 788s] armbuild15 failed "build osmo-remsim_0.2.2.dsc" at Sat Dec 21 08:50:24 UTC 2019. [ 788s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Dec 21 14:21:19 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 21 Dec 2019 14:21:19 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_dump.py: rewrite unit tests to use unittest framework References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16669 ) Change subject: trx_toolkit/data_dump.py: rewrite unit tests to use unittest framework ...................................................................... trx_toolkit/data_dump.py: rewrite unit tests to use unittest framework Change-Id: I8b934c15ba96d856aa79d10bf296d1446f043dd1 --- M src/target/trx_toolkit/data_dump.py A src/target/trx_toolkit/test_data_dump.py 2 files changed, 165 insertions(+), 145 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/69/16669/1 diff --git a/src/target/trx_toolkit/data_dump.py b/src/target/trx_toolkit/data_dump.py index b91408f..7c5452b 100644 --- a/src/target/trx_toolkit/data_dump.py +++ b/src/target/trx_toolkit/data_dump.py @@ -220,148 +220,3 @@ def append_all(self, msgs): for msg in msgs: self.append_msg(msg) - -# Regression tests -if __name__ == '__main__': - from tempfile import TemporaryFile - from gsm_shared import * - import random - - # Configure logging - log.basicConfig(level = log.DEBUG, - format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") - - # Create a temporary file - tf = TemporaryFile() - - # Create an instance of DATA dump manager - ddf = DATADumpFile(tf) - - # Generate two random bursts - burst_l12trx = [] - burst_trx2l1 = [] - - for i in range(0, GSM_BURST_LEN): - ubit = random.randint(0, 1) - burst_l12trx.append(ubit) - - sbit = random.randint(-127, 127) - burst_trx2l1.append(sbit) - - # Generate a basic list of random messages - log.info("Generating the reference messages") - messages_ref = [] - - for i in range(100): - # Create a message - if i % 2: - msg = DATAMSG_L12TRX() - msg.burst = burst_l12trx - else: - msg = DATAMSG_TRX2L1() - msg.burst = burst_trx2l1 - - # Randomize the header - msg.rand_hdr() - - # Append - messages_ref.append(msg) - - log.info("Adding the following messages to the capture:") - for msg in messages_ref[:3]: - log.info("%s: burst_len=%d" - % (msg.desc_hdr(), len(msg.burst))) - - # Check single message appending - ddf.append_msg(messages_ref[0]) - ddf.append_msg(messages_ref[1]) - ddf.append_msg(messages_ref[2]) - - # Read the written messages back - messages_check = ddf.parse_all() - - log.info("Read the following messages back:") - for msg in messages_check: - log.info("%s: burst_len=%d" - % (msg.desc_hdr(), len(msg.burst))) - - # Expecting three messages - assert(len(messages_check) == 3) - - # Check the messages - for i in range(3): - # Compare common header parts and bursts - assert(messages_check[i].burst == messages_ref[i].burst) - assert(messages_check[i].fn == messages_ref[i].fn) - assert(messages_check[i].tn == messages_ref[i].tn) - - # Validate a message - messages_check[i].validate() - - log.info("Check append_msg(): OK") - - - # Append the pending reference messages - ddf.append_all(messages_ref[3:]) - - # Read the written messages back - messages_check = ddf.parse_all() - - # Check the final amount - assert(len(messages_check) == len(messages_ref)) - - # Check the messages - for i in range(len(messages_check)): - # Compare common header parts and bursts - assert(messages_check[i].burst == messages_ref[i].burst) - assert(messages_check[i].fn == messages_ref[i].fn) - assert(messages_check[i].tn == messages_ref[i].tn) - - # Validate a message - messages_check[i].validate() - - log.info("Check append_all(): OK") - - - # Check parse_msg() - msg0 = ddf.parse_msg(0) - msg10 = ddf.parse_msg(10) - - # Make sure parsing was successful - assert(msg0 and msg10) - - # Compare common header parts and bursts - assert(msg0.burst == messages_ref[0].burst) - assert(msg0.fn == messages_ref[0].fn) - assert(msg0.tn == messages_ref[0].tn) - - assert(msg10.burst == messages_ref[10].burst) - assert(msg10.fn == messages_ref[10].fn) - assert(msg10.tn == messages_ref[10].tn) - - # Validate both messages - msg0.validate() - msg10.validate() - - log.info("Check parse_msg(): OK") - - - # Check parse_all() with range - messages_check = ddf.parse_all(skip = 10, count = 20) - - # Make sure parsing was successful - assert(messages_check) - - # Check the amount - assert(len(messages_check) == 20) - - for i in range(20): - # Compare common header parts and bursts - assert(messages_check[i].burst == messages_ref[i + 10].burst) - assert(messages_check[i].fn == messages_ref[i + 10].fn) - assert(messages_check[i].tn == messages_ref[i + 10].tn) - - # Validate a message - messages_check[i].validate() - - log.info("Check parse_all(): OK") diff --git a/src/target/trx_toolkit/test_data_dump.py b/src/target/trx_toolkit/test_data_dump.py new file mode 100644 index 0000000..2f7e25a --- /dev/null +++ b/src/target/trx_toolkit/test_data_dump.py @@ -0,0 +1,165 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +# TRX Toolkit +# Unit tests for DATA capture management +# +# (C) 2019 by Vadim Yanitskiy +# +# All Rights Reserved +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import unittest +import tempfile +import random + +from gsm_shared import * +from data_dump import * + +class DATADump_Test(unittest.TestCase): + def setUp(self): + # Create a temporary file + self._tf = tempfile.TemporaryFile(mode = 'w+b') + + # Create an instance of DATA dump manager + self._ddf = DATADumpFile(self._tf) + + # Compare message a with message b + def _compare_msg(self, a, b): + # Make sure we're comparing messages of the same type + self.assertEqual(a.__class__, b.__class__) + + # Compare common header fields + self.assertEqual(a.ver, b.ver) + self.assertEqual(a.fn, b.fn) + self.assertEqual(a.tn, b.tn) + + # Burst bits (if present) + self.assertEqual(a.burst, b.burst) + + # TRX2L1 specific fields + if isinstance(a, DATAMSG_L12TRX): + self.assertEqual(a.pwr, b.pwr) + + # L12TRX specific fields + if isinstance(a, DATAMSG_TRX2L1): + # Version independent fields + self.assertEqual(a.toa256, b.toa256) + self.assertEqual(a.rssi, b.rssi) + + # Version specific fields + if a.ver >= 1: + self.assertEqual(a.nope_ind, b.nope_ind) + self.assertEqual(a.mod_type, b.mod_type) + self.assertEqual(a.tsc_set, b.tsc_set) + self.assertEqual(a.tsc, b.tsc) + self.assertEqual(a.ci, b.ci) + + # Generate a random message of a given type / version + def _gen_rand_message(self, cls, ver = 1): + msg = cls(ver = ver) + msg.rand_hdr() + msg.rand_burst() + return msg + + # Generate a list of random messages + def _gen_rand_messages(self, cls, count, ver = 1): + msg_list = [] + + for i in range(count): + msg = self._gen_rand_message(cls, ver) + msg_list.append(msg) + + return msg_list + + # Generate a mixed list of random messages + def _gen_rand_message_mix(self, count, ver = 1): + msg_list = [] + msg_list += self._gen_rand_messages(DATAMSG_TRX2L1, count) + msg_list += self._gen_rand_messages(DATAMSG_L12TRX, count) + random.shuffle(msg_list) + return msg_list + + def _test_store_and_parse(self, cls): + msg_ref = self._gen_rand_message(cls) + self._ddf.append_msg(msg_ref) + + msg = self._ddf.parse_msg(0) + self._compare_msg(msg, msg_ref) + + # Store one TRX2L1 message in a file, read it back and compare + def test_store_and_parse_trx2l1(self): + self._test_store_and_parse(DATAMSG_TRX2L1) + + # Store one L12TRX message in a file, read it back and compare + def test_store_and_parse_l12trx(self): + self._test_store_and_parse(DATAMSG_L12TRX) + + # Store multiple TRX2L1/L12TRX messages in a file, read them back and compare + def test_store_and_parse_all(self): + # Store a mixed list of random messages (19 + 19) + msg_list_ref = self._gen_rand_message_mix(19) + self._ddf.append_all(msg_list_ref) + + # Retrieve and compare stored messages + msg_list = self._ddf.parse_all() + for i in range(len(msg_list_ref)): + self._compare_msg(msg_list[i], msg_list_ref[i]) + + # Verify random access to stored messages + def test_parse_msg_idx(self): + # Store a mixed list of random messages (19 + 19) + msg_list_ref = self._gen_rand_message_mix(19) + self._ddf.append_all(msg_list_ref) + + # Random access + for _ in range(100): + idx = random.randrange(len(msg_list_ref)) + msg = self._ddf.parse_msg(idx) + self._compare_msg(msg, msg_list_ref[idx]) + + def test_parse_empty(self): + with self.assertLogs(level = 'ERROR'): + idx = random.randrange(100) + msg = self._ddf.parse_msg(idx) + self.assertEqual(msg, False) + + def test_parse_all_empty(self): + msg_list = self._ddf.parse_all() + self.assertEqual(msg_list, []) + + def test_parse_len_overflow(self): + # Write a malformed message directly + self._tf.write(DATADump.TAG_L12TRX) + self._tf.write(b'\x00\x63') # 99 + self._tf.write(b'\xff' * 90) + + with self.assertLogs(level = 'ERROR'): + msg = self._ddf.parse_msg(0) + self.assertEqual(msg, None) + + def test_parse_unknown_tag(self): + # Write a malformed message directly + self._tf.write(b'\x33') + self._tf.write(b'\x00\x63') # 99 + self._tf.write(b'\xff' * 90) + + with self.assertLogs(level = 'ERROR'): + msg = self._ddf.parse_msg(0) + self.assertEqual(msg, None) + +if __name__ == '__main__': + unittest.main() -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8b934c15ba96d856aa79d10bf296d1446f043dd1 Gerrit-Change-Number: 16669 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 21 15:02:47 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 21 Dec 2019 15:02:47 +0000 Subject: Change in osmocom-bb[master]: contrib/jenkins.sh: also verify building the firmware References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16670 ) Change subject: contrib/jenkins.sh: also verify building the firmware ...................................................................... contrib/jenkins.sh: also verify building the firmware Change-Id: I4c224ef7855a2ac35476cbdd96c29565151a2830 --- M contrib/jenkins.sh 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/70/16670/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index a96dfeb..07a02c1 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -67,6 +67,10 @@ make maintainer-clean done +# Build the firmware (against the local copy of libosmocore) +cd "$base/src" +make firmware + # TRX Toolkit unit tests cd "$base/src/target/trx_toolkit" python3 -m unittest discover -v -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4c224ef7855a2ac35476cbdd96c29565151a2830 Gerrit-Change-Number: 16670 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 21 15:09:17 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 21 Dec 2019 15:09:17 +0000 Subject: Change in osmocom-bb[master]: contrib/jenkins.sh: also verify building the firmware In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/16670 to look at the new patch set (#2). Change subject: contrib/jenkins.sh: also verify building the firmware ...................................................................... contrib/jenkins.sh: also verify building the firmware Change-Id: I4c224ef7855a2ac35476cbdd96c29565151a2830 --- M contrib/jenkins.sh 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/70/16670/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4c224ef7855a2ac35476cbdd96c29565151a2830 Gerrit-Change-Number: 16670 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 21 15:09:17 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 21 Dec 2019 15:09:17 +0000 Subject: Change in osmocom-bb[master]: contrib/jenkins.sh: also run unit tests for TRX Toolkit In-Reply-To: References: Message-ID: Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/16567 to look at the new patch set (#4). Change subject: contrib/jenkins.sh: also run unit tests for TRX Toolkit ...................................................................... contrib/jenkins.sh: also run unit tests for TRX Toolkit Python's unittest module will automatically discover all unit tests in a given directory (files starting with 'test*.py'). The existing tests will be rewritten in subsequent changes. Change-Id: Ia3990dc8e1ff98b83d3ee25fafa5b029f46646cd --- M contrib/jenkins.sh 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/67/16567/4 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia3990dc8e1ff98b83d3ee25fafa5b029f46646cd Gerrit-Change-Number: 16567 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 22 00:41:31 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 22 Dec 2019 00:41:31 +0000 Subject: Change in osmo-trx[master]: uhd: Introduce UHD log category and support UHD >=3.11 logging framework In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16665 ) Change subject: uhd: Introduce UHD log category and support UHD >=3.11 logging framework ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/16665/2/Transceiver52M/device/uhd/UHDDevice.cpp File Transceiver52M/device/uhd/UHDDevice.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/16665/2/Transceiver52M/device/uhd/UHDDevice.cpp at 452 PS2, Line 452: USE_UHD_3_11 > Shouldn't we do this once in a separate __constructor__ function? open() is only called once during startup, and it's the first function called UHD related, so it's fine. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I36f1ff7d425a2144fb512ff393af02741eb4a3d4 Gerrit-Change-Number: 16665 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 22 Dec 2019 00:41:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 22 00:42:33 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 22 Dec 2019 00:42:33 +0000 Subject: Change in osmo-trx[master]: doc: clarify number of channels on B210 with multi-arfcn enabled In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16667 ) Change subject: doc: clarify number of channels on B210 with multi-arfcn enabled ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/16667/1/doc/manuals/chapters/configuration.adoc File doc/manuals/chapters/configuration.adoc: https://gerrit.osmocom.org/c/osmo-trx/+/16667/1/doc/manuals/chapters/configuration.adoc at 49 PS1, Line 49: 2 more than TRX > more than 2... [?] lol indeed, thanks. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I082d4d8c346f1be1569fe63baa856029e439cb2c Gerrit-Change-Number: 16667 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Sun, 22 Dec 2019 00:42:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 22 00:47:08 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 22 Dec 2019 00:47:08 +0000 Subject: Change in osmocom-bb[master]: contrib/jenkins.sh: also verify building the firmware In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16670 ) Change subject: contrib/jenkins.sh: also verify building the firmware ...................................................................... Patch Set 2: I think we should build against libosmocore master. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4c224ef7855a2ac35476cbdd96c29565151a2830 Gerrit-Change-Number: 16670 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Sun, 22 Dec 2019 00:47:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 22 00:48:04 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 22 Dec 2019 00:48:04 +0000 Subject: Change in osmocom-bb[master]: contrib/jenkins.sh: also run unit tests for TRX Toolkit In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16567 ) Change subject: contrib/jenkins.sh: also run unit tests for TRX Toolkit ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia3990dc8e1ff98b83d3ee25fafa5b029f46646cd Gerrit-Change-Number: 16567 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 22 Dec 2019 00:48:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 22 00:48:30 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 22 Dec 2019 00:48:30 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_dump.py: rewrite unit tests to use unittest framework In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16669 ) Change subject: trx_toolkit/data_dump.py: rewrite unit tests to use unittest framework ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8b934c15ba96d856aa79d10bf296d1446f043dd1 Gerrit-Change-Number: 16669 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 22 Dec 2019 00:48:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Dec 22 00:50:36 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 22 Dec 2019 00:50:36 +0000 Subject: Change in osmo-trx[master]: doc: clarify number of channels on B210 with multi-arfcn enabled In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/16667 to look at the new patch set (#2). Change subject: doc: clarify number of channels on B210 with multi-arfcn enabled ...................................................................... doc: clarify number of channels on B210 with multi-arfcn enabled Change-Id: I082d4d8c346f1be1569fe63baa856029e439cb2c --- M doc/manuals/chapters/configuration.adoc 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/67/16667/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I082d4d8c346f1be1569fe63baa856029e439cb2c Gerrit-Change-Number: 16667 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 04:19:05 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 23 Dec 2019 04:19:05 +0000 Subject: Change in osmocom-bb[master]: contrib/jenkins.sh: also verify building the firmware In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16670 ) Change subject: contrib/jenkins.sh: also verify building the firmware ...................................................................... Patch Set 2: > Patch Set 2: > > I think we should build against libosmocore master. Yes, we should in general. A while ago, Laf0rge did some tests, but after that nobody has tested this. For now we're still building against an old local copy, so I just want to be sure that nobody breaks building the firmware. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4c224ef7855a2ac35476cbdd96c29565151a2830 Gerrit-Change-Number: 16670 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 23 Dec 2019 04:19:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 06:49:08 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 23 Dec 2019 06:49:08 +0000 Subject: Change in osmocom-bb[master]: contrib/jenkins.sh: also verify building the firmware In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16670 ) Change subject: contrib/jenkins.sh: also verify building the firmware ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4c224ef7855a2ac35476cbdd96c29565151a2830 Gerrit-Change-Number: 16670 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 23 Dec 2019 06:49:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 10:39:58 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 23 Dec 2019 10:39:58 +0000 Subject: Change in meta-telephony[201705]: dahdi-linux: Fix build with poky pyro References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/meta-telephony/+/16671 ) Change subject: dahdi-linux: Fix build with poky pyro ...................................................................... dahdi-linux: Fix build with poky pyro bitbake/OE doesn't seem to like having PACKAGE_ARCH set to different values for different packages in the same recipe. When building ipk for dahdi-firmware (which was set to have different arch than the recipe), opkg-build cannot be found iduring do_package_ipk because PATH doesn't contain the machine-specific bin dir where opkg-build is copied (under recipe-sysroot-native). A possibility to keep dahdi-firmware allarch would be to split it into a separate .bb, but since the install process of firmware files is tightly coupled into the Makefile and arch-dependent binaries are used (such as objcopy), let's simply set it as MACHINE_ARCH, same as done for kernel modules. Kernel module packages are now suffixed with the kernel version in order to allow module packages from multiple kernel versions to co-exist on a target system. As a result, .ko files are not correctly installed into their respective kernel-module-* packages and hence those packages end up being empty and not created, and during image build it will fail because it cannot find the packages. Let's fix it by emptying KERNEL_MODULE_PACKAGE_SUFFIX as explained in yocto manual. Related: SYS#4760 Change-Id: I6b4802374194d0fb722d0c4fd8d6ed72cd468262 --- M recipes-isdn/dahdi-linux/dahdi-linux_2.10.2.bb 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/71/16671/1 diff --git a/recipes-isdn/dahdi-linux/dahdi-linux_2.10.2.bb b/recipes-isdn/dahdi-linux/dahdi-linux_2.10.2.bb index 122b819..6191338 100644 --- a/recipes-isdn/dahdi-linux/dahdi-linux_2.10.2.bb +++ b/recipes-isdn/dahdi-linux/dahdi-linux_2.10.2.bb @@ -132,9 +132,8 @@ kernel-module-xpd-fxs \ kernel-module-dahdi-vpmadt032-loader \ " - -PACKAGE_ARCH_dahdi-firmware = "all" PACKAGES =+ "dahdi-firmware ${DAHDI_KERNEL_MODULE}" +KERNEL_MODULE_PACKAGE_SUFFIX = "" FILES_${PN} = "${base_libdir}/modules/ ${sysconfdir}/udev/rules.d" FILES_dahdi-firmware = "${base_libdir}/firmware ${datadir}/dahdi ${libdir}/hotplug/firmware " -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I6b4802374194d0fb722d0c4fd8d6ed72cd468262 Gerrit-Change-Number: 16671 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 10:46:54 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 23 Dec 2019 10:46:54 +0000 Subject: Change in meta-telephony[201705]: dahdi-linux: Fix build with poky pyro In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16671 ) Change subject: dahdi-linux: Fix build with poky pyro ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I6b4802374194d0fb722d0c4fd8d6ed72cd468262 Gerrit-Change-Number: 16671 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 23 Dec 2019 10:46:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 13:11:06 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 23 Dec 2019 13:11:06 +0000 Subject: Change in osmo-pcu[master]: Allow Gb PAGING-PS without P-TMSI In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/16536 to look at the new patch set (#2). Change subject: Allow Gb PAGING-PS without P-TMSI ...................................................................... Allow Gb PAGING-PS without P-TMSI P-TMSI is optional IE, but IE is mandatory and hence always available. Since the encoding is actually a Mobile Identity, the IMSI is used in case P-TMSI is not available. Change-Id: I4dbf8db04e81f98352a42ce34a5d91326be9bfd1 --- M src/encoding.cpp M src/encoding.h M src/gprs_bssgp_pcu.cpp M src/gprs_rlcmac.cpp M src/gprs_rlcmac.h 5 files changed, 29 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/36/16536/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4dbf8db04e81f98352a42ce34a5d91326be9bfd1 Gerrit-Change-Number: 16536 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 13:11:08 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 23 Dec 2019 13:11:08 +0000 Subject: Change in osmo-pcu[master]: Split identity_lv param into mi+mi_len References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16673 ) Change subject: Split identity_lv param into mi+mi_len ...................................................................... Split identity_lv param into mi+mi_len It's not really needed to have those together in some function calls, and makes it more difficult to follow the code. Furthermore, new callers not having content already aligned (len+value) will be using these functions in forthcoming commits. Change-Id: Ifb9d3997bfb74b35366c3d1bc51ce458f19abf16 --- M src/bts.cpp M src/bts.h M src/pcu_l1_if.cpp M src/pdch.cpp M src/pdch.h 5 files changed, 11 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/73/16673/1 diff --git a/src/bts.cpp b/src/bts.cpp index f132c8c..b3b2f54 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -38,6 +38,7 @@ #include #include #include + #include #include #include #include @@ -354,7 +355,7 @@ m_pollController.expireTimedout(fn, max_delay); } -int BTS::add_paging(uint8_t chan_needed, uint8_t *identity_lv) +int BTS::add_paging(uint8_t chan_needed, const uint8_t *mi, uint8_t mi_len) { uint8_t l, trx, ts, any_tbf = 0; struct gprs_rlcmac_tbf *tbf; @@ -370,7 +371,7 @@ LOGP(DRLCMAC, LOGL_INFO, "Add RR paging: chan-needed=%d MI=%s\n", - chan_needed, osmo_hexdump(identity_lv + 1, identity_lv[0])); + chan_needed, osmo_mi_name(mi, mi_len)); /* collect slots to page * Mark slots for every TBF, but only mark one of it. @@ -414,7 +415,7 @@ for (ts = 0; ts < 8; ts++) { if ((slot_mask[trx] & (1 << ts))) { /* schedule */ - if (!m_bts.trx[trx].pdch[ts].add_paging(chan_needed, identity_lv)) + if (!m_bts.trx[trx].pdch[ts].add_paging(chan_needed, mi, mi_len)) return -ENOMEM; LOGP(DRLCMAC, LOGL_INFO, "Paging on PACCH of TRX=%d TS=%d\n", trx, ts); diff --git a/src/bts.h b/src/bts.h index 4df0d19..9824684 100644 --- a/src/bts.h +++ b/src/bts.h @@ -290,7 +290,7 @@ int current_frame_number() const; /** add paging to paging queue(s) */ - int add_paging(uint8_t chan_needed, uint8_t *identity_lv); + int add_paging(uint8_t chan_needed, const uint8_t *mi, uint8_t mi_len); gprs_rlcmac_dl_tbf *dl_tbf_by_poll_fn(uint32_t fn, uint8_t trx, uint8_t ts); gprs_rlcmac_ul_tbf *ul_tbf_by_poll_fn(uint32_t fn, uint8_t trx, uint8_t ts); diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 2c4fca2..b244ae3 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -649,8 +649,8 @@ return -EINVAL; } - return BTS::main_bts()->add_paging(pag_req->chan_needed, - pag_req->identity_lv); + return BTS::main_bts()->add_paging(pag_req->chan_needed, &pag_req->identity_lv[1], + pag_req->identity_lv[0]); } static int pcu_rx_susp_req(struct gsm_pcu_if_susp_req *susp_req) diff --git a/src/pdch.cpp b/src/pdch.cpp index beb2c13..7029047 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -251,14 +251,15 @@ return msg; } -bool gprs_rlcmac_pdch::add_paging(uint8_t chan_needed, uint8_t *identity_lv) +bool gprs_rlcmac_pdch::add_paging(uint8_t chan_needed, const uint8_t *mi, uint8_t mi_len) { struct gprs_rlcmac_paging *pag = talloc_zero(tall_pcu_ctx, struct gprs_rlcmac_paging); if (!pag) return false; pag->chan_needed = chan_needed; - memcpy(pag->identity_lv, identity_lv, identity_lv[0] + 1); + pag->identity_lv[0] = mi_len; + memcpy(&pag->identity_lv[1], mi, mi_len); llist_add(&pag->list, &paging_list); diff --git a/src/pdch.h b/src/pdch.h index d55f58e..821fb90 100644 --- a/src/pdch.h +++ b/src/pdch.h @@ -48,7 +48,7 @@ struct gprs_rlcmac_paging *dequeue_paging(); struct msgb *packet_paging_request(); - bool add_paging(uint8_t chan_needed, uint8_t *identity_lv); + bool add_paging(uint8_t chan_needed, const uint8_t *mi, uint8_t mi_len); void free_resources(); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16673 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ifb9d3997bfb74b35366c3d1bc51ce458f19abf16 Gerrit-Change-Number: 16673 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 13:11:06 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 23 Dec 2019 13:11:06 +0000 Subject: Change in osmo-pcu[master]: Support Gb PAGING-CS In-Reply-To: References: Message-ID: Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/16537 to look at the new patch set (#2). Change subject: Support Gb PAGING-CS ...................................................................... Support Gb PAGING-CS The paging is sent over PACCH towards MS with an active TBF. Related: OS#2406 Change-Id: I9501e02e1d7f6944497e724dbccb9a19c3f5221f --- M src/gprs_bssgp_pcu.cpp 1 file changed, 23 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/37/16537/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9501e02e1d7f6944497e724dbccb9a19c3f5221f Gerrit-Change-Number: 16537 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 13:11:08 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 23 Dec 2019 13:11:08 +0000 Subject: Change in osmo-pcu[master]: Pass paging group instead of imsi where later is not needed References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16672 ) Change subject: Pass paging group instead of imsi where later is not needed ...................................................................... Pass paging group instead of imsi where later is not needed Change-Id: Id0663a81f439f2d0b893b0d34f85a6db1927ef8e --- M src/bts.cpp M src/bts.h M src/gprs_bssgp_pcu.cpp M src/gprs_rlcmac.cpp M src/gprs_rlcmac.h M src/pcu_l1_if.cpp M src/pcu_l1_if.h M src/tbf.cpp M src/tbf_dl.cpp 9 files changed, 38 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/72/16672/1 diff --git a/src/bts.cpp b/src/bts.cpp index c8b6375..f132c8c 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -889,7 +889,7 @@ return 0; } -void BTS::snd_dl_ass(gprs_rlcmac_tbf *tbf, bool poll, const char *imsi) +void BTS::snd_dl_ass(gprs_rlcmac_tbf *tbf, bool poll, const char pgroup[PAGING_GROUP_LEN]) { int plen; unsigned int ts = tbf->first_ts; @@ -909,7 +909,7 @@ GSM_L1_BURST_TYPE_ACCESS_0); if (plen >= 0) { immediate_assignment_dl_tbf(); - pcu_l1if_tx_pch(immediate_assignment, plen, imsi); + pcu_l1if_tx_pch(immediate_assignment, plen, pgroup); } bitvec_free(immediate_assignment); diff --git a/src/bts.h b/src/bts.h index 7ef5a3f..4df0d19 100644 --- a/src/bts.h +++ b/src/bts.h @@ -306,7 +306,7 @@ enum ph_burst_type burst_type); int rcv_ptcch_rach(uint8_t trx_nr, uint8_t ts_nr, uint32_t fn, int16_t qta); - void snd_dl_ass(gprs_rlcmac_tbf *tbf, bool poll, const char *imsi); + void snd_dl_ass(gprs_rlcmac_tbf *tbf, bool poll, const char pgroup[PAGING_GROUP_LEN]); GprsMsStorage &ms_store(); GprsMs *ms_by_tlli(uint32_t tlli, uint32_t old_tlli = 0); diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp index 8ce1342..de7c1bf 100644 --- a/src/gprs_bssgp_pcu.cpp +++ b/src/gprs_bssgp_pcu.cpp @@ -173,7 +173,7 @@ static int gprs_bssgp_pcu_rx_paging_ps(struct msgb *msg, struct tlv_parsed *tp) { - char imsi[16]; + char imsi[16], pgroup[PAGING_GROUP_LEN]; uint8_t *ptmsi = (uint8_t *) TLVP_VAL(tp, BSSGP_IE_TMSI); uint16_t ptmsi_len = TLVP_LEN(tp, BSSGP_IE_TMSI); int rc; @@ -197,8 +197,13 @@ LOGP(DBSSGP, LOGL_NOTICE, "Failed to parse IMSI IE (rc=%d)\n", rc); return bssgp_tx_status(BSSGP_CAUSE_COND_IE_ERR, NULL, msg); } + rc = imsi2paging_group(imsi, pgroup); + if (rc < 0) { + LOGP(DBSSGP, LOGL_NOTICE, "Failed to get IMSI %s paging group\n", imsi); + return bssgp_tx_status(BSSGP_CAUSE_COND_IE_ERR, NULL, msg); + } - return gprs_rlcmac_paging_request(ptmsi, ptmsi_len, imsi); + return gprs_rlcmac_paging_request(ptmsi, ptmsi_len, pgroup); } /* Receive a BSSGP PDU from a BSS on a PTP BVCI */ diff --git a/src/gprs_rlcmac.cpp b/src/gprs_rlcmac.cpp index e381b11..994a32c 100644 --- a/src/gprs_rlcmac.cpp +++ b/src/gprs_rlcmac.cpp @@ -29,13 +29,13 @@ extern void *tall_pcu_ctx; int gprs_rlcmac_paging_request(uint8_t *ptmsi, uint16_t ptmsi_len, - const char *imsi) + const char pgroup[PAGING_GROUP_LEN]) { LOGP(DRLCMAC, LOGL_NOTICE, "TX: [PCU -> BTS] Paging Request (CCCH)\n"); bitvec *paging_request = bitvec_alloc(22, tall_pcu_ctx); bitvec_unhex(paging_request, DUMMY_VEC); int plen = Encoding::write_paging_request(paging_request, ptmsi, ptmsi_len); - pcu_l1if_tx_pch(paging_request, plen, (char *)imsi); + pcu_l1if_tx_pch(paging_request, plen, pgroup); bitvec_free(paging_request); return 0; diff --git a/src/gprs_rlcmac.h b/src/gprs_rlcmac.h index 5361a1c..5248ef0 100644 --- a/src/gprs_rlcmac.h +++ b/src/gprs_rlcmac.h @@ -26,6 +26,7 @@ #ifdef __cplusplus #include #include +#include extern "C" { #include @@ -92,8 +93,7 @@ int gprs_rlcmac_tx_ul_ud(gprs_rlcmac_tbf *tbf); -int gprs_rlcmac_paging_request(uint8_t *ptmsi, uint16_t ptmsi_len, - const char *imsi); +int gprs_rlcmac_paging_request(uint8_t *ptmsi, uint16_t ptmsi_len, const char pgroup[PAGING_GROUP_LEN]); struct msgb *gprs_rlcmac_app_info_msg(const struct gsm_pcu_if_app_info_req *req); diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 98e697d..2c4fca2 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -60,6 +60,17 @@ extern void *tall_pcu_ctx; +int imsi2paging_group(const char* imsi, char pgroup[PAGING_GROUP_LEN]) +{ + size_t len = strlen(imsi); + + if (!imsi || len < PAGING_GROUP_LEN) + return -1; + imsi += len - PAGING_GROUP_LEN; + memcpy(pgroup, imsi, PAGING_GROUP_LEN); + return 0; +} + /* * PCU messages */ @@ -218,19 +229,13 @@ pcu_tx_data_req(0, 0, PCU_IF_SAPI_AGCH, 0, 0, 0, data, GSM_MACBLOCK_LEN); } -#define PAGING_GROUP_LEN 3 -void pcu_l1if_tx_pch(bitvec * block, int plen, const char *imsi) +void pcu_l1if_tx_pch(bitvec * block, int plen, const char pgroup[PAGING_GROUP_LEN]) { struct gprs_rlcmac_bts *bts = bts_main_data(); uint8_t data[PAGING_GROUP_LEN + GSM_MACBLOCK_LEN]; /* prepend paging group */ - if (!imsi || strlen(imsi) < PAGING_GROUP_LEN) - return; - imsi += strlen(imsi) - PAGING_GROUP_LEN; - data[0] = imsi[0]; - data[1] = imsi[1]; - data[2] = imsi[2]; + memcpy(data, pgroup, PAGING_GROUP_LEN); /* block provided by upper layer comes without first byte (plen), * prepend it manually: diff --git a/src/pcu_l1_if.h b/src/pcu_l1_if.h index a77a6c8..71d39bd 100644 --- a/src/pcu_l1_if.h +++ b/src/pcu_l1_if.h @@ -34,6 +34,8 @@ } #endif +#define PAGING_GROUP_LEN 3 + static inline uint8_t qta2ta(int16_t qta) { if (qta < 0) @@ -152,14 +154,14 @@ }; #ifdef __cplusplus -void pcu_l1if_tx_pdtch(msgb *msg, uint8_t trx, uint8_t ts, uint16_t arfcn, +void pcu_l1if_tx_pdtch(msgb *msg, uint8_t trx, uint8_t ts, uint16_t arfcn, uint32_t fn, uint8_t block_nr); void pcu_l1if_tx_ptcch(uint8_t trx, uint8_t ts, uint16_t arfcn, uint32_t fn, uint8_t block_nr, uint8_t *data, size_t data_len); void pcu_l1if_tx_agch(bitvec * block, int len); -void pcu_l1if_tx_pch(bitvec * block, int plen, const char *imsi); +void pcu_l1if_tx_pch(bitvec * block, int plen, const char pgroup[PAGING_GROUP_LEN]); int pcu_tx_txt_ind(enum gsm_pcu_if_text_type t, const char *fmt, ...); @@ -184,7 +186,7 @@ void pcu_rx_block_time(uint16_t arfcn, uint32_t fn, uint8_t ts_no); void pcu_rx_ra_time(uint16_t arfcn, uint32_t fn, uint8_t ts_no); - +int imsi2paging_group(const char* imsi, char pgroup[PAGING_GROUP_LEN]); #ifdef __cplusplus } #endif diff --git a/src/tbf.cpp b/src/tbf.cpp index 389b186..006b222 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -803,6 +803,7 @@ void gprs_rlcmac_tbf::poll_timeout() { + char pgroup[PAGING_GROUP_LEN]; gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf(this); LOGPTBF(this, LOGL_NOTICE, "poll timeout for FN=%d, TS=%d (curr FN %d)\n", @@ -902,7 +903,8 @@ LOGPTBF(dl_tbf, LOGL_DEBUG, "Re-send dowlink assignment on PCH (IMSI=%s)\n", imsi()); /* send immediate assignment */ - dl_tbf->bts->snd_dl_ass(dl_tbf, false, imsi()); + imsi2paging_group(imsi(), pgroup); + dl_tbf->bts->snd_dl_ass(dl_tbf, false, pgroup); dl_tbf->m_wait_confirm = 1; } } else diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index e3c1ff4..cdf6c0d 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -507,6 +507,7 @@ /* depending on the current TBF, we assign on PACCH or AGCH */ void gprs_rlcmac_dl_tbf::trigger_ass(struct gprs_rlcmac_tbf *old_tbf) { + char pgroup[PAGING_GROUP_LEN]; /* stop pending timer */ stop_timers("assignment (DL-TBF)"); @@ -530,7 +531,8 @@ TBF_SET_ASS_ON(this, GPRS_RLCMAC_FLAG_CCCH, false); /* send immediate assignment */ - bts->snd_dl_ass(this, false, imsi()); + imsi2paging_group(imsi(), pgroup); + bts->snd_dl_ass(this, false, pgroup); m_wait_confirm = 1; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id0663a81f439f2d0b893b0d34f85a6db1927ef8e Gerrit-Change-Number: 16672 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 13:38:44 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 23 Dec 2019 13:38:44 +0000 Subject: Change in osmo-pcu[master]: Log BVCI PTP value upon msg recv References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16674 ) Change subject: Log BVCI PTP value upon msg recv ...................................................................... Log BVCI PTP value upon msg recv Change-Id: I47c5902112d568cd5a48e003010d8085b02d64e8 --- M src/gprs_bssgp_pcu.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/74/16674/1 diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp index 2c2735b..66a5f74 100644 --- a/src/gprs_bssgp_pcu.cpp +++ b/src/gprs_bssgp_pcu.cpp @@ -467,7 +467,7 @@ } else { - LOGP(DBSSGP, LOGL_DEBUG, "rx BVCI_PTP gprs_bssgp_rx_ptp\n"); + LOGP(DBSSGP, LOGL_DEBUG, "rx BVCI_PTP=%d gprs_bssgp_rx_ptp\n", ns_bvci); rc = gprs_bssgp_pcu_rx_ptp(msg, &tp, bctx); } return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I47c5902112d568cd5a48e003010d8085b02d64e8 Gerrit-Change-Number: 16674 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 13:39:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 23 Dec 2019 13:39:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce tests for CS and PS paging from SGSN/Gb In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16528 ) Change subject: pcu: Introduce tests for CS and PS paging from SGSN/Gb ...................................................................... Patch Set 4: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16528 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90b5a792c1d91e38ea7b8c060ff0b459673df951 Gerrit-Change-Number: 16528 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 23 Dec 2019 13:39:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 13:43:02 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 23 Dec 2019 13:43:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce tests for CS and PS paging from SGSN/Gb In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16528 ) Change subject: pcu: Introduce tests for CS and PS paging from SGSN/Gb ...................................................................... Patch Set 4: (2 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16528/2/library/GSM_RR_Types.ttcn File library/GSM_RR_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16528/2/library/GSM_RR_Types.ttcn at 924 PS2, Line 924: omit > Rather add a second argument to the template (or use '*'). That's fine for now, it's what we expect. If someones needs more later they can extend it. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16528/2/library/Osmocom_Gb_Types.ttcn File library/Osmocom_Gb_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16528/2/library/Osmocom_Gb_Types.ttcn at 1235 PS2, Line 1235: BssgpBvci > template BssgpBvci ... No template around here uses template for bvci, since usually you either want to check against a PTP or signalling bvci afaiu. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16528 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90b5a792c1d91e38ea7b8c060ff0b459673df951 Gerrit-Change-Number: 16528 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 23 Dec 2019 13:43:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 13:51:10 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 23 Dec 2019 13:51:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce tests for CS and PS paging from SGSN/Gb In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16528 to look at the new patch set (#5). Change subject: pcu: Introduce tests for CS and PS paging from SGSN/Gb ...................................................................... pcu: Introduce tests for CS and PS paging from SGSN/Gb CS Gb paging and PTP CS/PS paging implemented in osmo-pcu: I9501e02e1d7f6944497e724dbccb9a19c3f5221f I5c52b5af740460c48bb3ba858243b1d20e624268 Related: OS#3927, OS#2406 Change-Id: I90b5a792c1d91e38ea7b8c060ff0b459673df951 --- M library/GSM_RR_Types.ttcn M library/Osmocom_Gb_Types.ttcn M pcu/PCU_Tests_RAW.ttcn 3 files changed, 171 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/28/16528/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16528 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90b5a792c1d91e38ea7b8c060ff0b459673df951 Gerrit-Change-Number: 16528 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 13:51:11 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 23 Dec 2019 13:51:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Pass correct fn to ts_PCUIF_DATA_CNF References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16675 ) Change subject: pcu: Pass correct fn to ts_PCUIF_DATA_CNF ...................................................................... pcu: Pass correct fn to ts_PCUIF_DATA_CNF Change-Id: I68fc0e3dba2cdadbe479017f31868f6dd0dabe9f --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/16675/1 diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index ff609fe..c800d43 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -735,7 +735,7 @@ mtc.stop; } BTS.send(ts_PCUIF_DATA_CNF(bts_nr := 0, trx_nr := 0, ts_nr := 0, block_nr := 0, - fn := 0, arfcn := 871, sapi := PCU_IF_SAPI_PCH, data := macblock)); + fn := pcu_msg.u.data_req.fn, arfcn := 871, sapi := PCU_IF_SAPI_PCH, data := macblock)); } /* Expect a Paging Request Type 1 from PCU on PCUIF on specified sapi. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I68fc0e3dba2cdadbe479017f31868f6dd0dabe9f Gerrit-Change-Number: 16675 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:06:29 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 23 Dec 2019 17:06:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Pass correct fn to ts_PCUIF_DATA_CNF In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16675 ) Change subject: pcu: Pass correct fn to ts_PCUIF_DATA_CNF ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I68fc0e3dba2cdadbe479017f31868f6dd0dabe9f Gerrit-Change-Number: 16675 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 23 Dec 2019 17:06:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:06:19 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 23 Dec 2019 17:06:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce tests for CS and PS paging from SGSN/Gb In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16528 ) Change subject: pcu: Introduce tests for CS and PS paging from SGSN/Gb ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16528 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90b5a792c1d91e38ea7b8c060ff0b459673df951 Gerrit-Change-Number: 16528 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 23 Dec 2019 17:06:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:08:47 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 23 Dec 2019 17:08:47 +0000 Subject: Change in osmo-pcu[master]: Pass paging group instead of imsi where later is not needed In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16672 ) Change subject: Pass paging group instead of imsi where later is not needed ...................................................................... Patch Set 1: it's a bit weird to me that we neither pass a NUL-terminated string, nor do we simply pass an integer. The paging group is an integer in the range 0..999 which is computed from the three final digits of the IMSI. Yes, it can be done this way, but I think it's not very elegant, and easy to introdcue errors if you're passing arrays of characters without zero-termination. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id0663a81f439f2d0b893b0d34f85a6db1927ef8e Gerrit-Change-Number: 16672 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 23 Dec 2019 17:08:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:09:26 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 23 Dec 2019 17:09:26 +0000 Subject: Change in osmo-pcu[master]: Allow Gb PAGING-PS without P-TMSI In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16536 ) Change subject: Allow Gb PAGING-PS without P-TMSI ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4dbf8db04e81f98352a42ce34a5d91326be9bfd1 Gerrit-Change-Number: 16536 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 23 Dec 2019 17:09:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:10:00 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 23 Dec 2019 17:10:00 +0000 Subject: Change in osmo-pcu[master]: Split identity_lv param into mi+mi_len In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16673 ) Change subject: Split identity_lv param into mi+mi_len ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16673 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ifb9d3997bfb74b35366c3d1bc51ce458f19abf16 Gerrit-Change-Number: 16673 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 23 Dec 2019 17:10:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:10:26 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 23 Dec 2019 17:10:26 +0000 Subject: Change in osmo-pcu[master]: Support Gb PAGING-CS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16537 ) Change subject: Support Gb PAGING-CS ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9501e02e1d7f6944497e724dbccb9a19c3f5221f Gerrit-Change-Number: 16537 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 23 Dec 2019 17:10:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:10:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 23 Dec 2019 17:10:39 +0000 Subject: Change in osmo-pcu[master]: Log BVCI PTP value upon msg recv In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16674 ) Change subject: Log BVCI PTP value upon msg recv ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I47c5902112d568cd5a48e003010d8085b02d64e8 Gerrit-Change-Number: 16674 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 23 Dec 2019 17:10:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:11:01 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 23 Dec 2019 17:11:01 +0000 Subject: Change in meta-telephony[201705]: dahdi-linux: Fix build with poky pyro In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16671 ) Change subject: dahdi-linux: Fix build with poky pyro ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I6b4802374194d0fb722d0c4fd8d6ed72cd468262 Gerrit-Change-Number: 16671 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 23 Dec 2019 17:11:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:11:03 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 23 Dec 2019 17:11:03 +0000 Subject: Change in meta-telephony[201705]: dahdi-linux: Fix build with poky pyro In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16671 ) Change subject: dahdi-linux: Fix build with poky pyro ...................................................................... dahdi-linux: Fix build with poky pyro bitbake/OE doesn't seem to like having PACKAGE_ARCH set to different values for different packages in the same recipe. When building ipk for dahdi-firmware (which was set to have different arch than the recipe), opkg-build cannot be found iduring do_package_ipk because PATH doesn't contain the machine-specific bin dir where opkg-build is copied (under recipe-sysroot-native). A possibility to keep dahdi-firmware allarch would be to split it into a separate .bb, but since the install process of firmware files is tightly coupled into the Makefile and arch-dependent binaries are used (such as objcopy), let's simply set it as MACHINE_ARCH, same as done for kernel modules. Kernel module packages are now suffixed with the kernel version in order to allow module packages from multiple kernel versions to co-exist on a target system. As a result, .ko files are not correctly installed into their respective kernel-module-* packages and hence those packages end up being empty and not created, and during image build it will fail because it cannot find the packages. Let's fix it by emptying KERNEL_MODULE_PACKAGE_SUFFIX as explained in yocto manual. Related: SYS#4760 Change-Id: I6b4802374194d0fb722d0c4fd8d6ed72cd468262 --- M recipes-isdn/dahdi-linux/dahdi-linux_2.10.2.bb 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: pespin: Verified laforge: Looks good to me, approved diff --git a/recipes-isdn/dahdi-linux/dahdi-linux_2.10.2.bb b/recipes-isdn/dahdi-linux/dahdi-linux_2.10.2.bb index 122b819..6191338 100644 --- a/recipes-isdn/dahdi-linux/dahdi-linux_2.10.2.bb +++ b/recipes-isdn/dahdi-linux/dahdi-linux_2.10.2.bb @@ -132,9 +132,8 @@ kernel-module-xpd-fxs \ kernel-module-dahdi-vpmadt032-loader \ " - -PACKAGE_ARCH_dahdi-firmware = "all" PACKAGES =+ "dahdi-firmware ${DAHDI_KERNEL_MODULE}" +KERNEL_MODULE_PACKAGE_SUFFIX = "" FILES_${PN} = "${base_libdir}/modules/ ${sysconfdir}/udev/rules.d" FILES_dahdi-firmware = "${base_libdir}/firmware ${datadir}/dahdi ${libdir}/hotplug/firmware " -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I6b4802374194d0fb722d0c4fd8d6ed72cd468262 Gerrit-Change-Number: 16671 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:11:24 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 23 Dec 2019 17:11:24 +0000 Subject: Change in osmo-trx[master]: uhd: use value already cached in tmp variable In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16656 ) Change subject: uhd: use value already cached in tmp variable ...................................................................... uhd: use value already cached in tmp variable Change-Id: I4568eaed6db3da12f83f2f503a50032f7bfb482c --- M Transceiver52M/device/uhd/UHDDevice.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index 604bb44..59eb8a7 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -742,7 +742,7 @@ for (size_t i = 0; i < rx_buffers.size(); i++) { rc = rx_buffers[i]->write((short *) &pkt_bufs[i].front(), num_smpls, - metadata.time_spec.to_ticks(rx_rate)); + ts.to_ticks(rx_rate)); // Continue on local overrun, exit on other errors if ((rc < 0)) { -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4568eaed6db3da12f83f2f503a50032f7bfb482c Gerrit-Change-Number: 16656 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:11:22 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 23 Dec 2019 17:11:22 +0000 Subject: Change in osmo-trx[master]: uhd: use value already cached in tmp variable In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16656 ) Change subject: uhd: use value already cached in tmp variable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4568eaed6db3da12f83f2f503a50032f7bfb482c Gerrit-Change-Number: 16656 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 23 Dec 2019 17:11:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:11:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 23 Dec 2019 17:11:59 +0000 Subject: Change in osmo-trx[master]: Transceiver.cpp: Introduce and use new logging categories In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16659 ) Change subject: Transceiver.cpp: Introduce and use new logging categories ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ic8c218f050f35d48046ccf1561fb0bfc505d4f63 Gerrit-Change-Number: 16659 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 23 Dec 2019 17:11:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:13:10 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 23 Dec 2019 17:13:10 +0000 Subject: Change in osmo-trx[master]: uhd: Introduce UHD log category and support UHD >=3.11 logging framework In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16665 ) Change subject: uhd: Introduce UHD log category and support UHD >=3.11 logging framework ...................................................................... Patch Set 2: does that mean that we will have a separate logging category for every driver? I would prefer something generci like GDRIVER, GSDR or whatever. Then other drivers like libusrp, limesuite, etc. can use the same category on other hardware. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I36f1ff7d425a2144fb512ff393af02741eb4a3d4 Gerrit-Change-Number: 16665 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 23 Dec 2019 17:13:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:13:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 23 Dec 2019 17:13:12 +0000 Subject: Change in osmo-trx[master]: Transceiver.cpp: Introduce and use new logging categories In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16659 ) Change subject: Transceiver.cpp: Introduce and use new logging categories ...................................................................... Transceiver.cpp: Introduce and use new logging categories Take the chance to clean up logging lines in this file: * Use LOGCHAN in more places where chan is useful * Replace inherited (old osmo-trx) categories such as WARNING with osmocom ones. Change-Id: Ic8c218f050f35d48046ccf1561fb0bfc505d4f63 --- M CommonLibs/debug.c M CommonLibs/debug.h M Transceiver52M/Transceiver.cpp 3 files changed, 56 insertions(+), 35 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/CommonLibs/debug.c b/CommonLibs/debug.c index 09dab2b..cc5be44 100644 --- a/CommonLibs/debug.c +++ b/CommonLibs/debug.c @@ -35,12 +35,30 @@ .color = NULL, .enabled = 1, .loglevel = LOGL_NOTICE, }, + [DTRXCLK] = { + .name = "DTRXCLK", + .description = "TRX Master Clock", + .color = NULL, + .enabled = 1, .loglevel = LOGL_NOTICE, + }, [DTRXCTRL] = { .name = "DTRXCTRL", .description = "TRX CTRL interface", .color = "\033[1;33m", .enabled = 1, .loglevel = LOGL_NOTICE, }, + [DTRXDDL] = { + .name = "DTRXDDL", + .description = "TRX Data interface Downlink", + .color = NULL, + .enabled = 1, .loglevel = LOGL_NOTICE, + }, + [DTRXDUL] = { + .name = "DTRXDUL", + .description = "TRX CTRL interface Uplink", + .color = NULL, + .enabled = 1, .loglevel = LOGL_NOTICE, + }, [DDEV] = { .name = "DDEV", .description = "Device/Driver specific code", diff --git a/CommonLibs/debug.h b/CommonLibs/debug.h index ad12bb8..3837329 100644 --- a/CommonLibs/debug.h +++ b/CommonLibs/debug.h @@ -10,7 +10,10 @@ /* Debug Areas of the code */ enum { DMAIN, + DTRXCLK, DTRXCTRL, + DTRXDDL, + DTRXDUL, DDEV, DLMS, }; diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 27049b9..dc218d7 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -180,12 +180,12 @@ int d_srcport, d_dstport, c_srcport, c_dstport; if (!mChans) { - LOG(ALERT) << "No channels assigned"; + LOG(FATAL) << "No channels assigned"; return false; } if (!sigProcLibSetup()) { - LOG(ALERT) << "Failed to initialize signal processing library"; + LOG(FATAL) << "Failed to initialize signal processing library"; return false; } @@ -285,7 +285,7 @@ mLatencyUpdateTime = time; if (!mRadioInterface->start()) { - LOG(ALERT) << "Device failed to start"; + LOG(FATAL) << "Device failed to start"; return false; } @@ -371,12 +371,12 @@ radioVector *radio_burst; if (chan >= mTxPriorityQueues.size()) { - LOG(ALERT) << "Invalid channel " << chan; + LOGCHAN(chan, DTRXDDL, FATAL) << "Invalid channel"; return; } if (wTime.TN() > 7) { - LOG(ALERT) << "Received burst with invalid slot " << wTime.TN(); + LOGCHAN(chan, DTRXDDL, FATAL) << "Received burst with invalid slot " << wTime.TN(); return; } @@ -419,7 +419,7 @@ state = &mStates[i]; while ((burst = mTxPriorityQueues[i].getStaleBurst(nowTime))) { - LOGCHAN(i, DMAIN, NOTICE) << "dumping STALE burst in TRX->SDR interface (" + LOGCHAN(i, DTRXDDL, NOTICE) << "dumping STALE burst in TRX->SDR interface (" << burst->getTime() <<" vs " << nowTime << "), retrans=" << state->mRetrans; if (state->mRetrans) updateFillerTable(i, burst); @@ -606,7 +606,7 @@ /* Blocking FIFO read */ radioVector *radio_burst = mReceiveFIFO[chan]->read(); if (!radio_burst) { - LOGCHAN(chan, DMAIN, ERROR) << "ReceiveFIFO->read() returned no burst"; + LOGCHAN(chan, DTRXDUL, ERROR) << "ReceiveFIFO->read() returned no burst"; return -EIO; } @@ -651,7 +651,7 @@ } if (max_i < 0) { - LOG(ALERT) << "Received empty burst"; + LOGCHAN(chan, DTRXDUL, FATAL) << "Received empty burst"; goto ret_idle; } @@ -678,9 +678,9 @@ rc = detectAnyBurst(*burst, mTSC, BURST_THRESH, mSPSRx, type, max_toa, &ebp); if (rc <= 0) { if (rc == -SIGERR_CLIP) - LOG(WARNING) << "Clipping detected on received RACH or Normal Burst"; + LOGCHAN(chan, DTRXDUL, NOTICE) << "Clipping detected on received RACH or Normal Burst"; else if (rc != SIGERR_NONE) - LOG(WARNING) << "Unhandled RACH or Normal Burst detection error"; + LOGCHAN(chan, DTRXDUL, NOTICE) << "Unhandled RACH or Normal Burst detection error"; goto ret_idle; } @@ -760,7 +760,7 @@ /* Attempt to read from control socket */ msgLen = read(mCtrlSockets[chan], buffer, MAX_PACKET_LENGTH); if (msgLen <= 0) { - LOGCHAN(chan, DTRXCTRL, WARNING) << "mCtrlSockets read(" << mCtrlSockets[chan] << ") failed: " << msgLen; + LOGCHAN(chan, DTRXCTRL, NOTICE) << "mCtrlSockets read(" << mCtrlSockets[chan] << ") failed: " << msgLen; return false; } @@ -769,7 +769,7 @@ /* Verify a command signature */ if (strncmp(buffer, "CMD ", 4)) { - LOGC(DTRXCTRL, WARNING) << "bogus message on control interface"; + LOGCHAN(chan, DTRXCTRL, NOTICE) << "bogus message on control interface"; return false; } @@ -854,7 +854,7 @@ sscanf(params, "%d", &freqKhz); mRxFreq = freqKhz * 1e3; if (!mRadioInterface->tuneRx(mRxFreq, chan)) { - LOGC(DTRXCTRL, ALERT) << "RX failed to tune"; + LOGCHAN(chan, DTRXCTRL, FATAL) << "RX failed to tune"; sprintf(response,"RSP RXTUNE 1 %d",freqKhz); } else @@ -865,7 +865,7 @@ sscanf(params, "%d", &freqKhz); mTxFreq = freqKhz * 1e3; if (!mRadioInterface->tuneTx(mTxFreq, chan)) { - LOGC(DTRXCTRL, ALERT) << "TX failed to tune"; + LOGCHAN(chan, DTRXCTRL, FATAL) << "TX failed to tune"; sprintf(response,"RSP TXTUNE 1 %d",freqKhz); } else @@ -887,7 +887,7 @@ int timeslot; sscanf(params, "%d %d", ×lot, &corrCode); if ((timeslot < 0) || (timeslot > 7)) { - LOGC(DTRXCTRL, WARNING) << "bogus message on control interface"; + LOGCHAN(chan, DTRXCTRL, NOTICE) << "bogus message on control interface"; sprintf(response,"RSP SETSLOT 1 %d %d",timeslot,corrCode); return true; } @@ -916,14 +916,14 @@ mWriteBurstToDiskMask = mask; sprintf(response,"RSP _SETBURSTTODISKMASK 0 %d",mask); } else { - LOGC(DTRXCTRL, WARNING) << "bogus command " << command << " on control interface."; + LOGCHAN(chan, DTRXCTRL, NOTICE) << "bogus command " << command << " on control interface."; sprintf(response,"RSP ERR 1"); } LOGCHAN(chan, DTRXCTRL, INFO) << "response is '" << response << "'"; msgLen = write(mCtrlSockets[chan], response, strlen(response) + 1); if (msgLen <= 0) { - LOGCHAN(chan, DTRXCTRL, WARNING) << "mCtrlSockets write(" << mCtrlSockets[chan] << ") failed: " << msgLen; + LOGCHAN(chan, DTRXCTRL, NOTICE) << "mCtrlSockets write(" << mCtrlSockets[chan] << ") failed: " << msgLen; return false; } return true; @@ -940,7 +940,7 @@ // check data socket msgLen = read(mDataSockets[chan], buffer, sizeof(buffer)); if (msgLen <= 0) { - LOGCHAN(chan, DTRXCTRL, WARNING) << "mDataSockets read(" << mCtrlSockets[chan] << ") failed: " << msgLen; + LOGCHAN(chan, DTRXDDL, NOTICE) << "mDataSockets read(" << mCtrlSockets[chan] << ") failed: " << msgLen; return false; } @@ -950,13 +950,13 @@ break; case sizeof(*dl) + EDGE_BURST_NBITS: /* EDGE burst */ if (mSPSTx != 4) { - LOG(ERR) << "EDGE burst received but SPS is set to " << mSPSTx; + LOGCHAN(chan, DTRXDDL, ERROR) << "EDGE burst received but SPS is set to " << mSPSTx; return false; } burstLen = EDGE_BURST_NBITS; break; default: - LOG(ERR) << "badly formatted packet on GSM->TRX interface (len="<< msgLen << ")"; + LOGCHAN(chan, DTRXDDL, ERROR) << "badly formatted packet on GSM->TRX interface (len="<< msgLen << ")"; return false; } @@ -972,13 +972,12 @@ case 1: break; default: - LOG(ERR) << "Rx TRXD message with unknown header version " << unsigned(dl->common.version); + LOGCHAN(chan, DTRXDDL, ERROR) << "Rx TRXD message with unknown header version " << unsigned(dl->common.version); return false; } - LOG(DEBUG) << "Rx TRXD message (hdr_ver=" << unsigned(dl->common.version) << "): " - << "fn=" << fn << ", tn=" << unsigned(dl->common.tn) << ", " - << "burst_len=" << burstLen; + LOGCHAN(chan, DTRXDDL, DEBUG) << "Rx TRXD message (hdr_ver=" << unsigned(dl->common.version) + << "): fn=" << fn << ", tn=" << unsigned(dl->common.tn) << ", burst_len=" << burstLen; BitVector newBurst(burstLen); BitVector::iterator itr = newBurst.begin(); @@ -1020,7 +1019,7 @@ else os << "-"; } - LOGCHAN(chan, DMAIN, DEBUG) << std::fixed << std::right + LOGCHAN(chan, DTRXDUL, DEBUG) << std::fixed << std::right << " time: " << unsigned(bi->tn) << ":" << bi->fn << " RSSI: " << std::setw(5) << std::setprecision(1) << (bi->rssi - rssiOffset) << "dBFS/" << std::setw(6) << -bi->rssi << "dBm" @@ -1038,7 +1037,7 @@ if ((rc = pullRadioVector(chan, &bi)) < 0) { if (rc == -ENOENT) { /* timeslot off, continue processing */ - LOGCHAN(chan, DMAIN, DEBUG) << unsigned(bi.tn) << ":" << bi.fn << " timeslot is off"; + LOGCHAN(chan, DTRXDUL, DEBUG) << unsigned(bi.tn) << ":" << bi.fn << " timeslot is off"; return true; } return false; /* other errors: we want to stop the process */ @@ -1075,7 +1074,7 @@ if (mOn) { //radioClock->wait(); // wait until clock updates - LOG(DEBUG) << "radio clock " << radioClock->get(); + LOGC(DTRXCLK, DEBUG) << "radio clock " << radioClock->get(); while (radioClock->get() + mTransmitLatency > mTransmitDeadlineClock) { // if underrun, then we're not providing bursts to radio/USRP fast // enough. Need to increase latency by one GSM frame. @@ -1084,8 +1083,9 @@ // only update latency at the defined frame interval if (radioClock->get() > mLatencyUpdateTime + GSM::Time(USB_LATENCY_INTRVL)) { mTransmitLatency = mTransmitLatency + GSM::Time(1,0); - LOG(INFO) << "new latency: " << mTransmitLatency << " (underrun " - << radioClock->get() << " vs " << mLatencyUpdateTime + GSM::Time(USB_LATENCY_INTRVL) << ")"; + LOGC(DTRXCLK, INFO) << "new latency: " << mTransmitLatency << " (underrun " + << radioClock->get() << " vs " + << mLatencyUpdateTime + GSM::Time(USB_LATENCY_INTRVL) << ")"; mLatencyUpdateTime = radioClock->get(); } } @@ -1095,7 +1095,7 @@ if (mTransmitLatency > mRadioInterface->minLatency()) { if (radioClock->get() > mLatencyUpdateTime + GSM::Time(216,0)) { mTransmitLatency.decTN(); - LOG(INFO) << "reduced latency: " << mTransmitLatency; + LOGC(DTRXCLK, INFO) << "reduced latency: " << mTransmitLatency; mLatencyUpdateTime = radioClock->get(); } } @@ -1119,11 +1119,11 @@ // FIXME -- This should be adaptive. sprintf(command,"IND CLOCK %llu",(unsigned long long) (mTransmitDeadlineClock.FN()+2)); - LOG(INFO) << "ClockInterface: sending " << command; + LOGC(DTRXCLK, INFO) << "sending " << command; msgLen = write(mClockSocket, command, strlen(command) + 1); if (msgLen <= 0) { - LOG(ERROR) << "mClockSocket write(" << mClockSocket << ") failed: " << msgLen; + LOGC(DTRXCLK, ERROR) << "mClockSocket write(" << mClockSocket << ") failed: " << msgLen; return false; } @@ -1144,7 +1144,7 @@ while (1) { if (!trx->driveReceiveFIFO(num)) { - LOGCHAN(num, DMAIN, FATAL) << "Something went wrong in thread " << thread_name << ", requesting stop"; + LOGCHAN(num, DTRXDUL, FATAL) << "Something went wrong in thread " << thread_name << ", requesting stop"; osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL); break; } @@ -1159,7 +1159,7 @@ while (1) { if (!transceiver->driveReceiveRadio()) { - LOG(FATAL) << "Something went wrong in thread RxLower, requesting stop"; + LOGC(DTRXDUL, FATAL) << "Something went wrong in thread RxLower, requesting stop"; osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL); break; } @@ -1214,7 +1214,7 @@ while (1) { if (!trx->driveTxPriorityQueue(num)) { - LOGCHAN(num, DMAIN, FATAL) << "Something went wrong in thread " << thread_name << ", requesting stop"; + LOGCHAN(num, DTRXDDL, FATAL) << "Something went wrong in thread " << thread_name << ", requesting stop"; osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL); break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ic8c218f050f35d48046ccf1561fb0bfc505d4f63 Gerrit-Change-Number: 16659 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:13:28 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 23 Dec 2019 17:13:28 +0000 Subject: Change in osmo-trx[master]: uhd: Improve some logging lines printing UHD pretty-print output In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16666 ) Change subject: uhd: Improve some logging lines printing UHD pretty-print output ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: If5aba28aaf8a3312d89b3e963184f9f20966d199 Gerrit-Change-Number: 16666 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 23 Dec 2019 17:13:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:13:54 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 23 Dec 2019 17:13:54 +0000 Subject: Change in osmo-trx[master]: doc: clarify number of channels on B210 with multi-arfcn enabled In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16667 ) Change subject: doc: clarify number of channels on B210 with multi-arfcn enabled ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I082d4d8c346f1be1569fe63baa856029e439cb2c Gerrit-Change-Number: 16667 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 23 Dec 2019 17:13:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:14:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 23 Dec 2019 17:14:43 +0000 Subject: Change in osmo-trx[master]: radioInterfaceMulti: Fail to tune on freq not following multi-arfcn r... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16668 ) Change subject: radioInterfaceMulti: Fail to tune on freq not following multi-arfcn restrictions ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2f3d66a611d3a489b3e4d9431994f4ec77b4460f Gerrit-Change-Number: 16668 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Reviewer: ttsou Gerrit-Comment-Date: Mon, 23 Dec 2019 17:14:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:15:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 23 Dec 2019 17:15:12 +0000 Subject: Change in pysim[master]: commands: fix __record_len() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16660 ) Change subject: commands: fix __record_len() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If810c691893c022e9e9d87218dd0a334c5b2d579 Gerrit-Change-Number: 16660 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 23 Dec 2019 17:15:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:15:14 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 23 Dec 2019 17:15:14 +0000 Subject: Change in pysim[master]: commands: fix __record_len() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/16660 ) Change subject: commands: fix __record_len() ...................................................................... commands: fix __record_len() When working with USIM/ISIMs, The method __record_len() that is used by the record_count() method returns the length of the file instead the actual record count. This causes record_count() to return always 1 Change-Id: If810c691893c022e9e9d87218dd0a334c5b2d579 --- M pySim/commands.py 1 file changed, 9 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/commands.py b/pySim/commands.py index 03540b6..f2bdf7a 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -30,8 +30,8 @@ self._cla_byte = "a0" self.sel_ctrl = "0000" - # Get file size from FCP - def __get_len_from_tlv(self, fcp): + # Extract a single FCP item from TLV + def __parse_fcp(self, fcp): # see also: ETSI TS 102 221, chapter 11.1.1.3.1 Response for MF, # DF or ADF from pytlv.TLV import TLV @@ -58,9 +58,7 @@ # Skip FCP tag and length tlv = fcp[skip:] - tlv_parsed = tlvparser.parse(tlv) - - return int(tlv_parsed['80'], 16) + return tlvparser.parse(tlv) # Tell the length of a record by the card response # USIMs respond with an FCP template, which is different @@ -69,7 +67,10 @@ # SIM: GSM 11.11, chapter 9.2.1 SELECT def __record_len(self, r): if self.sel_ctrl == "0004": - return self.__get_len_from_tlv(r[-1]) + tlv_parsed = self.__parse_fcp(r[-1]) + file_descriptor = tlv_parsed['82'] + # See also ETSI TS 102 221, chapter 11.1.1.4.3 File Descriptor + return int(file_descriptor[4:8], 16) else: return int(r[-1][28:30], 16) @@ -77,7 +78,8 @@ # above. def __len(self, r): if self.sel_ctrl == "0004": - return self.__get_len_from_tlv(r[-1]) + tlv_parsed = self.__parse_fcp(r[-1]) + return int(tlv_parsed['80'], 16) else: return int(r[-1][4:8], 16) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If810c691893c022e9e9d87218dd0a334c5b2d579 Gerrit-Change-Number: 16660 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:19:15 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 23 Dec 2019 17:19:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: tolerate empty measurement result on chan est. In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 ) Change subject: BTS_Tests: tolerate empty measurement result on chan est. ...................................................................... Patch Set 2: Code-Review-1 (1 comment) putting -1 related my comment as there are already two +1. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649/2/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649/2/bts/BTS_Tests.ttcn at 1788 PS2, Line 1788: [] RSL.receive(f_build_meas_res_tmpl_empty()) -> value rsl { how are we guarding this to prevent a situation where the MS is sending many empty measurement reports, even at a later time? shouldn't there be some kind of non-empty guard ([]) here ensuring that this clause can only be executed for the beginning (g_next_meas_res_nr < FOO) or so? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib2f511991349ab15e02db9c5e45f0df3645835a4 Gerrit-Change-Number: 16649 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 23 Dec 2019 17:19:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:20:24 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 23 Dec 2019 17:20:24 +0000 Subject: Change in osmo-trx[master]: uhd: Introduce UHD log category and support UHD >=3.11 logging framework In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16665 ) Change subject: uhd: Introduce UHD log category and support UHD >=3.11 logging framework ...................................................................... Patch Set 2: > Patch Set 2: > > does that mean that we will have a separate logging category for every driver? I would prefer something generci like GDRIVER, GSDR or whatever. Then other drivers like libusrp, limesuite, etc. can use the same category on other hardware. Yes I also thought about possibility of having some common category, but imho it's clearer from user point of view naming the category against the low level interface. If I see category UHD I immediately understand that's coming from UHD, same for LMS. But I don't have a strong opinion, so if you think it makes more sense to have a common one I could change it (we already have one for LMS anyway). -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I36f1ff7d425a2144fb512ff393af02741eb4a3d4 Gerrit-Change-Number: 16665 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 23 Dec 2019 17:20:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:21:04 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 23 Dec 2019 17:21:04 +0000 Subject: Change in libosmocore[master]: l1sap: add measurement related struct members In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15888 ) Change subject: l1sap: add measurement related struct members ...................................................................... Patch Set 5: ping? this has been pending for about a month now. There's still the very suspicious union in there... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c34b02d329f9df190c5035c396403ca0a4f9c42 Gerrit-Change-Number: 15888 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 23 Dec 2019 17:21:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:22:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 23 Dec 2019 17:22:30 +0000 Subject: Change in osmo-bts[master]: l1sap: is_fille_frame(): assert len of data compared In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16661 ) Change subject: l1sap: is_fille_frame(): assert len of data compared ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/16661/1/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/16661/1/src/common/l1sap.c at 463 PS1, Line 463: OSMO_ASSERT(len == GSM_MACBLOCK_LEN); wouldn't it be safer to simlpy return false if the length is not what we expect? Aren't there situations where a zero-length frame can be passed up l1sap (like if there are only measurements, but no user data)? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id3d1725ff36091ed5c57927caad09a8baea6f52e Gerrit-Change-Number: 16661 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 23 Dec 2019 17:22:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:23:55 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 23 Dec 2019 17:23:55 +0000 Subject: Change in osmo-pcu[master]: Pass paging group instead of imsi where later is not needed In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16672 ) Change subject: Pass paging group instead of imsi where later is not needed ...................................................................... Patch Set 1: so iiuc it makes sense to convert it to a uint16_t with atoi() or strtoul() and pass that all over right? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id0663a81f439f2d0b893b0d34f85a6db1927ef8e Gerrit-Change-Number: 16672 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 23 Dec 2019 17:23:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:26:39 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 23 Dec 2019 17:26:39 +0000 Subject: Change in osmo-bts[master]: l1sap: is_fille_frame(): assert len of data compared In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16661 ) Change subject: l1sap: is_fille_frame(): assert len of data compared ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/16661/1/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/16661/1/src/common/l1sap.c at 463 PS1, Line 463: OSMO_ASSERT(len == GSM_MACBLOCK_LEN); > wouldn't it be safer to simlpy return false if the length is not what we expect? Aren't there situa [?] zero length frame is checked in a condition before calling this function, but I can change it. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id3d1725ff36091ed5c57927caad09a8baea6f52e Gerrit-Change-Number: 16661 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 23 Dec 2019 17:26:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 23 17:28:14 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 23 Dec 2019 17:28:14 +0000 Subject: Change in osmo-bts[master]: l1sap: is_fille_frame(): verify len of data compared In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/16661 to look at the new patch set (#2). Change subject: l1sap: is_fille_frame(): verify len of data compared ...................................................................... l1sap: is_fille_frame(): verify len of data compared Change-Id: Id3d1725ff36091ed5c57927caad09a8baea6f52e --- M src/common/l1sap.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/61/16661/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id3d1725ff36091ed5c57927caad09a8baea6f52e Gerrit-Change-Number: 16661 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 24 12:03:34 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 24 Dec 2019 12:03:34 +0000 Subject: Change in osmo-pcu[master]: fix typo in log message References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16676 ) Change subject: fix typo in log message ...................................................................... fix typo in log message Change-Id: Ib6fc4625242d855193b62b561624b23b265648b9 --- M src/pdch.cpp M tests/tbf/TbfTest.err 2 files changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/76/16676/1 diff --git a/src/pdch.cpp b/src/pdch.cpp index 7029047..e15af2c 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -608,7 +608,7 @@ } /* set control ts to current MS's TS, until assignment complete */ - LOGPTBF(ul_tbf, LOGL_DEBUG, "change control TS %d -> %d until assinment is complete.\n", + LOGPTBF(ul_tbf, LOGL_DEBUG, "change control TS %d -> %d until assignment is complete.\n", ul_tbf->control_ts, ts_no); ul_tbf->control_ts = ts_no; diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 1adc8f7..63fd515 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -1546,7 +1546,7 @@ TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assinment is complete. +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) start Packet Uplink Assignment (PACCH) +++++++++++++++++++++++++ TX : Packet Uplink Assignment +++++++++++++++++++++++++ @@ -1628,7 +1628,7 @@ TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assinment is complete. +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) start Packet Uplink Assignment (PACCH) +++++++++++++++++++++++++ TX : Packet Uplink Assignment +++++++++++++++++++++++++ @@ -1758,7 +1758,7 @@ TBF(TFI=1 TLLI=0x00000000 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 Modifying MS object, UL TLLI: 0x00000000 -> 0xf5667788, not yet confirmed Modifying MS object, TLLI = 0xf5667788, TA 220 -> 7 -TBF(TFI=1 TLLI=0xf5667788 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assinment is complete. +TBF(TFI=1 TLLI=0xf5667788 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=1 TLLI=0xf5667788 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS Received RTS for PDCH: TRX=0 TS=7 FN=2654335 block_nr=11 scheduling USF=0 for required uplink resource of UL TFI=0 TBF(TFI=1 TLLI=0xf5667788 DIR=UL STATE=ASSIGN) start Packet Uplink Assignment (PACCH) @@ -1825,7 +1825,7 @@ TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assinment is complete. +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS MS (IMSI ): Link quality 12dB (old 12dB) left window [0, 0], modifying uplink CS level: CS-1 -> CS-2 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) start Packet Uplink Assignment (PACCH) @@ -1918,7 +1918,7 @@ TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=NULL) changes state from NULL to ASSIGN TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assinment is complete. +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS MS (IMSI 0011223344): Link quality 12dB (old 12dB) left window [0, 0], modifying uplink CS level: CS-3 -> CS-4 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) start Packet Uplink Assignment (PACCH) @@ -1997,7 +1997,7 @@ TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assinment is complete. +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS MS (IMSI ): Link quality 12dB (old 12dB) left window [0, 0], modifying uplink CS level: CS-1 -> CS-2 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) start Packet Uplink Assignment (PACCH) @@ -2148,7 +2148,7 @@ TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assinment is complete. +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS MS (IMSI ): Link quality 12dB (old 12dB) left window [0, 0], modifying uplink CS level: CS-1 -> CS-2 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN) start Packet Uplink Assignment (PACCH) @@ -3173,7 +3173,7 @@ TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assinment is complete. +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS max_cs_ul cannot be derived (current UL CS: UNKNOWN) TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) start Packet Uplink Assignment (PACCH) @@ -3265,7 +3265,7 @@ TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assinment is complete. +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS max_cs_ul cannot be derived (current UL CS: UNKNOWN) TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) start Packet Uplink Assignment (PACCH) @@ -5904,7 +5904,7 @@ TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assinment is complete. +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS max_cs_ul cannot be derived (current UL CS: UNKNOWN) TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) start Packet Uplink Assignment (PACCH) @@ -6069,7 +6069,7 @@ TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assinment is complete. +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS max_cs_ul cannot be derived (current UL CS: UNKNOWN) TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) start Packet Uplink Assignment (PACCH) @@ -6414,7 +6414,7 @@ TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=ASSIGN EGPRS) starting timer T3169 [allocation (UL-TBF)] with 5 sec. 0 microsec, cur_fn=0 Modifying MS object, UL TLLI: 0x00000000 -> 0xf1223344, not yet confirmed Modifying MS object, TLLI = 0xf1223344, TA 220 -> 7 -TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assinment is complete. +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) change control TS 7 -> 7 until assignment is complete. TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) changes UL ASS state from GPRS_RLCMAC_UL_ASS_NONE to GPRS_RLCMAC_UL_ASS_SEND_ASS max_cs_ul cannot be derived (current UL CS: UNKNOWN) TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=ASSIGN EGPRS) start Packet Uplink Assignment (PACCH) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib6fc4625242d855193b62b561624b23b265648b9 Gerrit-Change-Number: 16676 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 24 13:55:02 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 24 Dec 2019 13:55:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: WIP EGPRS References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16677 ) Change subject: pcu: WIP EGPRS ...................................................................... pcu: WIP EGPRS Change-Id: I3b36d20b5350c8011fd5b4cd2bb2eadd08b74823 --- M library/RLCMAC_CSN1_Types.ttcn M library/RLCMAC_Types.ttcn M pcu/PCU_Tests_RAW.ttcn 3 files changed, 204 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/77/16677/1 diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index ea2edf6..121d350 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -16,6 +16,7 @@ import from General_Types all; import from Osmocom_Types all; import from GSM_Types all; + import from MobileL3_GMM_SM_Types all; /* TS 44.060 11.2.0.1 */ type enumerated RlcmacDlCtrlMsgType { @@ -418,7 +419,7 @@ * (value part, see 3GPP TS 24.008, 10.5.5.12a) */ type union MSRadioAccCap2 { /* TODO: see table 10.5.146/3GPP TS 24.008 */ - bitstring other + MSRadioAccessCapabilityV msRadioAccessCapabilityV }; /* Table 11.2.16.2 Access Type */ @@ -510,6 +511,14 @@ uint16_t RlcOctetCount } with { variant "" }; + const ChannelReqDescription c_ChReqDesc_default := { + peak_tput_class := 0, + priority := 0, + rlc_mode := RLC_MODE_UNACKNOWLEDGED, + llc_pdu_type := LLC_PDU_IS_NOT_SACK_OR_ACK, + RlcOctetCount := 0 + } + /* 12.8 Frequency Parameters */ type record FreqIndirect { uint6_t maio, diff --git a/library/RLCMAC_Types.ttcn b/library/RLCMAC_Types.ttcn index 8f9f2a5..37956e8 100644 --- a/library/RLCMAC_Types.ttcn +++ b/library/RLCMAC_Types.ttcn @@ -13,6 +13,7 @@ import from General_Types all; import from Osmocom_Types all; import from GSM_Types all; + import from MobileL3_GMM_SM_Types all; import from RLCMAC_CSN1_Types all; /* TS 44.060 10.4.7 */ @@ -289,6 +290,43 @@ } } + /* TS 44.016 sec 11.2.16 */ + template RlcmacUlBlock ts_RLCMAC_PKT_RES_REQ(GprsTlli tlli, + MSRadioAccessCapabilityV ms_rac, + ChannelReqDescription ch_req_desc := c_ChReqDesc_default, + RlcAccessType acc_type := RLC_ACC_TYPE_TWO_PHASE) := { + ctrl := { + mac_hdr := { + payload_type := MAC_PT_RLCMAC_NO_OPT, + spare := '00000'B, + retry := false + }, + payload := { + msg_type := PACKET_RESOURCE_REQUEST, + u := { + resource_req := { + acc_type_presence := '1'B, + acc_type := acc_type, + id_type := '1'B, + id := { tlli := tlli }, + ms_rac2_presence := '1'B, + ms_rac2 := { msRadioAccessCapabilityV := ms_rac }, + ch_req_desc := ch_req_desc, + change_mark_presence := '0'B, + change_mark := omit, + C_val := '000000'B, + sign_var_presence := '0'B, + sign_var := omit, + I_levels := { + iNone, iNone, iNone, iNone, + iNone, iNone, iNone, iNone + } + } + } + } + } + } + /* Template for uplink Data block */ template RlcmacUlBlock t_RLCMAC_UL_DATA(template uint5_t tfi, template uint4_t cv, template uint7_t bsn, template LlcBlocks blocks := {}, template boolean stall := false) := { @@ -384,6 +422,31 @@ } } + template RlcmacDlBlock tr_RLCMAC_UL_PACKET_ASS(template uint3_t usf := ?) := { + ctrl := { + mac_hdr := { + payload_type := (MAC_PT_RLCMAC_NO_OPT, MAC_PT_RLCMAC_OPT), + rrbp:= ?, + rrbp_valid := ?, + usf := usf + }, + opt := *, + payload := { + msg_type := PACKET_UL_ASSIGNMENT, + u := { + ul_assignment := { + page_mode := ?, + persistence_levels_present := ?, + persistence_levels := *, + identity := ?, + is_egprs := ?, /* msg escape */ + gprs := * + } + } + } + } + } + /* Receive Template for Uplink ACK/NACK */ template RlcmacDlBlock tr_RLCMAC_UL_ACK_NACK(template uint5_t ul_tfi, template GprsTlli tlli := ?) := { ctrl := { diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index c800d43..16131f4 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -28,6 +28,7 @@ import from RLCMAC_Types all; import from MobileL3_CommonIE_Types all; +import from MobileL3_GMM_SM_Types all; import from L3_Templates all; import from NS_Types all; @@ -818,7 +819,7 @@ } } -private function f_rx_rlcmac_dl_block_exp_pkt_ass(out RlcmacDlBlock dl_block, out uint32_t poll_fn) +private function f_rx_rlcmac_dl_block_exp_pkt_dl_ass(out RlcmacDlBlock dl_block, out uint32_t poll_fn) runs on RAW_PCU_Test_CT { var uint32_t dl_fn; @@ -831,6 +832,19 @@ poll_fn := dl_fn + f_rrbp_fn_delay(dl_block.ctrl.mac_hdr.rrbp); } +private function f_rx_rlcmac_dl_block_exp_pkt_ul_ass(out RlcmacDlBlock dl_block, out uint32_t poll_fn) +runs on RAW_PCU_Test_CT { + var uint32_t dl_fn; + + f_rx_rlcmac_dl_block(dl_block, dl_fn); + if (not match(dl_block, tr_RLCMAC_UL_PACKET_ASS())) { + setverdict(fail, "Failed to match Packet Uplink Assignment"); + mtc.stop; + } + + poll_fn := dl_fn + f_rrbp_fn_delay(dl_block.ctrl.mac_hdr.rrbp); +} + private function f_rx_rlcmac_dl_block_exp_pkt_pag_req(out RlcmacDlBlock dl_block) runs on RAW_PCU_Test_CT { var uint32_t dl_fn; @@ -1492,7 +1506,7 @@ (T3192 in MS) was started and until it fires the MS will be abailable on PDCH in case new data arrives from SGSN. Let's verify it: */ BSSGP[0].send(ts_BSSGP_DL_UD(tlli, data)); - f_rx_rlcmac_dl_block_exp_pkt_ass(dl_block, sched_fn); + f_rx_rlcmac_dl_block_exp_pkt_dl_ass(dl_block, sched_fn); f_tx_rlcmac_ul_block(ts_RLCMAC_CTRL_ACK(tlli), 0, sched_fn); /* Now that we confirmed the new assignment in the dl-tbf, lets receive the data and ack it */ @@ -1566,6 +1580,120 @@ f_tx_rlcmac_ul_block(ts_RLCMAC_DL_ACK_NACK(dl_block.data.mac_hdr.hdr_ext.tfi, ack_nack_desc), 0, sched_fn); } + +template (value) AccessCapabilitiesStruct ts_AccesssCap := { + lengthIndicator := 0, /* overwritten */ + accessCapabilities := { + rfPowerCapability := '001'B, /* FIXME */ + presenceBitA5 := '0'B, + a5bits := omit, + esind := '1'B, + psbit := '0'B, + vgcs := '0'B, + vbs := '0'B, + presenceBitMultislot := '0'B, + multislotcap := omit, + accessCapAdditionsAfterRel97 := omit + }, + spare_bits := omit +} + +template (value) MSRACapabilityValuesRecord ts_RaCapRecEGPRS(BIT4 att := '0001'B /* E-GSM */, MultislotCap_GPRS mscap_gprs, MultislotCap_EGPRS mscap_egprs) := { + mSRACapabilityValues := { + mSRACapabilityValuesExclude1111 := { + accessTechnType := att, /* E-GSM */ + accessCapabilities := { + lengthIndicator := 0, /* overwritten */ + accessCapabilities := { + rfPowerCapability := '001'B, /* FIXME */ + presenceBitA5 := '0'B, + a5bits := omit, + esind := '1'B, + psbit := '0'B, + vgcs := '0'B, + vbs := '0'B, + presenceBitMultislot := '1'B, + multislotcap := { + presenceBitHscsd := '0'B, + hscsdmultislotclass := omit, + presenceBitGprs := '1'B, + gprsmultislot := mscap_gprs, + presenceBitSms := '0'B, + multislotCap_SMS := omit, + multislotCapAdditionsAfterRel97 := { + presenceBitEcsdmulti := '0'B, + ecsdmultislotclass := omit, + presenceBitEgprsmulti := '1'B, + multislotCap_EGPRS := mscap_egprs, + presenceBitDtmGprsmulti := '0'B, + multislotCapdtmgprsmultislotsubclass := omit + } + }, + accessCapAdditionsAfterRel97 := omit + }, + spare_bits := omit + } + } + }, + presenceBitMSRACap := '0'B +}; + +/* Test scenario where MS wants to send some data on PDCH against SGSN and it is + * answered, so TBFs for uplink and later for downlink are created. + */ +testcase TC_mo_ping_pong_egprs() runs on RAW_PCU_Test_CT { + var GsmRrMessage rr_imm_ass; + var PacketUlAssign ul_tbf_ass; + var PacketDlAssign dl_tbf_ass; + var RlcmacDlBlock dl_block; + var PCUIF_Message pcu_msg; + var octetstring data := f_rnd_octstring(10); + var boolean ok; + var uint32_t sched_fn; + var OCT4 tlli := '00000001'O; + var AckNackDescription ack_nack_desc := valueof(t_AckNackDescription_init); + var MultislotCap_GPRS mscap_gprs := { + gprsmultislotclass := '00001'B, + gprsextendeddynalloccap := '0'B + } ; + var MultislotCap_EGPRS mscap_egprs := { + egprsmultislotclass := '00001'B, + egprsextendeddynalloccap := '0'B + } ; + var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRecEGPRS('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) }; + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename()); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign('FFFFFFFF'O, tlli); + + /* Establish an Uplink TBF */ + ok := f_establish_tbf(rr_imm_ass); + if (not ok) { + setverdict(fail, "Failed to establish TBF"); + mtc.stop; + } + ok := f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass); + if (not ok) { + setverdict(fail, "Immediate Assignment not an Uplink TBF"); + mtc.stop; + } + + /* Send PACKET RESOURCE REQUEST to upgrade to EGPRS */ + f_tx_rlcmac_ul_block(ts_RLCMAC_PKT_RES_REQ(tlli, ms_racap), 0); + + f_rx_rlcmac_dl_block_exp_pkt_ul_ass(dl_block, sched_fn); + f_tx_rlcmac_ul_block(ts_RLCMAC_CTRL_ACK(tlli), 0, sched_fn); + //////////////////////// + + f_sleep(3.0); +} + /* Verify that if PCU doesn't get an ACK for first DL block after IMM ASS, it * will retry by retransmitting both the IMM ASS + DL block after poll (ack) * timeout occurs (specified by sent RRBP on DL block). */ @@ -1793,6 +1921,7 @@ execute( TC_t3169() ); execute( TC_t3193() ); execute( TC_mo_ping_pong() ); + execute( TC_mo_ping_pong_egprs() ); execute( TC_imm_ass_dl_block_retrans() ); execute( TC_paging_cs_from_bts() ); execute (TC_paging_cs_from_sgsn_sign() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3b36d20b5350c8011fd5b4cd2bb2eadd08b74823 Gerrit-Change-Number: 16677 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 25 04:47:24 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 25 Dec 2019 04:47:24 +0000 Subject: Change in osmo-pcu[master]: fix typo in log message In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16676 ) Change subject: fix typo in log message ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib6fc4625242d855193b62b561624b23b265648b9 Gerrit-Change-Number: 16676 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 25 Dec 2019 04:47:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 25 04:49:00 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 25 Dec 2019 04:49:00 +0000 Subject: Change in osmo-pcu[master]: Log BVCI PTP value upon msg recv In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16674 ) Change subject: Log BVCI PTP value upon msg recv ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/16674/1/src/gprs_bssgp_pcu.cpp File src/gprs_bssgp_pcu.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/16674/1/src/gprs_bssgp_pcu.cpp at 470 PS1, Line 470: %d It should be %u since ns_bvci is of type uint16_t. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I47c5902112d568cd5a48e003010d8085b02d64e8 Gerrit-Change-Number: 16674 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 25 Dec 2019 04:49:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Dec 25 04:50:57 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 25 Dec 2019 04:50:57 +0000 Subject: Change in osmo-bts[master]: l1sap: is_fille_frame(): verify len of data compared In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16661 ) Change subject: l1sap: is_fille_frame(): verify len of data compared ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id3d1725ff36091ed5c57927caad09a8baea6f52e Gerrit-Change-Number: 16661 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 25 Dec 2019 04:50:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 26 07:10:28 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 26 Dec 2019 07:10:28 +0000 Subject: Change in simtrace2[master]: Update .gitignore file for host References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16678 ) Change subject: Update .gitignore file for host ...................................................................... Update .gitignore file for host Change-Id: Id6449ea1c3e918e8c7748b9af7c8c354c1b607d5 --- M host/.gitignore 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/78/16678/1 diff --git a/host/.gitignore b/host/.gitignore index 44ca2a0..13ea291 100644 --- a/host/.gitignore +++ b/host/.gitignore @@ -20,6 +20,7 @@ install-sh missing stamp-h1 +m4 #libtool ltmain.sh @@ -30,3 +31,8 @@ .version *.pc + +simtrace2-list +simtrace2-sniff +simtrace2-remsim +simtrace2-remsim-usb2udp -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Id6449ea1c3e918e8c7748b9af7c8c354c1b607d5 Gerrit-Change-Number: 16678 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 26 07:10:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 26 Dec 2019 07:10:30 +0000 Subject: Change in simtrace2[master]: migrate to libosmousb References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16679 ) Change subject: migrate to libosmousb ...................................................................... migrate to libosmousb the code we used to have in libusb_util.c has been migrated to libosmousb, a new part of libosmocore.git. Let's remove our historic copy and use the new shared library instead. Change-Id: Ib588c08f873c4da8f3a02815ee2767674a6a5061 --- M host/configure.ac M host/include/Makefile.am D host/include/osmocom/simtrace2/libusb_util.h M host/lib/Makefile.am D host/lib/libusb_util.c M host/src/Makefile.am M host/src/simtrace2-remsim.c M host/src/simtrace2-sniff.c M host/src/simtrace2_usb.c M host/src/usb2udp.c 10 files changed, 17 insertions(+), 429 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/79/16679/1 diff --git a/host/configure.ac b/host/configure.ac index 7929884..0f91cf2 100644 --- a/host/configure.ac +++ b/host/configure.ac @@ -58,6 +58,7 @@ PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) PKG_CHECK_MODULES(LIBOSMOSIM, libosmosim >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOUSB, libosmousb >= 0.0.0) PKG_CHECK_MODULES(LIBUSB, libusb-1.0) AC_ARG_ENABLE(sanitize, diff --git a/host/include/Makefile.am b/host/include/Makefile.am index 4222484..b7b453a 100644 --- a/host/include/Makefile.am +++ b/host/include/Makefile.am @@ -1,6 +1,5 @@ nobase_include_HEADERS = \ osmocom/simtrace2/apdu_dispatch.h \ - osmocom/simtrace2/libusb_util.h \ osmocom/simtrace2/simtrace2_api.h \ osmocom/simtrace2/simtrace_usb.h \ osmocom/simtrace2/simtrace_prot.h \ diff --git a/host/include/osmocom/simtrace2/libusb_util.h b/host/include/osmocom/simtrace2/libusb_util.h deleted file mode 100644 index 3280b27..0000000 --- a/host/include/osmocom/simtrace2/libusb_util.h +++ /dev/null @@ -1,73 +0,0 @@ -/* libisb utilities - * - * (C) 2010-2016 by Harald Welte - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#pragma once - -#include - -#define USB_MAX_PATH_LEN 20 - -struct dev_id { - uint16_t vendor_id; - uint16_t product_id; -}; - -/* Find any USB devices in the system matching the given Vendor and - * Product ID */ -libusb_device **find_matching_usb_devs(const struct dev_id *dev_ids); - -/* structure describing a single matching interface found */ -struct usb_interface_match { - /* libusb device E*/ - libusb_device *usb_dev; - /* Vendor ID of the device running matching interface */ - uint16_t vendor; - /* Product ID of the device running matching interface */ - uint16_t product; - /* USB Bus Address */ - uint8_t addr; - /* physical path */ - char path[USB_MAX_PATH_LEN]; - /* configuration of matching interface */ - uint8_t configuration; - /* interface number of matching interface */ - uint8_t interface; - /* altsetting of matching interface */ - uint8_t altsetting; - /* bInterfaceClass of matching interface */ - uint8_t class; - /* bInterfaceSubClass of matching interface */ - uint8_t sub_class; - /* bInterfaceProtocol of matching interface */ - uint8_t protocol; - /* index of string descriptor of matching interface */ - uint8_t string_idx; -}; - -int dev_find_matching_interfaces(libusb_device *dev, int class, int sub_class, int protocol, - struct usb_interface_match *out, unsigned int out_len); - -int usb_match_interfaces(libusb_context *ctx, const struct dev_id *dev_ids, - int class, int sub_class, int protocol, - struct usb_interface_match *out, unsigned int out_len); - -libusb_device_handle *usb_open_claim_interface(libusb_context *ctx, - const struct usb_interface_match *ifm); - -int get_usb_ep_addrs(libusb_device_handle *devh, unsigned int if_num, - uint8_t *out, uint8_t *in, uint8_t *irq); diff --git a/host/lib/Makefile.am b/host/lib/Makefile.am index 8416923..438ad9d 100644 --- a/host/lib/Makefile.am +++ b/host/lib/Makefile.am @@ -15,5 +15,4 @@ libosmo_simtrace2_la_SOURCES = \ apdu_dispatch.c \ gsmtap.c \ - libusb_util.c \ simtrace2_api.c diff --git a/host/lib/libusb_util.c b/host/lib/libusb_util.c deleted file mode 100644 index 50cd087..0000000 --- a/host/lib/libusb_util.c +++ /dev/null @@ -1,338 +0,0 @@ -/* libusb utilities - * - * (C) 2010-2019 by Harald Welte - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#include -#include -#include -#include -#include -#include - -#include - -#include - -static char path_buf[USB_MAX_PATH_LEN]; - -static char *get_path(libusb_device *dev) -{ -#if (defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102) || (defined(LIBUSBX_API_VERSION) && LIBUSBX_API_VERSION >= 0x01000102) - uint8_t path[8]; - int r,j; - r = libusb_get_port_numbers(dev, path, sizeof(path)); - if (r > 0) { - sprintf(path_buf,"%d-%d",libusb_get_bus_number(dev),path[0]); - for (j = 1; j < r; j++){ - sprintf(path_buf+strlen(path_buf),".%d",path[j]); - }; - } - return path_buf; -#else -# warning "libusb too old - building without USB path support!" - return NULL; -#endif -} - -static int match_dev_id(const struct libusb_device_descriptor *desc, const struct dev_id *id) -{ - if ((desc->idVendor == id->vendor_id) && (desc->idProduct == id->product_id)) - return 1; - return 0; -} - - -static int match_dev_ids(const struct libusb_device_descriptor *desc, const struct dev_id *ids) -{ - const struct dev_id *id; - - for (id = ids; id->vendor_id || id->product_id; id++) { - if (match_dev_id(desc, id)) - return 1; - } - return 0; -} - -libusb_device **find_matching_usb_devs(const struct dev_id *dev_ids) -{ - libusb_device **list; - libusb_device **out = calloc(256, sizeof(libusb_device *)); - libusb_device **cur = out; - unsigned int i; - int rc; - - if (!out) - return NULL; - - rc = libusb_get_device_list(NULL, &list); - if (rc <= 0) { - perror("No USB devices found"); - free(out); - return NULL; - } - - for (i = 0; list[i] != NULL; i++) { - struct libusb_device_descriptor dev_desc; - libusb_device *dev = list[i]; - - rc = libusb_get_device_descriptor(dev, &dev_desc); - if (rc < 0) { - perror("Couldn't get device descriptor\n"); - libusb_unref_device(dev); - continue; - } - - if (match_dev_ids(&dev_desc, dev_ids)) { - *cur = dev; - cur++; - /* FIXME: overflow check */ - } else - libusb_unref_device(dev); - } - if (cur == out) { - libusb_free_device_list(list, 1); - free(out); - return NULL; - } - - libusb_free_device_list(list, 0); - return out; -} - -int dev_find_matching_interfaces(libusb_device *dev, int class, int sub_class, int protocol, - struct usb_interface_match *out, unsigned int out_len) -{ - struct libusb_device_descriptor dev_desc; - int rc, i, out_idx = 0; - uint8_t addr; - char *path; - - rc = libusb_get_device_descriptor(dev, &dev_desc); - if (rc < 0) { - perror("Couldn't get device descriptor\n"); - return -EIO; - } - - addr = libusb_get_device_address(dev); - path = get_path(dev); - - /* iterate over all configurations */ - for (i = 0; i < dev_desc.bNumConfigurations; i++) { - struct libusb_config_descriptor *conf_desc; - int j; - - rc = libusb_get_config_descriptor(dev, i, &conf_desc); - if (rc < 0) { - fprintf(stderr, "Couldn't get config descriptor %u\n", i); - continue; - } - /* iterate over all interfaces */ - for (j = 0; j < conf_desc->bNumInterfaces; j++) { - const struct libusb_interface *intf = &conf_desc->interface[j]; - int k; - /* iterate over all alternate settings */ - for (k = 0; k < intf->num_altsetting; k++) { - const struct libusb_interface_descriptor *if_desc; - if_desc = &intf->altsetting[k]; - if (class >= 0 && if_desc->bInterfaceClass != class) - continue; - if (sub_class >= 0 && if_desc->bInterfaceSubClass != sub_class) - continue; - if (protocol >= 0 && if_desc->bInterfaceProtocol != protocol) - continue; - /* MATCH! */ - out[out_idx].usb_dev = dev; - out[out_idx].vendor = dev_desc.idVendor; - out[out_idx].product = dev_desc.idProduct; - out[out_idx].addr = addr; - strncpy(out[out_idx].path, path, sizeof(out[out_idx].path)-1); - out[out_idx].path[sizeof(out[out_idx].path)-1] = '\0'; - out[out_idx].configuration = conf_desc->bConfigurationValue; - out[out_idx].interface = if_desc->bInterfaceNumber; - out[out_idx].altsetting = if_desc->bAlternateSetting; - out[out_idx].class = if_desc->bInterfaceClass; - out[out_idx].sub_class = if_desc->bInterfaceSubClass; - out[out_idx].protocol = if_desc->bInterfaceProtocol; - out[out_idx].string_idx = if_desc->iInterface; - out_idx++; - if (out_idx >= out_len) - return out_idx; - } - } - } - return out_idx; -} - -int usb_match_interfaces(libusb_context *ctx, const struct dev_id *dev_ids, - int class, int sub_class, int protocol, - struct usb_interface_match *out, unsigned int out_len) -{ - struct usb_interface_match *out_cur = out; - unsigned int out_len_remain = out_len; - libusb_device **list; - libusb_device **dev; - - list = find_matching_usb_devs(dev_ids); - if (!list) - return 0; - - for (dev = list; *dev; dev++) { - int rc; - -#if 0 - struct libusb_device_descriptor dev_desc; - uint8_t ports[8]; - uint8_t addr; - rc = libusb_get_device_descriptor(*dev, &dev_desc); - if (rc < 0) { - perror("Cannot get device descriptor"); - continue; - } - - addr = libusb_get_device_address(*dev); - - rc = libusb_get_port_numbers(*dev, ports, sizeof(ports)); - if (rc < 0) { - perror("Cannot get device path"); - continue; - } - - printf("Found USB Device %04x:%04x at address %d\n", - dev_desc.idVendor, dev_desc.idProduct, addr); -#endif - - rc = dev_find_matching_interfaces(*dev, class, sub_class, protocol, out_cur, out_len_remain); - if (rc < 0) - continue; - out_cur += rc; - out_len_remain -= rc; - - } - return out_len - out_len_remain; -} - -libusb_device_handle *usb_open_claim_interface(libusb_context *ctx, - const struct usb_interface_match *ifm) -{ - int rc, config; - struct dev_id dev_ids[] = { { ifm->vendor, ifm->product }, { 0, 0 } }; - libusb_device **list; - libusb_device **dev; - libusb_device_handle *usb_devh = NULL; - - list = find_matching_usb_devs(dev_ids); - if (!list) { - perror("No USB device with matching VID/PID"); - return NULL; - } - - for (dev = list; *dev; dev++) { - int addr; - char *path; - - addr = libusb_get_device_address(*dev); - path = get_path(*dev); - if ((ifm->addr && addr == ifm->addr) || - (strlen(ifm->path) && !strcmp(path, ifm->path))) { - rc = libusb_open(*dev, &usb_devh); - if (rc < 0) { - fprintf(stderr, "Cannot open device: %s\n", libusb_error_name(rc)); - usb_devh = NULL; - break; - } - rc = libusb_get_configuration(usb_devh, &config); - if (rc < 0) { - fprintf(stderr, "Cannot get current configuration: %s\n", libusb_error_name(rc)); - libusb_close(usb_devh); - usb_devh = NULL; - break; - } - if (config != ifm->configuration) { - rc = libusb_set_configuration(usb_devh, ifm->configuration); - if (rc < 0) { - fprintf(stderr, "Cannot set configuration: %s\n", libusb_error_name(rc)); - libusb_close(usb_devh); - usb_devh = NULL; - break; - } - } - rc = libusb_claim_interface(usb_devh, ifm->interface); - if (rc < 0) { - fprintf(stderr, "Cannot claim interface: %s\n", libusb_error_name(rc)); - libusb_close(usb_devh); - usb_devh = NULL; - break; - } - rc = libusb_set_interface_alt_setting(usb_devh, ifm->interface, ifm->altsetting); - if (rc < 0) { - fprintf(stderr, "Cannot set interface altsetting: %s\n", libusb_error_name(rc)); - libusb_release_interface(usb_devh, ifm->interface); - libusb_close(usb_devh); - usb_devh = NULL; - break; - } - } - } - - /* unref / free list */ - for (dev = list; *dev; dev++) - libusb_unref_device(*dev); - free(list); - - return usb_devh; -} - -/*! \brief obtain the endpoint addresses for a given USB interface */ -int get_usb_ep_addrs(libusb_device_handle *devh, unsigned int if_num, - uint8_t *out, uint8_t *in, uint8_t *irq) -{ - libusb_device *dev = libusb_get_device(devh); - struct libusb_config_descriptor *cdesc; - const struct libusb_interface_descriptor *idesc; - const struct libusb_interface *iface; - int rc, l; - - rc = libusb_get_active_config_descriptor(dev, &cdesc); - if (rc < 0) - return rc; - - iface = &cdesc->interface[if_num]; - /* FIXME: we assume there's no altsetting */ - idesc = &iface->altsetting[0]; - - for (l = 0; l < idesc->bNumEndpoints; l++) { - const struct libusb_endpoint_descriptor *edesc = &idesc->endpoint[l]; - switch (edesc->bmAttributes & 3) { - case LIBUSB_TRANSFER_TYPE_BULK: - if (edesc->bEndpointAddress & 0x80) { - if (in) - *in = edesc->bEndpointAddress; - } else { - if (out) - *out = edesc->bEndpointAddress; - } - break; - case LIBUSB_TRANSFER_TYPE_INTERRUPT: - if (irq) - *irq = edesc->bEndpointAddress; - break; - default: - break; - } - } - return 0; -} diff --git a/host/src/Makefile.am b/host/src/Makefile.am index 29f2405..c3283ba 100644 --- a/host/src/Makefile.am +++ b/host/src/Makefile.am @@ -1,9 +1,9 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOSIM_CFLAGS) $(LIBUSB_CFLAGS) $(COVERAGE_FLAGS) +AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOSIM_CFLAGS) $(LIBOSMOUSB_CFLAGS) $(LIBUSB_CFLAGS) $(COVERAGE_FLAGS) AM_LDFLAGS=$(COVERAGE_LDFLAGS) LDADD= $(top_builddir)/lib/libosmo-simtrace2.la \ - $(LIBOSMOCORE_LIBS) $(LIBOSMOSIM_LIBS) $(LIBUSB_LIBS) + $(LIBOSMOCORE_LIBS) $(LIBOSMOSIM_LIBS) $(LIBOSMOUSB_LIBS) $(LIBUSB_LIBS) bin_PROGRAMS = simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list simtrace2-sniff diff --git a/host/src/simtrace2-remsim.c b/host/src/simtrace2-remsim.c index d51f081..7d5ecd3 100644 --- a/host/src/simtrace2-remsim.c +++ b/host/src/simtrace2-remsim.c @@ -38,7 +38,7 @@ #include -#include +#include #include #include #include @@ -404,7 +404,7 @@ ifm->addr = addr; if (path) osmo_strlcpy(ifm->path, path, sizeof(ifm->path)); - transp->usb_devh = usb_open_claim_interface(NULL, ifm); + transp->usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, ifm); if (!transp->usb_devh) { fprintf(stderr, "can't open USB device\n"); goto close_exit; @@ -416,7 +416,7 @@ goto close_exit; } - rc = get_usb_ep_addrs(transp->usb_devh, if_num, &transp->usb_ep.out, + rc = osmo_libusb_get_ep_addrs(transp->usb_devh, if_num, &transp->usb_ep.out, &transp->usb_ep.in, &transp->usb_ep.irq_in); if (rc < 0) { fprintf(stderr, "can't obtain EP addrs; rc=%d\n", rc); diff --git a/host/src/simtrace2-sniff.c b/host/src/simtrace2-sniff.c index c4cec1e..dfb6e7c 100644 --- a/host/src/simtrace2-sniff.c +++ b/host/src/simtrace2-sniff.c @@ -37,7 +37,7 @@ #include -#include +#include #include #include @@ -384,7 +384,7 @@ goto do_exit; } struct usb_interface_match ifm_scan[16]; - int num_interfaces = usb_match_interfaces(NULL, compatible_dev_ids, + int num_interfaces = osmo_libusb_find_matching_interfaces(NULL, compatible_dev_ids, USB_CLASS_PROPRIETARY, SIMTRACE_SNIFFER_USB_SUBCLASS, -1, ifm_scan, ARRAY_SIZE(ifm_scan)); if (num_interfaces <= 0) { perror("No compatible USB devices found"); @@ -473,7 +473,7 @@ signal(SIGINT, &signal_handler); do { - _transp.usb_devh = usb_open_claim_interface(NULL, &ifm_selected); + _transp.usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, &ifm_selected); if (!_transp.usb_devh) { fprintf(stderr, "can't open USB device\n"); goto close_exit; @@ -485,8 +485,8 @@ goto close_exit; } - rc = get_usb_ep_addrs(_transp.usb_devh, ifm_selected.interface, &_transp.usb_ep.out, - &_transp.usb_ep.in, &_transp.usb_ep.irq_in); + rc = osmo_libusb_get_ep_addrs(_transp.usb_devh, ifm_selected.interface, &_transp.usb_ep.out, + &_transp.usb_ep.in, &_transp.usb_ep.irq_in); if (rc < 0) { fprintf(stderr, "can't obtain EP addrs; rc=%d\n", rc); goto close_exit; diff --git a/host/src/simtrace2_usb.c b/host/src/simtrace2_usb.c index d31ff29..94e19ff 100644 --- a/host/src/simtrace2_usb.c +++ b/host/src/simtrace2_usb.c @@ -23,7 +23,7 @@ #include -#include +#include #include static const struct dev_id compatible_dev_ids[] = { @@ -38,9 +38,9 @@ struct usb_interface_match ifm[16]; int rc, i, num_interfaces; - /* scan for USB devices matching SIMtrace USB ID with proprietary class */ - rc = usb_match_interfaces(NULL, compatible_dev_ids, - USB_CLASS_PROPRIETARY, -1, -1, ifm, ARRAY_SIZE(ifm)); + /* scan for USB devices matching SIMtrace USB ID with proprietary class */ + rc = osmo_libusb_find_matching_interfaces(NULL, compatible_dev_ids, + USB_CLASS_PROPRIETARY, -1, -1, ifm, ARRAY_SIZE(ifm)); printf("USB matches: %d\n", rc); if (rc < 0) return rc; diff --git a/host/src/usb2udp.c b/host/src/usb2udp.c index 23800fd..57cee74 100644 --- a/host/src/usb2udp.c +++ b/host/src/usb2udp.c @@ -35,9 +35,9 @@ #include +#include #include #include -#include #include #include @@ -259,7 +259,7 @@ g_udp_ofd.cb = ofd_udp_cb; osmo_sock_init_ofd(&g_udp_ofd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, NULL, local_udp_port + if_num, OSMO_SOCK_F_BIND); - rc = get_usb_ep_addrs(g_devh, if_num, &g_buf_out.ep, &g_buf_in.ep, NULL); + rc = osmo_libusb_get_ep_addrs(g_devh, if_num, &g_buf_out.ep, &g_buf_in.ep, NULL); if (rc < 0) { fprintf(stderr, "couldn't find enpdoint addresses; rc=%d\n", rc); goto close_exit; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ib588c08f873c4da8f3a02815ee2767674a6a5061 Gerrit-Change-Number: 16679 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 26 07:10:30 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 26 Dec 2019 07:10:30 +0000 Subject: Change in simtrace2[master]: library: Add osmo_st2_compatible_dev_idsp[] References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16680 ) Change subject: library: Add osmo_st2_compatible_dev_idsp[] ...................................................................... library: Add osmo_st2_compatible_dev_idsp[] This is a list of known-compatible USB VID/PID pairs. Change-Id: I3ef66ebba307899c57077bfd633f84f30190f4dc --- M host/include/Makefile.am A host/include/osmocom/simtrace2/usb_util.h M host/lib/Makefile.am A host/lib/usb_util.c 4 files changed, 47 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/80/16680/1 diff --git a/host/include/Makefile.am b/host/include/Makefile.am index b7b453a..60134f3 100644 --- a/host/include/Makefile.am +++ b/host/include/Makefile.am @@ -3,4 +3,6 @@ osmocom/simtrace2/simtrace2_api.h \ osmocom/simtrace2/simtrace_usb.h \ osmocom/simtrace2/simtrace_prot.h \ - osmocom/simtrace2/gsmtap.h + osmocom/simtrace2/usb_util.h \ + osmocom/simtrace2/gsmtap.h \ + $(NULL) diff --git a/host/include/osmocom/simtrace2/usb_util.h b/host/include/osmocom/simtrace2/usb_util.h new file mode 100644 index 0000000..3bb2486 --- /dev/null +++ b/host/include/osmocom/simtrace2/usb_util.h @@ -0,0 +1,5 @@ +#pragma once + +#include + +extern const struct dev_id osmo_st2_compatible_dev_ids[]; diff --git a/host/lib/Makefile.am b/host/lib/Makefile.am index 438ad9d..3f7ec8e 100644 --- a/host/lib/Makefile.am +++ b/host/lib/Makefile.am @@ -15,4 +15,6 @@ libosmo_simtrace2_la_SOURCES = \ apdu_dispatch.c \ gsmtap.c \ - simtrace2_api.c + simtrace2_api.c \ + usb_util.c \ + $(NULL) diff --git a/host/lib/usb_util.c b/host/lib/usb_util.c new file mode 100644 index 0000000..7599991 --- /dev/null +++ b/host/lib/usb_util.c @@ -0,0 +1,36 @@ +/* usb_util - USB related utilities for SIMtrace 2 USB devices + * + * (C) 2016-2019 by Harald Welte + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +#include +#include +#include +#include +#include + +#include + +#include +#include + +/*! list of USB idVendor/idProduct tuples of devices using simtrace2 firmware */ +const struct dev_id osmo_st2_compatible_dev_ids[] = { + { USB_VENDOR_OPENMOKO, USB_PRODUCT_OWHW_SAM3 }, + { USB_VENDOR_OPENMOKO, USB_PRODUCT_QMOD_SAM3 }, + { USB_VENDOR_OPENMOKO, USB_PRODUCT_SIMTRACE2 }, + { 0, 0 } +}; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I3ef66ebba307899c57077bfd633f84f30190f4dc Gerrit-Change-Number: 16680 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 26 07:10:31 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 26 Dec 2019 07:10:31 +0000 Subject: Change in simtrace2[master]: simtrace2-remsim: Better semi-automatic interface matching References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/16681 ) Change subject: simtrace2-remsim: Better semi-automatic interface matching ...................................................................... simtrace2-remsim: Better semi-automatic interface matching Now it's sufficient to specify only the minimum required parameters to uniquely identify the USB device and/or interface to use * the program knows which VendorId/ProductId is supported * if more than one device are found, you need to specify the USB path like '-H 1-2.1' to disambiguate * if more than one matching interface are found in the device, you need to specify if like '-I 1' Change-Id: Icbcb5e8a00d189859310117880a763864b72b6c3 --- M host/src/simtrace2-remsim.c 1 file changed, 58 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/81/16681/1 diff --git a/host/src/simtrace2-remsim.c b/host/src/simtrace2-remsim.c index 7d5ecd3..7abaa79 100644 --- a/host/src/simtrace2-remsim.c +++ b/host/src/simtrace2-remsim.c @@ -43,7 +43,11 @@ #include #include #include +#include +#include +#include +#include #include #include #include @@ -274,6 +278,14 @@ } } +static const struct log_info_cat log_categories[] = { +}; + +static const struct log_info log_info = { + .cat = log_categories, + .num_cat = ARRAY_SIZE(log_categories), +}; + int main(int argc, char **argv) { struct osmo_st2_transport *transp = ci->slot->transp; @@ -291,6 +303,7 @@ struct osim_card_hdl *card; print_welcome(); + osmo_init_logging2(NULL, &log_info); while (1) { int option_index = 0; @@ -342,11 +355,6 @@ } } - if (!remote_udp_host && (vendor_id < 0 || product_id < 0)) { - fprintf(stderr, "You have to specify the vendor and product ID\n"); - goto do_exit; - } - transp->udp_fd = -1; ci->card_prof = &osim_uicc_sim_cic_profile; @@ -395,15 +403,51 @@ do { if (transp->udp_fd < 0) { - struct usb_interface_match _ifm, *ifm = &_ifm; - ifm->vendor = vendor_id; - ifm->product = product_id; - ifm->configuration = config_id; - ifm->interface = if_num; - ifm->altsetting = altsetting; - ifm->addr = addr; - if (path) - osmo_strlcpy(ifm->path, path, sizeof(ifm->path)); + struct usb_interface_match if_matches[16]; + struct usb_interface_match *ifm = NULL; + struct dev_id user_dev_ids[2] = { + { vendor_id, product_id }, + { 0, 0 } + }; + const struct dev_id *dev_ids = osmo_st2_compatible_dev_ids; + libusb_device *dev; + int i; + + if (vendor_id != -1 || product_id != -1) + dev_ids = user_dev_ids; + dev = osmo_libusb_find_matching_dev_path(NULL, dev_ids, path); + if (!dev) + goto close_exit; + + rc = osmo_libusb_dev_find_matching_interfaces(dev, USB_CLASS_PROPRIETARY, + SIMTRACE_CARDEM_USB_SUBCLASS, -1, + if_matches, sizeof(if_matches)); + if (rc < 1) { + fprintf(stderr, "can't find matching USB interface at device\n"); + goto close_exit; + } else if (rc == 1) { + ifm = if_matches; + } else if (rc > 1) { + if (if_num == -1) { + fprintf(stderr, "found %d matching USB interfaces, you " + "have to specify the interface number (try " + "simtrace2-list)\n", rc); + goto close_exit; + } + for (i = 0; i < rc; i++) { + if (if_matches[i].interface == if_num) { + ifm = &if_matches[i]; + break; + } + /* FIXME: match altsetting */ + } + } + if (!ifm) { + fprintf(stderr, "Couldn't find matching interface\n"); + goto close_exit; + } + /* FIXME: we may need to switch configuration, if found interface has different config */ + transp->usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, ifm); if (!transp->usb_devh) { fprintf(stderr, "can't open USB device\n"); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Icbcb5e8a00d189859310117880a763864b72b6c3 Gerrit-Change-Number: 16681 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Dec 26 07:40:29 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 26 Dec 2019 07:40:29 +0000 Subject: Change in osmo-gsm-manuals[master]: Add GPRS References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16682 ) Change subject: Add GPRS ...................................................................... Add GPRS Change-Id: Ib3218c035445875a079f3ef3aa72bbf6d8c668b6 --- M common/chapters/glossary.adoc 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/82/16682/1 diff --git a/common/chapters/glossary.adoc b/common/chapters/glossary.adoc index 7132496..0c914cb 100644 --- a/common/chapters/glossary.adoc +++ b/common/chapters/glossary.adoc @@ -114,6 +114,8 @@ GNU General Public License, a copyleft-style Free Software License Gp:: Gp interface between SGSN and GGSN; uses GTP protocol +GPRS:: + General Packet Radio Service; the packet switched 2G technology GPS:: Global Positioning System; provides a highly accurate clock reference besides the global position -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ib3218c035445875a079f3ef3aa72bbf6d8c668b6 Gerrit-Change-Number: 16682 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 27 12:31:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 27 Dec 2019 12:31:50 +0000 Subject: Change in osmo-gsm-manuals[master]: Add GPRS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16682 ) Change subject: Add GPRS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ib3218c035445875a079f3ef3aa72bbf6d8c668b6 Gerrit-Change-Number: 16682 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 27 Dec 2019 12:31:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 27 12:31:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 27 Dec 2019 12:31:53 +0000 Subject: Change in osmo-gsm-manuals[master]: Add GPRS In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16682 ) Change subject: Add GPRS ...................................................................... Add GPRS Change-Id: Ib3218c035445875a079f3ef3aa72bbf6d8c668b6 --- M common/chapters/glossary.adoc 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/common/chapters/glossary.adoc b/common/chapters/glossary.adoc index 7132496..0c914cb 100644 --- a/common/chapters/glossary.adoc +++ b/common/chapters/glossary.adoc @@ -114,6 +114,8 @@ GNU General Public License, a copyleft-style Free Software License Gp:: Gp interface between SGSN and GGSN; uses GTP protocol +GPRS:: + General Packet Radio Service; the packet switched 2G technology GPS:: Global Positioning System; provides a highly accurate clock reference besides the global position -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ib3218c035445875a079f3ef3aa72bbf6d8c668b6 Gerrit-Change-Number: 16682 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 27 12:32:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 27 Dec 2019 12:32:13 +0000 Subject: Change in simtrace2[master]: Update .gitignore file for host In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16678 ) Change subject: Update .gitignore file for host ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Id6449ea1c3e918e8c7748b9af7c8c354c1b607d5 Gerrit-Change-Number: 16678 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 27 Dec 2019 12:32:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 27 12:32:21 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 27 Dec 2019 12:32:21 +0000 Subject: Change in simtrace2[master]: migrate to libosmousb In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16679 ) Change subject: migrate to libosmousb ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ib588c08f873c4da8f3a02815ee2767674a6a5061 Gerrit-Change-Number: 16679 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 27 Dec 2019 12:32:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 27 12:32:28 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 27 Dec 2019 12:32:28 +0000 Subject: Change in simtrace2[master]: migrate to libosmousb In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16679 ) Change subject: migrate to libosmousb ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ib588c08f873c4da8f3a02815ee2767674a6a5061 Gerrit-Change-Number: 16679 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 27 Dec 2019 12:32:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 27 12:32:41 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 27 Dec 2019 12:32:41 +0000 Subject: Change in simtrace2[master]: OSMO_ASSERT() on double-free or invalid pointer In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16576 ) Change subject: OSMO_ASSERT() on double-free or invalid pointer ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16576 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2ab8fb7b86b6f608bbd9c4f79369c64cbad88bdf Gerrit-Change-Number: 16576 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 27 Dec 2019 12:32:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 27 12:32:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 27 Dec 2019 12:32:43 +0000 Subject: Change in simtrace2[master]: OSMO_ASSERT() on double-free or invalid pointer In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16576 ) Change subject: OSMO_ASSERT() on double-free or invalid pointer ...................................................................... OSMO_ASSERT() on double-free or invalid pointer Change-Id: I2ab8fb7b86b6f608bbd9c4f79369c64cbad88bdf --- M firmware/libcommon/source/pseudo_talloc.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/source/pseudo_talloc.c b/firmware/libcommon/source/pseudo_talloc.c index 3407a59..bbcd7af 100644 --- a/firmware/libcommon/source/pseudo_talloc.c +++ b/firmware/libcommon/source/pseudo_talloc.c @@ -66,6 +66,7 @@ if (ptr == msgb_data[i]) { if (!msgb_inuse[i]) { TRACE_ERROR("%s: double_free by %s\r\n", __func__, location); + OSMO_ASSERT(0); } else { msgb_inuse[i] = 0; } @@ -76,6 +77,7 @@ local_irq_restore(x); TRACE_ERROR("%s: invalid pointer %p from %s\r\n", __func__, ptr, location); + OSMO_ASSERT(0); return -1; } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16576 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2ab8fb7b86b6f608bbd9c4f79369c64cbad88bdf Gerrit-Change-Number: 16576 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 27 12:32:44 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 27 Dec 2019 12:32:44 +0000 Subject: Change in simtrace2[master]: Update .gitignore file for host In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16678 ) Change subject: Update .gitignore file for host ...................................................................... Update .gitignore file for host Change-Id: Id6449ea1c3e918e8c7748b9af7c8c354c1b607d5 --- M host/.gitignore 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/host/.gitignore b/host/.gitignore index 44ca2a0..13ea291 100644 --- a/host/.gitignore +++ b/host/.gitignore @@ -20,6 +20,7 @@ install-sh missing stamp-h1 +m4 #libtool ltmain.sh @@ -30,3 +31,8 @@ .version *.pc + +simtrace2-list +simtrace2-sniff +simtrace2-remsim +simtrace2-remsim-usb2udp -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Id6449ea1c3e918e8c7748b9af7c8c354c1b607d5 Gerrit-Change-Number: 16678 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 27 12:32:44 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 27 Dec 2019 12:32:44 +0000 Subject: Change in simtrace2[master]: migrate to libosmousb In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16679 ) Change subject: migrate to libosmousb ...................................................................... migrate to libosmousb the code we used to have in libusb_util.c has been migrated to libosmousb, a new part of libosmocore.git. Let's remove our historic copy and use the new shared library instead. Change-Id: Ib588c08f873c4da8f3a02815ee2767674a6a5061 --- M host/configure.ac M host/include/Makefile.am D host/include/osmocom/simtrace2/libusb_util.h M host/lib/Makefile.am D host/lib/libusb_util.c M host/src/Makefile.am M host/src/simtrace2-remsim.c M host/src/simtrace2-sniff.c M host/src/simtrace2_usb.c M host/src/usb2udp.c 10 files changed, 17 insertions(+), 429 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/host/configure.ac b/host/configure.ac index 7929884..0f91cf2 100644 --- a/host/configure.ac +++ b/host/configure.ac @@ -58,6 +58,7 @@ PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) PKG_CHECK_MODULES(LIBOSMOSIM, libosmosim >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOUSB, libosmousb >= 0.0.0) PKG_CHECK_MODULES(LIBUSB, libusb-1.0) AC_ARG_ENABLE(sanitize, diff --git a/host/include/Makefile.am b/host/include/Makefile.am index 4222484..b7b453a 100644 --- a/host/include/Makefile.am +++ b/host/include/Makefile.am @@ -1,6 +1,5 @@ nobase_include_HEADERS = \ osmocom/simtrace2/apdu_dispatch.h \ - osmocom/simtrace2/libusb_util.h \ osmocom/simtrace2/simtrace2_api.h \ osmocom/simtrace2/simtrace_usb.h \ osmocom/simtrace2/simtrace_prot.h \ diff --git a/host/include/osmocom/simtrace2/libusb_util.h b/host/include/osmocom/simtrace2/libusb_util.h deleted file mode 100644 index 3280b27..0000000 --- a/host/include/osmocom/simtrace2/libusb_util.h +++ /dev/null @@ -1,73 +0,0 @@ -/* libisb utilities - * - * (C) 2010-2016 by Harald Welte - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#pragma once - -#include - -#define USB_MAX_PATH_LEN 20 - -struct dev_id { - uint16_t vendor_id; - uint16_t product_id; -}; - -/* Find any USB devices in the system matching the given Vendor and - * Product ID */ -libusb_device **find_matching_usb_devs(const struct dev_id *dev_ids); - -/* structure describing a single matching interface found */ -struct usb_interface_match { - /* libusb device E*/ - libusb_device *usb_dev; - /* Vendor ID of the device running matching interface */ - uint16_t vendor; - /* Product ID of the device running matching interface */ - uint16_t product; - /* USB Bus Address */ - uint8_t addr; - /* physical path */ - char path[USB_MAX_PATH_LEN]; - /* configuration of matching interface */ - uint8_t configuration; - /* interface number of matching interface */ - uint8_t interface; - /* altsetting of matching interface */ - uint8_t altsetting; - /* bInterfaceClass of matching interface */ - uint8_t class; - /* bInterfaceSubClass of matching interface */ - uint8_t sub_class; - /* bInterfaceProtocol of matching interface */ - uint8_t protocol; - /* index of string descriptor of matching interface */ - uint8_t string_idx; -}; - -int dev_find_matching_interfaces(libusb_device *dev, int class, int sub_class, int protocol, - struct usb_interface_match *out, unsigned int out_len); - -int usb_match_interfaces(libusb_context *ctx, const struct dev_id *dev_ids, - int class, int sub_class, int protocol, - struct usb_interface_match *out, unsigned int out_len); - -libusb_device_handle *usb_open_claim_interface(libusb_context *ctx, - const struct usb_interface_match *ifm); - -int get_usb_ep_addrs(libusb_device_handle *devh, unsigned int if_num, - uint8_t *out, uint8_t *in, uint8_t *irq); diff --git a/host/lib/Makefile.am b/host/lib/Makefile.am index 8416923..438ad9d 100644 --- a/host/lib/Makefile.am +++ b/host/lib/Makefile.am @@ -15,5 +15,4 @@ libosmo_simtrace2_la_SOURCES = \ apdu_dispatch.c \ gsmtap.c \ - libusb_util.c \ simtrace2_api.c diff --git a/host/lib/libusb_util.c b/host/lib/libusb_util.c deleted file mode 100644 index 50cd087..0000000 --- a/host/lib/libusb_util.c +++ /dev/null @@ -1,338 +0,0 @@ -/* libusb utilities - * - * (C) 2010-2019 by Harald Welte - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#include -#include -#include -#include -#include -#include - -#include - -#include - -static char path_buf[USB_MAX_PATH_LEN]; - -static char *get_path(libusb_device *dev) -{ -#if (defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102) || (defined(LIBUSBX_API_VERSION) && LIBUSBX_API_VERSION >= 0x01000102) - uint8_t path[8]; - int r,j; - r = libusb_get_port_numbers(dev, path, sizeof(path)); - if (r > 0) { - sprintf(path_buf,"%d-%d",libusb_get_bus_number(dev),path[0]); - for (j = 1; j < r; j++){ - sprintf(path_buf+strlen(path_buf),".%d",path[j]); - }; - } - return path_buf; -#else -# warning "libusb too old - building without USB path support!" - return NULL; -#endif -} - -static int match_dev_id(const struct libusb_device_descriptor *desc, const struct dev_id *id) -{ - if ((desc->idVendor == id->vendor_id) && (desc->idProduct == id->product_id)) - return 1; - return 0; -} - - -static int match_dev_ids(const struct libusb_device_descriptor *desc, const struct dev_id *ids) -{ - const struct dev_id *id; - - for (id = ids; id->vendor_id || id->product_id; id++) { - if (match_dev_id(desc, id)) - return 1; - } - return 0; -} - -libusb_device **find_matching_usb_devs(const struct dev_id *dev_ids) -{ - libusb_device **list; - libusb_device **out = calloc(256, sizeof(libusb_device *)); - libusb_device **cur = out; - unsigned int i; - int rc; - - if (!out) - return NULL; - - rc = libusb_get_device_list(NULL, &list); - if (rc <= 0) { - perror("No USB devices found"); - free(out); - return NULL; - } - - for (i = 0; list[i] != NULL; i++) { - struct libusb_device_descriptor dev_desc; - libusb_device *dev = list[i]; - - rc = libusb_get_device_descriptor(dev, &dev_desc); - if (rc < 0) { - perror("Couldn't get device descriptor\n"); - libusb_unref_device(dev); - continue; - } - - if (match_dev_ids(&dev_desc, dev_ids)) { - *cur = dev; - cur++; - /* FIXME: overflow check */ - } else - libusb_unref_device(dev); - } - if (cur == out) { - libusb_free_device_list(list, 1); - free(out); - return NULL; - } - - libusb_free_device_list(list, 0); - return out; -} - -int dev_find_matching_interfaces(libusb_device *dev, int class, int sub_class, int protocol, - struct usb_interface_match *out, unsigned int out_len) -{ - struct libusb_device_descriptor dev_desc; - int rc, i, out_idx = 0; - uint8_t addr; - char *path; - - rc = libusb_get_device_descriptor(dev, &dev_desc); - if (rc < 0) { - perror("Couldn't get device descriptor\n"); - return -EIO; - } - - addr = libusb_get_device_address(dev); - path = get_path(dev); - - /* iterate over all configurations */ - for (i = 0; i < dev_desc.bNumConfigurations; i++) { - struct libusb_config_descriptor *conf_desc; - int j; - - rc = libusb_get_config_descriptor(dev, i, &conf_desc); - if (rc < 0) { - fprintf(stderr, "Couldn't get config descriptor %u\n", i); - continue; - } - /* iterate over all interfaces */ - for (j = 0; j < conf_desc->bNumInterfaces; j++) { - const struct libusb_interface *intf = &conf_desc->interface[j]; - int k; - /* iterate over all alternate settings */ - for (k = 0; k < intf->num_altsetting; k++) { - const struct libusb_interface_descriptor *if_desc; - if_desc = &intf->altsetting[k]; - if (class >= 0 && if_desc->bInterfaceClass != class) - continue; - if (sub_class >= 0 && if_desc->bInterfaceSubClass != sub_class) - continue; - if (protocol >= 0 && if_desc->bInterfaceProtocol != protocol) - continue; - /* MATCH! */ - out[out_idx].usb_dev = dev; - out[out_idx].vendor = dev_desc.idVendor; - out[out_idx].product = dev_desc.idProduct; - out[out_idx].addr = addr; - strncpy(out[out_idx].path, path, sizeof(out[out_idx].path)-1); - out[out_idx].path[sizeof(out[out_idx].path)-1] = '\0'; - out[out_idx].configuration = conf_desc->bConfigurationValue; - out[out_idx].interface = if_desc->bInterfaceNumber; - out[out_idx].altsetting = if_desc->bAlternateSetting; - out[out_idx].class = if_desc->bInterfaceClass; - out[out_idx].sub_class = if_desc->bInterfaceSubClass; - out[out_idx].protocol = if_desc->bInterfaceProtocol; - out[out_idx].string_idx = if_desc->iInterface; - out_idx++; - if (out_idx >= out_len) - return out_idx; - } - } - } - return out_idx; -} - -int usb_match_interfaces(libusb_context *ctx, const struct dev_id *dev_ids, - int class, int sub_class, int protocol, - struct usb_interface_match *out, unsigned int out_len) -{ - struct usb_interface_match *out_cur = out; - unsigned int out_len_remain = out_len; - libusb_device **list; - libusb_device **dev; - - list = find_matching_usb_devs(dev_ids); - if (!list) - return 0; - - for (dev = list; *dev; dev++) { - int rc; - -#if 0 - struct libusb_device_descriptor dev_desc; - uint8_t ports[8]; - uint8_t addr; - rc = libusb_get_device_descriptor(*dev, &dev_desc); - if (rc < 0) { - perror("Cannot get device descriptor"); - continue; - } - - addr = libusb_get_device_address(*dev); - - rc = libusb_get_port_numbers(*dev, ports, sizeof(ports)); - if (rc < 0) { - perror("Cannot get device path"); - continue; - } - - printf("Found USB Device %04x:%04x at address %d\n", - dev_desc.idVendor, dev_desc.idProduct, addr); -#endif - - rc = dev_find_matching_interfaces(*dev, class, sub_class, protocol, out_cur, out_len_remain); - if (rc < 0) - continue; - out_cur += rc; - out_len_remain -= rc; - - } - return out_len - out_len_remain; -} - -libusb_device_handle *usb_open_claim_interface(libusb_context *ctx, - const struct usb_interface_match *ifm) -{ - int rc, config; - struct dev_id dev_ids[] = { { ifm->vendor, ifm->product }, { 0, 0 } }; - libusb_device **list; - libusb_device **dev; - libusb_device_handle *usb_devh = NULL; - - list = find_matching_usb_devs(dev_ids); - if (!list) { - perror("No USB device with matching VID/PID"); - return NULL; - } - - for (dev = list; *dev; dev++) { - int addr; - char *path; - - addr = libusb_get_device_address(*dev); - path = get_path(*dev); - if ((ifm->addr && addr == ifm->addr) || - (strlen(ifm->path) && !strcmp(path, ifm->path))) { - rc = libusb_open(*dev, &usb_devh); - if (rc < 0) { - fprintf(stderr, "Cannot open device: %s\n", libusb_error_name(rc)); - usb_devh = NULL; - break; - } - rc = libusb_get_configuration(usb_devh, &config); - if (rc < 0) { - fprintf(stderr, "Cannot get current configuration: %s\n", libusb_error_name(rc)); - libusb_close(usb_devh); - usb_devh = NULL; - break; - } - if (config != ifm->configuration) { - rc = libusb_set_configuration(usb_devh, ifm->configuration); - if (rc < 0) { - fprintf(stderr, "Cannot set configuration: %s\n", libusb_error_name(rc)); - libusb_close(usb_devh); - usb_devh = NULL; - break; - } - } - rc = libusb_claim_interface(usb_devh, ifm->interface); - if (rc < 0) { - fprintf(stderr, "Cannot claim interface: %s\n", libusb_error_name(rc)); - libusb_close(usb_devh); - usb_devh = NULL; - break; - } - rc = libusb_set_interface_alt_setting(usb_devh, ifm->interface, ifm->altsetting); - if (rc < 0) { - fprintf(stderr, "Cannot set interface altsetting: %s\n", libusb_error_name(rc)); - libusb_release_interface(usb_devh, ifm->interface); - libusb_close(usb_devh); - usb_devh = NULL; - break; - } - } - } - - /* unref / free list */ - for (dev = list; *dev; dev++) - libusb_unref_device(*dev); - free(list); - - return usb_devh; -} - -/*! \brief obtain the endpoint addresses for a given USB interface */ -int get_usb_ep_addrs(libusb_device_handle *devh, unsigned int if_num, - uint8_t *out, uint8_t *in, uint8_t *irq) -{ - libusb_device *dev = libusb_get_device(devh); - struct libusb_config_descriptor *cdesc; - const struct libusb_interface_descriptor *idesc; - const struct libusb_interface *iface; - int rc, l; - - rc = libusb_get_active_config_descriptor(dev, &cdesc); - if (rc < 0) - return rc; - - iface = &cdesc->interface[if_num]; - /* FIXME: we assume there's no altsetting */ - idesc = &iface->altsetting[0]; - - for (l = 0; l < idesc->bNumEndpoints; l++) { - const struct libusb_endpoint_descriptor *edesc = &idesc->endpoint[l]; - switch (edesc->bmAttributes & 3) { - case LIBUSB_TRANSFER_TYPE_BULK: - if (edesc->bEndpointAddress & 0x80) { - if (in) - *in = edesc->bEndpointAddress; - } else { - if (out) - *out = edesc->bEndpointAddress; - } - break; - case LIBUSB_TRANSFER_TYPE_INTERRUPT: - if (irq) - *irq = edesc->bEndpointAddress; - break; - default: - break; - } - } - return 0; -} diff --git a/host/src/Makefile.am b/host/src/Makefile.am index 29f2405..c3283ba 100644 --- a/host/src/Makefile.am +++ b/host/src/Makefile.am @@ -1,9 +1,9 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOSIM_CFLAGS) $(LIBUSB_CFLAGS) $(COVERAGE_FLAGS) +AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOSIM_CFLAGS) $(LIBOSMOUSB_CFLAGS) $(LIBUSB_CFLAGS) $(COVERAGE_FLAGS) AM_LDFLAGS=$(COVERAGE_LDFLAGS) LDADD= $(top_builddir)/lib/libosmo-simtrace2.la \ - $(LIBOSMOCORE_LIBS) $(LIBOSMOSIM_LIBS) $(LIBUSB_LIBS) + $(LIBOSMOCORE_LIBS) $(LIBOSMOSIM_LIBS) $(LIBOSMOUSB_LIBS) $(LIBUSB_LIBS) bin_PROGRAMS = simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list simtrace2-sniff diff --git a/host/src/simtrace2-remsim.c b/host/src/simtrace2-remsim.c index d51f081..7d5ecd3 100644 --- a/host/src/simtrace2-remsim.c +++ b/host/src/simtrace2-remsim.c @@ -38,7 +38,7 @@ #include -#include +#include #include #include #include @@ -404,7 +404,7 @@ ifm->addr = addr; if (path) osmo_strlcpy(ifm->path, path, sizeof(ifm->path)); - transp->usb_devh = usb_open_claim_interface(NULL, ifm); + transp->usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, ifm); if (!transp->usb_devh) { fprintf(stderr, "can't open USB device\n"); goto close_exit; @@ -416,7 +416,7 @@ goto close_exit; } - rc = get_usb_ep_addrs(transp->usb_devh, if_num, &transp->usb_ep.out, + rc = osmo_libusb_get_ep_addrs(transp->usb_devh, if_num, &transp->usb_ep.out, &transp->usb_ep.in, &transp->usb_ep.irq_in); if (rc < 0) { fprintf(stderr, "can't obtain EP addrs; rc=%d\n", rc); diff --git a/host/src/simtrace2-sniff.c b/host/src/simtrace2-sniff.c index c4cec1e..dfb6e7c 100644 --- a/host/src/simtrace2-sniff.c +++ b/host/src/simtrace2-sniff.c @@ -37,7 +37,7 @@ #include -#include +#include #include #include @@ -384,7 +384,7 @@ goto do_exit; } struct usb_interface_match ifm_scan[16]; - int num_interfaces = usb_match_interfaces(NULL, compatible_dev_ids, + int num_interfaces = osmo_libusb_find_matching_interfaces(NULL, compatible_dev_ids, USB_CLASS_PROPRIETARY, SIMTRACE_SNIFFER_USB_SUBCLASS, -1, ifm_scan, ARRAY_SIZE(ifm_scan)); if (num_interfaces <= 0) { perror("No compatible USB devices found"); @@ -473,7 +473,7 @@ signal(SIGINT, &signal_handler); do { - _transp.usb_devh = usb_open_claim_interface(NULL, &ifm_selected); + _transp.usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, &ifm_selected); if (!_transp.usb_devh) { fprintf(stderr, "can't open USB device\n"); goto close_exit; @@ -485,8 +485,8 @@ goto close_exit; } - rc = get_usb_ep_addrs(_transp.usb_devh, ifm_selected.interface, &_transp.usb_ep.out, - &_transp.usb_ep.in, &_transp.usb_ep.irq_in); + rc = osmo_libusb_get_ep_addrs(_transp.usb_devh, ifm_selected.interface, &_transp.usb_ep.out, + &_transp.usb_ep.in, &_transp.usb_ep.irq_in); if (rc < 0) { fprintf(stderr, "can't obtain EP addrs; rc=%d\n", rc); goto close_exit; diff --git a/host/src/simtrace2_usb.c b/host/src/simtrace2_usb.c index d31ff29..94e19ff 100644 --- a/host/src/simtrace2_usb.c +++ b/host/src/simtrace2_usb.c @@ -23,7 +23,7 @@ #include -#include +#include #include static const struct dev_id compatible_dev_ids[] = { @@ -38,9 +38,9 @@ struct usb_interface_match ifm[16]; int rc, i, num_interfaces; - /* scan for USB devices matching SIMtrace USB ID with proprietary class */ - rc = usb_match_interfaces(NULL, compatible_dev_ids, - USB_CLASS_PROPRIETARY, -1, -1, ifm, ARRAY_SIZE(ifm)); + /* scan for USB devices matching SIMtrace USB ID with proprietary class */ + rc = osmo_libusb_find_matching_interfaces(NULL, compatible_dev_ids, + USB_CLASS_PROPRIETARY, -1, -1, ifm, ARRAY_SIZE(ifm)); printf("USB matches: %d\n", rc); if (rc < 0) return rc; diff --git a/host/src/usb2udp.c b/host/src/usb2udp.c index 23800fd..57cee74 100644 --- a/host/src/usb2udp.c +++ b/host/src/usb2udp.c @@ -35,9 +35,9 @@ #include +#include #include #include -#include #include #include @@ -259,7 +259,7 @@ g_udp_ofd.cb = ofd_udp_cb; osmo_sock_init_ofd(&g_udp_ofd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, NULL, local_udp_port + if_num, OSMO_SOCK_F_BIND); - rc = get_usb_ep_addrs(g_devh, if_num, &g_buf_out.ep, &g_buf_in.ep, NULL); + rc = osmo_libusb_get_ep_addrs(g_devh, if_num, &g_buf_out.ep, &g_buf_in.ep, NULL); if (rc < 0) { fprintf(stderr, "couldn't find enpdoint addresses; rc=%d\n", rc); goto close_exit; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ib588c08f873c4da8f3a02815ee2767674a6a5061 Gerrit-Change-Number: 16679 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Dec 27 12:33:22 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 27 Dec 2019 12:33:22 +0000 Subject: Change in osmo-pcu[master]: Pass paging group instead of imsi where later is not needed In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16672 ) Change subject: Pass paging group instead of imsi where later is not needed ...................................................................... Patch Set 1: > so iiuc it makes sense to convert it to a uint16_t with atoi() or > strtoul() and pass that all over right? yes, that would make more sense, IMHO. thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id0663a81f439f2d0b893b0d34f85a6db1927ef8e Gerrit-Change-Number: 16672 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 27 Dec 2019 12:33:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 28 00:23:27 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 28 Dec 2019 00:23:27 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_08.c: fix: do not crash on malformed Mobile Identity References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/16683 ) Change subject: libmsc/gsm_04_08.c: fix: do not crash on malformed Mobile Identity ...................................................................... libmsc/gsm_04_08.c: fix: do not crash on malformed Mobile Identity Change-Id: Ica4c90b8eb4d90325313c6eb400fa4a6bc5df825 Fixes: OS#4340 --- M src/libmsc/gsm_04_08.c 1 file changed, 29 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/83/16683/1 diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 750c766..331449a 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -192,6 +192,21 @@ DEBUGP(DMM, "IDENTITY RESPONSE: MI=%s\n", osmo_mi_name(mi, mi_len)); + if (!mi_len) + return -EINVAL; + switch (mi[0] & GSM_MI_TYPE_MASK) { + case GSM_MI_TYPE_IMSI: + case GSM_MI_TYPE_IMEI: + case GSM_MI_TYPE_IMEISV: + case GSM_MI_TYPE_TMSI: + break; + default: + LOGP(DMM, LOGL_ERROR, "MM Identity Response contains " + "unknown Mobile Identity type=0x%02x\n", + mi[0] & GSM_MI_TYPE_MASK); + return -EINVAL; + } + osmo_signal_dispatch(SS_SUBSCR, S_SUBSCR_IDENTITY, gh->data); return vlr_subscr_rx_id_resp(vsub, mi, mi_len); @@ -1184,6 +1199,20 @@ if (!mi) return 0; + if (!mi->len) + return -EINVAL; + switch (mi->val[0] & GSM_MI_TYPE_MASK) { + case GSM_MI_TYPE_IMSI: + case GSM_MI_TYPE_IMEI: + case GSM_MI_TYPE_IMEISV: + case GSM_MI_TYPE_TMSI: + break; + default: + LOGP(DMM, LOGL_ERROR, "RR Ciphering Mode Complete contains " + "unknown Mobile Identity type=0x%02x\n", + mi->val[0] & GSM_MI_TYPE_MASK); + return -EINVAL; + } LOG_MSC_A(msc_a, LOGL_DEBUG, "RR Ciphering Mode Complete contains Mobile Identity: %s\n", osmo_mi_name(mi->val, mi->len)); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ica4c90b8eb4d90325313c6eb400fa4a6bc5df825 Gerrit-Change-Number: 16683 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Dec 28 16:56:51 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 28 Dec 2019 16:56:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_invalid_id_resp_crash for OS#4340 References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16684 ) Change subject: MSC_Tests.ttcn: introduce TC_invalid_id_resp_crash for OS#4340 ...................................................................... MSC_Tests.ttcn: introduce TC_invalid_id_resp_crash for OS#4340 Change-Id: I62f23355eb91df2edf9dc837c928cb86b530b743 Related: OS#4340 --- M msc/MSC_Tests.ttcn 1 file changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/84/16684/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index e2728d3..de4f0a9 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -5711,6 +5711,43 @@ vc_conn.done; } +friend function f_tc_invalid_id_resp_crash(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + pars.tmsi := f_rnd_octstring(4); + f_init_handler(pars); + + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Initiate Location Updating using an unknown TMSI */ + f_bssap_compl_l3(f_build_lu_tmsi(pars.tmsi)); + + /* Expect an Identity Request, send response with no identity */ + BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_MM_ID_Req(CM_ID_TYPE_IMSI))); + BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_MM_ID_Rsp({ + lengthIndicator := 0, + mobileIdentityV := { + typeOfIdentity := '000'B, + oddEvenInd_identity := { + no_identity := { + oddevenIndicator := '0'B, + fillerDigits := 'FFFFF'H + } + } + } + }))); + + f_expect_lu_reject(); + f_expect_clear(); +} +testcase TC_invalid_id_resp_crash() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + + f_init(); + + vc_conn := f_start_handler(refers(f_tc_invalid_id_resp_crash), 7); + vc_conn.done; +} + control { execute( TC_cr_before_reset() ); execute( TC_lu_imsi_noauth_tmsi() ); @@ -5842,6 +5879,7 @@ execute( TC_lu_and_mt_call_osmux() ); } execute( TC_invalid_mgcp_crash() ); + execute( TC_invalid_id_resp_crash() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I62f23355eb91df2edf9dc837c928cb86b530b743 Gerrit-Change-Number: 16684 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 30 09:23:32 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 30 Dec 2019 09:23:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_invalid_id_resp_crash for OS#4340 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16684 ) Change subject: MSC_Tests.ttcn: introduce TC_invalid_id_resp_crash for OS#4340 ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16684/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16684/1//COMMIT_MSG at 8 PS1, Line 8: Please add better description regarding the crash here. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16684/1/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16684/1/msc/MSC_Tests.ttcn at 5714 PS1, Line 5714: friend function f_tc_invalid_id_resp_crash(charstring id, BSC_ConnHdlrPars pars) better Tc_resp_no_id ? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I62f23355eb91df2edf9dc837c928cb86b530b743 Gerrit-Change-Number: 16684 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 30 Dec 2019 09:23:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 30 10:28:34 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 30 Dec 2019 10:28:34 +0000 Subject: Change in osmo-trx[master]: radioInterfaceMulti: Fail to tune on freq not following multi-arfcn r... In-Reply-To: References: Message-ID: Hello ttsou, tnt, fixeria, laforge, Jenkins Builder, Hoernchen, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/16668 to look at the new patch set (#3). Change subject: radioInterfaceMulti: Fail to tune on freq not following multi-arfcn restrictions ...................................................................... radioInterfaceMulti: Fail to tune on freq not following multi-arfcn restrictions multi-arfcn feature uses a hardcoded disposition of logical channels on a physical channel. Logical channels in the phisical channel are separated by MCBTS_SPACING Hz, that is 4 GSM ARFCNs. As a result, multi-arfcn restricts the TRX ARFCN setup to the following: ARFCN(TRX0)=N, ARFCN(TRX1)=N+1*4, ARFCN(TRX2)=N+2*4, ... Let's make sure radioInterfaceMulti verifies the requested Rx/Tx frequencies for each logical channel over TRXC match the restriction explained above. It will check freq going to be set is indeed separated by MCBTS_SPACING from already set channels, making sure the ARFCN series is consistent. Otherwise, before this patch, one could set in osmo-bsc: ARFCN(TRX0)=N, ARFCN(TRX1)=N+2 and osmo-trx would silently ack the related Rx/TxTUNE TRXC commands, but actually still transmit on ARFCN N+4 instead. As a result, in this scenario TRX!=0 were unusable with multi-arfcn. Related: OS#4207 Change-Id: I2f3d66a611d3a489b3e4d9431994f4ec77b4460f --- M Transceiver52M/radioInterface.h M Transceiver52M/radioInterfaceMulti.cpp 2 files changed, 59 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/68/16668/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2f3d66a611d3a489b3e4d9431994f4ec77b4460f Gerrit-Change-Number: 16668 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Reviewer: ttsou Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 30 10:34:00 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 30 Dec 2019 10:34:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Introduce test TC_lu_imsi_timeout_tmsi_realloc In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16648 ) Change subject: msc: Introduce test TC_lu_imsi_timeout_tmsi_realloc ...................................................................... Patch Set 3: ping: more than 10 days without any more comment after new version has been submitted. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I603b2b2b1ae7edd6360ea38c6bbbfedc46e9fa5d Gerrit-Change-Number: 16648 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 30 Dec 2019 10:34:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 30 11:34:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 30 Dec 2019 11:34:01 +0000 Subject: Change in osmo-pcu[master]: Pass paging group instead of imsi where later is not needed In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/16672 to look at the new patch set (#2). Change subject: Pass paging group instead of imsi where later is not needed ...................................................................... Pass paging group instead of imsi where later is not needed Change-Id: Id0663a81f439f2d0b893b0d34f85a6db1927ef8e --- M src/bts.cpp M src/bts.h M src/gprs_bssgp_pcu.cpp M src/gprs_rlcmac.cpp M src/gprs_rlcmac.h M src/pcu_l1_if.cpp M src/pcu_l1_if.h M src/tbf.cpp M src/tbf_dl.cpp 9 files changed, 53 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/72/16672/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id0663a81f439f2d0b893b0d34f85a6db1927ef8e Gerrit-Change-Number: 16672 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 30 11:34:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 30 Dec 2019 11:34:01 +0000 Subject: Change in osmo-pcu[master]: Allow Gb PAGING-PS without P-TMSI In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/16536 to look at the new patch set (#3). Change subject: Allow Gb PAGING-PS without P-TMSI ...................................................................... Allow Gb PAGING-PS without P-TMSI P-TMSI is optional IE, but IE is mandatory and hence always available. Since the encoding is actually a Mobile Identity, the IMSI is used in case P-TMSI is not available. Change-Id: I4dbf8db04e81f98352a42ce34a5d91326be9bfd1 --- M src/encoding.cpp M src/encoding.h M src/gprs_bssgp_pcu.cpp M src/gprs_rlcmac.cpp M src/gprs_rlcmac.h 5 files changed, 29 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/36/16536/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4dbf8db04e81f98352a42ce34a5d91326be9bfd1 Gerrit-Change-Number: 16536 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 30 11:34:01 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 30 Dec 2019 11:34:01 +0000 Subject: Change in osmo-pcu[master]: Log BVCI PTP value upon msg recv In-Reply-To: References: Message-ID: Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/16674 to look at the new patch set (#2). Change subject: Log BVCI PTP value upon msg recv ...................................................................... Log BVCI PTP value upon msg recv Change-Id: I47c5902112d568cd5a48e003010d8085b02d64e8 --- M src/gprs_bssgp_pcu.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/74/16674/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I47c5902112d568cd5a48e003010d8085b02d64e8 Gerrit-Change-Number: 16674 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 30 13:16:07 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 30 Dec 2019 13:16:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Move NS tests to PCU_Tests_RAW_NS.ttcn References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16685 ) Change subject: pcu: Move NS tests to PCU_Tests_RAW_NS.ttcn ...................................................................... pcu: Move NS tests to PCU_Tests_RAW_NS.ttcn Tests from PCU_Tests_RAW_SNS inherit most infrastructure from NS tests defined in PCU_Tests_RAW, which in turn don't share that much with other tests present in that file. This way we simplify file PCU_Tests_RAW.ttcn, which will potentially grow once more tests are added. Change-Id: If680d1bd7dbfe98829f330c33705e0f13bedf3c7 --- M pcu/PCU_Tests.cfg M pcu/PCU_Tests_RAW.ttcn A pcu/PCU_Tests_RAW_NS.ttcn M pcu/PCU_Tests_RAW_SNS.ttcn 4 files changed, 458 insertions(+), 386 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/85/16685/1 diff --git a/pcu/PCU_Tests.cfg b/pcu/PCU_Tests.cfg index 6ea5a5a..0424e4f 100644 --- a/pcu/PCU_Tests.cfg +++ b/pcu/PCU_Tests.cfg @@ -22,3 +22,4 @@ [EXECUTE] PCU_Tests_RAW.control +PCU_Tests_RAW_NS.control diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index c800d43..d19093c 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -16,6 +16,8 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ +friend module PCU_Tests_RAW_NS; + import from General_Types all; import from Osmocom_Types all; import from GSM_Types all; @@ -42,8 +44,6 @@ import from PCUIF_CodecPort all; import from PCUIF_RAW_Components all; import from IPL4asp_Types all; -import from NS_CodecPort all; -import from NS_CodecPort_CtrlFunct all; import from Native_Functions all; import from PCU_Tests all; @@ -53,32 +53,9 @@ float X2002 := 0.2; /* Timer -2002, IMM ASSIGN confirm delay */ } -type component RAW_NS_CT { - /* UDP port towards the bottom (IUT) */ - port NS_CODEC_PT NSCP[4]; - var ConnectionId g_ns_conn_id[4] := {-1, -1, -1, -1}; - var NSConfiguration g_nsconfig[4]; - timer g_T_guard; -} - -type component RAW_PCU_CT { - /* PCUIF (we emulate the BTS part) */ - port PCUIF_CODEC_PT PCU; - var ConnectionId g_pcu_conn_id := -1; -} - -type component RAW_Test_CT extends RAW_NS_CT, RAW_PCU_CT { -} - -private altstep as_Tguard() runs on RAW_NS_CT { - [] g_T_guard.timeout { - setverdict(fail, "Timeout of T_guard"); - mtc.stop; - } -} /* FIXME: make sure to use parameters from mp_gb_cfg.cell_id in the PCU INFO IND */ -template (value) PCUIF_info_ind ts_PCUIF_INFO_default := { +private template (value) PCUIF_info_ind ts_PCUIF_INFO_default := { version := PCU_IF_VERSION, flags := c_PCUIF_Flags_default, trx := valueof(ts_PCUIF_InfoTrxs_def), @@ -114,356 +91,6 @@ remote_ip := { f_inet_haddr(mp_nsconfig.local_ip) , '00000000'O } } -function f_init_pcuif() runs on RAW_PCU_CT { - var PCUIF_info_ind info_ind; - map(self:PCU, system:PCU); - - - info_ind := valueof(ts_PCUIF_INFO_default); - - /* Connect the Unix Domain Socket */ - g_pcu_conn_id := f_pcuif_listen(PCU, mp_pcu_sock_path); - PCU.receive(UD_connected:?); - - /* Wait for PCU_VERSION and return INFO_IND */ - PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_TXT_IND(0, PCU_VERSION, ?))); - /* FIXME: make sure to use parameters from mp_gb_cfg.cell_id in the PCU INFO IND */ - var template PCUIF_Message info_ind_msg := ts_PCUIF_INFO_IND(0, info_ind); - PCU.send(t_SD_PCUIF(g_pcu_conn_id, info_ind_msg)); -} - -function f_pcuif_tx(template (value) PCUIF_Message msg) runs on RAW_PCU_CT { - PCU.send(t_SD_PCUIF(g_pcu_conn_id, msg)); -} - -function f_init_ns_codec(integer idx := 0, float guard_secs := 60.0) runs on RAW_NS_CT { - var Result res; - - if (not g_T_guard.running) { - g_T_guard.start(guard_secs); - activate(as_Tguard()); - } - - if (not isbound(g_nsconfig) or not isbound(g_nsconfig[idx])) { - /* copy most parts from mp_nsconfig */ - g_nsconfig[idx] := mp_nsconfig; - /* adjust those parts different for each NS-VC */ - g_nsconfig[idx].nsvci := mp_nsconfig.nsvci + idx; - g_nsconfig[idx].local_udp_port := mp_nsconfig.local_udp_port + idx; - } - - map(self:NSCP[idx], system:NSCP); - /* Connect the UDP socket */ - log("connecting NSCP[", idx, "] to ", g_nsconfig[idx]); - res := f_IPL4_connect(NSCP[idx], g_nsconfig[idx].remote_ip, g_nsconfig[idx].remote_udp_port, - g_nsconfig[idx].local_ip, g_nsconfig[idx].local_udp_port, 0, { udp := {}}); - if (not ispresent(res.connId)) { - setverdict(fail, "Could not connect NS UDP socket, check your configuration ", g_nsconfig[idx]); - mtc.stop; - } - g_ns_conn_id[idx] := res.connId; - -} - -function f_ns_exp(template PDU_NS exp_rx, integer idx := 0) runs on RAW_NS_CT return PDU_NS { - var NS_RecvFrom nrf; - log("f_ns_exp() expecting ", exp_rx); - alt { - [] NSCP[idx].receive(t_NS_RecvFrom(exp_rx)) -> value nrf { } - [] NSCP[idx].receive { - setverdict(fail, "Received unexpected NS: ", nrf); - mtc.stop; - } - } - return nrf.msg; -} - -/* perform outbound NS-ALIVE procedure */ -function f_outgoing_ns_alive(integer idx := 0) runs on RAW_NS_CT { - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE)); - alt { - [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE_ACK)); - [] NSCP[idx].receive { repeat; } - } -} - -/* perform outbound NS-ALIVE procedure */ -function f_outgoing_ns_alive_no_ack(integer idx := 0, float tout := 10.0) runs on RAW_NS_CT { - timer T := tout; - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE)); - T.start; - alt { - [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE_ACK)) { - setverdict(fail, "Received unexpected NS-ALIVE ACK"); - } - [] NSCP[idx].receive { repeat; } - [] T.timeout { - setverdict(pass); - } - } -} - -/* ensure no matching message is received within 'tout' */ -function f_ensure_no_ns(template PDU_NS ns := ?, integer idx := 0, float tout := 3.0) -runs on RAW_Test_CT { - timer T := tout; - T.start; - alt { - [] NSCP[idx].receive(t_NS_RecvFrom(ns)) { - setverdict(fail, "NS-ALIVE from unconfigured (possibly initial) endpoint"); - } - [] T.timeout { - setverdict(pass); - } - } -} - -/* perform outbound NS-BLOCK procedure */ -function f_outgoing_ns_block(NsCause cause, integer idx := 0) runs on RAW_NS_CT { - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_BLOCK(cause, g_nsconfig[idx].nsvci))); - alt { - [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_BLOCK_ACK(g_nsconfig[idx].nsvci))); - [] NSCP[idx].receive { repeat; } - } -} - -/* receive NS-ALIVE and ACK it */ -altstep as_rx_alive_tx_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { - [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE)) { - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE_ACK)); - if (not oneshot) { repeat; } - } -} - -/* Transmit BSSGP RESET for given BVCI and expect ACK */ -function f_tx_bvc_reset_rx_ack(BssgpBvci bvci, integer idx := 0, boolean exp_ack := true) -runs on RAW_NS_CT { - var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET(BSSGP_CAUSE_NET_SV_CAP_MOD_GT_ZERO_KBPS, bvci, - mp_gb_cfg.cell_id)); - timer T := 5.0; - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); - T.start; - alt { - [exp_ack] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, - decmatch tr_BVC_RESET_ACK(bvci, ?)))) { - setverdict(pass); - } - [exp_ack] T.timeout { - setverdict(fail, "No response to BVC-RESET"); - } - [not exp_ack] T.timeout { - setverdict(pass); - } - [] NSCP[idx].receive { repeat; } - } -} - -/* Receive a BSSGP RESET for given BVCI and ACK it */ -altstep as_rx_bvc_reset_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { - var NS_RecvFrom ns_rf; - /* FIXME: nail down received cell_id in match */ - [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, - decmatch tr_BVC_RESET(?, bvci, ?)))) - -> value ns_rf { - var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); - var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET_ACK(bvci, mp_gb_cfg.cell_id)); - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); - if (not oneshot) { repeat; } - } -} - - -/* Receive a BSSGP UNBLOCK for given BVCI and ACK it */ -altstep as_rx_bvc_unblock_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { - var NS_RecvFrom ns_rf; - [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, - decmatch t_BVC_UNBLOCK(bvci)))) - -> value ns_rf { - var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); - var PDU_BSSGP bssgp_tx := valueof(t_BVC_UNBLOCK_ACK(bvci)); - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); - if (not oneshot) { repeat; } - } -} - -/* Receive a BSSGP FLOW-CONTROL-BVC and ACK it */ -altstep as_rx_bvc_fc_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { - var NS_RecvFrom ns_rf; - [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, bvci, - decmatch tr_BVC_FC_BVC))) - -> value ns_rf { - var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); - var OCT1 tag := bssgp_rx.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value; - var PDU_BSSGP bssgp_tx := valueof(t_BVC_FC_BVC_ACK(tag)); - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, bvci, enc_PDU_BSSGP(bssgp_tx)))); - if (not oneshot) { repeat; } - } -} - -/********************************************************************************** - * Classic Gb/IP bring-up test cases using NS-{RESET,BLOCK,UNBLOCK} and no IP-SNS * - **********************************************************************************/ - -/* Receive a NS-RESET and ACK it */ -private altstep as_rx_ns_reset_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { - var NS_RecvFrom ns_rf; - [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_RESET(NS_CAUSE_OM_INTERVENTION, g_nsconfig[idx].nsvci, - g_nsconfig[idx].nsei))) -> value ns_rf { - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_RESET_ACK(g_nsconfig[idx].nsvci, - g_nsconfig[idx].nsei))); - if (not oneshot) { repeat; } - } -} -/* Receive a NS-UNBLOCK and ACK it */ -private altstep as_rx_ns_unblock_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { - var NS_RecvFrom ns_rf; - [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) -> value ns_rf { - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_UNBLOCK_ACK)); - if (not oneshot) { repeat; } - } -} - -/* test the NS-RESET procedure */ -testcase TC_ns_reset() runs on RAW_Test_CT { - f_init_ns_codec(); - f_init_pcuif(); - - - /* Expect inbound NS-RESET procedure */ - as_rx_ns_reset_ack(oneshot := true); - setverdict(pass); -} - -/* ensure NS-RESET are re-transmitted */ -testcase TC_ns_reset_retrans() runs on RAW_Test_CT { - f_init_ns_codec(); - f_init_pcuif(); - - var integer i; - for (i := 0; i < 3; i := i+1) { - NSCP[0].receive(t_NS_RecvFrom(tr_NS_RESET(NS_CAUSE_OM_INTERVENTION, - g_nsconfig[0].nsvci, g_nsconfig[0].nsei))); - } - - /* Expect inbound NS-RESET procedure */ - as_rx_ns_reset_ack(oneshot := true); - setverdict(pass); -} - -/* test the inbound NS-ALIVE procedure after NS-RESET */ -testcase TC_ns_alive() runs on RAW_Test_CT { - f_init_ns_codec(); - f_init_pcuif(); - - /* Expect inbound NS-RESET procedure */ - as_rx_ns_reset_ack(oneshot := true); - - /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ - as_rx_alive_tx_ack(oneshot := true); - setverdict(pass); -} - -/* Test for NS-RESET after NS-ALIVE timeout */ -testcase TC_ns_alive_timeout_reset() runs on RAW_Test_CT { - f_init_ns_codec(guard_secs := 100.0); - f_init_pcuif(); - - /* Expect inbound NS-RESET procedure */ - as_rx_ns_reset_ack(oneshot := true); - - /* wait for at least one NS-ALIVE */ - NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE)); - - /* wait for NS-RESET to re-appear, ignoring any NS-ALIVE until then */ - alt { - [] as_rx_ns_reset_ack(oneshot := true) { setverdict(pass); } - [] NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE)) { repeat; } - } -} - -/* test for NS-RESET/NS-ALIVE/NS-UNBLOCK */ -testcase TC_ns_unblock() runs on RAW_Test_CT { - f_init_ns_codec(); - f_init_pcuif(); - - /* Expect inbound NS-RESET procedure */ - as_rx_ns_reset_ack(oneshot := true); - - /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ - as_rx_alive_tx_ack(oneshot := true); - activate(as_rx_alive_tx_ack()); - - as_rx_ns_unblock_ack(oneshot := true); - setverdict(pass); -} - -/* test for NS-UNBLOCK re-transmissions */ -testcase TC_ns_unblock_retrans() runs on RAW_Test_CT { - f_init_ns_codec(); - f_init_pcuif(); - - /* Expect inbound NS-RESET procedure */ - as_rx_ns_reset_ack(oneshot := true); - - /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ - as_rx_alive_tx_ack(oneshot := true); - activate(as_rx_alive_tx_ack()); - - /* wait for first NS-UNBLOCK, don't respond */ - NSCP[0].receive(t_NS_RecvFrom(t_NS_UNBLOCK)); - - /* wait for re-transmission of NS-UNBLOCK */ - as_rx_ns_unblock_ack(oneshot := true); - setverdict(pass); -} - -/* full bring-up of the Gb link for NS and BSSGP layer up to BVC-FC */ -testcase TC_ns_full_bringup() runs on RAW_Test_CT { - f_init_ns_codec(); - f_init_pcuif(); - - /* Expect inbound NS-RESET procedure */ - as_rx_ns_reset_ack(oneshot := true); - - /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ - as_rx_alive_tx_ack(oneshot := true); - activate(as_rx_alive_tx_ack()); - - as_rx_ns_unblock_ack(oneshot := true); - - f_outgoing_ns_alive(); - - /* Expect BVC-RESET for signaling (0) and ptp BVCI */ - as_rx_bvc_reset_tx_ack(0, oneshot := true); - as_rx_bvc_reset_tx_ack(mp_gb_cfg.bvci, oneshot := true); - as_rx_bvc_unblock_tx_ack(mp_gb_cfg.bvci, oneshot := true); - - /* wait for one FLOW-CONTROL BVC and then ACK any further in the future */ - as_rx_bvc_fc_tx_ack(mp_gb_cfg.bvci, oneshot := true); - activate(as_rx_bvc_fc_tx_ack(mp_gb_cfg.bvci)); - setverdict(pass); -} - -/* test outbound (SGSN-originated) NS-BLOCK procedure */ -testcase TC_ns_so_block() runs on RAW_Test_CT { - f_init_ns_codec(); - f_init_pcuif(); - - /* Expect inbound NS-RESET procedure */ - as_rx_ns_reset_ack(oneshot := true); - - /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ - as_rx_alive_tx_ack(oneshot := true); - activate(as_rx_alive_tx_ack()); - - as_rx_ns_unblock_ack(oneshot := true); - - f_outgoing_ns_alive(); - - f_outgoing_ns_block(NS_CAUSE_EQUIPMENT_FAILURE); - setverdict(pass); -} - type record lqual_range { /* component reference to the IPA_Client component used for RSL */ uint8_t low, @@ -1774,15 +1401,6 @@ } control { - execute( TC_ns_reset() ); - execute( TC_ns_reset_retrans() ); - execute( TC_ns_alive() ); - execute( TC_ns_alive_timeout_reset() ); - execute( TC_ns_unblock() ); - execute( TC_ns_unblock_retrans() ); - execute( TC_ns_full_bringup() ); - execute( TC_ns_so_block() ); - execute( TC_pcuif_suspend() ); execute( TC_ta_ptcch_idle() ); execute( TC_ta_rach_imm_ass() ); diff --git a/pcu/PCU_Tests_RAW_NS.ttcn b/pcu/PCU_Tests_RAW_NS.ttcn new file mode 100644 index 0000000..b1b19bb --- /dev/null +++ b/pcu/PCU_Tests_RAW_NS.ttcn @@ -0,0 +1,453 @@ +module PCU_Tests_RAW_NS { + +/* Osmocom PCU test suite for IP Sub-Network-Service (SNS) in TTCN-3 + * (C) 2018-2019 Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from General_Types all; +import from Osmocom_Types all; +import from PCU_Tests all; +import from PCU_Tests_RAW all; +import from Osmocom_Gb_Types all; +import from NS_CodecPort all; +import from NS_Types all; +import from BSSGP_Types all; +import from UD_Types all; +import from NS_CodecPort all; +import from NS_CodecPort_CtrlFunct all; +import from NS_Emulation all; +import from Native_Functions all; +import from IPL4asp_Types all; +import from PCUIF_Types all; +import from PCUIF_CodecPort all; + +type component RAW_NS_CT { + /* UDP port towards the bottom (IUT) */ + port NS_CODEC_PT NSCP[4]; + var ConnectionId g_ns_conn_id[4] := {-1, -1, -1, -1}; + var NSConfiguration g_nsconfig[4]; + timer g_T_guard; +} + +type component RAW_PCU_CT { + /* PCUIF (we emulate the BTS part) */ + port PCUIF_CODEC_PT PCU; + var ConnectionId g_pcu_conn_id := -1; +} + +type component RAW_Test_CT extends RAW_NS_CT, RAW_PCU_CT { +} + +private altstep as_Tguard() runs on RAW_NS_CT { + [] g_T_guard.timeout { + setverdict(fail, "Timeout of T_guard"); + mtc.stop; + } +} + +/* FIXME: make sure to use parameters from mp_gb_cfg.cell_id in the PCU INFO IND */ +private template (value) PCUIF_info_ind ts_PCUIF_INFO_default := { + version := PCU_IF_VERSION, + flags := c_PCUIF_Flags_default, + trx := valueof(ts_PCUIF_InfoTrxs_def), + bsic := 7, + mcc := 262, + mnc := 42, + mnc_3_digits := 0, + lac := 13135, + rac := 0, + nsei := mp_nsconfig.nsei, + nse_timer := { 3, 3, 3, 3, 30, 3, 10 }, + cell_timer := { 3, 3, 3, 3, 3, 10, 3, 10, 3, 10, 3 }, + cell_id := 20960, + repeat_time := 5 * 50, + repeat_count := 3, + bvci := mp_gb_cfg.bvci, + t3142 := 20, + t3169 := 5, + t3191 := 5, + t3193_10ms := 160, + t3195 := 5, + t3101 := 10, + t3103 := 4, + t3105 := 8, + cv_countdown := 15, + dl_tbf_ext := 250 * 10, /* ms */ + ul_tbf_ext := 250 * 10, /* ms */ + initial_cs := 2, + initial_mcs := 6, + nsvci := { mp_nsconfig.nsvci, 0 }, + local_pprt := { mp_nsconfig.remote_udp_port, 0 }, + remote_port := { mp_nsconfig.local_udp_port, 0 }, + remote_ip := { f_inet_haddr(mp_nsconfig.local_ip) , '00000000'O } +} + +function f_init_pcuif() runs on RAW_PCU_CT { + var PCUIF_info_ind info_ind; + map(self:PCU, system:PCU); + + + info_ind := valueof(ts_PCUIF_INFO_default); + + /* Connect the Unix Domain Socket */ + g_pcu_conn_id := f_pcuif_listen(PCU, mp_pcu_sock_path); + PCU.receive(UD_connected:?); + + /* Wait for PCU_VERSION and return INFO_IND */ + PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_TXT_IND(0, PCU_VERSION, ?))); + /* FIXME: make sure to use parameters from mp_gb_cfg.cell_id in the PCU INFO IND */ + var template PCUIF_Message info_ind_msg := ts_PCUIF_INFO_IND(0, info_ind); + PCU.send(t_SD_PCUIF(g_pcu_conn_id, info_ind_msg)); +} + +function f_pcuif_tx(template (value) PCUIF_Message msg) runs on RAW_PCU_CT { + PCU.send(t_SD_PCUIF(g_pcu_conn_id, msg)); +} + +function f_init_ns_codec(integer idx := 0, float guard_secs := 60.0) runs on RAW_NS_CT { + var Result res; + + if (not g_T_guard.running) { + g_T_guard.start(guard_secs); + activate(as_Tguard()); + } + + if (not isbound(g_nsconfig) or not isbound(g_nsconfig[idx])) { + /* copy most parts from mp_nsconfig */ + g_nsconfig[idx] := mp_nsconfig; + /* adjust those parts different for each NS-VC */ + g_nsconfig[idx].nsvci := mp_nsconfig.nsvci + idx; + g_nsconfig[idx].local_udp_port := mp_nsconfig.local_udp_port + idx; + } + + map(self:NSCP[idx], system:NSCP); + /* Connect the UDP socket */ + log("connecting NSCP[", idx, "] to ", g_nsconfig[idx]); + res := f_IPL4_connect(NSCP[idx], g_nsconfig[idx].remote_ip, g_nsconfig[idx].remote_udp_port, + g_nsconfig[idx].local_ip, g_nsconfig[idx].local_udp_port, 0, { udp := {}}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect NS UDP socket, check your configuration ", g_nsconfig[idx]); + mtc.stop; + } + g_ns_conn_id[idx] := res.connId; + +} + +function f_ns_exp(template PDU_NS exp_rx, integer idx := 0) runs on RAW_NS_CT return PDU_NS { + var NS_RecvFrom nrf; + log("f_ns_exp() expecting ", exp_rx); + alt { + [] NSCP[idx].receive(t_NS_RecvFrom(exp_rx)) -> value nrf { } + [] NSCP[idx].receive { + setverdict(fail, "Received unexpected NS: ", nrf); + mtc.stop; + } + } + return nrf.msg; +} + +/* perform outbound NS-ALIVE procedure */ +function f_outgoing_ns_alive(integer idx := 0) runs on RAW_NS_CT { + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE)); + alt { + [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE_ACK)); + [] NSCP[idx].receive { repeat; } + } +} + +/* perform outbound NS-ALIVE procedure */ +function f_outgoing_ns_alive_no_ack(integer idx := 0, float tout := 10.0) runs on RAW_NS_CT { + timer T := tout; + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE)); + T.start; + alt { + [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE_ACK)) { + setverdict(fail, "Received unexpected NS-ALIVE ACK"); + } + [] NSCP[idx].receive { repeat; } + [] T.timeout { + setverdict(pass); + } + } +} + +/* ensure no matching message is received within 'tout' */ +function f_ensure_no_ns(template PDU_NS ns := ?, integer idx := 0, float tout := 3.0) +runs on RAW_Test_CT { + timer T := tout; + T.start; + alt { + [] NSCP[idx].receive(t_NS_RecvFrom(ns)) { + setverdict(fail, "NS-ALIVE from unconfigured (possibly initial) endpoint"); + } + [] T.timeout { + setverdict(pass); + } + } +} + +/* perform outbound NS-BLOCK procedure */ +function f_outgoing_ns_block(NsCause cause, integer idx := 0) runs on RAW_NS_CT { + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_BLOCK(cause, g_nsconfig[idx].nsvci))); + alt { + [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_BLOCK_ACK(g_nsconfig[idx].nsvci))); + [] NSCP[idx].receive { repeat; } + } +} + +/* receive NS-ALIVE and ACK it */ +altstep as_rx_alive_tx_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { + [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE)) { + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE_ACK)); + if (not oneshot) { repeat; } + } +} + +/* Transmit BSSGP RESET for given BVCI and expect ACK */ +function f_tx_bvc_reset_rx_ack(BssgpBvci bvci, integer idx := 0, boolean exp_ack := true) +runs on RAW_NS_CT { + var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET(BSSGP_CAUSE_NET_SV_CAP_MOD_GT_ZERO_KBPS, bvci, + mp_gb_cfg.cell_id)); + timer T := 5.0; + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); + T.start; + alt { + [exp_ack] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, + decmatch tr_BVC_RESET_ACK(bvci, ?)))) { + setverdict(pass); + } + [exp_ack] T.timeout { + setverdict(fail, "No response to BVC-RESET"); + } + [not exp_ack] T.timeout { + setverdict(pass); + } + [] NSCP[idx].receive { repeat; } + } +} + +/* Receive a BSSGP RESET for given BVCI and ACK it */ +altstep as_rx_bvc_reset_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { + var NS_RecvFrom ns_rf; + /* FIXME: nail down received cell_id in match */ + [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, + decmatch tr_BVC_RESET(?, bvci, ?)))) + -> value ns_rf { + var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); + var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET_ACK(bvci, mp_gb_cfg.cell_id)); + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); + if (not oneshot) { repeat; } + } +} + + +/* Receive a BSSGP UNBLOCK for given BVCI and ACK it */ +altstep as_rx_bvc_unblock_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { + var NS_RecvFrom ns_rf; + [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, + decmatch t_BVC_UNBLOCK(bvci)))) + -> value ns_rf { + var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); + var PDU_BSSGP bssgp_tx := valueof(t_BVC_UNBLOCK_ACK(bvci)); + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); + if (not oneshot) { repeat; } + } +} + +/* Receive a BSSGP FLOW-CONTROL-BVC and ACK it */ +altstep as_rx_bvc_fc_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { + var NS_RecvFrom ns_rf; + [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, bvci, + decmatch tr_BVC_FC_BVC))) + -> value ns_rf { + var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); + var OCT1 tag := bssgp_rx.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value; + var PDU_BSSGP bssgp_tx := valueof(t_BVC_FC_BVC_ACK(tag)); + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, bvci, enc_PDU_BSSGP(bssgp_tx)))); + if (not oneshot) { repeat; } + } +} + +/********************************************************************************** + * Classic Gb/IP bring-up test cases using NS-{RESET,BLOCK,UNBLOCK} and no IP-SNS * + **********************************************************************************/ + +/* Receive a NS-RESET and ACK it */ +private altstep as_rx_ns_reset_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { + var NS_RecvFrom ns_rf; + [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_RESET(NS_CAUSE_OM_INTERVENTION, g_nsconfig[idx].nsvci, + g_nsconfig[idx].nsei))) -> value ns_rf { + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_RESET_ACK(g_nsconfig[idx].nsvci, + g_nsconfig[idx].nsei))); + if (not oneshot) { repeat; } + } +} +/* Receive a NS-UNBLOCK and ACK it */ +private altstep as_rx_ns_unblock_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { + var NS_RecvFrom ns_rf; + [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) -> value ns_rf { + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_UNBLOCK_ACK)); + if (not oneshot) { repeat; } + } +} + +/* test the NS-RESET procedure */ +testcase TC_ns_reset() runs on RAW_Test_CT { + f_init_ns_codec(); + f_init_pcuif(); + + + /* Expect inbound NS-RESET procedure */ + as_rx_ns_reset_ack(oneshot := true); + setverdict(pass); +} + +/* ensure NS-RESET are re-transmitted */ +testcase TC_ns_reset_retrans() runs on RAW_Test_CT { + f_init_ns_codec(); + f_init_pcuif(); + + var integer i; + for (i := 0; i < 3; i := i+1) { + NSCP[0].receive(t_NS_RecvFrom(tr_NS_RESET(NS_CAUSE_OM_INTERVENTION, + g_nsconfig[0].nsvci, g_nsconfig[0].nsei))); + } + + /* Expect inbound NS-RESET procedure */ + as_rx_ns_reset_ack(oneshot := true); + setverdict(pass); +} + +/* test the inbound NS-ALIVE procedure after NS-RESET */ +testcase TC_ns_alive() runs on RAW_Test_CT { + f_init_ns_codec(); + f_init_pcuif(); + + /* Expect inbound NS-RESET procedure */ + as_rx_ns_reset_ack(oneshot := true); + + /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ + as_rx_alive_tx_ack(oneshot := true); + setverdict(pass); +} + +/* Test for NS-RESET after NS-ALIVE timeout */ +testcase TC_ns_alive_timeout_reset() runs on RAW_Test_CT { + f_init_ns_codec(guard_secs := 100.0); + f_init_pcuif(); + + /* Expect inbound NS-RESET procedure */ + as_rx_ns_reset_ack(oneshot := true); + + /* wait for at least one NS-ALIVE */ + NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE)); + + /* wait for NS-RESET to re-appear, ignoring any NS-ALIVE until then */ + alt { + [] as_rx_ns_reset_ack(oneshot := true) { setverdict(pass); } + [] NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE)) { repeat; } + } +} + +/* test for NS-RESET/NS-ALIVE/NS-UNBLOCK */ +testcase TC_ns_unblock() runs on RAW_Test_CT { + f_init_ns_codec(); + f_init_pcuif(); + + /* Expect inbound NS-RESET procedure */ + as_rx_ns_reset_ack(oneshot := true); + + /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ + as_rx_alive_tx_ack(oneshot := true); + activate(as_rx_alive_tx_ack()); + + as_rx_ns_unblock_ack(oneshot := true); + setverdict(pass); +} + +/* test for NS-UNBLOCK re-transmissions */ +testcase TC_ns_unblock_retrans() runs on RAW_Test_CT { + f_init_ns_codec(); + f_init_pcuif(); + + /* Expect inbound NS-RESET procedure */ + as_rx_ns_reset_ack(oneshot := true); + + /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ + as_rx_alive_tx_ack(oneshot := true); + activate(as_rx_alive_tx_ack()); + + /* wait for first NS-UNBLOCK, don't respond */ + NSCP[0].receive(t_NS_RecvFrom(t_NS_UNBLOCK)); + + /* wait for re-transmission of NS-UNBLOCK */ + as_rx_ns_unblock_ack(oneshot := true); + setverdict(pass); +} + +/* full bring-up of the Gb link for NS and BSSGP layer up to BVC-FC */ +testcase TC_ns_full_bringup() runs on RAW_Test_CT { + f_init_ns_codec(); + f_init_pcuif(); + + /* Expect inbound NS-RESET procedure */ + as_rx_ns_reset_ack(oneshot := true); + + /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ + as_rx_alive_tx_ack(oneshot := true); + activate(as_rx_alive_tx_ack()); + + as_rx_ns_unblock_ack(oneshot := true); + + f_outgoing_ns_alive(); + + /* Expect BVC-RESET for signaling (0) and ptp BVCI */ + as_rx_bvc_reset_tx_ack(0, oneshot := true); + as_rx_bvc_reset_tx_ack(mp_gb_cfg.bvci, oneshot := true); + as_rx_bvc_unblock_tx_ack(mp_gb_cfg.bvci, oneshot := true); + + /* wait for one FLOW-CONTROL BVC and then ACK any further in the future */ + as_rx_bvc_fc_tx_ack(mp_gb_cfg.bvci, oneshot := true); + activate(as_rx_bvc_fc_tx_ack(mp_gb_cfg.bvci)); + setverdict(pass); +} + +/* test outbound (SGSN-originated) NS-BLOCK procedure */ +testcase TC_ns_so_block() runs on RAW_Test_CT { + f_init_ns_codec(); + f_init_pcuif(); + + /* Expect inbound NS-RESET procedure */ + as_rx_ns_reset_ack(oneshot := true); + + /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ + as_rx_alive_tx_ack(oneshot := true); + activate(as_rx_alive_tx_ack()); + + as_rx_ns_unblock_ack(oneshot := true); + + f_outgoing_ns_alive(); + + f_outgoing_ns_block(NS_CAUSE_EQUIPMENT_FAILURE); + setverdict(pass); +} + + +control { + execute( TC_ns_reset() ); + execute( TC_ns_reset_retrans() ); + execute( TC_ns_alive() ); + execute( TC_ns_alive_timeout_reset() ); + execute( TC_ns_unblock() ); + execute( TC_ns_unblock_retrans() ); + execute( TC_ns_full_bringup() ); + execute( TC_ns_so_block() ); +} + +} diff --git a/pcu/PCU_Tests_RAW_SNS.ttcn b/pcu/PCU_Tests_RAW_SNS.ttcn index c8520e7..1a8c30f 100644 --- a/pcu/PCU_Tests_RAW_SNS.ttcn +++ b/pcu/PCU_Tests_RAW_SNS.ttcn @@ -12,7 +12,7 @@ import from Osmocom_Types all; import from PCU_Tests all; -import from PCU_Tests_RAW all; +import from PCU_Tests_RAW_NS all; import from Osmocom_Gb_Types all; import from NS_CodecPort all; import from NS_Types all; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If680d1bd7dbfe98829f330c33705e0f13bedf3c7 Gerrit-Change-Number: 16685 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 30 13:19:03 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 30 Dec 2019 13:19:03 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu: Run tests from PCU_Tests_RAW_NS.ttcn References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/16686 ) Change subject: ttcn3-pcu: Run tests from PCU_Tests_RAW_NS.ttcn ...................................................................... ttcn3-pcu: Run tests from PCU_Tests_RAW_NS.ttcn NS tests have been splitted recently into their own module. Make sure we call tests from the new module. Depends: osmo-ttcn3-hacks.git If680d1bd7dbfe98829f330c33705e0f13bedf3c7 Change-Id: I3e2ec21c56fbfad5d1af051dcc0d0a9c88d2070a --- M ttcn3-pcu-test/PCU_Tests.cfg 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/86/16686/1 diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg index 9520775..8c75ca9 100644 --- a/ttcn3-pcu-test/PCU_Tests.cfg +++ b/ttcn3-pcu-test/PCU_Tests.cfg @@ -24,3 +24,4 @@ [EXECUTE] PCU_Tests_RAW.control +PCU_Tests_RAW_NS.control -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3e2ec21c56fbfad5d1af051dcc0d0a9c88d2070a Gerrit-Change-Number: 16686 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 30 16:10:59 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 30 Dec 2019 16:10:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_rach_egprs_only References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16687 ) Change subject: pcu: Introduce test TC_rach_egprs_only ...................................................................... pcu: Introduce test TC_rach_egprs_only Change-Id: I96e0d28bed749ef657f0b68d0beee3f8471ab3e0 --- M library/GSM_RR_Types.ttcn M pcu/PCU_Tests_RAW.ttcn 2 files changed, 74 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/87/16687/1 diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index f5eeda5..4c2874a 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -911,6 +911,26 @@ } }; + template GsmRrMessage tr_IMM_ASS_REJ(template uint8_t ra := ?, template GsmFrameNumber fn := ?) := { + header := t_RrHeader(IMMEDIATE_ASSIGNMENT_REJECT, ?), + payload := { + imm_ass_rej := { + feature_ind := { + spare := '00'B, + cs_ir := false, + ps_ir := true + }, + page_mode := PAGE_MODE_NORMAL, + payload := { + {req_ref := tr_compute_ReqRef(ra, fn), wait_ind := ?}, + ?, + ?, + ? + } + } + } + }; + template GsmRrMessage tr_PAG_REQ1(template MobileIdentityLV mi1 := ?) := { header := t_RrHeader(PAGING_REQUEST_TYPE_1, ?), payload := { diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index d19093c..d2c4e2a 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -170,13 +170,19 @@ f_vty_config2(PCUVTY, {"pcu"}, cmd); } -private function f_init_vty(charstring id) runs on RAW_PCU_Test_CT { +private function f_init_vty(charstring id, boolean egprs_only := false) runs on RAW_PCU_Test_CT { map(self:PCUVTY, system:PCUVTY); f_vty_set_prompts(PCUVTY); f_vty_transceive(PCUVTY, "enable"); + + if (egprs_only) { + f_vty_config2(PCUVTY, {"pcu"}, "egprs only"); + } else { + f_vty_config2(PCUVTY, {"pcu"}, "no egprs"); + } } -private function f_init_raw(charstring id, template (value) PCUIF_info_ind info_ind := ts_PCUIF_INFO_default) +private function f_init_raw(charstring id, boolean egprs_only := false, template (value) PCUIF_info_ind info_ind := ts_PCUIF_INFO_default) runs on RAW_PCU_Test_CT { var RAW_PCUIF_CT vc_PCUIF; var RAW_PCU_BTS_CT vc_BTS; @@ -195,7 +201,7 @@ connect(vc_BTS:PCUIF, vc_PCUIF:BTS); connect(vc_BTS:TC, self:BTS); - f_init_vty(id); + f_init_vty(id, egprs_only); vc_PCUIF.start(f_PCUIF_CT_handler(mp_pcu_sock_path)); vc_BTS.start(f_BTS_CT_handler(0, valueof(info_ind))); @@ -1041,7 +1047,7 @@ info_ind.t3169 := 1; /* Initialize the PCU interface abstraction */ - f_init_raw(testcasename(), info_ind); + f_init_raw(testcasename(), false, info_ind); /* Establish BSSGP connection to the PCU */ f_bssgp_establish(); @@ -1400,6 +1406,48 @@ f_tc_paging_ps_from_sgsn(mp_gb_cfg.bvci); } +/* Reproduce osmo-pcu rejects 8-bit RACH req when in "egprs only" mode. */ +testcase TC_rach_egprs_only() runs on RAW_PCU_Test_CT { + var PCUIF_Message pcu_msg; + var GsmRrMessage rr_imm_ass_rej; + var uint32_t fn; + var uint16_t ra := oct2int('3A'O); + timer T; + + /* Initialize the PCU interface abstraction with EGPRS-only */ + f_init_raw(testcasename(), egprs_only := true); + + /* FIXME: ask the BTS component to give us the current TDMA fn */ + fn := 1337; + + /* Send RACH.ind (8 bit) */ + BTS.send(ts_PCUIF_RACH_IND(bts_nr := 0, trx_nr := 0, ts_nr := 0, + ra := ra, is_11bit := 0, + burst_type := BURST_TYPE_0, + fn := fn, arfcn := 871, + qta := 0)); + + /* Expect Immediate (TBF) Assignment Reject on TS0/AGCH */ + T.start(2.0); + alt { + [] BTS.receive(tr_PCUIF_DATA_REQ(bts_nr := 0, trx_nr := 0, ts_nr := 0, + sapi := PCU_IF_SAPI_AGCH, data := ?)) + -> value pcu_msg { + rr_imm_ass_rej := dec_GsmRrMessage(pcu_msg.u.data_req.data); + log("Rx Immediate Assignment Reject: ", rr_imm_ass_rej); + + if (match(rr_imm_ass_rej, tr_IMM_ASS_REJ(ra, fn))) { + setverdict(pass); + } else { + setverdict(fail, "IMM ASS REJ didn't match"); + } + } + [] T.timeout { + setverdict(fail, "Timeout waiting for Immediate Assignment Reject"); + } + } +} + control { execute( TC_pcuif_suspend() ); execute( TC_ta_ptcch_idle() ); @@ -1417,6 +1465,8 @@ execute (TC_paging_cs_from_sgsn_ptp() ); execute (TC_paging_ps_from_sgsn_sign() ); execute (TC_paging_ps_from_sgsn_ptp() ); + + execute( TC_rach_egprs_only() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I96e0d28bed749ef657f0b68d0beee3f8471ab3e0 Gerrit-Change-Number: 16687 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 30 16:28:48 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 30 Dec 2019 16:28:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_rach_egprs_only In-Reply-To: References: Message-ID: Hello fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16687 to look at the new patch set (#2). Change subject: pcu: Introduce test TC_rach_egprs_only ...................................................................... pcu: Introduce test TC_rach_egprs_only Change-Id: I96e0d28bed749ef657f0b68d0beee3f8471ab3e0 --- M library/GSM_RR_Types.ttcn M pcu/PCU_Tests_RAW.ttcn 2 files changed, 73 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/87/16687/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I96e0d28bed749ef657f0b68d0beee3f8471ab3e0 Gerrit-Change-Number: 16687 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 30 18:50:40 2019 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 30 Dec 2019 18:50:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_rach_egprs_only In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16687 ) Change subject: pcu: Introduce test TC_rach_egprs_only ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16687/2/pcu/PCU_Tests_RAW.ttcn File pcu/PCU_Tests_RAW.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16687/2/pcu/PCU_Tests_RAW.ttcn at 1411 PS2, Line 1411: osmo-pcu rejects 8-bit RACH req when in "egprs only" mode So this looks like a know bug, but we don't have any OS#XXXX references? Or do you consider this as an expected behavior? AFAIR, it's fine to accept 8-bit RACH in "egprs only" mode. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I96e0d28bed749ef657f0b68d0beee3f8471ab3e0 Gerrit-Change-Number: 16687 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 30 Dec 2019 18:50:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 30 19:27:44 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 30 Dec 2019 19:27:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RLCMAC_CSN1_Types.ttcn: Support encoding of MS Radio Access Capability 2 References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16688 ) Change subject: RLCMAC_CSN1_Types.ttcn: Support encoding of MS Radio Access Capability 2 ...................................................................... RLCMAC_CSN1_Types.ttcn: Support encoding of MS Radio Access Capability 2 Change-Id: Iac7d7b694bc44887443418f755e51d636abe8575 --- M library/RLCMAC_CSN1_Types.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/16688/1 diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index ea2edf6..11df29d 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -16,6 +16,7 @@ import from General_Types all; import from Osmocom_Types all; import from GSM_Types all; + import from MobileL3_GMM_SM_Types all; /* TS 44.060 11.2.0.1 */ type enumerated RlcmacDlCtrlMsgType { @@ -418,7 +419,7 @@ * (value part, see 3GPP TS 24.008, 10.5.5.12a) */ type union MSRadioAccCap2 { /* TODO: see table 10.5.146/3GPP TS 24.008 */ - bitstring other + MSRadioAccessCapabilityV msRadioAccessCapabilityV }; /* Table 11.2.16.2 Access Type */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iac7d7b694bc44887443418f755e51d636abe8575 Gerrit-Change-Number: 16688 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 30 19:27:44 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 30 Dec 2019 19:27:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_RR_Types.ttcn: Support encoding of EGPRS Packet Uplink Assignment References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16689 ) Change subject: GSM_RR_Types.ttcn: Support encoding of EGPRS Packet Uplink Assignment ...................................................................... GSM_RR_Types.ttcn: Support encoding of EGPRS Packet Uplink Assignment Change-Id: Idf3bd12318480e8cdd26fce35e52d0a9e8c39608 --- M library/GSM_RR_Types.ttcn 1 file changed, 123 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/16689/1 diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index 4c2874a..66fc36c 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -552,7 +552,129 @@ type record IaRestOctLL { BIT1 compressed_irat_ho_info_ind } with { variant "" }; - type octetstring EgprsUlAss; /* TODO */ + + + type record of AccessTechnologiesRequest + AccessTechnologiesRequestRepetition + with { variant "EXTENSION_BIT(reverse)" }; + + type record AccessTechnologiesRequest + { + BIT4 accessTechnType, + BIT1 extensionBit + } with { variant "FIELDORDER(msb)" }; + + type enumerated EgprsChCodingCommand { + CH_CODING_MCS1 ('0000'B), + CH_CODING_MCS2 ('0001'B), + CH_CODING_MCS3 ('0010'B), + CH_CODING_MCS4 ('0011'B), + CH_CODING_MCS5 ('0100'B), + CH_CODING_MCS6 ('0101'B), + CH_CODING_MCS7 ('0110'B), + CH_CODING_MCS8 ('0111'B), + CH_CODING_MCS9 ('1000'B), + CH_CODING_MCS5_7 ('1001'B), + CH_CODING_MCS6_9 ('1010'B) + } with { variant "FIELDLENGTH(4)" }; + + /* TS 44.060 Table 12.5.2.1 */ + type enumerated EgprsWindowSize { + EGPRS_WS_64 ('00000'B), + EGPRS_WS_96 ('00001'B), + EGPRS_WS_128 ('00010'B), + EGPRS_WS_160 ('00011'B), + EGPRS_WS_192 ('00100'B), + EGPRS_WS_224 ('00101'B), + EGPRS_WS_256 ('00110'B), + EGPRS_WS_288 ('00111'B), + EGPRS_WS_320 ('01000'B), + EGPRS_WS_352 ('01001'B), + EGPRS_WS_384 ('01010'B), + EGPRS_WS_416 ('01011'B), + EGPRS_WS_448 ('01100'B), + EGPRS_WS_480 ('01101'B), + EGPRS_WS_512 ('01110'B), + EGPRS_WS_544 ('01111'B), + EGPRS_WS_576 ('10000'B), + EGPRS_WS_608 ('10001'B), + EGPRS_WS_640 ('10010'B), + EGPRS_WS_672 ('10011'B), + EGPRS_WS_704 ('10100'B), + EGPRS_WS_736 ('10101'B), + EGPRS_WS_768 ('10110'B), + EGPRS_WS_800 ('10111'B), + EGPRS_WS_832 ('11000'B), + EGPRS_WS_864 ('11001'B), + EGPRS_WS_896 ('11010'B), + EGPRS_WS_928 ('11011'B), + EGPRS_WS_960 ('11100'B), + EGPRS_WS_992 ('11101'B), + EGPRS_WS_1024 ('11110'B) + } with { variant "FIELDLENGTH(5)" }; + + type record EgprsUlAssignDyn { + uint5_t tfi_assignment, + BIT1 polling, + BIT1 spare ('0'B), + uint3_t usf, + BIT1 usf_granularity, + BIT1 p0_present, + uint4_t p0 optional, + BIT1 pr_mode optional, + EgprsChCodingCommand egprs_ch_coding_cmd, + BIT1 tlli_block_chan_coding, + BIT1 bep_period2_present, + BIT4 bep_period2 optional, + BIT1 resegment, + EgprsWindowSize egprs_window_size, + BIT1 alpha_present, + uint4_t alpha optional, + uint5_t gamma, + BIT1 ta_index_present, + uint4_t ta_index optional, + BIT1 tbf_starting_time_present, + uint16_t tbf_starting_time optional + /* TODO: Additions for Rel-7 */ + } with { + variant (p0) "PRESENCE(p0_present = '1'B)" + variant (pr_mode) "PRESENCE(p0_present = '1'B)" + variant (bep_period2) "PRESENCE(bep_period2_present = '1'B)" + variant (alpha) "PRESENCE(alpha_present = '1'B)" + variant (ta_index) "PRESENCE(ta_index_present = '1'B)" + variant (tbf_starting_time) "PRESENCE(tbf_starting_time_present = '1'B)" + }; + type record EgprsUlAssignMultiblock { + BIT1 alpha_present, + uint4_t alpha optional, + uint5_t gamma, + uint16_t tbf_starting_time, + BIT2 nr_radio_blocks_allocated, + BIT1 p0_present, + uint4_t p0 optional, + BIT1 spare ('0'B) optional, + BIT1 pr_mode optional + /* TDO: Additions for Rel-6 */ + } with { + variant (alpha) "PRESENCE(alpha_present = '1'B)" + variant (p0) "PRESENCE(p0_present = '1'B)" + variant (spare) "PRESENCE(p0_present = '1'B)" + variant (pr_mode) "PRESENCE(p0_present = '1'B)" + }; + /* 3GPP TS 44.018 version 13.3.2 10.5.2.16, "EGPRS Packet Uplink Assignment" */ + type record EgprsUlAss { + BIT5 ext_ra, + BIT1 ats_present, + AccessTechnologiesRequestRepetition ats optional, + BIT1 presence, + EgprsUlAssignDyn dynamic optional, + EgprsUlAssignMultiblock multiblock optional + } with { + variant (ats) "PRESENCE(ats_present = '1'B)" + variant (dynamic) "PRESENCE(presence = '1'B)" + variant (multiblock) "PRESENCE(presence = '0'B)" + }; + type octetstring MblkDlAss; /* TODO */ type record IaRestOctLH { BIT2 presence, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idf3bd12318480e8cdd26fce35e52d0a9e8c39608 Gerrit-Change-Number: 16689 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Dec 30 19:46:54 2019 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 30 Dec 2019 19:46:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RLCMAC_CSN1_Types.ttcn: Support encoding of MS Radio Access Capability 2 In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16688 to look at the new patch set (#2). Change subject: RLCMAC_CSN1_Types.ttcn: Support encoding of MS Radio Access Capability 2 ...................................................................... RLCMAC_CSN1_Types.ttcn: Support encoding of MS Radio Access Capability 2 Change-Id: Iac7d7b694bc44887443418f755e51d636abe8575 --- M library/RLCMAC_CSN1_Types.ttcn M sysinfo/gen_links.sh 2 files changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/16688/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iac7d7b694bc44887443418f755e51d636abe8575 Gerrit-Change-Number: 16688 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 16:34:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 16:34:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce tests for CS and PS paging from SGSN/Gb In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16528 ) Change subject: pcu: Introduce tests for CS and PS paging from SGSN/Gb ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16528 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90b5a792c1d91e38ea7b8c060ff0b459673df951 Gerrit-Change-Number: 16528 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 31 Dec 2019 16:34:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 16:34:41 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 16:34:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Move NS tests to PCU_Tests_RAW_NS.ttcn In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16685 ) Change subject: pcu: Move NS tests to PCU_Tests_RAW_NS.ttcn ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If680d1bd7dbfe98829f330c33705e0f13bedf3c7 Gerrit-Change-Number: 16685 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 31 Dec 2019 16:34:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 16:34:49 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 16:34:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce tests for CS and PS paging from SGSN/Gb In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16528 ) Change subject: pcu: Introduce tests for CS and PS paging from SGSN/Gb ...................................................................... pcu: Introduce tests for CS and PS paging from SGSN/Gb CS Gb paging and PTP CS/PS paging implemented in osmo-pcu: I9501e02e1d7f6944497e724dbccb9a19c3f5221f I5c52b5af740460c48bb3ba858243b1d20e624268 Related: OS#3927, OS#2406 Change-Id: I90b5a792c1d91e38ea7b8c060ff0b459673df951 --- M library/GSM_RR_Types.ttcn M library/Osmocom_Gb_Types.ttcn M pcu/PCU_Tests_RAW.ttcn 3 files changed, 171 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index 965708f..f5eeda5 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -911,6 +911,22 @@ } }; + template GsmRrMessage tr_PAG_REQ1(template MobileIdentityLV mi1 := ?) := { + header := t_RrHeader(PAGING_REQUEST_TYPE_1, ?), + payload := { + pag_req_1 := { + chan_needed := { + second := ?, + first := ? + }, + page_mode := PAGE_MODE_NORMAL, + mi1 := mi1, + mi2 := omit, + rest_octets := ? + } + } + }; + template (value) GsmRrL3Message ts_MEAS_REP(boolean valid, uint6_t rxl_f, uint6_t rxl_s, uint3_t rxq_f, uint3_t rxq_s, template (omit) NcellReports reps) := { diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn index 55a2816..3149e77 100644 --- a/library/Osmocom_Gb_Types.ttcn +++ b/library/Osmocom_Gb_Types.ttcn @@ -1121,6 +1121,18 @@ delay_Value := f_oct_or_wc(delay, 2) } + template DRX_Parameters t_defaultDRXparam := { + iEI := '0A'O, + ext := '1'B, + lengthIndicator := { + length1 := 2 + }, + splitPG_CycleCode := '00'O, + nonDRXTimer := '000'B, + splitOnCCCH := '0'B, + cnSpecificDRXCycleLength := '0000'B + } + template PDU_BSSGP ts_BSSGP_DL_UD(GprsTlli tlli, octetstring pdu) := { pDU_BSSGP_DL_UNITDATA := { bssgpPduType := '00'O, @@ -1220,6 +1232,38 @@ } } + template PDU_BSSGP tr_BSSGP_CS_PAGING(BssgpBvci bvci) := { + pDU_BSSGP_PAGING_CS := { + bssgpPduType := '07'O, + iMSI := ?, + dRX_Parameters := ?, + paging_Field4 := { + bVCI := t_BSSGP_BVCI(bvci) + }, + tLLI := *, + channel_needed := *, + eMLPP_Priority := *, + tMSI := *, + global_CN_Id := * + } + } + + template PDU_BSSGP ts_BSSGP_CS_PAGING_IMSI(BssgpBvci bvci, hexstring imsi) := { + pDU_BSSGP_PAGING_CS := { + bssgpPduType := '07'O, + iMSI := ts_BSSGP_IMSI(imsi), + dRX_Parameters := t_defaultDRXparam, + paging_Field4 := { + bVCI := t_BSSGP_BVCI(bvci) + }, + tLLI := omit, + channel_needed := omit, + eMLPP_Priority := omit, + tMSI := omit, + global_CN_Id := omit + } + } + template PDU_BSSGP tr_BSSGP_PS_PAGING(BssgpBvci bvci) := { pDU_BSSGP_PAGING_PS := { bssgpPduType := '06'O, diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index c41a244..ff609fe 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -738,6 +738,24 @@ fn := 0, arfcn := 871, sapi := PCU_IF_SAPI_PCH, data := macblock)); } +/* Expect a Paging Request Type 1 from PCU on PCUIF on specified sapi. */ +private function f_pcuif_rx_pch_pag_req1(out GsmRrMessage rr_pag_req1) +runs on RAW_PCU_Test_CT { + var PCUIF_Message pcu_msg; + var octetstring macblock; + BTS.receive(tr_PCUIF_DATA_REQ(bts_nr := 0, trx_nr := 0, ts_nr := 0, + sapi := PCU_IF_SAPI_PCH)) -> value pcu_msg; + /* First 3 bytes contain paging group: */ + macblock := substr(pcu_msg.u.data_req.data, 3, pcu_msg.u.data_req.len - 3); + rr_pag_req1 := dec_GsmRrMessage(macblock); + if (not match(rr_pag_req1, tr_PAG_REQ1())) { + setverdict(fail, "Failed to match Paging Request Type 1: ", rr_pag_req1); + mtc.stop; + } + BTS.send(ts_PCUIF_DATA_CNF(bts_nr := 0, trx_nr := 0, ts_nr := 0, block_nr := 0, + fn := pcu_msg.u.data_req.fn, arfcn := 871, sapi := PCU_IF_SAPI_PCH, data := macblock)); +} + private function f_tx_rlcmac_ul_block(template (value) RlcmacUlBlock ul_data, int16_t lqual_cb := 0, uint32_t fn := 0) runs on RAW_PCU_Test_CT { var octetstring data; @@ -1666,6 +1684,95 @@ setverdict(pass); } +/* Test CS paging over Gb (SGSN->PCU->BTS[PDCH]). + */ +private function f_tc_paging_cs_from_sgsn(Nsvci bvci) runs on RAW_PCU_Test_CT { + var GsmRrMessage rr_imm_ass; + var PacketUlAssign ul_tbf_ass; + var RlcmacDlBlock dl_block; + var boolean ok; + var OCT4 tlli := '00000001'O; + var MobileIdentityLV_Paging mi_res; + var hexstring imsi := f_gen_imsi(42); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename()); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign('FFFFFFFF'O, tlli); + + /* Establish an Uplink TBF */ + ok := f_establish_tbf(rr_imm_ass); + if (not ok) { + setverdict(fail, "Failed to establish TBF"); + mtc.stop; + } + + ok := f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass); + if (not ok) { + setverdict(fail, "Immediate Assignment not an Uplink TBF"); + mtc.stop; + } + + /* Send paging request */ + BSSGP[0].send(ts_BSSGP_CS_PAGING_IMSI(bvci, imsi)); + + /* Receive it on BTS side towards MS */ + f_rx_rlcmac_dl_block_exp_pkt_pag_req(dl_block); + + /* FIXME: we must use .ps. here instead of .cs. (the one actually sent) + because TTCN3 counts length up to octet boundary and thinks it's a + PageInfoPs: */ + mi_res := dl_block.ctrl.payload.u.paging.repeated_pageinfo.ps.mobile_identity; + setverdict(pass); +} + +testcase TC_paging_cs_from_sgsn_sign() runs on RAW_PCU_Test_CT { + f_tc_paging_cs_from_sgsn(0); +} + +testcase TC_paging_cs_from_sgsn_ptp() runs on RAW_PCU_Test_CT { + f_tc_paging_cs_from_sgsn(mp_gb_cfg.bvci); +} + +/* Test PS paging over Gb (SGSN->PCU->BTS[CCCH]). + */ +private function f_tc_paging_ps_from_sgsn(Nsvci bvci) runs on RAW_PCU_Test_CT { + var GsmRrMessage rr_pag_req1; + var OCT4 tlli := '00000001'O; + var hexstring imsi := f_gen_imsi(42); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename()); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign('FFFFFFFF'O, tlli); + + /* Send paging request */ + BSSGP[0].send(ts_BSSGP_PS_PAGING_IMSI(bvci, imsi)); + + /* Receive it on BTS side towards MS */ + f_pcuif_rx_pch_pag_req1(rr_pag_req1); + + setverdict(pass); +} + +testcase TC_paging_ps_from_sgsn_sign() runs on RAW_PCU_Test_CT { + f_tc_paging_ps_from_sgsn(0); +} + +testcase TC_paging_ps_from_sgsn_ptp() runs on RAW_PCU_Test_CT { + f_tc_paging_ps_from_sgsn(mp_gb_cfg.bvci); +} + control { execute( TC_ns_reset() ); execute( TC_ns_reset_retrans() ); @@ -1688,6 +1795,10 @@ execute( TC_mo_ping_pong() ); execute( TC_imm_ass_dl_block_retrans() ); execute( TC_paging_cs_from_bts() ); + execute (TC_paging_cs_from_sgsn_sign() ); + execute (TC_paging_cs_from_sgsn_ptp() ); + execute (TC_paging_ps_from_sgsn_sign() ); + execute (TC_paging_ps_from_sgsn_ptp() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16528 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90b5a792c1d91e38ea7b8c060ff0b459673df951 Gerrit-Change-Number: 16528 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 16:34:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 16:34:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Pass correct fn to ts_PCUIF_DATA_CNF In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16675 ) Change subject: pcu: Pass correct fn to ts_PCUIF_DATA_CNF ...................................................................... pcu: Pass correct fn to ts_PCUIF_DATA_CNF Change-Id: I68fc0e3dba2cdadbe479017f31868f6dd0dabe9f --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index ff609fe..c800d43 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -735,7 +735,7 @@ mtc.stop; } BTS.send(ts_PCUIF_DATA_CNF(bts_nr := 0, trx_nr := 0, ts_nr := 0, block_nr := 0, - fn := 0, arfcn := 871, sapi := PCU_IF_SAPI_PCH, data := macblock)); + fn := pcu_msg.u.data_req.fn, arfcn := 871, sapi := PCU_IF_SAPI_PCH, data := macblock)); } /* Expect a Paging Request Type 1 from PCU on PCUIF on specified sapi. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I68fc0e3dba2cdadbe479017f31868f6dd0dabe9f Gerrit-Change-Number: 16675 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 16:34:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 16:34:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Move NS tests to PCU_Tests_RAW_NS.ttcn In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16685 ) Change subject: pcu: Move NS tests to PCU_Tests_RAW_NS.ttcn ...................................................................... pcu: Move NS tests to PCU_Tests_RAW_NS.ttcn Tests from PCU_Tests_RAW_SNS inherit most infrastructure from NS tests defined in PCU_Tests_RAW, which in turn don't share that much with other tests present in that file. This way we simplify file PCU_Tests_RAW.ttcn, which will potentially grow once more tests are added. Change-Id: If680d1bd7dbfe98829f330c33705e0f13bedf3c7 --- M pcu/PCU_Tests.cfg M pcu/PCU_Tests_RAW.ttcn A pcu/PCU_Tests_RAW_NS.ttcn M pcu/PCU_Tests_RAW_SNS.ttcn 4 files changed, 458 insertions(+), 386 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pcu/PCU_Tests.cfg b/pcu/PCU_Tests.cfg index 6ea5a5a..0424e4f 100644 --- a/pcu/PCU_Tests.cfg +++ b/pcu/PCU_Tests.cfg @@ -22,3 +22,4 @@ [EXECUTE] PCU_Tests_RAW.control +PCU_Tests_RAW_NS.control diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index c800d43..d19093c 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -16,6 +16,8 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ +friend module PCU_Tests_RAW_NS; + import from General_Types all; import from Osmocom_Types all; import from GSM_Types all; @@ -42,8 +44,6 @@ import from PCUIF_CodecPort all; import from PCUIF_RAW_Components all; import from IPL4asp_Types all; -import from NS_CodecPort all; -import from NS_CodecPort_CtrlFunct all; import from Native_Functions all; import from PCU_Tests all; @@ -53,32 +53,9 @@ float X2002 := 0.2; /* Timer -2002, IMM ASSIGN confirm delay */ } -type component RAW_NS_CT { - /* UDP port towards the bottom (IUT) */ - port NS_CODEC_PT NSCP[4]; - var ConnectionId g_ns_conn_id[4] := {-1, -1, -1, -1}; - var NSConfiguration g_nsconfig[4]; - timer g_T_guard; -} - -type component RAW_PCU_CT { - /* PCUIF (we emulate the BTS part) */ - port PCUIF_CODEC_PT PCU; - var ConnectionId g_pcu_conn_id := -1; -} - -type component RAW_Test_CT extends RAW_NS_CT, RAW_PCU_CT { -} - -private altstep as_Tguard() runs on RAW_NS_CT { - [] g_T_guard.timeout { - setverdict(fail, "Timeout of T_guard"); - mtc.stop; - } -} /* FIXME: make sure to use parameters from mp_gb_cfg.cell_id in the PCU INFO IND */ -template (value) PCUIF_info_ind ts_PCUIF_INFO_default := { +private template (value) PCUIF_info_ind ts_PCUIF_INFO_default := { version := PCU_IF_VERSION, flags := c_PCUIF_Flags_default, trx := valueof(ts_PCUIF_InfoTrxs_def), @@ -114,356 +91,6 @@ remote_ip := { f_inet_haddr(mp_nsconfig.local_ip) , '00000000'O } } -function f_init_pcuif() runs on RAW_PCU_CT { - var PCUIF_info_ind info_ind; - map(self:PCU, system:PCU); - - - info_ind := valueof(ts_PCUIF_INFO_default); - - /* Connect the Unix Domain Socket */ - g_pcu_conn_id := f_pcuif_listen(PCU, mp_pcu_sock_path); - PCU.receive(UD_connected:?); - - /* Wait for PCU_VERSION and return INFO_IND */ - PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_TXT_IND(0, PCU_VERSION, ?))); - /* FIXME: make sure to use parameters from mp_gb_cfg.cell_id in the PCU INFO IND */ - var template PCUIF_Message info_ind_msg := ts_PCUIF_INFO_IND(0, info_ind); - PCU.send(t_SD_PCUIF(g_pcu_conn_id, info_ind_msg)); -} - -function f_pcuif_tx(template (value) PCUIF_Message msg) runs on RAW_PCU_CT { - PCU.send(t_SD_PCUIF(g_pcu_conn_id, msg)); -} - -function f_init_ns_codec(integer idx := 0, float guard_secs := 60.0) runs on RAW_NS_CT { - var Result res; - - if (not g_T_guard.running) { - g_T_guard.start(guard_secs); - activate(as_Tguard()); - } - - if (not isbound(g_nsconfig) or not isbound(g_nsconfig[idx])) { - /* copy most parts from mp_nsconfig */ - g_nsconfig[idx] := mp_nsconfig; - /* adjust those parts different for each NS-VC */ - g_nsconfig[idx].nsvci := mp_nsconfig.nsvci + idx; - g_nsconfig[idx].local_udp_port := mp_nsconfig.local_udp_port + idx; - } - - map(self:NSCP[idx], system:NSCP); - /* Connect the UDP socket */ - log("connecting NSCP[", idx, "] to ", g_nsconfig[idx]); - res := f_IPL4_connect(NSCP[idx], g_nsconfig[idx].remote_ip, g_nsconfig[idx].remote_udp_port, - g_nsconfig[idx].local_ip, g_nsconfig[idx].local_udp_port, 0, { udp := {}}); - if (not ispresent(res.connId)) { - setverdict(fail, "Could not connect NS UDP socket, check your configuration ", g_nsconfig[idx]); - mtc.stop; - } - g_ns_conn_id[idx] := res.connId; - -} - -function f_ns_exp(template PDU_NS exp_rx, integer idx := 0) runs on RAW_NS_CT return PDU_NS { - var NS_RecvFrom nrf; - log("f_ns_exp() expecting ", exp_rx); - alt { - [] NSCP[idx].receive(t_NS_RecvFrom(exp_rx)) -> value nrf { } - [] NSCP[idx].receive { - setverdict(fail, "Received unexpected NS: ", nrf); - mtc.stop; - } - } - return nrf.msg; -} - -/* perform outbound NS-ALIVE procedure */ -function f_outgoing_ns_alive(integer idx := 0) runs on RAW_NS_CT { - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE)); - alt { - [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE_ACK)); - [] NSCP[idx].receive { repeat; } - } -} - -/* perform outbound NS-ALIVE procedure */ -function f_outgoing_ns_alive_no_ack(integer idx := 0, float tout := 10.0) runs on RAW_NS_CT { - timer T := tout; - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE)); - T.start; - alt { - [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE_ACK)) { - setverdict(fail, "Received unexpected NS-ALIVE ACK"); - } - [] NSCP[idx].receive { repeat; } - [] T.timeout { - setverdict(pass); - } - } -} - -/* ensure no matching message is received within 'tout' */ -function f_ensure_no_ns(template PDU_NS ns := ?, integer idx := 0, float tout := 3.0) -runs on RAW_Test_CT { - timer T := tout; - T.start; - alt { - [] NSCP[idx].receive(t_NS_RecvFrom(ns)) { - setverdict(fail, "NS-ALIVE from unconfigured (possibly initial) endpoint"); - } - [] T.timeout { - setverdict(pass); - } - } -} - -/* perform outbound NS-BLOCK procedure */ -function f_outgoing_ns_block(NsCause cause, integer idx := 0) runs on RAW_NS_CT { - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_BLOCK(cause, g_nsconfig[idx].nsvci))); - alt { - [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_BLOCK_ACK(g_nsconfig[idx].nsvci))); - [] NSCP[idx].receive { repeat; } - } -} - -/* receive NS-ALIVE and ACK it */ -altstep as_rx_alive_tx_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { - [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE)) { - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE_ACK)); - if (not oneshot) { repeat; } - } -} - -/* Transmit BSSGP RESET for given BVCI and expect ACK */ -function f_tx_bvc_reset_rx_ack(BssgpBvci bvci, integer idx := 0, boolean exp_ack := true) -runs on RAW_NS_CT { - var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET(BSSGP_CAUSE_NET_SV_CAP_MOD_GT_ZERO_KBPS, bvci, - mp_gb_cfg.cell_id)); - timer T := 5.0; - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); - T.start; - alt { - [exp_ack] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, - decmatch tr_BVC_RESET_ACK(bvci, ?)))) { - setverdict(pass); - } - [exp_ack] T.timeout { - setverdict(fail, "No response to BVC-RESET"); - } - [not exp_ack] T.timeout { - setverdict(pass); - } - [] NSCP[idx].receive { repeat; } - } -} - -/* Receive a BSSGP RESET for given BVCI and ACK it */ -altstep as_rx_bvc_reset_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { - var NS_RecvFrom ns_rf; - /* FIXME: nail down received cell_id in match */ - [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, - decmatch tr_BVC_RESET(?, bvci, ?)))) - -> value ns_rf { - var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); - var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET_ACK(bvci, mp_gb_cfg.cell_id)); - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); - if (not oneshot) { repeat; } - } -} - - -/* Receive a BSSGP UNBLOCK for given BVCI and ACK it */ -altstep as_rx_bvc_unblock_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { - var NS_RecvFrom ns_rf; - [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, - decmatch t_BVC_UNBLOCK(bvci)))) - -> value ns_rf { - var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); - var PDU_BSSGP bssgp_tx := valueof(t_BVC_UNBLOCK_ACK(bvci)); - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); - if (not oneshot) { repeat; } - } -} - -/* Receive a BSSGP FLOW-CONTROL-BVC and ACK it */ -altstep as_rx_bvc_fc_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { - var NS_RecvFrom ns_rf; - [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, bvci, - decmatch tr_BVC_FC_BVC))) - -> value ns_rf { - var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); - var OCT1 tag := bssgp_rx.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value; - var PDU_BSSGP bssgp_tx := valueof(t_BVC_FC_BVC_ACK(tag)); - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, bvci, enc_PDU_BSSGP(bssgp_tx)))); - if (not oneshot) { repeat; } - } -} - -/********************************************************************************** - * Classic Gb/IP bring-up test cases using NS-{RESET,BLOCK,UNBLOCK} and no IP-SNS * - **********************************************************************************/ - -/* Receive a NS-RESET and ACK it */ -private altstep as_rx_ns_reset_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { - var NS_RecvFrom ns_rf; - [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_RESET(NS_CAUSE_OM_INTERVENTION, g_nsconfig[idx].nsvci, - g_nsconfig[idx].nsei))) -> value ns_rf { - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_RESET_ACK(g_nsconfig[idx].nsvci, - g_nsconfig[idx].nsei))); - if (not oneshot) { repeat; } - } -} -/* Receive a NS-UNBLOCK and ACK it */ -private altstep as_rx_ns_unblock_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { - var NS_RecvFrom ns_rf; - [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) -> value ns_rf { - NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_UNBLOCK_ACK)); - if (not oneshot) { repeat; } - } -} - -/* test the NS-RESET procedure */ -testcase TC_ns_reset() runs on RAW_Test_CT { - f_init_ns_codec(); - f_init_pcuif(); - - - /* Expect inbound NS-RESET procedure */ - as_rx_ns_reset_ack(oneshot := true); - setverdict(pass); -} - -/* ensure NS-RESET are re-transmitted */ -testcase TC_ns_reset_retrans() runs on RAW_Test_CT { - f_init_ns_codec(); - f_init_pcuif(); - - var integer i; - for (i := 0; i < 3; i := i+1) { - NSCP[0].receive(t_NS_RecvFrom(tr_NS_RESET(NS_CAUSE_OM_INTERVENTION, - g_nsconfig[0].nsvci, g_nsconfig[0].nsei))); - } - - /* Expect inbound NS-RESET procedure */ - as_rx_ns_reset_ack(oneshot := true); - setverdict(pass); -} - -/* test the inbound NS-ALIVE procedure after NS-RESET */ -testcase TC_ns_alive() runs on RAW_Test_CT { - f_init_ns_codec(); - f_init_pcuif(); - - /* Expect inbound NS-RESET procedure */ - as_rx_ns_reset_ack(oneshot := true); - - /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ - as_rx_alive_tx_ack(oneshot := true); - setverdict(pass); -} - -/* Test for NS-RESET after NS-ALIVE timeout */ -testcase TC_ns_alive_timeout_reset() runs on RAW_Test_CT { - f_init_ns_codec(guard_secs := 100.0); - f_init_pcuif(); - - /* Expect inbound NS-RESET procedure */ - as_rx_ns_reset_ack(oneshot := true); - - /* wait for at least one NS-ALIVE */ - NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE)); - - /* wait for NS-RESET to re-appear, ignoring any NS-ALIVE until then */ - alt { - [] as_rx_ns_reset_ack(oneshot := true) { setverdict(pass); } - [] NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE)) { repeat; } - } -} - -/* test for NS-RESET/NS-ALIVE/NS-UNBLOCK */ -testcase TC_ns_unblock() runs on RAW_Test_CT { - f_init_ns_codec(); - f_init_pcuif(); - - /* Expect inbound NS-RESET procedure */ - as_rx_ns_reset_ack(oneshot := true); - - /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ - as_rx_alive_tx_ack(oneshot := true); - activate(as_rx_alive_tx_ack()); - - as_rx_ns_unblock_ack(oneshot := true); - setverdict(pass); -} - -/* test for NS-UNBLOCK re-transmissions */ -testcase TC_ns_unblock_retrans() runs on RAW_Test_CT { - f_init_ns_codec(); - f_init_pcuif(); - - /* Expect inbound NS-RESET procedure */ - as_rx_ns_reset_ack(oneshot := true); - - /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ - as_rx_alive_tx_ack(oneshot := true); - activate(as_rx_alive_tx_ack()); - - /* wait for first NS-UNBLOCK, don't respond */ - NSCP[0].receive(t_NS_RecvFrom(t_NS_UNBLOCK)); - - /* wait for re-transmission of NS-UNBLOCK */ - as_rx_ns_unblock_ack(oneshot := true); - setverdict(pass); -} - -/* full bring-up of the Gb link for NS and BSSGP layer up to BVC-FC */ -testcase TC_ns_full_bringup() runs on RAW_Test_CT { - f_init_ns_codec(); - f_init_pcuif(); - - /* Expect inbound NS-RESET procedure */ - as_rx_ns_reset_ack(oneshot := true); - - /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ - as_rx_alive_tx_ack(oneshot := true); - activate(as_rx_alive_tx_ack()); - - as_rx_ns_unblock_ack(oneshot := true); - - f_outgoing_ns_alive(); - - /* Expect BVC-RESET for signaling (0) and ptp BVCI */ - as_rx_bvc_reset_tx_ack(0, oneshot := true); - as_rx_bvc_reset_tx_ack(mp_gb_cfg.bvci, oneshot := true); - as_rx_bvc_unblock_tx_ack(mp_gb_cfg.bvci, oneshot := true); - - /* wait for one FLOW-CONTROL BVC and then ACK any further in the future */ - as_rx_bvc_fc_tx_ack(mp_gb_cfg.bvci, oneshot := true); - activate(as_rx_bvc_fc_tx_ack(mp_gb_cfg.bvci)); - setverdict(pass); -} - -/* test outbound (SGSN-originated) NS-BLOCK procedure */ -testcase TC_ns_so_block() runs on RAW_Test_CT { - f_init_ns_codec(); - f_init_pcuif(); - - /* Expect inbound NS-RESET procedure */ - as_rx_ns_reset_ack(oneshot := true); - - /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ - as_rx_alive_tx_ack(oneshot := true); - activate(as_rx_alive_tx_ack()); - - as_rx_ns_unblock_ack(oneshot := true); - - f_outgoing_ns_alive(); - - f_outgoing_ns_block(NS_CAUSE_EQUIPMENT_FAILURE); - setverdict(pass); -} - type record lqual_range { /* component reference to the IPA_Client component used for RSL */ uint8_t low, @@ -1774,15 +1401,6 @@ } control { - execute( TC_ns_reset() ); - execute( TC_ns_reset_retrans() ); - execute( TC_ns_alive() ); - execute( TC_ns_alive_timeout_reset() ); - execute( TC_ns_unblock() ); - execute( TC_ns_unblock_retrans() ); - execute( TC_ns_full_bringup() ); - execute( TC_ns_so_block() ); - execute( TC_pcuif_suspend() ); execute( TC_ta_ptcch_idle() ); execute( TC_ta_rach_imm_ass() ); diff --git a/pcu/PCU_Tests_RAW_NS.ttcn b/pcu/PCU_Tests_RAW_NS.ttcn new file mode 100644 index 0000000..b1b19bb --- /dev/null +++ b/pcu/PCU_Tests_RAW_NS.ttcn @@ -0,0 +1,453 @@ +module PCU_Tests_RAW_NS { + +/* Osmocom PCU test suite for IP Sub-Network-Service (SNS) in TTCN-3 + * (C) 2018-2019 Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from General_Types all; +import from Osmocom_Types all; +import from PCU_Tests all; +import from PCU_Tests_RAW all; +import from Osmocom_Gb_Types all; +import from NS_CodecPort all; +import from NS_Types all; +import from BSSGP_Types all; +import from UD_Types all; +import from NS_CodecPort all; +import from NS_CodecPort_CtrlFunct all; +import from NS_Emulation all; +import from Native_Functions all; +import from IPL4asp_Types all; +import from PCUIF_Types all; +import from PCUIF_CodecPort all; + +type component RAW_NS_CT { + /* UDP port towards the bottom (IUT) */ + port NS_CODEC_PT NSCP[4]; + var ConnectionId g_ns_conn_id[4] := {-1, -1, -1, -1}; + var NSConfiguration g_nsconfig[4]; + timer g_T_guard; +} + +type component RAW_PCU_CT { + /* PCUIF (we emulate the BTS part) */ + port PCUIF_CODEC_PT PCU; + var ConnectionId g_pcu_conn_id := -1; +} + +type component RAW_Test_CT extends RAW_NS_CT, RAW_PCU_CT { +} + +private altstep as_Tguard() runs on RAW_NS_CT { + [] g_T_guard.timeout { + setverdict(fail, "Timeout of T_guard"); + mtc.stop; + } +} + +/* FIXME: make sure to use parameters from mp_gb_cfg.cell_id in the PCU INFO IND */ +private template (value) PCUIF_info_ind ts_PCUIF_INFO_default := { + version := PCU_IF_VERSION, + flags := c_PCUIF_Flags_default, + trx := valueof(ts_PCUIF_InfoTrxs_def), + bsic := 7, + mcc := 262, + mnc := 42, + mnc_3_digits := 0, + lac := 13135, + rac := 0, + nsei := mp_nsconfig.nsei, + nse_timer := { 3, 3, 3, 3, 30, 3, 10 }, + cell_timer := { 3, 3, 3, 3, 3, 10, 3, 10, 3, 10, 3 }, + cell_id := 20960, + repeat_time := 5 * 50, + repeat_count := 3, + bvci := mp_gb_cfg.bvci, + t3142 := 20, + t3169 := 5, + t3191 := 5, + t3193_10ms := 160, + t3195 := 5, + t3101 := 10, + t3103 := 4, + t3105 := 8, + cv_countdown := 15, + dl_tbf_ext := 250 * 10, /* ms */ + ul_tbf_ext := 250 * 10, /* ms */ + initial_cs := 2, + initial_mcs := 6, + nsvci := { mp_nsconfig.nsvci, 0 }, + local_pprt := { mp_nsconfig.remote_udp_port, 0 }, + remote_port := { mp_nsconfig.local_udp_port, 0 }, + remote_ip := { f_inet_haddr(mp_nsconfig.local_ip) , '00000000'O } +} + +function f_init_pcuif() runs on RAW_PCU_CT { + var PCUIF_info_ind info_ind; + map(self:PCU, system:PCU); + + + info_ind := valueof(ts_PCUIF_INFO_default); + + /* Connect the Unix Domain Socket */ + g_pcu_conn_id := f_pcuif_listen(PCU, mp_pcu_sock_path); + PCU.receive(UD_connected:?); + + /* Wait for PCU_VERSION and return INFO_IND */ + PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_TXT_IND(0, PCU_VERSION, ?))); + /* FIXME: make sure to use parameters from mp_gb_cfg.cell_id in the PCU INFO IND */ + var template PCUIF_Message info_ind_msg := ts_PCUIF_INFO_IND(0, info_ind); + PCU.send(t_SD_PCUIF(g_pcu_conn_id, info_ind_msg)); +} + +function f_pcuif_tx(template (value) PCUIF_Message msg) runs on RAW_PCU_CT { + PCU.send(t_SD_PCUIF(g_pcu_conn_id, msg)); +} + +function f_init_ns_codec(integer idx := 0, float guard_secs := 60.0) runs on RAW_NS_CT { + var Result res; + + if (not g_T_guard.running) { + g_T_guard.start(guard_secs); + activate(as_Tguard()); + } + + if (not isbound(g_nsconfig) or not isbound(g_nsconfig[idx])) { + /* copy most parts from mp_nsconfig */ + g_nsconfig[idx] := mp_nsconfig; + /* adjust those parts different for each NS-VC */ + g_nsconfig[idx].nsvci := mp_nsconfig.nsvci + idx; + g_nsconfig[idx].local_udp_port := mp_nsconfig.local_udp_port + idx; + } + + map(self:NSCP[idx], system:NSCP); + /* Connect the UDP socket */ + log("connecting NSCP[", idx, "] to ", g_nsconfig[idx]); + res := f_IPL4_connect(NSCP[idx], g_nsconfig[idx].remote_ip, g_nsconfig[idx].remote_udp_port, + g_nsconfig[idx].local_ip, g_nsconfig[idx].local_udp_port, 0, { udp := {}}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect NS UDP socket, check your configuration ", g_nsconfig[idx]); + mtc.stop; + } + g_ns_conn_id[idx] := res.connId; + +} + +function f_ns_exp(template PDU_NS exp_rx, integer idx := 0) runs on RAW_NS_CT return PDU_NS { + var NS_RecvFrom nrf; + log("f_ns_exp() expecting ", exp_rx); + alt { + [] NSCP[idx].receive(t_NS_RecvFrom(exp_rx)) -> value nrf { } + [] NSCP[idx].receive { + setverdict(fail, "Received unexpected NS: ", nrf); + mtc.stop; + } + } + return nrf.msg; +} + +/* perform outbound NS-ALIVE procedure */ +function f_outgoing_ns_alive(integer idx := 0) runs on RAW_NS_CT { + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE)); + alt { + [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE_ACK)); + [] NSCP[idx].receive { repeat; } + } +} + +/* perform outbound NS-ALIVE procedure */ +function f_outgoing_ns_alive_no_ack(integer idx := 0, float tout := 10.0) runs on RAW_NS_CT { + timer T := tout; + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE)); + T.start; + alt { + [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE_ACK)) { + setverdict(fail, "Received unexpected NS-ALIVE ACK"); + } + [] NSCP[idx].receive { repeat; } + [] T.timeout { + setverdict(pass); + } + } +} + +/* ensure no matching message is received within 'tout' */ +function f_ensure_no_ns(template PDU_NS ns := ?, integer idx := 0, float tout := 3.0) +runs on RAW_Test_CT { + timer T := tout; + T.start; + alt { + [] NSCP[idx].receive(t_NS_RecvFrom(ns)) { + setverdict(fail, "NS-ALIVE from unconfigured (possibly initial) endpoint"); + } + [] T.timeout { + setverdict(pass); + } + } +} + +/* perform outbound NS-BLOCK procedure */ +function f_outgoing_ns_block(NsCause cause, integer idx := 0) runs on RAW_NS_CT { + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_BLOCK(cause, g_nsconfig[idx].nsvci))); + alt { + [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_BLOCK_ACK(g_nsconfig[idx].nsvci))); + [] NSCP[idx].receive { repeat; } + } +} + +/* receive NS-ALIVE and ACK it */ +altstep as_rx_alive_tx_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { + [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE)) { + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE_ACK)); + if (not oneshot) { repeat; } + } +} + +/* Transmit BSSGP RESET for given BVCI and expect ACK */ +function f_tx_bvc_reset_rx_ack(BssgpBvci bvci, integer idx := 0, boolean exp_ack := true) +runs on RAW_NS_CT { + var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET(BSSGP_CAUSE_NET_SV_CAP_MOD_GT_ZERO_KBPS, bvci, + mp_gb_cfg.cell_id)); + timer T := 5.0; + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); + T.start; + alt { + [exp_ack] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, + decmatch tr_BVC_RESET_ACK(bvci, ?)))) { + setverdict(pass); + } + [exp_ack] T.timeout { + setverdict(fail, "No response to BVC-RESET"); + } + [not exp_ack] T.timeout { + setverdict(pass); + } + [] NSCP[idx].receive { repeat; } + } +} + +/* Receive a BSSGP RESET for given BVCI and ACK it */ +altstep as_rx_bvc_reset_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { + var NS_RecvFrom ns_rf; + /* FIXME: nail down received cell_id in match */ + [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, + decmatch tr_BVC_RESET(?, bvci, ?)))) + -> value ns_rf { + var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); + var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET_ACK(bvci, mp_gb_cfg.cell_id)); + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); + if (not oneshot) { repeat; } + } +} + + +/* Receive a BSSGP UNBLOCK for given BVCI and ACK it */ +altstep as_rx_bvc_unblock_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { + var NS_RecvFrom ns_rf; + [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, + decmatch t_BVC_UNBLOCK(bvci)))) + -> value ns_rf { + var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); + var PDU_BSSGP bssgp_tx := valueof(t_BVC_UNBLOCK_ACK(bvci)); + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); + if (not oneshot) { repeat; } + } +} + +/* Receive a BSSGP FLOW-CONTROL-BVC and ACK it */ +altstep as_rx_bvc_fc_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { + var NS_Recv>From ns_rf; + [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, bvci, + decmatch tr_BVC_FC_BVC))) + -> value ns_rf { + var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); + var OCT1 tag := bssgp_rx.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value; + var PDU_BSSGP bssgp_tx := valueof(t_BVC_FC_BVC_ACK(tag)); + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, bvci, enc_PDU_BSSGP(bssgp_tx)))); + if (not oneshot) { repeat; } + } +} + +/********************************************************************************** + * Classic Gb/IP bring-up test cases using NS-{RESET,BLOCK,UNBLOCK} and no IP-SNS * + **********************************************************************************/ + +/* Receive a NS-RESET and ACK it */ +private altstep as_rx_ns_reset_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { + var NS_RecvFrom ns_rf; + [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_RESET(NS_CAUSE_OM_INTERVENTION, g_nsconfig[idx].nsvci, + g_nsconfig[idx].nsei))) -> value ns_rf { + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_RESET_ACK(g_nsconfig[idx].nsvci, + g_nsconfig[idx].nsei))); + if (not oneshot) { repeat; } + } +} +/* Receive a NS-UNBLOCK and ACK it */ +private altstep as_rx_ns_unblock_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { + var NS_RecvFrom ns_rf; + [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) -> value ns_rf { + NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_UNBLOCK_ACK)); + if (not oneshot) { repeat; } + } +} + +/* test the NS-RESET procedure */ +testcase TC_ns_reset() runs on RAW_Test_CT { + f_init_ns_codec(); + f_init_pcuif(); + + + /* Expect inbound NS-RESET procedure */ + as_rx_ns_reset_ack(oneshot := true); + setverdict(pass); +} + +/* ensure NS-RESET are re-transmitted */ +testcase TC_ns_reset_retrans() runs on RAW_Test_CT { + f_init_ns_codec(); + f_init_pcuif(); + + var integer i; + for (i := 0; i < 3; i := i+1) { + NSCP[0].receive(t_NS_RecvFrom(tr_NS_RESET(NS_CAUSE_OM_INTERVENTION, + g_nsconfig[0].nsvci, g_nsconfig[0].nsei))); + } + + /* Expect inbound NS-RESET procedure */ + as_rx_ns_reset_ack(oneshot := true); + setverdict(pass); +} + +/* test the inbound NS-ALIVE procedure after NS-RESET */ +testcase TC_ns_alive() runs on RAW_Test_CT { + f_init_ns_codec(); + f_init_pcuif(); + + /* Expect inbound NS-RESET procedure */ + as_rx_ns_reset_ack(oneshot := true); + + /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ + as_rx_alive_tx_ack(oneshot := true); + setverdict(pass); +} + +/* Test for NS-RESET after NS-ALIVE timeout */ +testcase TC_ns_alive_timeout_reset() runs on RAW_Test_CT { + f_init_ns_codec(guard_secs := 100.0); + f_init_pcuif(); + + /* Expect inbound NS-RESET procedure */ + as_rx_ns_reset_ack(oneshot := true); + + /* wait for at least one NS-ALIVE */ + NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE)); + + /* wait for NS-RESET to re-appear, ignoring any NS-ALIVE until then */ + alt { + [] as_rx_ns_reset_ack(oneshot := true) { setverdict(pass); } + [] NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE)) { repeat; } + } +} + +/* test for NS-RESET/NS-ALIVE/NS-UNBLOCK */ +testcase TC_ns_unblock() runs on RAW_Test_CT { + f_init_ns_codec(); + f_init_pcuif(); + + /* Expect inbound NS-RESET procedure */ + as_rx_ns_reset_ack(oneshot := true); + + /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ + as_rx_alive_tx_ack(oneshot := true); + activate(as_rx_alive_tx_ack()); + + as_rx_ns_unblock_ack(oneshot := true); + setverdict(pass); +} + +/* test for NS-UNBLOCK re-transmissions */ +testcase TC_ns_unblock_retrans() runs on RAW_Test_CT { + f_init_ns_codec(); + f_init_pcuif(); + + /* Expect inbound NS-RESET procedure */ + as_rx_ns_reset_ack(oneshot := true); + + /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ + as_rx_alive_tx_ack(oneshot := true); + activate(as_rx_alive_tx_ack()); + + /* wait for first NS-UNBLOCK, don't respond */ + NSCP[0].receive(t_NS_RecvFrom(t_NS_UNBLOCK)); + + /* wait for re-transmission of NS-UNBLOCK */ + as_rx_ns_unblock_ack(oneshot := true); + setverdict(pass); +} + +/* full bring-up of the Gb link for NS and BSSGP layer up to BVC-FC */ +testcase TC_ns_full_bringup() runs on RAW_Test_CT { + f_init_ns_codec(); + f_init_pcuif(); + + /* Expect inbound NS-RESET procedure */ + as_rx_ns_reset_ack(oneshot := true); + + /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ + as_rx_alive_tx_ack(oneshot := true); + activate(as_rx_alive_tx_ack()); + + as_rx_ns_unblock_ack(oneshot := true); + + f_outgoing_ns_alive(); + + /* Expect BVC-RESET for signaling (0) and ptp BVCI */ + as_rx_bvc_reset_tx_ack(0, oneshot := true); + as_rx_bvc_reset_tx_ack(mp_gb_cfg.bvci, oneshot := true); + as_rx_bvc_unblock_tx_ack(mp_gb_cfg.bvci, oneshot := true); + + /* wait for one FLOW-CONTROL BVC and then ACK any further in the future */ + as_rx_bvc_fc_tx_ack(mp_gb_cfg.bvci, oneshot := true); + activate(as_rx_bvc_fc_tx_ack(mp_gb_cfg.bvci)); + setverdict(pass); +} + +/* test outbound (SGSN-originated) NS-BLOCK procedure */ +testcase TC_ns_so_block() runs on RAW_Test_CT { + f_init_ns_codec(); + f_init_pcuif(); + + /* Expect inbound NS-RESET procedure */ + as_rx_ns_reset_ack(oneshot := true); + + /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ + as_rx_alive_tx_ack(oneshot := true); + activate(as_rx_alive_tx_ack()); + + as_rx_ns_unblock_ack(oneshot := true); + + f_outgoing_ns_alive(); + + f_outgoing_ns_block(NS_CAUSE_EQUIPMENT_FAILURE); + setverdict(pass); +} + + +control { + execute( TC_ns_reset() ); + execute( TC_ns_reset_retrans() ); + execute( TC_ns_alive() ); + execute( TC_ns_alive_timeout_reset() ); + execute( TC_ns_unblock() ); + execute( TC_ns_unblock_retrans() ); + execute( TC_ns_full_bringup() ); + execute( TC_ns_so_block() ); +} + +} diff --git a/pcu/PCU_Tests_RAW_SNS.ttcn b/pcu/PCU_Tests_RAW_SNS.ttcn index c8520e7..1a8c30f 100644 --- a/pcu/PCU_Tests_RAW_SNS.ttcn +++ b/pcu/PCU_Tests_RAW_SNS.ttcn @@ -12,7 +12,7 @@ import from Osmocom_Types all; import from PCU_Tests all; -import from PCU_Tests_RAW all; +import from PCU_Tests_RAW_NS all; import from Osmocom_Gb_Types all; import from NS_CodecPort all; import from NS_Types all; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If680d1bd7dbfe98829f330c33705e0f13bedf3c7 Gerrit-Change-Number: 16685 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 16:35:08 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 16:35:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_rach_egprs_only In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16687 ) Change subject: pcu: Introduce test TC_rach_egprs_only ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I96e0d28bed749ef657f0b68d0beee3f8471ab3e0 Gerrit-Change-Number: 16687 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 31 Dec 2019 16:35:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 16:35:20 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 16:35:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RLCMAC_CSN1_Types.ttcn: Support encoding of MS Radio Access Capability 2 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16688 ) Change subject: RLCMAC_CSN1_Types.ttcn: Support encoding of MS Radio Access Capability 2 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iac7d7b694bc44887443418f755e51d636abe8575 Gerrit-Change-Number: 16688 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 31 Dec 2019 16:35:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 16:35:58 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 16:35:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_RR_Types.ttcn: Support encoding of EGPRS Packet Uplink Assignment In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16689 ) Change subject: GSM_RR_Types.ttcn: Support encoding of EGPRS Packet Uplink Assignment ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idf3bd12318480e8cdd26fce35e52d0a9e8c39608 Gerrit-Change-Number: 16689 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 31 Dec 2019 16:35:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 16:36:32 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 16:36:32 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu: Run tests from PCU_Tests_RAW_NS.ttcn In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16686 ) Change subject: ttcn3-pcu: Run tests from PCU_Tests_RAW_NS.ttcn ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3e2ec21c56fbfad5d1af051dcc0d0a9c88d2070a Gerrit-Change-Number: 16686 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 31 Dec 2019 16:36:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 16:36:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 16:36:50 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu: Run tests from PCU_Tests_RAW_NS.ttcn In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16686 ) Change subject: ttcn3-pcu: Run tests from PCU_Tests_RAW_NS.ttcn ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3e2ec21c56fbfad5d1af051dcc0d0a9c88d2070a Gerrit-Change-Number: 16686 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 31 Dec 2019 16:36:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 16:36:52 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 16:36:52 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu: Run tests from PCU_Tests_RAW_NS.ttcn In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16686 ) Change subject: ttcn3-pcu: Run tests from PCU_Tests_RAW_NS.ttcn ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3e2ec21c56fbfad5d1af051dcc0d0a9c88d2070a Gerrit-Change-Number: 16686 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 31 Dec 2019 16:36:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 16:36:53 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 16:36:53 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu: Run tests from PCU_Tests_RAW_NS.ttcn In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/16686 ) Change subject: ttcn3-pcu: Run tests from PCU_Tests_RAW_NS.ttcn ...................................................................... ttcn3-pcu: Run tests from PCU_Tests_RAW_NS.ttcn NS tests have been splitted recently into their own module. Make sure we call tests from the new module. Depends: osmo-ttcn3-hacks.git If680d1bd7dbfe98829f330c33705e0f13bedf3c7 Change-Id: I3e2ec21c56fbfad5d1af051dcc0d0a9c88d2070a --- M ttcn3-pcu-test/PCU_Tests.cfg 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg index 9520775..8c75ca9 100644 --- a/ttcn3-pcu-test/PCU_Tests.cfg +++ b/ttcn3-pcu-test/PCU_Tests.cfg @@ -24,3 +24,4 @@ [EXECUTE] PCU_Tests_RAW.control +PCU_Tests_RAW_NS.control -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/16686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3e2ec21c56fbfad5d1af051dcc0d0a9c88d2070a Gerrit-Change-Number: 16686 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 16:38:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 16:38:39 +0000 Subject: Change in osmo-pcu[master]: Pass paging group instead of imsi where later is not needed In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16672 ) Change subject: Pass paging group instead of imsi where later is not needed ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/16672/2/src/pcu_l1_if.cpp File src/pcu_l1_if.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/16672/2/src/pcu_l1_if.cpp at 82 PS2, Line 82: 0 shouldn't this be 'return pgroup' ? If it is as broken as I suspect, I'm wondering what kind of testing this patch has seen? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id0663a81f439f2d0b893b0d34f85a6db1927ef8e Gerrit-Change-Number: 16672 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 31 Dec 2019 16:38:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 16:38:59 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 16:38:59 +0000 Subject: Change in osmo-pcu[master]: Allow Gb PAGING-PS without P-TMSI In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16536 ) Change subject: Allow Gb PAGING-PS without P-TMSI ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4dbf8db04e81f98352a42ce34a5d91326be9bfd1 Gerrit-Change-Number: 16536 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 31 Dec 2019 16:38:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:00:09 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 31 Dec 2019 17:00:09 +0000 Subject: Change in pysim[master]: Fixup: Fix automated tests References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16690 ) Change subject: Fixup: Fix automated tests ...................................................................... Fixup: Fix automated tests The Change I12e6b46787efb39c5745f4e7f3cdcca9209881b8 was not as effective as expected. Diff is used wrongly so that no lines are compared. Lets fix this Change-Id: I1601d8a2b3e1c07fe1eba375ea8deae3d50bbef0 --- M tests/pysim-test.sh 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/90/16690/1 diff --git a/tests/pysim-test.sh b/tests/pysim-test.sh index c3e1747..0d469c9 100755 --- a/tests/pysim-test.sh +++ b/tests/pysim-test.sh @@ -82,7 +82,9 @@ # pysim would print the device number of the reader and we do not # want the test to fail just because the card is put into a different # reader device. - CARD_DIFF=$(diff + 1 $TEMPFILE ./$CARD_NAME.ok) + tail -n +2 $CARD_NAME.ok > $CARD_NAME.ok.tmp + tail -n +2 $TEMPFILE > $CARD_NAME.chk.tmp + CARD_DIFF=$(diff $CARD_NAME.chk.tmp $CARD_NAME.ok.tmp) set -e if [ "$CARD_DIFF" != "" ]; then @@ -95,13 +97,14 @@ echo "------------8<------------" cat $TEMPFILE echo "------------8<------------" + rm *.tmp exit 1 fi inc_card_list $CARD_NAME echo "Card contents match the test data -- success!" - rm $TEMPFILE + rm *.tmp } # Read out the card using pysim-read and store the result as .ok file. This -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1601d8a2b3e1c07fe1eba375ea8deae3d50bbef0 Gerrit-Change-Number: 16690 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:00:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:00:18 +0000 Subject: Change in osmo-pcu[master]: Split identity_lv param into mi+mi_len In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16673 ) Change subject: Split identity_lv param into mi+mi_len ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16673 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ifb9d3997bfb74b35366c3d1bc51ce458f19abf16 Gerrit-Change-Number: 16673 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 31 Dec 2019 17:00:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:00:25 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:00:25 +0000 Subject: Change in osmo-pcu[master]: Support Gb PAGING-CS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16537 ) Change subject: Support Gb PAGING-CS ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9501e02e1d7f6944497e724dbccb9a19c3f5221f Gerrit-Change-Number: 16537 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 31 Dec 2019 17:00:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:00:39 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:00:39 +0000 Subject: Change in osmo-pcu[master]: Log BVCI PTP value upon msg recv In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16674 ) Change subject: Log BVCI PTP value upon msg recv ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I47c5902112d568cd5a48e003010d8085b02d64e8 Gerrit-Change-Number: 16674 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 31 Dec 2019 17:00:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:00:54 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:00:54 +0000 Subject: Change in osmo-pcu[master]: fix typo in log message In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/16676 ) Change subject: fix typo in log message ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/16676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib6fc4625242d855193b62b561624b23b265648b9 Gerrit-Change-Number: 16676 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 31 Dec 2019 17:00:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:01:43 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:01:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RLCMAC_CSN1_Types.ttcn: Support encoding of MS Radio Access Capability 2 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16688 ) Change subject: RLCMAC_CSN1_Types.ttcn: Support encoding of MS Radio Access Capability 2 ...................................................................... RLCMAC_CSN1_Types.ttcn: Support encoding of MS Radio Access Capability 2 Change-Id: Iac7d7b694bc44887443418f755e51d636abe8575 --- M library/RLCMAC_CSN1_Types.ttcn M sysinfo/gen_links.sh 2 files changed, 6 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index ea2edf6..11df29d 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -16,6 +16,7 @@ import from General_Types all; import from Osmocom_Types all; import from GSM_Types all; + import from MobileL3_GMM_SM_Types all; /* TS 44.060 11.2.0.1 */ type enumerated RlcmacDlCtrlMsgType { @@ -418,7 +419,7 @@ * (value part, see 3GPP TS 24.008, 10.5.5.12a) */ type union MSRadioAccCap2 { /* TODO: see table 10.5.146/3GPP TS 24.008 */ - bitstring other + MSRadioAccessCapabilityV msRadioAccessCapabilityV }; /* Table 11.2.16.2 Access Type */ diff --git a/sysinfo/gen_links.sh b/sysinfo/gen_links.sh index f44350a..d32b89b 100755 --- a/sysinfo/gen_links.sh +++ b/sysinfo/gen_links.sh @@ -8,6 +8,10 @@ FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" gen_links $DIR $FILES +DIR=$BASEDIR/titan.ProtocolModules.MobileL3_v13.4.0/src +FILES="MobileL3_CommonIE_Types.ttcn MobileL3_GMM_SM_Types.ttcn MobileL3_MM_Types.ttcn" +gen_links $DIR $FILES + DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src FILES="Socket_API_Definitions.ttcn" gen_links $DIR $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iac7d7b694bc44887443418f755e51d636abe8575 Gerrit-Change-Number: 16688 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:01:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:01:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_RR_Types.ttcn: Support encoding of EGPRS Packet Uplink Assignment In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16689 ) Change subject: GSM_RR_Types.ttcn: Support encoding of EGPRS Packet Uplink Assignment ...................................................................... GSM_RR_Types.ttcn: Support encoding of EGPRS Packet Uplink Assignment Change-Id: Idf3bd12318480e8cdd26fce35e52d0a9e8c39608 --- M library/GSM_RR_Types.ttcn 1 file changed, 123 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index f5eeda5..9fd7733 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -552,7 +552,129 @@ type record IaRestOctLL { BIT1 compressed_irat_ho_info_ind } with { variant "" }; - type octetstring EgprsUlAss; /* TODO */ + + + type record of AccessTechnologiesRequest + AccessTechnologiesRequestRepetition + with { variant "EXTENSION_BIT(reverse)" }; + + type record AccessTechnologiesRequest + { + BIT4 accessTechnType, + BIT1 extensionBit + } with { variant "FIELDORDER(msb)" }; + + type enumerated EgprsChCodingCommand { + CH_CODING_MCS1 ('0000'B), + CH_CODING_MCS2 ('0001'B), + CH_CODING_MCS3 ('0010'B), + CH_CODING_MCS4 ('0011'B), + CH_CODING_MCS5 ('0100'B), + CH_CODING_MCS6 ('0101'B), + CH_CODING_MCS7 ('0110'B), + CH_CODING_MCS8 ('0111'B), + CH_CODING_MCS9 ('1000'B), + CH_CODING_MCS5_7 ('1001'B), + CH_CODING_MCS6_9 ('1010'B) + } with { variant "FIELDLENGTH(4)" }; + + /* TS 44.060 Table 12.5.2.1 */ + type enumerated EgprsWindowSize { + EGPRS_WS_64 ('00000'B), + EGPRS_WS_96 ('00001'B), + EGPRS_WS_128 ('00010'B), + EGPRS_WS_160 ('00011'B), + EGPRS_WS_192 ('00100'B), + EGPRS_WS_224 ('00101'B), + EGPRS_WS_256 ('00110'B), + EGPRS_WS_288 ('00111'B), + EGPRS_WS_320 ('01000'B), + EGPRS_WS_352 ('01001'B), + EGPRS_WS_384 ('01010'B), + EGPRS_WS_416 ('01011'B), + EGPRS_WS_448 ('01100'B), + EGPRS_WS_480 ('01101'B), + EGPRS_WS_512 ('01110'B), + EGPRS_WS_544 ('01111'B), + EGPRS_WS_576 ('10000'B), + EGPRS_WS_608 ('10001'B), + EGPRS_WS_640 ('10010'B), + EGPRS_WS_672 ('10011'B), + EGPRS_WS_704 ('10100'B), + EGPRS_WS_736 ('10101'B), + EGPRS_WS_768 ('10110'B), + EGPRS_WS_800 ('10111'B), + EGPRS_WS_832 ('11000'B), + EGPRS_WS_864 ('11001'B), + EGPRS_WS_896 ('11010'B), + EGPRS_WS_928 ('11011'B), + EGPRS_WS_960 ('11100'B), + EGPRS_WS_992 ('11101'B), + EGPRS_WS_1024 ('11110'B) + } with { variant "FIELDLENGTH(5)" }; + + type record EgprsUlAssignDyn { + uint5_t tfi_assignment, + BIT1 polling, + BIT1 spare ('0'B), + uint3_t usf, + BIT1 usf_granularity, + BIT1 p0_present, + uint4_t p0 optional, + BIT1 pr_mode optional, + EgprsChCodingCommand egprs_ch_coding_cmd, + BIT1 tlli_block_chan_coding, + BIT1 bep_period2_present, + BIT4 bep_period2 optional, + BIT1 resegment, + EgprsWindowSize egprs_window_size, + BIT1 alpha_present, + uint4_t alpha optional, + uint5_t gamma, + BIT1 ta_index_present, + uint4_t ta_index optional, + BIT1 tbf_starting_time_present, + uint16_t tbf_starting_time optional + /* TODO: Additions for Rel-7 */ + } with { + variant (p0) "PRESENCE(p0_present = '1'B)" + variant (pr_mode) "PRESENCE(p0_present = '1'B)" + variant (bep_period2) "PRESENCE(bep_period2_present = '1'B)" + variant (alpha) "PRESENCE(alpha_present = '1'B)" + variant (ta_index) "PRESENCE(ta_index_present = '1'B)" + variant (tbf_starting_time) "PRESENCE(tbf_starting_time_present = '1'B)" + }; + type record EgprsUlAssignMultiblock { + BIT1 alpha_present, + uint4_t alpha optional, + uint5_t gamma, + uint16_t tbf_starting_time, + BIT2 nr_radio_blocks_allocated, + BIT1 p0_present, + uint4_t p0 optional, + BIT1 spare ('0'B) optional, + BIT1 pr_mode optional + /* TDO: Additions for Rel-6 */ + } with { + variant (alpha) "PRESENCE(alpha_present = '1'B)" + variant (p0) "PRESENCE(p0_present = '1'B)" + variant (spare) "PRESENCE(p0_present = '1'B)" + variant (pr_mode) "PRESENCE(p0_present = '1'B)" + }; + /* 3GPP TS 44.018 version 13.3.2 10.5.2.16, "EGPRS Packet Uplink Assignment" */ + type record EgprsUlAss { + BIT5 ext_ra, + BIT1 ats_present, + AccessTechnologiesRequestRepetition ats optional, + BIT1 presence, + EgprsUlAssignDyn dynamic optional, + EgprsUlAssignMultiblock multiblock optional + } with { + variant (ats) "PRESENCE(ats_present = '1'B)" + variant (dynamic) "PRESENCE(presence = '1'B)" + variant (multiblock) "PRESENCE(presence = '0'B)" + }; + type octetstring MblkDlAss; /* TODO */ type record IaRestOctLH { BIT2 presence, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idf3bd12318480e8cdd26fce35e52d0a9e8c39608 Gerrit-Change-Number: 16689 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:02:34 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:02:34 +0000 Subject: Change in osmo-bts[master]: l1sap: is_fille_frame(): verify len of data compared In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16661 ) Change subject: l1sap: is_fille_frame(): verify len of data compared ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id3d1725ff36091ed5c57927caad09a8baea6f52e Gerrit-Change-Number: 16661 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 31 Dec 2019 17:02:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:02:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:02:35 +0000 Subject: Change in osmo-bts[master]: l1sap: is_fille_frame(): verify len of data compared In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16661 ) Change subject: l1sap: is_fille_frame(): verify len of data compared ...................................................................... l1sap: is_fille_frame(): verify len of data compared Change-Id: Id3d1725ff36091ed5c57927caad09a8baea6f52e --- M src/common/l1sap.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 213099d..b6e21fa 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -458,6 +458,9 @@ static bool is_fill_frame(uint8_t chan_type, const uint8_t *data, unsigned int len) { + if (len != GSM_MACBLOCK_LEN) + return false; + switch (chan_type) { case GSMTAP_CHANNEL_AGCH: if (!memcmp(data, fill_frame, GSM_MACBLOCK_LEN)) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id3d1725ff36091ed5c57927caad09a8baea6f52e Gerrit-Change-Number: 16661 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:02:50 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:02:50 +0000 Subject: Change in osmocom-bb[master]: contrib/jenkins.sh: also verify building the firmware In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16670 ) Change subject: contrib/jenkins.sh: also verify building the firmware ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4c224ef7855a2ac35476cbdd96c29565151a2830 Gerrit-Change-Number: 16670 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 31 Dec 2019 17:02:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:02:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:02:57 +0000 Subject: Change in osmocom-bb[master]: contrib/jenkins.sh: also run unit tests for TRX Toolkit In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16567 ) Change subject: contrib/jenkins.sh: also run unit tests for TRX Toolkit ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia3990dc8e1ff98b83d3ee25fafa5b029f46646cd Gerrit-Change-Number: 16567 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 31 Dec 2019 17:02:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:03:09 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:03:09 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_msg.py: rewrite unit tests to use unittest framework In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16568 ) Change subject: trx_toolkit/data_msg.py: rewrite unit tests to use unittest framework ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia0cc7447b193a705e994078d16f3902339219916 Gerrit-Change-Number: 16568 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 31 Dec 2019 17:03:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:03:11 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:03:11 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_dump.py: rewrite unit tests to use unittest framework In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16669 ) Change subject: trx_toolkit/data_dump.py: rewrite unit tests to use unittest framework ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8b934c15ba96d856aa79d10bf296d1446f043dd1 Gerrit-Change-Number: 16669 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 31 Dec 2019 17:03:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:03:12 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:03:12 +0000 Subject: Change in osmocom-bb[master]: contrib/jenkins.sh: also verify building the firmware In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16670 ) Change subject: contrib/jenkins.sh: also verify building the firmware ...................................................................... contrib/jenkins.sh: also verify building the firmware Change-Id: I4c224ef7855a2ac35476cbdd96c29565151a2830 --- M contrib/jenkins.sh 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 52c6566..ec81f03 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -67,4 +67,8 @@ make maintainer-clean done +# Build the firmware (against the local copy of libosmocore) +cd "$base/src" +make firmware + osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4c224ef7855a2ac35476cbdd96c29565151a2830 Gerrit-Change-Number: 16670 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:03:13 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:03:13 +0000 Subject: Change in osmocom-bb[master]: contrib/jenkins.sh: also run unit tests for TRX Toolkit In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16567 ) Change subject: contrib/jenkins.sh: also run unit tests for TRX Toolkit ...................................................................... contrib/jenkins.sh: also run unit tests for TRX Toolkit Python's unittest module will automatically discover all unit tests in a given directory (files starting with 'test*.py'). The existing tests will be rewritten in subsequent changes. Change-Id: Ia3990dc8e1ff98b83d3ee25fafa5b029f46646cd --- M contrib/jenkins.sh 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index ec81f03..07a02c1 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -71,4 +71,8 @@ cd "$base/src" make firmware +# TRX Toolkit unit tests +cd "$base/src/target/trx_toolkit" +python3 -m unittest discover -v + osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia3990dc8e1ff98b83d3ee25fafa5b029f46646cd Gerrit-Change-Number: 16567 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:03:14 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:03:14 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_msg.py: rewrite unit tests to use unittest framework In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16568 ) Change subject: trx_toolkit/data_msg.py: rewrite unit tests to use unittest framework ...................................................................... trx_toolkit/data_msg.py: rewrite unit tests to use unittest framework Change-Id: Ia0cc7447b193a705e994078d16f3902339219916 --- M src/target/trx_toolkit/data_msg.py A src/target/trx_toolkit/test_data_msg.py 2 files changed, 193 insertions(+), 212 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index c96dddb..8710702 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -856,215 +856,3 @@ msg.burst = self.sbit2ubit(self.burst) return msg - -# Regression test -if __name__ == '__main__': - import logging as log - - # Configure logging - log.basicConfig(level = log.DEBUG, - format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") - - log.info("Generating the reference messages") - - # Create messages of both types - msg_l12trx_ref = DATAMSG_L12TRX() - msg_trx2l1_ref = DATAMSG_TRX2L1() - - # Validate header randomization - for i in range(0, 100): - msg_l12trx_ref.rand_hdr() - msg_trx2l1_ref.rand_hdr() - - msg_l12trx_ref.rand_burst() - msg_trx2l1_ref.rand_burst() - - msg_l12trx_ref.validate() - msg_trx2l1_ref.validate() - - log.info("Validate header randomization: OK") - - # Test error handling for common fields - msg = DATAMSG() - - # Make sure that message validation throws a ValueError - def validate_throw(msg): - try: - msg.validate() - return False - except ValueError: - return True - - # Unknown version - msg.rand_hdr() - msg.ver = 100 - assert(validate_throw(msg)) - - # Uninitialized field - msg.rand_hdr() - msg.fn = None - assert(validate_throw(msg)) - - # Out-of-range value - msg.rand_hdr() - msg.tn = 10 - assert(validate_throw(msg)) - - log.info("Check incorrect message validation: OK") - - log.info("Encoding the reference messages") - - # Encode DATA messages - l12trx_raw = msg_l12trx_ref.gen_msg() - trx2l1_raw = msg_trx2l1_ref.gen_msg() - - # Encode a TRX2L1 message in legacy mode - trx2l1_raw_legacy = msg_trx2l1_ref.gen_msg(legacy = True) - - log.info("Parsing generated messages back") - - # Parse generated DATA messages - msg_l12trx_dec = DATAMSG_L12TRX() - msg_trx2l1_dec = DATAMSG_TRX2L1() - msg_l12trx_dec.parse_msg(l12trx_raw) - msg_trx2l1_dec.parse_msg(trx2l1_raw) - - # Parse generated TRX2L1 message in legacy mode - msg_trx2l1_legacy_dec = DATAMSG_TRX2L1() - msg_trx2l1_legacy_dec.parse_msg(trx2l1_raw_legacy) - - log.info("Comparing decoded messages with the reference") - - # Compare bursts - assert(msg_l12trx_dec.burst == msg_l12trx_ref.burst) - assert(msg_trx2l1_dec.burst == msg_trx2l1_ref.burst) - assert(msg_trx2l1_legacy_dec.burst == msg_trx2l1_ref.burst) - - log.info("Compare bursts: OK") - - # Compare both parsed messages with the reference data - assert(msg_l12trx_dec.fn == msg_l12trx_ref.fn) - assert(msg_trx2l1_dec.fn == msg_trx2l1_ref.fn) - assert(msg_l12trx_dec.tn == msg_l12trx_ref.tn) - assert(msg_trx2l1_dec.tn == msg_trx2l1_ref.tn) - - log.info("Compare FN / TN: OK") - - # Compare message specific parts - assert(msg_trx2l1_dec.rssi == msg_trx2l1_ref.rssi) - assert(msg_l12trx_dec.pwr == msg_l12trx_ref.pwr) - assert(msg_trx2l1_dec.toa256 == msg_trx2l1_ref.toa256) - - log.info("Compare message specific data: OK") - - # Bit conversation test - usbits_ref = list(range(0, 256)) - sbits_ref = list(range(-127, 128)) - - # Test both usbit2sbit() and sbit2usbit() - sbits = DATAMSG.usbit2sbit(usbits_ref) - usbits = DATAMSG.sbit2usbit(sbits) - assert(usbits[:255] == usbits_ref[:255]) - assert(usbits[255] == 254) - - log.info("Check both usbit2sbit() and sbit2usbit(): OK") - - # Test both sbit2ubit() and ubit2sbit() - ubits = DATAMSG.sbit2ubit(sbits_ref) - assert(ubits == ([1] * 127 + [0] * 128)) - - sbits = DATAMSG.ubit2sbit(ubits) - assert(sbits == ([-127] * 127 + [127] * 128)) - - log.info("Check both sbit2ubit() and ubit2sbit(): OK") - - # Test message transformation - msg_l12trx_dec = msg_trx2l1_ref.gen_l12trx() - msg_trx2l1_dec = msg_l12trx_ref.gen_trx2l1() - - assert(msg_l12trx_dec.fn == msg_trx2l1_ref.fn) - assert(msg_l12trx_dec.tn == msg_trx2l1_ref.tn) - - assert(msg_trx2l1_dec.fn == msg_l12trx_ref.fn) - assert(msg_trx2l1_dec.tn == msg_l12trx_ref.tn) - - assert(msg_l12trx_dec.burst == DATAMSG.sbit2ubit(msg_trx2l1_ref.burst)) - assert(msg_trx2l1_dec.burst == DATAMSG.ubit2sbit(msg_l12trx_ref.burst)) - - log.info("Check L12TRX <-> TRX2L1 type transformations: OK") - - # Test header version coding - for ver in DATAMSG.known_versions: - # Create messages of both types - msg_l12trx = DATAMSG_L12TRX(ver = ver) - msg_trx2l1 = DATAMSG_TRX2L1(ver = ver) - - # Randomize message specific headers - msg_l12trx.rand_hdr() - msg_trx2l1.rand_hdr() - - # Randomize bursts - msg_l12trx.rand_burst() - msg_trx2l1.rand_burst() - - # Encode DATA messages - msg_l12trx_enc = msg_l12trx.gen_msg() - msg_trx2l1_enc = msg_trx2l1.gen_msg() - - # Parse generated DATA messages - msg_l12trx_dec = DATAMSG_L12TRX() - msg_trx2l1_dec = DATAMSG_TRX2L1() - msg_l12trx_dec.parse_msg(msg_l12trx_enc) - msg_trx2l1_dec.parse_msg(msg_trx2l1_enc) - - # Match the header version - assert(msg_l12trx_dec.ver == ver) - assert(msg_trx2l1_dec.ver == ver) - - # Match common TDMA fields - assert(msg_l12trx_dec.tn == msg_l12trx.tn) - assert(msg_trx2l1_dec.fn == msg_trx2l1.fn) - - # Match version specific fields - if msg_trx2l1.ver >= 0x01: - assert(msg_trx2l1_dec.nope_ind == msg_trx2l1.nope_ind) - assert(msg_trx2l1_dec.mod_type == msg_trx2l1.mod_type) - assert(msg_trx2l1_dec.tsc_set == msg_trx2l1.tsc_set) - assert(msg_trx2l1_dec.tsc == msg_trx2l1.tsc) - assert(msg_trx2l1_dec.ci == msg_trx2l1.ci) - - log.info("Check header version %u coding: OK" % ver) - - # Compare bursts - assert(msg_l12trx_dec.burst == msg_l12trx.burst) - assert(msg_trx2l1_dec.burst == msg_trx2l1.burst) - - msg_trx2l1_gen = msg_l12trx.gen_trx2l1() - msg_l12trx_gen = msg_trx2l1.gen_l12trx() - - assert(msg_trx2l1_gen is not None) - assert(msg_l12trx_gen is not None) - - # Match the header version - assert(msg_trx2l1_gen.ver == ver) - assert(msg_l12trx_gen.ver == ver) - - # Match common TDMA fields - assert(msg_trx2l1_gen.tn == msg_l12trx.tn) - assert(msg_l12trx_gen.fn == msg_trx2l1.fn) - - log.info("Verify version %u direct transformation: OK" % ver) - - # Verify NOPE indication coding - if msg_trx2l1.ver >= 0x01: - msg_trx2l1 = DATAMSG_TRX2L1(ver = ver) - msg_trx2l1.nope_ind = True - msg_trx2l1.rand_hdr() - - msg_trx2l1_dec = DATAMSG_TRX2L1() - msg_trx2l1_dec.parse_msg(msg_trx2l1.gen_msg()) - - assert(msg_trx2l1.nope_ind == msg_trx2l1_dec.nope_ind) - assert(msg_trx2l1.burst == msg_trx2l1_dec.burst) - - log.info("Verify version %u NOPE indication coding: OK" % ver) diff --git a/src/target/trx_toolkit/test_data_msg.py b/src/target/trx_toolkit/test_data_msg.py new file mode 100644 index 0000000..6254203 --- /dev/null +++ b/src/target/trx_toolkit/test_data_msg.py @@ -0,0 +1,193 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +# TRX Toolkit +# Unit test for TRXD message codec +# +# (C) 2019 by Vadim Yanitskiy +# +# All Rights Reserved +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import unittest + +from data_msg import DATAMSG, DATAMSG_L12TRX, DATAMSG_TRX2L1 + +class DATAMSG_Test(unittest.TestCase): + # Compare message a with message b + def _compare_msg(self, a, b): + # Make sure we're comparing messages of the same type + self.assertEqual(a.__class__, b.__class__) + + # Compare common header fields + self.assertEqual(a.ver, b.ver) + self.assertEqual(a.fn, b.fn) + self.assertEqual(a.tn, b.tn) + + # Burst bits (if present) + self.assertEqual(a.burst, b.burst) + + # TRX2L1 specific fields + if isinstance(a, DATAMSG_L12TRX): + self.assertEqual(a.pwr, b.pwr) + + # L12TRX specific fields + if isinstance(a, DATAMSG_TRX2L1): + # Version independent fields + self.assertEqual(a.toa256, b.toa256) + self.assertEqual(a.rssi, b.rssi) + + # Version specific fields + if a.ver >= 1: + self.assertEqual(a.nope_ind, b.nope_ind) + self.assertEqual(a.mod_type, b.mod_type) + self.assertEqual(a.tsc_set, b.tsc_set) + self.assertEqual(a.tsc, b.tsc) + self.assertEqual(a.ci, b.ci) + + # Make sure that message validation throws a ValueError + def test_validate(self): + # Unknown version + with self.assertRaises(ValueError): + msg = DATAMSG(fn = 0, tn = 0, ver = 100) + msg.validate() + + # Uninitialized field + with self.assertRaises(ValueError): + msg = DATAMSG() + msg.validate() + with self.assertRaises(ValueError): + msg = DATAMSG(fn = None, tn = 0) + msg.validate() + + # Out-of-range value(s) + with self.assertRaises(ValueError): + msg = DATAMSG(fn = -1, tn = 0) + msg.validate() + with self.assertRaises(ValueError): + msg = DATAMSG(fn = 0, tn = 10) + msg.validate() + + # Validate header and burst randomization + def test_rand_hdr_burst(self): + msg_l12trx = DATAMSG_L12TRX() + msg_trx2l1 = DATAMSG_TRX2L1() + + for i in range(100): + msg_l12trx.rand_burst() + msg_trx2l1.rand_burst() + msg_l12trx.rand_hdr() + msg_trx2l1.rand_hdr() + + msg_l12trx.validate() + msg_trx2l1.validate() + + def _test_enc_dec(self, msg, legacy = False, nope_ind = False): + # Prepare a given message (randomize) + msg.rand_hdr() + + # NOPE.ind contains no burst + if not nope_ind: + msg.rand_burst() + else: + msg.nope_ind = True + msg.mod_type = None + msg.tsc_set = None + msg.tsc = None + + # Encode a given message to bytes + msg_enc = msg.gen_msg(legacy) + + # Decode a new message from bytes + msg_dec = msg.__class__() + msg_dec.parse_msg(msg_enc) + + # Compare decoded vs the original + self._compare_msg(msg, msg_dec) + + # Validate encoding and decoding + def test_enc_dec(self): + for ver in DATAMSG.known_versions: + with self.subTest("L1 -> TRX message", ver = ver): + msg = DATAMSG_L12TRX(ver = ver) + self._test_enc_dec(msg) + + with self.subTest("TRX -> L1 message", ver = ver): + msg = DATAMSG_TRX2L1(ver = ver) + self._test_enc_dec(msg) + + if ver >= 1: + with self.subTest("TRX -> L1 NOPE.ind", ver = ver): + msg = DATAMSG_TRX2L1(ver = ver) + self._test_enc_dec(msg, nope_ind = True) + + with self.subTest("TRX -> L1 message (legacy)"): + msg = DATAMSG_TRX2L1(ver = 0) + self._test_enc_dec(msg, legacy = True) + + # Validate bit conversations + def test_bit_conv(self): + usbits_ref = list(range(0, 256)) + sbits_ref = list(range(-127, 128)) + + # Test both usbit2sbit() and sbit2usbit() + sbits = DATAMSG.usbit2sbit(usbits_ref) + usbits = DATAMSG.sbit2usbit(sbits) + self.assertEqual(usbits[:255], usbits_ref[:255]) + self.assertEqual(usbits[255], 254) + + # Test both sbit2ubit() and ubit2sbit() + ubits = DATAMSG.sbit2ubit(sbits_ref) + self.assertEqual(ubits, ([1] * 127 + [0] * 128)) + + sbits = DATAMSG.ubit2sbit(ubits) + self.assertEqual(sbits, ([-127] * 127 + [127] * 128)) + + def _test_transform(self, msg): + # Prepare given messages + msg.rand_hdr() + msg.rand_burst() + + # Perform message transformation + if isinstance(msg, DATAMSG_L12TRX): + msg_trans = msg.gen_trx2l1() + else: + msg_trans = msg.gen_l12trx() + + self.assertEqual(msg_trans.ver, msg.ver) + self.assertEqual(msg_trans.fn, msg.fn) + self.assertEqual(msg_trans.tn, msg.tn) + + if isinstance(msg, DATAMSG_TRX2L1): + burst = DATAMSG.sbit2ubit(msg.burst) + self.assertEqual(msg_trans.burst, burst) + else: + burst = DATAMSG.ubit2sbit(msg.burst) + self.assertEqual(msg_trans.burst, burst) + + # Validate message transformation + def test_transform(self): + for ver in DATAMSG.known_versions: + with self.subTest("L1 -> TRX message", ver = ver): + msg = DATAMSG_L12TRX(ver = ver) + self._test_transform(msg) + + with self.subTest("TRX -> L1 message", ver = ver): + msg = DATAMSG_TRX2L1(ver = ver) + self._test_transform(msg) + +if __name__ == '__main__': + unittest.main() -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia0cc7447b193a705e994078d16f3902339219916 Gerrit-Change-Number: 16568 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:03:14 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:03:14 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_dump.py: rewrite unit tests to use unittest framework In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16669 ) Change subject: trx_toolkit/data_dump.py: rewrite unit tests to use unittest framework ...................................................................... trx_toolkit/data_dump.py: rewrite unit tests to use unittest framework Change-Id: I8b934c15ba96d856aa79d10bf296d1446f043dd1 --- M src/target/trx_toolkit/data_dump.py A src/target/trx_toolkit/test_data_dump.py 2 files changed, 165 insertions(+), 145 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/target/trx_toolkit/data_dump.py b/src/target/trx_toolkit/data_dump.py index b91408f..7c5452b 100644 --- a/src/target/trx_toolkit/data_dump.py +++ b/src/target/trx_toolkit/data_dump.py @@ -220,148 +220,3 @@ def append_all(self, msgs): for msg in msgs: self.append_msg(msg) - -# Regression tests -if __name__ == '__main__': - from tempfile import TemporaryFile - from gsm_shared import * - import random - - # Configure logging - log.basicConfig(level = log.DEBUG, - format = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s") - - # Create a temporary file - tf = TemporaryFile() - - # Create an instance of DATA dump manager - ddf = DATADumpFile(tf) - - # Generate two random bursts - burst_l12trx = [] - burst_trx2l1 = [] - - for i in range(0, GSM_BURST_LEN): - ubit = random.randint(0, 1) - burst_l12trx.append(ubit) - - sbit = random.randint(-127, 127) - burst_trx2l1.append(sbit) - - # Generate a basic list of random messages - log.info("Generating the reference messages") - messages_ref = [] - - for i in range(100): - # Create a message - if i % 2: - msg = DATAMSG_L12TRX() - msg.burst = burst_l12trx - else: - msg = DATAMSG_TRX2L1() - msg.burst = burst_trx2l1 - - # Randomize the header - msg.rand_hdr() - - # Append - messages_ref.append(msg) - - log.info("Adding the following messages to the capture:") - for msg in messages_ref[:3]: - log.info("%s: burst_len=%d" - % (msg.desc_hdr(), len(msg.burst))) - - # Check single message appending - ddf.append_msg(messages_ref[0]) - ddf.append_msg(messages_ref[1]) - ddf.append_msg(messages_ref[2]) - - # Read the written messages back - messages_check = ddf.parse_all() - - log.info("Read the following messages back:") - for msg in messages_check: - log.info("%s: burst_len=%d" - % (msg.desc_hdr(), len(msg.burst))) - - # Expecting three messages - assert(len(messages_check) == 3) - - # Check the messages - for i in range(3): - # Compare common header parts and bursts - assert(messages_check[i].burst == messages_ref[i].burst) - assert(messages_check[i].fn == messages_ref[i].fn) - assert(messages_check[i].tn == messages_ref[i].tn) - - # Validate a message - messages_check[i].validate() - - log.info("Check append_msg(): OK") - - - # Append the pending reference messages - ddf.append_all(messages_ref[3:]) - - # Read the written messages back - messages_check = ddf.parse_all() - - # Check the final amount - assert(len(messages_check) == len(messages_ref)) - - # Check the messages - for i in range(len(messages_check)): - # Compare common header parts and bursts - assert(messages_check[i].burst == messages_ref[i].burst) - assert(messages_check[i].fn == messages_ref[i].fn) - assert(messages_check[i].tn == messages_ref[i].tn) - - # Validate a message - messages_check[i].validate() - - log.info("Check append_all(): OK") - - - # Check parse_msg() - msg0 = ddf.parse_msg(0) - msg10 = ddf.parse_msg(10) - - # Make sure parsing was successful - assert(msg0 and msg10) - - # Compare common header parts and bursts - assert(msg0.burst == messages_ref[0].burst) - assert(msg0.fn == messages_ref[0].fn) - assert(msg0.tn == messages_ref[0].tn) - - assert(msg10.burst == messages_ref[10].burst) - assert(msg10.fn == messages_ref[10].fn) - assert(msg10.tn == messages_ref[10].tn) - - # Validate both messages - msg0.validate() - msg10.validate() - - log.info("Check parse_msg(): OK") - - - # Check parse_all() with range - messages_check = ddf.parse_all(skip = 10, count = 20) - - # Make sure parsing was successful - assert(messages_check) - - # Check the amount - assert(len(messages_check) == 20) - - for i in range(20): - # Compare common header parts and bursts - assert(messages_check[i].burst == messages_ref[i + 10].burst) - assert(messages_check[i].fn == messages_ref[i + 10].fn) - assert(messages_check[i].tn == messages_ref[i + 10].tn) - - # Validate a message - messages_check[i].validate() - - log.info("Check parse_all(): OK") diff --git a/src/target/trx_toolkit/test_data_dump.py b/src/target/trx_toolkit/test_data_dump.py new file mode 100644 index 0000000..2f7e25a --- /dev/null +++ b/src/target/trx_toolkit/test_data_dump.py @@ -0,0 +1,165 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +# TRX Toolkit +# Unit tests for DATA capture management +# +# (C) 2019 by Vadim Yanitskiy +# +# All Rights Reserved +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import unittest +import tempfile +import random + +from gsm_shared import * +from data_dump import * + +class DATADump_Test(unittest.TestCase): + def setUp(self): + # Create a temporary file + self._tf = tempfile.TemporaryFile(mode = 'w+b') + + # Create an instance of DATA dump manager + self._ddf = DATADumpFile(self._tf) + + # Compare message a with message b + def _compare_msg(self, a, b): + # Make sure we're comparing messages of the same type + self.assertEqual(a.__class__, b.__class__) + + # Compare common header fields + self.assertEqual(a.ver, b.ver) + self.assertEqual(a.fn, b.fn) + self.assertEqual(a.tn, b.tn) + + # Burst bits (if present) + self.assertEqual(a.burst, b.burst) + + # TRX2L1 specific fields + if isinstance(a, DATAMSG_L12TRX): + self.assertEqual(a.pwr, b.pwr) + + # L12TRX specific fields + if isinstance(a, DATAMSG_TRX2L1): + # Version independent fields + self.assertEqual(a.toa256, b.toa256) + self.assertEqual(a.rssi, b.rssi) + + # Version specific fields + if a.ver >= 1: + self.assertEqual(a.nope_ind, b.nope_ind) + self.assertEqual(a.mod_type, b.mod_type) + self.assertEqual(a.tsc_set, b.tsc_set) + self.assertEqual(a.tsc, b.tsc) + self.assertEqual(a.ci, b.ci) + + # Generate a random message of a given type / version + def _gen_rand_message(self, cls, ver = 1): + msg = cls(ver = ver) + msg.rand_hdr() + msg.rand_burst() + return msg + + # Generate a list of random messages + def _gen_rand_messages(self, cls, count, ver = 1): + msg_list = [] + + for i in range(count): + msg = self._gen_rand_message(cls, ver) + msg_list.append(msg) + + return msg_list + + # Generate a mixed list of random messages + def _gen_rand_message_mix(self, count, ver = 1): + msg_list = [] + msg_list += self._gen_rand_messages(DATAMSG_TRX2L1, count) + msg_list += self._gen_rand_messages(DATAMSG_L12TRX, count) + random.shuffle(msg_list) + return msg_list + + def _test_store_and_parse(self, cls): + msg_ref = self._gen_rand_message(cls) + self._ddf.append_msg(msg_ref) + + msg = self._ddf.parse_msg(0) + self._compare_msg(msg, msg_ref) + + # Store one TRX2L1 message in a file, read it back and compare + def test_store_and_parse_trx2l1(self): + self._test_store_and_parse(DATAMSG_TRX2L1) + + # Store one L12TRX message in a file, read it back and compare + def test_store_and_parse_l12trx(self): + self._test_store_and_parse(DATAMSG_L12TRX) + + # Store multiple TRX2L1/L12TRX messages in a file, read them back and compare + def test_store_and_parse_all(self): + # Store a mixed list of random messages (19 + 19) + msg_list_ref = self._gen_rand_message_mix(19) + self._ddf.append_all(msg_list_ref) + + # Retrieve and compare stored messages + msg_list = self._ddf.parse_all() + for i in range(len(msg_list_ref)): + self._compare_msg(msg_list[i], msg_list_ref[i]) + + # Verify random access to stored messages + def test_parse_msg_idx(self): + # Store a mixed list of random messages (19 + 19) + msg_list_ref = self._gen_rand_message_mix(19) + self._ddf.append_all(msg_list_ref) + + # Random access + for _ in range(100): + idx = random.randrange(len(msg_list_ref)) + msg = self._ddf.parse_msg(idx) + self._compare_msg(msg, msg_list_ref[idx]) + + def test_parse_empty(self): + with self.assertLogs(level = 'ERROR'): + idx = random.randrange(100) + msg = self._ddf.parse_msg(idx) + self.assertEqual(msg, False) + + def test_parse_all_empty(self): + msg_list = self._ddf.parse_all() + self.assertEqual(msg_list, []) + + def test_parse_len_overflow(self): + # Write a malformed message directly + self._tf.write(DATADump.TAG_L12TRX) + self._tf.write(b'\x00\x63') # 99 + self._tf.write(b'\xff' * 90) + + with self.assertLogs(level = 'ERROR'): + msg = self._ddf.parse_msg(0) + self.assertEqual(msg, None) + + def test_parse_unknown_tag(self): + # Write a malformed message directly + self._tf.write(b'\x33') + self._tf.write(b'\x00\x63') # 99 + self._tf.write(b'\xff' * 90) + + with self.assertLogs(level = 'ERROR'): + msg = self._ddf.parse_msg(0) + self.assertEqual(msg, None) + +if __name__ == '__main__': + unittest.main() -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8b934c15ba96d856aa79d10bf296d1446f043dd1 Gerrit-Change-Number: 16669 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:03:38 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:03:38 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/vty: ensure backwards compatibility with older config files In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16653 ) Change subject: osmo-bts-trx/vty: ensure backwards compatibility with older config files ...................................................................... osmo-bts-trx/vty: ensure backwards compatibility with older config files osmo-bts-trx used to have its own (low-level) MS Power Control loop, but recently it has been ripped out. Since [1], the process fails to start if the configuration file still contains 'ms-power-control dsp'. Let's be more tolerant: override 'dsp' by 'osmo' and print a warning. [1] I49706926b1e962b18791174627bc3cc0cd0cd9d5 Change-Id: I4facd21bca3d8cb80d21e83ea267bc013e474533 --- M src/common/vty.c 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/vty.c b/src/common/vty.c index 8b947a7..b32b39b 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -792,8 +792,17 @@ bool soft = !strcmp(argv[0], "osmo"); if (!soft && !gsm_bts_has_feature(trx->bts, BTS_FEAT_MS_PWR_CTRL_DSP)) { - vty_out(vty, "This BTS model has no DSP/HW MS Power Control support%s", VTY_NEWLINE); - return CMD_WARNING; + /* NOTE: osmo-bts-trx used to have its own (low-level) MS Power Control loop, which + * has been ripped out in favour of the common implementation. Configuration files + * may still contain 'dsp', so let's be tolerant and override 'dsp' by 'osmo'. */ + if (trx->bts->variant == BTS_OSMO_TRX && vty->type == VTY_FILE) { + vty_out(vty, "BTS model 'osmo-bts-trx' has no DSP/HW MS Power Control support, " + "consider updating your configuration file!%s", VTY_NEWLINE); + soft = true; /* override */ + } else { + vty_out(vty, "This BTS model has no DSP/HW MS Power Control support%s", VTY_NEWLINE); + return CMD_WARNING; + } } trx->ms_pwr_ctl_soft = soft; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4facd21bca3d8cb80d21e83ea267bc013e474533 Gerrit-Change-Number: 16653 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:03:57 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:03:57 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11_gsup.c: do not init a buffer in gsm411_gsup_mo_fwd_s... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16657 ) Change subject: libmsc/gsm_04_11_gsup.c: do not init a buffer in gsm411_gsup_mo_fwd_sm_req() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I19d4d0de0d5a46bf1de194b966f18ea8a84ced94 Gerrit-Change-Number: 16657 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 31 Dec 2019 17:03:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:04:18 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:04:18 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11_gsup.c: fix SM-RP-OA encoding for MO SMS over GSUP In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16655 ) Change subject: libmsc/gsm_04_11_gsup.c: fix SM-RP-OA encoding for MO SMS over GSUP ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0f32e2af0ed2d2fea6addf45efbdfee120c2425d Gerrit-Change-Number: 16655 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 31 Dec 2019 17:04:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:04:19 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:04:19 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11_gsup.c: do not init a buffer in gsm411_gsup_mo_fwd_s... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16657 ) Change subject: libmsc/gsm_04_11_gsup.c: do not init a buffer in gsm411_gsup_mo_fwd_sm_req() ...................................................................... libmsc/gsm_04_11_gsup.c: do not init a buffer in gsm411_gsup_mo_fwd_sm_req() Because there is no real need for that. Change-Id: I19d4d0de0d5a46bf1de194b966f18ea8a84ced94 --- M src/libmsc/gsm_04_11_gsup.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c index 2abfc92..d7edd2f 100644 --- a/src/libmsc/gsm_04_11_gsup.c +++ b/src/libmsc/gsm_04_11_gsup.c @@ -53,7 +53,7 @@ int gsm411_gsup_mo_fwd_sm_req(struct gsm_trans *trans, struct msgb *msg, uint8_t sm_rp_mr, uint8_t *sm_rp_da, uint8_t sm_rp_da_len) { - uint8_t bcd_buf[GSM48_MI_SIZE] = { 0 }; + uint8_t bcd_buf[GSM48_MI_SIZE]; struct osmo_gsup_message gsup_msg; size_t bcd_len; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I19d4d0de0d5a46bf1de194b966f18ea8a84ced94 Gerrit-Change-Number: 16657 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:04:20 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:04:20 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11_gsup.c: fix SM-RP-OA encoding for MO SMS over GSUP In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16655 ) Change subject: libmsc/gsm_04_11_gsup.c: fix SM-RP-OA encoding for MO SMS over GSUP ...................................................................... libmsc/gsm_04_11_gsup.c: fix SM-RP-OA encoding for MO SMS over GSUP We shall not include additional BCD length octet into the value part of SM-RP-OA (Originating Address) IE. Instead, there should be ToA/NPI header (1 octet). Since we do not get ToN/NPI fields from the VLR/HLR, let's assume the following default values: 1... .... = Extension: No extension .001 .... = Type of number: International (1) .... 0001 = Numbering plan: ISDN/telephone (E.164/E.163) (1) Change-Id: I0f32e2af0ed2d2fea6addf45efbdfee120c2425d TTCN-3 test case: Ib467eeca6439bc6cce72293fbb5bb48f6d233db9 Related: OS#4324 --- M src/libmsc/gsm_04_11_gsup.c 1 file changed, 12 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c index d7edd2f..b6b798f 100644 --- a/src/libmsc/gsm_04_11_gsup.c +++ b/src/libmsc/gsm_04_11_gsup.c @@ -1,5 +1,5 @@ /* - * (C) 2018 by Vadim Yanitskiy + * (C) 2018-2019 by Vadim Yanitskiy * * All Rights Reserved * @@ -65,22 +65,28 @@ /* Assign SM-RP-MR to transaction state */ trans->sms.sm_rp_mr = sm_rp_mr; - /* Encode subscriber's MSISDN */ + /* Encode subscriber's MSISDN as LHV (with room for ToN/NPI header) */ bcd_len = gsm48_encode_bcd_number(bcd_buf, sizeof(bcd_buf), - 0, trans->vsub->msisdn); + 1, trans->vsub->msisdn); if (bcd_len <= 0 || bcd_len > sizeof(bcd_buf)) { LOG_TRANS(trans, LOGL_ERROR, "Failed to encode subscriber's MSISDN\n"); return -EINVAL; } + /* NOTE: assuming default ToN/NPI values as we don't have this info */ + bcd_buf[1] = 0x01 /* NPI: ISDN/Telephony Numbering (ITU-T Rec. E.164 / ITU-T Rec. E.163) */ + | (0x01 << 4) /* ToN: International Number */ + | (0x01 << 7); /* No Extension */ + /* Initialize a new GSUP message */ gsup_sm_msg_init(&gsup_msg, OSMO_GSUP_MSGT_MO_FORWARD_SM_REQUEST, trans->vsub->imsi, &sm_rp_mr); - /* According to 12.2.3, the MSISDN from VLR is inserted here */ + /* According to 12.2.3, the MSISDN from VLR is inserted here. + * NOTE: redundant BCD length octet is not included. */ gsup_msg.sm_rp_oa_type = OSMO_GSUP_SMS_SM_RP_ODA_MSISDN; - gsup_msg.sm_rp_oa_len = bcd_len; - gsup_msg.sm_rp_oa = bcd_buf; + gsup_msg.sm_rp_oa_len = bcd_len - 1; + gsup_msg.sm_rp_oa = bcd_buf + 1; /* SM-RP-DA should (already) contain SMSC address */ gsup_msg.sm_rp_da_type = OSMO_GSUP_SMS_SM_RP_ODA_SMSC_ADDR; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0f32e2af0ed2d2fea6addf45efbdfee120c2425d Gerrit-Change-Number: 16655 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:04:41 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:04:41 +0000 Subject: Change in osmocom-bb[master]: mobile: Send correct ARFCN in UL gsmtap In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16658 ) Change subject: mobile: Send correct ARFCN in UL gsmtap ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9f677866095413a0efeb8a336ce15a2dbca2228c Gerrit-Change-Number: 16658 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 31 Dec 2019 17:04:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:05:29 2019 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 31 Dec 2019 17:05:29 +0000 Subject: Change in pysim[master]: cards: Add support for sysmo-isim-sja2 References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/16691 ) Change subject: cards: Add support for sysmo-isim-sja2 ...................................................................... cards: Add support for sysmo-isim-sja2 The sysmo-isim-sja2 cards are not yet supported by pysim. Lets add support for writing KI and OPC in ADF.USIM and ADF.ISIM as well as the remaining common simcard parameters. Related: SYS#4466 Change-Id: I23e2b46eac0e0dbc2b271983d448999f6a459ecf --- M pySim/cards.py M pySim/commands.py A pysim-testdata/sysmoISIM-SJA2.data A pysim-testdata/sysmoISIM-SJA2.ok 4 files changed, 199 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/91/16691/1 diff --git a/pySim/cards.py b/pySim/cards.py index 758ec0e..9174ad5 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -144,6 +144,30 @@ data, sw = self._scc.update_binary(EF['SPN'], rpad(content, 32)) return sw + # Read the (full) AID for either ISIM or USIM application + def read_aid(self, isim = False): + + # First (known) halves of the AID + aid_usim = "a0000000871002" + aid_isim = "a0000000871004" + + # Select which one to look for + if isim: + aid = aid_isim + else: + aid = aid_usim + + # Find out how many records the EF.DIR has, then go through + # all records and try to find the AID we are looking for + aid_record_count = self._scc.record_count(['2F00']) + for i in range(0, aid_record_count): + record = self._scc.read_record(['2F00'], i + 1) + if aid in record[0]: + aid_len = int(record[0][6:8], 16) + return record[0][8:8 + aid_len * 2] + + return None + class _MagicSimBase(Card): """ @@ -911,10 +935,120 @@ return +class SysmoISIMSJA2(Card): + """ + sysmocom sysmoISIM-SJA2 + """ + + name = 'sysmoISIM-SJA2' + + def __init__(self, ssc): + super(SysmoISIMSJA2, self).__init__(ssc) + self._scc.cla_byte = "00" + self._scc.sel_ctrl = "0004" #request an FCP + + @classmethod + def autodetect(kls, scc): + try: + # Try card model #1 + atr = "3B 9F 96 80 1F 87 80 31 E0 73 FE 21 1B 67 4A 4C 75 30 34 05 4B A9" + if scc.get_atr() == toBytes(atr): + return kls(scc) + + # Try card model #2 + atr = "3B 9F 96 80 1F 87 80 31 E0 73 FE 21 1B 67 4A 4C 75 31 33 02 51 B2" + if scc.get_atr() == toBytes(atr): + return kls(scc) + except: + return None + return None + + def program(self, p): + # authenticate as ADM using default key (written on the card..) + if not p['pin_adm']: + raise ValueError("Please provide a PIN-ADM as there is no default one") + self._scc.verify_chv(0x0A, h2b(p['pin_adm'])) + + # This type of card does not allow to reprogram the ICCID. + # Reprogramming the ICCID would mess up the card os software + # license management, so the ICCID must be kept at its factory + # setting! + if p.get('iccid'): + print("Warning: Programming of the ICCID is not implemented for this type of card.") + + # select DF_GSM + self._scc.select_file(['7f20']) + + # write EF.IMSI + if p.get('imsi'): + self._scc.update_binary('6f07', enc_imsi(p['imsi'])) + + # EF.PLMNsel + if p.get('mcc') and p.get('mnc'): + sw = self.update_plmnsel(p['mcc'], p['mnc']) + if sw != '9000': + print("Programming PLMNsel failed with code %s"%sw) + + # EF.PLMNwAcT + if p.get('mcc') and p.get('mnc'): + sw = self.update_plmn_act(p['mcc'], p['mnc']) + if sw != '9000': + print("Programming PLMNwAcT failed with code %s"%sw) + + # EF.OPLMNwAcT + if p.get('mcc') and p.get('mnc'): + sw = self.update_oplmn_act(p['mcc'], p['mnc']) + if sw != '9000': + print("Programming OPLMNwAcT failed with code %s"%sw) + + # EF.AD + if p.get('mcc') and p.get('mnc'): + sw = self.update_ad(p['mnc']) + if sw != '9000': + print("Programming AD failed with code %s"%sw) + + # EF.SMSP + if p.get('smsp'): + r = self._scc.select_file(['3f00', '7f10']) + data, sw = self._scc.update_record('6f42', 1, lpad(p['smsp'], 104), force_len=True) + + # update EF-SIM_AUTH_KEY (and EF-USIM_AUTH_KEY_2G, which is + # hard linked to EF-USIM_AUTH_KEY) + self._scc.select_file(['3f00']) + self._scc.select_file(['a515']) + if p.get('ki'): + self._scc.update_binary('6f20', p['ki'], 1) + if p.get('opc'): + self._scc.update_binary('6f20', p['opc'], 17) + + # update EF-USIM_AUTH_KEY in ADF.ISIM + self._scc.select_file(['3f00']) + aid = self.read_aid(isim = True) + self._scc.select_adf(aid) + if p.get('ki'): + self._scc.update_binary('af20', p['ki'], 1) + if p.get('opc'): + self._scc.update_binary('af20', p['opc'], 17) + + # update EF-USIM_AUTH_KEY in ADF.USIM + self._scc.select_file(['3f00']) + aid = self.read_aid() + self._scc.select_adf(aid) + if p.get('ki'): + self._scc.update_binary('af20', p['ki'], 1) + if p.get('opc'): + self._scc.update_binary('af20', p['opc'], 17) + + return + + def erase(self): + return + + # In order for autodetection ... _cards_classes = [ FakeMagicSim, SuperSim, MagicSim, GrcardSim, SysmoSIMgr1, SysmoSIMgr2, SysmoUSIMgr1, SysmoUSIMSJS1, - FairwavesSIM, OpenCellsSim, WavemobileSim ] + FairwavesSIM, OpenCellsSim, WavemobileSim, SysmoISIMSJA2 ] def card_autodetect(scc): for kls in _cards_classes: diff --git a/pySim/commands.py b/pySim/commands.py index f2bdf7a..385cacf 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -107,6 +107,10 @@ rv.append(data) return rv + def select_adf(self, aid): + aidlen = ("0" + format(len(aid)/2, 'x'))[-2:] + return self._tp.send_apdu_checksw(self.cla_byte + "a4" + "0404" + aidlen + aid) + def read_binary(self, ef, length=None, offset=0): if not hasattr(type(ef), '__iter__'): ef = [ef] diff --git a/pysim-testdata/sysmoISIM-SJA2.data b/pysim-testdata/sysmoISIM-SJA2.data new file mode 100644 index 0000000..4b45a06 --- /dev/null +++ b/pysim-testdata/sysmoISIM-SJA2.data @@ -0,0 +1,7 @@ +MCC=001 +MNC=01 +ICCID=1122334455667788990 +KI=AABBCCDDEEFFAABBCCDDEEFFAABBCCDD +OPC=12345678901234567890123456789012 +IMSI=001010000000102 +ADM=72273953 diff --git a/pysim-testdata/sysmoISIM-SJA2.ok b/pysim-testdata/sysmoISIM-SJA2.ok new file mode 100644 index 0000000..fb191e0 --- /dev/null +++ b/pysim-testdata/sysmoISIM-SJA2.ok @@ -0,0 +1,53 @@ +Using PC/SC reader (dev=0) interface +Reading ... +ICCID: 8988211900000000004 +IMSI: 001010000000102 +SMSP: ffffffffffffffffffffffffffffffffffffffffffffffffe1ffffffffffffffffffffffff0581005155f5ffffffffffff000000 +PLMNsel: fff11fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +PLMNwAcT: + fff11fffff # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + +OPLMNwAcT: + fff11fffff # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + ffffff0000 # unused + +HPLMNAcT: + ffffff0000 # unused + ffffff0000 # unused + ffffffffff # unused + ffffffffff # unused + ffffffffff # unused + ffffffffff # unused + ffffffffff # unused + ffffffffff # unused + ffffffffff # unused + ffffffffff # unused + ffffffffff # unused + ffffff0000 # unused + +ACC: 0001 +MSISDN: Not available +AD: 00000002 +Done ! + -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I23e2b46eac0e0dbc2b271983d448999f6a459ecf Gerrit-Change-Number: 16691 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:05:31 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:05:31 +0000 Subject: Change in osmocom-bb[master]: layer23: Identify AGCH from PCH on tx of GSMTAP downlink messages In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16663 ) Change subject: layer23: Identify AGCH from PCH on tx of GSMTAP downlink messages ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0adab003a4060c9cef730e0432859659c51bd087 Gerrit-Change-Number: 16663 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 31 Dec 2019 17:05:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:05:49 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:05:49 +0000 Subject: Change in osmocom-bb[master]: layer23: Avoid sending downlink AGCH/PCH fill frames over GSMTAP In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16664 ) Change subject: layer23: Avoid sending downlink AGCH/PCH fill frames over GSMTAP ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id21e9334b620b8ab3ad404708bfd5358e3555ab6 Gerrit-Change-Number: 16664 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 31 Dec 2019 17:05:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:05:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:05:51 +0000 Subject: Change in osmocom-bb[master]: mobile: Send correct ARFCN in UL gsmtap In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16658 ) Change subject: mobile: Send correct ARFCN in UL gsmtap ...................................................................... mobile: Send correct ARFCN in UL gsmtap Change-Id: I9f677866095413a0efeb8a336ce15a2dbca2228c --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index ddde7d2..9664561 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -298,8 +298,9 @@ /* send copy via GSMTAP */ rsl_dec_chan_nr(chan_nr, &chan_type, &chan_ss, &chan_ts); gsmtap_chan_type = chantype_rsl2gsmtap(chan_type, link_id); - gsmtap_send(gsmtap_inst, 0|0x4000, chan_ts, gsmtap_chan_type, - chan_ss, 0, 127, 255, msg->l2h, msgb_l2len(msg)); + gsmtap_send(gsmtap_inst, ms->rrlayer.cd_now.arfcn | GSMTAP_ARFCN_F_UPLINK, + chan_ts, gsmtap_chan_type, chan_ss, 0, 127, 255, + msg->l2h, msgb_l2len(msg)); /* prepend uplink info header */ l1i_ul = (struct l1ctl_info_ul *) msgb_push(msg, sizeof(*l1i_ul)); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9f677866095413a0efeb8a336ce15a2dbca2228c Gerrit-Change-Number: 16658 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:05:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:05:51 +0000 Subject: Change in osmocom-bb[master]: layer23: Identify AGCH from PCH on tx of GSMTAP downlink messages In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16663 ) Change subject: layer23: Identify AGCH from PCH on tx of GSMTAP downlink messages ...................................................................... layer23: Identify AGCH from PCH on tx of GSMTAP downlink messages Some bits are taken from osmo-bts l1sap.c Change-Id: I0adab003a4060c9cef730e0432859659c51bd087 --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 46 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 9664561..d1385e5 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -50,6 +50,51 @@ extern struct gsmtap_inst *gsmtap_inst; +#define CB_FCCH -1 +#define CB_SCH -2 +#define CB_BCCH -3 +#define CB_IDLE -4 + +/* according to TS 05.02 Clause 7 Table 3 of 9 an Figure 8a */ +static const int ccch_block_table[51] = { + CB_FCCH, CB_SCH,/* 0..1 */ + CB_BCCH, CB_BCCH, CB_BCCH, CB_BCCH, /* 2..5: BCCH */ + 0, 0, 0, 0, /* 6..9: B0 */ + CB_FCCH, CB_SCH,/* 10..11 */ + 1, 1, 1, 1, /* 12..15: B1 */ + 2, 2, 2, 2, /* 16..19: B2 */ + CB_FCCH, CB_SCH,/* 20..21 */ + 3, 3, 3, 3, /* 22..25: B3 */ + 4, 4, 4, 4, /* 26..29: B4 */ + CB_FCCH, CB_SCH,/* 30..31 */ + 5, 5, 5, 5, /* 32..35: B5 */ + 6, 6, 6, 6, /* 36..39: B6 */ + CB_FCCH, CB_SCH,/* 40..41 */ + 7, 7, 7, 7, /* 42..45: B7 */ + 8, 8, 8, 8, /* 46..49: B8 */ + -4 /* 50: Idle */ +}; + +/* determine the CCCH block number based on the frame number */ +static unsigned int fn2ccch_block(uint32_t fn) +{ + int rc = ccch_block_table[fn%51]; + /* if FN is negative, we were called for something that's not CCCH! */ + OSMO_ASSERT(rc >= 0); + return rc; +} + +static uint8_t chantype_rsl2gsmtap_ext(uint8_t rsl_chantype, uint8_t link_id, uint32_t fn, uint8_t num_agch) +{ + uint8_t ret = chantype_rsl2gsmtap(rsl_chantype, link_id); + if (ret != GSMTAP_CHANNEL_PCH) + return ret; + + if (fn2ccch_block(fn) >= num_agch) + return GSMTAP_CHANNEL_PCH; + return GSMTAP_CHANNEL_AGCH; +} + static struct msgb *osmo_l1_alloc(uint8_t msg_type) { struct l1ctl_hdr *l1h; @@ -230,7 +275,7 @@ } /* send CCCH data via GSMTAP */ - gsmtap_chan_type = chantype_rsl2gsmtap(chan_type, dl->link_id); + gsmtap_chan_type = chantype_rsl2gsmtap_ext(chan_type, dl->link_id, tm.fn, ms->cellsel.si->bs_ag_blks_res); gsmtap_send(gsmtap_inst, ntohs(dl->band_arfcn), chan_ts, gsmtap_chan_type, chan_ss, tm.fn, dl->rx_level-110, dl->snr, ccch->data, sizeof(ccch->data)); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0adab003a4060c9cef730e0432859659c51bd087 Gerrit-Change-Number: 16663 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:05:51 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:05:51 +0000 Subject: Change in osmocom-bb[master]: layer23: Avoid sending downlink AGCH/PCH fill frames over GSMTAP In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16664 ) Change subject: layer23: Avoid sending downlink AGCH/PCH fill frames over GSMTAP ...................................................................... layer23: Avoid sending downlink AGCH/PCH fill frames over GSMTAP Some bits are taken from osmo-bts l1sap.c. Change-Id: Id21e9334b620b8ab3ad404708bfd5358e3555ab6 --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 36 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index d1385e5..de66972 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -95,6 +95,34 @@ return GSMTAP_CHANNEL_AGCH; } +static const uint8_t fill_frame[GSM_MACBLOCK_LEN] = { + 0x03, 0x03, 0x01, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, + 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, + 0x2B, 0x2B, 0x2B +}; + +/* Paging Request 1 with "no identity" content, i.e. empty/dummy paging */ +static const uint8_t paging_fill[GSM_MACBLOCK_LEN] = { + 0x15, 0x06, 0x21, 0x00, 0x01, 0xf0, 0x2b, 0x2b, 0x2b, 0x2b, + 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, + 0x2b, 0x2b, 0x2b }; + +static bool is_fill_frame(uint8_t chan_type, const uint8_t *data) +{ + switch (chan_type) { + case GSMTAP_CHANNEL_AGCH: + if (!memcmp(data, fill_frame, GSM_MACBLOCK_LEN)) + return true; + break; + case GSMTAP_CHANNEL_PCH: + if (!memcmp(data, paging_fill, GSM_MACBLOCK_LEN)) + return true; + break; + /* don't use 'default' case here as the above only conditionally return true */ + } + return false; +} + static struct msgb *osmo_l1_alloc(uint8_t msg_type) { struct l1ctl_hdr *l1h; @@ -274,11 +302,15 @@ return 0; } - /* send CCCH data via GSMTAP */ gsmtap_chan_type = chantype_rsl2gsmtap_ext(chan_type, dl->link_id, tm.fn, ms->cellsel.si->bs_ag_blks_res); - gsmtap_send(gsmtap_inst, ntohs(dl->band_arfcn), chan_ts, - gsmtap_chan_type, chan_ss, tm.fn, dl->rx_level-110, - dl->snr, ccch->data, sizeof(ccch->data)); + /* don't log fill frames via GSMTAP; they serve no purpose other than + * to clog up your logs */ + if (!is_fill_frame(gsmtap_chan_type, ccch->data)) { + /* send CCCH data via GSMTAP */ + gsmtap_send(gsmtap_inst, ntohs(dl->band_arfcn), chan_ts, + gsmtap_chan_type, chan_ss, tm.fn, dl->rx_level-110, + dl->snr, ccch->data, sizeof(ccch->data)); + } /* determine LAPDm entity based on SACCH or not */ if (dl->link_id & 0x40) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id21e9334b620b8ab3ad404708bfd5358e3555ab6 Gerrit-Change-Number: 16664 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:06:56 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:06:56 +0000 Subject: Change in osmo-trx[master]: uhd: Introduce UHD log category and support UHD >=3.11 logging framework In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16665 ) Change subject: uhd: Introduce UHD log category and support UHD >=3.11 logging framework ...................................................................... Patch Set 2: > > Patch Set 2: > > > > does that mean that we will have a separate logging category for > every driver? I would prefer something generci like GDRIVER, GSDR > or whatever. Then other drivers like libusrp, limesuite, etc. can > use the same category on other hardware. > > Yes I also thought about possibility of having some common > category, but imho it's clearer from user point of view naming the > category against the low level interface. If I see category UHD I > immediately understand that's coming from UHD, same for LMS. > > But I don't have a strong opinion, so if you think it makes more > sense to have a common one I could change it (we already have one > for LMS anyway). I would prefer a common one for all drivers, preferably by converting the LMS one into a generic one (with backwards compatibility for old log files). -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I36f1ff7d425a2144fb512ff393af02741eb4a3d4 Gerrit-Change-Number: 16665 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 31 Dec 2019 17:06:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:07:35 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:07:35 +0000 Subject: Change in pysim[master]: Fixup: Fix automated tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16690 ) Change subject: Fixup: Fix automated tests ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1601d8a2b3e1c07fe1eba375ea8deae3d50bbef0 Gerrit-Change-Number: 16690 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 31 Dec 2019 17:07:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:07:37 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:07:37 +0000 Subject: Change in pysim[master]: Fixup: Fix automated tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16690 ) Change subject: Fixup: Fix automated tests ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1601d8a2b3e1c07fe1eba375ea8deae3d50bbef0 Gerrit-Change-Number: 16690 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 31 Dec 2019 17:07:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Dec 31 17:07:38 2019 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 31 Dec 2019 17:07:38 +0000 Subject: Change in pysim[master]: Fixup: Fix automated tests In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/16690 ) Change subject: Fixup: Fix automated tests ...................................................................... Fixup: Fix automated tests The Change I12e6b46787efb39c5745f4e7f3cdcca9209881b8 was not as effective as expected. Diff is used wrongly so that no lines are compared. Lets fix this Change-Id: I1601d8a2b3e1c07fe1eba375ea8deae3d50bbef0 --- M tests/pysim-test.sh 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/tests/pysim-test.sh b/tests/pysim-test.sh index c3e1747..0d469c9 100755 --- a/tests/pysim-test.sh +++ b/tests/pysim-test.sh @@ -82,7 +82,9 @@ # pysim would print the device number of the reader and we do not # want the test to fail just because the card is put into a different # reader device. - CARD_DIFF=$(diff + 1 $TEMPFILE ./$CARD_NAME.ok) + tail -n +2 $CARD_NAME.ok > $CARD_NAME.ok.tmp + tail -n +2 $TEMPFILE > $CARD_NAME.chk.tmp + CARD_DIFF=$(diff $CARD_NAME.chk.tmp $CARD_NAME.ok.tmp) set -e if [ "$CARD_DIFF" != "" ]; then @@ -95,13 +97,14 @@ echo "------------8<------------" cat $TEMPFILE echo "------------8<------------" + rm *.tmp exit 1 fi inc_card_list $CARD_NAME echo "Card contents match the test data -- success!" - rm $TEMPFILE + rm *.tmp } # Read out the card using pysim-read and store the result as .ok file. This -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1601d8a2b3e1c07fe1eba375ea8deae3d50bbef0 Gerrit-Change-Number: 16690 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Dec 30 01:58:57 2019 From: admin at opensuse.org (OBS Notification) Date: Mon, 30 Dec 2019 01:58:57 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_10/i586 In-Reply-To: References: Message-ID: <5e0959e868c7d_8222aac4e6525f02170359@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_10/i586 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: [ 35s] Processing triggers for libc-bin (2.28-10) ... [ 35s] [60/452] installing libgdbm6-1.18.1-4 [ 35s] Processing triggers for libc-bin (2.28-10) ... [ 35s] [61/452] installing libgmp10-2:6.1.2+dfsg-4 [ 35s] Processing triggers for libc-bin (2.28-10) ... [ 36s] [62/452] installing libgpg-error0-1.35-1 [ 36s] Processing triggers for libc-bin (2.28-10) ... [ 36s] [63/452] installing libgpm2-1.20.7-5 [ 36s] Processing triggers for libc-bin (2.28-10) ... [ 36s] [64/452] installing libgraphite2-3-1.3.13-7 [ 36s] Processing triggers for libc-bin (2.28-10) ... [ 36s] [65/452] installing libgslcblas0-2.5+dfsg-6 [ 36s] Segmentation fault (core dumped) [ 36s] dpkg: error processing package libgslcblas0:i386 (--install): [ 36s] installed libgslcblas0:i386 package post-installation script subprocess returned error exit status 139 [ 36s] Processing triggers for libc-bin (2.28-10) ... [ 36s] Errors were encountered while processing: [ 36s] libgslcblas0:i386 [ 36s] exit ... [ 36s] [ 36s] lamb23 failed "build osmo-pcu_0.7.0.59.585c.dsc" at Mon Dec 30 01:58:52 UTC 2019. [ 36s] [ 36s] ### VM INTERACTION START ### [ 39s] [ 22.586620] sysrq: SysRq : Power Off [ 39s] [ 22.595609] reboot: Power down [ 39s] ### VM INTERACTION END ### [ 39s] [ 39s] lamb23 failed "build osmo-pcu_0.7.0.59.585c.dsc" at Mon Dec 30 01:58:56 UTC 2019. [ 39s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Dec 28 02:53:28 2019 From: admin at opensuse.org (OBS Notification) Date: Sat, 28 Dec 2019 02:53:28 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <5e06c3acb7144_8222aac4e6525f0185483d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 877s] dh_strip --dbg-package=osmo-hnbgw [ 877s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 877s] dh_makeshlibs [ 877s] dh_shlibdeps [ 878s] dpkg-shlibdeps: warning: symbol talloc_asn1_ctx used by debian/libosmo-ranap2/usr/lib/x86_64-linux-gnu/libosmo-sabp.so.0.0.0 found in none of the libraries [ 878s] dpkg-shlibdeps: warning: symbol asn1_xer_print used by debian/libosmo-ranap2/usr/lib/x86_64-linux-gnu/libosmo-sabp.so.0.0.0 found in none of the libraries [ 879s] dh_installdeb [ 879s] dh_gencontrol [ 879s] dh_md5sums [ 879s] dh_builddeb [ 879s] dpkg-deb: building package 'osmo-hnbgw-dbg' in '../osmo-hnbgw-dbg_0.5.0.22.1644_amd64.deb'. [ 879s] dpkg-deb: building package 'libosmo-ranap-dbg' in '../libosmo-ranap-dbg_0.5.0.22.1644_amd64.deb'. [ 879s] dpkg-deb: building package 'libosmo-ranap2' in '../libosmo-ranap2_0.5.0.22.1644_amd64.deb'. [ 879s] dpkg-deb: building package 'osmo-hnbgw' in '../osmo-hnbgw_0.5.0.22.1644_amd64.deb'. [ 879s] dpkg-deb: building package 'libosmo-ranap-dev' in '../libosmo-ranap-dev_0.5.0.22.1644_amd64.deb'. [ 881s] dpkg-genbuildinfo [ 881s] dpkg-genchanges >../osmo-iuh_0.5.0.22.1644_amd64.changes [ 881s] dpkg-genchanges: error: file ../osmo-iuh_0.5.0.22.1644.tar.xz has checksum 73a624eac973ee8068f6721dab7bff93 instead of expected 30eeabd4462877514b6c4bc1497b4afb (algorithm md5) [ 881s] dpkg-buildpackage: error: dpkg-genchanges subprocess returned exit status 25 [ 881s] [ 881s] lamb60 failed "build osmo-iuh_0.5.0.22.1644.dsc" at Sat Dec 28 02:53:12 UTC 2019. [ 881s] [ 881s] ### VM INTERACTION START ### [ 884s] [ 856.929778] sysrq: SysRq : Power Off [ 884s] [ 856.937200] reboot: Power down [ 884s] ### VM INTERACTION END ### [ 884s] [ 884s] lamb60 failed "build osmo-iuh_0.5.0.22.1644.dsc" at Sat Dec 28 02:53:16 UTC 2019. [ 884s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/)