diff options
| author | Ciaby <ciaby@rhizomatica.org> | 2015-08-06 18:52:06 +0200 |
|---|---|---|
| committer | Ciaby <ciaby@rhizomatica.org> | 2015-08-06 18:54:22 +0200 |
| commit | e0d60333a25d7c44ec0ba8956bc9716f536a2d1b (patch) | |
| tree | 089f4dbf657c704a401dbe38823b7409f97b67fc /openbsc/include | |
| parent | 43726c309318cd0165025c54b993fc12310ee2b2 (diff) | |
| parent | 14a088a92162fd6abb3031e025ce59fba40af718 (diff) | |
Merge branch 'zecke/features/rtp-bridge' into ciaby/2015-07-28ciaby/2015-08-06
Diffstat (limited to 'openbsc/include')
| -rw-r--r-- | openbsc/include/openbsc/gsm_data.h | 5 | ||||
| -rw-r--r-- | openbsc/include/openbsc/mncc.h | 14 |
2 files changed, 18 insertions, 1 deletions
diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index 90f3c800d..c167c494a 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -120,6 +120,11 @@ struct gsm_subscriber_connection { /* Are we part of a special "silent" call */ int silent_call; + /* MNCC rtp bridge markers */ + int mncc_rtp_bridge; + int mncc_rtp_create_pending; + int mncc_rtp_connect_pending; + /* bsc structures */ struct osmo_bsc_sccp_con *sccp_con; diff --git a/openbsc/include/openbsc/mncc.h b/openbsc/include/openbsc/mncc.h index 94ed68572..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 2 +#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); |