Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/11155 )
Change subject: mncc_sock.py: simplify msg_type matching
......................................................................
mncc_sock.py: simplify msg_type matching
Change-Id: I0d7d988e7d1bcfd9cf5cd319fd9da0f4f65a8e5d
---
M mncc_sock.py
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
Harald Welte: Looks good to me, approved; Verified
diff --git a/mncc_sock.py b/mncc_sock.py
index 9887471..1c4f6be 100644
--- a/mncc_sock.py
+++ b/mncc_sock.py
@@ -22,6 +22,11 @@
fit = min(len(bytes), ctypes.sizeof(self))
ctypes.memmove(ctypes.addressof(self), bytes, fit)
+ # Message type matching
+ def is_rtp(self):
+ return self.msg_type in (mncc.MNCC_RTP_CREATE,
+ mncc.MNCC_RTP_CONNECT, mncc.MNCC_RTP_FREE)
+
class mncc_msg(mncc.gsm_mncc, mncc_msg_common):
def __str__(self):
return 'mncc_msg(type=0x%04x, callref=%u, fields=0x%04x)' %
(self.msg_type, self.callref, self.fields)
@@ -75,7 +80,7 @@
data = self.sock.recv(1500)
ms = mncc_msg()
ms.receive(data)
- if ms.msg_type == mncc.MNCC_RTP_CREATE or ms.msg_type ==
mncc.MNCC_RTP_CONNECT or ms.msg_type == mncc.MNCC_RTP_FREE:
+ if ms.is_rtp():
ms = mncc_rtp_msg()
ms.receive(data)
elif ms.msg_type == mncc.MNCC_SOCKET_HELLO:
--
To view, visit https://gerrit.osmocom.org/11155
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: mncc-python
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I0d7d988e7d1bcfd9cf5cd319fd9da0f4f65a8e5d
Gerrit-Change-Number: 11155
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy <axilira...@gmail.com>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
