<p>Piotr Krysik <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10425">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Piotr Krysik: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">apps/grgsm_trx: introduce bind address option<br><br>The new option (-b --bind-addr) allows one to specify the bind<br>address for both DATA and CTRL interfaces. By default, '0.0.0.0'<br>is used, so there are no restrictions for the L1 source address.<br><br>Change-Id: I3339f686b53db07cfd1bff9a516f4bdc28058cd9<br>---<br>M apps/grgsm_trx<br>M python/trx/ctrl_if_bb.py<br>M python/trx/radio_if.py<br>M python/trx/udp_link.py<br>4 files changed, 23 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/grgsm_trx b/apps/grgsm_trx</span><br><span>index 668b0be..1c0581f 100755</span><br><span>--- a/apps/grgsm_trx</span><br><span>+++ b/apps/grgsm_trx</span><br><span>@@ -3,7 +3,7 @@</span><br><span> </span><br><span> # GR-GSM based transceiver</span><br><span> #</span><br><span style="color: hsl(0, 100%, 40%);">-# (C) 2016-2017 by Vadim Yanitskiy <axilirator@gmail.com></span><br><span style="color: hsl(120, 100%, 40%);">+# (C) 2016-2018 by Vadim Yanitskiy <axilirator@gmail.com></span><br><span> #</span><br><span> # All Rights Reserved</span><br><span> #</span><br><span>@@ -30,7 +30,7 @@</span><br><span> from grgsm.trx import fake_pm</span><br><span> </span><br><span> COPYRIGHT = \</span><br><span style="color: hsl(0, 100%, 40%);">- "Copyright (C) 2016-2017 by Vadim Yanitskiy <axilirator@gmail.com>\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Copyright (C) 2016-2018 by Vadim Yanitskiy <axilirator@gmail.com>\n" \</span><br><span> "Copyright (C) 2017 by Piotr Krysik <ptrkrysik@gmail.com>\n" \</span><br><span> "License GPLv2+: GNU GPL version 2 or later " \</span><br><span> "<http://gnu.org/licenses/gpl.html>\n" \</span><br><span>@@ -40,6 +40,7 @@</span><br><span> class Application:</span><br><span> # Application variables</span><br><span> remote_addr = "127.0.0.1"</span><br><span style="color: hsl(120, 100%, 40%);">+ bind_addr = "0.0.0.0"</span><br><span> base_port = 6700</span><br><span> </span><br><span> # PHY specific</span><br><span>@@ -63,7 +64,8 @@</span><br><span> self.radio = radio_if(self.phy_args, self.phy_sample_rate,</span><br><span> self.phy_rx_gain, self.phy_tx_gain, self.phy_ppm,</span><br><span> self.phy_rx_antenna, self.phy_tx_antenna,</span><br><span style="color: hsl(0, 100%, 40%);">- self.remote_addr, self.base_port)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.bind_addr, self.remote_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ self.base_port)</span><br><span> </span><br><span> # Power measurement emulation</span><br><span> # Noise: -120 .. -105</span><br><span>@@ -71,8 +73,9 @@</span><br><span> self.pm = fake_pm(-120, -105, -75, -50)</span><br><span> </span><br><span> # Init TRX CTRL interface</span><br><span style="color: hsl(0, 100%, 40%);">- self.server = ctrl_if_bb(self.remote_addr,</span><br><span style="color: hsl(0, 100%, 40%);">- self.base_port + 101, self.base_port + 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ self.server = ctrl_if_bb(</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_addr, self.base_port + 101,</span><br><span style="color: hsl(120, 100%, 40%);">+ self.bind_addr, self.base_port + 1,</span><br><span> self.radio, self.pm)</span><br><span> </span><br><span> print("[i] Init complete")</span><br><span>@@ -96,6 +99,7 @@</span><br><span> # TRX specific</span><br><span> s += " TRX interface specific\n" \</span><br><span> " -i --remote-addr Set remote address (default %s)\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ " -b --bind-addr Set bind address (default %s)\n" \</span><br><span> " -p --base-port Set base port number (default %d)\n\n"</span><br><span> </span><br><span> # PHY specific</span><br><span>@@ -110,6 +114,7 @@</span><br><span> </span><br><span> print(s % (</span><br><span> self.remote_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ self.bind_addr,</span><br><span> self.base_port,</span><br><span> self.phy_rx_gain,</span><br><span> self.phy_tx_gain,</span><br><span>@@ -120,10 +125,10 @@</span><br><span> def parse_argv(self):</span><br><span> try:</span><br><span> opts, args = getopt.getopt(sys.argv[1:],</span><br><span style="color: hsl(0, 100%, 40%);">- "i:p:a:s:g:G:h",</span><br><span style="color: hsl(0, 100%, 40%);">- ["help", "remote-addr=", "base-port=", "device-args=",</span><br><span style="color: hsl(0, 100%, 40%);">- "sample-rate=", "rx-gain=", "tx-gain=", "ppm=",</span><br><span style="color: hsl(0, 100%, 40%);">- "rx-antenna=", "tx-antenna="])</span><br><span style="color: hsl(120, 100%, 40%);">+ "i:b:p:a:s:g:G:h",</span><br><span style="color: hsl(120, 100%, 40%);">+ ["help", "remote-addr=", "bind-addr=", "base-port=",</span><br><span style="color: hsl(120, 100%, 40%);">+ "device-args=", "sample-rate=", "rx-gain=", "tx-gain=",</span><br><span style="color: hsl(120, 100%, 40%);">+ "ppm=", "rx-antenna=", "tx-antenna="])</span><br><span> except getopt.GetoptError as err:</span><br><span> # Print(help and exit)</span><br><span> self.print_help()</span><br><span>@@ -138,6 +143,8 @@</span><br><span> # TRX specific</span><br><span> elif o in ("-i", "--remote-addr"):</span><br><span> self.remote_addr = v</span><br><span style="color: hsl(120, 100%, 40%);">+ elif o in ("-b", "--bind-addr"):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.bind_addr = v</span><br><span> elif o in ("-p", "--base-port"):</span><br><span> if int(v) >= 0 and int(v) <= 65535:</span><br><span> self.base_port = int(v)</span><br><span>diff --git a/python/trx/ctrl_if_bb.py b/python/trx/ctrl_if_bb.py</span><br><span>index 7886e23..f5a9fa3 100644</span><br><span>--- a/python/trx/ctrl_if_bb.py</span><br><span>+++ b/python/trx/ctrl_if_bb.py</span><br><span>@@ -26,9 +26,10 @@</span><br><span> from ctrl_if import ctrl_if</span><br><span> </span><br><span> class ctrl_if_bb(ctrl_if):</span><br><span style="color: hsl(0, 100%, 40%);">- def __init__(self, remote_addr, remote_port, bind_port, tb, pm):</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, remote_addr, remote_port, bind_addr, bind_port, tb, pm):</span><br><span> print("[i] Init CTRL interface")</span><br><span style="color: hsl(0, 100%, 40%);">- ctrl_if.__init__(self, remote_addr, remote_port, bind_port)</span><br><span style="color: hsl(120, 100%, 40%);">+ ctrl_if.__init__(self, remote_addr, remote_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ bind_addr, bind_port)</span><br><span> </span><br><span> # Set link to the follow graph (top block)</span><br><span> self.tb = tb</span><br><span>diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py</span><br><span>index 25a35a5..1c7f003 100644</span><br><span>--- a/python/trx/radio_if.py</span><br><span>+++ b/python/trx/radio_if.py</span><br><span>@@ -81,8 +81,8 @@</span><br><span> def __init__(self, phy_args, phy_sample_rate,</span><br><span> phy_rx_gain, phy_tx_gain, phy_ppm,</span><br><span> phy_rx_antenna, phy_tx_antenna,</span><br><span style="color: hsl(0, 100%, 40%);">- trx_remote_addr, trx_base_port,</span><br><span style="color: hsl(0, 100%, 40%);">- trx_bind_addr = "0.0.0.0"):</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_bind_addr, trx_remote_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_base_port):</span><br><span> </span><br><span> print("[i] Init Radio interface")</span><br><span> </span><br><span>diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py</span><br><span>index d96a6aa..efa701b 100644</span><br><span>--- a/python/trx/udp_link.py</span><br><span>+++ b/python/trx/udp_link.py</span><br><span>@@ -26,10 +26,10 @@</span><br><span> import select</span><br><span> </span><br><span> class udp_link:</span><br><span style="color: hsl(0, 100%, 40%);">- def __init__(self, remote_addr, remote_port, bind_port):</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, remote_addr, remote_port, bind_addr = '0.0.0.0', bind_port = 0):</span><br><span> self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)</span><br><span> self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)</span><br><span style="color: hsl(0, 100%, 40%);">- self.sock.bind((remote_addr, bind_port))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.sock.bind((bind_addr, bind_port))</span><br><span> self.sock.setblocking(0)</span><br><span> </span><br><span> # Save remote info</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10425">change 10425</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/10425"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: gr-gsm </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I3339f686b53db07cfd1bff9a516f4bdc28058cd9 </div>
<div style="display:none"> Gerrit-Change-Number: 10425 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Piotr Krysik <ptrkrysik@gmail.com> </div>