From ffbf45e09e400e934d0f507c8b2e252cdb6ac395 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 14 Jul 2015 16:03:41 +0200 Subject: mncc: Update the protocol to match LCR This adds the protocol definition for the RTP bridge extension of Andreas Eversberg and bumps the protocol version. I added the missing mncc mappings from value to string. [ 5cf8fb10ea3addcae74d37f4dbf1c1be664df53e protocol extension 5dac90de38990b188f499c602bf18a4f232070e8 payload extension] --- openbsc/include/openbsc/mncc.h | 14 +++++++++++++- openbsc/src/libmsc/mncc.c | 3 +++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/openbsc/include/openbsc/mncc.h b/openbsc/include/openbsc/mncc.h index ffac7fd6f..46ba23729 100644 --- a/openbsc/include/openbsc/mncc.h +++ b/openbsc/include/openbsc/mncc.h @@ -92,6 +92,9 @@ struct gsm_call { #define MNCC_FRAME_RECV 0x0201 #define MNCC_FRAME_DROP 0x0202 #define MNCC_LCHAN_MODIFY 0x0203 +#define MNCC_RTP_CREATE 0x0204 +#define MNCC_RTP_CONNECT 0x0205 +#define MNCC_RTP_FREE 0x0206 #define GSM_TCHF_FRAME 0x0300 #define GSM_TCHF_FRAME_EFR 0x0301 @@ -163,7 +166,7 @@ struct gsm_data_frame { unsigned char data[0]; }; -#define MNCC_SOCK_VERSION 4 +#define MNCC_SOCK_VERSION 5 struct gsm_mncc_hello { uint32_t msg_type; uint32_t version; @@ -179,6 +182,15 @@ struct gsm_mncc_hello { uint32_t lchan_type_offset; }; +struct gsm_mncc_rtp { + uint32_t msg_type; + uint32_t callref; + uint32_t ip; + uint16_t port; + uint32_t payload_type; + uint32_t payload_msg_type; +}; + char *get_mncc_name(int value); void mncc_set_cause(struct gsm_mncc *data, int loc, int val); void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg); diff --git a/openbsc/src/libmsc/mncc.c b/openbsc/src/libmsc/mncc.c index 73db5f047..2767faa35 100644 --- a/openbsc/src/libmsc/mncc.c +++ b/openbsc/src/libmsc/mncc.c @@ -83,6 +83,9 @@ static struct mncc_names { {"MNCC_FRAME_RECV", 0x0201}, {"MNCC_FRAME_DROP", 0x0202}, {"MNCC_LCHAN_MODIFY", 0x0203}, + {"MNCC_RTP_CREATE", 0x0204}, + {"MNCC_RTP_CONNECT", 0x0205}, + {"MNCC_RTP_FREE", 0x0206}, {"GSM_TCHF_FRAME", 0x0300}, {"GSM_TCHF_FRAME_EFR", 0x0301}, -- cgit v1.2.3