Change in osmo-ci[master]: coverity: don't install systemd file

[lynxis lazus]

Hello Pau Espin Pedrol,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/11017

to look at the new patch set (#2).

Change subject: coverity: don't install systemd file
..

coverity: don't install systemd file

Because the systemd install directory does not use --prefix as
base, they are installed by default to /lib/systemd.
As the coverity only scans the compilation, don't install systemd files.

Change-Id: I39b491fc09f0db0efd8d9d09e8f4cba4ba49cdde
---
M coverity/build_Osmocom.sh
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/17/11017/2
--
To view, visit https://gerrit.osmocom.org/11017
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I39b491fc09f0db0efd8d9d09e8f4cba4ba49cdde
Gerrit-Change-Number: 11017
Gerrit-PatchSet: 2
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 

Change in osmo-ci[master]: jobs/coverity: only build the master branch

[lynxis lazus]

lynxis lazus has posted comments on this change. ( 
https://gerrit.osmocom.org/11011 )

Change subject: jobs/coverity: only build the master branch
..


Patch Set 1: Verified+1


--
To view, visit https://gerrit.osmocom.org/11011
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I0b68ebae025e0dc9dbfd22b97731b59be30e7823
Gerrit-Change-Number: 11011
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: lynxis lazus 
Gerrit-Comment-Date: Tue, 18 Sep 2018 22:23:25 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-ci[master]: jobs/coverity: only build the master branch

[lynxis lazus]

lynxis lazus has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/11011 )

Change subject: jobs/coverity: only build the master branch
..

jobs/coverity: only build the master branch

Otherwise the last modified branch will be build.

Change-Id: I0b68ebae025e0dc9dbfd22b97731b59be30e7823
---
M jobs/coverity.yml
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  lynxis lazus: Verified



diff --git a/jobs/coverity.yml b/jobs/coverity.yml
index 3ec4bda..b37d4a4 100644
--- a/jobs/coverity.yml
+++ b/jobs/coverity.yml
@@ -29,6 +29,8 @@
   url: git://git.osmocom.org/osmo-ci
   git-config-name: 'Jenkins Builder'
   git-config-email: 'jenk...@osmocom.org'
+  branches:
+- 'origin/master'
 triggers:
   - timed: "@daily"


--
To view, visit https://gerrit.osmocom.org/11011
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I0b68ebae025e0dc9dbfd22b97731b59be30e7823
Gerrit-Change-Number: 11011
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: lynxis lazus 

Change in osmo-sgsn[master]: vty: restart sgsn state: improve output message

[lynxis lazus]

lynxis lazus has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/11018 )

Change subject: vty: restart sgsn state: improve output message
..

vty: restart sgsn state: improve output message

Change-Id: I20e91e196b9d64b6dac11ab47fcef85f8a9ee0b7
---
M src/gprs/sgsn_vty.c
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c
index 154e576..de193f0 100644
--- a/src/gprs/sgsn_vty.c
+++ b/src/gprs/sgsn_vty.c
@@ -824,7 +824,7 @@
vty_out(vty, "Flushed all BSSGPs queues.%s", VTY_NEWLINE);

gtp_clear_queues(sgsn->gsn);
-   vty_out(vty, "Restarted connection to GGSN.%s", VTY_NEWLINE);
+   vty_out(vty, "Flushed rx & tx queus towards the GGSN.%s", VTY_NEWLINE);
 
/* remove all queues to bssgp */
return CMD_SUCCESS;

--
To view, visit https://gerrit.osmocom.org/11018
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I20e91e196b9d64b6dac11ab47fcef85f8a9ee0b7
Gerrit-Change-Number: 11018
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: lynxis lazus 

Change in osmo-ci[master]: jobs/coverity: only build the master branch

[lynxis lazus]

lynxis lazus has posted comments on this change. ( 
https://gerrit.osmocom.org/11011 )

Change subject: jobs/coverity: only build the master branch
..


Patch Set 1: -Verified


--
To view, visit https://gerrit.osmocom.org/11011
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I0b68ebae025e0dc9dbfd22b97731b59be30e7823
Gerrit-Change-Number: 11011
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: lynxis lazus 
Gerrit-Comment-Date: Tue, 18 Sep 2018 20:53:55 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-ci[master]: jobs/coverity: only build the master branch

[lynxis lazus]

lynxis lazus has posted comments on this change. ( 
https://gerrit.osmocom.org/11011 )

Change subject: jobs/coverity: only build the master branch
..


Patch Set 1: Verified-1

the ttcn3 fails because of 3 missing bytes ;)


--
To view, visit https://gerrit.osmocom.org/11011
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I0b68ebae025e0dc9dbfd22b97731b59be30e7823
Gerrit-Change-Number: 11011
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: lynxis lazus 
Gerrit-Comment-Date: Tue, 18 Sep 2018 20:43:42 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bts[master]: CBCH: Some more scheduler_mframe cleanup

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/11006 )

Change subject: CBCH: Some more scheduler_mframe cleanup
..

CBCH: Some more scheduler_mframe cleanup

As the CBCH replaces SDCCH sub-slot-2 in downlink, we should mark
the uplink as IDLE, just as the associated SACCH in uplink and downlink.

Also, there are no burst_numbers in IDLE slots.

Change-Id: Ib8565d1d0080bfce5d2aec77609709a445a2171c
---
M src/common/scheduler_mframe.c
1 file changed, 14 insertions(+), 14 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/common/scheduler_mframe.c b/src/common/scheduler_mframe.c
index b78ffa8..b969407 100644
--- a/src/common/scheduler_mframe.c
+++ b/src/common/scheduler_mframe.c
@@ -179,9 +179,9 @@
   { TRXC_BCCH, 2,  TRXC_RACH,  0 },
   { TRXC_BCCH, 3,  TRXC_RACH,  0 },
   { TRXC_CCCH, 0,  TRXC_IDLE,  0 },
-  { TRXC_CCCH, 1,  TRXC_IDLE,  1 },
-  { TRXC_CCCH, 2,  TRXC_IDLE,  2 },
-  { TRXC_CCCH, 3,  TRXC_IDLE,  3 },
+  { TRXC_CCCH, 1,  TRXC_IDLE,  0 },
+  { TRXC_CCCH, 2,  TRXC_IDLE,  0 },
+  { TRXC_CCCH, 3,  TRXC_IDLE,  0 },
   {TRXC_FCCH,  0,  TRXC_SACCH4_3,  0 },
   {TRXC_SCH,   0,  TRXC_SACCH4_3,  1 },
   { TRXC_CCCH, 0,  TRXC_SACCH4_3,  2 },
@@ -219,10 +219,10 @@
   { TRXC_SACCH4_0, 2,  TRXC_SDCCH4_1,  3 },
   { TRXC_SACCH4_0, 3,  TRXC_RACH,  0 },
   { TRXC_SACCH4_1, 0,  TRXC_RACH,  0 },
-  { TRXC_SACCH4_1, 1,  TRXC_RACH,  0 },
-  { TRXC_SACCH4_1, 2,  TRXC_RACH,  1 },
-  { TRXC_SACCH4_1, 3,  TRXC_RACH,  2 },
-  {TRXC_IDLE,  0,  TRXC_RACH,  3 },
+  { TRXC_SACCH4_1, 1,  TRXC_IDLE,  0 },
+  { TRXC_SACCH4_1, 2,  TRXC_IDLE,  0 },
+  { TRXC_SACCH4_1, 3,  TRXC_IDLE,  0 },
+  {TRXC_IDLE,  0,  TRXC_IDLE,  0 },

   {TRXC_FCCH,  0,  TRXC_SDCCH4_3,  0 },
   {TRXC_SCH,   0,  TRXC_SDCCH4_3,  1 },
@@ -267,14 +267,14 @@
   {TRXC_FCCH,  0,  TRXC_SDCCH4_0,  3 },
   {TRXC_SCH,   0,  TRXC_SDCCH4_1,  0 },
   { TRXC_IDLE, 0,  TRXC_SDCCH4_1,  1 },
-  { TRXC_IDLE, 1,  TRXC_SDCCH4_1,  2 },
-  { TRXC_IDLE, 2,  TRXC_SDCCH4_1,  3 },
-  { TRXC_IDLE, 3,  TRXC_RACH,  0 },
+  { TRXC_IDLE, 0,  TRXC_SDCCH4_1,  2 },
+  { TRXC_IDLE, 0,  TRXC_SDCCH4_1,  3 },
+  { TRXC_IDLE, 0,  TRXC_RACH,  0 },
   { TRXC_SACCH4_3, 0,  TRXC_RACH,  0 },
-  { TRXC_SACCH4_3, 1,  TRXC_RACH,  0 },
-  { TRXC_SACCH4_3, 2,  TRXC_RACH,  1 },
-  { TRXC_SACCH4_3, 3,  TRXC_RACH,  2 },
-  {TRXC_IDLE,  0,  TRXC_SDCCH4_2,  3 },
+  { TRXC_SACCH4_3, 1,  TRXC_IDLE,  0 },
+  { TRXC_SACCH4_3, 2,  TRXC_IDLE,  0 },
+  { TRXC_SACCH4_3, 3,  TRXC_IDLE,  0 },
+  {TRXC_IDLE,  0,  TRXC_IDLE,  0 },
 };

 static const struct trx_sched_frame frame_sdcch8[102] = {

--
To view, visit https://gerrit.osmocom.org/11006
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8565d1d0080bfce5d2aec77609709a445a2171c
Gerrit-Change-Number: 11006
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in osmo-bts[master]: common/rsl.c: tweak log level in lapdm_rll_tx_cb()

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11007 )

Change subject: common/rsl.c: tweak log level in lapdm_rll_tx_cb()
..


Patch Set 1: Code-Review+1

while at it, it makes sense to msgb_hexdump() which message we're talking about.


--
To view, visit https://gerrit.osmocom.org/11007
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I26eac5e4466c493ffe08dbb89de20f5e1c2bb85d
Gerrit-Change-Number: 11007
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Tue, 18 Sep 2018 20:36:57 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-ci[master]: jobs/coverity: only build the master branch

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11011 )

Change subject: jobs/coverity: only build the master branch
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/11011
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I0b68ebae025e0dc9dbfd22b97731b59be30e7823
Gerrit-Change-Number: 11011
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Comment-Date: Tue, 18 Sep 2018 20:35:15 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in docker-playground[master]: ttcn3-sgsn-test: save the log as color/raw version

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11013 )

Change subject: ttcn3-sgsn-test: save the log as color/raw version
..


Patch Set 1: Code-Review+1

(1 comment)

https://gerrit.osmocom.org/#/c/11013/1//COMMIT_MSG
Commit Message:

https://gerrit.osmocom.org/#/c/11013/1//COMMIT_MSG@7
PS1, Line 7: as color/raw version
I think that's actually overkill.  We don't save two log files for any of the 
other TTCN3 test suites AFAIR either.



--
To view, visit https://gerrit.osmocom.org/11013
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie06d0ad6f980e5800f65a128cd33d6937c47afa9
Gerrit-Change-Number: 11013
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: lynxis lazus 
Gerrit-Comment-Date: Tue, 18 Sep 2018 20:34:55 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: Yes

Change in osmo-hlr[master]: make: always allow running python tests manually

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/11014 )

Change subject: make: always allow running python tests manually
..

make: always allow running python tests manually

Keep the rules to run the external-tests in tests/Makefile available for
invocation, to allow conveniently launching the tests manualy without the need
to pass --with-external-tests to ./configure first.

Change-Id: Ic28dbeabddee6b41af12b977e3fe59e663ee51a1
---
M tests/Makefile.am
1 file changed, 4 insertions(+), 5 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7e45da4..e07749c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -44,6 +44,10 @@
 # don't run vty and ctrl tests concurrently so that the ports don't conflict
$(MAKE) vty-test
$(MAKE) ctrl-test
+else
+python-tests:
+   echo "Not running python-based external tests (determined at 
configure-time)"
+endif

 VTY_TEST_DB = hlr_vty_test.db
 
@@ -75,11 +79,6 @@
-rm -f $(CTRL_TEST_DB)
-rm $(CTRL_TEST_DB)-*

-else
-python-tests:
-   echo "Not running python-based tests (determined at configure-time)"
-endif
-
 check-local: atconfig $(TESTSUITE)
$(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS)
$(MAKE) $(AM_MAKEFLAGS) python-tests

--
To view, visit https://gerrit.osmocom.org/11014
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic28dbeabddee6b41af12b977e3fe59e663ee51a1
Gerrit-Change-Number: 11014
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in osmo-hlr[master]: make: always allow running python tests manually

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11014 )

Change subject: make: always allow running python tests manually
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/11014
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ic28dbeabddee6b41af12b977e3fe59e663ee51a1
Gerrit-Change-Number: 11014
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Tue, 18 Sep 2018 20:33:47 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bsc[master]: Implement RR Classmark Enquiry

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10910 )

Change subject: Implement RR Classmark Enquiry
..

Implement RR Classmark Enquiry

If the MSC sends a BSSMAP Classmark Request, send an RR Classmark Enquiry to
the MS.

(The reverse direction, i.e. sending a BSSMAP Classmark Update back to the MSC,
is already implemented.)

