Change in osmo-bts[master]: send TCH/F fill frames in DTX mode (WIP)

[Harald Welte]

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

Change subject: send TCH/F fill frames in DTX mode (WIP)
..


Patch Set 1:

are you sure that unexpected frame was received on the TCH/F you ar=e 
monitoring and not on some completely other logical channel?  The 
0303012b2b2b... frames are sent in many places on all kinds of logical channels 
whenever there's nothing else to send, such as downlink AGCH, unused frames in 
SDCCH, ...


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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I7bff00b8cf41dc1b0e6e668173bebce23be0d253
Gerrit-Change-Number: 10415
Gerrit-PatchSet: 1
Gerrit-Owner: Stefan Sperling 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Stefan Sperling 
Gerrit-CC: Harald Welte 
Gerrit-Comment-Date: Fri, 10 Aug 2018 06:59:34 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in libosmocore[master]: bssgp: introduce flush queue functions

[Harald Welte]

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

Change subject: bssgp: introduce flush queue functions
..

bssgp: introduce flush queue functions

To reset the state of BSSGP allow to flush the BSSGP queues.
When testing (with TTCN3) the test object should be resetted between
each test.

Introduce the functions:
bssgp_fc_flush_queue() - flushs a single flow control object
bssgp_flush_all_queues() - flushs queues of all BSSGP connections

Change-Id: I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325
---
M include/osmocom/gprs/gprs_bssgp.h
M src/gb/gprs_bssgp.c
M src/gb/libosmogb.map
3 files changed, 33 insertions(+), 0 deletions(-)

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



diff --git a/include/osmocom/gprs/gprs_bssgp.h 
b/include/osmocom/gprs/gprs_bssgp.h
index 2dead69..400c3e0 100644
--- a/include/osmocom/gprs/gprs_bssgp.h
+++ b/include/osmocom/gprs/gprs_bssgp.h
@@ -207,6 +207,9 @@
 int bssgp_fc_ms_init(struct bssgp_flow_control *fc_ms, uint16_t bvci,
 uint16_t nsei, uint32_t max_queue_depth);

+void bssgp_flush_all_queues();
+void bssgp_fc_flush_queue(struct bssgp_flow_control *fc);
+
 /* gprs_bssgp_vty.c */
 int bssgp_vty_init(void);
 void bssgp_set_log_ss(int ss);
diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c
index 5dfce16..3b9fbf9 100644
--- a/src/gb/gprs_bssgp.c
+++ b/src/gb/gprs_bssgp.c
@@ -1263,3 +1263,31 @@
 {
DBSSGP = ss;
 }
+
+/*!
+ * \brief Flush the queue of the bssgp_flow_control
+ * \param[in] The flow control object which holds the queue.
+ */
+void bssgp_fc_flush_queue(struct bssgp_flow_control *fc)
+{
+   struct bssgp_fc_queue_element *element, *tmp;
+
+   llist_for_each_entry_safe(element, tmp, &fc->queue, list) {
+   msgb_free(element->msg);
+   llist_del(&element->list);
+   talloc_free(element);
+   }
+}
+
+/*!
+ * \brief Flush the queues of all BSSGP contexts.
+ */
+void bssgp_flush_all_queues()
+{
+   struct bssgp_bvc_ctx *bctx;
+
+   llist_for_each_entry(bctx, &bssgp_bvc_ctxts, list) {
+   if (bctx->fc)
+   bssgp_fc_flush_queue(bctx->fc);
+   }
+}
diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map
index d56e651..ec69670 100644
--- a/src/gb/libosmogb.map
+++ b/src/gb/libosmogb.map
@@ -6,6 +6,8 @@
 bssgp_fc_in;
 bssgp_fc_init;
 bssgp_fc_ms_init;
+bssgp_fc_flush_queue;
+bssgp_flush_all_queues;
 bssgp_msgb_alloc;
 bssgp_msgb_copy;
 bssgp_msgb_tlli_put;

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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325
Gerrit-Change-Number: 10371
Gerrit-PatchSet: 6
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: lynxis lazus 

Change in osmo-ttcn3-hacks[master]: update DTX fill frame test expectations

[Harald Welte]

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

Change subject: update DTX fill frame test expectations
..


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/10414/1/bts/BTS_Tests.ttcn
File bts/BTS_Tests.ttcn:

https://gerrit.osmocom.org/#/c/10414/1/bts/BTS_Tests.ttcn@3840
PS1, Line 3840: 52, 53, 54, 55, 56, 57, 58, 5
this is listing all eitght bursts that are required during DTX on a TCH/F.  
However, the test operates at block level, so the two blocks received s hould 
be 52 + 56 (IIRC we report the frame number of the first burst of each block).



--
To view, visit https://gerrit.osmocom.org/10414
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: Ie573b54ab5654f027c470aa7a565d2b5b97dc74b
Gerrit-Change-Number: 10414
Gerrit-PatchSet: 1
Gerrit-Owner: Stefan Sperling 
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: Harald Welte 
Gerrit-Comment-Date: Fri, 10 Aug 2018 07:09:37 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in osmo-bts[master]: send TCH/F fill frames in DTX mode (WIP)

[Harald Welte]

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

Change subject: send TCH/F fill frames in DTX mode (WIP)
..


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/10415/1/src/common/l1sap.c
File src/common/l1sap.c:

https://gerrit.osmocom.org/#/c/10415/1/src/common/l1sap.c@676
PS1, Line 676: 52, 53, 54, 55, 56, 57, 58, 59
again also here: We are opearating at _block_ level at the l1sap level, not a 
burst level.  So we will ever only see a RTS.ind for 52 and 56 here, and the 
PHY will transmit at fn%26 == (52.53,54,55 and 56,57,58,59 respectively).

So if you want to be super careful, I would check if it's 52 or 56, and could 
OSMO_ASSERT if it's ever any of the other numbers above, which should never 
happen, as TCH/F blocks are defined to start at 0,4,8,13,17,21 (modulo 26), 
which means
0,4,8,13,17,21,
26,30,34,38,47,
52,56,60,65,73,
78,82,86,91,99



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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I7bff00b8cf41dc1b0e6e668173bebce23be0d253
Gerrit-Change-Number: 10415
Gerrit-PatchSet: 1
Gerrit-Owner: Stefan Sperling 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Stefan Sperling 
Gerrit-CC: Harald Welte 
Gerrit-Comment-Date: Fri, 10 Aug 2018 07:19:38 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in osmo-ttcn3-hacks[master]: bsc: Wait for immedate assignment in f_chreq_act_ack

[Harald Welte]

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

Change subject: bsc: Wait for immedate assignment in f_chreq_act_ack
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10407
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: I2831d4caf7f045b3396d28a978328e8a1097d8d3
Gerrit-Change-Number: 10407
Gerrit-PatchSet: 1
Gerrit-Owner: daniel 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Fri, 10 Aug 2018 07:20:10 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-ttcn3-hacks[master]: bsc: Wait for immedate assignment in f_chreq_act_ack

[Harald Welte]

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

Change subject: bsc: Wait for immedate assignment in f_chreq_act_ack
..

bsc: Wait for immedate assignment in f_chreq_act_ack

Sometimes TC_chan_rel_hard_rlsd_ms_dead could fail because the Immediate
assignment command would arrive in the RSL queue after it was cleared in
f_expect_chan_rel. The alt statement would now never complete since the
Immediate Assignment was blocking/hogging the queue. Wait explicitly for
the IMM ASS in f_chreq_act_ack before continuing.

Change-Id: I2831d4caf7f045b3396d28a978328e8a1097d8d3
---
M bsc/BSC_Tests.ttcn
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 5af4573..e94b781 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -642,6 +642,7 @@
rx_rsl := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV));
var RslChannelNr chan_nr := rx_rsl.ies[0].body.chan_nr;
f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, fn+10));
+   rx_rsl := f_exp_ipa_rx(0, tr_RSL_IMM_ASSIGN(0));
return chan_nr;
 }


--
To view, visit https://gerrit.osmocom.org/10407
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: I2831d4caf7f045b3396d28a978328e8a1097d8d3
Gerrit-Change-Number: 10407
Gerrit-PatchSet: 2
Gerrit-Owner: daniel 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

Change in docker-playground[master]: regen_docs: Add a script that extracts counter and vty info

[Harald Welte]

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

Change subject: regen_docs: Add a script that extracts counter and vty info
..


Patch Set 1: Code-Review+2

We can merge this, but I seriously fear that having another set of config files 
will make this break frequently.  We already have the example config, the 
config templates in osmo-gsm-tester, the existing configs in docker-playground 
for the TTCN3 tests, etc. to update / sync in case of changes as it is...


--
To view, visit https://gerrit.osmocom.org/10273
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: I4e57a64caccfbc982199f8f25bbb14c2d96e11a6
Gerrit-Change-Number: 10273
Gerrit-PatchSet: 1
Gerrit-Owner: daniel 
Gerrit-Reviewer: Harald Welte 
Gerrit-Comment-Date: Fri, 10 Aug 2018 07:21:47 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in gr-gsm[master]: apps/grgsm_trx: also print Piotr as a copyright holder

[Vadim Yanitskiy]

Vadim Yanitskiy has uploaded this change for review. ( 
https://gerrit.osmocom.org/10416


Change subject: apps/grgsm_trx: also print Piotr as a copyright holder
..

apps/grgsm_trx: also print Piotr as a copyright holder

Despite the most part of Python code was written by Vadim, it's
heavily based on huge and impressive work done by Piotr. Let's
also print his credentials in the license header.

Change-Id: Icca7c679d84f99440ff502219f624e0f73112744
---
M apps/grgsm_trx
1 file changed, 1 insertion(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/16/10416/1

diff --git a/apps/grgsm_trx b/apps/grgsm_trx
index 128adab..eafc726 100755
--- a/apps/grgsm_trx
+++ b/apps/grgsm_trx
@@ -31,6 +31,7 @@

 COPYRIGHT = \
"Copyright (C) 2016-2017 by Vadim Yanitskiy \n" \
+   "Copyright (C) 2017 by Piotr Krysik \n" \
"License GPLv2+: GNU GPL version 2 or later " \
"\n" \
"This is free software: you are free to change and redistribute it.\n" \

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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icca7c679d84f99440ff502219f624e0f73112744
Gerrit-Change-Number: 10416
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy 

Change in gr-gsm[master]: apps/grgsm_trx: use format string for help message

[Vadim Yanitskiy]

Vadim Yanitskiy has uploaded this change for review. ( 
https://gerrit.osmocom.org/10420


Change subject: apps/grgsm_trx: use format string for help message
..

apps/grgsm_trx: use format string for help message

Instead of using the hard-coded default values in help message,
it makes sense to use a format string, and pass the actual
values when printing help.

Change-Id: Ib1bf0ef3ded86aa92faeb9b63eb286283f5c8c3d
---
M apps/grgsm_trx
1 file changed, 15 insertions(+), 8 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/20/10420/1

diff --git a/apps/grgsm_trx b/apps/grgsm_trx
index eb7fbdb..b925fc1 100755
--- a/apps/grgsm_trx
+++ b/apps/grgsm_trx
@@ -96,20 +96,27 @@

# TRX specific
s += " TRX interface specific\n" \
-"  -i --remote-addr  Set remote address (default 
127.0.0.1)\n" \
-"  -p --base-portSet base port number (default 
5700)\n\n"
+"  -i --remote-addr  Set remote address (default 
%s)\n" \
+"  -p --base-portSet base port number (default 
%d)\n\n"

# PHY specific
s += " Radio interface specific\n" \
 "  -a --device-args  Set device arguments\n" \
 "  -s --sample-rate  Set sample rate\n" \
-"  -g --rx-gain  Set RX gain (default 30)\n" \
-"  -G --tx-gain  Set TX gain (default 10)\n" \
-" --rx-antenna   Set RX antenna (default RX2)\n" \
-" --tx-antenna   Set TX antenna (default TX/RX)\n" 
\
-" --ppm  Set frequency correction (default 
0)\n"
+"  -g --rx-gain  Set RX gain (default %d)\n" \
+"  -G --tx-gain  Set TX gain (default %d)\n" \
+" --rx-antenna   Set RX antenna (default %s)\n" \
+" --tx-antenna   Set TX antenna (default %s)\n" \
+" --ppm  Set frequency correction (default 
%d)\n"

-   print(s)
+   print(s % (
+   self.remote_addr,
+   self.base_port,
+   self.phy_rx_gain,
+   self.phy_tx_gain,
+   self.phy_rx_antenna,
+   self.phy_tx_antenna,
+   self.phy_ppm))

def parse_argv(self):
try:

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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1bf0ef3ded86aa92faeb9b63eb286283f5c8c3d
Gerrit-Change-Number: 10420
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy 

Change in gr-gsm[master]: grgsm_trx: change default TRX port number to 6700

[Vadim Yanitskiy]

Vadim Yanitskiy has uploaded this change for review. ( 
https://gerrit.osmocom.org/10417


Change subject: grgsm_trx: change default TRX port number to 6700
..

grgsm_trx: change default TRX port number to 6700

In order to avoid clashes with OsmoTRX, which may be also
running on the same host, let's use a different port range
starting from 6700 by default.

This idea was introduced as a result of OS#2984.

Change-Id: Iaf0c78733bfefcb0b0938abf6d316e27d03ecab4
---
M apps/grgsm_trx
1 file changed, 1 insertion(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/17/10417/1

diff --git a/apps/grgsm_trx b/apps/grgsm_trx
index eafc726..eb7fbdb 100755
--- a/apps/grgsm_trx
+++ b/apps/grgsm_trx
@@ -40,7 +40,7 @@
 class Application:
# Application variables
remote_addr = "127.0.0.1"
-   base_port = 5700
+   base_port = 6700

# PHY specific
phy_sample_rate = 4 * 1625000 / 6

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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf0c78733bfefcb0b0938abf6d316e27d03ecab4
Gerrit-Change-Number: 10417
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy 

Change in gr-gsm[master]: trx/radio_if.py: reset UHD device time at startup

[Vadim Yanitskiy]

Vadim Yanitskiy has uploaded this change for review. ( 
https://gerrit.osmocom.org/10418


Change subject: trx/radio_if.py: reset UHD device time at startup
..

trx/radio_if.py: reset UHD device time at startup

Some UHD devices, such as UmTRX, require one to manually reset the
hardware clock, otherwise the burst transmission doesn't work.

Change-Id: Idddc1387199bd22342ec5af25c8635e73352e315
---
M python/trx/radio_if.py
1 file changed, 6 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/18/10418/1

diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py
index 355312b..83bfffe 100644
--- a/python/trx/radio_if.py
+++ b/python/trx/radio_if.py
@@ -257,6 +257,12 @@
(self.dict_toggle_sign, 'dict_out'),
(self.msg_to_tag_sink, 'msg'))

+
+   # Some UHD devices, such as UmTRX, require one
+   # to manually reset the hardware clock
+   self.phy_src.set_time_now(uhd.time_spec(0.0))
+   self.phy_sink.set_time_now(uhd.time_spec(0.0))
+
def shutdown(self):
print("[i] Shutdown Radio interface")
self.stop()

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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idddc1387199bd22342ec5af25c8635e73352e315
Gerrit-Change-Number: 10418
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy 

Change in gr-gsm[master]: trx/radio_if.py: drop useless import of osmosdr

[Vadim Yanitskiy]

Vadim Yanitskiy has uploaded this change for review. ( 
https://gerrit.osmocom.org/10419


Change subject: trx/radio_if.py: drop useless import of osmosdr
..

trx/radio_if.py: drop useless import of osmosdr

Change-Id: Iacd5ca118957e3ecf05df81f511b17bb9a8982b5
---
M python/trx/radio_if.py
1 file changed, 0 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/19/10419/1

diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py
index 83bfffe..21276e5 100644
--- a/python/trx/radio_if.py
+++ b/python/trx/radio_if.py
@@ -26,7 +26,6 @@
 import pmt
 import time
 import grgsm
-import osmosdr

 from math import pi


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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacd5ca118957e3ecf05df81f511b17bb9a8982b5
Gerrit-Change-Number: 10419
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy 

Change in gr-gsm[master]: trx/ctrl_if.py: send control responses to where commands are from

[Vadim Yanitskiy]

Vadim Yanitskiy has uploaded this change for review. ( 
https://gerrit.osmocom.org/10423


Change subject: trx/ctrl_if.py: send control responses to where commands are 
from
..

trx/ctrl_if.py: send control responses to where commands are from

When we receive a control command, we should not simply send the
response to the default destination, but send it back to the exact
IP/prt from which the command originated.

This ensures correct routing of responses even in case multiple
programs are interfacing concurrently with a control socket.

Cherry-picked from: I24a0bba6eed059b101af95dac7d059f34dd715fc
Change-Id: I1f304ea887dc957d3ad53adb1e3c56ab27d8f196
---
M python/trx/ctrl_if.py
M python/trx/udp_link.py
2 files changed, 12 insertions(+), 9 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/23/10423/1

diff --git a/python/trx/ctrl_if.py b/python/trx/ctrl_if.py
index 7dee0f8..ae5cf05 100644
--- a/python/trx/ctrl_if.py
+++ b/python/trx/ctrl_if.py
@@ -25,15 +25,15 @@
 from grgsm.trx import udp_link

 class ctrl_if(udp_link):
-   def handle_rx(self, data):
+   def handle_rx(self, data, remote):
if self.verify_req(data):
request = self.prepare_req(data)
rc = self.parse_cmd(request)

if type(rc) is tuple:
-   self.send_response(request, rc[0], rc[1])
+   self.send_response(request, remote, rc[0], 
rc[1])
else:
-   self.send_response(request, rc)
+   self.send_response(request, remote, rc)
else:
print("[!] Wrong data on CTRL interface")

@@ -65,7 +65,7 @@

return True

-   def send_response(self, request, response_code, params = None):
+   def send_response(self, request, remote, response_code, params = None):
# Include status code, for example ["TXTUNE", "0", "941600"]
request.insert(1, str(response_code))

@@ -76,7 +76,7 @@
# Add the response signature, and join back to string
response = "RSP " + " ".join(request) + "\0"
# Now we have something like "RSP TXTUNE 0 941600"
-   self.send(response)
+   self.send(response, remote)

def parse_cmd(self, request):
raise NotImplementedError
diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py
index 1fae8b4..d96a6aa 100644
--- a/python/trx/udp_link.py
+++ b/python/trx/udp_link.py
@@ -45,13 +45,16 @@
# Check for incoming data
if self.sock in r_event:
data, addr = self.sock.recvfrom(128)
-   self.handle_rx(data.decode())
+   self.handle_rx(data.decode(), addr)

-   def send(self, data):
+   def send(self, data, remote = None):
if type(data) not in [bytearray, bytes]:
data = data.encode()

-   self.sock.sendto(data, (self.remote_addr, self.remote_port))
+   if remote is None:
+   remote = (self.remote_addr, self.remote_port)

-   def handle_rx(self, data):
+   self.sock.sendto(data, remote)
+
+   def handle_rx(self, data, remote):
raise NotImplementedError

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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f304ea887dc957d3ad53adb1e3c56ab27d8f196
Gerrit-Change-Number: 10423
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy 

Change in gr-gsm[master]: gsm_trx_burst_if: allow to customize the bind address

[Vadim Yanitskiy]

Vadim Yanitskiy has uploaded this change for review. ( 
https://gerrit.osmocom.org/10424


Change subject: gsm_trx_burst_if: allow to customize the bind address
..

gsm_trx_burst_if: allow to customize the bind address

Pleviously remote address for DATA interface was also used as the
bind address, what is definitely wrong. Let's change the API a bit
in order to allow one to specify a custom bind address.

Change-Id: I6e5f7b7119ac454217b8dd04f9ee0dd3b23972b6
---
M grc/trx/gsm_trx_burst_if.xml
M include/grgsm/misc_utils/udp_socket.h
M include/grgsm/trx/trx_burst_if.h
M lib/misc_utils/udp_socket.cc
M lib/trx/trx_burst_if_impl.cc
M lib/trx/trx_burst_if_impl.h
M python/trx/radio_if.py
7 files changed, 26 insertions(+), 11 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/24/10424/1

diff --git a/grc/trx/gsm_trx_burst_if.xml b/grc/trx/gsm_trx_burst_if.xml
index 99427b3..49979a3 100644
--- a/grc/trx/gsm_trx_burst_if.xml
+++ b/grc/trx/gsm_trx_burst_if.xml
@@ -3,7 +3,7 @@
   TRX Burst Interface
   gsm_trx_burst_if
   import grgsm
-  grgsm.trx_burst_if($remote_addr, $base_port)
+  grgsm.trx_burst_if($bind_addr, $remote_addr, $base_port)

   
 base_port
@@ -13,6 +13,13 @@
   

   
+bind_addr
+bind_addr
+0.0.0.0
+string
+  
+
+  
 remote_addr
 remote_addr
 127.0.0.1
diff --git a/include/grgsm/misc_utils/udp_socket.h 
b/include/grgsm/misc_utils/udp_socket.h
index 15b2c66..d1ceb9f 100644
--- a/include/grgsm/misc_utils/udp_socket.h
+++ b/include/grgsm/misc_utils/udp_socket.h
@@ -53,8 +53,9 @@

 public:
   udp_socket(
-const std::string &remote_addr,
+const std::string &bind_addr,
 const std::string &src_port,
+const std::string &remote_addr,
 const std::string &dst_port,
 size_t mtu);
   ~udp_socket();
diff --git a/include/grgsm/trx/trx_burst_if.h b/include/grgsm/trx/trx_burst_if.h
index 0e7a35a..9277dc5 100644
--- a/include/grgsm/trx/trx_burst_if.h
+++ b/include/grgsm/trx/trx_burst_if.h
@@ -48,6 +48,7 @@
* creating new instances.
*/
   static sptr make(
+const std::string &bind_addr,
 const std::string &remote_addr,
 const std::string &base_port);
 };
diff --git a/lib/misc_utils/udp_socket.cc b/lib/misc_utils/udp_socket.cc
index 73393a0..c43f183 100644
--- a/lib/misc_utils/udp_socket.cc
+++ b/lib/misc_utils/udp_socket.cc
@@ -38,8 +38,9 @@
   namespace gsm {

 udp_socket::udp_socket(
-  const std::string &remote_addr,
+  const std::string &bind_addr,
   const std::string &src_port,
+  const std::string &remote_addr,
   const std::string &dst_port,
   size_t mtu)
 {
@@ -50,7 +51,7 @@
   udp::resolver resolver(d_io_service);

   udp::resolver::query rx_query(
-udp::v4(), remote_addr, src_port,
+udp::v4(), bind_addr, src_port,
 boost::asio::ip::resolver_query_base::passive);
   udp::resolver::query tx_query(
 udp::v4(), remote_addr, dst_port,
diff --git a/lib/trx/trx_burst_if_impl.cc b/lib/trx/trx_burst_if_impl.cc
index e3fcc89..f72eecd 100644
--- a/lib/trx/trx_burst_if_impl.cc
+++ b/lib/trx/trx_burst_if_impl.cc
@@ -48,19 +48,22 @@

 trx_burst_if::sptr
 trx_burst_if::make(
+  const std::string &bind_addr,
   const std::string &remote_addr,
   const std::string &base_port)
 {
   int base_port_int = boost::lexical_cast (base_port);

   return gnuradio::get_initial_sptr
-(new trx_burst_if_impl(remote_addr, base_port_int));
+(new trx_burst_if_impl(bind_addr, remote_addr,
+  base_port_int));
 }

 /*
  * The private constructor
  */
 trx_burst_if_impl::trx_burst_if_impl(
+  const std::string &bind_addr,
   const std::string &remote_addr,
   int base_port
 ) : gr::block("trx_burst_if",
@@ -79,8 +82,8 @@
 std::string data_dst_port = boost::lexical_cast 
(base_port + 102);

 // Init DATA interface
-d_data_sock = new udp_socket(remote_addr,
-  data_src_port, data_dst_port, DATA_IF_MTU);
+d_data_sock = new udp_socket(bind_addr, data_src_port,
+  remote_addr, data_dst_port, DATA_IF_MTU);

 // Bind DATA interface handler
 d_data_sock->udp_rx_handler = boost::bind(
diff --git a/lib/trx/trx_burst_if_impl.h b/lib/trx/trx_burst_if_impl.h
index 27ec259..fdb49f2 100644
--- a/lib/trx/trx_burst_if_impl.h
+++ b/lib/trx/trx_burst_if_impl.h
@@ -40,7 +40,8 @@
   void burst_pack(pmt::pmt_t msg, uint8_t *buf);

  public:
-  trx_burst_if_impl(const std::string &remote_addr, int base_port);
+  trx_burst_if_impl(const std::string &bind_addr,
+const std::string &remote_addr, int base_port);
   ~trx_burst_if_impl();

   void handle_dl_burst(pmt::pmt_t msg);
diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py
index 21276e5..8553eba 100644
--- a/python/trx/

Change in gr-gsm[master]: trx/udp_link.py: close socket in destructor

[Vadim Yanitskiy]

Vadim Yanitskiy has uploaded this change for review. ( 
https://gerrit.osmocom.org/10421


Change subject: trx/udp_link.py: close socket in destructor
..

trx/udp_link.py: close socket in destructor

Previously it was required to call the UDPLink.shutdown() method
manually in order to close a socket. Let's do it automatically
using the destructor of UDPLink.

Cherry-picked from: I59c3dc61ec58cd9effeb789947d28fd602ca91f4
Change-Id: Ief7aa21d1e50682a90616833b679741957193aae
---
M apps/grgsm_trx
M python/trx/ctrl_if_bb.py
M python/trx/udp_link.py
3 files changed, 3 insertions(+), 8 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/21/10421/1

diff --git a/apps/grgsm_trx b/apps/grgsm_trx
index b925fc1..668b0be 100755
--- a/apps/grgsm_trx
+++ b/apps/grgsm_trx
@@ -83,7 +83,6 @@

def shutdown(self):
print("[i] Shutting down...")
-   self.server.shutdown()
self.radio.shutdown()

def print_copyright(self):
diff --git a/python/trx/ctrl_if_bb.py b/python/trx/ctrl_if_bb.py
index 5874e59..7886e23 100644
--- a/python/trx/ctrl_if_bb.py
+++ b/python/trx/ctrl_if_bb.py
@@ -35,10 +35,6 @@
# Power measurement
self.pm = pm

-   def shutdown(self):
-   print("[i] Shutdown CTRL interface")
-   ctrl_if.shutdown(self)
-
def parse_cmd(self, request):
# Power control
if self.verify_cmd(request, "POWERON", 0):
diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py
index 675ef5c..cedcb1b 100644
--- a/python/trx/udp_link.py
+++ b/python/trx/udp_link.py
@@ -35,6 +35,9 @@
self.remote_addr = remote_addr
self.remote_port = remote_port

+   def __del__(self):
+   self.sock.close()
+
def loop(self):
r_event, w_event, x_event = select.select([self.sock], [], [])

@@ -43,9 +46,6 @@
data, addr = self.sock.recvfrom(128)
self.handle_rx(data.decode())

-   def shutdown(self):
-   self.sock.close();
-
def send(self, data):
if type(data) not in [bytearray, bytes]:
data = data.encode()

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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief7aa21d1e50682a90616833b679741957193aae
Gerrit-Change-Number: 10421
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy 

Change in gr-gsm[master]: trx/udp_link.py: set SO_REUSEADDR socket option

[Vadim Yanitskiy]

Vadim Yanitskiy has uploaded this change for review. ( 
https://gerrit.osmocom.org/10422


Change subject: trx/udp_link.py: set SO_REUSEADDR socket option
..

trx/udp_link.py: set SO_REUSEADDR socket option

Setting this option allows one to reuse existing connections,
for example, by injecting CTRL commands or DATA bursts
into existing connections.

Cherry-picked from: I0882c76affa9a668a12d10967081054d2b666ed1
Change-Id: I6d256683a7aa0419cd5bd0a3eaa97aefdf3254f9
---
M python/trx/udp_link.py
1 file changed, 1 insertion(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/22/10422/1

diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py
index cedcb1b..1fae8b4 100644
--- a/python/trx/udp_link.py
+++ b/python/trx/udp_link.py
@@ -28,6 +28,7 @@
 class udp_link:
def __init__(self, remote_addr, remote_port, bind_port):
self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+   self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
self.sock.bind((remote_addr, bind_port))
self.sock.setblocking(0)


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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d256683a7aa0419cd5bd0a3eaa97aefdf3254f9
Gerrit-Change-Number: 10422
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy 

Change in gr-gsm[master]: apps/grgsm_trx: introduce bind address option

[Vadim Yanitskiy]

Vadim Yanitskiy has uploaded this change for review. ( 
https://gerrit.osmocom.org/10425


Change subject: apps/grgsm_trx: introduce bind address option
..

apps/grgsm_trx: introduce bind address option

The new option (-b --bind-addr) allows one to specify the bind
address for both DATA and CTRL interfaces. By default, '0.0.0.0'
is used, so there are no restrictions for the L1 source address.

Change-Id: I3339f686b53db07cfd1bff9a516f4bdc28058cd9
---
M apps/grgsm_trx
M python/trx/ctrl_if_bb.py
M python/trx/radio_if.py
M python/trx/udp_link.py
4 files changed, 23 insertions(+), 15 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/25/10425/1

diff --git a/apps/grgsm_trx b/apps/grgsm_trx
index 668b0be..1c0581f 100755
--- a/apps/grgsm_trx
+++ b/apps/grgsm_trx
@@ -3,7 +3,7 @@

 # GR-GSM based transceiver
 #
-# (C) 2016-2017 by Vadim Yanitskiy 
+# (C) 2016-2018 by Vadim Yanitskiy 
 #
 # All Rights Reserved
 #
@@ -30,7 +30,7 @@
 from grgsm.trx import fake_pm

 COPYRIGHT = \
-   "Copyright (C) 2016-2017 by Vadim Yanitskiy \n" \
+   "Copyright (C) 2016-2018 by Vadim Yanitskiy \n" \
"Copyright (C) 2017 by Piotr Krysik \n" \
"License GPLv2+: GNU GPL version 2 or later " \
"\n" \
@@ -40,6 +40,7 @@
 class Application:
# Application variables
remote_addr = "127.0.0.1"
+   bind_addr = "0.0.0.0"
base_port = 6700

# PHY specific
@@ -63,7 +64,8 @@
self.radio = radio_if(self.phy_args, self.phy_sample_rate,
self.phy_rx_gain, self.phy_tx_gain, self.phy_ppm,
self.phy_rx_antenna, self.phy_tx_antenna,
-   self.remote_addr, self.base_port)
+   self.bind_addr, self.remote_addr,
+   self.base_port)

# Power measurement emulation
# Noise: -120 .. -105
@@ -71,8 +73,9 @@
self.pm = fake_pm(-120, -105, -75, -50)

# Init TRX CTRL interface
-   self.server = ctrl_if_bb(self.remote_addr,
-   self.base_port + 101, self.base_port + 1,
+   self.server = ctrl_if_bb(
+   self.remote_addr, self.base_port + 101,
+   self.bind_addr, self.base_port + 1,
self.radio, self.pm)

print("[i] Init complete")
@@ -96,6 +99,7 @@
# TRX specific
s += " TRX interface specific\n" \
 "  -i --remote-addr  Set remote address (default 
%s)\n" \
+"  -b --bind-addrSet bind address (default %s)\n" \
 "  -p --base-portSet base port number (default 
%d)\n\n"

# PHY specific
@@ -110,6 +114,7 @@

print(s % (
self.remote_addr,
+   self.bind_addr,
self.base_port,
self.phy_rx_gain,
self.phy_tx_gain,
@@ -120,10 +125,10 @@
def parse_argv(self):
try:
opts, args = getopt.getopt(sys.argv[1:],
-   "i:p:a:s:g:G:h",
-   ["help", "remote-addr=", "base-port=", 
"device-args=",
-   "sample-rate=", "rx-gain=", "tx-gain=", "ppm=",
-   "rx-antenna=", "tx-antenna="])
+   "i:b:p:a:s:g:G:h",
+   ["help", "remote-addr=", "bind-addr=", 
"base-port=",
+   "device-args=", "sample-rate=", "rx-gain=", 
"tx-gain=",
+   "ppm=", "rx-antenna=", "tx-antenna="])
except getopt.GetoptError as err:
# Print(help and exit)
self.print_help()
@@ -138,6 +143,8 @@
# TRX specific
elif o in ("-i", "--remote-addr"):
self.remote_addr = v
+   elif o in ("-b", "--bind-addr"):
+   self.bind_addr = v
elif o in ("-p", "--base-port"):
if int(v) >= 0 and int(v) <= 65535:
self.base_port = int(v)
diff --git a/python/trx/ctrl_if_bb.py b/python/trx/ctrl_if_bb.py
index 7886e23..f5a9fa3 100644
--- a/python/trx/ctrl_if_bb.py
+++ b/python/trx/ctrl_if_bb.py
@@ -26,9 +26,10 @@
 from ctrl_if import ctrl_if

 class ctrl_if_bb(ctrl_if):
-   def __init__(self, remote_addr, remote_port, bind_port, tb, pm):
+   def __init__(self, remote_addr, remote_port, bind_addr, bind_port, tb, 
pm):
print("[i] Init CTRL interface")
-   ctrl_if.__init__(self, remote_addr, remote_port, bind_port)
+   ctr

Change in gr-gsm[master]: apps/grgsm_trx: print bind / remote address and port

[Vadim Yanitskiy]

Vadim Yanitskiy has uploaded this change for review. ( 
https://gerrit.osmocom.org/10426


Change subject: apps/grgsm_trx: print bind / remote address and port
..

apps/grgsm_trx: print bind / remote address and port

Change-Id: If750d476f3972f1ab5c5b637438d14d40b1e3d87
---
M python/trx/ctrl_if_bb.py
M python/trx/radio_if.py
M python/trx/udp_link.py
3 files changed, 11 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/26/10426/1

diff --git a/python/trx/ctrl_if_bb.py b/python/trx/ctrl_if_bb.py
index f5a9fa3..fe0002e 100644
--- a/python/trx/ctrl_if_bb.py
+++ b/python/trx/ctrl_if_bb.py
@@ -27,10 +27,11 @@

 class ctrl_if_bb(ctrl_if):
def __init__(self, remote_addr, remote_port, bind_addr, bind_port, tb, 
pm):
-   print("[i] Init CTRL interface")
ctrl_if.__init__(self, remote_addr, remote_port,
bind_addr, bind_port)

+   print("[i] Init CTRL interface (%s)" % self.desc_link())
+
# Set link to the follow graph (top block)
self.tb = tb
# Power measurement
diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py
index b6d1961..6374be7 100644
--- a/python/trx/radio_if.py
+++ b/python/trx/radio_if.py
@@ -84,7 +84,9 @@
trx_bind_addr, trx_remote_addr,
trx_base_port):

-   print("[i] Init Radio interface")
+   print("[i] Init Radio interface (L:%s:%u <-> R:%s:%u)"
+   % (trx_bind_addr, trx_base_port + 2,
+   trx_remote_addr, trx_base_port + 102))

# PHY specific variables
self.sample_rate = phy_sample_rate
diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py
index efa701b..ad84e5a 100644
--- a/python/trx/udp_link.py
+++ b/python/trx/udp_link.py
@@ -47,6 +47,12 @@
data, addr = self.sock.recvfrom(128)
self.handle_rx(data.decode(), addr)

+   def desc_link(self):
+   (bind_addr, bind_port) = self.sock.getsockname()
+
+   return "L:%s:%u <-> R:%s:%u" \
+   % (bind_addr, bind_port, self.remote_addr, 
self.remote_port)
+
def send(self, data, remote = None):
if type(data) not in [bytearray, bytes]:
data = data.encode()

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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: If750d476f3972f1ab5c5b637438d14d40b1e3d87
Gerrit-Change-Number: 10426
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy 

Change in gr-gsm[master]: trx/radio_if.py: reset UHD device time at startup

[Piotr Krysik]

Piotr Krysik has posted comments on this change. ( 
https://gerrit.osmocom.org/10418 )

Change subject: trx/radio_if.py: reset UHD device time at startup
..


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

(1 comment)

https://gerrit.osmocom.org/#/c/10418/1/python/trx/radio_if.py
File python/trx/radio_if.py:

https://gerrit.osmocom.org/#/c/10418/1/python/trx/radio_if.py@264
PS1, Line 264:  self.phy_sink.set_time_now(uhd.time_spec(0.0))
set_time_now needs to be done only once, either for source or sink (I'm having 
fun with gerrit review window ;) )



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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Idddc1387199bd22342ec5af25c8635e73352e315
Gerrit-Change-Number: 10418
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Piotr Krysik 
Gerrit-Comment-Date: Fri, 10 Aug 2018 09:27:17 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: Yes

Change in gr-gsm[master]: trx/radio_if.py: reset UHD device time at startup

[Vadim Yanitskiy]

Hello Piotr Krysik,

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

https://gerrit.osmocom.org/10418

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

Change subject: trx/radio_if.py: reset UHD device time at startup
..

trx/radio_if.py: reset UHD device time at startup

Some UHD devices, such as UmTRX, require one to manually reset the
hardware clock, otherwise the burst transmission doesn't work.

Change-Id: Idddc1387199bd22342ec5af25c8635e73352e315
---
M python/trx/radio_if.py
1 file changed, 6 insertions(+), 0 deletions(-)


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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Idddc1387199bd22342ec5af25c8635e73352e315
Gerrit-Change-Number: 10418
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Piotr Krysik 

Change in gr-gsm[master]: trx/radio_if.py: reset UHD device time at startup

[Piotr Krysik]

Piotr Krysik has posted comments on this change. ( 
https://gerrit.osmocom.org/10418 )

Change subject: trx/radio_if.py: reset UHD device time at startup
..


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


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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Idddc1387199bd22342ec5af25c8635e73352e315
Gerrit-Change-Number: 10418
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Piotr Krysik 
Gerrit-Comment-Date: Fri, 10 Aug 2018 09:41:36 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in gr-gsm[master]: apps/grgsm_trx: print bind / remote address and port

[Piotr Krysik]

Piotr Krysik has posted comments on this change. ( 
https://gerrit.osmocom.org/10426 )

Change subject: apps/grgsm_trx: print bind / remote address and port
..


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


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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: If750d476f3972f1ab5c5b637438d14d40b1e3d87
Gerrit-Change-Number: 10426
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Piotr Krysik 
Gerrit-Comment-Date: Fri, 10 Aug 2018 09:43:00 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in gr-gsm[master]: trx/ctrl_if.py: send control responses to where commands are from

[Piotr Krysik]

Piotr Krysik has posted comments on this change. ( 
https://gerrit.osmocom.org/10423 )

Change subject: trx/ctrl_if.py: send control responses to where commands are 
from
..


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


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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I1f304ea887dc957d3ad53adb1e3c56ab27d8f196
Gerrit-Change-Number: 10423
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Piotr Krysik 
Gerrit-Comment-Date: Fri, 10 Aug 2018 09:45:24 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in gr-gsm[master]: apps/grgsm_trx: introduce bind address option

[Piotr Krysik]

Piotr Krysik has posted comments on this change. ( 
https://gerrit.osmocom.org/10425 )

Change subject: apps/grgsm_trx: introduce bind address option
..


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


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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I3339f686b53db07cfd1bff9a516f4bdc28058cd9
Gerrit-Change-Number: 10425
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Piotr Krysik 
Gerrit-Comment-Date: Fri, 10 Aug 2018 09:45:13 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in gr-gsm[master]: apps/grgsm_trx: also print Piotr as a copyright holder

[Piotr Krysik]

Piotr Krysik has posted comments on this change. ( 
https://gerrit.osmocom.org/10416 )

Change subject: apps/grgsm_trx: also print Piotr as a copyright holder
..


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


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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Icca7c679d84f99440ff502219f624e0f73112744
Gerrit-Change-Number: 10416
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Piotr Krysik 
Gerrit-Comment-Date: Fri, 10 Aug 2018 09:46:01 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in gr-gsm[master]: gsm_trx_burst_if: allow to customize the bind address

[Piotr Krysik]

Piotr Krysik has posted comments on this change. ( 
https://gerrit.osmocom.org/10424 )

Change subject: gsm_trx_burst_if: allow to customize the bind address
..


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


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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I6e5f7b7119ac454217b8dd04f9ee0dd3b23972b6
Gerrit-Change-Number: 10424
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Piotr Krysik 
Gerrit-Comment-Date: Fri, 10 Aug 2018 09:45:18 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in gr-gsm[master]: trx/udp_link.py: set SO_REUSEADDR socket option

[Piotr Krysik]

Piotr Krysik has posted comments on this change. ( 
https://gerrit.osmocom.org/10422 )

Change subject: trx/udp_link.py: set SO_REUSEADDR socket option
..


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


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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I6d256683a7aa0419cd5bd0a3eaa97aefdf3254f9
Gerrit-Change-Number: 10422
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Piotr Krysik 
Gerrit-Comment-Date: Fri, 10 Aug 2018 09:45:30 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in gr-gsm[master]: apps/grgsm_trx: use format string for help message

[Piotr Krysik]

Piotr Krysik has posted comments on this change. ( 
https://gerrit.osmocom.org/10420 )

Change subject: apps/grgsm_trx: use format string for help message
..


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

(1 comment)

https://gerrit.osmocom.org/#/c/10420/1/apps/grgsm_trx
File apps/grgsm_trx:

https://gerrit.osmocom.org/#/c/10420/1/apps/grgsm_trx@99
PS1, Line 99:
note: for parsing arguments we could use optparse 
(https://docs.python.org/2/library/optparse.html) or argparse 
(https://docs.python.org/2/library/argparse.html#module-argparse)



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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib1bf0ef3ded86aa92faeb9b63eb286283f5c8c3d
Gerrit-Change-Number: 10420
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Piotr Krysik 
Gerrit-Comment-Date: Fri, 10 Aug 2018 09:45:41 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: Yes

Change in gr-gsm[master]: grgsm_trx: change default TRX port number to 6700

[Piotr Krysik]

Piotr Krysik has posted comments on this change. ( 
https://gerrit.osmocom.org/10417 )

Change subject: grgsm_trx: change default TRX port number to 6700
..


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


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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Iaf0c78733bfefcb0b0938abf6d316e27d03ecab4
Gerrit-Change-Number: 10417
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Piotr Krysik 
Gerrit-Comment-Date: Fri, 10 Aug 2018 09:45:56 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in gr-gsm[master]: trx/radio_if.py: drop useless import of osmosdr

[Piotr Krysik]

Piotr Krysik has posted comments on this change. ( 
https://gerrit.osmocom.org/10419 )

Change subject: trx/radio_if.py: drop useless import of osmosdr
..


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


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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Iacd5ca118957e3ecf05df81f511b17bb9a8982b5
Gerrit-Change-Number: 10419
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Piotr Krysik 
Gerrit-Comment-Date: Fri, 10 Aug 2018 09:45:47 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in gr-gsm[master]: trx/udp_link.py: close socket in destructor

[Piotr Krysik]

Piotr Krysik has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10421 )

Change subject: trx/udp_link.py: close socket in destructor
..

trx/udp_link.py: close socket in destructor

Previously it was required to call the UDPLink.shutdown() method
manually in order to close a socket. Let's do it automatically
using the destructor of UDPLink.

Cherry-picked from: I59c3dc61ec58cd9effeb789947d28fd602ca91f4
Change-Id: Ief7aa21d1e50682a90616833b679741957193aae
---
M apps/grgsm_trx
M python/trx/ctrl_if_bb.py
M python/trx/udp_link.py
3 files changed, 3 insertions(+), 8 deletions(-)

Approvals:
  Piotr Krysik: Looks good to me, approved; Verified



diff --git a/apps/grgsm_trx b/apps/grgsm_trx
index b925fc1..668b0be 100755
--- a/apps/grgsm_trx
+++ b/apps/grgsm_trx
@@ -83,7 +83,6 @@

def shutdown(self):
print("[i] Shutting down...")
-   self.server.shutdown()
self.radio.shutdown()

def print_copyright(self):
diff --git a/python/trx/ctrl_if_bb.py b/python/trx/ctrl_if_bb.py
index 5874e59..7886e23 100644
--- a/python/trx/ctrl_if_bb.py
+++ b/python/trx/ctrl_if_bb.py
@@ -35,10 +35,6 @@
# Power measurement
self.pm = pm
 
-   def shutdown(self):
-   print("[i] Shutdown CTRL interface")
-   ctrl_if.shutdown(self)
-
def parse_cmd(self, request):
# Power control
if self.verify_cmd(request, "POWERON", 0):
diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py
index 675ef5c..cedcb1b 100644
--- a/python/trx/udp_link.py
+++ b/python/trx/udp_link.py
@@ -35,6 +35,9 @@
self.remote_addr = remote_addr
self.remote_port = remote_port
 
+   def __del__(self):
+   self.sock.close()
+
def loop(self):
r_event, w_event, x_event = select.select([self.sock], [], [])

@@ -43,9 +46,6 @@
data, addr = self.sock.recvfrom(128)
self.handle_rx(data.decode())

-   def shutdown(self):
-   self.sock.close();
-
def send(self, data):
if type(data) not in [bytearray, bytes]:
data = data.encode()

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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ief7aa21d1e50682a90616833b679741957193aae
Gerrit-Change-Number: 10421
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Piotr Krysik 

Change in gr-gsm[master]: trx/udp_link.py: close socket in destructor

[Piotr Krysik]

Piotr Krysik has posted comments on this change. ( 
https://gerrit.osmocom.org/10421 )

Change subject: trx/udp_link.py: close socket in destructor
..


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


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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ief7aa21d1e50682a90616833b679741957193aae
Gerrit-Change-Number: 10421
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Piotr Krysik 
Gerrit-Comment-Date: Fri, 10 Aug 2018 09:45:35 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in gr-gsm[master]: apps/grgsm_trx: also print Piotr as a copyright holder

[Piotr Krysik]

Piotr Krysik has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10416 )

Change subject: apps/grgsm_trx: also print Piotr as a copyright holder
..

apps/grgsm_trx: also print Piotr as a copyright holder

Despite the most part of Python code was written by Vadim, it's
heavily based on huge and impressive work done by Piotr. Let's
also print his credentials in the license header.

Change-Id: Icca7c679d84f99440ff502219f624e0f73112744
---
M apps/grgsm_trx
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Piotr Krysik: Looks good to me, approved; Verified



diff --git a/apps/grgsm_trx b/apps/grgsm_trx
index 128adab..eafc726 100755
--- a/apps/grgsm_trx
+++ b/apps/grgsm_trx
@@ -31,6 +31,7 @@

 COPYRIGHT = \
"Copyright (C) 2016-2017 by Vadim Yanitskiy \n" \
+   "Copyright (C) 2017 by Piotr Krysik \n" \
"License GPLv2+: GNU GPL version 2 or later " \
"\n" \
"This is free software: you are free to change and redistribute it.\n" \

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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Icca7c679d84f99440ff502219f624e0f73112744
Gerrit-Change-Number: 10416
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Piotr Krysik 

Change in gr-gsm[master]: trx/udp_link.py: set SO_REUSEADDR socket option

[Piotr Krysik]

Piotr Krysik has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10422 )

Change subject: trx/udp_link.py: set SO_REUSEADDR socket option
..

trx/udp_link.py: set SO_REUSEADDR socket option

Setting this option allows one to reuse existing connections,
for example, by injecting CTRL commands or DATA bursts
into existing connections.

Cherry-picked from: I0882c76affa9a668a12d10967081054d2b666ed1
Change-Id: I6d256683a7aa0419cd5bd0a3eaa97aefdf3254f9
---
M python/trx/udp_link.py
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Piotr Krysik: Looks good to me, approved; Verified



diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py
index cedcb1b..1fae8b4 100644
--- a/python/trx/udp_link.py
+++ b/python/trx/udp_link.py
@@ -28,6 +28,7 @@
 class udp_link:
def __init__(self, remote_addr, remote_port, bind_port):
self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+   self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
self.sock.bind((remote_addr, bind_port))
self.sock.setblocking(0)


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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I6d256683a7aa0419cd5bd0a3eaa97aefdf3254f9
Gerrit-Change-Number: 10422
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Piotr Krysik 

Change in gr-gsm[master]: trx/radio_if.py: reset UHD device time at startup

[Piotr Krysik]

Piotr Krysik has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10418 )

Change subject: trx/radio_if.py: reset UHD device time at startup
..

trx/radio_if.py: reset UHD device time at startup

Some UHD devices, such as UmTRX, require one to manually reset the
hardware clock, otherwise the burst transmission doesn't work.

Change-Id: Idddc1387199bd22342ec5af25c8635e73352e315
---
M python/trx/radio_if.py
1 file changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Piotr Krysik: Looks good to me, approved; Verified



diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py
index 355312b..119b237 100644
--- a/python/trx/radio_if.py
+++ b/python/trx/radio_if.py
@@ -257,6 +257,12 @@
(self.dict_toggle_sign, 'dict_out'),
(self.msg_to_tag_sink, 'msg'))

+
+   # Some UHD devices (such as UmTRX) do start the clock
+   # not from 0, so it's required to reset it manually.
+   # Resetting UHD source will also affect the sink.
+   self.phy_src.set_time_now(uhd.time_spec(0.0))
+
def shutdown(self):
print("[i] Shutdown Radio interface")
self.stop()

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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Idddc1387199bd22342ec5af25c8635e73352e315
Gerrit-Change-Number: 10418
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Piotr Krysik 

Change in gr-gsm[master]: apps/grgsm_trx: use format string for help message

[Piotr Krysik]

Piotr Krysik has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10420 )

Change subject: apps/grgsm_trx: use format string for help message
..

apps/grgsm_trx: use format string for help message

Instead of using the hard-coded default values in help message,
it makes sense to use a format string, and pass the actual
values when printing help.

Change-Id: Ib1bf0ef3ded86aa92faeb9b63eb286283f5c8c3d
---
M apps/grgsm_trx
1 file changed, 15 insertions(+), 8 deletions(-)

Approvals:
  Piotr Krysik: Looks good to me, approved; Verified



diff --git a/apps/grgsm_trx b/apps/grgsm_trx
index eb7fbdb..b925fc1 100755
--- a/apps/grgsm_trx
+++ b/apps/grgsm_trx
@@ -96,20 +96,27 @@

# TRX specific
s += " TRX interface specific\n" \
-"  -i --remote-addr  Set remote address (default 
127.0.0.1)\n" \
-"  -p --base-portSet base port number (default 
5700)\n\n"
+"  -i --remote-addr  Set remote address (default 
%s)\n" \
+"  -p --base-portSet base port number (default 
%d)\n\n"

# PHY specific
s += " Radio interface specific\n" \
 "  -a --device-args  Set device arguments\n" \
 "  -s --sample-rate  Set sample rate\n" \
-"  -g --rx-gain  Set RX gain (default 30)\n" \
-"  -G --tx-gain  Set TX gain (default 10)\n" \
-" --rx-antenna   Set RX antenna (default RX2)\n" \
-" --tx-antenna   Set TX antenna (default TX/RX)\n" 
\
-" --ppm  Set frequency correction (default 
0)\n"
+"  -g --rx-gain  Set RX gain (default %d)\n" \
+"  -G --tx-gain  Set TX gain (default %d)\n" \
+" --rx-antenna   Set RX antenna (default %s)\n" \
+" --tx-antenna   Set TX antenna (default %s)\n" \
+" --ppm  Set frequency correction (default 
%d)\n"

-   print(s)
+   print(s % (
+   self.remote_addr,
+   self.base_port,
+   self.phy_rx_gain,
+   self.phy_tx_gain,
+   self.phy_rx_antenna,
+   self.phy_tx_antenna,
+   self.phy_ppm))

def parse_argv(self):
try:

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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1bf0ef3ded86aa92faeb9b63eb286283f5c8c3d
Gerrit-Change-Number: 10420
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Piotr Krysik 

Change in gr-gsm[master]: trx/radio_if.py: drop useless import of osmosdr

[Piotr Krysik]

Piotr Krysik has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10419 )

Change subject: trx/radio_if.py: drop useless import of osmosdr
..

trx/radio_if.py: drop useless import of osmosdr

Change-Id: Iacd5ca118957e3ecf05df81f511b17bb9a8982b5
---
M python/trx/radio_if.py
1 file changed, 0 insertions(+), 1 deletion(-)

Approvals:
  Piotr Krysik: Looks good to me, approved; Verified



diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py
index 119b237..2648cc9 100644
--- a/python/trx/radio_if.py
+++ b/python/trx/radio_if.py
@@ -26,7 +26,6 @@
 import pmt
 import time
 import grgsm
-import osmosdr

 from math import pi


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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Iacd5ca118957e3ecf05df81f511b17bb9a8982b5
Gerrit-Change-Number: 10419
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Piotr Krysik 

Change in gr-gsm[master]: trx/ctrl_if.py: send control responses to where commands are from

[Piotr Krysik]

Piotr Krysik has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10423 )

Change subject: trx/ctrl_if.py: send control responses to where commands are 
from
..

trx/ctrl_if.py: send control responses to where commands are from

When we receive a control command, we should not simply send the
response to the default destination, but send it back to the exact
IP/prt from which the command originated.

This ensures correct routing of responses even in case multiple
programs are interfacing concurrently with a control socket.

Cherry-picked from: I24a0bba6eed059b101af95dac7d059f34dd715fc
Change-Id: I1f304ea887dc957d3ad53adb1e3c56ab27d8f196
---
M python/trx/ctrl_if.py
M python/trx/udp_link.py
2 files changed, 12 insertions(+), 9 deletions(-)

Approvals:
  Piotr Krysik: Looks good to me, approved; Verified



diff --git a/python/trx/ctrl_if.py b/python/trx/ctrl_if.py
index 7dee0f8..ae5cf05 100644
--- a/python/trx/ctrl_if.py
+++ b/python/trx/ctrl_if.py
@@ -25,15 +25,15 @@
 from grgsm.trx import udp_link

 class ctrl_if(udp_link):
-   def handle_rx(self, data):
+   def handle_rx(self, data, remote):
if self.verify_req(data):
request = self.prepare_req(data)
rc = self.parse_cmd(request)

if type(rc) is tuple:
-   self.send_response(request, rc[0], rc[1])
+   self.send_response(request, remote, rc[0], 
rc[1])
else:
-   self.send_response(request, rc)
+   self.send_response(request, remote, rc)
else:
print("[!] Wrong data on CTRL interface")

@@ -65,7 +65,7 @@

return True

-   def send_response(self, request, response_code, params = None):
+   def send_response(self, request, remote, response_code, params = None):
# Include status code, for example ["TXTUNE", "0", "941600"]
request.insert(1, str(response_code))

@@ -76,7 +76,7 @@
# Add the response signature, and join back to string
response = "RSP " + " ".join(request) + "\0"
# Now we have something like "RSP TXTUNE 0 941600"
-   self.send(response)
+   self.send(response, remote)

def parse_cmd(self, request):
raise NotImplementedError
diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py
index 1fae8b4..d96a6aa 100644
--- a/python/trx/udp_link.py
+++ b/python/trx/udp_link.py
@@ -45,13 +45,16 @@
# Check for incoming data
if self.sock in r_event:
data, addr = self.sock.recvfrom(128)
-   self.handle_rx(data.decode())
+   self.handle_rx(data.decode(), addr)

-   def send(self, data):
+   def send(self, data, remote = None):
if type(data) not in [bytearray, bytes]:
data = data.encode()

-   self.sock.sendto(data, (self.remote_addr, self.remote_port))
+   if remote is None:
+   remote = (self.remote_addr, self.remote_port)

-   def handle_rx(self, data):
+   self.sock.sendto(data, remote)
+
+   def handle_rx(self, data, remote):
raise NotImplementedError

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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I1f304ea887dc957d3ad53adb1e3c56ab27d8f196
Gerrit-Change-Number: 10423
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Piotr Krysik 

Change in gr-gsm[master]: apps/grgsm_trx: introduce bind address option

[Piotr Krysik]

Piotr Krysik has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10425 )

Change subject: apps/grgsm_trx: introduce bind address option
..

apps/grgsm_trx: introduce bind address option

The new option (-b --bind-addr) allows one to specify the bind
address for both DATA and CTRL interfaces. By default, '0.0.0.0'
is used, so there are no restrictions for the L1 source address.

Change-Id: I3339f686b53db07cfd1bff9a516f4bdc28058cd9
---
M apps/grgsm_trx
M python/trx/ctrl_if_bb.py
M python/trx/radio_if.py
M python/trx/udp_link.py
4 files changed, 23 insertions(+), 15 deletions(-)

Approvals:
  Piotr Krysik: Looks good to me, approved; Verified



diff --git a/apps/grgsm_trx b/apps/grgsm_trx
index 668b0be..1c0581f 100755
--- a/apps/grgsm_trx
+++ b/apps/grgsm_trx
@@ -3,7 +3,7 @@

 # GR-GSM based transceiver
 #
-# (C) 2016-2017 by Vadim Yanitskiy 
+# (C) 2016-2018 by Vadim Yanitskiy 
 #
 # All Rights Reserved
 #
@@ -30,7 +30,7 @@
 from grgsm.trx import fake_pm

 COPYRIGHT = \
-   "Copyright (C) 2016-2017 by Vadim Yanitskiy \n" \
+   "Copyright (C) 2016-2018 by Vadim Yanitskiy \n" \
"Copyright (C) 2017 by Piotr Krysik \n" \
"License GPLv2+: GNU GPL version 2 or later " \
"\n" \
@@ -40,6 +40,7 @@
 class Application:
# Application variables
remote_addr = "127.0.0.1"
+   bind_addr = "0.0.0.0"
base_port = 6700

# PHY specific
@@ -63,7 +64,8 @@
self.radio = radio_if(self.phy_args, self.phy_sample_rate,
self.phy_rx_gain, self.phy_tx_gain, self.phy_ppm,
self.phy_rx_antenna, self.phy_tx_antenna,
-   self.remote_addr, self.base_port)
+   self.bind_addr, self.remote_addr,
+   self.base_port)

# Power measurement emulation
# Noise: -120 .. -105
@@ -71,8 +73,9 @@
self.pm = fake_pm(-120, -105, -75, -50)

# Init TRX CTRL interface
-   self.server = ctrl_if_bb(self.remote_addr,
-   self.base_port + 101, self.base_port + 1,
+   self.server = ctrl_if_bb(
+   self.remote_addr, self.base_port + 101,
+   self.bind_addr, self.base_port + 1,
self.radio, self.pm)

print("[i] Init complete")
@@ -96,6 +99,7 @@
# TRX specific
s += " TRX interface specific\n" \
 "  -i --remote-addr  Set remote address (default 
%s)\n" \
+"  -b --bind-addrSet bind address (default %s)\n" \
 "  -p --base-portSet base port number (default 
%d)\n\n"

# PHY specific
@@ -110,6 +114,7 @@

print(s % (
self.remote_addr,
+   self.bind_addr,
self.base_port,
self.phy_rx_gain,
self.phy_tx_gain,
@@ -120,10 +125,10 @@
def parse_argv(self):
try:
opts, args = getopt.getopt(sys.argv[1:],
-   "i:p:a:s:g:G:h",
-   ["help", "remote-addr=", "base-port=", 
"device-args=",
-   "sample-rate=", "rx-gain=", "tx-gain=", "ppm=",
-   "rx-antenna=", "tx-antenna="])
+   "i:b:p:a:s:g:G:h",
+   ["help", "remote-addr=", "bind-addr=", 
"base-port=",
+   "device-args=", "sample-rate=", "rx-gain=", 
"tx-gain=",
+   "ppm=", "rx-antenna=", "tx-antenna="])
except getopt.GetoptError as err:
# Print(help and exit)
self.print_help()
@@ -138,6 +143,8 @@
# TRX specific
elif o in ("-i", "--remote-addr"):
self.remote_addr = v
+   elif o in ("-b", "--bind-addr"):
+   self.bind_addr = v
elif o in ("-p", "--base-port"):
if int(v) >= 0 and int(v) <= 65535:
self.base_port = int(v)
diff --git a/python/trx/ctrl_if_bb.py b/python/trx/ctrl_if_bb.py
index 7886e23..f5a9fa3 100644
--- a/python/trx/ctrl_if_bb.py
+++ b/python/trx/ctrl_if_bb.py
@@ -26,9 +26,10 @@
 from ctrl_if import ctrl_if

 class ctrl_if_bb(ctrl_if):
-   def __init__(self, remote_addr, remote_port, bind_port, tb, pm):
+   def __init__(self, remote_addr, remote_port, bind_addr, bind_port, tb, 
pm):
print("[i] Init CTRL interface")
-   ctrl_if.__init__(self, remote_addr, remote_port, bind_port)
+   ctrl_i

Change in gr-gsm[master]: grgsm_trx: change default TRX port number to 6700

[Piotr Krysik]

Piotr Krysik has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10417 )

Change subject: grgsm_trx: change default TRX port number to 6700
..

grgsm_trx: change default TRX port number to 6700

In order to avoid clashes with OsmoTRX, which may be also
running on the same host, let's use a different port range
starting from 6700 by default.

This idea was introduced as a result of OS#2984.

Change-Id: Iaf0c78733bfefcb0b0938abf6d316e27d03ecab4
---
M apps/grgsm_trx
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Piotr Krysik: Looks good to me, approved; Verified



diff --git a/apps/grgsm_trx b/apps/grgsm_trx
index eafc726..eb7fbdb 100755
--- a/apps/grgsm_trx
+++ b/apps/grgsm_trx
@@ -40,7 +40,7 @@
 class Application:
# Application variables
remote_addr = "127.0.0.1"
-   base_port = 5700
+   base_port = 6700

# PHY specific
phy_sample_rate = 4 * 1625000 / 6

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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf0c78733bfefcb0b0938abf6d316e27d03ecab4
Gerrit-Change-Number: 10417
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Piotr Krysik 

Change in gr-gsm[master]: gsm_trx_burst_if: allow to customize the bind address

[Piotr Krysik]

Piotr Krysik has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10424 )

Change subject: gsm_trx_burst_if: allow to customize the bind address
..

gsm_trx_burst_if: allow to customize the bind address

Pleviously remote address for DATA interface was also used as the
bind address, what is definitely wrong. Let's change the API a bit
in order to allow one to specify a custom bind address.

Change-Id: I6e5f7b7119ac454217b8dd04f9ee0dd3b23972b6
---
M grc/trx/gsm_trx_burst_if.xml
M include/grgsm/misc_utils/udp_socket.h
M include/grgsm/trx/trx_burst_if.h
M lib/misc_utils/udp_socket.cc
M lib/trx/trx_burst_if_impl.cc
M lib/trx/trx_burst_if_impl.h
M python/trx/radio_if.py
7 files changed, 26 insertions(+), 11 deletions(-)

Approvals:
  Piotr Krysik: Looks good to me, approved; Verified



diff --git a/grc/trx/gsm_trx_burst_if.xml b/grc/trx/gsm_trx_burst_if.xml
index 99427b3..49979a3 100644
--- a/grc/trx/gsm_trx_burst_if.xml
+++ b/grc/trx/gsm_trx_burst_if.xml
@@ -3,7 +3,7 @@
   TRX Burst Interface
   gsm_trx_burst_if
   import grgsm
-  grgsm.trx_burst_if($remote_addr, $base_port)
+  grgsm.trx_burst_if($bind_addr, $remote_addr, $base_port)

   
 base_port
@@ -13,6 +13,13 @@
   

   
+bind_addr
+bind_addr
+0.0.0.0
+string
+  
+
+  
 remote_addr
 remote_addr
 127.0.0.1
diff --git a/include/grgsm/misc_utils/udp_socket.h 
b/include/grgsm/misc_utils/udp_socket.h
index 15b2c66..d1ceb9f 100644
--- a/include/grgsm/misc_utils/udp_socket.h
+++ b/include/grgsm/misc_utils/udp_socket.h
@@ -53,8 +53,9 @@

 public:
   udp_socket(
-const std::string &remote_addr,
+const std::string &bind_addr,
 const std::string &src_port,
+const std::string &remote_addr,
 const std::string &dst_port,
 size_t mtu);
   ~udp_socket();
diff --git a/include/grgsm/trx/trx_burst_if.h b/include/grgsm/trx/trx_burst_if.h
index 0e7a35a..9277dc5 100644
--- a/include/grgsm/trx/trx_burst_if.h
+++ b/include/grgsm/trx/trx_burst_if.h
@@ -48,6 +48,7 @@
* creating new instances.
*/
   static sptr make(
+const std::string &bind_addr,
 const std::string &remote_addr,
 const std::string &base_port);
 };
diff --git a/lib/misc_utils/udp_socket.cc b/lib/misc_utils/udp_socket.cc
index 73393a0..c43f183 100644
--- a/lib/misc_utils/udp_socket.cc
+++ b/lib/misc_utils/udp_socket.cc
@@ -38,8 +38,9 @@
   namespace gsm {

 udp_socket::udp_socket(
-  const std::string &remote_addr,
+  const std::string &bind_addr,
   const std::string &src_port,
+  const std::string &remote_addr,
   const std::string &dst_port,
   size_t mtu)
 {
@@ -50,7 +51,7 @@
   udp::resolver resolver(d_io_service);

   udp::resolver::query rx_query(
-udp::v4(), remote_addr, src_port,
+udp::v4(), bind_addr, src_port,
 boost::asio::ip::resolver_query_base::passive);
   udp::resolver::query tx_query(
 udp::v4(), remote_addr, dst_port,
diff --git a/lib/trx/trx_burst_if_impl.cc b/lib/trx/trx_burst_if_impl.cc
index e3fcc89..f72eecd 100644
--- a/lib/trx/trx_burst_if_impl.cc
+++ b/lib/trx/trx_burst_if_impl.cc
@@ -48,19 +48,22 @@

 trx_burst_if::sptr
 trx_burst_if::make(
+  const std::string &bind_addr,
   const std::string &remote_addr,
   const std::string &base_port)
 {
   int base_port_int = boost::lexical_cast (base_port);

   return gnuradio::get_initial_sptr
-(new trx_burst_if_impl(remote_addr, base_port_int));
+(new trx_burst_if_impl(bind_addr, remote_addr,
+  base_port_int));
 }

 /*
  * The private constructor
  */
 trx_burst_if_impl::trx_burst_if_impl(
+  const std::string &bind_addr,
   const std::string &remote_addr,
   int base_port
 ) : gr::block("trx_burst_if",
@@ -79,8 +82,8 @@
 std::string data_dst_port = boost::lexical_cast 
(base_port + 102);

 // Init DATA interface
-d_data_sock = new udp_socket(remote_addr,
-  data_src_port, data_dst_port, DATA_IF_MTU);
+d_data_sock = new udp_socket(bind_addr, data_src_port,
+  remote_addr, data_dst_port, DATA_IF_MTU);

 // Bind DATA interface handler
 d_data_sock->udp_rx_handler = boost::bind(
diff --git a/lib/trx/trx_burst_if_impl.h b/lib/trx/trx_burst_if_impl.h
index 27ec259..fdb49f2 100644
--- a/lib/trx/trx_burst_if_impl.h
+++ b/lib/trx/trx_burst_if_impl.h
@@ -40,7 +40,8 @@
   void burst_pack(pmt::pmt_t msg, uint8_t *buf);

  public:
-  trx_burst_if_impl(const std::string &remote_addr, int base_port);
+  trx_burst_if_impl(const std::string &bind_addr,
+const std::string &remote_addr, int base_port);
   ~trx_burst_if_impl();

   void handle_dl_burst(pmt::pmt_t msg);
diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py
index 2648cc9..25a35a5 100644
--- a/python/trx/rad

Change in gr-gsm[master]: apps/grgsm_trx: print bind / remote address and port

[Piotr Krysik]

Piotr Krysik has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10426 )

Change subject: apps/grgsm_trx: print bind / remote address and port
..

apps/grgsm_trx: print bind / remote address and port

Change-Id: If750d476f3972f1ab5c5b637438d14d40b1e3d87
---
M python/trx/ctrl_if_bb.py
M python/trx/radio_if.py
M python/trx/udp_link.py
3 files changed, 11 insertions(+), 2 deletions(-)

Approvals:
  Piotr Krysik: Looks good to me, approved; Verified



diff --git a/python/trx/ctrl_if_bb.py b/python/trx/ctrl_if_bb.py
index f5a9fa3..fe0002e 100644
--- a/python/trx/ctrl_if_bb.py
+++ b/python/trx/ctrl_if_bb.py
@@ -27,10 +27,11 @@

 class ctrl_if_bb(ctrl_if):
def __init__(self, remote_addr, remote_port, bind_addr, bind_port, tb, 
pm):
-   print("[i] Init CTRL interface")
ctrl_if.__init__(self, remote_addr, remote_port,
bind_addr, bind_port)

+   print("[i] Init CTRL interface (%s)" % self.desc_link())
+
# Set link to the follow graph (top block)
self.tb = tb
# Power measurement
diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py
index 1c7f003..d2afcf6 100644
--- a/python/trx/radio_if.py
+++ b/python/trx/radio_if.py
@@ -84,7 +84,9 @@
trx_bind_addr, trx_remote_addr,
trx_base_port):

-   print("[i] Init Radio interface")
+   print("[i] Init Radio interface (L:%s:%u <-> R:%s:%u)"
+   % (trx_bind_addr, trx_base_port + 2,
+   trx_remote_addr, trx_base_port + 102))

# PHY specific variables
self.sample_rate = phy_sample_rate
diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py
index efa701b..ad84e5a 100644
--- a/python/trx/udp_link.py
+++ b/python/trx/udp_link.py
@@ -47,6 +47,12 @@
data, addr = self.sock.recvfrom(128)
self.handle_rx(data.decode(), addr)

+   def desc_link(self):
+   (bind_addr, bind_port) = self.sock.getsockname()
+
+   return "L:%s:%u <-> R:%s:%u" \
+   % (bind_addr, bind_port, self.remote_addr, 
self.remote_port)
+
def send(self, data, remote = None):
if type(data) not in [bytearray, bytes]:
data = data.encode()

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

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: If750d476f3972f1ab5c5b637438d14d40b1e3d87
Gerrit-Change-Number: 10426
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Piotr Krysik 

Change in libtelnet[master]: util/Makefile.am: Fix build with builddir neq srcdir

[Pau Espin Pedrol]

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


Change subject: util/Makefile.am: Fix build with builddir neq srcdir
..

util/Makefile.am: Fix build with builddir neq srcdir

Change-Id: I2ce5feeacda1f0b41de1d0a07d8c40ca09ad9fc2
---
M util/Makefile.am
1 file changed, 3 insertions(+), 3 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libtelnet refs/changes/27/10427/1

diff --git a/util/Makefile.am b/util/Makefile.am
index 9c66ef7..57f7fa6 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,9 +1,9 @@
-AM_CFLAGS = -I..
-AM_LDFLAGS = -L..
+AM_CFLAGS = -I$(srcdir)/..
+AM_LDFLAGS = -L$(builddir)/..

 ipaccess_telnet_SOURCES = telnet-client.c ../libtelnet.h ipaccess-auth.c
 ipaccess_telnet_LDADD = ../libtelnet.la -lssl -lcrypto
-ipaccess_telnet_CFLAGS = -DNANO_BTS_CLI_CLIENT -I..
+ipaccess_telnet_CFLAGS = -DNANO_BTS_CLI_CLIENT -I$(srcdir)/..

 telnet_client_SOURCES = telnet-client.c ../libtelnet.h
 telnet_client_LDADD = ../libtelnet.la

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

Gerrit-Project: libtelnet
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ce5feeacda1f0b41de1d0a07d8c40ca09ad9fc2
Gerrit-Change-Number: 10427
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in libtelnet[master]: util/Makefile.am: Fix build with builddir neq srcdir

[Pau Espin Pedrol]

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

Change subject: util/Makefile.am: Fix build with builddir neq srcdir
..


Patch Set 1: Verified+1


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

Gerrit-Project: libtelnet
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I2ce5feeacda1f0b41de1d0a07d8c40ca09ad9fc2
Gerrit-Change-Number: 10427
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Fri, 10 Aug 2018 11:01:33 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libtelnet[master]: util/Makefile.am: Fix build with builddir neq srcdir

[Pau Espin Pedrol]

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

Change subject: util/Makefile.am: Fix build with builddir neq srcdir
..


Patch Set 1:

Please +2 it but don't merge it. This way I'll remember to update SRCREV in OE 
recipe when I merge it.


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

Gerrit-Project: libtelnet
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I2ce5feeacda1f0b41de1d0a07d8c40ca09ad9fc2
Gerrit-Change-Number: 10427
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Fri, 10 Aug 2018 11:02:51 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in osmo-msc[master]: libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello()

[Keith Whyte]

Keith Whyte has uploaded this change for review. ( 
https://gerrit.osmocom.org/10428


Change subject: libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello()
..

libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello()

lchan_type was removed from gsm_mncc and the hello message on initial import 
from legacy OpenBSC
in Change-Id: Id3705236350d5f69e447046b0a764bbabc3d493c

This patch follows on from Change-Id: Ia02373a36df7605507ee3de49173a9fd6547b726 
which reintroduced
lchan_type to the gsm_mncc struct. This patch restores the lchan_type_offset to 
the hello protocol message

Without this patch, LCR will issue an error and disconnect from the MNCC socket.

Change-Id: I65312082fa5dc0721170f923840e992ef9481a63
Closes: OS#3461
---
M src/libmsc/mncc_sock.c
1 file changed, 1 insertion(+), 0 deletions(-)



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

diff --git a/src/libmsc/mncc_sock.c b/src/libmsc/mncc_sock.c
index 74ea9d2..57b4bd8 100644
--- a/src/libmsc/mncc_sock.c
+++ b/src/libmsc/mncc_sock.c
@@ -228,6 +228,7 @@
hello->called_offset = offsetof(struct gsm_mncc, called);
hello->signal_offset = offsetof(struct gsm_mncc, signal);
hello->emergency_offset = offsetof(struct gsm_mncc, emergency);
+   hello->lchan_type_offset = offsetof(struct gsm_mncc, lchan_type);

msgb_enqueue(&mncc->net->upqueue, msg);
mncc->conn_bfd.when |= BSC_FD_WRITE;

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

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65312082fa5dc0721170f923840e992ef9481a63
Gerrit-Change-Number: 10428
Gerrit-PatchSet: 1
Gerrit-Owner: Keith Whyte 

Change in osmo-msc[master]: libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello()

[Keith Whyte]

Hello Jenkins Builder,

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

https://gerrit.osmocom.org/10428

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

Change subject: libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello()
..

libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello()

lchan_type was removed from gsm_mncc and the hello message
on initial import from legacy OpenBSC in
Change-Id: Id3705236350d5f69e447046b0a764bbabc3d493c

This patch follows on from Change-Id: Ia02373a36df7605507ee3de49173a9fd6547b726
which reintroduced lchan_type to the gsm_mncc struct.

This patch restores the lchan_type_offset to the hello protocol message

Without this patch, LCR will issue an error and disconnect from the MNCC socket.

Change-Id: I65312082fa5dc0721170f923840e992ef9481a63
Closes: OS#3461
---
M src/libmsc/mncc_sock.c
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/28/10428/2
--
To view, visit https://gerrit.osmocom.org/10428
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: I65312082fa5dc0721170f923840e992ef9481a63
Gerrit-Change-Number: 10428
Gerrit-PatchSet: 2
Gerrit-Owner: Keith Whyte 
Gerrit-Reviewer: Jenkins Builder

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

[jenkins]

See 


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

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

Change in osmo-msc[master]: libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello()

[Vadim Yanitskiy]

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

Change subject: libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello()
..


Patch Set 2: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/10428
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: I65312082fa5dc0721170f923840e992ef9481a63
Gerrit-Change-Number: 10428
Gerrit-PatchSet: 2
Gerrit-Owner: Keith Whyte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Fri, 10 Aug 2018 16:22:43 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-gsm-tester[master]: resources.conf.prod: Update modem paths after HW setup changes

[Pau Espin Pedrol]

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


Change subject: resources.conf.prod: Update modem paths after HW setup changes
..

resources.conf.prod: Update modem paths after HW setup changes

Change-Id: I8673af3e9447b8093bc61503f9354a8f0431620e
---
M example/resources.conf.prod
1 file changed, 4 insertions(+), 4 deletions(-)



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

diff --git a/example/resources.conf.prod b/example/resources.conf.prod
index 6023fc4..31a737c 100644
--- a/example/resources.conf.prod
+++ b/example/resources.conf.prod
@@ -96,28 +96,28 @@

 modem:
 - label: sierra_1st
-  path: '/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.7/1-1.7.2'
+  path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.2'
   ki: 'EBAB63D06C3F546A16C977CB40E57C68'
   auth_algo: 'comp128v1'
   ciphers: [a5_0, a5_1]
   features: ['sms', 'voice', 'ussd', 'gprs', 'sim']

 - label: sierra_2nd
-  path: '/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.7/1-1.7.3'
+  path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.3'
   ki: 'EBD2B5F6CF3374106D0A66C11F922001'
   auth_algo: 'comp128v1'
   ciphers: [a5_0, a5_1]
   features: ['sms', 'voice', 'ussd', 'gprs', 'sim']

 - label: ec20
-  path: '/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.7/1-1.7.6'
+  path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.6'
   ki: '07F35D0A9476646169669401215580E0'
   auth_algo: 'comp128v1'
   ciphers: [a5_0, a5_1]
   features: ['sms', 'ussd', 'gprs', 'sim']

 - label: gobi2k
-  path: '/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.7/1-1.7.5'
+  path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.5'
   ki: '5752B3F43277C35D2D1D957007DF74E2'
   auth_algo: 'comp128v1'
   ciphers: [a5_0, a5_1]

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

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

Change in osmo-gsm-tester[master]: resources.conf.prod: Update modem paths after HW setup changes

[Pau Espin Pedrol]

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

Change subject: resources.conf.prod: Update modem paths after HW setup changes
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I8673af3e9447b8093bc61503f9354a8f0431620e
Gerrit-Change-Number: 10429
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-CC: Jenkins Builder
Gerrit-Comment-Date: Fri, 10 Aug 2018 19:53:28 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-gsm-tester[master]: resources.conf.prod: Update modem paths after HW setup changes

[Pau Espin Pedrol]

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

Change subject: resources.conf.prod: Update modem paths after HW setup changes
..

resources.conf.prod: Update modem paths after HW setup changes

Change-Id: I8673af3e9447b8093bc61503f9354a8f0431620e
---
M example/resources.conf.prod
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Pau Espin Pedrol: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/example/resources.conf.prod b/example/resources.conf.prod
index 6023fc4..31a737c 100644
--- a/example/resources.conf.prod
+++ b/example/resources.conf.prod
@@ -96,28 +96,28 @@

 modem:
 - label: sierra_1st
-  path: '/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.7/1-1.7.2'
+  path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.2'
   ki: 'EBAB63D06C3F546A16C977CB40E57C68'
   auth_algo: 'comp128v1'
   ciphers: [a5_0, a5_1]
   features: ['sms', 'voice', 'ussd', 'gprs', 'sim']

 - label: sierra_2nd
-  path: '/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.7/1-1.7.3'
+  path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.3'
   ki: 'EBD2B5F6CF3374106D0A66C11F922001'
   auth_algo: 'comp128v1'
   ciphers: [a5_0, a5_1]
   features: ['sms', 'voice', 'ussd', 'gprs', 'sim']

 - label: ec20
-  path: '/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.7/1-1.7.6'
+  path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.6'
   ki: '07F35D0A9476646169669401215580E0'
   auth_algo: 'comp128v1'
   ciphers: [a5_0, a5_1]
   features: ['sms', 'ussd', 'gprs', 'sim']

 - label: gobi2k
-  path: '/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.7/1-1.7.5'
+  path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.5'
   ki: '5752B3F43277C35D2D1D957007DF74E2'
   auth_algo: 'comp128v1'
   ciphers: [a5_0, a5_1]

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

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I8673af3e9447b8093bc61503f9354a8f0431620e
Gerrit-Change-Number: 10429
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol 

Change in libtelnet[master]: util/Makefile.am: Fix build with builddir neq srcdir

[Harald Welte]

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

Change subject: util/Makefile.am: Fix build with builddir neq srcdir
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: libtelnet
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I2ce5feeacda1f0b41de1d0a07d8c40ca09ad9fc2
Gerrit-Change-Number: 10427
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Fri, 10 Aug 2018 20:59:13 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libtelnet[master]: util/Makefile.am: Fix build with builddir neq srcdir

[Harald Welte]

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

Change subject: util/Makefile.am: Fix build with builddir neq srcdir
..

util/Makefile.am: Fix build with builddir neq srcdir

Change-Id: I2ce5feeacda1f0b41de1d0a07d8c40ca09ad9fc2
---
M util/Makefile.am
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Pau Espin Pedrol: Verified
  Harald Welte: Looks good to me, approved



diff --git a/util/Makefile.am b/util/Makefile.am
index 9c66ef7..57f7fa6 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,9 +1,9 @@
-AM_CFLAGS = -I..
-AM_LDFLAGS = -L..
+AM_CFLAGS = -I$(srcdir)/..
+AM_LDFLAGS = -L$(builddir)/..

 ipaccess_telnet_SOURCES = telnet-client.c ../libtelnet.h ipaccess-auth.c
 ipaccess_telnet_LDADD = ../libtelnet.la -lssl -lcrypto
-ipaccess_telnet_CFLAGS = -DNANO_BTS_CLI_CLIENT -I..
+ipaccess_telnet_CFLAGS = -DNANO_BTS_CLI_CLIENT -I$(srcdir)/..

 telnet_client_SOURCES = telnet-client.c ../libtelnet.h
 telnet_client_LDADD = ../libtelnet.la

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

Gerrit-Project: libtelnet
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I2ce5feeacda1f0b41de1d0a07d8c40ca09ad9fc2
Gerrit-Change-Number: 10427
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 

Change in osmo-msc[master]: libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello()

[Harald Welte]

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

Change subject: libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello()
..

libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello()

lchan_type was removed from gsm_mncc and the hello message
on initial import from legacy OpenBSC in
Change-Id: Id3705236350d5f69e447046b0a764bbabc3d493c

This patch follows on from Change-Id: Ia02373a36df7605507ee3de49173a9fd6547b726
which reintroduced lchan_type to the gsm_mncc struct.

This patch restores the lchan_type_offset to the hello protocol message

Without this patch, LCR will issue an error and disconnect from the MNCC socket.

Change-Id: I65312082fa5dc0721170f923840e992ef9481a63
Closes: OS#3461
---
M src/libmsc/mncc_sock.c
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/src/libmsc/mncc_sock.c b/src/libmsc/mncc_sock.c
index 74ea9d2..57b4bd8 100644
--- a/src/libmsc/mncc_sock.c
+++ b/src/libmsc/mncc_sock.c
@@ -228,6 +228,7 @@
hello->called_offset = offsetof(struct gsm_mncc, called);
hello->signal_offset = offsetof(struct gsm_mncc, signal);
hello->emergency_offset = offsetof(struct gsm_mncc, emergency);
+   hello->lchan_type_offset = offsetof(struct gsm_mncc, lchan_type);

msgb_enqueue(&mncc->net->upqueue, msg);
mncc->conn_bfd.when |= BSC_FD_WRITE;

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

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I65312082fa5dc0721170f923840e992ef9481a63
Gerrit-Change-Number: 10428
Gerrit-PatchSet: 2
Gerrit-Owner: Keith Whyte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy 

Change in osmo-msc[master]: libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello()

[Harald Welte]

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

Change subject: libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello()
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10428
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: I65312082fa5dc0721170f923840e992ef9481a63
Gerrit-Change-Number: 10428
Gerrit-PatchSet: 2
Gerrit-Owner: Keith Whyte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Fri, 10 Aug 2018 20:59:00 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Build failed in Jenkins: master-osmo-iuh » a1=default,a2=default,a3=default,osmocom-master-debian9 #1783

[jenkins]

See 


--
[...truncated 701.56 KB...]
  CC   RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.lo
  CC   RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.lo
  CC   RANAP_Requested-RAB-Parameter-MaxBitrateList.lo
  CC   RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.lo
  CC   RANAP_RequestType.lo
  CC   RANAP_ResidualBitErrorRatio.lo
  CC   RANAP_ResponseTime.lo
  CC   RANAP_RIMInformation.lo
  CC   RANAP_RIM-Transfer.lo
  CC   RANAP_RIMRoutingAddress.lo
  CC   RANAP_RNC-ID.lo
  CC   RANAP_RNCTraceInformation.lo
  CC   RANAP_RNSAPRelocationParameters.lo
  CC   RANAP_RRC-Container.lo
  CC   RANAP_RTLoadValue.lo
  CC   RANAP_RSRVCC-HO-Indication.lo
  CC   RANAP_RSRVCC-Information.lo
  CC   RANAP_RSRVCC-Operation-Possible.lo
In file included from 
:8:0,
 from ../../include/osmocom/ranap/RANAP_RABParametersList.h:14,
 from 
../../include/osmocom/ranap/RANAP_RNSAPRelocationParameters.h:14,
 from RANAP_RNSAPRelocationParameters.c:7:
../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:23: warning: ‘struct 
MemberN’ declared inside parameter list will not be visible outside of this 
definition or declaration
  A_SEQUENCE_OF(struct MemberN {
   ^
:17:16:
 note: in definition of macro ‘A_SET_OF’
   void (*free)(type *);   \
^~~~
../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:2: note: in 
expansion of macro ‘A_SEQUENCE_OF’
  A_SEQUENCE_OF(struct MemberN {
  ^
In file included from 
:8:0,
 from ../../include/osmocom/ranap/RANAP_RABParametersList.h:14,
 from 
../../include/osmocom/ranap/RANAP_RNSAPRelocationParameters.h:14,
 from RANAP_RNSAPRelocationParameters.c:7:
../../include/osmocom/ranap/RANAP_RABParametersList.h:29:23: warning: ‘struct 
MemberB’ declared inside parameter list will not be visible outside of this 
definition or declaration
  A_SEQUENCE_OF(struct MemberB {
   ^
:17:16:
 note: in definition of macro ‘A_SET_OF’
   void (*free)(type *);   \
^~~~
../../include/osmocom/ranap/RANAP_RABParametersList.h:29:2: note: in expansion 
of macro ‘A_SEQUENCE_OF’
  A_SEQUENCE_OF(struct MemberB {
  ^
  CC   RANAP_SAC.lo
  CC   RANAP_SAI.lo
  CC   RANAP_SAPI.lo
  CC   RANAP_SessionUpdateID.lo
  CC   RANAP_Shared-Network-Information.lo
  CC   RANAP_Session-Re-establishment-Indicator.lo
  CC   RANAP_SignallingIndication.lo
  CC   RANAP_SDU-ErrorRatio.lo
  CC   RANAP_SDU-FormatInformationParameters.lo
  CC   RANAP_SDU-FormatInformationParameterItem.lo
  CC   RANAP_SDU-Parameters.lo
In file included from 
:8:0,
 from 
../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:14,
 from 
../../include/osmocom/ranap/RANAP_Shared-Network-Information.h:14,
 from RANAP_Shared-Network-Information.c:7:
../../include/osmocom/ranap/RANAP_LA-LIST.h:27:23: warning: ‘struct MemberA’ 
declared inside parameter list will not be visible outside of this definition 
or declaration
  A_SEQUENCE_OF(struct MemberA {
   ^
:17:16:
 note: in definition of macro ‘A_SET_OF’
   void (*free)(type *);   \
^~~~
../../include/osmocom/ranap/RANAP_LA-LIST.h:27:2: note: in expansion of macro 
‘A_SEQUENCE_OF’
  A_SEQUENCE_OF(struct MemberA {
  ^
../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:27:23: warning: 
‘struct MemberM’ declared inside parameter list will not be visible outside of 
this definition or declaration
  A_SEQUENCE_OF(struct MemberM {
   ^

Jenkins build is back to normal : master-osmo-iuh » a1=default,a2=default,a3=default,osmocom-master-debian9 #1784

[jenkins]

See