<p>Piotr Krysik <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10421">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;">trx/udp_link.py: close socket in destructor<br><br>Previously it was required to call the UDPLink.shutdown() method<br>manually in order to close a socket. Let's do it automatically<br>using the destructor of UDPLink.<br><br>Cherry-picked from: I59c3dc61ec58cd9effeb789947d28fd602ca91f4<br>Change-Id: Ief7aa21d1e50682a90616833b679741957193aae<br>---<br>M apps/grgsm_trx<br>M python/trx/ctrl_if_bb.py<br>M python/trx/udp_link.py<br>3 files changed, 3 insertions(+), 8 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 b925fc1..668b0be 100755</span><br><span>--- a/apps/grgsm_trx</span><br><span>+++ b/apps/grgsm_trx</span><br><span>@@ -83,7 +83,6 @@</span><br><span> </span><br><span>    def shutdown(self):</span><br><span>          print("[i] Shutting down...")</span><br><span style="color: hsl(0, 100%, 40%);">-         self.server.shutdown()</span><br><span>               self.radio.shutdown()</span><br><span> </span><br><span>    def print_copyright(self):</span><br><span>diff --git a/python/trx/ctrl_if_bb.py b/python/trx/ctrl_if_bb.py</span><br><span>index 5874e59..7886e23 100644</span><br><span>--- a/python/trx/ctrl_if_bb.py</span><br><span>+++ b/python/trx/ctrl_if_bb.py</span><br><span>@@ -35,10 +35,6 @@</span><br><span>                 # Power measurement</span><br><span>          self.pm = pm</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        def shutdown(self):</span><br><span style="color: hsl(0, 100%, 40%);">-             print("[i] Shutdown CTRL interface")</span><br><span style="color: hsl(0, 100%, 40%);">-          ctrl_if.shutdown(self)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>       def parse_cmd(self, request):</span><br><span>                # Power control</span><br><span>              if self.verify_cmd(request, "POWERON", 0):</span><br><span>diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py</span><br><span>index 675ef5c..cedcb1b 100644</span><br><span>--- a/python/trx/udp_link.py</span><br><span>+++ b/python/trx/udp_link.py</span><br><span>@@ -35,6 +35,9 @@</span><br><span>                self.remote_addr = remote_addr</span><br><span>               self.remote_port = remote_port</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+    def __del__(self):</span><br><span style="color: hsl(120, 100%, 40%);">+            self.sock.close()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  def loop(self):</span><br><span>              r_event, w_event, x_event = select.select([self.sock], [], [])</span><br><span> </span><br><span>@@ -43,9 +46,6 @@</span><br><span>                       data, addr = self.sock.recvfrom(128)</span><br><span>                         self.handle_rx(data.decode())</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       def shutdown(self):</span><br><span style="color: hsl(0, 100%, 40%);">-             self.sock.close();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>   def send(self, data):</span><br><span>                if type(data) not in [bytearray, bytes]:</span><br><span>                     data = data.encode()</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10421">change 10421</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/10421"/><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: Ief7aa21d1e50682a90616833b679741957193aae </div>
<div style="display:none"> Gerrit-Change-Number: 10421 </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>