Change in libosmo-sccp[master]: fix memleaks in mtp_user_prim_cb()

[Neels Hofmeyr]

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

Change subject: fix memleaks in mtp_user_prim_cb()
..


Patch Set 1:

NOTE: I AM NOT 100% SURE ABOUT THIS ONE. Please look closely whether I missed 
something; am not sure how to test for this.


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

Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I72b3c6a6f57ba32d9ba191af33b4b236492174e0
Gerrit-Change-Number: 9957
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Comment-Date: Wed, 11 Jul 2018 03:24:53 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in libosmo-sccp[master]: fix memleak in m3ua_rx_xfer()

[Neels Hofmeyr]

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

Change subject: fix memleak in m3ua_rx_xfer()
..


Patch Set 1:

NOTE: I AM NOT 100% SURE ABOUT THIS ONE. Please look closely whether I missed 
something; am not sure how to test for this.


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

Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I6211c8809eefeb94289c4c497553561b043ee619
Gerrit-Change-Number: 9958
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Comment-Date: Wed, 11 Jul 2018 03:25:05 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in libosmo-sccp[master]: fix memleak in m3ua_rx_xfer()

[Neels Hofmeyr]

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


Change subject: fix memleak in m3ua_rx_xfer()
..

fix memleak in m3ua_rx_xfer()

Change-Id: I6211c8809eefeb94289c4c497553561b043ee619
---
M src/m3ua.c
1 file changed, 4 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/58/9958/1

diff --git a/src/m3ua.c b/src/m3ua.c
index f1fe3f1..06ccd6e 100644
--- a/src/m3ua.c
+++ b/src/m3ua.c
@@ -534,6 +534,7 @@

 static int m3ua_rx_xfer(struct osmo_ss7_asp *asp, struct xua_msg *xua)
 {
+   int rc;
uint32_t rctx = xua_msg_get_u32(xua, M3UA_IEI_ROUTE_CTX);
struct m3ua_data_hdr *dh;
struct osmo_ss7_as *as;
@@ -583,7 +584,9 @@
 * routing context on the outbound side */
xua_msg_free_tag(xua, M3UA_IEI_ROUTE_CTX);

-   return m3ua_hmdc_rx_from_l2(asp->inst, xua);
+   rc = m3ua_hmdc_rx_from_l2(asp->inst, xua);
+   xua_msg_free(xua);
+   return rc;
 }

 static int m3ua_rx_mgmt_err(struct osmo_ss7_asp *asp, struct xua_msg *xua)

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

Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6211c8809eefeb94289c4c497553561b043ee619
Gerrit-Change-Number: 9958
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 

Change in libosmo-sccp[master]: fix memleaks in mtp_user_prim_cb()

[Neels Hofmeyr]

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


Change subject: fix memleaks in mtp_user_prim_cb()
..

fix memleaks in mtp_user_prim_cb()

After dispatching to scrc_rx_mtp_xfer_ind_xua(), free the xua_msg.

Do not free the xua_msg in any of the code paths triggered within
scrc_rx_mtp_xfer_ind_xua(), i.e. remove xua_msg_free() from:
sccp_scoc_rx_from_scrc()
 +->sccp_scoc_rx_unass_local_ref()
 +->tx_coerr_from_xua()
 +->tx_relco_from_xua()

Before this, some code paths would free the xua_msg, while most code paths
would not, causing mem leaks.

Change-Id: I72b3c6a6f57ba32d9ba191af33b4b236492174e0
---
M src/sccp_scoc.c
M src/sccp_user.c
2 files changed, 1 insertion(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/57/9957/1

diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c
index 3de986d..d7e1d08 100644
--- a/src/sccp_scoc.c
+++ b/src/sccp_scoc.c
@@ -1316,7 +1316,6 @@

/* sent to SCRC for transmission */
sccp_scrc_rx_scoc_conn_msg(inst, xua);
-   xua_msg_free(xua);
 }

 /* Generate a RELCO based in input arguments */
@@ -1354,7 +1353,6 @@

/* send to SCRC for transmission */
sccp_scrc_rx_scoc_conn_msg(inst, xua);
-   xua_msg_free(xua);
 }

 /* Generate a RLSD based in input arguments */
diff --git a/src/sccp_user.c b/src/sccp_user.c
index 99ed96e..ab9cb64 100644
--- a/src/sccp_user.c
+++ b/src/sccp_user.c
@@ -174,6 +174,7 @@
xua->mtp = omp->u.transfer;
/* hand this primitive into SCCP via the SCRC code */
rc = scrc_rx_mtp_xfer_ind_xua(inst, xua);
+   xua_msg_free(xua);
break;
default:
LOGP(DLSCCP, LOGL_ERROR, "Unknown primitive %u:%u receivd\n",

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

Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I72b3c6a6f57ba32d9ba191af33b4b236492174e0
Gerrit-Change-Number: 9957
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 

Change in libosmo-sccp[master]: fix two memleaks in ipa_rx_msg_sccp()

[Neels Hofmeyr]

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


Change subject: fix two memleaks in ipa_rx_msg_sccp()
..

fix two memleaks in ipa_rx_msg_sccp()

1: Do not call xua_msg_alloc() which is later bluntly overwritten by
m3ua_xfer_from_data().

2: After dispatching to m3ua_hmdc_rx_from_l2(), call xua_msg_free().

Related: OS#3393
Change-Id: I0918f9bbc15b036619f1c25a133b69819b2a30fa
---
M src/ipa.c
1 file changed, 5 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/56/9956/1

diff --git a/src/ipa.c b/src/ipa.c
index e15b1d8..f3a7a52 100644
--- a/src/ipa.c
+++ b/src/ipa.c
@@ -202,8 +202,9 @@

 static int ipa_rx_msg_sccp(struct osmo_ss7_asp *asp, struct msgb *msg)
 {
+   int rc;
struct m3ua_data_hdr data_hdr;
-   struct xua_msg *xua = xua_msg_alloc();
+   struct xua_msg *xua;
struct osmo_ss7_as *as = find_as_for_asp(asp);
uint32_t opc, dpc;

@@ -263,7 +264,9 @@
m3ua_dh_to_xfer_param(>mtp, _hdr);

/* Pass on as if we had received it from an M3UA ASP */
-   return m3ua_hmdc_rx_from_l2(asp->inst, xua);
+   rc = m3ua_hmdc_rx_from_l2(asp->inst, xua);
+   xua_msg_free(xua);
+   return rc;
 }

 /*! \brief process M3UA message received from socket

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

Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0918f9bbc15b036619f1c25a133b69819b2a30fa
Gerrit-Change-Number: 9956
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 

Change in osmo-bsc[master]: call osmo_xua_msg_tall_ctx_init()

[Neels Hofmeyr]

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


Change subject: call osmo_xua_msg_tall_ctx_init()
..

call osmo_xua_msg_tall_ctx_init()

xua_msg allocations should not go unnoticed by our root ctx. libosmo-sigtran
recently added this API to fix that.

Depends: I618878680a096a7f7fc2d83098590f2e4cb08870 (libosmo-sccp)
Change-Id: I8d5edda17be82e0cb4a1af3e2a62cbcb3a2ddda3
---
M src/osmo-bsc/osmo_bsc_main.c
1 file changed, 3 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/55/9955/1

diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c
index 622070b..65e82f5 100644
--- a/src/osmo-bsc/osmo_bsc_main.c
+++ b/src/osmo-bsc/osmo_bsc_main.c
@@ -56,6 +56,8 @@

 #include 
 
+#include 
+
 #define _GNU_SOURCE
 #include 

@@ -774,6 +776,7 @@

tall_bsc_ctx = talloc_named_const(NULL, 1, "osmo-bsc");
msgb_talloc_ctx_init(tall_bsc_ctx, 0);
+   osmo_xua_msg_tall_ctx_init(tall_bsc_ctx);
vty_info.tall_ctx = tall_bsc_ctx;

tall_paging_ctx = talloc_named_const(tall_bsc_ctx, 0, "paging_request");

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

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d5edda17be82e0cb4a1af3e2a62cbcb3a2ddda3
Gerrit-Change-Number: 9955
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 

Change in osmo-bsc[master]: cosmetic: name osmo-bsc's root ctx 'osmo-bsc', not 'openbsc'

[Neels Hofmeyr]

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


Change subject: cosmetic: name osmo-bsc's root ctx 'osmo-bsc', not 'openbsc'
..

cosmetic: name osmo-bsc's root ctx 'osmo-bsc', not 'openbsc'

Change-Id: Ie038bbed436069e7849ba78c3c77c80a68bc3dad
---
M src/osmo-bsc/osmo_bsc_main.c
1 file changed, 1 insertion(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/9954/1

diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c
index 9ee5147..622070b 100644
--- a/src/osmo-bsc/osmo_bsc_main.c
+++ b/src/osmo-bsc/osmo_bsc_main.c
@@ -772,7 +772,7 @@
struct osmo_bsc_data *data;
int rc;

-   tall_bsc_ctx = talloc_named_const(NULL, 1, "openbsc");
+   tall_bsc_ctx = talloc_named_const(NULL, 1, "osmo-bsc");
msgb_talloc_ctx_init(tall_bsc_ctx, 0);
vty_info.tall_ctx = tall_bsc_ctx;


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

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie038bbed436069e7849ba78c3c77c80a68bc3dad
Gerrit-Change-Number: 9954
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 

Change in libosmo-sccp[master]: add osmo_xua_msg_tall_ctx_init()

[Neels Hofmeyr]

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


Change subject: add osmo_xua_msg_tall_ctx_init()
..

add osmo_xua_msg_tall_ctx_init()

So far the tall_xua ctx used to allocate from in xua_msg_alloc() was never
initialized, actually hiding memory leaks from the talloc report.
Add this API to allow branching the xua_msg ctx off a sane root ctx.

Explicitly initialize tall_xua to NULL, so that, if xua_msg_ctx_init() isn't
called, tall_xua is still guaranteed to not be a random pointer.

The convention should actually be that only libosmocore exposes API with the
osmo_ prefix, but libosmo-sigtran explicitly exposes only symbols starting with
osmo_, forcing me to use this prefix.

osmo-bsc will use this function to hook the tall_xua ctx to osmo-bsc's own root
ctx.

Change-Id: I618878680a096a7f7fc2d83098590f2e4cb08870
---
M include/osmocom/sigtran/xua_msg.h
M src/xua_msg.c
2 files changed, 9 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/53/9953/1

diff --git a/include/osmocom/sigtran/xua_msg.h 
b/include/osmocom/sigtran/xua_msg.h
index 423adbc..e912e02 100644
--- a/include/osmocom/sigtran/xua_msg.h
+++ b/include/osmocom/sigtran/xua_msg.h
@@ -69,6 +69,8 @@
 extern const struct xua_dialect xua_dialect_sua;
 extern const struct xua_dialect xua_dialect_m3ua;

+void osmo_xua_msg_tall_ctx_init(void *ctx);
+
 struct xua_msg *xua_msg_alloc(void);
 void xua_msg_free(struct xua_msg *msg);

diff --git a/src/xua_msg.c b/src/xua_msg.c
index d56009f..ed0cdc7 100644
--- a/src/xua_msg.c
+++ b/src/xua_msg.c
@@ -33,7 +33,13 @@
 #include 
 #include 

-static void *tall_xua;
+static void *tall_xua = NULL;
+
+/* Allocate the root talloc context used for xua_msg_alloc(). */
+void osmo_xua_msg_tall_ctx_init(void *ctx)
+{
+   tall_xua = talloc_named_const(ctx, 0, "xua_msg");
+}

 struct xua_msg *xua_msg_alloc(void)
 {

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

Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I618878680a096a7f7fc2d83098590f2e4cb08870
Gerrit-Change-Number: 9953
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 

Change in libosmo-sccp[master]: cosmetic: sccp2sua.c: log the IEI for parsed SCCP addr

[Neels Hofmeyr]

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


Change subject: cosmetic: sccp2sua.c: log the IEI for parsed SCCP addr
..

cosmetic: sccp2sua.c: log the IEI for parsed SCCP addr

Before this, the log looked like it parsed the same address twice with
differing results:

  DLSUA DEBUG sccp2sua.c:333 Parsed Addr: RI=2,PC=1196,SSN=254
  DLSUA DEBUG sccp2sua.c:333 Parsed Addr: RI=2,PC=100,SSN=254

Adding the IEI clarifies this:

  DLSUA DEBUG sccp2sua.c:333 IEI 259: Parsed Addr: RI=2,PC=1196,SSN=254
  DLSUA DEBUG sccp2sua.c:333 IEI 258: Parsed Addr: RI=2,PC=100,SSN=254

(I'd have liked to print the IEI name from sua_iei_names, but I frankly can't
figure out how to reach that value_string array "hidden" behind a xua_msg_class
struct, and neither can I find any other code doing so.)

Change-Id: I64adb31129684b2eb66fff581040017ce2f6d163
---
M src/sccp2sua.c
1 file changed, 1 insertion(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/52/9952/1

diff --git a/src/sccp2sua.c b/src/sccp2sua.c
index afc38c7..2f5b687 100644
--- a/src/sccp2sua.c
+++ b/src/sccp2sua.c
@@ -330,7 +330,7 @@
if (rc < 0)
return rc;

-   LOGP(DLSUA, LOGL_DEBUG, "Parsed Addr: %s\n", osmo_sccp_addr_dump());
+   LOGP(DLSUA, LOGL_DEBUG, "IEI %u: Parsed Addr: %s\n", iei, 
osmo_sccp_addr_dump());

/* Then re-encode it as SUA address */
return xua_msg_add_sccp_addr(xua, iei, );

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

Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I64adb31129684b2eb66fff581040017ce2f6d163
Gerrit-Change-Number: 9952
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 

Change in libosmo-sccp[master]: fix memleak in ipa_rx_msg_sccp

[Neels Hofmeyr]

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


Change subject: fix memleak in ipa_rx_msg_sccp
..

fix memleak in ipa_rx_msg_sccp

After m3ua_xfer_from_data() has copied the msgb data, we need to free the msgb.

Change-Id: I2263751c0aa3ae32455847c7622af8be0a1e7802
---
M src/ipa.c
1 file changed, 1 insertion(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/51/9951/1

diff --git a/src/ipa.c b/src/ipa.c
index 0e6f683..e15b1d8 100644
--- a/src/ipa.c
+++ b/src/ipa.c
@@ -258,6 +258,7 @@
data_hdr.dpc = osmo_htonl(dpc);
/* Create M3UA message in XUA structure */
xua = m3ua_xfer_from_data(_hdr, msgb_l2(msg), msgb_l2len(msg));
+   msgb_free(msg);
/* Update xua->mtp with values from data_hdr */
m3ua_dh_to_xfer_param(>mtp, _hdr);


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

Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2263751c0aa3ae32455847c7622af8be0a1e7802
Gerrit-Change-Number: 9951
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 

Change in osmo-ttcn3-hacks[master]: sgsn: Add test to verify restart_ctr during echo req/reply.

[Pau Espin Pedrol]

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


Change subject: sgsn: Add test to verify restart_ctr during echo req/reply.
..

sgsn: Add test to verify restart_ctr during echo req/reply.

Currently test doesn't fully work because it doesn't match the PDP CTX
DEL REQ correctly.

Change-Id: I1dcb250dba2079c14b857c0b89a02ac21d1c591f
---
M sgsn/SGSN_Tests.ttcn
1 file changed, 59 insertions(+), 0 deletions(-)



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

diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index 017c724..8c3d8de 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -64,6 +64,7 @@
port TELNETasp_PT SGSNVTY;

var boolean g_initialized := false;
+   var boolean g_use_echo := false;
 };

 type component BSSGP_ConnHdlr extends BSSGP_Client_CT, GSUP_ConnHdlr, 
GTP_ConnHdlr {
@@ -160,6 +161,14 @@
f_vty_config(SGSNVTY, "sgsn", "auth-policy remote");
 }

+private function f_vty_enable_echo_interval(boolean enable) runs on test_CT {
+   if (enable) {
+   f_vty_config(SGSNVTY, "sgsn", "ggsn 0 echo-interval 5");
+   } else {
+   f_vty_config(SGSNVTY, "sgsn", "ggsn 0 no echo-interval");
+   }
+}
+

 function f_init(BcdMccMnc mcc_mnc := '26242F'H) runs on test_CT {
if (g_initialized == true) {
@@ -184,6 +193,7 @@
f_init_gsup("SGSN_Test");
f_init_gtp("SGSN_Test");
f_init_vty();
+   f_vty_enable_echo_interval(g_use_echo);
 }

 type function void_fn(charstring id) runs on BSSGP_ConnHdlr;
@@ -874,6 +884,7 @@
OCT4ggsn_tei_u, /* GGSN TEI 
User */
octetstring ggsn_ip_c,  /* GGSN IP 
Control */
octetstring ggsn_ip_u,  /* GGSN IP User 
*/
+   OCT1ggsn_restart_ctr,   /* GGSN Restart 
Counter */

OCT4sgsn_tei_c optional,/* SGSN TEI 
Control */
OCT4sgsn_tei_u optional,/* SGSN TEI 
User */
@@ -1025,6 +1036,7 @@
ggsn_tei_u := f_rnd_octstring(4),
ggsn_ip_c := f_inet_addr(ggsn_ip),
ggsn_ip_u := f_inet_addr(ggsn_ip),
+   ggsn_restart_ctr := int2oct(2, 1),

sgsn_tei_c := omit,
sgsn_tei_u := omit,
@@ -1251,6 +1263,52 @@
vc_conn.done;
 }

+private function f_TC_attach_restart_ctr_dettach(charstring id) runs on 
BSSGP_ConnHdlr {
+   var Gtp1cUnitdata g_ud;
+   var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip));
+
+   /* first perform regular attach */
+   f_TC_attach(id);
+   /* Activate a pdp context against the  GGSN */
+   f_pdp_ctx_act(apars);
+   /* Wait to receive first echo request and send initial Restart counter 
*/
+   log("PESPIN: before 1st GTAP receive");
+   GTP.receive(tr_GTPC_MsgType(?, echoRequest, ?)) -> value g_ud {
+   log("PESPIN: inside 1st GTAP receive");
+   var integer seq_nr := 
oct2int(g_ud.gtpc.opt_part.sequenceNumber);
+   GTP.send(ts_GTPC_PONG(g_ud.peer, seq_nr, 
apars.ggsn_restart_ctr));
+   }
+   log("PESPIN: after 1st GTAP receive");
+   /* Wait to receive second echo request and send incremented Restart
+  counter. This will fake a restarted GGSN, and pdp ctx allocated
+  should be released by SGSN */
+   apars.ggsn_restart_ctr := int2oct(oct2int(apars.ggsn_restart_ctr) + 1, 
1);
+   GTP.receive(tr_GTPC_MsgType(?, echoRequest, ?)) -> value g_ud {
+   log("PESPIN: inside 2nd GTAP receive");
+   var integer seq_nr := 
oct2int(g_ud.gtpc.opt_part.sequenceNumber);
+   GTP.send(ts_GTPC_PONG(g_ud.peer, seq_nr, 
apars.ggsn_restart_ctr));
+   }
+   log("PESPIN: waiting for PDP DEACT on tid ", apars.tid);
+   var OCT1 cause_network_failure := int2oct(38, 1)
+   alt {
+   [] BSSGP.receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?))) {
+   log("PESPIN: received PDP DEACT");
+   BSSGP.send(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid));
+   setverdict(pass);
+   }
+   [] as_xid(apars);
+   }
+   log("PESPIN: DONE SUCCESS");
+}
+testcase TC_attach_restart_ctr_dettach() runs on test_CT {
+   var BSSGP_ConnHdlr vc_conn;
+   g_use_echo := true
+   f_init();
+   vc_conn := f_start_handler(refers(f_TC_attach_restart_ctr_dettach), 
testcasename(), g_gb[0], 17, 30.0);
+   vc_conn.done;
+   g_use_echo := false
+}
+
 private function f_TC_hlr_location_cancel_request_update(charstring id) runs 