Related: OS#3043 (A5/3 encryption)
Related: osmo-ttcn3-hacks Idaab4d568cf986b4897ba008f6262c839d1592fb
Change-Id: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf
---
M include/osmocom/bsc/gsm_04_08_rr.h
M src/osmo-bsc/gsm_04_08_rr.c
M src/osmo-bsc/osmo_bsc_bssap.c
3 files changed, 19 insertions(+), 0 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/include/osmocom/bsc/gsm_04_08_rr.h 
b/include/osmocom/bsc/gsm_04_08_rr.h
index 7b7a62f..e2e861d 100644
--- a/include/osmocom/bsc/gsm_04_08_rr.h
+++ b/include/osmocom/bsc/gsm_04_08_rr.h
@@ -21,6 +21,7 @@
   uint8_t *classmark2_lv);
 int gsm48_handle_paging_resp(struct gsm_subscriber_connection *conn,
 struct msgb *msg, struct bsc_subscr *bsub);
+int gsm48_send_rr_classmark_enquiry(struct gsm_lchan *lchan);
 int gsm48_send_rr_ciph_mode(struct gsm_lchan *lchan, int want_imeisv);
 int gsm48_multirate_config(uint8_t *lv, const struct amr_multirate_conf *mr, 
const struct amr_mode *modes);
 struct msgb *gsm48_make_ho_cmd(struct gsm_lchan *new_lchan, uint8_t 
power_command, uint8_t ho_ref);
diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c
index 2b4a1ba..35044a3 100644
--- a/src/osmo-bsc/gsm_04_08_rr.c
+++ b/src/osmo-bsc/gsm_04_08_rr.c
@@ -273,6 +273,21 @@
return rsl_siemens_mrpci(lchan, );
 }

+/* 3GPP 44.018 9.1.12 Classmark Enquiry */
+int gsm48_send_rr_classmark_enquiry(struct gsm_lchan *lchan)
+{
+   struct msgb *msg = gsm48_msgb_alloc_name("GSM 44.018 Classmark 
Enquiry");
+   struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh));
+
+   msg->lchan = lchan;
+   gh->proto_discr = GSM48_PDISC_RR;
+   gh->msg_type = GSM48_MT_RR_CLSM_ENQ;
+
+   DEBUGP(DRR, "%s TX CLASSMARK ENQUIRY %u\n", gsm_lchan_name(lchan), 
msgb_length(msg));
+
+   return gsm48_sendmsg(msg);
+}
+
 /* Chapter 9.1.9: Ciphering Mode Command */
 int gsm48_send_rr_ciph_mode(struct gsm_lchan *lchan, int want_imeisv)
 {
diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c
index d6b0b6d..97daa5c 100644
--- a/src/osmo-bsc/osmo_bsc_bssap.c
+++ b/src/osmo-bsc/osmo_bsc_bssap.c
@@ -870,6 +870,9 @@
case BSS_MAP_MSG_HANDOVER_CMD:
ret = bssmap_handle_handover_cmd(conn, msg, length);
break;
+   case BSS_MAP_MSG_CLASSMARK_RQST:
+   ret = gsm48_send_rr_classmark_enquiry(conn->lchan);
+   break;
default:
LOGP(DMSC, LOGL_NOTICE, "Unimplemented msg type: %s\n",
gsm0808_bssmap_name(msg->l4h[0]));

--
To view, visit https://gerrit.osmocom.org/10910
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf
Gerrit-Change-Number: 10910
Gerrit-PatchSet: 2
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Vadim Yanitskiy 

Change in osmo-bsc[master]: Implement RR Classmark Enquiry

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10910 )

Change subject: Implement RR Classmark Enquiry
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10910
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf
Gerrit-Change-Number: 10910
Gerrit-PatchSet: 2
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Tue, 18 Sep 2018 20:33:09 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-ttcn3-hacks[master]: bsc: test Classmark Enquiry

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/11012 )

Change subject: bsc: test Classmark Enquiry
..

bsc: test Classmark Enquiry

Enhance TC_classmark to also include the BSSMAP Classmark Request -> RR
Classmark Enquiry part. So far it was only testing the return path of RR
Classmark Change -> BSSMAP Classmark Update.

This test will thus fail with current osmo-bsc master, and will succeed as soon
as osmo-bsc If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf is merged.

Add:

* ts_BSSMAP_ClassmarkRequest in BSSMAP_Templates.ttcn
* tr_RRM_CM_ENQUIRY in L3_Templates.ttcn

Change-Id: Idaab4d568cf986b4897ba008f6262c839d1592fb
---
M bsc/BSC_Tests.ttcn
M library/BSSMAP_Templates.ttcn
M library/L3_Templates.ttcn
3 files changed, 33 insertions(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index b44de9f..a99214b 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -1940,13 +1940,18 @@
vc_conn.done;
 }

-/* test if L3 RR CLASSMARK CHANGE is translated to BSSMAP CLASSMARK UPDATE */
+/* test the procedure of the MSC requesting a Classmark Update:
+ * a) BSSMAP Classmark Request should result in RR CLASSMARK ENQUIRY,
+ * b) L3 RR CLASSMARK CHANGE should result in BSSMAP CLASSMARK UPDATE */
 private function f_tc_classmark(charstring id) runs on MSC_ConnHdlr {
g_pars := valueof(t_def_TestHdlrPars);
f_create_chan_and_exp();
/* we should now have a COMPL_L3 at the MSC */
BSSAP.receive(tr_BSSMAP_ComplL3);

+   BSSAP.send(ts_BSSMAP_ClassmarkRequest);
+   RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, decmatch tr_RRM_CM_ENQUIRY));
+
f_rsl_send_l3(ts_RRM_CM_CHG(valueof(ts_CM2)));
BSSAP.receive(tr_BSSMAP_ClassmarkUpd(?, omit));
setverdict(pass);
diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn
index d92ea61..a3a50de 100644
--- a/library/BSSMAP_Templates.ttcn
+++ b/library/BSSMAP_Templates.ttcn
@@ -944,6 +944,18 @@
}
 }

+template PDU_BSSAP ts_BSSMAP_ClassmarkRequest
+modifies ts_BSSAP_BSSMAP := {
+   pdu := {
+   bssmap := {
+   classmarkRequest := {
+   messageType := '58'O,
+   talkerPriority := omit
+   }
+   }
+   }
+}
+
 /* return Layer3 octetstring inside BSSAP PDU */
 function f_bssap_extract_l3(PDU_BSSAP bssap) return template octetstring {
if (ischosen(bssap.pdu.bssmap)) {
diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn
index 557b1b8..1ce84cf 100644
--- a/library/L3_Templates.ttcn
+++ b/library/L3_Templates.ttcn
@@ -525,6 +525,21 @@
}
 }

+template PDU_ML3_NW_MS tr_RRM_CM_ENQUIRY := {
+   discriminator := '0110'B,
+   tiOrSkip := {
+   skipIndicator := ''B
+   },
+   msgs := {
+   rrm := {
+   classmarkEnquiry := {
+   messageType := '00010011'B,
+   classmarkEnquiryMask := *
+   }
+   }
+   }
+}
+
 template (value) PDU_ML3_MS_NW ts_RRM_UL_REL(OCT1 cause) := {
discriminator := '0110'B,
tiOrSkip := {

--
To view, visit https://gerrit.osmocom.org/11012
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Idaab4d568cf986b4897ba008f6262c839d1592fb
Gerrit-Change-Number: 11012
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 

Change in osmo-msc[master]: fix Classmark Update without VLR subscriber

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11016 )

Change subject: fix Classmark Update without VLR subscriber
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/11016
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib2a2ae6bf86e8f29fc6751a8b5cdb7187cd70290
Gerrit-Change-Number: 11016
Gerrit-PatchSet: 2
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: daniel 
Gerrit-Comment-Date: Tue, 18 Sep 2018 20:32:29 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-msc[master]: fix Classmark Update without VLR subscriber

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/11016 )

Change subject: fix Classmark Update without VLR subscriber
..

fix Classmark Update without VLR subscriber

This recent patch moves Classmark storage to the VLR subscriber, and introduced
a segfault when a Classmark Update is received during IMSI detach:

commit 986fe7ed18580775bed91399a1f02eae60bda251
change-id I27081bf6e9e017923b2d02607f7ea06beddad82a
Mon Sep 17 01:12:13 2018 +0200
"store classmark in vlr_subscr, not conn"

It assumed that we would never accept any Classmark Update messages unless we
also have a valid subscriber for it. Well, that is proven wrong by the
ttcn3-msc-test TC_imsi_detach_by_imsi(), which brings osmo-msc to its knees.

Fix: in case of no valid vlr_subscr being present, store Classmark in the conn
temporarily, and copy any received Classmark to VLR subscriber as soon as it
gets associated with the conn (if at all).

Change-Id: Ib2a2ae6bf86e8f29fc6751a8b5cdb7187cd70290
---
M include/osmocom/msc/gsm_data.h
M src/libmsc/gsm_04_08.c
M src/libmsc/osmo_msc.c
3 files changed, 31 insertions(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  daniel: Looks good to me, but someone else must approve
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h
index 70ac934..54026f6 100644
--- a/include/osmocom/msc/gsm_data.h
+++ b/include/osmocom/msc/gsm_data.h
@@ -181,6 +181,10 @@

bool waiting_for_clear_complete;
} a;
+
+   /* Temporary storage for Classmark Information for times when a 
connection has no VLR subscriber
+* associated yet. It will get copied to the VLR subscriber upon 
msc_vlr_subscr_assoc(). */
+   struct gsm_classmark temporary_classmark;
 };


diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c
index 564e90b..0f52d09 100644
--- a/src/libmsc/gsm_04_08.c
+++ b/src/libmsc/gsm_04_08.c
@@ -1739,6 +1739,22 @@
 subscr->imsi, subscr->msisdn, subscr->use_count);
 }

+static void update_classmark(const struct gsm_classmark *src, struct 
gsm_classmark *dst)
+{
+   if (src->classmark1_set) {
+   dst->classmark1 = src->classmark1;
+   dst->classmark1_set = true;
+   }
+   if (src->classmark2_len) {
+   dst->classmark2_len = src->classmark2_len;
+   memcpy(dst->classmark2, src->classmark2, 
sizeof(dst->classmark2));
+   }
+   if (src->classmark3_len) {
+   dst->classmark3_len = src->classmark3_len;
+   memcpy(dst->classmark3, src->classmark3, 
sizeof(dst->classmark3));
+   }
+}
+
 /* VLR informs us that the subscriber has been associated with a conn */
 static void msc_vlr_subscr_assoc(void *msc_conn_ref,
 struct vlr_subscr *vsub)
@@ -1749,6 +1765,11 @@
conn->vsub = vlr_subscr_get(vsub);
OSMO_ASSERT(conn->vsub);
conn->vsub->cs.attached_via_ran = conn->via_ran;
+
+   /* In case we have already received Classmark Information before the 
VLR Subscriber was
+* associated with the conn: merge the new Classmark into 
vsub->classmark. Don't overwrite valid
+* vsub->classmark with unset classmark, though. */
+   update_classmark(>temporary_classmark, >vsub->classmark);
 }

 static int msc_vlr_route_gsup_msg(struct vlr_subscr *vsub,
diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c
index 8efa16c..3965e9b 100644
--- a/src/libmsc/osmo_msc.c
+++ b/src/libmsc/osmo_msc.c
@@ -147,7 +147,12 @@
   const uint8_t *cm2, uint8_t cm2_len,
   const uint8_t *cm3, uint8_t cm3_len)
 {
-   struct gsm_classmark *cm = >vsub->classmark;
+   struct gsm_classmark *cm;
+
+   if (!conn->vsub)
+   cm = >temporary_classmark;
+   else
+   cm = >vsub->classmark;

if (cm2 && cm2_len) {
if (cm2_len > sizeof(cm->classmark2)) {

--
To view, visit https://gerrit.osmocom.org/11016
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2a2ae6bf86e8f29fc6751a8b5cdb7187cd70290
Gerrit-Change-Number: 11016
Gerrit-PatchSet: 2
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: daniel 

Change in osmo-ttcn3-hacks[master]: bsc: test Classmark Enquiry

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11012 )

Change subject: bsc: test Classmark Enquiry
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/11012
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Idaab4d568cf986b4897ba008f6262c839d1592fb
Gerrit-Change-Number: 11012
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Tue, 18 Sep 2018 20:32:02 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/x86_64

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/x86_64

Package network:osmocom:nightly/simtrace2 failed to build in 
xUbuntu_18.04/x86_64

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  349s] No package 'libpcsclite' found
[  349s] simtrace2-remsim.o: In function `main':
[  349s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  349s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  349s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  349s] apdu_dispatch.o: In function `apdu_segment_in':
[  349s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  349s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  349s] collect2: error: ld returned 1 exit status
[  349s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  349s] make[2]: *** [simtrace2-remsim] Error 1
[  349s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  349s] Makefile:20: recipe for target 'utils' failed
[  349s] make[1]: *** [utils] Error 2
[  349s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  349s] dh_auto_build: make -j1 returned exit code 2
[  349s] debian/rules:4: recipe for target 'build' failed
[  349s] make: *** [build] Error 2
[  349s] dpkg-buildpackage: error: debian/rules build subprocess returned exit 
status 2
[  349s] 
[  349s] lamb53 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 
20:30:24 UTC 2018.
[  349s] 
[  349s] ### VM INTERACTION START ###
[  352s] [  335.319696] sysrq: SysRq : Power Off
[  352s] [  335.358054] reboot: Power down
[  352s] ### VM INTERACTION END ###
[  352s] 
[  352s] lamb53 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 
20:30:28 UTC 2018.
[  352s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Change in osmo-gsm-tester[master]: suites: encryption: Add test register_a5_3_authreq

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11010 )

Change subject: suites: encryption: Add test register_a5_3_authreq
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/11010
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I279e78e741b3ca841cb8508db40874f3c17b0785
Gerrit-Change-Number: 11010
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Tue, 18 Sep 2018 20:30:14 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-gsm-tester[master]: contrib: Use correct var to write repo name in git_hashes.txt

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11015 )

Change subject: contrib: Use correct var to write repo name in git_hashes.txt
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/11015
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I7a7db7cf4cc020295d216c60d6dc688f110916dc
Gerrit-Change-Number: 11015
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Tue, 18 Sep 2018 20:30:35 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-gsm-tester[master]: encryption: Reuse code using test lib features

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11009 )

Change subject: encryption: Reuse code using test lib features
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/11009
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I9b6944516c524a0c11a47aec6839f8ee9d571661
Gerrit-Change-Number: 11009
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Tue, 18 Sep 2018 20:29:33 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586

Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  298s] No package 'libpcsclite' found
[  298s] simtrace2-remsim.o: In function `main':
[  298s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  298s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  298s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  298s] apdu_dispatch.o: In function `apdu_segment_in':
[  298s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  298s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  298s] collect2: error: ld returned 1 exit status
[  298s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  298s] make[2]: *** [simtrace2-remsim] Error 1
[  298s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  298s] Makefile:20: recipe for target 'utils' failed
[  298s] make[1]: *** [utils] Error 2
[  298s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  298s] dh_auto_build: make -j1 returned exit code 2
[  298s] debian/rules:4: recipe for target 'build' failed
[  298s] make: *** [build] Error 2
[  298s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  298s] 
[  298s] cloud107 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 
20:28:39 UTC 2018.
[  298s] 
[  298s] ### VM INTERACTION START ###
[  301s] [  266.420488] sysrq: SysRq : Power Off
[  301s] [  266.466367] reboot: Power down
[  302s] ### VM INTERACTION END ###
[  302s] 
[  302s] cloud107 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 
20:28:44 UTC 2018.
[  302s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Change in osmo-gsm-tester[master]: default-suites: Remove nanobts HR1 voice test

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/11008 )

Change subject: default-suites: Remove nanobts HR1 voice test
..

default-suites: Remove nanobts HR1 voice test

nanobts doesn't support this codec, so it will always fail.

Change-Id: Iea4e6395809e5ef5485892f8f17e0dcfa36640dc
---
M example/default-suites.conf
1 file changed, 0 insertions(+), 2 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/example/default-suites.conf b/example/default-suites.conf
index af7e8de..1857ba5 100644
--- a/example/default-suites.conf
+++ b/example/default-suites.conf
@@ -47,7 +47,6 @@
 - voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr1
 - voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr2
 - voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr3
-- voice:nanobts+band-1900+mod-bts0-ts-tchh+cfg-codec-hr1
 - voice:nanobts+band-1900+mod-bts0-ts-tchh+cfg-codec-hr3
 - voice:nanobts+band-1900+mod-bts0-dynts-ipa
 - gprs:nanobts+band-1900
@@ -58,7 +57,6 @@
 - voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr1
 - voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr2
 - voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr3
-- voice:nanobts+band-900+mod-bts0-ts-tchh+cfg-codec-hr1
 - voice:nanobts+band-900+mod-bts0-ts-tchh+cfg-codec-hr3
 - voice:nanobts+band-900+mod-bts0-dynts-ipa
 - voice:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend

--
To view, visit https://gerrit.osmocom.org/11008
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Iea4e6395809e5ef5485892f8f17e0dcfa36640dc
Gerrit-Change-Number: 11008
Gerrit-PatchSet: 3
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 

Change in osmo-gsm-tester[master]: default-suites: Remove nanobts HR1 voice test

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11008 )

Change subject: default-suites: Remove nanobts HR1 voice test
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/11008
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Iea4e6395809e5ef5485892f8f17e0dcfa36640dc
Gerrit-Change-Number: 11008
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Tue, 18 Sep 2018 20:29:06 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/i586

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/i586

Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/i586

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  168s] No package 'libpcsclite' found
[  168s] simtrace2-remsim.o: In function `main':
[  168s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  168s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  168s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  168s] apdu_dispatch.o: In function `apdu_segment_in':
[  168s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  168s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  168s] collect2: error: ld returned 1 exit status
[  168s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  168s] make[2]: *** [simtrace2-remsim] Error 1
[  168s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  168s] Makefile:20: recipe for target 'utils' failed
[  168s] make[1]: *** [utils] Error 2
[  168s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  168s] dh_auto_build: make -j1 returned exit code 2
[  168s] debian/rules:4: recipe for target 'build' failed
[  168s] make: *** [build] Error 2
[  168s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  168s] 
[  168s] lamb62 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 
20:27:56 UTC 2018.
[  168s] 
[  168s] ### VM INTERACTION START ###
[  171s] [  160.135761] sysrq: SysRq : Power Off
[  171s] [  160.150920] reboot: Power down
[  171s] ### VM INTERACTION END ###
[  171s] 
[  171s] lamb62 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 
20:27:59 UTC 2018.
[  171s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Change in osmo-sgsn[master]: sgsn_ggsn_ctx_drop_pdp: protect against nullpointer when MM is gone

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11020 )

Change subject: sgsn_ggsn_ctx_drop_pdp: protect against nullpointer when MM is 
gone
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/11020
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I507a8c2193c84f8dff7f5d669adcd3583331f289
Gerrit-Change-Number: 11020
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Tue, 18 Sep 2018 20:28:12 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-sgsn[master]: gprs_sgsn.h: fix wrong type of re-attempts

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11021 )

Change subject: gprs_sgsn.h: fix wrong type of re-attempts
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/11021
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I708226cec9e131dcda4234f42ed3689f4f6750e8
Gerrit-Change-Number: 11021
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Tue, 18 Sep 2018 20:28:24 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/i586

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/i586

Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/i586

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  199s] No package 'libpcsclite' found
[  199s] simtrace2-remsim.o: In function `main':
[  199s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  199s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  199s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  199s] apdu_dispatch.o: In function `apdu_segment_in':
[  199s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  199s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  199s] collect2: error: ld returned 1 exit status
[  199s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  199s] make[2]: *** [simtrace2-remsim] Error 1
[  199s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  199s] Makefile:20: recipe for target 'utils' failed
[  199s] make[1]: *** [utils] Error 2
[  199s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  199s] dh_auto_build: make -j1 returned exit code 2
[  199s] debian/rules:4: recipe for target 'build' failed
[  199s] make: *** [build] Error 2
[  199s] dpkg-buildpackage: error: debian/rules build subprocess returned exit 
status 2
[  199s] 
[  199s] lamb04 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 
20:25:46 UTC 2018.
[  199s] 
[  199s] ### VM INTERACTION START ###
[  203s] [  190.467958] sysrq: SysRq : Power Off
[  203s] [  190.473415] reboot: Power down
[  203s] ### VM INTERACTION END ###
[  203s] 
[  203s] lamb04 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 
20:25:50 UTC 2018.
[  203s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Change in osmo-sgsn[master]: vty: restart sgsn state: improve output message

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11018 )

Change subject: vty: restart sgsn state: improve output message
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/11018
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I20e91e196b9d64b6dac11ab47fcef85f8a9ee0b7
Gerrit-Change-Number: 11018
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Tue, 18 Sep 2018 20:21:43 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/x86_64

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/x86_64

