Change in libosmocore[master]: add gsm0808_create_handover_request_ack2 to add AoIP RTP addr

[Neels Hofmeyr]

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

Change subject: add gsm0808_create_handover_request_ack2 to add AoIP RTP addr
..


Patch Set 6:

This quirk explained in the commit log is a minor detail but it bugs me. If we 
merge this once, we will always keep this sockaddr_storage as pointer instead 
of as member chiseled in stone.

The long term perspective could have been to also provide these structs like 
struct gsm0808_handover_request_ack as the output of decoding in libosmocore, 
instead of just as input to encoding. So far the situation is that libosmocore 
can only *encode* BSSAP, but *decoding* is done separately in each program. 
i.e., osmo-bsc implements TLV parsing of some BSSAP messages, while osmo-msc 
implements TLV parsing for others.

Now, if at some point I would add a gsm0808_decode_handover_request_ack() 
function, I would like to provide struct gsm0808_handover_request_ack as 
out-argument, and I would also like to then have the sockaddr_storage as direct 
member. Otherwise the caller would need to first populate with a pointer before 
calling. All possible of course, but rather quirky IMO.

This just because the use of sockaddr_storage isn't properly separated from 
implementations that get compiled on embedded and can't use it; embedded builds 
include headers naming struct sockaddr_storage even though the platform doesn't 
support it, and even function implementations using sockaddr_storage get 
compiled there but can't ever be used because they have unresolved references 
to functions handling sockaddr_storage ... meh

If we reshuffled the files to separate sockaddr_storage from embedded properly, 
we could include netinet/in.h directly in gsm0808.h and just use struct 
sockaddr_* as members.

A similar quirk shows up in that osmo_ip_port patch, I have to carefully 
navigate around what includes what.

In the regression tests, it is even weirder. There is an "if ENABLE_MSGFILE" in 
testsuite.at, but an 'if' like that doesn't seem to have any effect at all. So 
we can't actually exclude individual tests on embedded. How does that work, we 
just don't run any tests there apparently?

What do you guys think, should I try to separate sockaddr_storage from embedded 
builds before merging (or releasing) this, or is this a can of worms and 
incompatibilities that will suck me into realms where I don't want to go?


--
To view, visit https://gerrit.osmocom.org/13259
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: Ia71542ea37d4fd2c9fb9b40357db7aeb111ec576
Gerrit-Change-Number: 13259
Gerrit-PatchSet: 6
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Comment-Date: Fri, 15 Mar 2019 05:05:23 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in libosmocore[master]: add gsm0808_create_handover_request_ack2 to add AoIP RTP addr

[Neels Hofmeyr]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/13259

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

Change subject: add gsm0808_create_handover_request_ack2 to add AoIP RTP addr
..

add gsm0808_create_handover_request_ack2 to add AoIP RTP addr

osmo-bsc so far omits the AoIP Transport Layer Address from its Handover
Request Acknowledge message, which breaks inter-BSC Handover for AoIP.
Allow fixing that.

One quirk I really don't like about this: I would prefer to directly use struct
sockaddr_storage as a member of the struct gsm0808_handover_request_ack. Even
though struct sockaddr_storage appears in various function signatures, the
gsm0808.c actually also gets built on embedded systems that lack arpa/inet.h
(for me indicated by the ARM build job on jenkins). Compiling gsm0808.c works
only because the actual coding of struct sockaddr_storage is implemented in
gsm0808_util.c, which (apparently) does not get built on embedded and hence,
even though there are undefined references to e.g.
gsm0808_enc_aoip_trasp_addr() it works.

Related: I4a5acdb2d4a0b947cc0c62067a67be88a3d467ff (osmo-bsc)
Change-Id: Ia71542ea37d4fd2c9fb9b40357db7aeb111ec576
---
M include/osmocom/gsm/gsm0808.h
M src/gsm/gsm0808.c
M src/gsm/libosmogsm.map
3 files changed, 53 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/59/13259/6
--
To view, visit https://gerrit.osmocom.org/13259
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ia71542ea37d4fd2c9fb9b40357db7aeb111ec576
Gerrit-Change-Number: 13259
Gerrit-PatchSet: 6
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder (102)

Change in libosmocore[master]: add gsm0808_create_handover_request_ack2 to add AoIP RTP addr

[Neels Hofmeyr]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/13259

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

Change subject: add gsm0808_create_handover_request_ack2 to add AoIP RTP addr
..

add gsm0808_create_handover_request_ack2 to add AoIP RTP addr

osmo-bsc so far omits the AoIP Transport Layer Address from its Handover
Request Acknowledge message, which breaks inter-BSC Handover for AoIP.
Allow fixing that.

Related: I4a5acdb2d4a0b947cc0c62067a67be88a3d467ff (osmo-bsc)
Change-Id: Ia71542ea37d4fd2c9fb9b40357db7aeb111ec576
---
M include/osmocom/gsm/gsm0808.h
M src/gsm/gsm0808.c
M src/gsm/libosmogsm.map
3 files changed, 53 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/59/13259/5
--
To view, visit https://gerrit.osmocom.org/13259
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ia71542ea37d4fd2c9fb9b40357db7aeb111ec576
Gerrit-Change-Number: 13259
Gerrit-PatchSet: 5
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder (102)

Change in libosmocore[master]: add gsm0808_create_handover_request_ack2 to add AoIP RTP addr

[Neels Hofmeyr]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/13259

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

Change subject: add gsm0808_create_handover_request_ack2 to add AoIP RTP addr
..

add gsm0808_create_handover_request_ack2 to add AoIP RTP addr

osmo-bsc so far omits the AoIP Transport Layer Address from its Handover
Request Acknowledge message, which breaks inter-BSC Handover for AoIP.
Allow fixing that.

Related: I4a5acdb2d4a0b947cc0c62067a67be88a3d467ff (osmo-bsc)
Change-Id: Ia71542ea37d4fd2c9fb9b40357db7aeb111ec576
---
M include/osmocom/gsm/gsm0808.h
M include/osmocom/gsm/gsm_utils.h
M src/gsm/gsm0808.c
M src/gsm/libosmogsm.map
4 files changed, 56 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/59/13259/4
--
To view, visit https://gerrit.osmocom.org/13259
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ia71542ea37d4fd2c9fb9b40357db7aeb111ec576
Gerrit-Change-Number: 13259
Gerrit-PatchSet: 4
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder (102)

Change in libosmocore[master]: add osmo_use_count API

[Neels Hofmeyr]

Hello Vadim Yanitskiy, Pau Espin Pedrol, Harald Welte, Jenkins Builder,

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

https://gerrit.osmocom.org/13121

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

Change subject: add osmo_use_count API
..

add osmo_use_count API

Provide a common implementation of use counting that supports naming each user
as well as counting more than just one use per user, depending on the rules the
caller implies.

In osmo-msc, we were originally using a simple int counter to see whether a
connection is still in use or should be discarded. For clarity, we later added
names to each user in the form of a bitmask of flags, to figure out exactly
which users are still active: for logging and to debug double get / double put
bugs. This however is still not adequate, since there may be more than one CM
Service Request pending. Also, it is a specialized implementation that is not
re-usable.

With this generalized implementation, we can:

- fix the problem of inadequate counting of multiple concurrent CM Service
  Requests (more than one use count per user category),
- directly use arbitrary names for uses like __func__ or "foo" (no need to
  define enums and value_string[]s),
- re-use the same code for e.g. vlr_subscr and get fairly detailed VLR
  susbscriber usage logging for free.

Change-Id: Ife31e6798b4e728a23913179e346552a7dd338c0
---
M include/Makefile.am
A include/osmocom/core/use_count.h
M src/Makefile.am
A src/use_count.c
M tests/Makefile.am
M tests/testsuite.at
A tests/use_count/use_count_test.c
A tests/use_count/use_count_test.err
A tests/use_count/use_count_test.ok
9 files changed, 1,029 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/21/13121/4
--
To view, visit https://gerrit.osmocom.org/13121
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ife31e6798b4e728a23913179e346552a7dd338c0
Gerrit-Change-Number: 13121
Gerrit-PatchSet: 4
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-CC: Max 

Change in libosmocore[master]: add osmo_use_count API

[Neels Hofmeyr]

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

Change subject: add osmo_use_count API
..


Patch Set 3:

(1 comment)

In the end I kept the naming the same, while spreading a lot more documentation 
to clarify. The outer struct could be called "osmo_use_count_list", but 
semantically, it represents *the* use count of this object, which happens to be 
fragmented into separate named tokens with a portion of the counts for each 
token. Each token has a 'use' (a name) and a 'count', which IMHO can't be 
improved upon naming wise. Suggestions welcome. (I also like how 'use' and 
'count' make 'use count' ;)

https://gerrit.osmocom.org/#/c/13121/2/src/use_count.c
File src/use_count.c:

https://gerrit.osmocom.org/#/c/13121/2/src/use_count.c@205
PS2, Line 205:  * \param[in] file  Source file path, as in __FILE__.
> ACK. […]
NACK, I disagree with describing all arguments here. The reason is that this is 
the kind of private implementation handle for the actual 
osmo_use_count_get_put() API, and writing out all arguments will be an exact 
copy of the description in osmo_use_count_get_put(). Add a few patches here and 
there, and very soon both will be out of sync. I will not introduce such a copy 
for function signatures that are so obviously one and the same.

Having 'change' vs 'diff' isn't harmful, but I can change that if you insist. I 
can diff that if you insist.



--
To view, visit https://gerrit.osmocom.org/13121
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: Ife31e6798b4e728a23913179e346552a7dd338c0
Gerrit-Change-Number: 13121
Gerrit-PatchSet: 3
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-CC: Max 
Gerrit-Comment-Date: Fri, 15 Mar 2019 04:04:22 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in libosmocore[master]: add gsm0808_create_handover_request_ack2 to add AoIP RTP addr

[Neels Hofmeyr]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/13259

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

Change subject: add gsm0808_create_handover_request_ack2 to add AoIP RTP addr
..

add gsm0808_create_handover_request_ack2 to add AoIP RTP addr

osmo-bsc so far omits the AoIP Transport Layer Address from its Handover
Request Acknowledge message, which breaks inter-BSC Handover for AoIP.
Allow fixing that.

Related: I4a5acdb2d4a0b947cc0c62067a67be88a3d467ff (osmo-bsc)
Change-Id: Ia71542ea37d4fd2c9fb9b40357db7aeb111ec576
---
M include/osmocom/gsm/gsm0808.h
M src/gsm/gsm0808.c
M src/gsm/libosmogsm.map
3 files changed, 56 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/59/13259/3
--
To view, visit https://gerrit.osmocom.org/13259
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ia71542ea37d4fd2c9fb9b40357db7aeb111ec576
Gerrit-Change-Number: 13259
Gerrit-PatchSet: 3
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder (102)

Change in libosmocore[master]: add gsm0808_create_handover_request_ack2 to add AoIP RTP addr

[Neels Hofmeyr]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/13259

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

Change subject: add gsm0808_create_handover_request_ack2 to add AoIP RTP addr
..

add gsm0808_create_handover_request_ack2 to add AoIP RTP addr

osmo-bsc so far omits the AoIP Transport Layer Address from its Handover
Request Acknowledge message, which breaks inter-BSC Handover for AoIP.
Allow fixing that.

Related: I4a5acdb2d4a0b947cc0c62067a67be88a3d467ff (osmo-bsc)
Change-Id: Ia71542ea37d4fd2c9fb9b40357db7aeb111ec576
---
M include/osmocom/gsm/gsm0808.h
M src/gsm/gsm0808.c
M src/gsm/libosmogsm.map
3 files changed, 54 insertions(+), 9 deletions(-)


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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ia71542ea37d4fd2c9fb9b40357db7aeb111ec576
Gerrit-Change-Number: 13259
Gerrit-PatchSet: 2
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder (102)

Change in libosmocore[master]: add gsm0808_create_handover_request_ack2 to add AoIP RTP addr

[Neels Hofmeyr]

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


Change subject: add gsm0808_create_handover_request_ack2 to add AoIP RTP addr
..

add gsm0808_create_handover_request_ack2 to add AoIP RTP addr

Change-Id: Ia71542ea37d4fd2c9fb9b40357db7aeb111ec576
---
M include/osmocom/gsm/gsm0808.h
M src/gsm/gsm0808.c
M src/gsm/libosmogsm.map
3 files changed, 54 insertions(+), 9 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/59/13259/1

diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h
index a1345c3..b31a698 100644
--- a/include/osmocom/gsm/gsm0808.h
+++ b/include/osmocom/gsm/gsm0808.h
@@ -143,6 +143,26 @@
 };
 struct msgb *gsm0808_create_handover_required(const struct 
gsm0808_handover_required *params);

+struct gsm0808_create_handover_request_ack {
+   const uint8_t *l3_info;
+   uint8_t l3_info_len;
+
+   bool chosen_channel_present;
+   uint8_t chosen_channel;
+
+   /*! For A5/N set chosen_encr_alg = N+1, e.g. chosen_encr_alg = 1 means 
A5/0 (no encryption), 2 means A5/1, 4
+* means A5/3. Set chosen_encr_alg = 0 to omit the Chosen Encryption 
Algorithm IE. */
+   uint8_t chosen_encr_alg;
+
+   /* chosen_speech_version == 0 omits the IE */
+   uint8_t chosen_speech_version;
+
+   struct sockaddr_storage aoip_transport_layer;
+
+   /* more items are defined in the spec and may be added later */
+   bool more_items; /*!< always set this to false */
+};
+struct msgb *gsm0808_create_handover_request_ack2(const struct 
gsm0808_create_handover_request_ack *params);
 struct msgb *gsm0808_create_handover_request_ack(const uint8_t *l3_info, 
uint8_t l3_info_len,
 uint8_t chosen_channel, 
uint8_t chosen_encr_alg,
 uint8_t chosen_speech_version);
diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c
index 4873076..ad51b5f 100644
--- a/src/gsm/gsm0808.c
+++ b/src/gsm/gsm0808.c
@@ -860,9 +860,7 @@
 /*! Create BSSMAP HANDOVER REQUEST ACKNOWLEDGE message, 3GPP TS 48.008 
3.2.1.10.
  * Sent from the MT BSC back to the MSC when it has allocated an lchan to 
handover to.
  * l3_info is the RR Handover Command that the MO BSC sends to the MS to move 
over. */
-struct msgb *gsm0808_create_handover_request_ack(const uint8_t *l3_info, 
uint8_t l3_info_len,
-uint8_t chosen_channel, 
uint8_t chosen_encr_alg,
-uint8_t chosen_speech_version)
+struct msgb *gsm0808_create_handover_request_ack2(const struct 
gsm0808_create_handover_request_ack *params)
 {
struct msgb *msg;

@@ -873,13 +871,22 @@
/* Message Type, 3.2.2.1 */
msgb_v_put(msg, BSS_MAP_MSG_HANDOVER_RQST_ACKNOWLEDGE);

-   /* Layer 3 Information, 3.2.2.24 */
-   msgb_tlv_put(msg, GSM0808_IE_LAYER_3_INFORMATION, l3_info_len, l3_info);
+   /* Layer 3 Information, 3.2.2.24 -- it is actually mandatory, but 
rather compose a nonstandard message than
+* segfault or return NULL without a log message. */
+   if (params->l3_info && params->l3_info_len)
+   msgb_tlv_put(msg, GSM0808_IE_LAYER_3_INFORMATION, 
params->l3_info_len, params->l3_info);

-   msgb_tv_put(msg, GSM0808_IE_CHOSEN_CHANNEL, chosen_channel);
-   msgb_tv_put(msg, GSM0808_IE_CHOSEN_ENCR_ALG, chosen_encr_alg);
-   if (chosen_speech_version != 0)
-   msgb_tv_put(msg, GSM0808_IE_SPEECH_VERSION, 
chosen_speech_version);
+   if (params->chosen_channel_present)
+   msgb_tv_put(msg, GSM0808_IE_CHOSEN_CHANNEL, 
params->chosen_channel);
+   if (params->chosen_encr_alg)
+   msgb_tv_put(msg, GSM0808_IE_CHOSEN_ENCR_ALG, 
params->chosen_encr_alg);
+
+   if (params->chosen_speech_version != 0)
+   msgb_tv_put(msg, GSM0808_IE_SPEECH_VERSION, 
params->chosen_speech_version);
+
+   if (params->aoip_transport_layer.ss_family == AF_INET
+   || params->aoip_transport_layer.ss_family == AF_INET6)
+   gsm0808_enc_aoip_trasp_addr(msg, >aoip_transport_layer);

/* prepend header with final length */
msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, 
msgb_length(msg));
@@ -887,6 +894,23 @@
return msg;
 }

+/*! Same as gsm0808_create_handover_request_ack2() but with less parameters.
+ * In particular, this lacks the AoIP Transport Layer address. */
+struct msgb *gsm0808_create_handover_request_ack(const uint8_t *l3_info, 
uint8_t l3_info_len,
+uint8_t chosen_channel, 
uint8_t chosen_encr_alg,
+uint8_t chosen_speech_version)
+{
+   struct gsm0808_create_handover_request_ack params = {
+   .l3_info = l3_info,
+   .l3_info_len = l3_info_len,
+

Change in osmo-bsc[master]: avoid use-after-free: on MGW endpoint dealloc, also forget it in conn...

[Neels Hofmeyr]

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


Change subject: avoid use-after-free: on MGW endpoint dealloc, also forget it 
in conn->ho.*
..

avoid use-after-free: on MGW endpoint dealloc, also forget it in conn->ho.*

With the FORGET_MGW_ENDPOINT event, the MGW endpoint FSM notifies the gscon
that it has deallocated and that hence the gscon should forget all references
to it (to avoid a use-after-free).

Also do this for the endpoint FSM and endpoint ci pointers in the conn->ho.*
sub struct.

I saw a use-after-free after a Handover Failure message tears down the lchan
and MGW endpoint before triggering the handover_fsm.c cleanup code, which also
tries to clean up an endpoint CI if it was created for the failed Handover.

Change-Id: I6702ccd0df44bea5eb8b26d471d7903c24e6e30b
---
M src/osmo-bsc/bsc_subscr_conn_fsm.c
1 file changed, 6 insertions(+), 3 deletions(-)



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

diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c 
b/src/osmo-bsc/bsc_subscr_conn_fsm.c
index 13a5730..1cc0c78 100644
--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c
+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c
@@ -699,6 +699,7 @@
 {
conn->user_plane.mgw_endpoint = NULL;
conn->user_plane.mgw_endpoint_ci_msc = NULL;
+   conn->ho.created_ci_for_msc = NULL;
lchan_forget_mgw_endpoint(conn->lchan);
lchan_forget_mgw_endpoint(conn->assignment.new_lchan);
lchan_forget_mgw_endpoint(conn->ho.new_lchan);
@@ -706,9 +707,11 @@

 void gscon_forget_mgw_endpoint_ci(struct gsm_subscriber_connection *conn, 
struct mgwep_ci *ci)
 {
-   if (ci != conn->user_plane.mgw_endpoint_ci_msc)
-   return;
-   conn->user_plane.mgw_endpoint_ci_msc = NULL;
+   if (conn->ho.created_ci_for_msc == ci)
+   conn->ho.created_ci_for_msc = NULL;
+
+   if (conn->user_plane.mgw_endpoint_ci_msc == ci)
+   conn->user_plane.mgw_endpoint_ci_msc = NULL;
 }

 static void gscon_fsm_allstate(struct osmo_fsm_inst *fi, uint32_t event, void 
*data)

--
To view, visit https://gerrit.osmocom.org/13258
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: I6702ccd0df44bea5eb8b26d471d7903c24e6e30b
Gerrit-Change-Number: 13258
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 

Change in osmo-bsc[master]: fix log line end in assignment_fsm.c

[Neels Hofmeyr]

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


Change subject: fix log line end in assignment_fsm.c
..

fix log line end in assignment_fsm.c

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



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

diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c
index aa696ac..81a2a1e 100644
--- a/src/osmo-bsc/assignment_fsm.c
+++ b/src/osmo-bsc/assignment_fsm.c
@@ -563,7 +563,7 @@
struct gsm_subscriber_connection *conn = assignment_fi_conn(fi);
/* Do we still need to wait for the RTP stream at all? */
if (lchan_state_is(conn->assignment.new_lchan, LCHAN_ST_ESTABLISHED)) {
-   LOG_ASSIGNMENT(conn, LOGL_DEBUG, "lchan fully established, no 
need to wait");
+   LOG_ASSIGNMENT(conn, LOGL_DEBUG, "lchan fully established, no 
need to wait\n");
assignment_fsm_post_lchan_established(fi);
}
 }

--
To view, visit https://gerrit.osmocom.org/13257
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: I4070ee9164eb161584df70ae174b538c394ab9cd
Gerrit-Change-Number: 13257
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 

Change in osmo-bsc[master]: Revert "assignment_fsm: Properly support assigning signalling mode TC...

[Neels Hofmeyr]

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

Change subject: Revert "assignment_fsm: Properly support assigning signalling 
mode TCH/x"
..

Revert "assignment_fsm: Properly support assigning signalling mode TCH/x"

This commit breaks voice channel assignment. It results in the
Assignment Complete sent to the MSC for a voice lchan lacking
AoIP Transport Layer Address, Speech Version and Speech Codec.
Hence the MSC cannot complete the Assignment for a voice call.
Let's revisit this patch, test thoroughly and re-merge later.

This reverts commit 4d3a21269b25e7164a94fa8ce3ad67ff80904aee.

Reason for revert: 

Change-Id: I72aaa03539919e7e85b5b75b133326cec5e68bc9
---
M include/osmocom/bsc/gsm_data.h
M include/osmocom/bsc/lchan_select.h
M src/osmo-bsc/assignment_fsm.c
M src/osmo-bsc/codec_pref.c
M src/osmo-bsc/handover_fsm.c
M src/osmo-bsc/lchan_select.c
M src/osmo-bsc/osmo_bsc_bssap.c
M tests/codec_pref/codec_pref_test.c
8 files changed, 134 insertions(+), 169 deletions(-)

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



diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index aff73de..47ca5e8 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -98,15 +98,9 @@
SUBSCR_SCCP_ST_CONNECTED
 };

-enum channel_rate {
-   CH_RATE_SDCCH,
-   CH_RATE_HALF,
-   CH_RATE_FULL,
-};
-
 struct channel_mode_and_rate {
enum gsm48_chan_mode chan_mode;
-   enum channel_rate chan_rate;
+   bool full_rate;
uint16_t s15_s0;
 };

@@ -121,9 +115,12 @@
char msc_rtp_addr[INET_ADDRSTRLEN];
uint16_t msc_rtp_port;

-   /* Rate/codec setting in preference order (need at least 1 !) */
-   int n_ch_mode_rate;
-   struct channel_mode_and_rate ch_mode_rate[3];
+   /* Prefered rate/codec setting (mandatory) */
+   struct channel_mode_and_rate ch_mode_rate_pref;
+
+   /* Alternate rate/codec setting (optional) */
+   bool ch_mode_rate_alt_present;
+   struct channel_mode_and_rate ch_mode_rate_alt;
 };

 /* State of an ongoing Assignment, while the assignment_fsm is still busy. 
This serves as state separation to keep the
diff --git a/include/osmocom/bsc/lchan_select.h 
b/include/osmocom/bsc/lchan_select.h
index 865181b..4aecdf6 100644
--- a/include/osmocom/bsc/lchan_select.h
+++ b/include/osmocom/bsc/lchan_select.h
@@ -3,4 +3,4 @@

 struct gsm_lchan *lchan_select_by_type(struct gsm_bts *bts, enum gsm_chan_t 
type);
 struct gsm_lchan *lchan_select_by_chan_mode(struct gsm_bts *bts,
-   enum gsm48_chan_mode chan_mode, 
enum channel_rate chan_rate);
+   enum gsm48_chan_mode chan_mode, 
bool full_rate);
diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c
index 2180791..aa696ac 100644
--- a/src/osmo-bsc/assignment_fsm.c
+++ b/src/osmo-bsc/assignment_fsm.c
@@ -251,15 +251,17 @@
 static bool lchan_type_compat_with_mode(enum gsm_chan_t type, const struct 
channel_mode_and_rate *ch_mode_rate)
 {
enum gsm48_chan_mode chan_mode = ch_mode_rate->chan_mode;
-   enum channel_rate chan_rate = ch_mode_rate->chan_rate;
+   bool full_rate = ch_mode_rate->full_rate;

switch (chan_mode) {
case GSM48_CMODE_SIGN:
switch (type) {
-   case GSM_LCHAN_TCH_F: return chan_rate == CH_RATE_FULL;
-   case GSM_LCHAN_TCH_H: return chan_rate == CH_RATE_HALF;
-   case GSM_LCHAN_SDCCH: return chan_rate == CH_RATE_SDCCH;
-   default: return false;
+   case GSM_LCHAN_TCH_F:
+   case GSM_LCHAN_TCH_H:
+   case GSM_LCHAN_SDCCH:
+   return true;
+   default:
+   return false;
}

case GSM48_CMODE_SPEECH_V1:
@@ -267,12 +269,12 @@
case GSM48_CMODE_DATA_3k6:
case GSM48_CMODE_DATA_6k0:
/* these services can all run on TCH/H, but we may have
-* an explicit override by the 'chan_rate' argument */
+* an explicit override by the 'full_rate' argument */
switch (type) {
case GSM_LCHAN_TCH_F:
-   return chan_rate == CH_RATE_FULL;
+   return full_rate;
case GSM_LCHAN_TCH_H:
-   return chan_rate == CH_RATE_HALF;
+   return !full_rate;
default:
return false;
}
@@ -318,34 +320,45 @@
  * sure that both are consistent. */
 static int check_requires_voice_stream(struct gsm_subscriber_connection *conn)
 {
-   bool requires_voice_pref = false, requires_voice_alt;
+   bool result_requires_voice_alt;
+   bool result_requires_voice_pref;

Change in osmo-bsc[master]: Revert "assignment_fsm: Properly support assigning signalling mode TC...

[Neels Hofmeyr]

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

Change subject: Revert "assignment_fsm: Properly support assigning signalling 
mode TCH/x"
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/13256
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: I72aaa03539919e7e85b5b75b133326cec5e68bc9
Gerrit-Change-Number: 13256
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: tnt 
Gerrit-CC: Max 
Gerrit-Comment-Date: Thu, 14 Mar 2019 22:12:08 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bsc[master]: Revert "assignment_fsm: Properly support assigning signalling mode TC...

[Neels Hofmeyr]

Hello tnt, Vadim Yanitskiy, Harald Welte, Jenkins Builder,

I'd like you to do a code review. Please visit

https://gerrit.osmocom.org/13256

to review the following change.


Change subject: Revert "assignment_fsm: Properly support assigning signalling 
mode TCH/x"
..

Revert "assignment_fsm: Properly support assigning signalling mode TCH/x"

This commit breaks voice channel assignment. It results in the
Assignment Complete sent to the MSC for a voice lchan lacking
AoIP Transport Layer Address, Speech Version and Speech Codec.
Hence the MSC cannot complete the Assignment for a voice call.
Let's revisit this patch, test thoroughly and re-merge later.

This reverts commit 4d3a21269b25e7164a94fa8ce3ad67ff80904aee.

Reason for revert: 

Change-Id: I72aaa03539919e7e85b5b75b133326cec5e68bc9
---
M include/osmocom/bsc/gsm_data.h
M include/osmocom/bsc/lchan_select.h
M src/osmo-bsc/assignment_fsm.c
M src/osmo-bsc/codec_pref.c
M src/osmo-bsc/handover_fsm.c
M src/osmo-bsc/lchan_select.c
M src/osmo-bsc/osmo_bsc_bssap.c
M tests/codec_pref/codec_pref_test.c
8 files changed, 134 insertions(+), 169 deletions(-)



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

diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index fb0735a..c4315c0 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -98,15 +98,9 @@
SUBSCR_SCCP_ST_CONNECTED
 };

-enum channel_rate {
-   CH_RATE_SDCCH,
-   CH_RATE_HALF,
-   CH_RATE_FULL,
-};
-
 struct channel_mode_and_rate {
enum gsm48_chan_mode chan_mode;
-   enum channel_rate chan_rate;
+   bool full_rate;
uint16_t s15_s0;
 };

@@ -121,9 +115,12 @@
char msc_rtp_addr[INET_ADDRSTRLEN];
uint16_t msc_rtp_port;

-   /* Rate/codec setting in preference order (need at least 1 !) */
-   int n_ch_mode_rate;
-   struct channel_mode_and_rate ch_mode_rate[3];
+   /* Prefered rate/codec setting (mandatory) */
+   struct channel_mode_and_rate ch_mode_rate_pref;
+
+   /* Alternate rate/codec setting (optional) */
+   bool ch_mode_rate_alt_present;
+   struct channel_mode_and_rate ch_mode_rate_alt;
 };

 /* State of an ongoing Assignment, while the assignment_fsm is still busy. 
This serves as state separation to keep the
diff --git a/include/osmocom/bsc/lchan_select.h 
b/include/osmocom/bsc/lchan_select.h
index 865181b..4aecdf6 100644
--- a/include/osmocom/bsc/lchan_select.h
+++ b/include/osmocom/bsc/lchan_select.h
@@ -3,4 +3,4 @@

 struct gsm_lchan *lchan_select_by_type(struct gsm_bts *bts, enum gsm_chan_t 
type);
 struct gsm_lchan *lchan_select_by_chan_mode(struct gsm_bts *bts,
-   enum gsm48_chan_mode chan_mode, 
enum channel_rate chan_rate);
+   enum gsm48_chan_mode chan_mode, 
bool full_rate);
diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c
index 2180791..aa696ac 100644
--- a/src/osmo-bsc/assignment_fsm.c
+++ b/src/osmo-bsc/assignment_fsm.c
@@ -251,15 +251,17 @@
 static bool lchan_type_compat_with_mode(enum gsm_chan_t type, const struct 
channel_mode_and_rate *ch_mode_rate)
 {
enum gsm48_chan_mode chan_mode = ch_mode_rate->chan_mode;
-   enum channel_rate chan_rate = ch_mode_rate->chan_rate;
+   bool full_rate = ch_mode_rate->full_rate;

switch (chan_mode) {
case GSM48_CMODE_SIGN:
switch (type) {
-   case GSM_LCHAN_TCH_F: return chan_rate == CH_RATE_FULL;
-   case GSM_LCHAN_TCH_H: return chan_rate == CH_RATE_HALF;
-   case GSM_LCHAN_SDCCH: return chan_rate == CH_RATE_SDCCH;
-   default: return false;
+   case GSM_LCHAN_TCH_F:
+   case GSM_LCHAN_TCH_H:
+   case GSM_LCHAN_SDCCH:
+   return true;
+   default:
+   return false;
}

case GSM48_CMODE_SPEECH_V1:
@@ -267,12 +269,12 @@
case GSM48_CMODE_DATA_3k6:
case GSM48_CMODE_DATA_6k0:
/* these services can all run on TCH/H, but we may have
-* an explicit override by the 'chan_rate' argument */
+* an explicit override by the 'full_rate' argument */
switch (type) {
case GSM_LCHAN_TCH_F:
-   return chan_rate == CH_RATE_FULL;
+   return full_rate;
case GSM_LCHAN_TCH_H:
-   return chan_rate == CH_RATE_HALF;
+   return !full_rate;
default:
return false;
}
@@ -318,34 +320,45 @@
  * sure that both are consistent. */
 static int check_requires_voice_stream(struct gsm_subscriber_connection *conn)
 {
-   bool requires_voice_pref = false, requires_voice_alt;
+   bool 

Change in osmo-bsc[master]: assignment_fsm: Properly support assigning signalling mode TCH/x

[Neels Hofmeyr]

Neels Hofmeyr has created a revert of this change. ( 
https://gerrit.osmocom.org/13172 )

Change subject: assignment_fsm: Properly support assigning signalling mode TCH/x
..
--
To view, visit https://gerrit.osmocom.org/13172
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: revert
Gerrit-Change-Id: I4c7499c8c866ea3ff7b1327edb3615d003d927d3
Gerrit-Change-Number: 13172
Gerrit-PatchSet: 5
Gerrit-Owner: tnt 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: tnt 
Gerrit-CC: Max 

Change in osmo-ci[master]: ttcn3-testsuites: Split ttcn3-pcu-test-sns from ttcn3-pcu-test

[Harald Welte]

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

Change subject: ttcn3-testsuites: Split ttcn3-pcu-test-sns from ttcn3-pcu-test
..

ttcn3-testsuites: Split ttcn3-pcu-test-sns from ttcn3-pcu-test

The SNS variant of the tests require the PCU to be started with
different config file.

Change-Id: I42785b68f136198152ad79072346faccfe4a9424
---
M jobs/ttcn3-testsuites.yml
1 file changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved; Verified



diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml
index b53d3dd..0558144 100644
--- a/jobs/ttcn3-testsuites.yml
+++ b/jobs/ttcn3-testsuites.yml
@@ -35,6 +35,8 @@
   timer: 00 07 * * *
   - ttcn3-pcu-test:
   timer: 00 05 * * *
+  - ttcn3-pcu-test-sns:
+  timer: 15 05 * * *

   # latest stable
   - nplab-m3ua-test-latest:
@@ -61,6 +63,8 @@
   blocking: "^ttcn3-sip-test.*"
   - ttcn3-pcu-test-latest:
   blocking: "^ttcn3-pcu-test.*"
+  - ttcn3-pcu-test-sns-latest:
+  blocking: "^ttcn3-pcu-test-sns.*"
 - job-template:
 name: '{job-name}'
 project-type: freestyle

--
To view, visit https://gerrit.osmocom.org/13255
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: I42785b68f136198152ad79072346faccfe4a9424
Gerrit-Change-Number: 13255
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 

Change in osmo-ci[master]: ttcn3-testsuites: Split ttcn3-pcu-test-sns from ttcn3-pcu-test

[Harald Welte]

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

Change subject: ttcn3-testsuites: Split ttcn3-pcu-test-sns from ttcn3-pcu-test
..


Patch Set 1: Verified+1 Code-Review+2


--
To view, visit https://gerrit.osmocom.org/13255
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: I42785b68f136198152ad79072346faccfe4a9424
Gerrit-Change-Number: 13255
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Comment-Date: Thu, 14 Mar 2019 21:31:52 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Build failure of network:osmocom:latest/orcania in Raspbian_9.0/armv7l

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:latest/orcania/Raspbian_9.0/armv7l

Package network:osmocom:latest/orcania failed to build in Raspbian_9.0/armv7l

Check out the package for editing:
  osc checkout network:osmocom:latest orcania

Last lines of build log:
[  105s] Processing triggers for man-db (2.7.6.1-2) ...
[  105s] [172/225] installing perl-5.24.1-3+deb9u5
[  105s] update-alternatives: using /usr/bin/prename to provide /usr/bin/rename 
(rename) in auto mode
[  105s] Processing triggers for man-db (2.7.6.1-2) ...
[  106s] [173/225] installing gnupg-2.1.18-8~deb9u4
[  106s] Processing triggers for man-db (2.7.6.1-2) ...
[  106s] [174/225] installing libcurl3-7.52.1-5+deb9u9
[  106s] Processing triggers for libc-bin (2.24-11+deb9u4) ...
[  106s] [175/225] installing libarchive-zip-perl-1.59-1+deb9u1
[  106s] Processing triggers for man-db (2.7.6.1-2) ...
[  107s] [176/225] installing libtimedate-perl-2.3000-2
[  107s] Processing triggers for man-db (2.7.6.1-2) ...
[  107s] [177/225] installing raspbian-archive-keyring-20120528.2
[  107s] /var/lib/dpkg/info/raspbian-archive-keyring.postinst: 8: 
/var/lib/dpkg/info/raspbian-archive-keyring.postinst: apt-key: not found
[  107s] dpkg: error processing package raspbian-archive-keyring (--install):
[  107s]  subprocess installed post-installation script returned error exit 
status 127
[  107s] Errors were encountered while processing:
[  107s]  raspbian-archive-keyring
[  107s] exit ...
[  107s] 
[  107s] armbuild15 failed "build orcania_1.2.9-5.dsc" at Thu Mar 14 21:12:51 
UTC 2019.
[  107s] 
[  107s] ### VM INTERACTION START ###
[  110s] [   73.372252] sysrq: SysRq : Power Off
[  110s] [   73.374143] reboot: Power down
[  110s] ### VM INTERACTION END ###
[  110s] 
[  110s] armbuild15 failed "build orcania_1.2.9-5.dsc" at Thu Mar 14 21:12:54 
UTC 2019.
[  110s] 

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

Build failure of network:osmocom:nightly/orcania in Raspbian_9.0/armv7l

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/orcania/Raspbian_9.0/armv7l

Package network:osmocom:nightly/orcania failed to build in Raspbian_9.0/armv7l

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

Last lines of build log:
[  103s] Processing triggers for man-db (2.7.6.1-2) ...
[  103s] [172/225] installing perl-5.24.1-3+deb9u5
[  103s] update-alternatives: using /usr/bin/prename to provide /usr/bin/rename 
(rename) in auto mode
[  103s] Processing triggers for man-db (2.7.6.1-2) ...
[  103s] [173/225] installing gnupg-2.1.18-8~deb9u4
[  103s] Processing triggers for man-db (2.7.6.1-2) ...
[  104s] [174/225] installing libcurl3-7.52.1-5+deb9u9
[  104s] Processing triggers for libc-bin (2.24-11+deb9u4) ...
[  104s] [175/225] installing libarchive-zip-perl-1.59-1+deb9u1
[  104s] Processing triggers for man-db (2.7.6.1-2) ...
[  104s] [176/225] installing libtimedate-perl-2.3000-2
[  104s] Processing triggers for man-db (2.7.6.1-2) ...
[  105s] [177/225] installing raspbian-archive-keyring-20120528.2
[  105s] /var/lib/dpkg/info/raspbian-archive-keyring.postinst: 8: 
/var/lib/dpkg/info/raspbian-archive-keyring.postinst: apt-key: not found
[  105s] dpkg: error processing package raspbian-archive-keyring (--install):
[  105s]  subprocess installed post-installation script returned error exit 
status 127
[  105s] Errors were encountered while processing:
[  105s]  raspbian-archive-keyring
[  105s] exit ...
[  105s] 
[  105s] armbuild19 failed "build orcania_1.2.9-5.dsc" at Thu Mar 14 20:56:27 
UTC 2019.
[  105s] 
[  105s] ### VM INTERACTION START ###
[  108s] [   74.413077] sysrq: SysRq : Power Off
[  108s] [   74.415121] reboot: Power down
[  108s] ### VM INTERACTION END ###
[  108s] 
[  108s] armbuild19 failed "build orcania_1.2.9-5.dsc" at Thu Mar 14 20:56:31 
UTC 2019.
[  108s] 

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

Change in osmo-ci[master]: ttcn3-testsuites: Split ttcn3-pcu-test-sns from ttcn3-pcu-test

[Harald Welte]

Harald Welte has uploaded this change for review. ( 
https://gerrit.osmocom.org/13255


Change subject: ttcn3-testsuites: Split ttcn3-pcu-test-sns from ttcn3-pcu-test
..

ttcn3-testsuites: Split ttcn3-pcu-test-sns from ttcn3-pcu-test

The SNS variant of the tests require the PCU to be started with
different config file.

Change-Id: I42785b68f136198152ad79072346faccfe4a9424
---
M jobs/ttcn3-testsuites.yml
1 file changed, 4 insertions(+), 0 deletions(-)



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

diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml
index b53d3dd..0558144 100644
--- a/jobs/ttcn3-testsuites.yml
+++ b/jobs/ttcn3-testsuites.yml
@@ -35,6 +35,8 @@
   timer: 00 07 * * *
   - ttcn3-pcu-test:
   timer: 00 05 * * *
+  - ttcn3-pcu-test-sns:
+  timer: 15 05 * * *

   # latest stable
   - nplab-m3ua-test-latest:
@@ -61,6 +63,8 @@
   blocking: "^ttcn3-sip-test.*"
   - ttcn3-pcu-test-latest:
   blocking: "^ttcn3-pcu-test.*"
+  - ttcn3-pcu-test-sns-latest:
+  blocking: "^ttcn3-pcu-test-sns.*"
 - job-template:
 name: '{job-name}'
 project-type: freestyle

--
To view, visit https://gerrit.osmocom.org/13255
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: I42785b68f136198152ad79072346faccfe4a9424
Gerrit-Change-Number: 13255
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 

Change in docker-playground[master]: PCU: Differentiate between tests with classic and SNS Gb dialects

[Harald Welte]

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

Change subject: PCU: Differentiate between tests with classic and SNS Gb 
dialects
..

PCU: Differentiate between tests with classic and SNS Gb dialects

OsmoPCU needs to have the gb-dialect parameter configured right from
startup.  This means we'll split the ttcn3-pcu-test into two suites,
similarly to how we deal with AoIP / SCCPlite in the ttcn3-bsc-test.

Change-Id: I6e844f9ac4b87e801661fb1a1bdd25a15148f474
---
A ttcn3-pcu-test-sns/jenkins.sh
A ttcn3-pcu-test-sns/sns
M ttcn3-pcu-test/PCU_Tests.cfg
A ttcn3-pcu-test/jenkins-sns.sh
A ttcn3-pcu-test/sns/PCU_Tests.cfg
A ttcn3-pcu-test/sns/osmo-pcu.cfg
6 files changed, 82 insertions(+), 1 deletion(-)

Approvals:
  Harald Welte: Looks good to me, approved; Verified



diff --git a/ttcn3-pcu-test-sns/jenkins.sh b/ttcn3-pcu-test-sns/jenkins.sh
new file mode 12
index 000..8a1c657
--- /dev/null
+++ b/ttcn3-pcu-test-sns/jenkins.sh
@@ -0,0 +1 @@
+../ttcn3-pcu-test/jenkins-sns.sh
\ No newline at end of file
diff --git a/ttcn3-pcu-test-sns/sns b/ttcn3-pcu-test-sns/sns
new file mode 12
index 000..c2fe958
--- /dev/null
+++ b/ttcn3-pcu-test-sns/sns
@@ -0,0 +1 @@
+../ttcn3-pcu-test/sns
\ No newline at end of file
diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg
index 43ce941..07af661 100644
--- a/ttcn3-pcu-test/PCU_Tests.cfg
+++ b/ttcn3-pcu-test/PCU_Tests.cfg
@@ -21,4 +21,3 @@

 [EXECUTE]
 PCU_Tests_RAW.control
-PCU_Tests_RAW_SNS.control
diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh
new file mode 100755
index 000..7f57c09
--- /dev/null
+++ b/ttcn3-pcu-test/jenkins-sns.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+. ../jenkins-common.sh
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+docker_images_require \
+   "debian-jessie-build" \
+   "osmo-pcu-$IMAGE_SUFFIX" \
+   "debian-stretch-titan" \
+   "ttcn3-pcu-test"
+
+network_create 172.18.14.0/24
+
+mkdir $VOL_BASE_DIR/pcu-tester
+mkdir $VOL_BASE_DIR/pcu-tester/unix
+cp sns/PCU_Tests.cfg $VOL_BASE_DIR/pcu-tester/
+
+mkdir $VOL_BASE_DIR/pcu
+mkdir $VOL_BASE_DIR/pcu/unix
+cp sns/osmo-pcu.cfg $VOL_BASE_DIR/pcu/
+
+mkdir $VOL_BASE_DIR/unix
+
+echo Starting container with PCU
+docker run --rm \
+   --network $NET_NAME --ip 172.18.14.101 \
+   -v $VOL_BASE_DIR/pcu:/data \
+   -v $VOL_BASE_DIR/unix:/data/unix \
+   --name ${BUILD_TAG}-pcu-sns -d \
+   $REPO_USER/osmo-pcu-$IMAGE_SUFFIX \
+   /usr/local/bin/respawn.sh osmo-pcu -c /data/osmo-pcu.cfg
+
+echo Starting container with PCU testsuite
+docker run --rm \
+   --network $NET_NAME --ip 172.18.14.10 \
+   -e "TTCN3_PCAP_PATH=/data" \
+   -v $VOL_BASE_DIR/pcu-tester:/data \
+   -v $VOL_BASE_DIR/unix:/data/unix \
+   --name ${BUILD_TAG}-ttcn3-pcu-test-sns \
+   $REPO_USER/ttcn3-pcu-test
+
+echo Stopping containers
+docker container kill ${BUILD_TAG}-pcu-sns
+
+network_remove
+rm -rf $VOL_BASE_DIR/unix
+collect_logs
diff --git a/ttcn3-pcu-test/sns/PCU_Tests.cfg b/ttcn3-pcu-test/sns/PCU_Tests.cfg
new file mode 100644
index 000..07db9b3
--- /dev/null
+++ b/ttcn3-pcu-test/sns/PCU_Tests.cfg
@@ -0,0 +1,23 @@
+[ORDERED_INCLUDE]
+"/osmo-ttcn3-hacks/Common.cfg"
+"/osmo-ttcn3-hacks/pcu/PCU_Tests.default"
+
+[LOGGING]
+
+[TESTPORT_PARAMETERS]
+
+[MODULE_PARAMETERS]
+PCU_Tests_RAW.mp_pcu_sock_path := "/data/unix/pcu_bts"
+PCU_Tests.mp_nsconfig := {
+   local_ip := "172.18.14.10",
+   local_udp_port := 23000,
+   remote_ip := "172.18.14.101",
+   remote_udp_port := 23000,
+   nsvci := 1234,
+   nsei := 1234
+}
+
+[MAIN_CONTROLLER]
+
+[EXECUTE]
+PCU_Tests_RAW_SNS.control
diff --git a/ttcn3-pcu-test/sns/osmo-pcu.cfg b/ttcn3-pcu-test/sns/osmo-pcu.cfg
new file mode 100644
index 000..34ba20d
--- /dev/null
+++ b/ttcn3-pcu-test/sns/osmo-pcu.cfg
@@ -0,0 +1,11 @@
+line vty
+ no login
+ bind 0.0.0.0
+pcu
+ flow-control-interval 10
+ cs 2
+ alloc-algorithm dynamic
+ alpha 0
+ gamma 0
+ pcu-socket /data/unix/pcu_bts
+ gb-dialect ip-sns

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

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I6e844f9ac4b87e801661fb1a1bdd25a15148f474
Gerrit-Change-Number: 13254
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 

Change in docker-playground[master]: PCU: Differentiate between tests with classic and SNS Gb dialects

[Harald Welte]

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

Change subject: PCU: Differentiate between tests with classic and SNS Gb 
dialects
..


Patch Set 1: Verified+1 Code-Review+2


--
To view, visit https://gerrit.osmocom.org/13254
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: I6e844f9ac4b87e801661fb1a1bdd25a15148f474
Gerrit-Change-Number: 13254
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Comment-Date: Thu, 14 Mar 2019 20:50:35 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-ttcn3-hacks[master]: Generalize ttcn3-tcpdump-*.sh

[Max]

Max has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/13252 )

Change subject: Generalize ttcn3-tcpdump-*.sh
..

Generalize ttcn3-tcpdump-*.sh

Prepare for supporting alternative packet dumpers:
* reword comments
* rename pidfile
* move tcpdump-specific option inside if
* move comment about sudo closer to actual sudo invocation

Those are cosmetic changes which do not affect how packet dump is made
but makes it easier to support alternative packet dumpers in follow-up
commit.

Change-Id: Ib2528db65348c0422fe8b7c7c53656fbce4f6405
---
M ttcn3-tcpdump-start.sh
M ttcn3-tcpdump-stop.sh
2 files changed, 14 insertions(+), 14 deletions(-)

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



diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh
index 747002b..b8ad01a 100755
--- a/ttcn3-tcpdump-start.sh
+++ b/ttcn3-tcpdump-start.sh
@@ -1,6 +1,6 @@
 #!/bin/sh

-PIDFILE=/tmp/tcpdump.pid
+PIDFILE=/tmp/dumper.pid
 TCPDUMP=/usr/sbin/tcpdump
 TESTCASE=$1

@@ -16,19 +16,19 @@
rm $PIDFILE
 fi

+if [ "$(id -u)" = "0" ]; then
+   CMD="$TCPDUMP -U"
+else
 # NOTE: This requires you to be root or something like
 # "laforge ALL=NOPASSWD: /usr/sbin/tcpdump, /bin/kill" in your sudoers file
-if [ "$(id -u)" = "0" ]; then
-   CMD=$TCPDUMP
-else
-   CMD="sudo $TCPDUMP"
+   CMD="sudo $TCPDUMP -U"
 fi
-$CMD -U -s 1500 -n -i any -w "$TTCN3_PCAP_PATH/$TESTCASE.pcap" 
>$TTCN3_PCAP_PATH/$TESTCASE.pcap.stdout 2>&1 &
+$CMD -s 1500 -n -i any -w "$TTCN3_PCAP_PATH/$TESTCASE.pcap" 
>$TTCN3_PCAP_PATH/$TESTCASE.pcap.stdout 2>&1 &
 PID=$!
 echo $PID > $PIDFILE

-# Wait until tcpdump creates the pcap file and starts recording.
-# We generate some traffic until we see tcpdump catches it.
+# Wait until packet dumper creates the pcap file and starts recording.
+# We generate some traffic until we see packet dumper catches it.
 # Timeout is 10 seconds.
 ping 127.0.0.1 >/dev/null 2>&1 &
 PID=$!
@@ -36,7 +36,7 @@
 while [ ! -f "$TTCN3_PCAP_PATH/$TESTCASE.pcap" ] ||
   [ "$(stat -c '%s' "$TTCN3_PCAP_PATH/$TESTCASE.pcap")" -eq 32 ]
 do
-   echo "Waiting for tcpdump to start... $i"
+   echo "Waiting for packet dumper to start... $i"
sleep 1
i=$((i+1))
if [ $i -eq 10 ]; then
diff --git a/ttcn3-tcpdump-stop.sh b/ttcn3-tcpdump-stop.sh
index baabefe..f53cf5d 100755
--- a/ttcn3-tcpdump-stop.sh
+++ b/ttcn3-tcpdump-stop.sh
@@ -1,6 +1,6 @@
 #!/bin/sh

-PIDFILE=/tmp/tcpdump.pid
+PIDFILE=/tmp/dumper.pid
 TESTCASE=$1
 VERDICT="$2"

@@ -17,14 +17,14 @@
TTCN3_PCAP_PATH=/tmp
 fi

-# Wait for up to 2 seconds if we keep receiving traffinc from tcpdump,
+# Wait for up to 2 seconds if we keep receiving traffinc from packet dumper,
 # otherwise we might lose last packets from test.
 i=0
 prev_count=-1
 count=$(stat --format="%s" "$TTCN3_PCAP_PATH/$TESTCASE.pcap")
 while [ $count -gt $prev_count ] && [ $i -lt 2 ]
 do
-   echo "Waiting for tcpdump to finish... $i (prev_count=$prev_count, 
count=$count)"
+   echo "Waiting for packet dumper to finish... $i 
(prev_count=$prev_count, count=$count)"
sleep 1
prev_count=$count
count=$(stat --format="%s" "$TTCN3_PCAP_PATH/$TESTCASE.pcap")
@@ -32,11 +32,11 @@
 done

 if [ -e $PIDFILE ]; then
-   # NOTE: This requires you to be root or something like
-   # "laforge ALL=NOPASSWD: /usr/sbin/tcpdump, /bin/kill" in your sudoers 
file
if [ "$(id -u)" = "0" ]; then
kill "$(cat "$PIDFILE")"
else
+   # NOTE: This requires you to be root or something like
+   # "laforge ALL=NOPASSWD: /usr/sbin/tcpdump, /bin/kill" in your sudoers 
file
sudo kill "$(cat "$PIDFILE")"
fi
rm $PIDFILE

--
To view, visit https://gerrit.osmocom.org/13252
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: Ib2528db65348c0422fe8b7c7c53656fbce4f6405
Gerrit-Change-Number: 13252
Gerrit-PatchSet: 2
Gerrit-Owner: Max 
Gerrit-Reviewer: Daniel Willmann 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: osmith 

Change in osmo-ttcn3-hacks[master]: Generalize ttcn3-tcpdump-*.sh

[Harald Welte]

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

Change subject: Generalize ttcn3-tcpdump-*.sh
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/13252
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: Ib2528db65348c0422fe8b7c7c53656fbce4f6405
Gerrit-Change-Number: 13252
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Daniel Willmann 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 14 Mar 2019 20:45:34 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-ttcn3-hacks[master]: Use dumpcap for ttcn3-tcpdump-*.sh if available

[Harald Welte]

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

Change subject: Use dumpcap for ttcn3-tcpdump-*.sh if available
..


Patch Set 1:

I really like the idea and I'm surprised we didn't do this sooner.  However, 
the fact that dumpcap is installed doesn't mean that a) it's setuid-root, or b) 
the current user has the right group/permission

On Debian systems, for example, it's part of the package configuration that is 
performed during package installation.

I think for this to work properly we'd need some way to test if capturing 
actually worked or if it was rejected before taking a decision for dumpcap.


--
To view, visit https://gerrit.osmocom.org/13253
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: I77df04d51a469c924cf727f0596cc33565909746
Gerrit-Change-Number: 13253
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Daniel Willmann 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: osmith 
Gerrit-CC: Harald Welte 
Gerrit-Comment-Date: Thu, 14 Mar 2019 20:44:55 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in docker-playground[master]: PCU: Differentiate between tests with classic and SNS Gb dialects

[Harald Welte]

Harald Welte has uploaded this change for review. ( 
https://gerrit.osmocom.org/13254


Change subject: PCU: Differentiate between tests with classic and SNS Gb 
dialects
..

PCU: Differentiate between tests with classic and SNS Gb dialects

OsmoPCU needs to have the gb-dialect parameter configured right from
startup.  This means we'll split the ttcn3-pcu-test into two suites,
similarly to how we deal with AoIP / SCCPlite in the ttcn3-bsc-test.

Change-Id: I6e844f9ac4b87e801661fb1a1bdd25a15148f474
---
A ttcn3-pcu-test-sns/jenkins.sh
A ttcn3-pcu-test-sns/sns
M ttcn3-pcu-test/PCU_Tests.cfg
A ttcn3-pcu-test/jenkins-sns.sh
A ttcn3-pcu-test/sns/PCU_Tests.cfg
A ttcn3-pcu-test/sns/osmo-pcu.cfg
6 files changed, 82 insertions(+), 1 deletion(-)



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

diff --git a/ttcn3-pcu-test-sns/jenkins.sh b/ttcn3-pcu-test-sns/jenkins.sh
new file mode 12
index 000..8a1c657
--- /dev/null
+++ b/ttcn3-pcu-test-sns/jenkins.sh
@@ -0,0 +1 @@
+../ttcn3-pcu-test/jenkins-sns.sh
\ No newline at end of file
diff --git a/ttcn3-pcu-test-sns/sns b/ttcn3-pcu-test-sns/sns
new file mode 12
index 000..c2fe958
--- /dev/null
+++ b/ttcn3-pcu-test-sns/sns
@@ -0,0 +1 @@
+../ttcn3-pcu-test/sns
\ No newline at end of file
diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg
index 43ce941..07af661 100644
--- a/ttcn3-pcu-test/PCU_Tests.cfg
+++ b/ttcn3-pcu-test/PCU_Tests.cfg
@@ -21,4 +21,3 @@

 [EXECUTE]
 PCU_Tests_RAW.control
-PCU_Tests_RAW_SNS.control
diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh
new file mode 100755
index 000..7f57c09
--- /dev/null
+++ b/ttcn3-pcu-test/jenkins-sns.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+. ../jenkins-common.sh
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+docker_images_require \
+   "debian-jessie-build" \
+   "osmo-pcu-$IMAGE_SUFFIX" \
+   "debian-stretch-titan" \
+   "ttcn3-pcu-test"
+
+network_create 172.18.14.0/24
+
+mkdir $VOL_BASE_DIR/pcu-tester
+mkdir $VOL_BASE_DIR/pcu-tester/unix
+cp sns/PCU_Tests.cfg $VOL_BASE_DIR/pcu-tester/
+
+mkdir $VOL_BASE_DIR/pcu
+mkdir $VOL_BASE_DIR/pcu/unix
+cp sns/osmo-pcu.cfg $VOL_BASE_DIR/pcu/
+
+mkdir $VOL_BASE_DIR/unix
+
+echo Starting container with PCU
+docker run --rm \
+   --network $NET_NAME --ip 172.18.14.101 \
+   -v $VOL_BASE_DIR/pcu:/data \
+   -v $VOL_BASE_DIR/unix:/data/unix \
+   --name ${BUILD_TAG}-pcu-sns -d \
+   $REPO_USER/osmo-pcu-$IMAGE_SUFFIX \
+   /usr/local/bin/respawn.sh osmo-pcu -c /data/osmo-pcu.cfg
+
+echo Starting container with PCU testsuite
+docker run --rm \
+   --network $NET_NAME --ip 172.18.14.10 \
+   -e "TTCN3_PCAP_PATH=/data" \
+   -v $VOL_BASE_DIR/pcu-tester:/data \
+   -v $VOL_BASE_DIR/unix:/data/unix \
+   --name ${BUILD_TAG}-ttcn3-pcu-test-sns \
+   $REPO_USER/ttcn3-pcu-test
+
+echo Stopping containers
+docker container kill ${BUILD_TAG}-pcu-sns
+
+network_remove
+rm -rf $VOL_BASE_DIR/unix
+collect_logs
diff --git a/ttcn3-pcu-test/sns/PCU_Tests.cfg b/ttcn3-pcu-test/sns/PCU_Tests.cfg
new file mode 100644
index 000..07db9b3
--- /dev/null
+++ b/ttcn3-pcu-test/sns/PCU_Tests.cfg
@@ -0,0 +1,23 @@
+[ORDERED_INCLUDE]
+"/osmo-ttcn3-hacks/Common.cfg"
+"/osmo-ttcn3-hacks/pcu/PCU_Tests.default"
+
+[LOGGING]
+
+[TESTPORT_PARAMETERS]
+
+[MODULE_PARAMETERS]
+PCU_Tests_RAW.mp_pcu_sock_path := "/data/unix/pcu_bts"
+PCU_Tests.mp_nsconfig := {
+   local_ip := "172.18.14.10",
+   local_udp_port := 23000,
+   remote_ip := "172.18.14.101",
+   remote_udp_port := 23000,
+   nsvci := 1234,
+   nsei := 1234
+}
+
+[MAIN_CONTROLLER]
+
+[EXECUTE]
+PCU_Tests_RAW_SNS.control
diff --git a/ttcn3-pcu-test/sns/osmo-pcu.cfg b/ttcn3-pcu-test/sns/osmo-pcu.cfg
new file mode 100644
index 000..34ba20d
--- /dev/null
+++ b/ttcn3-pcu-test/sns/osmo-pcu.cfg
@@ -0,0 +1,11 @@
+line vty
+ no login
+ bind 0.0.0.0
+pcu
+ flow-control-interval 10
+ cs 2
+ alloc-algorithm dynamic
+ alpha 0
+ gamma 0
+ pcu-socket /data/unix/pcu_bts
+ gb-dialect ip-sns

--
To view, visit https://gerrit.osmocom.org/13254
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: I6e844f9ac4b87e801661fb1a1bdd25a15148f474
Gerrit-Change-Number: 13254
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 

Change in osmo-ttcn3-hacks[master]: Use dumpcap for ttcn3-tcpdump-*.sh if available

[Max]

Max has uploaded this change for review. ( https://gerrit.osmocom.org/13253


Change subject: Use dumpcap for ttcn3-tcpdump-*.sh if available
..

Use dumpcap for ttcn3-tcpdump-*.sh if available

Check if dumpcap is installed and use it for packet capture instead of
'sudo tcpdump' if available. This makes it easier to use TTCN-3
testsuite as regular user without altering sudoers.

Change-Id: I77df04d51a469c924cf727f0596cc33565909746
---
M ttcn3-tcpdump-start.sh
M ttcn3-tcpdump-stop.sh
2 files changed, 11 insertions(+), 7 deletions(-)



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

diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh
index b8ad01a..14773d9 100755
--- a/ttcn3-tcpdump-start.sh
+++ b/ttcn3-tcpdump-start.sh
@@ -16,12 +16,16 @@
rm $PIDFILE
 fi

-if [ "$(id -u)" = "0" ]; then
-   CMD="$TCPDUMP -U"
-else
-# NOTE: This requires you to be root or something like
-# "laforge ALL=NOPASSWD: /usr/sbin/tcpdump, /bin/kill" in your sudoers file
-   CMD="sudo $TCPDUMP -U"
+if [ -x /usr/bin/dumpcap ]; then
+   CMD=/usr/bin/dumpcap
+   else
+   if [ "$(id -u)" = "0" ]; then
+  CMD="$TCPDUMP -U"
+   else
+   # NOTE: This requires you to be root or something like
+   # "laforge ALL=NOPASSWD: /usr/sbin/tcpdump, /bin/kill" in your sudoers 
file
+  CMD="sudo $TCPDUMP -U"
+   fi
 fi
 $CMD -s 1500 -n -i any -w "$TTCN3_PCAP_PATH/$TESTCASE.pcap" 
>$TTCN3_PCAP_PATH/$TESTCASE.pcap.stdout 2>&1 &
 PID=$!
diff --git a/ttcn3-tcpdump-stop.sh b/ttcn3-tcpdump-stop.sh
index f53cf5d..2dd1e2d 100755
--- a/ttcn3-tcpdump-stop.sh
+++ b/ttcn3-tcpdump-stop.sh
@@ -32,7 +32,7 @@
 done

 if [ -e $PIDFILE ]; then
-   if [ "$(id -u)" = "0" ]; then
+   if [ "$(id -u)" = "0" -o -x /usr/bin/dumpcap ]; then
kill "$(cat "$PIDFILE")"
else
# NOTE: This requires you to be root or something like

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

Change in osmo-ttcn3-hacks[master]: Generalize ttcn3-tcpdump-*.sh

[Max]

Max has uploaded this change for review. ( https://gerrit.osmocom.org/13252


Change subject: Generalize ttcn3-tcpdump-*.sh
..

Generalize ttcn3-tcpdump-*.sh

Prepare for supporting alternative packet dumpers:
* reword comments
* rename pidfile
* move tcpdump-specific option inside if
* move comment about sudo closer to actual sudo invocation

Those are cosmetic changes which do not affect how packet dump is made
but makes it easier to support alternative packet dumpers in follow-up
commit.

Change-Id: Ib2528db65348c0422fe8b7c7c53656fbce4f6405
---
M ttcn3-tcpdump-start.sh
M ttcn3-tcpdump-stop.sh
2 files changed, 14 insertions(+), 14 deletions(-)



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

diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh
index 747002b..b8ad01a 100755
--- a/ttcn3-tcpdump-start.sh
+++ b/ttcn3-tcpdump-start.sh
@@ -1,6 +1,6 @@
 #!/bin/sh

-PIDFILE=/tmp/tcpdump.pid
+PIDFILE=/tmp/dumper.pid
 TCPDUMP=/usr/sbin/tcpdump
 TESTCASE=$1

@@ -16,19 +16,19 @@
rm $PIDFILE
 fi

+if [ "$(id -u)" = "0" ]; then
+   CMD="$TCPDUMP -U"
+else
 # NOTE: This requires you to be root or something like
 # "laforge ALL=NOPASSWD: /usr/sbin/tcpdump, /bin/kill" in your sudoers file
-if [ "$(id -u)" = "0" ]; then
-   CMD=$TCPDUMP
-else
-   CMD="sudo $TCPDUMP"
+   CMD="sudo $TCPDUMP -U"
 fi
-$CMD -U -s 1500 -n -i any -w "$TTCN3_PCAP_PATH/$TESTCASE.pcap" 
>$TTCN3_PCAP_PATH/$TESTCASE.pcap.stdout 2>&1 &
+$CMD -s 1500 -n -i any -w "$TTCN3_PCAP_PATH/$TESTCASE.pcap" 
>$TTCN3_PCAP_PATH/$TESTCASE.pcap.stdout 2>&1 &
 PID=$!
 echo $PID > $PIDFILE

-# Wait until tcpdump creates the pcap file and starts recording.
-# We generate some traffic until we see tcpdump catches it.
+# Wait until packet dumper creates the pcap file and starts recording.
+# We generate some traffic until we see packet dumper catches it.
 # Timeout is 10 seconds.
 ping 127.0.0.1 >/dev/null 2>&1 &
 PID=$!
@@ -36,7 +36,7 @@
 while [ ! -f "$TTCN3_PCAP_PATH/$TESTCASE.pcap" ] ||
   [ "$(stat -c '%s' "$TTCN3_PCAP_PATH/$TESTCASE.pcap")" -eq 32 ]
 do
-   echo "Waiting for tcpdump to start... $i"
+   echo "Waiting for packet dumper to start... $i"
sleep 1
i=$((i+1))
if [ $i -eq 10 ]; then
diff --git a/ttcn3-tcpdump-stop.sh b/ttcn3-tcpdump-stop.sh
index baabefe..f53cf5d 100755
--- a/ttcn3-tcpdump-stop.sh
+++ b/ttcn3-tcpdump-stop.sh
@@ -1,6 +1,6 @@
 #!/bin/sh

-PIDFILE=/tmp/tcpdump.pid
+PIDFILE=/tmp/dumper.pid
 TESTCASE=$1
 VERDICT="$2"

@@ -17,14 +17,14 @@
TTCN3_PCAP_PATH=/tmp
 fi

-# Wait for up to 2 seconds if we keep receiving traffinc from tcpdump,
+# Wait for up to 2 seconds if we keep receiving traffinc from packet dumper,
 # otherwise we might lose last packets from test.
 i=0
 prev_count=-1
 count=$(stat --format="%s" "$TTCN3_PCAP_PATH/$TESTCASE.pcap")
 while [ $count -gt $prev_count ] && [ $i -lt 2 ]
 do
-   echo "Waiting for tcpdump to finish... $i (prev_count=$prev_count, 
count=$count)"
+   echo "Waiting for packet dumper to finish... $i 
(prev_count=$prev_count, count=$count)"
sleep 1
prev_count=$count
count=$(stat --format="%s" "$TTCN3_PCAP_PATH/$TESTCASE.pcap")
@@ -32,11 +32,11 @@
 done

 if [ -e $PIDFILE ]; then
-   # NOTE: This requires you to be root or something like
-   # "laforge ALL=NOPASSWD: /usr/sbin/tcpdump, /bin/kill" in your sudoers 
file
if [ "$(id -u)" = "0" ]; then
kill "$(cat "$PIDFILE")"
else
+   # NOTE: This requires you to be root or something like
+   # "laforge ALL=NOPASSWD: /usr/sbin/tcpdump, /bin/kill" in your sudoers 
file
sudo kill "$(cat "$PIDFILE")"
fi
rm $PIDFILE

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

Change in osmo-bsc[master]: net_init.c: remove unneeded header

[Pau Espin Pedrol]

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

Change subject: net_init.c: remove unneeded header
..

net_init.c: remove unneeded header

Change-Id: I9c2d07914bb19429bfc1f2c5a38a513749068304
---
M src/osmo-bsc/net_init.c
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/src/osmo-bsc/net_init.c b/src/osmo-bsc/net_init.c
index 5ea564d..b4ff489 100644
--- a/src/osmo-bsc/net_init.c
+++ b/src/osmo-bsc/net_init.c
@@ -18,7 +18,6 @@
  */

 #include 
-#include 
 #include 
 #include 
 #include 

--
To view, visit https://gerrit.osmocom.org/13224
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: I9c2d07914bb19429bfc1f2c5a38a513749068304
Gerrit-Change-Number: 13224
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 

Change in osmo-bsc[master]: src/utils/Makefile.am: Drop unneeded sigtran and mgcp-client deps

[Pau Espin Pedrol]

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

Change subject: src/utils/Makefile.am: Drop unneeded sigtran and mgcp-client 
deps
..

src/utils/Makefile.am: Drop unneeded sigtran and mgcp-client deps

Change-Id: I1a91d673e08c161dd6110bd16e8f52cb17be398c
---
M src/utils/Makefile.am
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 914a604..24cd230 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -11,8 +11,6 @@
$(LIBOSMOABIS_CFLAGS) \
$(COVERAGE_CFLAGS) \
$(SQLITE3_CFLAGS) \
-   $(LIBOSMOSIGTRAN_CFLAGS) \
-   $(LIBOSMOMGCPCLIENT_CFLAGS) \
$(NULL)

 AM_LDFLAGS = \
@@ -132,4 +130,3 @@
$(LIBOSMOGSM_CFLAGS) \
$(LIBOSMOABIS_CFLAGS) \
$(NULL)
-

--
To view, visit https://gerrit.osmocom.org/13223
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: I1a91d673e08c161dd6110bd16e8f52cb17be398c
Gerrit-Change-Number: 13223
Gerrit-PatchSet: 3
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-CC: Max 

Change in osmo-bsc[master]: ipaccess/Makefile.am: Remove unneeded libosmo-sigtran dep

[Pau Espin Pedrol]

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

Change subject: ipaccess/Makefile.am: Remove unneeded libosmo-sigtran dep
..

ipaccess/Makefile.am: Remove unneeded libosmo-sigtran dep

Change-Id: Idc26f178fa8942fe407ca01e23b0a21955727dca
---
M src/ipaccess/Makefile.am
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am
index c504234..3578a40 100644
--- a/src/ipaccess/Makefile.am
+++ b/src/ipaccess/Makefile.am
@@ -10,7 +10,6 @@
$(LIBOSMOGSM_CFLAGS) \
$(LIBOSMOABIS_CFLAGS) \
$(COVERAGE_CFLAGS) \
-   $(LIBOSMOSIGTRAN_CFLAGS) \
$(NULL)

 AM_LDFLAGS = \
@@ -21,7 +20,6 @@
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOABIS_LIBS) \
-   $(LIBOSMOSIGTRAN_LIBS) \
$(NULL)

 bin_PROGRAMS = \

--
To view, visit https://gerrit.osmocom.org/13219
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: Idc26f178fa8942fe407ca01e23b0a21955727dca
Gerrit-Change-Number: 13219
Gerrit-PatchSet: 4
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 

Change in osmo-bsc[master]: configure.ac: Add flag to enable/disable build of ipaccess related utils

[Pau Espin Pedrol]

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

Change subject: configure.ac: Add flag to enable/disable build of ipaccess 
related utils
..

configure.ac: Add flag to enable/disable build of ipaccess related utils

Change-Id: Iff70dc46c77b2ac58351ad9a91caf3f524c6fd89
---
M configure.ac
M src/Makefile.am
2 files changed, 9 insertions(+), 1 deletion(-)

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



diff --git a/configure.ac b/configure.ac
index eafe4d6..cdee90c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,6 +38,11 @@
 AC_SEARCH_LIBS([dlopen], [dl dld], [LIBRARY_DL="$LIBS";LIBS=""])
 AC_SUBST(LIBRARY_DL)

+# Enable/disable ipaccess-utils (src/ipacces/)?
+AC_ARG_ENABLE([ipaccess-utils], [AS_HELP_STRING([--enable-ipaccess-utils], 
[Build ipaccess utils: abisip-find, ipaccess-config, ...])],
+[osmo_ac_ipa_utils="$enableval"],[osmo_ac_ipa_utils="yes"])
+AM_CONDITIONAL(BUILD_IPA_UTILS, test "x$osmo_ac_ipa_utils" = "xyes")
+AC_SUBST(osmo_ac_ipa_utils)

 PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.12.0)
 PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.12.0)
diff --git a/src/Makefile.am b/src/Makefile.am
index 6c63eea..62ae4dd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,5 +23,8 @@
libfilter \
osmo-bsc \
utils \
-   ipaccess \
$(NULL)
+
+if BUILD_IPA_UTILS
+SUBDIRS += ipaccess
+endif

--
To view, visit https://gerrit.osmocom.org/13222
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: Iff70dc46c77b2ac58351ad9a91caf3f524c6fd89
Gerrit-Change-Number: 13222
Gerrit-PatchSet: 3
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-CC: Max 

Change in osmo-bsc[master]: Move msc related code from gsm_data to bsc_msc

[Pau Espin Pedrol]

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

Change subject: Move msc related code from gsm_data to bsc_msc
..

Move msc related code from gsm_data to bsc_msc

This way ipaccess utils can be built without requiring libosmo-sigtran.

Change-Id: I508188896be58ddc3bd4e9c3c661c258c06866f4
---
M include/osmocom/bsc/bsc_msc_data.h
M include/osmocom/bsc/gsm_data.h
M src/osmo-bsc/gsm_data.c
M src/osmo-bsc/osmo_bsc_msc.c
M tests/handover/Makefile.am
5 files changed, 19 insertions(+), 19 deletions(-)

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



diff --git a/include/osmocom/bsc/bsc_msc_data.h 
b/include/osmocom/bsc/bsc_msc_data.h
index 9f2d7d8..5202174 100644
--- a/include/osmocom/bsc/bsc_msc_data.h
+++ b/include/osmocom/bsc/bsc_msc_data.h
@@ -161,6 +161,9 @@
 struct bsc_msc_data *osmo_msc_data_find(struct gsm_network *, int);
 struct bsc_msc_data *osmo_msc_data_alloc(struct gsm_network *, int);

+
+struct osmo_cell_global_id *cgi_for_msc(struct bsc_msc_data *msc, struct 
gsm_bts *bts);
+
 /* Helper function to calculate the port number for a given
  * timeslot/multiplex. This functionality is needed to support
  * the sccp-lite scenario where the MGW is handled externally */
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index fb0735a..aff73de 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -1690,6 +1690,4 @@

 int bts_count_free_ts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan);

-struct osmo_cell_global_id *cgi_for_msc(struct bsc_msc_data *msc, struct 
gsm_bts *bts);
-
 #endif /* _GSM_DATA_H */
diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c
index 0198fcf..a128216 100644
--- a/src/osmo-bsc/gsm_data.c
+++ b/src/osmo-bsc/gsm_data.c
@@ -38,7 +38,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -1694,19 +1693,3 @@
OSMO_VALUE_STRING(FOR_VTY),
{}
 };
-
-struct osmo_cell_global_id *cgi_for_msc(struct bsc_msc_data *msc, struct 
gsm_bts *bts)
-{
-   static struct osmo_cell_global_id cgi;
-   cgi.lai.plmn = msc->network->plmn;
-   if (msc->core_plmn.mcc != GSM_MCC_MNC_INVALID)
-   cgi.lai.plmn.mcc = msc->core_plmn.mcc;
-   if (msc->core_plmn.mnc != GSM_MCC_MNC_INVALID) {
-   cgi.lai.plmn.mnc = msc->core_plmn.mnc;
-   cgi.lai.plmn.mnc_3_digits = msc->core_plmn.mnc_3_digits;
-   }
-   cgi.lai.lac = (msc->core_lac != -1) ? msc->core_lac : 
bts->location_area_code;
-   cgi.cell_identity = (msc->core_ci != -1) ? msc->core_ci : 
bts->cell_identity;
-
-   return 
-}
diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c
index 71931e6..4df1ce4 100644
--- a/src/osmo-bsc/osmo_bsc_msc.c
+++ b/src/osmo-bsc/osmo_bsc_msc.c
@@ -119,3 +119,18 @@
return msc_data;
 }

+struct osmo_cell_global_id *cgi_for_msc(struct bsc_msc_data *msc, struct 
gsm_bts *bts)
+{
+   static struct osmo_cell_global_id cgi;
+   cgi.lai.plmn = msc->network->plmn;
+   if (msc->core_plmn.mcc != GSM_MCC_MNC_INVALID)
+   cgi.lai.plmn.mcc = msc->core_plmn.mcc;
+   if (msc->core_plmn.mnc != GSM_MCC_MNC_INVALID) {
+   cgi.lai.plmn.mnc = msc->core_plmn.mnc;
+   cgi.lai.plmn.mnc_3_digits = msc->core_plmn.mnc_3_digits;
+   }
+   cgi.lai.lac = (msc->core_lac != -1) ? msc->core_lac : 
bts->location_area_code;
+   cgi.cell_identity = (msc->core_ci != -1) ? msc->core_ci : 
bts->cell_identity;
+
+   return 
+}
diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am
index 5e9af04..5e4440c 100644
--- a/tests/handover/Makefile.am
+++ b/tests/handover/Makefile.am
@@ -69,6 +69,7 @@
$(top_builddir)/src/osmo-bsc/neighbor_ident.o \
$(top_builddir)/src/osmo-bsc/net_init.o \
$(top_builddir)/src/osmo-bsc/osmo_bsc_lcls.o \
+   $(top_builddir)/src/osmo-bsc/osmo_bsc_msc.o \
$(top_builddir)/src/osmo-bsc/paging.o \
$(top_builddir)/src/osmo-bsc/pcu_sock.o \
$(top_builddir)/src/osmo-bsc/penalty_timers.o \

--
To view, visit https://gerrit.osmocom.org/13221
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: I508188896be58ddc3bd4e9c3c661c258c06866f4
Gerrit-Change-Number: 13221
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 

Change in osmo-ttcn3-hacks[master]: Log PCU socket path on errors

[Harald Welte]

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

Change subject: Log PCU socket path on errors
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/13250
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: I5a4a7c9dc630ecd6fc0ca7a21d4b528d811edd06
Gerrit-Change-Number: 13250
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Thu, 14 Mar 2019 16:01:08 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-ttcn3-hacks[master]: Log FN and RA in TC_rach_max_ta

[Harald Welte]

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

Change subject: Log FN and RA in TC_rach_max_ta
..

Log FN and RA in TC_rach_max_ta

Similar to other RA-related tests, log FN and RA values in case of test
failure.

Change-Id: I815b10d0f0e9f29de7d306fa052b72b9e483dd9d
---
M bts/BTS_Tests.ttcn
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 0b70da3..86d43fe 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -1100,7 +1100,7 @@
setverdict(pass);
}
[expect_pass] T.timeout {
-   Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout 
waiting for CHAN RQD");
+   Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, 
log2str("Timeout waiting for CHAN RQD: FN=", fn, " RA=", ra));
}
}
 }

--
To view, visit https://gerrit.osmocom.org/13251
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: I815b10d0f0e9f29de7d306fa052b72b9e483dd9d
Gerrit-Change-Number: 13251
Gerrit-PatchSet: 2
Gerrit-Owner: Max 
Gerrit-Reviewer: Daniel Willmann 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: osmith 

Change in osmo-ttcn3-hacks[master]: Log FN and RA in TC_rach_max_ta

[Harald Welte]

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

Change subject: Log FN and RA in TC_rach_max_ta
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/13251
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: I815b10d0f0e9f29de7d306fa052b72b9e483dd9d
Gerrit-Change-Number: 13251
Gerrit-PatchSet: 2
Gerrit-Owner: Max 
Gerrit-Reviewer: Daniel Willmann 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 14 Mar 2019 16:00:30 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-pcu[master]: MCS: add mcs_is_*() helpers

[Harald Welte]

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

Change subject: MCS: add mcs_is_*() helpers
..


Patch Set 3: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/13214
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: I6699cbc8d7ae766fa4d2b3d37e5f9ff1cf158b7e
Gerrit-Change-Number: 13214
Gerrit-PatchSet: 3
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Comment-Date: Thu, 14 Mar 2019 15:58:52 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-pcu[master]: Fix TA index encoder

[Harald Welte]

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

Change subject: Fix TA index encoder
..


Patch Set 3: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/13238
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: I54482790e1cf3cb13a635a99a481250576deabaf
Gerrit-Change-Number: 13238
Gerrit-PatchSet: 3
Gerrit-Owner: Max 
Gerrit-Reviewer: Daniel Willmann 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 14 Mar 2019 15:58:06 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bsc[master]: configure.ac: Add flag to enable/disable build of ipaccess related utils

[Harald Welte]

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

Change subject: configure.ac: Add flag to enable/disable build of ipaccess 
related utils
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/13222
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: Iff70dc46c77b2ac58351ad9a91caf3f524c6fd89
Gerrit-Change-Number: 13222
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-CC: Max 
Gerrit-Comment-Date: Thu, 14 Mar 2019 15:57:11 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-pcu[master]: MCS: use value_string for conversion

[Harald Welte]

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

Change subject: MCS: use value_string for conversion
..


Patch Set 8: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/13069
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: I212ebb892ab162821633974d5a6c7e315d308370
Gerrit-Change-Number: 13069
Gerrit-PatchSet: 8
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Comment-Date: Thu, 14 Mar 2019 15:57:30 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bsc[master]: net_init.c: remove unneeded header

[Harald Welte]

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

Change subject: net_init.c: remove unneeded header
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/13224
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: I9c2d07914bb19429bfc1f2c5a38a513749068304
Gerrit-Change-Number: 13224
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Comment-Date: Thu, 14 Mar 2019 15:56:59 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bsc[master]: ipaccess/Makefile.am: Remove unneeded libosmo-sigtran dep

[Harald Welte]

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

Change subject: ipaccess/Makefile.am: Remove unneeded libosmo-sigtran dep
..


Patch Set 3: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/13219
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: Idc26f178fa8942fe407ca01e23b0a21955727dca
Gerrit-Change-Number: 13219
Gerrit-PatchSet: 3
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Comment-Date: Thu, 14 Mar 2019 15:56:55 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bsc[master]: Move msc related code from gsm_data to bsc_msc

[Harald Welte]

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

Change subject: Move msc related code from gsm_data to bsc_msc
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/13221
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: I508188896be58ddc3bd4e9c3c661c258c06866f4
Gerrit-Change-Number: 13221
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Comment-Date: Thu, 14 Mar 2019 15:56:49 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-ttcn3-hacks[master]: Log FN and RA in TC_rach_max_ta

[Max]

Max has posted comments on this change. ( https://gerrit.osmocom.org/13251 )

Change subject: Log FN and RA in TC_rach_max_ta
..


Patch Set 2:

This change is ready for review.


--
To view, visit https://gerrit.osmocom.org/13251
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: I815b10d0f0e9f29de7d306fa052b72b9e483dd9d
Gerrit-Change-Number: 13251
Gerrit-PatchSet: 2
Gerrit-Owner: Max 
Gerrit-Reviewer: Daniel Willmann 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 14 Mar 2019 15:44:28 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in libosmo-sccp[master]: Store + show remote ip/port in dynamically created ASPs

[Harald Welte]

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

Change subject: Store + show remote ip/port in dynamically created ASPs
..

Store + show remote ip/port in dynamically created ASPs

"show cs7 instance 0 asp" before this patch would not display the
remote IP/port information about dynamically-added ASPs but instead:

  Effect Primary

ASP Name  AS Name   State  Type  Rmt Port Remote IP Addr  SCTP
    -     --- 
--
asp-dyn-0 ? ASP_ACTIVE m3ua  0(null)

With this patch it is now correctly displayed:
  Effect Primary

ASP Name  AS Name   State  Type  Rmt Port Remote IP Addr  SCTP
    -     --- 
--
asp-dyn-0 ? ASP_ACTIVE m3ua  24905127.0.0.1

Change-Id: I39a1c57bc72e8aff607f3a551811a2f6372adab4
Closes: OS#3836
---
M src/osmo_ss7.c
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c
index 381a53a..f8633b6 100644
--- a/src/osmo_ss7.c
+++ b/src/osmo_ss7.c
@@ -1691,9 +1691,15 @@
asp = osmo_ss7_asp_find_or_create(oxs->inst, namebuf, 
0, 0,
  oxs->cfg.proto);
if (asp) {
+   char hostbuf[INET6_ADDRSTRLEN];
+   char portbuf[16];
+
+   osmo_sock_get_ip_and_port(fd, hostbuf, 
sizeof(hostbuf), portbuf, sizeof(portbuf), false);
LOGP(DLSS7, LOGL_INFO, "%s: created dynamicASP 
%s\n",
sock_name, asp->cfg.name);
asp->cfg.is_server = true;
+   asp->cfg.remote.port = atoi(portbuf);
+   asp->cfg.remote.host = talloc_strdup(asp, 
hostbuf);
asp->dyn_allocated = true;
asp->server = srv;
osmo_ss7_asp_restart(asp);

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

Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I39a1c57bc72e8aff607f3a551811a2f6372adab4
Gerrit-Change-Number: 13234
Gerrit-PatchSet: 3
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 

Change in osmo-pcu[master]: Use unique NSEI/BVCI/NSVCI in TBF tests

[Max]

Max has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/13201 )

Change subject: Use unique NSEI/BVCI/NSVCI in TBF tests
..

Use unique NSEI/BVCI/NSVCI in TBF tests

This works around the issue with colliding rate counter group index
highlighted by 86e35e488740889f8ad03d09a78918839b883240 by using
different NSEI/BVCI/NSVCI parameters for different TBF tests.

Change-Id: Id7d2d1a48308a6b1fb17768aee0e79adbdee56ee
Related: OS#3827
---
M tests/tbf/TbfTest.cpp
M tests/tbf/TbfTest.err
2 files changed, 5 insertions(+), 14 deletions(-)

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



diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp
index 0d473a1..993ca10 100644
--- a/tests/tbf/TbfTest.cpp
+++ b/tests/tbf/TbfTest.cpp
@@ -449,8 +449,7 @@

bts = the_bts.bts_data();
setup_bts(_bts, ts_no);
-   gprs_bssgp_create_and_connect(bts, 33001, 0, 33001,
-   1234, 1234, 1234, 1, 1, false, 0, 0, 0);
+   gprs_bssgp_create_and_connect(bts, 33001, 0, 33001, 1234, 1234, 1234, 
1, 1, false, 0, 0, 0);

for (i = 0; i < 1024; i++) {
uint32_t tlli = 0xc000 + i;
@@ -492,8 +491,7 @@
setup_bts(_bts, ts_no);
bts->ms_idle_sec = 10; /* keep the MS object */

-   gprs_bssgp_create_and_connect(bts, 33001, 0, 33001,
-   1234, 1234, 1234, 1, 1, false, 0, 0, 0);
+   gprs_bssgp_create_and_connect(bts, 33001, 0, 33001, 2234, 2234, 2234, 
1, 1, false, 0, 0, 0);

/* Handle LLC frame 1 */
memset(buf, 1, sizeof(buf));
@@ -2179,8 +2177,7 @@
/* EGPRS-only */
bts->egprs_enabled = 1;

-   gprs_bssgp_create_and_connect(bts, 33001, 0, 33001,
-   1234, 1234, 1234, 1, 1, false, 0, 0, 0);
+   gprs_bssgp_create_and_connect(bts, 33001, 0, 33001, 3234, 3234, 3234, 
1, 1, false, 0, 0, 0);

/* Does not support EGPRS */
rc = gprs_rlcmac_dl_tbf::handle(bts, tlli, 0, imsi, ms_class, 0,
@@ -2241,8 +2238,7 @@
bts->trx[0].pdch[4].enable();
bts->trx[0].pdch[5].enable();

-   gprs_bssgp_create_and_connect(bts, 33001, 0, 33001,
-   1234, 1234, 1234, 1, 1, false, 0, 0, 0);
+   gprs_bssgp_create_and_connect(bts, 33001, 0, 33001, 4234, 4234, 4234, 
1, 1, false, 0, 0, 0);

/* Does no support EGPRS */
dl_tbf = tbf_alloc_dl_tbf(bts, NULL, 0, ms_class, 0, false);
@@ -2279,8 +2275,7 @@
bts->trx[0].pdch[4].enable();
bts->trx[0].pdch[5].enable();

-   gprs_bssgp_create_and_connect(bts, 33001, 0, 33001,
-   1234, 1234, 1234, 1, 1, false, 0, 0, 0);
+   gprs_bssgp_create_and_connect(bts, 33001, 0, 33001, 5234, 5234, 5234, 
1, 1, false, 0, 0, 0);

/* EGPRS-only */
bts->egprs_enabled = 1;
diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err
index 8d5adf9..355ec69 100644
--- a/tests/tbf/TbfTest.err
+++ b/tests/tbf/TbfTest.err
@@ -1337,7 +1337,6 @@
 - Failed to find a usable TRX (TFI exhausted)
 No PDCH resource
 Destroying MS object, TLLI = 0x
-counter group 'bssgp:bss_ctx' already exists for index 1234, instead using 
index 1235. This is a software bug that needs fixing.
 ** DL-TBF starts here **
 Allocating DL TBF: MS_CLASS=45/0
 Creating MS object, TLLI = 0x
@@ -3032,10 +3031,8 @@
 TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) starting timer T3191 [final 
block (DL-TBF)] with 0 sec. 0 microsec, cur_fn=0
 TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduled Ack/Nack polling on 
FN=2654461, TS=7
 TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) msg block (BSN 10, CS-1): 0f 
03 14 4d 43 20 50 41 43 4b 45 54 20 30 39 20 28 54 42 46 20 32 29
-counter group 'bssgp:bss_ctx' already exists for index 1234, instead using 
index 1236. This is a software bug that needs fixing.
 Not accepting non-EGPRS phone in EGPRS-only mode
 No PDCH resource
-counter group 'bssgp:bss_ctx' already exists for index 1234, instead using 
index 1237. This is a software bug that needs fixing.
 ** DL-TBF starts here **
 Allocating DL TBF: MS_CLASS=12/0
 Creating MS object, TLLI = 0x
@@ -5924,7 +5921,6 @@
 TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS) set ass. type PACCH [prev 
CCCH:0, PACCH:0]
 TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS) starting timer T0 
[assignment (PACCH)] with 2 sec. 0 microsec, cur_fn=0
 TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS) appending 256 bytes
-counter group 'bssgp:bss_ctx' already exists for index 1234, instead using 
index 1238. This is a software bug that needs fixing.
 ** DL-TBF starts here **
 Allocating DL TBF: MS_CLASS=11/11
 Creating MS object, TLLI = 0x

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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: 

Change in osmo-pcu[master]: Use unique NSEI/BVCI/NSVCI in TBF tests

[Harald Welte]

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

Change subject: Use unique NSEI/BVCI/NSVCI in TBF tests
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/13201
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: Id7d2d1a48308a6b1fb17768aee0e79adbdee56ee
Gerrit-Change-Number: 13201
Gerrit-PatchSet: 2
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Thu, 14 Mar 2019 15:37:32 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-ggsn[master]: Don't return error on normal shutdown

[Harald Welte]

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

Change subject: Don't return error on normal shutdown
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I7fe0d3e052953d5b87ce65649d88d83476fee3c0
Gerrit-Change-Number: 13249
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: tnt 
Gerrit-Comment-Date: Thu, 14 Mar 2019 15:37:48 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-ggsn[master]: Don't return error on normal shutdown

[Harald Welte]

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

Change subject: Don't return error on normal shutdown
..

Don't return error on normal shutdown

Previously we've always returned error code from main() even in case of
regular expected shutdown. Let's not confuse it with actual error
shutdown and return 0 by default.

Change-Id: I7fe0d3e052953d5b87ce65649d88d83476fee3c0
---
M ggsn/ggsn.c
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  Pau Espin Pedrol: Looks good to me, but someone else must approve
  tnt: 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/ggsn/ggsn.c b/ggsn/ggsn.c
index 39695b9..dd723e9 100644
--- a/ggsn/ggsn.c
+++ b/ggsn/ggsn.c
@@ -1158,5 +1158,5 @@
llist_for_each_entry(ggsn, _ggsn_list, list)
ggsn_stop(ggsn);

-   return 1;
+   return 0;
 }

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

Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I7fe0d3e052953d5b87ce65649d88d83476fee3c0
Gerrit-Change-Number: 13249
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: tnt 

Change in libosmo-netif[master]: tests: AM_LDFLAGS = -noinstall for all tests

[Harald Welte]

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

Change subject: tests: AM_LDFLAGS = -noinstall for all tests
..


Patch Set 4: Code-Review+2

similar patch for all unit tests in all repositories would be good. thanks


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

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I94ccff42dfba71aaf59bb30ca312db0bac58c27d
Gerrit-Change-Number: 13241
Gerrit-PatchSet: 4
Gerrit-Owner: osmith 
Gerrit-Reviewer: Alexander Huemer 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pablo Neira Ayuso 
Gerrit-Reviewer: dexter 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: steve-m 
Gerrit-Reviewer: tnt 
Gerrit-Comment-Date: Thu, 14 Mar 2019 15:36:41 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-ttcn3-hacks[master]: Log FN and RA in TC_rach_max_ta

[Max]

Max has uploaded this change for review. ( https://gerrit.osmocom.org/13251


Change subject: Log FN and RA in TC_rach_max_ta
..

Log FN and RA in TC_rach_max_ta

Similar to other RA-related tests, log FN and RA values in case of test
failure.

Change-Id: I815b10d0f0e9f29de7d306fa052b72b9e483dd9d
---
M bts/BTS_Tests.ttcn
1 file changed, 1 insertion(+), 1 deletion(-)



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

diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 0b70da3..45f599d 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -1100,7 +1100,7 @@
setverdict(pass);
}
[expect_pass] T.timeout {
-   Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout 
waiting for CHAN RQD");
+   Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout 
waiting for CHAN RQD: FN=", fn, " RA=", ra);
}
}
 }

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

Change in osmo-ttcn3-hacks[master]: Log PCU socket path on errors

[Max]

Max has uploaded this change for review. ( https://gerrit.osmocom.org/13250


Change subject: Log PCU socket path on errors
..

Log PCU socket path on errors

Change-Id: I5a4a7c9dc630ecd6fc0ca7a21d4b528d811edd06
---
M library/PCUIF_CodecPort.ttcn
1 file changed, 6 insertions(+), 6 deletions(-)



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

diff --git a/library/PCUIF_CodecPort.ttcn b/library/PCUIF_CodecPort.ttcn
index 676a91a..cc86fee 100644
--- a/library/PCUIF_CodecPort.ttcn
+++ b/library/PCUIF_CodecPort.ttcn
@@ -66,9 +66,9 @@
if (ispresent(res.result) and ispresent(res.result.result_code) 
and
res.result.result_code == ERROR) {
if (ispresent(res.result.err)) {
-   setverdict(fail, "Error connecting to PCU 
socket: ", res.result.err);
+   setverdict(fail, "Error connecting to PCU 
socket ", sock, ": ", res.result.err);
} else {
-   setverdict(fail, "Error connecting to PCU 
socket");
+   setverdict(fail, "Error connecting to PCU 
socket ", sock);
}
mtc.stop;
} else {
@@ -76,7 +76,7 @@
}
}
[] T.timeout {
-   setverdict(fail, "Timeout connecting to PCU socket");
+   setverdict(fail, "Timeout connecting to PCU socket ", sock);
mtc.stop;
}
}
@@ -95,9 +95,9 @@
if (ispresent(res.result) and ispresent 
(res.result.result_code) and
res.result.result_code == ERROR) {
if (ispresent(res.result.err)) {
-   setverdict(fail, "Error listening on PCU 
socket: ", res.result.err);
+   setverdict(fail, "Error listening on PCU socket 
", sock, ": ", res.result.err);
} else {
-   setverdict(fail, "Error listening on PCU 
socket");
+   setverdict(fail, "Error listening on PCU socket 
", sock);
}
mtc.stop;
} else {
@@ -105,7 +105,7 @@
}
}
[] T.timeout {
-   setverdict(fail, "Timeout waiting for PCU socket connection");
+   setverdict(fail, "Timeout waiting for PCU socket ", sock, " 
connection");
mtc.stop;
}
}

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

Change in osmo-ggsn[master]: Don't return error on normal shutdown

[Vadim Yanitskiy]

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

Change subject: Don't return error on normal shutdown
..


Patch Set 1: Code-Review+1


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

Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I7fe0d3e052953d5b87ce65649d88d83476fee3c0
Gerrit-Change-Number: 13249
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: tnt 
Gerrit-Comment-Date: Thu, 14 Mar 2019 15:26:54 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-ggsn[master]: Don't return error on normal shutdown

[tnt]

tnt has posted comments on this change. ( https://gerrit.osmocom.org/13249 )

Change subject: Don't return error on normal shutdown
..


Patch Set 1: Code-Review+1


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

Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I7fe0d3e052953d5b87ce65649d88d83476fee3c0
Gerrit-Change-Number: 13249
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: tnt 
Gerrit-Comment-Date: Thu, 14 Mar 2019 15:26:32 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-ggsn[master]: Don't return error on normal shutdown

[Pau Espin Pedrol]

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

Change subject: Don't return error on normal shutdown
..


Patch Set 1: Code-Review+1


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

Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I7fe0d3e052953d5b87ce65649d88d83476fee3c0
Gerrit-Change-Number: 13249
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 14 Mar 2019 15:21:02 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-ggsn[master]: Don't return error on normal shutdown

[Max]

Max has uploaded this change for review. ( https://gerrit.osmocom.org/13249


Change subject: Don't return error on normal shutdown
..

Don't return error on normal shutdown

Previously we've always returned error code from main() even in case of
regular expected shutdown. Let's not confuse it with actual error
shutdown and return 0 by default.

Change-Id: I7fe0d3e052953d5b87ce65649d88d83476fee3c0
---
M ggsn/ggsn.c
1 file changed, 1 insertion(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/49/13249/1

diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c
index 39695b9..dd723e9 100644
--- a/ggsn/ggsn.c
+++ b/ggsn/ggsn.c
@@ -1158,5 +1158,5 @@
llist_for_each_entry(ggsn, _ggsn_list, list)
ggsn_stop(ggsn);

-   return 1;
+   return 0;
 }

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

Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7fe0d3e052953d5b87ce65649d88d83476fee3c0
Gerrit-Change-Number: 13249
Gerrit-PatchSet: 1
Gerrit-Owner: Max 

Change in osmo-bsc[master]: Move LCLS references from gsm_data to osmo_bsc_lcls

[Pau Espin Pedrol]

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

Change subject: Move LCLS references from gsm_data to osmo_bsc_lcls
..

Move LCLS references from gsm_data to osmo_bsc_lcls

This commit aims at better ordering of content in order to get rid of
sigtran stuff in gsm_data. This way we can avoid requiring
libosmo-sigtran when building ipaccess utils.

Change-Id: I8941f059d6e4eb21a971d48d2b66c29ec3355a6d
---
M include/osmocom/bsc/bsc_msc_data.h
M include/osmocom/bsc/osmo_bsc_lcls.h
M src/osmo-bsc/gsm_data.c
M src/osmo-bsc/osmo_bsc_lcls.c
4 files changed, 24 insertions(+), 20 deletions(-)

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



diff --git a/include/osmocom/bsc/bsc_msc_data.h 
b/include/osmocom/bsc/bsc_msc_data.h
index 0c2094e..9f2d7d8 100644
--- a/include/osmocom/bsc/bsc_msc_data.h
+++ b/include/osmocom/bsc/bsc_msc_data.h
@@ -29,6 +29,7 @@
 #define _OSMO_MSC_DATA_H

 #include "debug.h"
+#include "osmo_bsc_lcls.h"

 #include 
 #include 
@@ -53,19 +54,6 @@
MSC_CON_TYPE_LOCAL,
 };

-enum bsc_lcls_mode {
-   BSC_LCLS_MODE_DISABLED,
-   BSC_LCLS_MODE_MGW_LOOP,
-   BSC_LCLS_MODE_BTS_LOOP,
-};
-
-extern const struct value_string bsc_lcls_mode_names[];
-
-static inline const char *bsc_lcls_mode_name(enum bsc_lcls_mode m)
-{
-   return get_value_string(bsc_lcls_mode_names, m);
-}
-
 /*! /brief Information on a remote MSC for libbsc.
  */
 struct bsc_msc_data {
diff --git a/include/osmocom/bsc/osmo_bsc_lcls.h 
b/include/osmocom/bsc/osmo_bsc_lcls.h
index d98fe98..8bbd552 100644
--- a/include/osmocom/bsc/osmo_bsc_lcls.h
+++ b/include/osmocom/bsc/osmo_bsc_lcls.h
@@ -1,4 +1,7 @@
 #pragma once
+
+#include "gsm_data.h"
+
 #include 

 enum lcls_fsm_state {
@@ -29,6 +32,19 @@
LCLS_EV_OTHER_DEAD,
 };

+enum bsc_lcls_mode {
+   BSC_LCLS_MODE_DISABLED,
+   BSC_LCLS_MODE_MGW_LOOP,
+   BSC_LCLS_MODE_BTS_LOOP,
+};
+
+extern const struct value_string bsc_lcls_mode_names[];
+
+static inline const char *bsc_lcls_mode_name(enum bsc_lcls_mode m)
+{
+   return get_value_string(bsc_lcls_mode_names, m);
+}
+
 enum gsm0808_lcls_status lcls_get_status(const struct 
gsm_subscriber_connection *conn);

 void lcls_update_config(struct gsm_subscriber_connection *conn,
diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c
index 0492571..0198fcf 100644
--- a/src/osmo-bsc/gsm_data.c
+++ b/src/osmo-bsc/gsm_data.c
@@ -37,6 +37,7 @@
 #include 

 #include 
+#include 
 #include 
 #include 
 #include 
@@ -46,13 +47,6 @@

 void *tall_bsc_ctx = NULL;

-const struct value_string bsc_lcls_mode_names[] = {
-   { BSC_LCLS_MODE_DISABLED,   "disabled" },
-   { BSC_LCLS_MODE_MGW_LOOP,   "mgw-loop" },
-   { BSC_LCLS_MODE_BTS_LOOP,   "bts-loop" },
-   { 0, NULL }
-};
-
 static LLIST_HEAD(bts_models);

 void set_ts_e1link(struct gsm_bts_trx_ts *ts, uint8_t e1_nr,
diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c
index f7b84e1..c1f62dc 100644
--- a/src/osmo-bsc/osmo_bsc_lcls.c
+++ b/src/osmo-bsc/osmo_bsc_lcls.c
@@ -42,6 +42,12 @@
{ 0, NULL }
 };

+const struct value_string bsc_lcls_mode_names[] = {
+   { BSC_LCLS_MODE_DISABLED,   "disabled" },
+   { BSC_LCLS_MODE_MGW_LOOP,   "mgw-loop" },
+   { BSC_LCLS_MODE_BTS_LOOP,   "bts-loop" },
+   { 0, NULL }
+};

 /***
  * Utility functions

--
To view, visit https://gerrit.osmocom.org/13220
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: I8941f059d6e4eb21a971d48d2b66c29ec3355a6d
Gerrit-Change-Number: 13220
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 

Change in osmo-msc[master]: libmsc: Allow different channel types to be requested as silent calls

[tnt]

tnt has posted comments on this change. ( https://gerrit.osmocom.org/13242 )

Change subject: libmsc: Allow different channel types to be requested as silent 
calls
..


Patch Set 3: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/13242
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: I82645708dd27864cf33ea9cc993ead0983415602
Gerrit-Change-Number: 13242
Gerrit-PatchSet: 3
Gerrit-Owner: tnt 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: tnt 
Gerrit-CC: Harald Welte 
Gerrit-CC: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 14 Mar 2019 12:39:28 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-msc[master]: libmsc: Allow different channel types to be requested as silent calls

[tnt]

tnt has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/13242 )

Change subject: libmsc: Allow different channel types to be requested as silent 
calls
..

libmsc: Allow different channel types to be requested as silent calls

Change-Id: I82645708dd27864cf33ea9cc993ead0983415602
---
M include/osmocom/msc/silent_call.h
M src/libmsc/msc_vty.c
M src/libmsc/silent_call.c
3 files changed, 160 insertions(+), 23 deletions(-)

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



diff --git a/include/osmocom/msc/silent_call.h 
b/include/osmocom/msc/silent_call.h
index 70324e5..ca36052 100644
--- a/include/osmocom/msc/silent_call.h
+++ b/include/osmocom/msc/silent_call.h
@@ -2,9 +2,12 @@
 #define _SILENT_CALL_H

 struct ran_conn;
+struct gsm0808_channel_type;

 extern int gsm_silent_call_start(struct vlr_subscr *vsub,
- void *data, int type);
+   const struct gsm0808_channel_type *ct,
+   const char *traffic_dst_ip, uint16_t traffic_dst_port,
+   void *data);
 extern int gsm_silent_call_stop(struct vlr_subscr *vsub);

 #if 0
diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c
index ac3946a..6404ee9 100644
--- a/src/libmsc/msc_vty.c
+++ b/src/libmsc/msc_vty.c
@@ -1066,21 +1066,35 @@
return rc;
 }

-#define CHAN_TYPES "(any|tch/f|tch/any|sdcch)"
+#define CHAN_TYPES "(any|tch/f|tch/h|tch/any|sdcch)"
 #define CHAN_TYPE_HELP \
"Any channel\n" \
"TCH/F channel\n"   \
+   "TCH/H channel\n"   \
"Any TCH channel\n" \
"SDCCH channel\n"

+#define CHAN_MODES "(signalling|speech-hr|speech-fr|speech-efr|speech-amr)"
+#define CHAN_MODE_HELP \
+   "Signalling only\n" \
+   "Speech with HR codec\n"\
+   "Speech with FR codec\n"\
+   "Speech with EFR codec\n"   \
+   "Speech with AMR codec\n"
+
 DEFUN(subscriber_silent_call_start,
   subscriber_silent_call_start_cmd,
-  "subscriber " SUBSCR_TYPES " ID silent-call start 
(any|tch/f|tch/any|sdcch)",
+  "subscriber " SUBSCR_TYPES " ID silent-call start " CHAN_TYPES " " 
CHAN_MODES " [IP] [<0-65535>]",
SUBSCR_HELP "Silent call operation\n" "Start silent call\n"
-   CHAN_TYPE_HELP)
+   CHAN_TYPE_HELP CHAN_MODE_HELP
+   "Target IP for RTP traffic (default 127.0.0.1)\n"
+   "Target port for RTP traffic (default: 4000)\n")
 {
struct vlr_subscr *vsub = get_vsub_by_argv(gsmnet, argv[0], argv[1]);
-   int rc, type;
+   struct gsm0808_channel_type ct;
+   const char *ip;
+   uint16_t port;
+   int rc, speech;

if (!vsub) {
vty_out(vty, "%% No subscriber found for %s %s%s",
@@ -1088,16 +1102,52 @@
return CMD_WARNING;
}

-   if (!strcmp(argv[2], "tch/f"))
-   type = RSL_CHANNEED_TCH_F;
-   else if (!strcmp(argv[2], "tch/any"))
-   type = RSL_CHANNEED_TCH_ForH;
-   else if (!strcmp(argv[2], "sdcch"))
-   type = RSL_CHANNEED_SDCCH;
-   else
-   type = RSL_CHANNEED_ANY;/* Defaults to ANY */
+   memset(, 0x00, sizeof(ct));

-   rc = gsm_silent_call_start(vsub, vty, type);
+   if (!strcmp(argv[3], "signalling")) {
+   ct.ch_indctr = GSM0808_CHAN_SIGN;
+   ct.perm_spch[0] = 0; /* Spare but required */
+   ct.perm_spch_len = 1;
+   } else if (!strcmp(argv[3], "speech-hr")) {
+   ct.ch_indctr = GSM0808_CHAN_SPEECH;
+   ct.perm_spch[0] = GSM0808_PERM_HR1;
+   ct.perm_spch_len = 1;
+   } else if (!strcmp(argv[3], "speech-fr")) {
+   ct.ch_indctr = GSM0808_CHAN_SPEECH;
+   ct.perm_spch[0] = GSM0808_PERM_FR1;
+   ct.perm_spch_len = 1;
+   } else if (!strcmp(argv[3], "speech-efr")) {
+   ct.ch_indctr = GSM0808_CHAN_SPEECH;
+   ct.perm_spch[0] = GSM0808_PERM_FR2;
+   ct.perm_spch_len = 1;
+   } else if (!strcmp(argv[3], "speech-amr")) {
+   ct.ch_indctr = GSM0808_CHAN_SPEECH;
+   ct.perm_spch[0] = GSM0808_PERM_FR3;
+   ct.perm_spch[1] = GSM0808_PERM_HR3;
+   ct.perm_spch_len = 2;
+   }
+
+   speech = ct.ch_indctr == GSM0808_CHAN_SPEECH;
+
+   if (!strcmp(argv[2], "tch/f"))
+   ct.ch_rate_type = speech ? GSM0808_SPEECH_FULL_BM : 
GSM0808_SIGN_FULL_BM;
+   else if (!strcmp(argv[2], "tch/h"))
+   ct.ch_rate_type = speech ? GSM0808_SPEECH_HALF_LM : 
GSM0808_SIGN_HALF_LM;
+   else if (!strcmp(argv[2], "tch/any"))
+   

Change in osmo-dev[master]: run.sh: fix $TO_RAN_IP and $TO_RAN_IU_IP usage

[Neels Hofmeyr]

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

Change subject: run.sh: fix $TO_RAN_IP and $TO_RAN_IU_IP usage
..

run.sh: fix $TO_RAN_IP and $TO_RAN_IU_IP usage

Add curly braces around both variables, so they get replaced properly
again.

Change-Id: I1f0f749b74fe5fd3982e045283735151f69c2487
---
M net/templates/run.sh
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Pau Espin Pedrol: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, but someone else must approve
  Neels Hofmeyr: Looks good to me, approved; Verified



diff --git a/net/templates/run.sh b/net/templates/run.sh
index 804262a..3244b11 100755
--- a/net/templates/run.sh
+++ b/net/templates/run.sh
@@ -27,14 +27,14 @@
   sudo ip link set $apn up
 fi

-if [ -z "$(ip addr show | grep "$TO_RAN_IP")" ]; then
-  echo "No interface has IP address $TO_RAN_IP! Hit enter to continue anyway."
+if [ -z "$(ip addr show | grep "${TO_RAN_IP}")" ]; then
+  echo "No interface has IP address ${TO_RAN_IP}! Hit enter to continue 
anyway."
   read enter_to_continue
 fi
-if [ -z "$(ip addr show | grep "$TO_RAN_IU_IP")" ]; then
-  echo "No interface has IP address $TO_RAN_IU_IP! Hit enter to 'ip addr add 
$TO_RAN_IU_IP/32 dev $dev'"
+if [ -z "$(ip addr show | grep "${TO_RAN_IU_IP}")" ]; then
+  echo "No interface has IP address ${TO_RAN_IU_IP}! Hit enter to 'ip addr add 
${TO_RAN_IU_IP}/32 dev $dev'"
   read enter_to_continue
-  sudo ip addr add $TO_RAN_IU_IP/32 dev $dev
+  sudo ip addr add ${TO_RAN_IU_IP}/32 dev $dev
 fi

 logdir="current_log"

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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I1f0f749b74fe5fd3982e045283735151f69c2487
Gerrit-Change-Number: 13235
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Pau Espin Pedrol 

Change in osmo-dev[master]: run.sh: fix $TO_RAN_IP and $TO_RAN_IU_IP usage

[Neels Hofmeyr]

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

Change subject: run.sh: fix $TO_RAN_IP and $TO_RAN_IU_IP usage
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I1f0f749b74fe5fd3982e045283735151f69c2487
Gerrit-Change-Number: 13235
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 14 Mar 2019 12:28:47 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-dev[master]: run.sh: fix $TO_RAN_IP and $TO_RAN_IU_IP usage

[Neels Hofmeyr]

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

Change subject: run.sh: fix $TO_RAN_IP and $TO_RAN_IU_IP usage
..


Patch Set 1: Verified+1


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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I1f0f749b74fe5fd3982e045283735151f69c2487
Gerrit-Change-Number: 13235
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 14 Mar 2019 12:28:57 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-msc[master]: libmsc: Allow different channel types to be requested as silent calls

[Vadim Yanitskiy]

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

Change subject: libmsc: Allow different channel types to be requested as silent 
calls
..


Patch Set 3: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/13242
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: I82645708dd27864cf33ea9cc993ead0983415602
Gerrit-Change-Number: 13242
Gerrit-PatchSet: 3
Gerrit-Owner: tnt 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: tnt 
Gerrit-CC: Harald Welte 
Gerrit-CC: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 14 Mar 2019 12:26:33 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libosmo-netif[master]: tests: AM_LDFLAGS = -noinstall for all tests

[osmith]

osmith has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/13241 )

Change subject: tests: AM_LDFLAGS = -noinstall for all tests
..

tests: AM_LDFLAGS = -noinstall for all tests

Fix a symbol lookup error when building a new test on systems where
a previous libosmonetif.so is installed. Symptoms described here in
detail: https://osmocom.org/issues/3812#note-10

-no-install causes libtool to generate output files that link against
libraries in the build tree, instead of linking against the future
installation paths and generating a wrapper script. The wrapper script
should override the library paths, but at least on Debian, it does not
work as it should. Test binaries won't be installed anyway, so we can
safely use -no-install and work around the problem.

See also:
https://autotools.io/libtool/wrappers.html
https://www.gnu.org/software/libtool/manual/html_node/Link-mode.html

Related: OS#3812
Change-Id: I94ccff42dfba71aaf59bb30ca312db0bac58c27d
---
M tests/Makefile.am
1 file changed, 1 insertion(+), 2 deletions(-)

Approvals:
  Max: Looks good to me, but someone else must approve
  tnt: Looks good to me, but someone else must approve
  osmith: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/tests/Makefile.am b/tests/Makefile.am
index 36447be..dd7703a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
 AM_CFLAGS = -Wall -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) -g
-AM_LDFLAGS = $(LIBOSMOCORE_LDFLAGS)
+AM_LDFLAGS = $(LIBOSMOCORE_LDFLAGS) -no-install

 check_PROGRAMS = osmux/osmux_test osmux/osmux_test2 stream/stream_test 
jibuf/jibuf_test amr/amr_test
 check_HEADERS =
@@ -12,7 +12,6 @@

 stream_stream_test_SOURCES = stream/stream_test.c
 stream_stream_test_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) 
$(top_builddir)/src/libosmonetif.la
-stream_stream_test_LDFLAGS = -no-install

 jibuf_jibuf_test_SOURCES = jibuf/jibuf_test.c
 jibuf_jibuf_test_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) 
$(top_builddir)/src/libosmonetif.la

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

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I94ccff42dfba71aaf59bb30ca312db0bac58c27d
Gerrit-Change-Number: 13241
Gerrit-PatchSet: 4
Gerrit-Owner: osmith 
Gerrit-Reviewer: Alexander Huemer 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pablo Neira Ayuso 
Gerrit-Reviewer: dexter 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: steve-m 
Gerrit-Reviewer: tnt 

Change in libosmo-netif[master]: tests: AM_LDFLAGS = -noinstall for all tests

[osmith]

osmith has posted comments on this change. ( https://gerrit.osmocom.org/13241 )

Change subject: tests: AM_LDFLAGS = -noinstall for all tests
..


Patch Set 3: Code-Review+2


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

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I94ccff42dfba71aaf59bb30ca312db0bac58c27d
Gerrit-Change-Number: 13241
Gerrit-PatchSet: 3
Gerrit-Owner: osmith 
Gerrit-Reviewer: Alexander Huemer 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pablo Neira Ayuso 
Gerrit-Reviewer: dexter 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: steve-m 
Gerrit-Reviewer: tnt 
Gerrit-Comment-Date: Thu, 14 Mar 2019 12:03:27 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libosmo-netif[master]: gitignore: add amr_test

[osmith]

osmith has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/13247 )

Change subject: gitignore: add amr_test
..

gitignore: add amr_test

Change-Id: I1ea7aad144a505412969c6c301349f8d47964422
---
M .gitignore
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Max: Looks good to me, but someone else must approve
  tnt: Looks good to me, but someone else must approve
  osmith: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/.gitignore b/.gitignore
index e2f2fb9..23d5b42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,4 @@
 jibuf_tool
 osmux_test2
 stream_test
+amr_test

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

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I1ea7aad144a505412969c6c301349f8d47964422
Gerrit-Change-Number: 13247
Gerrit-PatchSet: 2
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: tnt 

Change in libosmo-netif[master]: gitignore: add amr_test

[osmith]

osmith has posted comments on this change. ( https://gerrit.osmocom.org/13247 )

Change subject: gitignore: add amr_test
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I1ea7aad144a505412969c6c301349f8d47964422
Gerrit-Change-Number: 13247
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: tnt 
Gerrit-Comment-Date: Thu, 14 Mar 2019 12:03:11 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libosmo-netif[master]: tests: AM_LDFLAGS = -noinstall for all tests

[tnt]

tnt has posted comments on this change. ( https://gerrit.osmocom.org/13241 )

Change subject: tests: AM_LDFLAGS = -noinstall for all tests
..


Patch Set 3: Code-Review+1


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

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I94ccff42dfba71aaf59bb30ca312db0bac58c27d
Gerrit-Change-Number: 13241
Gerrit-PatchSet: 3
Gerrit-Owner: osmith 
Gerrit-Reviewer: Alexander Huemer 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pablo Neira Ayuso 
Gerrit-Reviewer: dexter 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: steve-m 
Gerrit-Reviewer: tnt 
Gerrit-Comment-Date: Thu, 14 Mar 2019 12:02:41 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libosmo-netif[master]: tests: AM_LDFLAGS = -noinstall for all tests

[Max]

Max has posted comments on this change. ( https://gerrit.osmocom.org/13241 )

Change subject: tests: AM_LDFLAGS = -noinstall for all tests
..


Patch Set 3: Code-Review+1


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

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I94ccff42dfba71aaf59bb30ca312db0bac58c27d
Gerrit-Change-Number: 13241
Gerrit-PatchSet: 3
Gerrit-Owner: osmith 
Gerrit-Reviewer: Alexander Huemer 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pablo Neira Ayuso 
Gerrit-Reviewer: dexter 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: steve-m 
Gerrit-Comment-Date: Thu, 14 Mar 2019 12:02:25 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libosmo-netif[master]: gitignore: add amr_test

[tnt]

tnt has posted comments on this change. ( https://gerrit.osmocom.org/13247 )

Change subject: gitignore: add amr_test
..


Patch Set 1: Code-Review+1


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

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I1ea7aad144a505412969c6c301349f8d47964422
Gerrit-Change-Number: 13247
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: tnt 
Gerrit-Comment-Date: Thu, 14 Mar 2019 12:00:13 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libosmo-netif[master]: tests: AM_LDFLAGS = -noinstall for all tests

[osmith]

osmith has posted comments on this change. ( https://gerrit.osmocom.org/13241 )

Change subject: tests: AM_LDFLAGS = -noinstall for all tests
..


Patch Set 2:

(1 comment)

https://gerrit.osmocom.org/#/c/13241/2//COMMIT_MSG
Commit Message:

https://gerrit.osmocom.org/#/c/13241/2//COMMIT_MSG@10
PS2, Line 10: a previous libosmonetfix.so is installed. Symptoms described here 
in
> libosmo-netif?
lol, fixed.



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

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I94ccff42dfba71aaf59bb30ca312db0bac58c27d
Gerrit-Change-Number: 13241
Gerrit-PatchSet: 2
Gerrit-Owner: osmith 
Gerrit-Reviewer: Alexander Huemer 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pablo Neira Ayuso 
Gerrit-Reviewer: dexter 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: steve-m 
Gerrit-Comment-Date: Thu, 14 Mar 2019 11:46:22 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in libosmo-netif[master]: tests: AM_LDFLAGS = -noinstall for all tests

[osmith]

Hello dexter, Alexander Huemer, steve-m, Max, Harald Welte, Jenkins Builder, 
Pablo Neira Ayuso,

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

https://gerrit.osmocom.org/13241

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

Change subject: tests: AM_LDFLAGS = -noinstall for all tests
..

tests: AM_LDFLAGS = -noinstall for all tests

Fix a symbol lookup error when building a new test on systems where
a previous libosmonetif.so is installed. Symptoms described here in
detail: https://osmocom.org/issues/3812#note-10

-no-install causes libtool to generate output files that link against
libraries in the build tree, instead of linking against the future
installation paths and generating a wrapper script. The wrapper script
should override the library paths, but at least on Debian, it does not
work as it should. Test binaries won't be installed anyway, so we can
safely use -no-install and work around the problem.

See also:
https://autotools.io/libtool/wrappers.html
https://www.gnu.org/software/libtool/manual/html_node/Link-mode.html

Related: OS#3812
Change-Id: I94ccff42dfba71aaf59bb30ca312db0bac58c27d
---
M tests/Makefile.am
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/41/13241/3
--
To view, visit https://gerrit.osmocom.org/13241
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I94ccff42dfba71aaf59bb30ca312db0bac58c27d
Gerrit-Change-Number: 13241
Gerrit-PatchSet: 3
Gerrit-Owner: osmith 
Gerrit-Reviewer: Alexander Huemer 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pablo Neira Ayuso 
Gerrit-Reviewer: dexter 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: steve-m 

Change in libosmo-netif[master]: gitignore: add amr_test

[Max]

Max has posted comments on this change. ( https://gerrit.osmocom.org/13247 )

Change subject: gitignore: add amr_test
..


Patch Set 1: Code-Review+1


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

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I1ea7aad144a505412969c6c301349f8d47964422
Gerrit-Change-Number: 13247
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Thu, 14 Mar 2019 10:46:56 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libosmo-netif[master]: tests: AM_LDFLAGS = -noinstall for all tests

[Max]

Max has posted comments on this change. ( https://gerrit.osmocom.org/13241 )

Change subject: tests: AM_LDFLAGS = -noinstall for all tests
..


Patch Set 2:

(1 comment)

https://gerrit.osmocom.org/#/c/13241/2//COMMIT_MSG
Commit Message:

https://gerrit.osmocom.org/#/c/13241/2//COMMIT_MSG@10
PS2, Line 10: a previous libosmonetfix.so is installed. Symptoms described here 
in
libosmo-netif?



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

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I94ccff42dfba71aaf59bb30ca312db0bac58c27d
Gerrit-Change-Number: 13241
Gerrit-PatchSet: 2
Gerrit-Owner: osmith 
Gerrit-Reviewer: Alexander Huemer 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pablo Neira Ayuso 
Gerrit-Reviewer: dexter 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: steve-m 
Gerrit-Comment-Date: Thu, 14 Mar 2019 10:46:30 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in osmo-msc[master]: libmsc: Allow different channel types to be requested as silent calls

[tnt]

tnt has posted comments on this change. ( https://gerrit.osmocom.org/13242 )

Change subject: libmsc: Allow different channel types to be requested as silent 
calls
..


Patch Set 3:

(2 comments)

Fixed in latest patch set.

https://gerrit.osmocom.org/#/c/13242/1/src/libmsc/silent_call.c
File src/libmsc/silent_call.c:

https://gerrit.osmocom.org/#/c/13242/1/src/libmsc/silent_call.c@196
PS1, Line 196:
> Rather sizeof(*ct), so it would be safe to rename 'gsm0808_channel_type' 
> symbol later on... […]
Ack


https://gerrit.osmocom.org/#/c/13242/1/src/libmsc/silent_call.c@199
PS1, Line 199:
> Are you sure it would calculate the size of the string buffer and not the 
> size of pointer? (Personal […]
I am sure.



--
To view, visit https://gerrit.osmocom.org/13242
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: I82645708dd27864cf33ea9cc993ead0983415602
Gerrit-Change-Number: 13242
Gerrit-PatchSet: 3
Gerrit-Owner: tnt 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: tnt 
Gerrit-CC: Harald Welte 
Gerrit-CC: Pau Espin Pedrol 
Gerrit-CC: Vadim Yanitskiy 
Gerrit-Comment-Date: Thu, 14 Mar 2019 10:05:55 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in libosmo-netif[master]: tests: AM_LDFLAGS = -noinstall for all tests

[osmith]

osmith has posted comments on this change. ( https://gerrit.osmocom.org/13241 )

Change subject: tests: AM_LDFLAGS = -noinstall for all tests
..


Patch Set 2:

> Personally I'd prefer to just enable '-no-install' globally for all the tests 
> by default and be done with it.

Good idea, updated the patch to do that.

> I'm not sure with what the "no-install" LDFLAGS do, and I would therefore 
> (humbly) guess that I'm not the only one. It might be worth one sentence 
> inthe commit log.

Commit message updated to include a description.


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

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I94ccff42dfba71aaf59bb30ca312db0bac58c27d
Gerrit-Change-Number: 13241
Gerrit-PatchSet: 2
Gerrit-Owner: osmith 
Gerrit-Reviewer: Alexander Huemer 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pablo Neira Ayuso 
Gerrit-Reviewer: dexter 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: steve-m 
Gerrit-Comment-Date: Thu, 14 Mar 2019 10:00:50 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in libosmo-netif[master]: tests: AM_LDFLAGS = -noinstall for all tests

[osmith]

Hello dexter, Alexander Huemer, steve-m, Max, Harald Welte, Jenkins Builder, 
Pablo Neira Ayuso,

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

https://gerrit.osmocom.org/13241

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

Change subject: tests: AM_LDFLAGS = -noinstall for all tests
..

tests: AM_LDFLAGS = -noinstall for all tests

Fix a symbol lookup error when building a new test on systems where
a previous libosmonetfix.so is installed. Symptoms described here in
detail: https://osmocom.org/issues/3812#note-10

-no-install causes libtool to generate output files that link against
libraries in the build tree, instead of linking against the future
installation paths and generating a wrapper script. The wrapper script
should override the library paths, but at least on Debian, it does not
work as it should. Test binaries won't be installed anyway, so we can
safely use -no-install and work around the problem.

See also:
https://autotools.io/libtool/wrappers.html
https://www.gnu.org/software/libtool/manual/html_node/Link-mode.html

Related: OS#3812
Change-Id: I94ccff42dfba71aaf59bb30ca312db0bac58c27d
---
M tests/Makefile.am
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/41/13241/2
--
To view, visit https://gerrit.osmocom.org/13241
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I94ccff42dfba71aaf59bb30ca312db0bac58c27d
Gerrit-Change-Number: 13241
Gerrit-PatchSet: 2
Gerrit-Owner: osmith 
Gerrit-Reviewer: Alexander Huemer 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pablo Neira Ayuso 
Gerrit-Reviewer: dexter 
Gerrit-Reviewer: steve-m 

Change in libosmo-netif[master]: gitignore: add amr_test

[osmith]

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/13247


Change subject: gitignore: add amr_test
..

gitignore: add amr_test

Change-Id: I1ea7aad144a505412969c6c301349f8d47964422
---
M .gitignore
1 file changed, 1 insertion(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/47/13247/1

diff --git a/.gitignore b/.gitignore
index e2f2fb9..23d5b42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,4 @@
 jibuf_tool
 osmux_test2
 stream_test
+amr_test

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

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ea7aad144a505412969c6c301349f8d47964422
Gerrit-Change-Number: 13247
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 

Change in osmo-msc[master]: libmsc: Allow different channel types to be requested as silent calls

[Max]

Max has posted comments on this change. ( https://gerrit.osmocom.org/13242 )

Change subject: libmsc: Allow different channel types to be requested as silent 
calls
..


Patch Set 3: Code-Review+1

(1 comment)

https://gerrit.osmocom.org/#/c/13242/1/src/libmsc/silent_call.c
File src/libmsc/silent_call.c:

https://gerrit.osmocom.org/#/c/13242/1/src/libmsc/silent_call.c@107
PS1, Line 107:  } rtp_addr;
> I'm not convinced ... […]
I was thinking about libmsc - the same way a_iface_tx_assignment() is shared 
for example. Anyway, not a merge blocker.



--
To view, visit https://gerrit.osmocom.org/13242
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: I82645708dd27864cf33ea9cc993ead0983415602
Gerrit-Change-Number: 13242
Gerrit-PatchSet: 3
Gerrit-Owner: tnt 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: tnt 
Gerrit-CC: Harald Welte 
Gerrit-CC: Pau Espin Pedrol 
Gerrit-CC: Vadim Yanitskiy 
Gerrit-Comment-Date: Thu, 14 Mar 2019 09:39:57 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: Yes

Change in libosmo-netif[master]: amr_test: add to .gitignore, use -noinstall flag

[Max]

Max has posted comments on this change. ( https://gerrit.osmocom.org/13241 )

Change subject: amr_test: add to .gitignore, use -noinstall flag
..


Patch Set 1:

> I'm not sure with what the "no-install" LDFLAGS do, and I would therefore 
> (humbly) guess that I'm not the only one.  It might be worth one sentence 
> inthe commit log.

https://www.gnu.org/software/libtool/manual/html_node/Link-mode.html - 
reference for "no-install" flag.


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

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I94ccff42dfba71aaf59bb30ca312db0bac58c27d
Gerrit-Change-Number: 13241
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Alexander Huemer 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pablo Neira Ayuso 
Gerrit-Reviewer: dexter 
Gerrit-Reviewer: steve-m 
Gerrit-Comment-Date: Thu, 14 Mar 2019 09:33:14 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in osmo-pcu[master]: Debian: bump copyright year

[Max]

Max has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/13240 )

Change subject: Debian: bump copyright year
..

Debian: bump copyright year

Change-Id: If61a510fbbcd549dc7bdf6e38643a00d242be875
---
M debian/copyright
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/debian/copyright b/debian/copyright
index 5bb2110..2e800a7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@
 Files: *
 Copyright: 2009-2015 Holger Hans Peter Freyther 
2013 Jacob Erlbeck 
-   2016-2017 sysmocom s.m.f.c. GmbH 
+   2016-2019 sysmocom s.m.f.c. GmbH 
2015 by Yves Godin 
 License:   AGPL-3.0+

@@ -22,7 +22,7 @@
src/pcu_utils.h
src/gprs_codel.c
src/gprs_codel.h
-Copyright: 2016-2017 sysmocom s.m.f.c. GmbH 
+Copyright: 2016-2019 sysmocom s.m.f.c. GmbH 
 License:   GPL-2.0+

 Files: osmoappdesc.py

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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: If61a510fbbcd549dc7bdf6e38643a00d242be875
Gerrit-Change-Number: 13240
Gerrit-PatchSet: 2
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: osmith 

Change in osmo-ttcn3-hacks[master]: ggsn: add tests to validate IPv4v6 pdp ctx

[osmith]

osmith has posted comments on this change. ( https://gerrit.osmocom.org/13231 )

Change subject: ggsn: add tests to validate IPv4v6 pdp ctx
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/13231
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: I3bab7df5caddc5c8b973c81544f954d5473ac234
Gerrit-Change-Number: 13231
Gerrit-PatchSet: 2
Gerrit-Owner: osmith 
Gerrit-Reviewer: Daniel Willmann 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 14 Mar 2019 09:10:38 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-ttcn3-hacks[master]: ggsn: add tests to validate IPv4v6 pdp ctx

[osmith]

osmith has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/13231 )

Change subject: ggsn: add tests to validate IPv4v6 pdp ctx
..

ggsn: add tests to validate IPv4v6 pdp ctx

Add related templates based on 3GPP TS 29.060 Figure 37A and create
tests based on existing IPv4 and v6 ones.

Related: OS#2900
Change-Id: I3bab7df5caddc5c8b973c81544f954d5473ac234
---
M ggsn_tests/GGSN_Tests.ttcn
M library/GTP_Templates.ttcn
2 files changed, 198 insertions(+), 0 deletions(-)

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



diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn
index 3c99fd9..398aed3 100644
--- a/ggsn_tests/GGSN_Tests.ttcn
+++ b/ggsn_tests/GGSN_Tests.ttcn
@@ -257,6 +257,10 @@
not match(cpr.endUserAddress, 
tr_EuaIPv6(?))) {
setverdict(fail);
}
+   if (match(ctx.eua, t_EuaIPv4v6(?, ?)) 
and
+   not match(cpr.endUserAddress, 
tr_EuaIPv4v6(?, ?))) {
+   setverdict(fail);
+   }
/* Check if PCO response corresponds to 
request */
if (ispresent(ctx.pco_req)) {
if (match(ctx.pco_req, 
ts_PCO_IPv4_DNS_CONT) and
@@ -697,6 +701,21 @@
f_wait_icmp6(ctx, (tr_ICMPv6_ERP,tr_ICMPv6_DU));
}

+   /* create ICMPv6 router solicitation deriving link-id from PDP Context 
EUA */
+   function f_icmpv6_rs_for_pdp46(in PdpContext ctx) return octetstring {
+   var OCT16 interface_id := 
ctx.eua.endUserAddress.endUserAddressIPv4andIPv6.ipv6_address;
+   return f_gen_icmpv6_router_solicitation(interface_id);
+   }
+
+   /* generate and encode ICMPv6 neighbor solicitation for PDP Context */
+   function f_gen_icmpv6_neigh_solicit_for_pdp46(in PdpContext ctx) return 
octetstring {
+   var OCT16 interface_id := 
ctx.eua.endUserAddress.endUserAddressIPv4andIPv6.ipv6_address;
+   var OCT16 link_local := f_ipv6_link_local(interface_id);
+   var OCT16 daddr := f_ipv6_sol_node_mcast(link_local);
+
+   return f_gen_icmpv6_neigh_solicit(link_local, daddr, 
link_local);
+   }
+
/* Assert we don't receive a ICMPv4/6 echo reply (or unreachable) from 
GTP */
function f_wait_gtpu_fail(PdpContext ctx) runs on GT_CT {
T_default.start;
@@ -1028,6 +1047,154 @@
f_pdp_ctx_del(ctx, '1'B);
}

+   /* Test IPv4v6 context activation for dynamic IPv4v6 EUA without DNS 
request */
+   testcase TC_pdp46_act_deact() runs on GT_CT {
+   f_init();
+   var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), 
'1234'O, c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn)));
+   f_pdp_ctx_act(ctx);
+   f_pdp_ctx_del(ctx, '1'B);
+   }
+
+   /* Test PDP context activation for dynamic IPv4v6 EUA with IPv4 DNS in 
IPCP */
+   testcase TC_pdp46_act_deact_ipcp() runs on GT_CT {
+   f_init();
+   var OCT4 ggsn_ip4_dns1 := f_inet_addr(m_ggsn_ip4_dns1);
+   var OCT4 ggsn_ip4_dns2 := f_inet_addr(m_ggsn_ip4_dns2);
+   var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), 
'1234'O, c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn)));
+   ctx.pco_req := valueof(ts_PCO_IPv4_DNS_IPCP);
+   f_pdp_ctx_act(ctx);
+   /* verify IPCP is at all contained */
+   if (not match(ctx.pco_neg, tr_PCO_Contains('8021'O))) {
+   setverdict(fail, "IPCP not found in PCO");
+   }
+   /* verify IPCP contains both primary and secondary IPv4 DNS */
+   var IpcpPacket ipcp := 
dec_IpcpPacket(f_PCO_extract_proto(ctx.pco_neg, '8021'O));
+   if (not match(ipcp, tr_IPCP_Ack_DNS(0, ggsn_ip4_dns1, 
ggsn_ip4_dns2))) {
+   if (not match(ipcp, tr_IPCP_Ack_DNS(0))) {
+   setverdict(fail, "Primary/Secondary DNS PCO 
IPCP option not found");
+   } else {
+   setverdict(fail, "Primary/Secondary DNS PCO 
IPCP option found but not matching expected values");
+   }
+   }
+   f_pdp_ctx_del(ctx, '1'B);
+   }
+
+   /* Test PDP context activation for dynamic IPv4v6 EUA with IPv6 DNS in 
PCO and router solicitation/advertisement */
+   testcase TC_pdp46_act_deact_icmp6() runs on GT_CT {
+   f_init();
+   

Change in osmo-pcu[master]: Debian: bump copyright year

[osmith]

osmith has posted comments on this change. ( https://gerrit.osmocom.org/13240 )

Change subject: Debian: bump copyright year
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/13240
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: If61a510fbbcd549dc7bdf6e38643a00d242be875
Gerrit-Change-Number: 13240
Gerrit-PatchSet: 2
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 14 Mar 2019 09:09:45 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bsc[master]: assignment_fsm: Properly support assigning signalling mode TCH/x

[tnt]

tnt has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/13172 )

Change subject: assignment_fsm: Properly support assigning signalling mode TCH/x
..

assignment_fsm: Properly support assigning signalling mode TCH/x

To support the 3 possible preferences, the changes needed were:
 - Replace 'full_rate' bool with a 3 option enum to represent
   the channels types for signalling
 - Switch from _pref/_alt to using an array sorted in preference
   order

Change-Id: I4c7499c8c866ea3ff7b1327edb3615d003d927d3
Signed-off-by: Sylvain Munaut 
---
M include/osmocom/bsc/gsm_data.h
M include/osmocom/bsc/lchan_select.h
M src/osmo-bsc/assignment_fsm.c
M src/osmo-bsc/codec_pref.c
M src/osmo-bsc/handover_fsm.c
M src/osmo-bsc/lchan_select.c
M src/osmo-bsc/osmo_bsc_bssap.c
M tests/codec_pref/codec_pref_test.c
8 files changed, 168 insertions(+), 133 deletions(-)

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



diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index c4315c0..fb0735a 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -98,9 +98,15 @@
SUBSCR_SCCP_ST_CONNECTED
 };

+enum channel_rate {
+   CH_RATE_SDCCH,
+   CH_RATE_HALF,
+   CH_RATE_FULL,
+};
+
 struct channel_mode_and_rate {
enum gsm48_chan_mode chan_mode;
-   bool full_rate;
+   enum channel_rate chan_rate;
uint16_t s15_s0;
 };

@@ -115,12 +121,9 @@
char msc_rtp_addr[INET_ADDRSTRLEN];
uint16_t msc_rtp_port;

-   /* Prefered rate/codec setting (mandatory) */
-   struct channel_mode_and_rate ch_mode_rate_pref;
-
-   /* Alternate rate/codec setting (optional) */
-   bool ch_mode_rate_alt_present;
-   struct channel_mode_and_rate ch_mode_rate_alt;
+   /* Rate/codec setting in preference order (need at least 1 !) */
+   int n_ch_mode_rate;
+   struct channel_mode_and_rate ch_mode_rate[3];
 };

 /* State of an ongoing Assignment, while the assignment_fsm is still busy. 
This serves as state separation to keep the
diff --git a/include/osmocom/bsc/lchan_select.h 
b/include/osmocom/bsc/lchan_select.h
index 4aecdf6..865181b 100644
--- a/include/osmocom/bsc/lchan_select.h
+++ b/include/osmocom/bsc/lchan_select.h
@@ -3,4 +3,4 @@

 struct gsm_lchan *lchan_select_by_type(struct gsm_bts *bts, enum gsm_chan_t 
type);
 struct gsm_lchan *lchan_select_by_chan_mode(struct gsm_bts *bts,
-   enum gsm48_chan_mode chan_mode, 
bool full_rate);
+   enum gsm48_chan_mode chan_mode, 
enum channel_rate chan_rate);
diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c
index aa696ac..2180791 100644
--- a/src/osmo-bsc/assignment_fsm.c
+++ b/src/osmo-bsc/assignment_fsm.c
@@ -251,17 +251,15 @@
 static bool lchan_type_compat_with_mode(enum gsm_chan_t type, const struct 
channel_mode_and_rate *ch_mode_rate)
 {
enum gsm48_chan_mode chan_mode = ch_mode_rate->chan_mode;
-   bool full_rate = ch_mode_rate->full_rate;
+   enum channel_rate chan_rate = ch_mode_rate->chan_rate;

switch (chan_mode) {
case GSM48_CMODE_SIGN:
switch (type) {
-   case GSM_LCHAN_TCH_F:
-   case GSM_LCHAN_TCH_H:
-   case GSM_LCHAN_SDCCH:
-   return true;
-   default:
-   return false;
+   case GSM_LCHAN_TCH_F: return chan_rate == CH_RATE_FULL;
+   case GSM_LCHAN_TCH_H: return chan_rate == CH_RATE_HALF;
+   case GSM_LCHAN_SDCCH: return chan_rate == CH_RATE_SDCCH;
+   default: return false;
}

case GSM48_CMODE_SPEECH_V1:
@@ -269,12 +267,12 @@
case GSM48_CMODE_DATA_3k6:
case GSM48_CMODE_DATA_6k0:
/* these services can all run on TCH/H, but we may have
-* an explicit override by the 'full_rate' argument */
+* an explicit override by the 'chan_rate' argument */
switch (type) {
case GSM_LCHAN_TCH_F:
-   return full_rate;
+   return chan_rate == CH_RATE_FULL;
case GSM_LCHAN_TCH_H:
-   return !full_rate;
+   return chan_rate == CH_RATE_HALF;
default:
return false;
}
@@ -320,45 +318,34 @@
  * sure that both are consistent. */
 static int check_requires_voice_stream(struct gsm_subscriber_connection *conn)
 {
-   bool result_requires_voice_alt;
-   bool result_requires_voice_pref;
+   bool requires_voice_pref = false, requires_voice_alt;
struct assignment_request *req = >assignment.req;
struct osmo_fsm_inst *fi = conn->fi;
-   int rc;
+   int i, rc;

/* When the assignment 

Change in osmo-msc[master]: libmsc: Allow different channel types to be requested as silent calls

[tnt]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/13242

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

Change subject: libmsc: Allow different channel types to be requested as silent 
calls
..

libmsc: Allow different channel types to be requested as silent calls

Change-Id: I82645708dd27864cf33ea9cc993ead0983415602
---
M include/osmocom/msc/silent_call.h
M src/libmsc/msc_vty.c
M src/libmsc/silent_call.c
3 files changed, 160 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/42/13242/3
--
To view, visit https://gerrit.osmocom.org/13242
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: I82645708dd27864cf33ea9cc993ead0983415602
Gerrit-Change-Number: 13242
Gerrit-PatchSet: 3
Gerrit-Owner: tnt 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: tnt 
Gerrit-CC: Harald Welte 
Gerrit-CC: Max 
Gerrit-CC: Pau Espin Pedrol 
Gerrit-CC: Vadim Yanitskiy 

Change in osmo-msc[master]: libmsc: Allow different channel types to be requested as silent calls

[Vadim Yanitskiy]

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

Change subject: libmsc: Allow different channel types to be requested as silent 
calls
..


Patch Set 1:

(5 comments)

https://gerrit.osmocom.org/#/c/13242/1/src/libmsc/silent_call.c
File src/libmsc/silent_call.c:

https://gerrit.osmocom.org/#/c/13242/1/src/libmsc/silent_call.c@91
PS1, Line 91:   osmo_timer_schedule(>timer, 0, 0);
> Can you at least document that in the code then?

ACK, some small comment would be appreciated.


https://gerrit.osmocom.org/#/c/13242/1/src/libmsc/silent_call.c@106
PS1, Line 106: (i=0; ict.perm_spch_len; i++)
Cosmetic: spaces between '=' and '<' are missing.


https://gerrit.osmocom.org/#/c/13242/1/src/libmsc/silent_call.c@127
PS1, Line 127:
ws


https://gerrit.osmocom.org/#/c/13242/1/src/libmsc/silent_call.c@196
PS1, Line 196: struct gsm0808_channel_type
Rather sizeof(*ct), so it would be safe to rename 'gsm0808_channel_type' symbol 
later on... Not critical though.


https://gerrit.osmocom.org/#/c/13242/1/src/libmsc/silent_call.c@199
PS1, Line 199: sizeof(scd->traffic_ip)
Are you sure it would calculate the size of the string buffer and not the size 
of pointer? (Personally I'm always unsure in such cases, so testing is required)



--
To view, visit https://gerrit.osmocom.org/13242
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: I82645708dd27864cf33ea9cc993ead0983415602
Gerrit-Change-Number: 13242
Gerrit-PatchSet: 1
Gerrit-Owner: tnt 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: tnt 
Gerrit-CC: Harald Welte 
Gerrit-CC: Max 
Gerrit-CC: Pau Espin Pedrol 
Gerrit-CC: Vadim Yanitskiy 
Gerrit-Comment-Date: Thu, 14 Mar 2019 08:12:54 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in osmo-msc[master]: libmsc: Allow different channel types to be requested as silent calls

[tnt]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/13242

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

Change subject: libmsc: Allow different channel types to be requested as silent 
calls
..

libmsc: Allow different channel types to be requested as silent calls

Change-Id: I82645708dd27864cf33ea9cc993ead0983415602
---
M include/osmocom/msc/silent_call.h
M src/libmsc/msc_vty.c
M src/libmsc/silent_call.c
3 files changed, 161 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/42/13242/2
--
To view, visit https://gerrit.osmocom.org/13242
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: I82645708dd27864cf33ea9cc993ead0983415602
Gerrit-Change-Number: 13242
Gerrit-PatchSet: 2
Gerrit-Owner: tnt 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: tnt 
Gerrit-CC: Harald Welte 
Gerrit-CC: Max 
Gerrit-CC: Pau Espin Pedrol 
Gerrit-CC: Vadim Yanitskiy 

Change in osmo-msc[master]: libmsc: Allow different channel types to be requested as silent calls

[tnt]

tnt has posted comments on this change. ( https://gerrit.osmocom.org/13242 )

Change subject: libmsc: Allow different channel types to be requested as silent 
calls
..


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/13242/1/src/libmsc/msc_vty.c
File src/libmsc/msc_vty.c:

https://gerrit.osmocom.org/#/c/13242/1/src/libmsc/msc_vty.c@1063
PS1, Line 1063: 65536
> I may be wrong, but shouldn't it be 65535? […]
Ack



--
To view, visit https://gerrit.osmocom.org/13242
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: I82645708dd27864cf33ea9cc993ead0983415602
Gerrit-Change-Number: 13242
Gerrit-PatchSet: 1
Gerrit-Owner: tnt 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: tnt 
Gerrit-CC: Harald Welte 
Gerrit-CC: Max 
Gerrit-CC: Pau Espin Pedrol 
Gerrit-CC: Vadim Yanitskiy 
Gerrit-Comment-Date: Thu, 14 Mar 2019 07:59:51 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in osmo-msc[master]: libmsc: Allow different channel types to be requested as silent calls

[Vadim Yanitskiy]

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

Change subject: libmsc: Allow different channel types to be requested as silent 
calls
..


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/13242/1/src/libmsc/msc_vty.c
File src/libmsc/msc_vty.c:

https://gerrit.osmocom.org/#/c/13242/1/src/libmsc/msc_vty.c@1063
PS1, Line 1063: 65536
I may be wrong, but shouldn't it be 65535?
0x is 65535 + 0, so 65536 possible values in total.



--
To view, visit https://gerrit.osmocom.org/13242
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: I82645708dd27864cf33ea9cc993ead0983415602
Gerrit-Change-Number: 13242
Gerrit-PatchSet: 1
Gerrit-Owner: tnt 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: tnt 
Gerrit-CC: Harald Welte 
Gerrit-CC: Max 
Gerrit-CC: Pau Espin Pedrol 
Gerrit-CC: Vadim Yanitskiy 
Gerrit-Comment-Date: Thu, 14 Mar 2019 07:55:51 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No