<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11154">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved; Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mncc_sock.py: share common send() / receive() calls<br><br>Change-Id: I871c72c8e3392a1be76e0126a24b3bc9a787113d<br>---<br>M mncc_sock.py<br>1 file changed, 6 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/mncc_sock.py b/mncc_sock.py</span><br><span>index 34ab361..9887471 100644</span><br><span>--- a/mncc_sock.py</span><br><span>+++ b/mncc_sock.py</span><br><span>@@ -15,45 +15,32 @@</span><br><span> import mncc</span><br><span> import ctypes</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class mncc_msg(mncc.gsm_mncc):</span><br><span style="color: hsl(120, 100%, 40%);">+class mncc_msg_common:</span><br><span>     def send(self):</span><br><span>         return buffer(self)[:]</span><br><span>     def receive(self, bytes):</span><br><span>         fit = min(len(bytes), ctypes.sizeof(self))</span><br><span>         ctypes.memmove(ctypes.addressof(self), bytes, fit)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+class mncc_msg(mncc.gsm_mncc, mncc_msg_common):</span><br><span>     def __str__(self):</span><br><span>         return 'mncc_msg(type=0x%04x, callref=%u, fields=0x%04x)' % (self.msg_type, self.callref, self.fields)</span><br><span>     def __unicode__(self):</span><br><span>         return u'mncc_msg(type=0x%04x, callref=%u, fields=0x%04x)' % (self.msg_type, self.callref, self.fields)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class mncc_hello_msg(mncc.gsm_mncc_hello):</span><br><span style="color: hsl(0, 100%, 40%);">-    def send(self):</span><br><span style="color: hsl(0, 100%, 40%);">-        return buffer(self)[:]</span><br><span style="color: hsl(0, 100%, 40%);">-    def receive(self, bytes):</span><br><span style="color: hsl(0, 100%, 40%);">-        fit = min(len(bytes), ctypes.sizeof(self))</span><br><span style="color: hsl(0, 100%, 40%);">-        ctypes.memmove(ctypes.addressof(self), bytes, fit)</span><br><span style="color: hsl(120, 100%, 40%);">+class mncc_hello_msg(mncc.gsm_mncc_hello, mncc_msg_common):</span><br><span>     def __str__(self):</span><br><span>         return 'mncc_hello_msg(version=0x%04x)' % (self.version)</span><br><span>     def __unicode__(self):</span><br><span>         return u'mncc_hello_msg(version=0x%04x)' % (self.version)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class mncc_rtp_msg(mncc.gsm_mncc_rtp):</span><br><span style="color: hsl(0, 100%, 40%);">-    def send(self):</span><br><span style="color: hsl(0, 100%, 40%);">-        return buffer(self)[:]</span><br><span style="color: hsl(0, 100%, 40%);">-    def receive(self, bytes):</span><br><span style="color: hsl(0, 100%, 40%);">-        fit = min(len(bytes), ctypes.sizeof(self))</span><br><span style="color: hsl(0, 100%, 40%);">-        ctypes.memmove(ctypes.addressof(self), bytes, fit)</span><br><span style="color: hsl(120, 100%, 40%);">+class mncc_rtp_msg(mncc.gsm_mncc_rtp, mncc_msg_common):</span><br><span>     def __str__(self):</span><br><span>         return 'mncc_rtp_msg(type=0x%04x, callref=%u, ip=%x, port=%u)' % (self.msg_type, self.callref, self.ip, self.port)</span><br><span>     def __unicode__(self):</span><br><span>         return u'mncc_rtp_msg(type=0x%04x, callref=%u, ip=%x, port=%u)' % (self.msg_type, self.callref, self.ip, self.port)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class mncc_bridge_msg(mncc.gsm_mncc_bridge):</span><br><span style="color: hsl(0, 100%, 40%);">-    def send(self):</span><br><span style="color: hsl(0, 100%, 40%);">-        return buffer(self)[:]</span><br><span style="color: hsl(0, 100%, 40%);">-    def receive(self, bytes):</span><br><span style="color: hsl(0, 100%, 40%);">-        fit = min(len(bytes), ctypes.sizeof(self))</span><br><span style="color: hsl(0, 100%, 40%);">-        ctypes.memmove(ctypes.addressof(self), bytes, fit)</span><br><span style="color: hsl(120, 100%, 40%);">+class mncc_bridge_msg(mncc.gsm_mncc_bridge, mncc_msg_common):</span><br><span>     def __str__(self):</span><br><span>         return 'mncc_bridge_msg(%u, %u)' % (self.callref[0], self.callref[1])</span><br><span>     def __unicode__(self):</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11154">change 11154</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/11154"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: mncc-python </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I871c72c8e3392a1be76e0126a24b3bc9a787113d </div>
<div style="display:none"> Gerrit-Change-Number: 11154 </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: Harald Welte <laforge@gnumonks.org> </div>