Package network:osmocom:nightly/simtrace2 failed to build in 
xUbuntu_17.10/x86_64

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  245s] No package 'libpcsclite' found
[  245s] simtrace2-remsim.o: In function `main':
[  245s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  245s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  245s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  245s] apdu_dispatch.o: In function `apdu_segment_in':
[  245s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  245s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  245s] collect2: error: ld returned 1 exit status
[  245s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  245s] make[2]: *** [simtrace2-remsim] Error 1
[  245s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  245s] Makefile:20: recipe for target 'utils' failed
[  245s] make[1]: *** [utils] Error 2
[  245s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  245s] dh_auto_build: make -j1 returned exit code 2
[  245s] debian/rules:4: recipe for target 'build' failed
[  245s] make: *** [build] Error 2
[  245s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  245s] 
[  245s] morla3 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 
20:20:03 UTC 2018.
[  245s] 
[  245s] ### VM INTERACTION START ###
[  249s] [  233.774758] sysrq: SysRq : Power Off
[  249s] [  233.865475] reboot: Power down
[  249s] ### VM INTERACTION END ###
[  249s] 
[  249s] morla3 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 
20:20:07 UTC 2018.
[  249s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64

[OBS Notification]

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:
[  139s] No package 'libpcsclite' found
[  139s] simtrace2-remsim.o: In function `main':
[  139s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  139s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  139s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  139s] apdu_dispatch.o: In function `apdu_segment_in':
[  139s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  139s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  139s] collect2: error: ld returned 1 exit status
[  139s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  139s] make[2]: *** [simtrace2-remsim] Error 1
[  139s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  139s] Makefile:20: recipe for target 'utils' failed
[  139s] make[1]: *** [utils] Error 2
[  139s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  139s] dh_auto_build: make -j1 returned exit code 2
[  139s] debian/rules:4: recipe for target 'build' failed
[  139s] make: *** [build] Error 2
[  139s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  139s] 
[  139s] lamb03 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 
20:18:40 UTC 2018.
[  139s] 
[  139s] ### VM INTERACTION START ###
[  142s] [  132.292678] sysrq: SysRq : Power Off
[  142s] [  132.298435] reboot: Power down
[  142s] ### VM INTERACTION END ###
[  142s] 
[  142s] lamb03 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 
20:18:44 UTC 2018.
[  142s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586

[OBS Notification]

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:
[  186s] No package 'libpcsclite' found
[  186s] simtrace2-remsim.o: In function `main':
[  186s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  186s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  186s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  186s] apdu_dispatch.o: In function `apdu_segment_in':
[  186s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  186s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  186s] collect2: error: ld returned 1 exit status
[  186s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  186s] make[2]: *** [simtrace2-remsim] Error 1
[  186s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  186s] Makefile:20: recipe for target 'utils' failed
[  186s] make[1]: *** [utils] Error 2
[  186s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  186s] dh_auto_build: make -j1 returned exit code 2
[  186s] debian/rules:4: recipe for target 'build' failed
[  186s] make: *** [build] Error 2
[  186s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  186s] 
[  186s] lamb57 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 
20:18:49 UTC 2018.
[  186s] 
[  186s] ### VM INTERACTION START ###
[  189s] [  176.854239] sysrq: SysRq : Power Off
[  189s] [  176.872970] reboot: Power down
[  189s] ### VM INTERACTION END ###
[  189s] 
[  189s] lamb57 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 
20:18:53 UTC 2018.
[  189s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/x86_64

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/x86_64

Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/x86_64

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  218s] No package 'libpcsclite' found
[  218s] simtrace2-remsim.o: In function `main':
[  218s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  218s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  218s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  218s] apdu_dispatch.o: In function `apdu_segment_in':
[  218s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  218s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  218s] collect2: error: ld returned 1 exit status
[  218s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  218s] make[2]: *** [simtrace2-remsim] Error 1
[  218s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  218s] Makefile:20: recipe for target 'utils' failed
[  218s] make[1]: *** [utils] Error 2
[  218s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  218s] dh_auto_build: make -j1 returned exit code 2
[  218s] debian/rules:4: recipe for target 'build' failed
[  218s] make: *** [build] Error 2
[  218s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  218s] 
[  218s] cloud121 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 
20:14:11 UTC 2018.
[  218s] 
[  218s] ### VM INTERACTION START ###
[  221s] [  180.858453] sysrq: SysRq : Power Off
[  221s] [  180.906656] reboot: Power down
[  222s] ### VM INTERACTION END ###
[  222s] 
[  222s] cloud121 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 
20:14:16 UTC 2018.
[  222s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/armv7l

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/armv7l

Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/armv7l

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  283s] No package 'libpcsclite' found
[  283s] simtrace2-remsim.o: In function `main':
[  283s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  283s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  283s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:772: undefined 
reference to `osim_uicc_sim_cic_profile'
[  283s] apdu_dispatch.o: In function `apdu_segment_in':
[  283s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  283s] /usr/src/packages/BUILD/host/apdu_dispatch.c:173: undefined reference 
to `osim_uicc_sim_cic_profile'
[  283s] collect2: error: ld returned 1 exit status
[  283s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  283s] make[2]: *** [simtrace2-remsim] Error 1
[  283s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  283s] Makefile:20: recipe for target 'utils' failed
[  283s] make[1]: *** [utils] Error 2
[  283s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  283s] dh_auto_build: make -j1 returned exit code 2
[  283s] debian/rules:4: recipe for target 'build' failed
[  283s] make: *** [build] Error 2
[  283s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  283s] 
[  283s] armbuild13 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 
20:12:13 UTC 2018.
[  283s] 
[  283s] ### VM INTERACTION START ###
[  286s] [  253.542548] SysRq : Power Off
[  286s] [  253.543991] reboot: Power down
[  287s] ### VM INTERACTION END ###
[  287s] 
[  287s] armbuild13 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Tue Sep 18 
20:12:16 UTC 2018.
[  287s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Change in osmo-sgsn[master]: gprs_llc: remove the FCS from the msgb by trim'ing the msgb

[lynxis lazus]

lynxis lazus has uploaded this change for review. ( 
https://gerrit.osmocom.org/11022


Change subject: gprs_llc: remove the FCS from the msgb by trim'ing the msgb
..

gprs_llc: remove the FCS from the msgb by trim'ing the msgb

After checking the FCS, it's no use. The FCS should also not
appear on `hexdump(msgb_l3(MSG), msgb_l3len(MSG))`.

Change-Id: I27e061ead86395a336b67c7aead93d305a0f2ae8
---
M src/gprs/gprs_llc.c
1 file changed, 3 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/22/11022/1

diff --git a/src/gprs/gprs_llc.c b/src/gprs/gprs_llc.c
index 6c92f83..abbb742 100644
--- a/src/gprs/gprs_llc.c
+++ b/src/gprs/gprs_llc.c
@@ -945,6 +945,9 @@
LOGP(DLLC, LOGL_INFO, "Dropping frame with invalid FCS\n");
return -EIO;
}
+   /* set l3 layer & remove the fcs */
+   msg->l3h = llhp.data;
+   msgb_l3trim(msg, llhp.data_len);

/* Update LLE's (BVCI, NSEI) tuple */
lle->llme->bvci = msgb_bvci(msg);
@@ -960,7 +963,6 @@

/* llhp.data is only set when we need to send LL_[UNIT]DATA_IND up */
if (llhp.cmd == GPRS_LLC_UI && llhp.data && llhp.data_len) {
-   msgb_gmmh(msg) = llhp.data;
switch (llhp.sapi) {
case GPRS_SAPI_GMM:
/* send LL_UNITDATA_IND to GMM */

--
To view, visit https://gerrit.osmocom.org/11022
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I27e061ead86395a336b67c7aead93d305a0f2ae8
Gerrit-Change-Number: 11022
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 

Change in osmo-sgsn[master]: GTP: refactor the echo timer

[lynxis lazus]

lynxis lazus has uploaded this change for review. ( 
https://gerrit.osmocom.org/11023


Change subject: GTP: refactor the echo timer
..

GTP: refactor the echo timer

The gtp echo timer must be re-check everytime the
echo-timer has been modified or deactivated.

Fixes the TTCN3 SGSN_Tests.TC_attach_restart_ctr_echo

Change-Id: Ia33471a9a9cfc3887facb665c82094b99932052a
---
M include/osmocom/sgsn/gprs_sgsn.h
M src/gprs/gprs_sgsn.c
M src/gprs/sgsn_vty.c
3 files changed, 20 insertions(+), 6 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/23/11023/1

diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h
index f745685..2658bd6 100644
--- a/include/osmocom/sgsn/gprs_sgsn.h
+++ b/include/osmocom/sgsn/gprs_sgsn.h
@@ -375,6 +375,7 @@
 int sgsn_ggsn_ctx_drop_all_pdp_except(struct sgsn_ggsn_ctx *ggsn, struct 
sgsn_pdp_ctx *except);
 void sgsn_ggsn_ctx_add_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx 
*pdp);
 void sgsn_ggsn_ctx_remove_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx 
*pdp);
+void sgsn_ggsn_ctx_check_echo_timer(struct sgsn_ggsn_ctx *ggc);

 struct apn_ctx {
struct llist_head list;
diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c
index dc0e7c0..16ba979 100644
--- a/src/gprs/gprs_sgsn.c
+++ b/src/gprs/gprs_sgsn.c
@@ -489,12 +489,24 @@
talloc_free(pdp);
 }

+void sgsn_ggsn_ctx_check_echo_timer(struct sgsn_ggsn_ctx *ggc)
+{
+   if (llist_empty(>pdp_list) || ggc->echo_interval <= 0) {
+   /* stop timer */
+   if (osmo_timer_pending(>echo_timer))
+   osmo_timer_del(>echo_timer);
+   } else {
+   /* re-start timer */
+   sgsn_ggsn_echo_req(ggc);
+   osmo_timer_schedule(>echo_timer, ggc->echo_interval, 0);
+   }
+}
+
 /* GGSN contexts */
 static void echo_timer_cb(void *data)
 {
struct sgsn_ggsn_ctx *ggc = (struct sgsn_ggsn_ctx *) data;
-   sgsn_ggsn_echo_req(ggc);
-   osmo_timer_schedule(>echo_timer, ggc->echo_interval, 0);
+   sgsn_ggsn_ctx_check_echo_timer(ggc);
 }

 struct sgsn_ggsn_ctx *sgsn_ggsn_ctx_alloc(uint32_t id)
@@ -742,15 +754,14 @@

 void sgsn_ggsn_ctx_add_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx *pdp)
 {
-   if (llist_empty(>pdp_list) && ggc->echo_interval > 0)
-   osmo_timer_schedule(>echo_timer, ggc->echo_interval, 0);
+   sgsn_ggsn_ctx_check_echo_timer(ggc);
+
llist_add(>ggsn_list, >pdp_list);
 }
 void sgsn_ggsn_ctx_remove_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx 
*pdp)
 {
llist_del(>ggsn_list);
-   if (llist_empty(>pdp_list) && osmo_timer_pending(>echo_timer))
-   osmo_timer_del(>echo_timer);
+   sgsn_ggsn_ctx_check_echo_timer(ggc);
if (pdp->destroy_ggsn)
sgsn_ggsn_ctx_free(pdp->ggsn);
pdp->ggsn = NULL;
diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c
index de193f0..63985bc 100644
--- a/src/gprs/sgsn_vty.c
+++ b/src/gprs/sgsn_vty.c
@@ -383,6 +383,7 @@
 "not be lower than 60 seconds, use this value for 
" \
 "testing purposes only!%s", VTY_NEWLINE);

+   sgsn_ggsn_ctx_check_echo_timer(ggc);
return CMD_SUCCESS;
 }

@@ -395,6 +396,7 @@
struct sgsn_ggsn_ctx *ggc = sgsn_ggsn_ctx_find_alloc(id);

ggc->echo_interval = -1;
+   sgsn_ggsn_ctx_check_echo_timer(ggc);

return CMD_SUCCESS;
 }

--
To view, visit https://gerrit.osmocom.org/11023
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia33471a9a9cfc3887facb665c82094b99932052a
Gerrit-Change-Number: 11023
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 

Change in osmo-sgsn[master]: gprs_sgsn.h: fix wrong type of re-attempts

[lynxis lazus]

lynxis lazus has uploaded this change for review. ( 
https://gerrit.osmocom.org/11021


Change subject: gprs_sgsn.h: fix wrong type of re-attempts
..

gprs_sgsn.h: fix wrong type of re-attempts

The GMM ctx->gmm_att_req.auth_reattempt is used to track
multiple UTMS re-sync attempt of a MS.

Change-Id: I708226cec9e131dcda4234f42ed3689f4f6750e8
Fixes: f7198d7dbb84 ("gprs_gmm: introduce a GMM Attach Request FSM")
Fixes: OS#3556
---
M include/osmocom/sgsn/gprs_sgsn.h
1 file changed, 1 insertion(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/21/11021/1

diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h
index a5ca959..f745685 100644
--- a/include/osmocom/sgsn/gprs_sgsn.h
+++ b/include/osmocom/sgsn/gprs_sgsn.h
@@ -176,7 +176,7 @@
 * the fsm needs to compare it against old to decide what to do 
*/
struct msgb *attach_req;
uint32_t id_type;
-   bool auth_reattempt;
+   int auth_reattempt; /* tracking UMTS resync auth attempts */
} gmm_att_req;
/* VLR number */
uint32_tnew_sgsn_addr;

--
To view, visit https://gerrit.osmocom.org/11021
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I708226cec9e131dcda4234f42ed3689f4f6750e8
Gerrit-Change-Number: 11021
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 

Change in osmo-sgsn[master]: sgsn_ggsn_ctx_drop_pdp: protect against nullpointer when MM is gone

[lynxis lazus]

lynxis lazus has uploaded this change for review. ( 
https://gerrit.osmocom.org/11020


Change subject: sgsn_ggsn_ctx_drop_pdp: protect against nullpointer when MM is 
gone
..

sgsn_ggsn_ctx_drop_pdp: protect against nullpointer when MM is gone

When the GGSN crashs, the SGSN will be notified after
it comes back. Because of the async operation,
the mm ctx could be already gone.

Change-Id: I507a8c2193c84f8dff7f5d669adcd3583331f289
---
M src/gprs/gprs_sgsn.c
1 file changed, 3 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/20/11020/1

diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c
index 977ae48..dc0e7c0 100644
--- a/src/gprs/gprs_sgsn.c
+++ b/src/gprs/gprs_sgsn.c
@@ -707,7 +707,9 @@

 void sgsn_ggsn_ctx_drop_pdp(struct sgsn_pdp_ctx *pctx)
 {
-   if (pctx->mm->gmm_state == GMM_REGISTERED_NORMAL) {
+   /* the MM context can be deleted while the GGSN is not reachable or
+* if has been crashed. */
+   if (pctx->mm && pctx->mm->gmm_state == GMM_REGISTERED_NORMAL) {
gsm48_tx_gsm_deact_pdp_req(pctx, GSM_CAUSE_NET_FAIL, true);
sgsn_ggsn_ctx_remove_pdp(pctx->ggsn, pctx);
} else  {

--
To view, visit https://gerrit.osmocom.org/11020
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I507a8c2193c84f8dff7f5d669adcd3583331f289
Gerrit-Change-Number: 11020
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 

Change in osmo-sgsn[master]: sgsn_libgtp: fix a potential memleak when the GGSN is not reachable

[lynxis lazus]

lynxis lazus has uploaded this change for review. ( 
https://gerrit.osmocom.org/11019


Change subject: sgsn_libgtp: fix a potential memleak when the GGSN is not 
reachable
..

sgsn_libgtp: fix a potential memleak when the GGSN is not reachable

When a MS does the following

- MS: GMM Attach Activate
- MS: Activate PDP CTX
- SGNS: send Request Ctx to GSGSN which does not answer
- GMM Detach (MM ctx get freed)
- libgtp retrans timeout of the first answer
- sgsn_libgtp.c: create_pdp_conf() which ignores this ctx because of emtpy MM 
ctx

Change-Id: I4575f7f80f785a62ae3b7f165d236a9dd818aabf
---
M src/gprs/sgsn_libgtp.c
1 file changed, 6 insertions(+), 6 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/19/11019/1

diff --git a/src/gprs/sgsn_libgtp.c b/src/gprs/sgsn_libgtp.c
index 7829796..478d402 100644
--- a/src/gprs/sgsn_libgtp.c
+++ b/src/gprs/sgsn_libgtp.c
@@ -390,15 +390,13 @@
 static int create_pdp_conf(struct pdp_t *pdp, void *cbp, int cause)
 {
struct sgsn_pdp_ctx *pctx = cbp;
-   uint8_t reject_cause;
+   uint8_t reject_cause = 0;

LOGPDPCTXP(LOGL_INFO, pctx, "Received CREATE PDP CTX CONF, 
cause=%d(%s)\n",
cause, get_value_string(gtp_cause_strs, cause));

if (!pctx->mm) {
-   LOGP(DGPRS, LOGL_INFO,
-"No MM context, aborting CREATE PDP CTX CONF\n");
-   return -EIO;
+   goto reject;
}

/* Check for cause value if it was really successful */
@@ -452,9 +450,11 @@

if (pdp)
pdp_freepdp(pdp);
+
/* Send PDP CTX ACT REJ to MS */
-   gsm48_tx_gsm_act_pdp_rej(pctx->mm, pctx->ti, reject_cause,
-   0, NULL);
+   if (pctx->mm)
+   gsm48_tx_gsm_act_pdp_rej(pctx->mm, pctx->ti, reject_cause,
+0, NULL);
sgsn_pdp_ctx_free(pctx);

return EOF;

--
To view, visit https://gerrit.osmocom.org/11019
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4575f7f80f785a62ae3b7f165d236a9dd818aabf
Gerrit-Change-Number: 11019
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 

Change in osmo-sgsn[master]: vty: restart sgsn state: improve output message

[lynxis lazus]

lynxis lazus has uploaded this change for review. ( 
https://gerrit.osmocom.org/11018


Change subject: vty: restart sgsn state: improve output message
..

vty: restart sgsn state: improve output message

Change-Id: I20e91e196b9d64b6dac11ab47fcef85f8a9ee0b7
---
M src/gprs/sgsn_vty.c
1 file changed, 1 insertion(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/18/11018/1

diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c
index 154e576..de193f0 100644
--- a/src/gprs/sgsn_vty.c
+++ b/src/gprs/sgsn_vty.c
@@ -824,7 +824,7 @@
vty_out(vty, "Flushed all BSSGPs queues.%s", VTY_NEWLINE);

gtp_clear_queues(sgsn->gsn);
-   vty_out(vty, "Restarted connection to GGSN.%s", VTY_NEWLINE);
+   vty_out(vty, "Flushed rx & tx queus towards the GGSN.%s", VTY_NEWLINE);

/* remove all queues to bssgp */
return CMD_SUCCESS;

--
To view, visit https://gerrit.osmocom.org/11018
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I20e91e196b9d64b6dac11ab47fcef85f8a9ee0b7
Gerrit-Change-Number: 11018
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 

Change in osmo-gsm-tester[master]: default-suites: Remove nanobts HR1 voice test

[Pau Espin Pedrol]

Hello Vadim Yanitskiy, Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/11008

to look at the new patch set (#2).

Change subject: default-suites: Remove nanobts HR1 voice test
..

default-suites: Remove nanobts HR1 voice test

nanobts doesn't support this codec, so it will always fail.

Change-Id: Iea4e6395809e5ef5485892f8f17e0dcfa36640dc
---
M example/default-suites.conf
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester 
refs/changes/08/11008/2
--
To view, visit https://gerrit.osmocom.org/11008
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Iea4e6395809e5ef5485892f8f17e0dcfa36640dc
Gerrit-Change-Number: 11008
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 

Change in osmo-ci[master]: coverity: ensure the systemd install directory is /tmp

[lynxis lazus]

lynxis lazus has posted comments on this change. ( 
https://gerrit.osmocom.org/11017 )

Change subject: coverity: ensure the systemd install directory is /tmp
..


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/11017/1/coverity/build_Osmocom.sh
File coverity/build_Osmocom.sh:

https://gerrit.osmocom.org/#/c/11017/1/coverity/build_Osmocom.sh@15
PS1, Line 15:   ./configure --prefix="$prefix" 
--with-systemdsystemunitdir=/tmp/ $*
> testing it with "=no" https://jenkins.osmocom. […]
the old jenkins job had the wrong version.

https://jenkins.osmocom.org/jenkins/job/osmocom-coverity/238/



--
To view, visit https://gerrit.osmocom.org/11017
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I39b491fc09f0db0efd8d9d09e8f4cba4ba49cdde
Gerrit-Change-Number: 11017
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 
Gerrit-Comment-Date: Tue, 18 Sep 2018 16:25:43 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in osmo-ci[master]: ansible: gsm-tester: remove ofono from the dependencies

[lynxis lazus]

lynxis lazus has abandoned this change. ( https://gerrit.osmocom.org/9458 )

Change subject: ansible: gsm-tester: remove ofono from the dependencies
..


Abandoned
--
To view, visit https://gerrit.osmocom.org/9458
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: abandon
Gerrit-Change-Id: Id679e3fb165441b357a5ff11f240f4792dcd9dc8
Gerrit-Change-Number: 9458
Gerrit-PatchSet: 2
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: lynxis lazus 
Gerrit-CC: Pau Espin Pedrol 

Change in osmo-gsm-tester[master]: default-suites: Remove nanobts HR1 voice test

[Vadim Yanitskiy]

Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/11008 )

Change subject: default-suites: Remove nanobts HR1 voice test
..


Patch Set 1: Code-Review+1

(1 comment)

https://gerrit.osmocom.org/#/c/11008/1//COMMIT_MSG
Commit Message:

https://gerrit.osmocom.org/#/c/11008/1//COMMIT_MSG@9
PS1, Line 9: format
Would be better to write 'codec'.



--
To view, visit https://gerrit.osmocom.org/11008
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Iea4e6395809e5ef5485892f8f17e0dcfa36640dc
Gerrit-Change-Number: 11008
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Tue, 18 Sep 2018 16:09:24 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: Yes

Change in osmo-bsc[master]: Implement RR Classmark Enquiry

[Vadim Yanitskiy]

Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/10910 )

Change subject: Implement RR Classmark Enquiry
..


Patch Set 2: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/10910
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf
Gerrit-Change-Number: 10910
Gerrit-PatchSet: 2
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Tue, 18 Sep 2018 16:06:54 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-ci[master]: coverity: ensure the systemd install directory is /tmp

[lynxis lazus]

lynxis lazus has posted comments on this change. ( 
https://gerrit.osmocom.org/11017 )

Change subject: coverity: ensure the systemd install directory is /tmp
..


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/11017/1/coverity/build_Osmocom.sh
File coverity/build_Osmocom.sh:

https://gerrit.osmocom.org/#/c/11017/1/coverity/build_Osmocom.sh@15
PS1, Line 15:   ./configure --prefix="$prefix" 
--with-systemdsystemunitdir=/tmp/ $*
> If you don't care about the files (that's why you use /tmp right?) then pass 
> one of these, I think a […]
testing it with "=no" 
https://jenkins.osmocom.org/jenkins/job/osmocom-coverity/236/console



--
To view, visit https://gerrit.osmocom.org/11017
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I39b491fc09f0db0efd8d9d09e8f4cba4ba49cdde
Gerrit-Change-Number: 11017
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 
Gerrit-Comment-Date: Tue, 18 Sep 2018 16:06:20 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in osmo-ttcn3-hacks[master]: bsc: test Classmark Enquiry

[Vadim Yanitskiy]

Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/11012 )

Change subject: bsc: test Classmark Enquiry
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/11012
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Idaab4d568cf986b4897ba008f6262c839d1592fb
Gerrit-Change-Number: 11012
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Tue, 18 Sep 2018 16:00:02 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-msc[master]: fix Classmark Update without VLR subscriber

[Vadim Yanitskiy]

Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/11016 )

Change subject: fix Classmark Update without VLR subscriber
..


Patch Set 2: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/11016
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib2a2ae6bf86e8f29fc6751a8b5cdb7187cd70290
Gerrit-Change-Number: 11016
Gerrit-PatchSet: 2
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: daniel 
Gerrit-Comment-Date: Tue, 18 Sep 2018 15:51:18 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-ci[master]: coverity: ensure the systemd install directory is /tmp

[Pau Espin Pedrol]

Pau Espin Pedrol has posted comments on this change. ( 
https://gerrit.osmocom.org/11017 )

Change subject: coverity: ensure the systemd install directory is /tmp
..


Patch Set 1: Code-Review-1

(1 comment)

https://gerrit.osmocom.org/#/c/11017/1/coverity/build_Osmocom.sh
File coverity/build_Osmocom.sh:

https://gerrit.osmocom.org/#/c/11017/1/coverity/build_Osmocom.sh@15
PS1, Line 15:   ./configure --prefix="$prefix" 
--with-systemdsystemunitdir=/tmp/ $*
If you don't care about the files (that's why you use /tmp right?) then pass 
one of these, I think any is enough to void installing systemd services:
--without-systemdsystemunitdir
--with-systemdsystemunitdir=no
--with-systemdsystemunitdir=



--
To view, visit https://gerrit.osmocom.org/11017
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I39b491fc09f0db0efd8d9d09e8f4cba4ba49cdde
Gerrit-Change-Number: 11017
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Tue, 18 Sep 2018 15:41:40 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: Yes

Change in osmo-hlr[master]: tweak example config

[Neels Hofmeyr]

Neels Hofmeyr has posted comments on this change. ( 
https://gerrit.osmocom.org/10940 )

Change subject: tweak example config
..


Patch Set 2: Code-Review+2

re-add previous +2 due to trivial test expectation fix


--
To view, visit https://gerrit.osmocom.org/10940
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I8296832704d779df5f1b20a595b568c99780e64d
Gerrit-Change-Number: 10940
Gerrit-PatchSet: 2
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Comment-Date: Tue, 18 Sep 2018 15:20:11 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-ci[master]: coverity: ensure the systemd install directory is /tmp

[lynxis lazus]

lynxis lazus has uploaded this change for review. ( 
https://gerrit.osmocom.org/11017


Change subject: coverity: ensure the systemd install directory is /tmp
..

coverity: ensure the systemd install directory is /tmp

Because the systemd install directory does not use --prefix as
base. For this reason, the build failed before, because installing
to /lib/systemd failed.

Change-Id: I39b491fc09f0db0efd8d9d09e8f4cba4ba49cdde
---
M coverity/build_Osmocom.sh
1 file changed, 1 insertion(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/17/11017/1

diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh
index 920c0b9..485355a 100755
--- a/coverity/build_Osmocom.sh
+++ b/coverity/build_Osmocom.sh
@@ -12,7 +12,7 @@

 do_build() {
autoreconf --install --force
-   ./configure --prefix="$prefix" $*
+   ./configure --prefix="$prefix" --with-systemdsystemunitdir=/tmp/ $*

make $PARALLEL_MAKE
make install

--
To view, visit https://gerrit.osmocom.org/11017
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I39b491fc09f0db0efd8d9d09e8f4cba4ba49cdde
Gerrit-Change-Number: 11017
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 

Change in osmo-hlr[master]: tweak example config

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10940 )

Change subject: tweak example config
..

tweak example config

Remove 'logging level all' setting.
Tweak some more logging details (to my current favorite).

Add USSD example for showing the IMSI.

Change-Id: I8296832704d779df5f1b20a595b568c99780e64d
---
M doc/examples/osmo-hlr.cfg
M tests/test_nodes.vty
2 files changed, 5 insertions(+), 2 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Neels Hofmeyr: Looks good to me, approved



diff --git a/doc/examples/osmo-hlr.cfg b/doc/examples/osmo-hlr.cfg
index 35d942d..54993a9 100644
--- a/doc/examples/osmo-hlr.cfg
+++ b/doc/examples/osmo-hlr.cfg
@@ -5,9 +5,10 @@
   logging filter all 1
   logging color 1
   logging print category 1
-  logging timestamp 1
+  logging print category-hex 0
+  logging print level 1
+  logging print file basename last
   logging print extended-timestamp 1
-  logging level all notice
   logging level main notice
   logging level db notice
   logging level auc notice
@@ -22,3 +23,4 @@
  gsup
   bind ip 127.0.0.1
  ussd route prefix *#100# internal own-msisdn
+ ussd route prefix *#101# internal own-imsi
diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty
index d2c455f..95e132d 100644
--- a/tests/test_nodes.vty
+++ b/tests/test_nodes.vty
@@ -117,4 +117,5 @@
  gsup
   bind ip 127.0.0.1
  ussd route prefix *#100# internal own-msisdn
+ ussd route prefix *#101# internal own-imsi
 end

--
To view, visit https://gerrit.osmocom.org/10940
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I8296832704d779df5f1b20a595b568c99780e64d
Gerrit-Change-Number: 10940
Gerrit-PatchSet: 2
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr 

Build failed in Jenkins: master-asn1c » a1=default,a2=default,a3=default,osmocom-master-debian9 #250

[jenkins]

See 


--
[...truncated 3.67 KB...]

+ ./configure
checking build system type... x86_64-unknown-linux-gnu
checking host system type... x86_64-unknown-linux-gnu
checking target system type... x86_64-unknown-linux-gnu
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether to enable maintainer-specific portions of Makefiles... no
checking for style of include used by make... GNU
checking for gcc... gcc
checking for C compiler default output file name... a.out
checking whether the C compiler works... yes
checking whether we are cross compiling... no
checking for suffix of executables... 
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for /usr/bin/ld option to reload object files... -r
checking for BSD-compatible nm... /usr/bin/nm -B
checking whether ln -s works... yes
checking how to recognise dependent libraries... pass_all
checking how to run the C preprocessor... gcc -E
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking dlfcn.h usability... yes
checking dlfcn.h presence... yes
checking for dlfcn.h... yes
checking for g++... g++
checking whether we are using the GNU C++ compiler... yes
checking whether g++ accepts -g... yes
checking dependency style of g++... gcc3
checking how to run the C++ preprocessor... g++ -E
checking for g77... no
checking for f77... no
checking for xlf... no
checking for frt... no
checking for pgf77... no
checking for cf77... no
checking for fort77... no
checking for fl32... no
checking for af77... no
checking for f90... no
checking for xlf90... no
checking for pgf90... no
checking for pghpf... no
checking for epcf90... no
checking for gfortran... no
checking for g95... no
checking for f95... no
checking for fort... no
checking for xlf95... no
checking for ifort... no
checking for ifc... no
checking for efc... no
checking for pgf95... no
checking for lf95... no
checking for ftn... no
checking whether we are using the GNU Fortran 77 compiler... no
checking whether  accepts -g... no
checking the maximum length of command line arguments... 32768
checking command to parse /usr/bin/nm -B output from gcc object... ok
checking for objdir... .libs
checking for ar... ar
checking for ranlib... ranlib
checking for strip... strip
checking if gcc supports -fno-rtti -fno-exceptions... no
checking for gcc option to produce PIC... -fPIC
checking if gcc PIC flag -fPIC works... yes
checking if gcc static flag -static works... yes
checking if gcc supports -c -o file.o... yes
checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared 
libraries... yes
checking whether -lc should be explicitly linked in... no
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... yes
checking whether to build static libraries... yes
configure: creating libtool
appending configuration tag "CXX" to libtool
checking for ld used by g++... /usr/bin/ld -m elf_x86_64
checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes
checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared 
libraries... yes
checking for g++ option to produce PIC... -fPIC
checking if g++ PIC flag -fPIC works... yes
checking if g++ static flag -static works... yes
checking if g++ supports -c -o file.o... yes
checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared 
libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
appending configuration tag "F77" to libtool
checking for autoconf... /usr/bin/autoconf
checking for autoheader... /usr/bin/autoheader
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking 

Change in osmo-msc[master]: fix Classmark Update without VLR subscriber

[daniel]

daniel has posted comments on this change. ( https://gerrit.osmocom.org/11016 )

Change subject: fix Classmark Update without VLR subscriber
..


Patch Set 2: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/11016
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib2a2ae6bf86e8f29fc6751a8b5cdb7187cd70290
Gerrit-Change-Number: 11016
Gerrit-PatchSet: 2
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: daniel 
Gerrit-Comment-Date: Tue, 18 Sep 2018 14:43:05 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-msc[master]: fix Classmark Update without VLR subscriber

[Neels Hofmeyr]

Hello Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/11016

to look at the new patch set (#2).

Change subject: fix Classmark Update without VLR subscriber
..

fix Classmark Update without VLR subscriber

This recent patch moves Classmark storage to the VLR subscriber, and introduced
a segfault when a Classmark Update is received during IMSI detach:

commit 986fe7ed18580775bed91399a1f02eae60bda251
change-id I27081bf6e9e017923b2d02607f7ea06beddad82a
Mon Sep 17 01:12:13 2018 +0200
"store classmark in vlr_subscr, not conn"

It assumed that we would never accept any Classmark Update messages unless we
also have a valid subscriber for it. Well, that is proven wrong by the
ttcn3-msc-test TC_imsi_detach_by_imsi(), which brings osmo-msc to its knees.

Fix: in case of no valid vlr_subscr being present, store Classmark in the conn
temporarily, and copy any received Classmark to VLR subscriber as soon as it
gets associated with the conn (if at all).

Change-Id: Ib2a2ae6bf86e8f29fc6751a8b5cdb7187cd70290
---
M include/osmocom/msc/gsm_data.h
M src/libmsc/gsm_04_08.c
M src/libmsc/osmo_msc.c
3 files changed, 31 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/16/11016/2
--
To view, visit https://gerrit.osmocom.org/11016
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ib2a2ae6bf86e8f29fc6751a8b5cdb7187cd70290
Gerrit-Change-Number: 11016
Gerrit-PatchSet: 2
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder (102)

Change in osmo-msc[master]: fix Classmark Update without VLR subscriber

[Neels Hofmeyr]

Neels Hofmeyr has uploaded this change for review. ( 
https://gerrit.osmocom.org/11016


Change subject: fix Classmark Update without VLR subscriber
..

fix Classmark Update without VLR subscriber

This recent patch moves Classmark storage to the VLR subscriber, and introduced
a segfault when a Classmark Update is received during IMSI detach:

commit 986fe7ed18580775bed91399a1f02eae60bda251
change-id I27081bf6e9e017923b2d02607f7ea06beddad82a
Mon Sep 17 01:12:13 2018 +0200
"store classmark in vlr_subscr, not conn"

It assumed that we would never accept any Classmark Update messages unless we
also have a valid subscriber for it. Well, that is proven wrong by the
ttcn3-msc-test TC_imsi_detach_by_imsi(), which brings osmo-msc to its knees.

Fix: in case of no valid vlr_subscr being present, store Classmark in the conn
temporarily, and copy any received Classmark to VLR subscriber as soon as it
gets associated with the conn (if at all).

Change-Id: Ib2a2ae6bf86e8f29fc6751a8b5cdb7187cd70290
---
M include/osmocom/msc/gsm_data.h
M src/libmsc/gsm_04_08.c
M src/libmsc/osmo_msc.c
3 files changed, 31 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/16/11016/1

diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h
index 70ac934..54026f6 100644
--- a/include/osmocom/msc/gsm_data.h
+++ b/include/osmocom/msc/gsm_data.h
@@ -181,6 +181,10 @@

bool waiting_for_clear_complete;
} a;
+
+   /* Temporary storage for Classmark Information for times when a 
connection has no VLR subscriber
+* associated yet. It will get copied to the VLR subscriber upon 
msc_vlr_subscr_assoc(). */
+   struct gsm_classmark temporary_classmark;
 };


diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c
index 564e90b..0f52d09 100644
--- a/src/libmsc/gsm_04_08.c
+++ b/src/libmsc/gsm_04_08.c
@@ -1739,6 +1739,22 @@
 subscr->imsi, subscr->msisdn, subscr->use_count);
 }

+static void update_classmark(const struct gsm_classmark *src, struct 
gsm_classmark *dst)
+{
+   if (src->classmark1_set) {
+   dst->classmark1 = src->classmark1;
+   dst->classmark1_set = true;
+   }
+   if (src->classmark2_len) {
+   dst->classmark2_len = src->classmark2_len;
+   memcpy(dst->classmark2, src->classmark2, 
sizeof(dst->classmark2));
+   }
+   if (src->classmark3_len) {
+   dst->classmark3_len = src->classmark3_len;
+   memcpy(dst->classmark3, src->classmark3, 
sizeof(dst->classmark3));
+   }
+}
+
 /* VLR informs us that the subscriber has been associated with a conn */
 static void msc_vlr_subscr_assoc(void *msc_conn_ref,
 struct vlr_subscr *vsub)
@@ -1749,6 +1765,11 @@
conn->vsub = vlr_subscr_get(vsub);
OSMO_ASSERT(conn->vsub);
conn->vsub->cs.attached_via_ran = conn->via_ran;
+
+   /* In case we have already received Classmark Information before the 
VLR Subscriber was
+* associated with the conn: merge the new Classmark into 
vsub->classmark. Don't overwrite valid
+* vsub->classmark with unset classmark, though. */
+   update_classmark(>temporary_classmark, >vsub->classmark);
 }

 static int msc_vlr_route_gsup_msg(struct vlr_subscr *vsub,
diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c
index 8efa16c..5c3f6c6 100644
--- a/src/libmsc/osmo_msc.c
+++ b/src/libmsc/osmo_msc.c
@@ -147,7 +147,12 @@
   const uint8_t *cm2, uint8_t cm2_len,
   const uint8_t *cm3, uint8_t cm3_len)
 {
-   struct gsm_classmark *cm = >vsub->classmark;
+   struct gsm_classmark *cm;
+
+   if (!conn->vsub)
+   cm = >temporary_classmark;
+   else
+   cm = >vsub->classmark;

if (cm2 && cm2_len) {
if (cm2_len > sizeof(cm->classmark2)) {

--
To view, visit https://gerrit.osmocom.org/11016
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2a2ae6bf86e8f29fc6751a8b5cdb7187cd70290
Gerrit-Change-Number: 11016
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 

Change in osmo-gsm-tester[master]: contrib: Use correct var to write repo name in git_hashes.txt

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/11015


Change subject: contrib: Use correct var to write repo name in git_hashes.txt
..

contrib: Use correct var to write repo name in git_hashes.txt

We want to write repo name in there, not $dep which actually doesn't
exist in local context of have_repo function. In most cases it's
actually the same because in almost all cases $dep is passed as $1 to
have_repo and thus is the same as local $repo. But in a few recipes
which don't use build_repo directly but instead use have_repo and build
manually, $dep may not point to $repo. That's the case for osmocom-bb
for instance. As a result, "libosmocore" is printed twice, were second
word should be "osmocom-bb".

Change-Id: I7a7db7cf4cc020295d216c60d6dc688f110916dc
---
M contrib/jenkins-build-common.sh
1 file changed, 1 insertion(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester 
refs/changes/15/11015/1

diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh
index c2ffbb4..bfe8d73 100644
--- a/contrib/jenkins-build-common.sh
+++ b/contrib/jenkins-build-common.sh
@@ -92,7 +92,7 @@
 
   git rev-parse HEAD

-  echo "$(git rev-parse HEAD) $dep" >> "$prefix_real/${name}_git_hashes.txt"
+  echo "$(git rev-parse HEAD) $repo" >> "$prefix_real/${name}_git_hashes.txt"

   cd "$base"
 }

--
To view, visit https://gerrit.osmocom.org/11015
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a7db7cf4cc020295d216c60d6dc688f110916dc
Gerrit-Change-Number: 11015
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in osmo-hlr[master]: tweak example config

[Neels Hofmeyr]

Hello Harald Welte, Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/10940

to look at the new patch set (#2).

Change subject: tweak example config
..

tweak example config

Remove 'logging level all' setting.
Tweak some more logging details (to my current favorite).

Add USSD example for showing the IMSI.

Change-Id: I8296832704d779df5f1b20a595b568c99780e64d
---
M doc/examples/osmo-hlr.cfg
M tests/test_nodes.vty
2 files changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/40/10940/2
--
To view, visit https://gerrit.osmocom.org/10940
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I8296832704d779df5f1b20a595b568c99780e64d
Gerrit-Change-Number: 10940
Gerrit-PatchSet: 2
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in osmo-hlr[master]: make: always allow running python tests manually

[Neels Hofmeyr]

Neels Hofmeyr has uploaded this change for review. ( 
https://gerrit.osmocom.org/11014


Change subject: make: always allow running python tests manually
..

make: always allow running python tests manually

Keep the rules to run the external-tests in tests/Makefile available for
invocation, to allow conveniently launching the tests manualy without the need
to pass --with-external-tests to ./configure first.

Change-Id: Ic28dbeabddee6b41af12b977e3fe59e663ee51a1
---
M tests/Makefile.am
1 file changed, 4 insertions(+), 5 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/14/11014/1

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7e45da4..e07749c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -44,6 +44,10 @@
 # don't run vty and ctrl tests concurrently so that the ports don't conflict
$(MAKE) vty-test
$(MAKE) ctrl-test
+else
+python-tests:
+   echo "Not running python-based external tests (determined at 
configure-time)"
+endif

 VTY_TEST_DB = hlr_vty_test.db

@@ -75,11 +79,6 @@
-rm -f $(CTRL_TEST_DB)
-rm $(CTRL_TEST_DB)-*

-else
-python-tests:
-   echo "Not running python-based tests (determined at configure-time)"
-endif
-
 check-local: atconfig $(TESTSUITE)
$(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS)
$(MAKE) $(AM_MAKEFLAGS) python-tests

--
To view, visit https://gerrit.osmocom.org/11014
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic28dbeabddee6b41af12b977e3fe59e663ee51a1
Gerrit-Change-Number: 11014
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 

Change in docker-playground[master]: ttcn3-sgsn-test: save the log as color/raw version

[lynxis lazus]

lynxis lazus has posted comments on this change. ( 
https://gerrit.osmocom.org/11013 )

Change subject: ttcn3-sgsn-test: save the log as color/raw version
..


Patch Set 1: Verified+1

tested using a docker container.


--
To view, visit https://gerrit.osmocom.org/11013
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie06d0ad6f980e5800f65a128cd33d6937c47afa9
Gerrit-Change-Number: 11013
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: lynxis lazus 
Gerrit-Comment-Date: Tue, 18 Sep 2018 12:52:16 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in docker-playground[master]: ttcn3-sgsn-test: save the log as color/raw version

[lynxis lazus]

lynxis lazus has uploaded this change for review. ( 
https://gerrit.osmocom.org/11013


Change subject: ttcn3-sgsn-test: save the log as color/raw version
..

ttcn3-sgsn-test: save the log as color/raw version

The sgsn does not save anywhere it's logfile.

Change-Id: Ie06d0ad6f980e5800f65a128cd33d6937c47afa9
---
M ttcn3-sgsn-test/osmo-sgsn.cfg
1 file changed, 76 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/docker-playground 
refs/changes/13/11013/1

diff --git a/ttcn3-sgsn-test/osmo-sgsn.cfg b/ttcn3-sgsn-test/osmo-sgsn.cfg
index 0999c51..cebf549 100644
--- a/ttcn3-sgsn-test/osmo-sgsn.cfg
+++ b/ttcn3-sgsn-test/osmo-sgsn.cfg
@@ -40,6 +40,82 @@
   logging level lm3ua notice
   logging level lmgcp notice
 !
+log file sgsn-color.log
+  logging filter all 1
+  logging color 1
+  logging print category 1
+  logging timestamp 1
+  logging print file 1
+  logging level all everything
+  logging level mm debug
+  logging level pag notice
+  logging level meas notice
+  logging level ref notice
+  logging level gprs debug
+  logging level ns info
+  logging level bssgp info
+  logging level llc debug
+  logging level sndcp debug
+  logging level slhc notice
+  logging level ranap info
+  logging level sua info
+  logging level v42bis info
+  logging level lglobal info
+  logging level llapd notice
+  logging level linp notice
+  logging level lmux notice
+  logging level lmi notice
+  logging level lmib notice
+  logging level lsms notice
+  logging level lctrl notice
+  logging level lgtp debug
+  logging level lstats notice
+  logging level lgsup debug
+  logging level loap notice
+  logging level lss7 notice
+  logging level lsccp info
+  logging level lsua notice
+  logging level lm3ua notice
+  logging level lmgcp notice
+!
+log file sgsn-raw.log
+  logging filter all 1
+  logging color 0
+  logging print category 1
+  logging timestamp 1
+  logging print file 1
+  logging level all everything
+  logging level mm debug
+  logging level pag notice
+  logging level meas notice
+  logging level ref notice
+  logging level gprs debug
+  logging level ns info
+  logging level bssgp info
+  logging level llc debug
+  logging level sndcp debug
+  logging level slhc notice
+  logging level ranap info
+  logging level sua info
+  logging level v42bis info
+  logging level lglobal info
+  logging level llapd notice
+  logging level linp notice
+  logging level lmux notice
+  logging level lmi notice
+  logging level lmib notice
+  logging level lsms notice
+  logging level lctrl notice
+  logging level lgtp debug
+  logging level lstats notice
+  logging level lgsup debug
+  logging level loap notice
+  logging level lss7 notice
+  logging level lsccp info
+  logging level lsua notice
+  logging level lm3ua notice
+  logging level lmgcp notice
+!
 stats interval 5
 !
 line vty

--
To view, visit https://gerrit.osmocom.org/11013
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie06d0ad6f980e5800f65a128cd33d6937c47afa9
Gerrit-Change-Number: 11013
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 

Change in osmo-bsc[master]: Implement RR Classmark Enquiry

[Neels Hofmeyr]

Neels Hofmeyr has posted comments on this change. ( 
https://gerrit.osmocom.org/10910 )

Change subject: Implement RR Classmark Enquiry
..


Patch Set 2:

tested by https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/11012


--
To view, visit https://gerrit.osmocom.org/10910
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf
Gerrit-Change-Number: 10910
Gerrit-PatchSet: 2
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Comment-Date: Tue, 18 Sep 2018 12:38:46 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in osmo-bsc[master]: Implement RR Classmark Enquiry

[Neels Hofmeyr]

Hello Harald Welte, Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/10910

to look at the new patch set (#2).

Change subject: Implement RR Classmark Enquiry
..

Implement RR Classmark Enquiry

If the MSC sends a BSSMAP Classmark Request, send an RR Classmark Enquiry to
the MS.

(The reverse direction, i.e. sending a BSSMAP Classmark Update back to the MSC,
is already implemented.)

Related: OS#3043 (A5/3 encryption)
Related: osmo-ttcn3-hacks Idaab4d568cf986b4897ba008f6262c839d1592fb
Change-Id: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf
---
M include/osmocom/bsc/gsm_04_08_rr.h
M src/osmo-bsc/gsm_04_08_rr.c
M src/osmo-bsc/osmo_bsc_bssap.c
3 files changed, 19 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/10/10910/2
--
To view, visit https://gerrit.osmocom.org/10910
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf
Gerrit-Change-Number: 10910
Gerrit-PatchSet: 2
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in osmo-ttcn3-hacks[master]: bsc: test Classmark Enquiry

[Neels Hofmeyr]

Neels Hofmeyr has uploaded this change for review. ( 
https://gerrit.osmocom.org/11012


Change subject: bsc: test Classmark Enquiry
..

bsc: test Classmark Enquiry

Enhance TC_classmark to also include the BSSMAP Classmark Request -> RR
Classmark Enquiry part. So far it was only testing the return path of RR
Classmark Change -> BSSMAP Classmark Update.

This test will thus fail with current osmo-bsc master, and will succeed as soon
as osmo-bsc If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf is merged.

Add:

* ts_BSSMAP_ClassmarkRequest in BSSMAP_Templates.ttcn
* tr_RRM_CM_ENQUIRY in L3_Templates.ttcn

Change-Id: Idaab4d568cf986b4897ba008f6262c839d1592fb
---
M bsc/BSC_Tests.ttcn
M library/BSSMAP_Templates.ttcn
M library/L3_Templates.ttcn
3 files changed, 33 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/12/11012/1

diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index b44de9f..a99214b 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -1940,13 +1940,18 @@
vc_conn.done;
 }

-/* test if L3 RR CLASSMARK CHANGE is translated to BSSMAP CLASSMARK UPDATE */
+/* test the procedure of the MSC requesting a Classmark Update:
+ * a) BSSMAP Classmark Request should result in RR CLASSMARK ENQUIRY,
+ * b) L3 RR CLASSMARK CHANGE should result in BSSMAP CLASSMARK UPDATE */
 private function f_tc_classmark(charstring id) runs on MSC_ConnHdlr {
g_pars := valueof(t_def_TestHdlrPars);
f_create_chan_and_exp();
/* we should now have a COMPL_L3 at the MSC */
BSSAP.receive(tr_BSSMAP_ComplL3);

+   BSSAP.send(ts_BSSMAP_ClassmarkRequest);
+   RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, decmatch tr_RRM_CM_ENQUIRY));
+
f_rsl_send_l3(ts_RRM_CM_CHG(valueof(ts_CM2)));
BSSAP.receive(tr_BSSMAP_ClassmarkUpd(?, omit));
setverdict(pass);
diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn
index d92ea61..a3a50de 100644
--- a/library/BSSMAP_Templates.ttcn
+++ b/library/BSSMAP_Templates.ttcn
@@ -944,6 +944,18 @@
}
 }

+template PDU_BSSAP ts_BSSMAP_ClassmarkRequest
+modifies ts_BSSAP_BSSMAP := {
+   pdu := {
+   bssmap := {
+   classmarkRequest := {
+   messageType := '58'O,
+   talkerPriority := omit
+   }
+   }
+   }
+}
+
 /* return Layer3 octetstring inside BSSAP PDU */
 function f_bssap_extract_l3(PDU_BSSAP bssap) return template octetstring {
if (ischosen(bssap.pdu.bssmap)) {
diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn
index 557b1b8..1ce84cf 100644
--- a/library/L3_Templates.ttcn
+++ b/library/L3_Templates.ttcn
@@ -525,6 +525,21 @@
}
 }

+template PDU_ML3_NW_MS tr_RRM_CM_ENQUIRY := {
+   discriminator := '0110'B,
+   tiOrSkip := {
+   skipIndicator := ''B
+   },
+   msgs := {
+   rrm := {
+   classmarkEnquiry := {
+   messageType := '00010011'B,
+   classmarkEnquiryMask := *
+   }
+   }
+   }
+}
+
 template (value) PDU_ML3_MS_NW ts_RRM_UL_REL(OCT1 cause) := {
discriminator := '0110'B,
tiOrSkip := {

--
To view, visit https://gerrit.osmocom.org/11012
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idaab4d568cf986b4897ba008f6262c839d1592fb
Gerrit-Change-Number: 11012
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 

Change in osmo-ci[master]: jobs/coverity: only build the master branch

[lynxis lazus]

lynxis lazus has uploaded this change for review. ( 
https://gerrit.osmocom.org/11011


Change subject: jobs/coverity: only build the master branch
..

jobs/coverity: only build the master branch

Otherwise the last modified branch will be build.

Change-Id: I0b68ebae025e0dc9dbfd22b97731b59be30e7823
---
M jobs/coverity.yml
1 file changed, 2 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/11/11011/1

diff --git a/jobs/coverity.yml b/jobs/coverity.yml
index 3ec4bda..b37d4a4 100644
--- a/jobs/coverity.yml
+++ b/jobs/coverity.yml
@@ -29,6 +29,8 @@
   url: git://git.osmocom.org/osmo-ci
   git-config-name: 'Jenkins Builder'
   git-config-email: 'jenk...@osmocom.org'
+  branches:
+- 'origin/master'
 triggers:
   - timed: "@daily"


--
To view, visit https://gerrit.osmocom.org/11011
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b68ebae025e0dc9dbfd22b97731b59be30e7823
Gerrit-Change-Number: 11011
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus 

Change in osmo-gsm-tester[master]: osmo-trx: Add multi_arfcn support

[Pau Espin Pedrol]

Pau Espin Pedrol has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/11001 )

Change subject: osmo-trx: Add multi_arfcn support
..

osmo-trx: Add multi_arfcn support

2nd TRX arfcn is changed in defaults.conf because multi_arfcn requires
them to be alocated in steps of 4 starting from TRX0.

It is not enabled by default yet on B200 (it must use it to support
several TRX) because current host running osmo-gsm-tester is not
performant enough and cannot keep up with timers due to multi-arfcn CPU
overhead.

Change-Id: I096df82ad1f4cbb41dfbd6a78466a845f34be385
---
M example/defaults.conf
M src/osmo_gsm_tester/bts_osmotrx.py
M src/osmo_gsm_tester/resource.py
M src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl
4 files changed, 9 insertions(+), 1 deletion(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/example/defaults.conf b/example/defaults.conf
index 7ad5e1f..42258a6 100644
--- a/example/defaults.conf
+++ b/example/defaults.conf
@@ -48,7 +48,7 @@
 - phys_chan_config: PDCH
   - nominal_power: 23
 max_power_red: 0
-arfcn: 870
+arfcn: 872
 timeslot_list:
 - phys_chan_config: TCH/F
 - phys_chan_config: TCH/F
diff --git a/src/osmo_gsm_tester/bts_osmotrx.py 
b/src/osmo_gsm_tester/bts_osmotrx.py
index a4bc082..e7e3542 100644
--- a/src/osmo_gsm_tester/bts_osmotrx.py
+++ b/src/osmo_gsm_tester/bts_osmotrx.py
@@ -174,6 +174,8 @@
 self.dbg(config_file=self.config_file)

 values = self.conf
+multi_arfcn_bool = util.str2bool(values.get('osmo_trx', 
{}).get('multi_arfcn', False))
+config.overlay(values, { 'osmo_trx': { 'multi_arfcn': multi_arfcn_bool 
} })

 self.dbg('OSMO-TRX CONFIG:\n' + pprint.pformat(values))

diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py
index 9ca5665..e043d87 100644
--- a/src/osmo_gsm_tester/resource.py
+++ b/src/osmo_gsm_tester/resource.py
@@ -72,6 +72,7 @@
 'bts[].osmo_trx.type': schema.STR,
 'bts[].osmo_trx.clock_reference': schema.OSMO_TRX_CLOCK_REF,
 'bts[].osmo_trx.trx_ip': schema.IPV4,
+'bts[].osmo_trx.multi_arfcn': schema.BOOL_STR,
 'arfcn[].arfcn': schema.INT,
 'arfcn[].band': schema.BAND,
 'modem[].label': schema.STR,
diff --git a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl 
b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl
index 2f6e830..0003f1b 100644
--- a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl
@@ -19,6 +19,11 @@
  remote-ip ${osmo_trx.bts_ip}
  base-port 5700
  egprs disable
+%if osmo_trx.get('multi_arfcn', False):
+ multi-arfcn enable
+%else:
+ multi-arfcn disable
+%endif
  tx-sps 4
  rx-sps 4
  clock-ref ${osmo_trx.clock_reference}

-- 
To view, visit https://gerrit.osmocom.org/11001
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I096df82ad1f4cbb41dfbd6a78466a845f34be385
Gerrit-Change-Number: 11001
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 

Change in osmo-gsm-tester[master]: osmo-bts-trx: Add multiTRX support

[Pau Espin Pedrol]

Pau Espin Pedrol has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/11000 )

Change subject: osmo-bts-trx: Add multiTRX support
..

osmo-bts-trx: Add multiTRX support

Support is limited to 1 osmo-trx with 1 phy and multiple instances.

Change-Id: If2bda5ec7ac9fa3fe6bc5d71f323c3ccc2a70158
---
M example/defaults.conf
M src/osmo_gsm_tester/bts_osmotrx.py
M src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl
3 files changed, 13 insertions(+), 5 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/example/defaults.conf b/example/defaults.conf
index fc4c324..7ad5e1f 100644
--- a/example/defaults.conf
+++ b/example/defaults.conf
@@ -76,6 +76,9 @@
 - phys_chan_config: TCH/F # nanobts only supports PDCH in TRX0.
 - phys_chan_config: TCH/F

+osmo_bts_trx:
+  max_trx: 2
+
 osmo_trx:
   type: uhd
   launch_trx: true
diff --git a/src/osmo_gsm_tester/bts_osmotrx.py 
b/src/osmo_gsm_tester/bts_osmotrx.py
index 1c7349f..a4bc082 100644
--- a/src/osmo_gsm_tester/bts_osmotrx.py
+++ b/src/osmo_gsm_tester/bts_osmotrx.py
@@ -77,7 +77,7 @@
 'osmo_trx': {
 'bts_ip': self.remote_addr(),
 'trx_ip': self.trx_remote_ip(),
-'channels': [{}] # TODO: implement channels 
for multiTRX
+'channels': [{} for trx_i in 
range(self.num_trx())]
 }
 }
 })
@@ -134,7 +134,8 @@

 self.proc_bts = self.launch_process(keepalive, OsmoBtsTrx.BIN_BTS_TRX, 
'-r', '1',
 '-c', os.path.abspath(self.config_file),
-'-i', self.bsc.addr())
+'-i', self.bsc.addr(),
+'-t', str(self.num_trx()))
 self.suite_run.poll()

 class OsmoTrx(log.Origin, metaclass=ABCMeta):
diff --git a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl 
b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl
index 5dba323..677b047 100644
--- a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl
@@ -23,9 +23,11 @@
 phy 0
  osmotrx ip local ${osmo_bts_trx.osmo_trx.bts_ip}
  osmotrx ip remote ${osmo_bts_trx.osmo_trx.trx_ip}
- instance 0
+%for chan in osmo_bts_trx.osmo_trx.channels:
+ instance ${loop.index}
   osmotrx rx-gain 25
   osmotrx tx-attenuation oml
+%endfor
 bts 0
  band ${osmo_bts_trx.band}
  ipa unit-id ${osmo_bts_trx.ipa_unit_id} 0
@@ -44,5 +46,7 @@
  gsmtap-sapi ptcch
  gsmtap-sapi cbch
  gsmtap-sapi sacch
- trx 0
-  phy 0 instance 0
+%for chan in osmo_bts_trx.osmo_trx.channels:
+ trx ${loop.index}
+  phy 0 instance ${loop.index}
+%endfor

--
To view, visit https://gerrit.osmocom.org/11000
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: If2bda5ec7ac9fa3fe6bc5d71f323c3ccc2a70158
Gerrit-Change-Number: 11000
Gerrit-PatchSet: 3
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 

Change in osmo-gsm-tester[master]: encryption: Reuse code using test lib features

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/11009


Change subject: encryption: Reuse code using test lib features
..

encryption: Reuse code using test lib features

Change-Id: I9b6944516c524a0c11a47aec6839f8ee9d571661
---
A suites/encryption/lib/testlib.py
M suites/encryption/register_a5_0_authopt.py
M suites/encryption/register_a5_0_authreq.py
M suites/encryption/register_a5_1_authreq.py
4 files changed, 66 insertions(+), 125 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester 
refs/changes/09/11009/1

diff --git a/suites/encryption/lib/testlib.py b/suites/encryption/lib/testlib.py
new file mode 100644
index 000..3948941
--- /dev/null
+++ b/suites/encryption/lib/testlib.py
@@ -0,0 +1,54 @@
+#!/usr/bin/env python3
+from osmo_gsm_tester.testenv import *
+
+def encryption_test_setup_run(enable_auth, algo):
+hlr = suite.hlr()
+bts = suite.bts()
+mgw_msc = suite.mgw()
+mgw_bsc = suite.mgw()
+stp = suite.stp()
+msc = suite.msc(hlr, mgw_msc, stp)
+bsc = suite.bsc(msc, mgw_bsc, stp)
+ms = suite.modem()
+
+print('start network...')
+msc.set_authentication(enable_auth)
+msc.set_encryption(algo)
+bsc.set_encryption(algo)
+hlr.start()
+stp.start()
+msc.start()
+mgw_msc.start()
+mgw_bsc.start()
+bsc.bts_add(bts)
+bsc.start()
+bts.start()
+wait(bsc.bts_is_connected, bts)
+
+ms.log_info()
+good_ki = ms.ki()
+bad_ki = ("%1X" % (int(good_ki[0], 16) ^ 0x01)) + good_ki[1:]
+
+print('KI changed: ' + good_ki + " => " + bad_ki)
+ms.set_ki(bad_ki)
+hlr.subscriber_add(ms)
+if enable_auth:
+print('Attempt connection with wrong KI...')
+ms.connect(msc.mcc_mnc())
+
+sleep(40) # TODO: read pcap or CTRL interface and look for Rejected? 
(gsm_a.dtap.msg_mm_type == 0x04)
+print('Asserting modem did not register')
+# FIXME: this can fail because ofono qmi signals registered before 
being accepted by network. See OS#2458
+# assert not ms.is_connected(msc.mcc_mnc())
+assert not msc.subscriber_attached(ms)
+
+hlr.subscriber_delete(ms)
+print('KI changed: ' + bad_ki + " => " + good_ki)
+ms.set_ki(good_ki)
+hlr.subscriber_add(ms, ms.msisdn)
+print('Attempt connection with correct KI...')
+else:
+print('Attempt connection with wrong KI, should work as it is not 
used...')
+ms.connect(msc.mcc_mnc())
+wait(ms.is_connected, msc.mcc_mnc())
+wait(msc.subscriber_attached, ms)
diff --git a/suites/encryption/register_a5_0_authopt.py 
b/suites/encryption/register_a5_0_authopt.py
index acbbb1f..1b7f471 100755
--- a/suites/encryption/register_a5_0_authopt.py
+++ b/suites/encryption/register_a5_0_authopt.py
@@ -1,37 +1,8 @@
 #!/usr/bin/env python3
 from osmo_gsm_tester.testenv import *

-hlr = suite.hlr()
-bts = suite.bts()
-mgw_msc = suite.mgw()
-mgw_bsc = suite.mgw()
-stp = suite.stp()
-msc = suite.msc(hlr, mgw_msc, stp)
-bsc = suite.bsc(msc, mgw_bsc, stp)
-ms = suite.modem()
+import testlib
+suite.test_import_modules_register_for_cleanup(testlib)
+from testlib import encryption_test_setup_run

-print('start network...')
-msc.set_authentication(False)
-msc.set_encryption('a5_0')
-bsc.set_encryption('a5_0')
-hlr.start()
-stp.start()
-msc.start()
-mgw_msc.start()
-mgw_bsc.start()
-bsc.bts_add(bts)
-bsc.start()
-bts.start()
-wait(bsc.bts_is_connected, bts)
-
-ms.log_info()
-good_ki = ms.ki()
-bad_ki = ("%1X" % (int(good_ki[0], 16) ^ 0x01)) + good_ki[1:]
-
-print('KI changed: ' + good_ki + " => " + bad_ki)
-ms.set_ki(bad_ki)
-hlr.subscriber_add(ms)
-print('Attempt connection with wrong KI, should work as it is not used...')
-ms.connect(msc.mcc_mnc())
-wait(ms.is_connected, msc.mcc_mnc())
-wait(msc.subscriber_attached, ms)
+encryption_test_setup_run(False, 'a5_0')
diff --git a/suites/encryption/register_a5_0_authreq.py 
b/suites/encryption/register_a5_0_authreq.py
index 789ace5..feca525 100755
--- a/suites/encryption/register_a5_0_authreq.py
+++ b/suites/encryption/register_a5_0_authreq.py
@@ -1,50 +1,8 @@
 #!/usr/bin/env python3
 from osmo_gsm_tester.testenv import *

-hlr = suite.hlr()
-bts = suite.bts()
-mgw_msc = suite.mgw()
-mgw_bsc = suite.mgw()
-stp = suite.stp()
-msc = suite.msc(hlr, mgw_msc, stp)
-bsc = suite.bsc(msc, mgw_bsc, stp)
-ms = suite.modem()
+import testlib
+suite.test_import_modules_register_for_cleanup(testlib)
+from testlib import encryption_test_setup_run

-print('start network...')
-msc.set_authentication(True)
-msc.set_encryption('a5_0')
-bsc.set_encryption('a5_0')
-hlr.start()
-stp.start()
-msc.start()
-mgw_msc.start()
-mgw_bsc.start()
-bsc.bts_add(bts)
-bsc.start()
-bts.start()
-wait(bsc.bts_is_connected, bts)
-
-ms.log_info()
-good_ki = ms.ki()
-bad_ki = ("%1X" % (int(good_ki[0], 16) ^ 0x01)) + good_ki[1:]
-
-print('KI changed: ' + good_ki + " => " + bad_ki)

Change in osmo-gsm-tester[master]: suites: encryption: Add test register_a5_3_authreq

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/11010


Change subject: suites: encryption: Add test register_a5_3_authreq
..

suites: encryption: Add test register_a5_3_authreq

Change-Id: I279e78e741b3ca841cb8508db40874f3c17b0785
---
A suites/encryption/register_a5_3_authreq.py
1 file changed, 8 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester 
refs/changes/10/11010/1

diff --git a/suites/encryption/register_a5_3_authreq.py 
b/suites/encryption/register_a5_3_authreq.py
new file mode 100755
index 000..219c109
--- /dev/null
+++ b/suites/encryption/register_a5_3_authreq.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python3
+from osmo_gsm_tester.testenv import *
+
+import testlib
+suite.test_import_modules_register_for_cleanup(testlib)
+from testlib import encryption_test_setup_run
+
+encryption_test_setup_run(True, 'a5_3')

--
To view, visit https://gerrit.osmocom.org/11010
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I279e78e741b3ca841cb8508db40874f3c17b0785
Gerrit-Change-Number: 11010
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in osmo-gsm-tester[master]: default-suites: Remove nanobts HR1 voice test

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/11008


Change subject: default-suites: Remove nanobts HR1 voice test
..

default-suites: Remove nanobts HR1 voice test

nanobts doesn't support this format, so it will always fail.

Change-Id: Iea4e6395809e5ef5485892f8f17e0dcfa36640dc
---
M example/default-suites.conf
1 file changed, 0 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester 
refs/changes/08/11008/1

diff --git a/example/default-suites.conf b/example/default-suites.conf
index af7e8de..1857ba5 100644
--- a/example/default-suites.conf
+++ b/example/default-suites.conf
@@ -47,7 +47,6 @@
 - voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr1
 - voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr2
 - voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr3
-- voice:nanobts+band-1900+mod-bts0-ts-tchh+cfg-codec-hr1
 - voice:nanobts+band-1900+mod-bts0-ts-tchh+cfg-codec-hr3
 - voice:nanobts+band-1900+mod-bts0-dynts-ipa
 - gprs:nanobts+band-1900
@@ -58,7 +57,6 @@
 - voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr1
 - voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr2
 - voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr3
-- voice:nanobts+band-900+mod-bts0-ts-tchh+cfg-codec-hr1
 - voice:nanobts+band-900+mod-bts0-ts-tchh+cfg-codec-hr3
 - voice:nanobts+band-900+mod-bts0-dynts-ipa
 - voice:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend

--
To view, visit https://gerrit.osmocom.org/11008
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea4e6395809e5ef5485892f8f17e0dcfa36640dc
Gerrit-Change-Number: 11008
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in osmocom-bb[master]: Install to /bin as it doesn't require special privileges..

[Holger Freyther]

Holger Freyther has posted comments on this change. ( 
https://gerrit.osmocom.org/10967 )

Change subject: Install to /bin as it doesn't require special privileges..
..


Patch Set 2:

> I think since we don't plan to have binaries with spaces in path is
 > not worth spending time changing the logic in the osmo-gsm-tester
 > script. This patch is good though.

Well. Either way it is the wrong place and too late to have this discussion. My 
personal preference is to find robust solutions and spaces in shell scripts is 
a bug class that keeps on giving. I think it is better to not have to worry 
about a class of problems than excluding them it by decree.

In a parallel universe where time is a less scarce resource... I would make 
these bash scripts, use arrays and have a way to disambiguate bin/foo and 
sbin/foo..


Other sbin binaries: I think we won't find many.

 wget --no-parent -r 
http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/amd64/
for i in `ls 
download.opensuse.org/repositories/network\:/osmocom\:/latest/Debian_9.0/amd64/*.deb`;
 do dpkg -c $i | grep sbin; done

returns no hit.


--
To view, visit https://gerrit.osmocom.org/10967
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ibe572a4c17871785b623e70acc7f5da056f945e5
Gerrit-Change-Number: 10967
Gerrit-PatchSet: 2
Gerrit-Owner: Holger Freyther 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Holger Freyther 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-CC: Pau Espin Pedrol 
Gerrit-Comment-Date: Tue, 18 Sep 2018 06:52:49 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in osmo-gsm-tester[master]: build: Add overload to clone repo and build in subdirectory

[Holger Freyther]

Holger Freyther has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10970 )

Change subject: build: Add overload to clone repo and build in subdirectory
..

build: Add overload to clone repo and build in subdirectory

To build osmo-nitb we need to clone "openbsc" and then enter the
"openbsc" sub-directory. For building "mobile" and "virt_phy" of
OsmocomBB we will need to do something similar. Instead of added
more hardcoded paths, add a variant that allows to specify the
source directory.

Change-Id: I67fbd54296f2c68316bf8e89cfeb37d147193d53
---
M contrib/jenkins-build-common.sh
M contrib/jenkins-build-osmo-nitb.sh
2 files changed, 14 insertions(+), 9 deletions(-)

Approvals:
  Harald Welte: Looks good to me, but someone else must approve
  Pau Espin Pedrol: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh
index 731bf58..c2ffbb4 100644
--- a/contrib/jenkins-build-common.sh
+++ b/contrib/jenkins-build-common.sh
@@ -12,6 +12,7 @@
 # build_repo libosmocore --configure --opts
 # build_repo libosmo-foo special_branch --configure --opts
 # build_repo osmo-bar
+# build_repo_dir openbsc ./openbsc
 #
 # create_bin_tgz
 #--
@@ -98,11 +99,19 @@

 build_repo() {
   # usage: build_repo  [] [--configure-opts [...]]
+  dir="$1"
+  shift
+  build_repo_dir "${dir}" "./" $@
+}
+
+build_repo_dir() {
+  # usage: build_repo_dir   [] [--configure-opts [...]]
   dep="$1"
+  dir="$2"
   branch="master"
-  if [ -z "$(echo "$2" | grep '^-')" ]; then
+  if [ -z "$(echo "$3" | grep '^-')" ]; then
 # second arg does not start with a dash, it's empty or a branch
-branch="$2"
+branch="$3"
 if [ -n "$branch" ]; then
   # we had a branch arg, need to shift once more to get config options
   shift
@@ -111,6 +120,7 @@
 fi
   fi
   shift
+  shift
   configure_opts="$@"

   set +x; echo "
@@ -122,12 +132,7 @@

   have_repo "$dep" "$branch"

-  cd "$dep"
-
-  # special shim: we know the openbsc.git needs to be built in the openbsc/ 
subdir.
-  if [ "$dep" = "openbsc" ]; then
-cd openbsc
-  fi
+  cd "$dep/${dir}"
 
   set +x; echo; echo; set -x
   autoreconf -fi
diff --git a/contrib/jenkins-build-osmo-nitb.sh 
b/contrib/jenkins-build-osmo-nitb.sh
index 1e3ecc6..4f81fa8 100755
--- a/contrib/jenkins-build-osmo-nitb.sh
+++ b/contrib/jenkins-build-osmo-nitb.sh
@@ -10,6 +10,6 @@
 build_repo openggsn
 build_repo libsmpp34
 build_repo libosmo-sccp
-build_repo openbsc --enable-smpp --enable-osmo-bsc --enable-nat
+build_repo_dir openbsc openbsc --enable-smpp --enable-osmo-bsc --enable-nat

 create_bin_tgz "osmo-nitb osmo-bsc_mgcp"

--
To view, visit https://gerrit.osmocom.org/10970
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I67fbd54296f2c68316bf8e89cfeb37d147193d53
Gerrit-Change-Number: 10970
Gerrit-PatchSet: 2
Gerrit-Owner: Holger Freyther 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Holger Freyther 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol