diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2019-10-21 03:00:26 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2019-11-28 02:52:55 +0100 |
| commit | b4552057830f05b58ec0e6c5cf8e0d26f2f5e746 (patch) | |
| tree | b6b1b3d829bd8cc17b440b1552ba062d0be723f0 /include | |
| parent | eef45781024d6e17c7b473d15ec5d3d83515d0e2 (diff) | |
MNCC v6: add optional SDP to the socket protocol
Add a char buffer of 1024 characters length as space for SDP to pass to /
receive from MNCC.
Actually support receiving MNCC without such an SDP tail. The main reason for
this is to avoid the need to adjust the ttcn3 implementation of MNCC: it would
stop working for older osmo-msc.
Older or non-SIP MNCC peers could operate the previous MNCC protocol unchanged
(save the protocol number bump) without having to implement SDP.
The SDP part in the MNCC protocol will be used in upcoming patch
I8c3b2de53ffae4ec3a66b9dabf308c290a2c999f.
This patch must be merged at the same time as osmo-sip-connector patch
Iaca9ed6611fc5ca8ca749bbbefc31f54bea5e925, so that both sides have a matching
MNCC protocol version number.
Change-Id: Ie16f0804c4d99760cd4a0c544d0889b6313eebb7
Diffstat (limited to 'include')
| -rw-r--r-- | include/osmocom/msc/mncc.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/osmocom/msc/mncc.h b/include/osmocom/msc/mncc.h index 4414a8db2..cf7d7ce9b 100644 --- a/include/osmocom/msc/mncc.h +++ b/include/osmocom/msc/mncc.h @@ -159,6 +159,9 @@ struct gsm_mncc { unsigned char lchan_type; unsigned char lchan_mode; + + /* A buffer to contain SDP ('\0' terminated) */ + char sdp[1024]; }; struct gsm_data_frame { @@ -167,7 +170,7 @@ struct gsm_data_frame { unsigned char data[0]; }; -#define MNCC_SOCK_VERSION 5 +#define MNCC_SOCK_VERSION 6 struct gsm_mncc_hello { uint32_t msg_type; uint32_t version; @@ -190,6 +193,7 @@ struct gsm_mncc_rtp { uint16_t port; uint32_t payload_type; uint32_t payload_msg_type; + char sdp[1024]; }; struct gsm_mncc_bridge { @@ -226,6 +230,7 @@ int mncc_sock_init(struct gsm_network *net, const char *sock_path); || msg_type == GSM_BAD_FRAME) int mncc_prim_check(const struct gsm_mncc *mncc_prim, unsigned int len); +int mncc_check_sdp_termination(const char *label, const struct gsm_mncc *mncc, unsigned int len, const char *sdp); int mncc_bearer_cap_to_channel_type(struct gsm0808_channel_type *ct, const struct gsm_mncc_bearer_cap *bc); |