on BSSGP_ConnHdlr {
/* MS: perform regular attach */
f_TC_attach(id);
@@ -1625,6 +1683,7 @@
execute( TC_attach_pdp_act_user_deact_mo() );
execute( TC_attach_pdp_act_user_deact_mt() );

Change in osmo-ttcn3-hacks[master]: lib: GTP_Emulation: Allow receiving packets with TEID 0

[Pau Espin Pedrol]

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


Change subject: lib: GTP_Emulation: Allow receiving packets with TEID 0
..

lib: GTP_Emulation: Allow receiving packets with TEID 0

Some GTP messages like Echo Request, Echo Reply and Ind Error don't use
the TEID value. According to 3GPP TS 29.060 sec 9.3.1 in those cases the TEID is
set to 0:

"""
- TEID: Contains the Tunnel Endpoint Identifier for the tunnel to which this 
T-PDU belongs. The TEID shall be
used by the receiving entity to find the PDP context, except for the following 
cases:
- The Echo Request/Response and Supported Extension Headers notification 
messages, where the Tunnel
Endpoint Identifier shall be set to all zeroes.
- The Error Indication message where the Tunnel Endpoint Identifier shall be 
set to all zeros.
"""

Change-Id: Ic702b78028e850ed961ef805f35e10a42da34e56
---
M library/GTP_Emulation.ttcn
1 file changed, 11 insertions(+), 2 deletions(-)



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

diff --git a/library/GTP_Emulation.ttcn b/library/GTP_Emulation.ttcn
index 534fdef..615309a 100644
--- a/library/GTP_Emulation.ttcn
+++ b/library/GTP_Emulation.ttcn
@@ -185,10 +185,19 @@
var template hexstring imsi_t := 
f_gtpc_extract_imsi(g1c_ud.gtpc);
if (isvalue(imsi_t)) {
vc_conn := f_comp_by_imsi(valueof(imsi_t));
-   } else {
+   CLIENT.send(g1c_ud) to vc_conn;
+   } else if(g1c_ud.gtpc.teid != int2oct(0, 4)) {
vc_conn := f_comp_by_teid(g1c_ud.gtpc.teid);
+   CLIENT.send(g1c_ud) to vc_conn;
+   } else {
+   /* Send to all clients */
+   var integer i;
+   for (i := 0; i < sizeof(TidTable); i := i+1) {
+   if (isbound(TidTable[i].teid) and 
TidTable[i].teid == teid) {
+   CLIENT.send(g1c_ud) to 
TidTable[i].vc_conn;
+   }
+   }
}
-   CLIENT.send(g1c_ud) to vc_conn;
}
[] GTPU.receive(Gtp1uUnitdata:?) -> value g1u_ud {
vc_conn := f_comp_by_teid(g1u_ud.gtpu.teid);

--
To view, visit https://gerrit.osmocom.org/9949
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: Ic702b78028e850ed961ef805f35e10a42da34e56
Gerrit-Change-Number: 9949
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in osmo-sgsn[master]: vty: Add cmd to disable echo loop explictly

[Pau Espin Pedrol]

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


Change subject: vty: Add cmd to disable echo loop explictly
..

vty: Add cmd to disable echo loop explictly

Change-Id: I0598427257533ce8ae9e9afa787293d7c98fed15
---
M src/gprs/sgsn_vty.c
1 file changed, 17 insertions(+), 0 deletions(-)



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

diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c
index 9f9332c..8092158 100644
--- a/src/gprs/sgsn_vty.c
+++ b/src/gprs/sgsn_vty.c
@@ -185,6 +185,9 @@
if (gctx->echo_interval != -1)
vty_out(vty, " ggsn %u echo-interval %"PRId32"%s",
gctx->id, gctx->echo_interval, VTY_NEWLINE);
+   else
+   vty_out(vty, " ggsn %u no echo-interval%s",
+   gctx->id, VTY_NEWLINE);
}

if (sgsn->cfg.dynamic_lookup)
@@ -380,6 +383,19 @@
return CMD_SUCCESS;
 }

+DEFUN(cfg_ggsn_no_echo_interval, cfg_ggsn_no_echo_interval_cmd,
+   "ggsn <0-255> no echo-interval",
+   GGSN_STR "GGSN Number\n"
+   NO_STR "Send an echo request to this static GGSN every interval.\n")
+{
+   uint32_t id = atoi(argv[0]);
+   struct sgsn_ggsn_ctx *ggc = sgsn_ggsn_ctx_find_alloc(id);
+
+   ggc->echo_interval = -1;
+
+   return CMD_SUCCESS;
+}
+
 DEFUN(cfg_ggsn_dynamic_lookup, cfg_ggsn_dynamic_lookup_cmd,
"ggsn dynamic",
GGSN_STR
@@ -1302,6 +1318,7 @@
//install_element(SGSN_NODE, _ggsn_remote_port_cmd);
install_element(SGSN_NODE, _ggsn_gtp_version_cmd);
install_element(SGSN_NODE, _ggsn_echo_interval_cmd);
+   install_element(SGSN_NODE, _ggsn_no_echo_interval_cmd);
install_element(SGSN_NODE, _imsi_acl_cmd);
install_element(SGSN_NODE, _auth_policy_cmd);
install_element(SGSN_NODE, _encrypt_cmd);

--
To view, visit https://gerrit.osmocom.org/9948
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: I0598427257533ce8ae9e9afa787293d7c98fed15
Gerrit-Change-Number: 9948
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

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

[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 pysim[master]: tests: add test program to verify pysim-prog.py (and pysim-read.py)

[dexter]

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9947


Change subject: tests: add test program to verify pysim-prog.py (and 
pysim-read.py)
..

tests: add test program to verify pysim-prog.py (and pysim-read.py)

Pysim now supports quite a number of different cards. Estimating
if changes in pysim introce regressions becomes increasingly difficult

The script that is added with this patch is intended to run as
atomated testsuit on real cards attached to a test system. However,
it can also be used by developers locally to check for regressions.

Change-Id: I8c6f95998272333bc757b34e3ab6be004e8cd674
Related: OS#3376
---
A tests/fakemagicsim.data.example
A tests/pysim-test.sh
A tests/sysmoUSIM-SJS1.data.example
3 files changed, 234 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/47/9947/1

diff --git a/tests/fakemagicsim.data.example b/tests/fakemagicsim.data.example
new file mode 100644
index 000..deab2f7
--- /dev/null
+++ b/tests/fakemagicsim.data.example
@@ -0,0 +1,6 @@
+MCC=001
+MNC=01
+ICCID=1122334455667788990
+KI=
+OPC=
+IMSI=00101000102
\ No newline at end of file
diff --git a/tests/pysim-test.sh b/tests/pysim-test.sh
new file mode 100755
index 000..0defcad
--- /dev/null
+++ b/tests/pysim-test.sh
@@ -0,0 +1,221 @@
+#!/bin/bash
+
+# Utility to verify the functionality of pysim-prog.py
+#
+# (C) 2018 by Sysmocom s.f.m.c. GmbH
+# All Rights Reserved
+#
+# Author: Philipp Maier
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+PYSIM_PROG=../pySim-prog.py
+PYSIM_READ=../pySim-read.py
+TEMPFILE=temp.tmp
+
+set -e
+
+echo "pysim-test - a test program to test pysim-prog.py"
+echo "="
+
+# Generate a list of the cards we expect to see by checking which .ok files
+# are present
+function gen_card_list {
+N_CARDS=0
+
+echo "Expecting to see the following cards:"
+
+for I in *.data ; do
+   CARD_NAMES[$N_CARDS]=${I%.*}
+   CARD_SEEN[$N_CARDS]=0
+   N_CARDS=$((N_CARDS+1))
+done
+
+for I in $(seq 0 $((N_CARDS-1))); do
+   echo ${CARD_NAMES[$I]}
+done
+}
+
+# Increment counter in card list for a specified card name (type)
+function inc_card_list {
+CARD_NAME=$1
+for I in $(seq 0 $((N_CARDS-1))); do
+   if [ $CARD_NAME = ${CARD_NAMES[$I]} ]; then
+   CARD_SEEN[$I]=$((${CARD_NAMES[$I]}+1))
+   fi
+done
+}
+
+# Check the card list, each card must be seen exactly one times
+function check_card_list {
+for I in $(seq 0 $((N_CARDS-1))); do
+   if [ ${CARD_SEEN[$I]} -ne 1 ]; then
+   echo "Error: Card ${CARD_NAMES[$I]} seen ${CARD_SEEN[$I]} times!"
+   exit 1
+   fi
+done
+
+echo "All cards seen -- everything ok!"
+}
+
+# Verify the contents of a card by reading them and then diffing against the
+# previously created .ok file
+function check_card {
+TERMINAL=$1
+CARD_NAME=$2
+echo "Verifying card ..."
+stat ./$CARD_NAME.ok > /dev/null
+python $PYSIM_READ -p $TERMINAL > $TEMPFILE
+set +e
+CARD_DIFF=$(diff $TEMPFILE ./$CARD_NAME.ok)
+set -e
+
+if [ "$CARD_DIFF" != "" ]; then
+   echo "Card contents do not match the test data:"
+   echo "Expected: $CARD_NAME.ok"
+   echo "8<"
+   cat "$CARD_NAME.ok"
+   echo "8<"
+   echo "Got:"
+   echo "8<"
+   cat $TEMPFILE
+   echo "8<"
+   exit 1
+fi
+
+inc_card_list $CARD_NAME
+
+echo "Card contents match the test data -- success!"
+rm $TEMPFILE
+}
+
+# Read out the card using pysim-read and store the result as .ok file. This
+# data will be used later in order to verify the results of our write tests.
+function gen_ok_file {
+TERMINAL=$1
+CARD_NAME=$2
+python $PYSIM_READ -p $TERMINAL > "$CARD_NAME.ok"
+echo "Generated file: $CARD_NAME.ok"
+echo "8<"
+cat "$CARD_NAME.ok"
+echo "8<"
+}
+
+# Find out the type (card name) of the card that is installed in the specified
+# reader
+function probe_card {
+TERMINAL=$1
+RESULT=$(timeout 5 $PYSIM_PROG -p $TERMINAL -T | cut -d ":" 

Change in osmo-pcu[master]: tbf: Replace '.' in counter names with ':'

[Pau Espin Pedrol]

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

Change subject: tbf: Replace '.' in counter names with ':'
..


Patch Set 1:

Build failure triggered is fixed in next commit, so this one we can Verify+2 
manually and merge.


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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ieb7496e1a30ab4f2bfe36c7b664dcdc034010a15
Gerrit-Change-Number: 9942
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Tue, 10 Jul 2018 14:08:40 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in simtrace2[master]: host sniff: add functions to print flags

[Kévin Redon]

Kévin Redon has uploaded this change for review. ( 
https://gerrit.osmocom.org/9946


Change subject: host sniff: add functions to print flags
..

host sniff: add functions to print flags

Change-Id: If3c0a4790662bcc64db5ff03adcc033836e16ad0
---
M host/simtrace2-sniff.c
1 file changed, 58 insertions(+), 29 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/46/9946/1

diff --git a/host/simtrace2-sniff.c b/host/simtrace2-sniff.c
index d5fe48a..765ced3 100644
--- a/host/simtrace2-sniff.c
+++ b/host/simtrace2-sniff.c
@@ -94,6 +94,58 @@
return 0;
 }

+struct flag_meaning_t {
+   const uint32_t flag;
+   const char* meaning;
+};
+
+const struct flag_meaning_t change_flags[] = {
+   {
+   .flag = SNIFF_CHANGE_FLAG_CARD_INSERT,
+   .meaning = "card inserted",
+   },
+   {
+   .flag = SNIFF_CHANGE_FLAG_CARD_EJECT,
+   .meaning = "card ejected",
+   },
+   {
+   .flag = SNIFF_CHANGE_FLAG_RESET_HOLD,
+   .meaning = "reset hold",
+   },
+   {
+   .flag = SNIFF_CHANGE_FLAG_RESET_RELEASE,
+   .meaning = "reset release",
+   },
+   {
+   .flag = SNIFF_CHANGE_FLAG_TIMEOUT_WT,
+   .meaning = "data transfer timeout",
+   },
+};
+
+const struct flag_meaning_t data_flags[] = {
+   {
+   .flag = SNIFF_DATA_FLAG_ERROR_INCOMPLETE,
+   .meaning = "incomplete",
+   },
+   {
+   .flag = SNIFF_DATA_FLAG_ERROR_MALFORMED,
+   .meaning = "malformed",
+   },
+};
+
+static void print_flags(const struct flag_meaning_t* flag_meanings, uint32_t 
nb_flags, uint32_t flags) {
+   uint32_t i;
+   for (i = 0; i < nb_flags; i++) {
+   if (flags & flag_meanings[i].flag) {
+   printf(flag_meanings[i].meaning);
+   flags &= ~flag_meanings[i].flag;
+   if (flags) {
+   printf(", ");
+   }
+   }
+   }
+}
+
 static int process_change(const uint8_t *buf, int len)
 {
/* check if there is enough data for the structure */
@@ -103,22 +155,12 @@
struct sniff_change *change = (struct sniff_change *)buf;

printf("Card state change: ");
-   if (change->flags_CHANGE_FLAG_CARD_INSERT) {
-   printf("card inserted ");
+   if (change->flags) {
+   print_flags(change_flags, ARRAY_SIZE(change_flags), 
change->flags);
+   printf("\n");
+   } else {
+   printf("no changes\n");
}
-   if (change->flags_CHANGE_FLAG_CARD_EJECT) {
-   printf("card ejected ");
-   }
-   if (change->flags_CHANGE_FLAG_RESET_HOLD) {
-   printf("reset hold ");
-   }
-   if (change->flags_CHANGE_FLAG_RESET_RELEASE) {
-   printf("reset release ");
-   }
-   if (change->flags_CHANGE_FLAG_TIMEOUT_WT) {
-   printf("data transfer timeout ");
-   }
-   printf("\n");

return 0;
 }
@@ -176,20 +218,7 @@
}
if (data->flags) {
printf(" (");
-   if (data->flags & SNIFF_DATA_FLAG_ERROR_INCOMPLETE) {
-   printf("incomplete");
-   data->flags &= ~SNIFF_DATA_FLAG_ERROR_INCOMPLETE;
-   if (data->flags) {
-   printf(", ");
-   }
-   }
-   if (data->flags & SNIFF_DATA_FLAG_ERROR_MALFORMED) {
-   printf("malformed");
-   data->flags &= ~SNIFF_DATA_FLAG_ERROR_MALFORMED;
-   if (data->flags) {
-   printf(", ");
-   }
-   }
+   print_flags(data_flags, ARRAY_SIZE(data_flags), data->flags);
printf(")");
}
printf(": ");

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

Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: If3c0a4790662bcc64db5ff03adcc033836e16ad0
Gerrit-Change-Number: 9946
Gerrit-PatchSet: 1
Gerrit-Owner: Kévin Redon 

Change in simtrace2[master]: sniffer: fix inverted reset meaning

[Kévin Redon]

Kévin Redon has uploaded this change for review. ( 
https://gerrit.osmocom.org/9944


Change subject: sniffer: fix inverted reset meaning
..

sniffer: fix inverted reset meaning

Change-Id: I860e2e29c059e1e0ec126695bb68d489891a17da
---
M firmware/libcommon/source/sniffer.c
1 file changed, 7 insertions(+), 7 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/44/9944/1

diff --git a/firmware/libcommon/source/sniffer.c 
b/firmware/libcommon/source/sniffer.c
index 0ca71a5..c58b047 100644
--- a/firmware/libcommon/source/sniffer.c
+++ b/firmware/libcommon/source/sniffer.c
@@ -832,11 +832,11 @@
TRACE_ERROR("Pin other than reset caused a interrupt\n\r");
return;
}
-   /* Update the ISO state according to the reset change */
+   /* Update the ISO state according to the reset change (reset is active 
low) */
if (PIO_Get(_rst)) {
-   change_flags |= SNIFF_CHANGE_FLAG_RESET_HOLD; /* set flag and 
let main loop send it */
-   } else {
change_flags |= SNIFF_CHANGE_FLAG_RESET_RELEASE; /* set flag 
and let main loop send it */
+   } else {
+   change_flags |= SNIFF_CHANGE_FLAG_RESET_HOLD; /* set flag and 
let main loop send it */
}
 }

@@ -1011,13 +1011,13 @@
/* Handle flags */
if (change_flags) { /* WARNING this is not synced with the data buffer 
handling */
if (change_flags & SNIFF_CHANGE_FLAG_RESET_HOLD) {
-   if (ISO7816_S_WAIT_ATR != iso_state) {
-   change_state(ISO7816_S_WAIT_ATR);
+   if (ISO7816_S_RESET != iso_state) {
+   change_state(ISO7816_S_RESET);
}
}
if (change_flags & SNIFF_CHANGE_FLAG_RESET_RELEASE) {
-   if (ISO7816_S_RESET != iso_state) {
-   change_state(ISO7816_S_RESET);
+   if (ISO7816_S_WAIT_ATR != iso_state) {
+   change_state(ISO7816_S_WAIT_ATR);
}
}
if (change_flags & SNIFF_CHANGE_FLAG_TIMEOUT_WT) {

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

Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I860e2e29c059e1e0ec126695bb68d489891a17da
Gerrit-Change-Number: 9944
Gerrit-PatchSet: 1
Gerrit-Owner: Kévin Redon 

Change in simtrace2[master]: host sniff: process remaining usb messages in buffer

[Kévin Redon]

Kévin Redon has uploaded this change for review. ( 
https://gerrit.osmocom.org/9945


Change subject: host sniff: process remaining usb messages in buffer
..

host sniff: process remaining usb messages in buffer

Change-Id: I1746c0187b2e5dbef44b4b336fee3bd9ded15079
---
M host/simtrace2-sniff.c
1 file changed, 6 insertions(+), 3 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/45/9945/1

diff --git a/host/simtrace2-sniff.c b/host/simtrace2-sniff.c
index eb547b0..d5fe48a 100644
--- a/host/simtrace2-sniff.c
+++ b/host/simtrace2-sniff.c
@@ -276,12 +276,15 @@
if (xfer_len > 0) {
//printf("URB: %s\n", osmo_hexdump([buf_i], 
xfer_len));
buf_i += xfer_len;
-   if (buf_i>=sizeof(buf)) {
+   if (buf_i >= sizeof(buf)) {
perror("preventing USB buffer overflow");
return;
}
-   int processed = process_usb_msg(buf, buf_i);
-   if (processed > 0 && processed <= buf_i) {
+   int processed;
+   while ((processed = process_usb_msg(buf, buf_i)) > 0) {
+   if (processed > buf_i) {
+   break;
+   }
for (i = processed; i < buf_i; i++) {
buf[i-processed] = buf[i];
}

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

Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1746c0187b2e5dbef44b4b336fee3bd9ded15079
Gerrit-Change-Number: 9945
Gerrit-PatchSet: 1
Gerrit-Owner: Kévin Redon 

Change in osmo-pcu[master]: tbf: Replace '.' in counter names with ':'

[Pau Espin Pedrol]

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


Change subject: tbf: Replace '.' in counter names with ':'
..

tbf: Replace '.' in counter names with ':'

The '.' is illegal character in counter names, as they are exported
via CTRL interface, where '.' has a special meaning that cannot be
used by strings comprising the variable name.

Change-Id: Ieb7496e1a30ab4f2bfe36c7b664dcdc034010a15
---
M src/tbf.cpp
1 file changed, 32 insertions(+), 32 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/42/9942/1

diff --git a/src/tbf.cpp b/src/tbf.cpp
index 76137df..71057db 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -98,49 +98,49 @@
 };

 static const struct rate_ctr_desc tbf_ctr_description[] = {
-{ "rlc.nacked", "RLC Nacked " },
+{ "rlc:nacked", "RLC Nacked " },
 };

 static const struct rate_ctr_desc tbf_dl_gprs_ctr_description[] = {
-{ "gprs.downlink.cs1",  "CS1" },
-{ "gprs.downlink.cs2",  "CS2" },
-{ "gprs.downlink.cs3",  "CS3" },
-{ "gprs.downlink.cs4",  "CS4" },
+{ "gprs:downlink:cs1",  "CS1" },
+{ "gprs:downlink:cs2",  "CS2" },
+{ "gprs:downlink:cs3",  "CS3" },
+{ "gprs:downlink:cs4",  "CS4" },
 };

 static const struct rate_ctr_desc tbf_dl_egprs_ctr_description[] = {
-{ "egprs.downlink.mcs1","MCS1" },
-{ "egprs.downlink.mcs2","MCS2" },
-{ "egprs.downlink.mcs3","MCS3" },
-{ "egprs.downlink.mcs4","MCS4" },
-{ "egprs.downlink.mcs5","MCS5" },
-{ "egprs.downlink.mcs6","MCS6" },
-{ "egprs.downlink.mcs7","MCS7" },
-{ "egprs.downlink.mcs8","MCS8" },
-{ "egprs.downlink.mcs9","MCS9" },
+{ "egprs:downlink:mcs1","MCS1" },
+{ "egprs:downlink:mcs2","MCS2" },
+{ "egprs:downlink:mcs3","MCS3" },
+{ "egprs:downlink:mcs4","MCS4" },
+{ "egprs:downlink:mcs5","MCS5" },
+{ "egprs:downlink:mcs6","MCS6" },
+{ "egprs:downlink:mcs7","MCS7" },
+{ "egprs:downlink:mcs8","MCS8" },
+{ "egprs:downlink:mcs9","MCS9" },
 };

 static const struct rate_ctr_desc tbf_ul_gprs_ctr_description[] = {
-{ "gprs.uplink.cs1",  "CS1" },
-{ "gprs.uplink.cs2",  "CS2" },
-{ "gprs.uplink.cs3",  "CS3" },
-{ "gprs.uplink.cs4",  "CS4" },
+{ "gprs:uplink:cs1",  "CS1" },
+{ "gprs:uplink:cs2",  "CS2" },
+{ "gprs:uplink:cs3",  "CS3" },
+{ "gprs:uplink:cs4",  "CS4" },
 };

 static const struct rate_ctr_desc tbf_ul_egprs_ctr_description[] = {
-{ "egprs.uplink.mcs1","MCS1" },
-{ "egprs.uplink.mcs2","MCS2" },
-{ "egprs.uplink.mcs3","MCS3" },
-{ "egprs.uplink.mcs4","MCS4" },
-{ "egprs.uplink.mcs5","MCS5" },
-{ "egprs.uplink.mcs6","MCS6" },
-{ "egprs.uplink.mcs7","MCS7" },
-{ "egprs.uplink.mcs8","MCS8" },
-{ "egprs.uplink.mcs9","MCS9" },
+{ "egprs:uplink:mcs1","MCS1" },
+{ "egprs:uplink:mcs2","MCS2" },
+{ "egprs:uplink:mcs3","MCS3" },
+{ "egprs:uplink:mcs4","MCS4" },
+{ "egprs:uplink:mcs5","MCS5" },
+{ "egprs:uplink:mcs6","MCS6" },
+{ "egprs:uplink:mcs7","MCS7" },
+{ "egprs:uplink:mcs8","MCS8" },
+{ "egprs:uplink:mcs9","MCS9" },
 };

 static const struct rate_ctr_group_desc tbf_ctrg_desc = {
-"pcu.tbf",
+"pcu:tbf",
 "TBF Statistics",
 OSMO_STATS_CLASS_SUBSCRIBER,
 ARRAY_SIZE(tbf_ctr_description),
@@ -148,7 +148,7 @@
 };

 static const struct rate_ctr_group_desc tbf_dl_gprs_ctrg_desc = {
-"tbf.gprs",
+"tbf:gprs",
 "Data Blocks",
 OSMO_STATS_CLASS_SUBSCRIBER,
 ARRAY_SIZE(tbf_dl_gprs_ctr_description),
@@ -156,7 +156,7 @@
 };

 static const struct rate_ctr_group_desc 

Change in osmo-pcu[master]: tbf: Use incrementing id for rate_ctr_group_alloc

[Pau Espin Pedrol]

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


Change subject: tbf: Use incrementing id for rate_ctr_group_alloc
..

tbf: Use incrementing id for rate_ctr_group_alloc

Wrap-around of var handling next id will luckly happen
long after initially assigned TBFs are already released.

Change-Id: I90ef64133986c556c1a529f5b966e847e6cabbad
---
M src/tbf.cpp
1 file changed, 18 insertions(+), 8 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/43/9943/1

diff --git a/src/tbf.cpp b/src/tbf.cpp
index 71057db..6792d08 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -51,6 +51,8 @@

 extern void *tall_pcu_ctx;

+static unsigned int next_tbf_ctr_group_id = 0; /* Incrementing group id */
+
 static void tbf_timer_cb(void *_tbf);

 const struct value_string gprs_rlcmac_tbf_poll_state_names[] = {
@@ -922,7 +924,7 @@
"Allocated: trx = %d, ul_slots = %02x, dl_slots = %02x\n",
tbf->trx->trx_no, tbf->ul_slots(), tbf->dl_slots());

-   tbf->m_ctrs = rate_ctr_group_alloc(tbf, _ctrg_desc, 0);
+   tbf->m_ctrs = rate_ctr_group_alloc(tbf, _ctrg_desc, 
next_tbf_ctr_group_id++);
if (!tbf->m_ctrs) {
LOGPTBF(tbf, LOGL_ERROR, "Couldn't allocate TBF counters\n");
return -1;
@@ -1005,8 +1007,10 @@
return NULL;
}

-   tbf->m_ul_egprs_ctrs = rate_ctr_group_alloc(tbf, 
_ul_egprs_ctrg_desc, 0);
-   tbf->m_ul_gprs_ctrs = rate_ctr_group_alloc(tbf, _ul_gprs_ctrg_desc, 
0);
+   tbf->m_ul_egprs_ctrs = rate_ctr_group_alloc(tbf,
+   _ul_egprs_ctrg_desc, 
tbf->m_ctrs->idx);
+   tbf->m_ul_gprs_ctrs = rate_ctr_group_alloc(tbf,
+   _ul_gprs_ctrg_desc, 
tbf->m_ctrs->idx);
if (!tbf->m_ul_egprs_ctrs || !tbf->m_ul_gprs_ctrs) {
LOGPTBF(tbf, LOGL_ERROR, "Couldn't allocate TBF UL counters\n");
talloc_free(tbf);
@@ -1094,14 +1098,18 @@

if (tbf->is_egprs_enabled()) {
tbf->set_window_size();
-   tbf->m_dl_egprs_ctrs = rate_ctr_group_alloc(tbf, 
_dl_egprs_ctrg_desc, 0);
+   tbf->m_dl_egprs_ctrs = rate_ctr_group_alloc(tbf,
+   _dl_egprs_ctrg_desc,
+   tbf->m_ctrs->idx);
if (!tbf->m_dl_egprs_ctrs) {
LOGPTBF(tbf, LOGL_ERROR, "Couldn't allocate EGPRS DL 
counters\n");
talloc_free(tbf);
return NULL;
}
} else {
-   tbf->m_dl_gprs_ctrs = rate_ctr_group_alloc(tbf, 
_dl_gprs_ctrg_desc, 0);
+   tbf->m_dl_gprs_ctrs = rate_ctr_group_alloc(tbf,
+   _dl_gprs_ctrg_desc,
+   tbf->m_ctrs->idx);
if (!tbf->m_dl_gprs_ctrs) {
LOGPTBF(tbf, LOGL_ERROR, "Couldn't allocate GPRS DL 
counters\n");
talloc_free(tbf);
@@ -1569,11 +1577,13 @@
TBF_SET_ASS_STATE_UL(ul_tbf, GPRS_RLCMAC_UL_ASS_SEND_ASS_REJ);
ul_tbf->control_ts = ts;
ul_tbf->trx = trx;
-   ul_tbf->m_ctrs = rate_ctr_group_alloc(ul_tbf, _ctrg_desc, 0);
+   ul_tbf->m_ctrs = rate_ctr_group_alloc(ul_tbf, _ctrg_desc, 
next_tbf_ctr_group_id++);
ul_tbf->m_ul_egprs_ctrs = rate_ctr_group_alloc(ul_tbf,
-   _ul_egprs_ctrg_desc, 0);
+  _ul_egprs_ctrg_desc,
+  ul_tbf->m_ctrs->idx);
ul_tbf->m_ul_gprs_ctrs = rate_ctr_group_alloc(ul_tbf,
-   _ul_gprs_ctrg_desc, 0);
+ _ul_gprs_ctrg_desc,
+ ul_tbf->m_ctrs->idx);
if (!ul_tbf->m_ctrs || !ul_tbf->m_ul_egprs_ctrs || 
!ul_tbf->m_ul_gprs_ctrs) {
LOGPTBF(ul_tbf, LOGL_ERROR, "Cound not allocate TBF UL rate 
counters\n");
talloc_free(ul_tbf);

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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I90ef64133986c556c1a529f5b966e847e6cabbad
Gerrit-Change-Number: 9943
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in osmo-ttcn3-hacks[master]: BSC_Tests_LCLS: try call legs with different codec/rate

[dexter]

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9941


Change subject: BSC_Tests_LCLS: try call legs with different codec/rate
..

BSC_Tests_LCLS: try call legs with different codec/rate

since the local MGW may not support transcoding, osmo-bsc should
avoid to LCLS call legs that use different codec/rate. This test
attemts to set up a call with different codec rate and checks if
those legs do not get LCLSed

Change-Id: I91b132306e530ad9ca03fb4a34012381be6b0b52
Depends: osmo-bsc I157549129a40c64364dc126f67195759e5f1d60f
Related: OS#1602
---
M bsc/BSC_Tests_LCLS.ttcn
M bsc/expected-results.xml
2 files changed, 38 insertions(+), 0 deletions(-)



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

diff --git a/bsc/BSC_Tests_LCLS.ttcn b/bsc/BSC_Tests_LCLS.ttcn
index da9fe94..dfbd946 100644
--- a/bsc/BSC_Tests_LCLS.ttcn
+++ b/bsc/BSC_Tests_LCLS.ttcn
@@ -303,6 +303,42 @@
 f_tc_lcls_gcr_bway_connect(true)
 }

+/* Unless explicitly enabled, osmo-bsc will avoid LCLSs when the codecs or 
rates
+ * of both legs are different */
+testcase TC_lcls_gcr_bway_codec_mismatch() runs on lcls_test_CT {
+   var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars);
+   var TestHdlrParams pars_b;
+   var MSC_ConnHdlr vc_conn;
+   var MgcpCommand mgcp_cmd;
+
+   f_lcls_init();
+
+   /* First call leg uses full rate */
+   pars_a.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR}));
+   pars_a.lcls.gcr := valueof(ts_GCR('010203'O, '0405'O, '060708090a'O));
+   pars_a.lcls.cfg := LCLS_CFG_both_way;
+   pars_a.lcls.csc := LCLS_CSC_connect;
+
+   /* The second call leg uses half-rate */
+   pars_b := pars_a;
+   pars_a.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR}));
+
+   /* first call is not possible to be LS (no second leg yet) */
+   pars_a.lcls.exp_sts := LCLS_STS_not_possible_ls;
+
+   /* second call is also not possible to be LS (codec/rate does not 
match) */
+   pars_b.lcls.exp_sts := LCLS_STS_not_yet_ls;
+   f_lcls_test_init(pars_a, pars_b);
+
+   interleave {
+   [] CONN_A.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL);
+   [] CONN_B.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL);
+   [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_not_yet_ls));
+   }
+
+   f_lcls_test_fini();
+}
+
 /* Send an ASSIGNMENT REQ with LCLS CFG+CSC enabling LCLS but GCR doesn't 
match! */
 testcase TC_lcls_gcr_nomatch_bway_connect() runs on lcls_test_CT {
var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars);
@@ -600,6 +636,7 @@
execute( TC_lcls_gcr_only() );
execute( TC_lcls_gcr_bway_connect() );
execute( TC_lcls_gcr_bway_connect_hr() );
+   execute( TC_lcls_gcr_bway_codec_mismatch() );
execute( TC_lcls_gcr_nomatch_bway_connect() );
execute( TC_lcls_gcr_bway_dont_connect() );
execute( TC_lcls_gcr_unsuppported_cfg() );
diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml
index dbe3d2c..7339951 100644
--- a/bsc/expected-results.xml
+++ b/bsc/expected-results.xml
@@ -88,6 +88,7 @@
   
   
   
+  
   
   
   

--
To view, visit https://gerrit.osmocom.org/9941
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: I91b132306e530ad9ca03fb4a34012381be6b0b52
Gerrit-Change-Number: 9941
Gerrit-PatchSet: 1
Gerrit-Owner: dexter 

Change in osmo-bsc[master]: lcls: do not LCLS call legs with different codecs

[dexter]

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9940


Change subject: lcls: do not LCLS call legs with different codecs
..

lcls: do not LCLS call legs with different codecs

It is theoretically possible to LCLS two legs that use different
codecs. However, this requires transcoding capabilities on the
local MGW. If the local MGW lacks transcoding features such a
local circuit should be avoided. Enabeling LCLS under such
coditions should be optional (VTY)

- Add check to avoid LCLS on different codec/rate
- Add VTY-Option to optionally override the check
  (MGW is able to transcode)

Change-Id: I157549129a40c64364dc126f67195759e5f1d60f
Related: OS#1602
---
M include/osmocom/bsc/bsc_msc_data.h
M src/osmo-bsc/osmo_bsc_lcls.c
M src/osmo-bsc/osmo_bsc_vty.c
3 files changed, 31 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/40/9940/1

diff --git a/include/osmocom/bsc/bsc_msc_data.h 
b/include/osmocom/bsc/bsc_msc_data.h
index 7235fba..4b39526 100644
--- a/include/osmocom/bsc/bsc_msc_data.h
+++ b/include/osmocom/bsc/bsc_msc_data.h
@@ -92,6 +92,7 @@
struct gsm_audio_support **audio_support;
int audio_length;
enum bsc_lcls_mode lcls_mode;
+   bool lcls_codec_mismatch_allow;

/* ussd welcome text */
char *ussd_welcome_txt;
diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c
index b197e66..ab00418 100644
--- a/src/osmo-bsc/osmo_bsc_lcls.c
+++ b/src/osmo-bsc/osmo_bsc_lcls.c
@@ -273,6 +273,18 @@
return false;
}

+   if (conn->user_plane.full_rate != conn->lcls.other->user_plane.full_rate
+   && conn->sccp.msc->lcls_codec_mismatch_allow == false) {
+   LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismiatch 
(channel rate)\n");
+   return false;
+   }
+
+   if (conn->user_plane.chan_mode != conn->lcls.other->user_plane.chan_mode
+   && conn->sccp.msc->lcls_codec_mismatch_allow == false) {
+   LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismiatch 
(channel mode)\n");
+   return false;
+   }
+
return true;
 }

diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c
index f6f1b8a..709e783 100644
--- a/src/osmo-bsc/osmo_bsc_vty.c
+++ b/src/osmo-bsc/osmo_bsc_vty.c
@@ -650,6 +650,23 @@
return CMD_SUCCESS;
 }

+DEFUN(cfg_net_msc_lcls_mismtch,
+  cfg_net_msc_lcls_mismtch_cmd,
+  "lcls-codec-mismatch (allowed|forbidden)",
+  "Allow 3GPP LCLS (Local Call, Local Switch) when call legs use different 
codec/rate\n"
+  "Allow LCLS only only for calls that use the same codec/rate on both 
legs\n"
+  "Do not Allow LCLS for calls that use a different codec/rate on both 
legs\n")
+{
+   struct bsc_msc_data *data = bsc_msc_data(vty);
+
+   if (strcmp(argv[0], "allowed") == 0)
+   data->lcls_codec_mismatch_allow = true;
+   else
+   data->lcls_codec_mismatch_allow = false;
+
+   return CMD_SUCCESS;
+}
+
 DEFUN(cfg_net_bsc_mid_call_text,
   cfg_net_bsc_mid_call_text_cmd,
   "mid-call-text .TEXT",
@@ -938,6 +955,7 @@
install_element(MSC_NODE, _net_msc_amr_5_15_cmd);
install_element(MSC_NODE, _net_msc_amr_4_75_cmd);
install_element(MSC_NODE, _net_msc_lcls_mode_cmd);
+   install_element(MSC_NODE, _net_msc_lcls_mismtch_cmd);
install_element(MSC_NODE, _msc_acc_lst_name_cmd);
install_element(MSC_NODE, _msc_no_acc_lst_name_cmd);
install_element(MSC_NODE, _msc_cs7_bsc_addr_cmd);

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

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I157549129a40c64364dc126f67195759e5f1d60f
Gerrit-Change-Number: 9940
Gerrit-PatchSet: 1
Gerrit-Owner: dexter 

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

[jenkins]

See 


--
[...truncated 127.18 KB...]
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... no
checking whether make supports nested variables... (cached) yes
checking if gcc supports -fvisibility=hidden... yes
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 whether gcc understands -c and -o together... (cached) yes
checking dependency style of gcc... (cached) gcc3
checking for pkg-config... /usr/bin/pkg-config
checking pkg-config is at least version 0.9.0... yes
checking for LIBOSMOCORE... yes
checking for LIBOSMOCODEC... yes
checking for LIBALSA... yes
checking for OPENCORE_AMRNB... yes
checking gsm/gsm.h usability... yes
checking gsm/gsm.h presence... yes
checking for gsm/gsm.h... yes
checking for gsm_create in -lgsm... yes
checking for stdint.h... (cached) yes
checking for stdlib.h... (cached) yes
checking for string.h... (cached) yes
checking for unistd.h... (cached) yes
checking for inline... inline
checking for int16_t... yes
checking for int32_t... yes
checking for uint16_t... yes
checking for uint32_t... yes
checking for uint64_t... yes
checking for uint8_t... yes
checking for stdlib.h... (cached) yes
checking for GNU libc compatible malloc... yes
checking for memset... yes
checking that generated files are newer than configure... done
configure: creating ./config.status
config.status: creating Makefile
config.status: creating src/Makefile
config.status: creating libgsmhr/Makefile
config.status: creating include/Makefile
config.status: creating include/gsmhr/Makefile
config.status: creating libosmogapk.pc
config.status: creating tests/atlocal
config.status: creating tests/Makefile
config.status: creating config.h
config.status: executing depfiles commands
config.status: executing libtool commands
config.status: executing tests/atconfig commands
make[1]: Entering directory 
'
make  all-recursive
make[2]: Entering directory 
'
Making all in include
make[3]: Entering directory 
'
make[4]: Entering directory 
'
make[4]: Nothing to be done for 'all-am'.
make[4]: Leaving directory 
'
make[3]: Leaving directory 
'
Making all in src
make[3]: Entering directory 
'
  CC   procqueue.lo
  CC   pq_format.lo
  CC   pq_codec.lo
  CC   pq_file.lo
  CC   pq_alsa.lo
  CC   pq_rtp.lo
  CC   pq_ecu.lo
  CC   ecu_fr.lo
  CC   formats.lo
  CC   fmt_ti.lo
  CC   fmt_amr.lo
  CC   fmt_gsm.lo
  CC   fmt_hr_ref.lo
  CC   fmt_racal.lo
  CC   fmt_rawpcm.lo
  CC   fmt_rtp_amr.lo
  CC   fmt_rtp_efr.lo
  CC   fmt_rtp_hr_etsi.lo
  CC   fmt_rtp_hr_ietf.lo
  CC   fmt_amr_opencore.lo
  CC   codecs.lo
  CC   codec_pcm.lo
  CC   codec_hr.lo
  CC   codec_fr.lo
  CC   codec_efr.lo
  CC   codec_amr.lo
  CC   benchmark.lo
  CC   common.lo
  CCLD libosmogapk.la
  CC   app_osmo_gapk.o
  CCLD osmo-gapk
make[3]: Leaving directory 
'
Making all in tests
make[3]: Entering directory 
'
make[3]: Nothing to be 

Change in libosmocore[master]: vty: fix use-after-free and memleaks in is_cmd_ambiguous()

[Pau Espin Pedrol]

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

Change subject: vty: fix use-after-free and memleaks in is_cmd_ambiguous()
..


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/9939/1/src/vty/command.c
File src/vty/command.c:

https://gerrit.osmocom.org/#/c/9939/1/src/vty/command.c@1322
PS1, Line 1322: cmd_deopt(const char *str)
> Do we really need this wrapper? […]
Agree.
Furthermore, I think the way you are fixing the issue looks like killing a fly 
with a cannon (as in using a separate ctx for this function and freeing it at 
the end). Can we try to simply make sure to free stuff where needed, maybe 
refactor the function if required.



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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia71ba742108b5ff020997bfb612ad5eb30d04fcd
Gerrit-Change-Number: 9939
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: Pau Espin Pedrol 
Gerrit-CC: Vadim Yanitskiy 
Gerrit-Comment-Date: Tue, 10 Jul 2018 09:47:19 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in libosmocore[master]: vty: cosmetic: cmd_deopt(): use talloc_strndup(), not memcpy()

[Pau Espin Pedrol]

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

Change subject: vty: cosmetic: cmd_deopt(): use talloc_strndup(), not memcpy()
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ibf870ae02be706f802482f7cff6589a70cde8320
Gerrit-Change-Number: 9938
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Tue, 10 Jul 2018 09:38:55 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libosmocore[master]: vty/command.c: talloc from tall_vty_cmd_ctx, not NULL

[Pau Espin Pedrol]

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

Change subject: vty/command.c: talloc from tall_vty_cmd_ctx, not NULL
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Iaa409b4f63557c8fb028bbb322b5e7253393c05c
Gerrit-Change-Number: 9937
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Tue, 10 Jul 2018 09:38:52 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in simtrace2[master]: USB: add flags for sniff data and centralise transfer

[Kévin Redon]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/9920

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

Change subject: USB: add flags for sniff data and centralise transfer
..

USB: add flags for sniff data and centralise transfer

Also fix issue in usb_msg_alloc_hdr and add cosmetic spaces around
operations.

Change-Id: I768a0ad639aa5e648a630af72d01f7b68082b6b6
---
M firmware/libcommon/include/simtrace_prot.h
M firmware/libcommon/source/sniffer.c
M host/simtrace2-sniff.c
3 files changed, 140 insertions(+), 142 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/20/9920/2
--
To view, visit https://gerrit.osmocom.org/9920
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I768a0ad639aa5e648a630af72d01f7b68082b6b6
Gerrit-Change-Number: 9920
Gerrit-PatchSet: 2
Gerrit-Owner: Kévin Redon 
Gerrit-Reviewer: Jenkins Builder

Change in simtrace2[master]: host: set license to GPLv2+

[Kévin Redon]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/9915

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

Change subject: host: set license to GPLv2+
..

host: set license to GPLv2+

Change-Id: I0948d74874af1d3a0f1b4cbcb4a838e4ecd9fe3f
---
M host/apdu_dispatch.c
M host/apdu_dispatch.h
M host/libusb_util.c
M host/libusb_util.h
M host/simtrace2-discovery.c
M host/simtrace2-discovery.h
M host/simtrace2-remsim.c
M host/simtrace2-sniff.c
M host/simtrace2_usb.c
M host/usb2udp.c
10 files changed, 134 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/15/9915/2
--
To view, visit https://gerrit.osmocom.org/9915
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I0948d74874af1d3a0f1b4cbcb4a838e4ecd9fe3f
Gerrit-Change-Number: 9915
Gerrit-PatchSet: 2
Gerrit-Owner: Kévin Redon 
Gerrit-Reviewer: Jenkins Builder

Change in simtrace2[master]: cosmetic: put spaces around operations

[Kévin Redon]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/9919

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

Change subject: cosmetic: put spaces around operations
..

cosmetic: put spaces around operations

Change-Id: If5ba5f8d16680e8403944274336ea595017063db
---
M firmware/libcommon/source/sniffer.c
1 file changed, 72 insertions(+), 72 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/19/9919/2
--
To view, visit https://gerrit.osmocom.org/9919
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: If5ba5f8d16680e8403944274336ea595017063db
Gerrit-Change-Number: 9919
Gerrit-PatchSet: 2
Gerrit-Owner: Kévin Redon 
Gerrit-Reviewer: Jenkins Builder

Change in simtrace2[master]: replace leading spaces with tabs

[Kévin Redon]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/9918

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

Change subject: replace leading spaces with tabs
..

replace leading spaces with tabs

Change-Id: I86783eba0827b58303b10310e9f6b9625e1a27f1
---
M firmware/apps/cardem/main.c
M firmware/apps/dfu/main.c
M firmware/apps/trace/main.c
M firmware/apps/triple_play/main.c
M firmware/libboard/common/source/board_cstartup_gnu.c
M firmware/libboard/common/source/board_lowlevel.c
M firmware/libboard/common/source/led.c
M firmware/libboard/common/source/uart_console.c
M firmware/libcommon/include/assert.h
M firmware/libcommon/include/cciddriver.h
M firmware/libcommon/include/iso7816_4.h
M firmware/libcommon/include/simtrace.h
M firmware/libcommon/source/cciddriver.c
M firmware/libcommon/source/iso7816_4.c
M firmware/libcommon/source/mode_cardemu.c
M firmware/libcommon/source/mode_ccid.c
M firmware/libcommon/source/stdio.c
M firmware/libcommon/source/string.c
18 files changed, 1,727 insertions(+), 1,727 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/18/9918/2
--
To view, visit https://gerrit.osmocom.org/9918
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I86783eba0827b58303b10310e9f6b9625e1a27f1
Gerrit-Change-Number: 9918
Gerrit-PatchSet: 2
Gerrit-Owner: Kévin Redon 
Gerrit-Reviewer: Jenkins Builder

Change in simtrace2[master]: set linux end of line

[Kévin Redon]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/9917

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

Change subject: set linux end of line
..

set linux end of line

Change-Id: I5200f0d6f39b0641cac26a4109a3cd33e8474b9b
---
M firmware/atmel_softpack_libraries/libchip_sam3s/include/efc.h
M firmware/atmel_softpack_libraries/libchip_sam3s/include/flashd.h
M firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c
M firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c
M firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c
M firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c
M firmware/atmel_softpack_libraries/libchip_sam3s/source/pio.c
M firmware/atmel_softpack_libraries/libchip_sam3s/source/pio_it.c
M firmware/atmel_softpack_libraries/libchip_sam3s/source/pmc.c
M firmware/atmel_softpack_libraries/libchip_sam3s/source/spi.c
M firmware/atmel_softpack_libraries/libchip_sam3s/source/tc.c
M firmware/atmel_softpack_libraries/libchip_sam3s/source/usart.c
M firmware/atmel_softpack_libraries/libchip_sam3s/source/wdt.c
M firmware/libboard/common/source/board_cstartup_gnu.c
M firmware/libboard/common/source/board_lowlevel.c
M firmware/libboard/common/source/uart_console.c
16 files changed, 6,071 insertions(+), 6,071 deletions(-)


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

Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I5200f0d6f39b0641cac26a4109a3cd33e8474b9b
Gerrit-Change-Number: 9917
Gerrit-PatchSet: 2
Gerrit-Owner: Kévin Redon 
Gerrit-Reviewer: Jenkins Builder

Change in simtrace2[master]: DFU: use central DFU override check

[Kévin Redon]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/9913

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

Change subject: DFU: use central DFU override check
..

DFU: use central DFU override check

TRACE_INFO will also provide the DFU start reason, but TRACE_INFO
(TRACE_LEVEL >= 4) should only be used for debugging.
WARNING: With TRACE_LEVEL >= 4 the DFU binary is over the maximum of
16 kiB allocated for the DFU bootloader.
Thus make combined will not boot the main application because its
start if after the expecte 16 kiB address; and flashing using DFU
will overwrite the DFU bootloader itself.

Change-Id: I82323e0f76c03f67df7dc8f2b6783166cc25f3aa
---
M firmware/apps/dfu/main.c
M firmware/libboard/common/source/board_cstartup_gnu.c
2 files changed, 49 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/13/9913/2
--
To view, visit https://gerrit.osmocom.org/9913
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I82323e0f76c03f67df7dc8f2b6783166cc25f3aa
Gerrit-Change-Number: 9913
Gerrit-PatchSet: 2
Gerrit-Owner: Kévin Redon 
Gerrit-Reviewer: Jenkins Builder

Change in simtrace2[master]: firmware: set license to GPLv2+

[Kévin Redon]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/9916

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

Change subject: firmware: set license to GPLv2+
..

firmware: set license to GPLv2+

Change-Id: Id4c00159f984976b6d8641900fb64e36a3a30407
---
M firmware/apps/cardem/main.c
M firmware/apps/dfu/main.c
M firmware/apps/trace/main.c
M firmware/apps/triple_play/main.c
M firmware/libboard/common/include/board_common.h
M firmware/libboard/common/include/board_lowlevel.h
M firmware/libboard/common/include/boardver_adc.h
M firmware/libboard/common/include/led.h
M firmware/libboard/common/include/manifest.h
M firmware/libboard/common/include/sim_switch.h
M firmware/libboard/common/include/uart_console.h
M firmware/libboard/common/source/board_cstartup_gnu.c
M firmware/libboard/common/source/boardver_adc.c
M firmware/libboard/common/source/led.c
M firmware/libboard/common/source/manifest.c
M firmware/libboard/common/source/sim_switch.c
M firmware/libboard/owhw/include/board.h
M firmware/libboard/owhw/source/owhw.c
M firmware/libboard/qmod/include/board.h
M firmware/libboard/qmod/include/card_pres.h
M firmware/libboard/qmod/include/i2c.h
M firmware/libboard/qmod/include/wwan_led.h
M firmware/libboard/qmod/include/wwan_perst.h
M firmware/libboard/qmod/source/board_qmod.c
M firmware/libboard/qmod/source/card_pres.c
M firmware/libboard/qmod/source/i2c.c
M firmware/libboard/qmod/source/wwan_led.c
M firmware/libboard/qmod/source/wwan_perst.c
M firmware/libboard/simtrace/include/board.h
M firmware/libboard/simtrace/source/board_simtrace.c
M firmware/libcommon/include/card_emu.h
M firmware/libcommon/include/iso7816_fidi.h
M firmware/libcommon/include/llist_irqsafe.h
M firmware/libcommon/include/ringbuffer.h
M firmware/libcommon/include/simtrace.h
M firmware/libcommon/include/simtrace_prot.h
M firmware/libcommon/include/simtrace_usb.h
M firmware/libcommon/include/stdio.h
M firmware/libcommon/include/talloc.h
M firmware/libcommon/include/usb_buf.h
M firmware/libcommon/include/utils.h
M firmware/libcommon/source/card_emu.c
M firmware/libcommon/source/fputs.c
M firmware/libcommon/source/host_communication.c
M firmware/libcommon/source/iso7816_fidi.c
M firmware/libcommon/source/mode_cardemu.c
M firmware/libcommon/source/pseudo_talloc.c
M firmware/libcommon/source/ringbuffer.c
M firmware/libcommon/source/sniffer.c
M firmware/libcommon/source/tc_etu.c
M firmware/libcommon/source/usb_buf.c
51 files changed, 791 insertions(+), 118 deletions(-)


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

Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Id4c00159f984976b6d8641900fb64e36a3a30407
Gerrit-Change-Number: 9916
Gerrit-PatchSet: 2
Gerrit-Owner: Kévin Redon 
Gerrit-Reviewer: Jenkins Builder

Change in libosmocore[master]: vty: fix use-after-free and memleaks in is_cmd_ambiguous()

[Vadim Yanitskiy]

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

Change subject: vty: fix use-after-free and memleaks in is_cmd_ambiguous()
..


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/9939/1/src/vty/command.c
File src/vty/command.c:

https://gerrit.osmocom.org/#/c/9939/1/src/vty/command.c@1322
PS1, Line 1322: cmd_deopt(const char *str)
Do we really need this wrapper?
Why not to pass the 'tall_vty_cmd_ctx' explicitly from callers?



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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia71ba742108b5ff020997bfb612ad5eb30d04fcd
Gerrit-Change-Number: 9939
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: Vadim Yanitskiy 
Gerrit-Comment-Date: Tue, 10 Jul 2018 09:27:24 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in libosmocore[master]: vty: cosmetic: cmd_deopt(): use talloc_strndup(), not memcpy()

[Vadim Yanitskiy]

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

Change subject: vty: cosmetic: cmd_deopt(): use talloc_strndup(), not memcpy()
..


Patch Set 1: Code-Review+1


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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ibf870ae02be706f802482f7cff6589a70cde8320
Gerrit-Change-Number: 9938
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Tue, 10 Jul 2018 09:19:22 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libosmocore[master]: vty/command.c: talloc from tall_vty_cmd_ctx, not NULL

[Vadim Yanitskiy]

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

Change subject: vty/command.c: talloc from tall_vty_cmd_ctx, not NULL
..


Patch Set 1: Code-Review+1


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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Iaa409b4f63557c8fb028bbb322b5e7253393c05c
Gerrit-Change-Number: 9937
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Tue, 10 Jul 2018 09:16:45 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes