<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10423">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trx/ctrl_if.py: send control responses to where commands are from<br><br>When we receive a control command, we should not simply send the<br>response to the default destination, but send it back to the exact<br>IP/prt from which the command originated.<br><br>This ensures correct routing of responses even in case multiple<br>programs are interfacing concurrently with a control socket.<br><br>Cherry-picked from: I24a0bba6eed059b101af95dac7d059f34dd715fc<br>Change-Id: I1f304ea887dc957d3ad53adb1e3c56ab27d8f196<br>---<br>M python/trx/ctrl_if.py<br>M python/trx/udp_link.py<br>2 files changed, 12 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/23/10423/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/python/trx/ctrl_if.py b/python/trx/ctrl_if.py</span><br><span>index 7dee0f8..ae5cf05 100644</span><br><span>--- a/python/trx/ctrl_if.py</span><br><span>+++ b/python/trx/ctrl_if.py</span><br><span>@@ -25,15 +25,15 @@</span><br><span> from grgsm.trx import udp_link</span><br><span> </span><br><span> class ctrl_if(udp_link):</span><br><span style="color: hsl(0, 100%, 40%);">- def handle_rx(self, data):</span><br><span style="color: hsl(120, 100%, 40%);">+ def handle_rx(self, data, remote):</span><br><span> if self.verify_req(data):</span><br><span> request = self.prepare_req(data)</span><br><span> rc = self.parse_cmd(request)</span><br><span> </span><br><span> if type(rc) is tuple:</span><br><span style="color: hsl(0, 100%, 40%);">- self.send_response(request, rc[0], rc[1])</span><br><span style="color: hsl(120, 100%, 40%);">+ self.send_response(request, remote, rc[0], rc[1])</span><br><span> else:</span><br><span style="color: hsl(0, 100%, 40%);">- self.send_response(request, rc)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.send_response(request, remote, rc)</span><br><span> else:</span><br><span> print("[!] Wrong data on CTRL interface")</span><br><span> </span><br><span>@@ -65,7 +65,7 @@</span><br><span> </span><br><span> return True</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def send_response(self, request, response_code, params = None):</span><br><span style="color: hsl(120, 100%, 40%);">+ def send_response(self, request, remote, response_code, params = None):</span><br><span> # Include status code, for example ["TXTUNE", "0", "941600"]</span><br><span> request.insert(1, str(response_code))</span><br><span> </span><br><span>@@ -76,7 +76,7 @@</span><br><span> # Add the response signature, and join back to string</span><br><span> response = "RSP " + " ".join(request) + "\0"</span><br><span> # Now we have something like "RSP TXTUNE 0 941600"</span><br><span style="color: hsl(0, 100%, 40%);">- self.send(response)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.send(response, remote)</span><br><span> </span><br><span> def parse_cmd(self, request):</span><br><span> raise NotImplementedError</span><br><span>diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py</span><br><span>index 1fae8b4..d96a6aa 100644</span><br><span>--- a/python/trx/udp_link.py</span><br><span>+++ b/python/trx/udp_link.py</span><br><span>@@ -45,13 +45,16 @@</span><br><span> # Check for incoming data</span><br><span> if self.sock in r_event:</span><br><span> data, addr = self.sock.recvfrom(128)</span><br><span style="color: hsl(0, 100%, 40%);">- self.handle_rx(data.decode())</span><br><span style="color: hsl(120, 100%, 40%);">+ self.handle_rx(data.decode(), addr)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def send(self, data):</span><br><span style="color: hsl(120, 100%, 40%);">+ def send(self, data, remote = None):</span><br><span> if type(data) not in [bytearray, bytes]:</span><br><span> data = data.encode()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- self.sock.sendto(data, (self.remote_addr, self.remote_port))</span><br><span style="color: hsl(120, 100%, 40%);">+ if remote is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ remote = (self.remote_addr, self.remote_port)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def handle_rx(self, data):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.sock.sendto(data, remote)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def handle_rx(self, data, remote):</span><br><span> raise NotImplementedError</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10423">change 10423</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/10423"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I1f304ea887dc957d3ad53adb1e3c56ab27d8f196 </div>
<div style="display:none"> Gerrit-Change-Number: 10423 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>