laforge has submitted this change. (
https://gerrit.osmocom.org/c/mncc-python/+/36320?usp=email )
(
4 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: update to MNCC V8 support
......................................................................
update to MNCC V8 support
This updates the mncc.h to V8 with GCR support, as introduced
in Change-ID I705c860e51637b4537cad65a330ecbaaca96dd5b of osmo-msc
Change-Id: Ia27956e42c6c2f494d59b89f42345462c86b10d2
---
M mncc.h
M mncc.py
2 files changed, 37 insertions(+), 18 deletions(-)
Approvals:
laforge: Looks good to me, approved; Verified
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
diff --git a/mncc.h b/mncc.h
index 394399f..5708f62 100644
--- a/mncc.h
+++ b/mncc.h
@@ -1,7 +1,7 @@
/* This file contains sections copied from
* libosmocore/include/osmocom/gsm/protocol/gsm_04_08.h,
* libosmocore/include/osmocom/gsm/mncc.h and
- * openbsc/include/openbsc/mncc.h
+ * osmo-msc/include/osmocom/msc/mncc.h
*/
#include <stdint.h>
@@ -271,6 +271,7 @@
#define MNCC_F_CCCAP 0x0800
#define MNCC_F_KEYPAD 0x1000
#define MNCC_F_SIGNAL 0x2000
+#define MNCC_F_GCR 0x4000
struct gsm_mncc {
/* context based information */
@@ -308,6 +309,9 @@
unsigned char lchan_type;
unsigned char lchan_mode;
+ /* Global Call Reference (encoded as per 3GPP TS 29.205) */
+ uint8_t gcr[16];
+
char sdp[1024];
};
@@ -317,7 +321,7 @@
unsigned char data[0];
};
-#define MNCC_SOCK_VERSION 7
+#define MNCC_SOCK_VERSION 8
struct gsm_mncc_hello {
uint32_t msg_type;
uint32_t version;
diff --git a/mncc.py b/mncc.py
index e22fb74..7f5f422 100644
--- a/mncc.py
+++ b/mncc.py
@@ -188,7 +188,8 @@
MNCC_F_CCCAP = 0x0800 # macro
MNCC_F_KEYPAD = 0x1000 # macro
MNCC_F_SIGNAL = 0x2000 # macro
-MNCC_SOCK_VERSION = 7 # macro
+MNCC_F_GCR = 0x4000 # macro
+MNCC_SOCK_VERSION = 8 # macro
# values for enumeration 'gsm48_bcap_itcap'
gsm48_bcap_itcap__enumvalues = {
@@ -524,6 +525,7 @@
('imsi', ctypes.c_char * 16),
('lchan_type', ctypes.c_ubyte),
('lchan_mode', ctypes.c_ubyte),
+ ('gcr', ctypes.c_ubyte * 16),
('sdp', ctypes.c_char * 1024),
('PADDING_0', ctypes.c_ubyte * 2),
]
@@ -624,21 +626,22 @@
'MNCC_FRAME_RECV', 'MNCC_F_BEARER_CAP', 'MNCC_F_CALLED',
'MNCC_F_CALLING', 'MNCC_F_CAUSE', 'MNCC_F_CCCAP',
'MNCC_F_CONNECTED', 'MNCC_F_EMERGENCY', 'MNCC_F_FACILITY',
- 'MNCC_F_KEYPAD', 'MNCC_F_PROGRESS', 'MNCC_F_REDIRECTING',
- 'MNCC_F_SIGNAL', 'MNCC_F_SSVERSION', 'MNCC_F_USERUSER',
- 'MNCC_HOLD_CNF', 'MNCC_HOLD_IND', 'MNCC_HOLD_REJ',
- 'MNCC_LCHAN_MODIFY', 'MNCC_MODIFY_CNF', 'MNCC_MODIFY_IND',
- 'MNCC_MODIFY_REJ', 'MNCC_MODIFY_REQ', 'MNCC_MODIFY_RSP',
- 'MNCC_NOTIFY_IND', 'MNCC_NOTIFY_REQ', 'MNCC_PROGRESS_REQ',
- 'MNCC_REJ_IND', 'MNCC_REJ_REQ', 'MNCC_REL_CNF', 'MNCC_REL_IND',
- 'MNCC_REL_REQ', 'MNCC_RETRIEVE_CNF', 'MNCC_RETRIEVE_IND',
- 'MNCC_RETRIEVE_REJ', 'MNCC_RTP_CONNECT', 'MNCC_RTP_CREATE',
- 'MNCC_RTP_FREE', 'MNCC_SETUP_CNF', 'MNCC_SETUP_COMPL_IND',
- 'MNCC_SETUP_COMPL_REQ', 'MNCC_SETUP_IND', 'MNCC_SETUP_REQ',
- 'MNCC_SETUP_RSP', 'MNCC_SOCKET_HELLO', 'MNCC_SOCK_VERSION',
- 'MNCC_START_DTMF_IND', 'MNCC_START_DTMF_REJ',
- 'MNCC_START_DTMF_RSP', 'MNCC_STOP_DTMF_IND', 'MNCC_STOP_DTMF_RSP',
- 'MNCC_USERINFO_IND', 'MNCC_USERINFO_REQ', 'gsm48_bcap_coding',
+ 'MNCC_F_GCR', 'MNCC_F_KEYPAD', 'MNCC_F_PROGRESS',
+ 'MNCC_F_REDIRECTING', 'MNCC_F_SIGNAL', 'MNCC_F_SSVERSION',
+ 'MNCC_F_USERUSER', 'MNCC_HOLD_CNF', 'MNCC_HOLD_IND',
+ 'MNCC_HOLD_REJ', 'MNCC_LCHAN_MODIFY', 'MNCC_MODIFY_CNF',
+ 'MNCC_MODIFY_IND', 'MNCC_MODIFY_REJ', 'MNCC_MODIFY_REQ',
+ 'MNCC_MODIFY_RSP', 'MNCC_NOTIFY_IND', 'MNCC_NOTIFY_REQ',
+ 'MNCC_PROGRESS_REQ', 'MNCC_REJ_IND', 'MNCC_REJ_REQ',
+ 'MNCC_REL_CNF', 'MNCC_REL_IND', 'MNCC_REL_REQ',
+ 'MNCC_RETRIEVE_CNF', 'MNCC_RETRIEVE_IND', 'MNCC_RETRIEVE_REJ',
+ 'MNCC_RTP_CONNECT', 'MNCC_RTP_CREATE', 'MNCC_RTP_FREE',
+ 'MNCC_SETUP_CNF', 'MNCC_SETUP_COMPL_IND', 'MNCC_SETUP_COMPL_REQ',
+ 'MNCC_SETUP_IND', 'MNCC_SETUP_REQ', 'MNCC_SETUP_RSP',
+ 'MNCC_SOCKET_HELLO', 'MNCC_SOCK_VERSION', 'MNCC_START_DTMF_IND',
+ 'MNCC_START_DTMF_REJ', 'MNCC_START_DTMF_RSP',
+ 'MNCC_STOP_DTMF_IND', 'MNCC_STOP_DTMF_RSP', 'MNCC_USERINFO_IND',
+ 'MNCC_USERINFO_REQ', 'gsm48_bcap_coding',
'gsm48_bcap_interm_rate', 'gsm48_bcap_itcap',
'gsm48_bcap_modem_type', 'gsm48_bcap_parity', 'gsm48_bcap_ra',
'gsm48_bcap_rrq', 'gsm48_bcap_sig_access',
--
To view, visit https://gerrit.osmocom.org/c/mncc-python/+/36320?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: mncc-python
Gerrit-Branch: master
Gerrit-Change-Id: Ia27956e42c6c2f494d59b89f42345462c86b10d2
Gerrit-Change-Number: 36320
Gerrit-PatchSet: 5
Gerrit-Owner: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: osmith <osm...@sysmocom.de>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged
