<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12260">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Pau Espin Pedrol: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trx_toolkit/ctrl_if.py: read data from socket in handle_rx()<br><br>It makes much more sense to read data from socket in handle_rx(),<br>instead of expecting a buffer with received data from caller.<br><br>Change-Id: I83479c60c54e36a2a7582714a6043090585957ae<br>---<br>M src/target/trx_toolkit/ctrl_if.py<br>M src/target/trx_toolkit/fake_trx.py<br>2 files changed, 7 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/trx_toolkit/ctrl_if.py b/src/target/trx_toolkit/ctrl_if.py</span><br><span>index b533746..45bfa2b 100644</span><br><span>--- a/src/target/trx_toolkit/ctrl_if.py</span><br><span>+++ b/src/target/trx_toolkit/ctrl_if.py</span><br><span>@@ -27,7 +27,11 @@</span><br><span> from udp_link import UDPLink</span><br><span> </span><br><span> class CTRLInterface(UDPLink):</span><br><span style="color: hsl(0, 100%, 40%);">-  def handle_rx(self, data, remote):</span><br><span style="color: hsl(120, 100%, 40%);">+    def handle_rx(self):</span><br><span style="color: hsl(120, 100%, 40%);">+          # Read data from socket</span><br><span style="color: hsl(120, 100%, 40%);">+               data, remote = self.sock.recvfrom(128)</span><br><span style="color: hsl(120, 100%, 40%);">+                data = data.decode()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>               if not self.verify_req(data):</span><br><span>                        log.error("Wrong data on CTRL interface")</span><br><span>                  return</span><br><span>diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py</span><br><span>index d73b566..95261df 100755</span><br><span>--- a/src/target/trx_toolkit/fake_trx.py</span><br><span>+++ b/src/target/trx_toolkit/fake_trx.py</span><br><span>@@ -112,13 +112,11 @@</span><br><span> </span><br><span>                      # CTRL commands from BTS</span><br><span>                     if self.bts_ctrl.sock in r_event:</span><br><span style="color: hsl(0, 100%, 40%);">-                               data, addr = self.bts_ctrl.sock.recvfrom(128)</span><br><span style="color: hsl(0, 100%, 40%);">-                           self.bts_ctrl.handle_rx(data.decode(), addr)</span><br><span style="color: hsl(120, 100%, 40%);">+                          self.bts_ctrl.handle_rx()</span><br><span> </span><br><span>                        # CTRL commands from BB</span><br><span>                      if self.bb_ctrl.sock in r_event:</span><br><span style="color: hsl(0, 100%, 40%);">-                                data, addr = self.bb_ctrl.sock.recvfrom(128)</span><br><span style="color: hsl(0, 100%, 40%);">-                            self.bb_ctrl.handle_rx(data.decode(), addr)</span><br><span style="color: hsl(120, 100%, 40%);">+                           self.bb_ctrl.handle_rx()</span><br><span> </span><br><span>         def shutdown(self):</span><br><span>          log.info("Shutting down...")</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12260">change 12260</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/12260"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I83479c60c54e36a2a7582714a6043090585957ae </div>
<div style="display:none"> Gerrit-Change-Number: 12260 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>