cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

mncc: Complete definitions for all speech traffic frames at MNCC interface 

The new definitions are: half rate and AMR

Change of definition name for bad frame, because it applies to all types of
traffic, not only TCH/F.

Increase MNCC interface version to 4. Version 3 is skipped, because it was
used by older version of Linux-Call-Router which is incompatible with the
current version of the MNCC interface.
This commit is contained in:
Andreas Eversberg 2014-01-31 09:02:01 +01:00 committed by Holger Hans Peter Freyther
parent f50f70452f
commit f78fc4e76e
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openbsc/include/openbsc/mncc.h
View File

@ -95,7 +95,9 @@ struct gsm_call {
#define GSM_TCHF_FRAME 0x0300
#define GSM_TCHF_FRAME_EFR 0x0301
#define GSM_TCHF_BAD_FRAME 0x03ff
#define GSM_TCHH_FRAME 0x0302
#define GSM_TCH_FRAME_AMR 0x0303
#define GSM_BAD_FRAME 0x03ff
#define MNCC_SOCKET_HELLO 0x0400
@ -161,7 +163,7 @@ struct gsm_data_frame {
unsigned char data[0];
};
#define MNCC_SOCK_VERSION 2
#define MNCC_SOCK_VERSION 4
struct gsm_mncc_hello {
uint32_t msg_type;
uint32_t version;

6
openbsc/src/libmsc/mncc.c
View File

@ -84,7 +84,11 @@ static struct mncc_names {
{"MNCC_FRAME_DROP", 0x0202},
{"MNCC_LCHAN_MODIFY", 0x0203},
{"GSM_TCH_FRAME", 0x0300},
{"GSM_TCHF_FRAME", 0x0300},
{"GSM_TCHF_FRAME_EFR", 0x0301},
{"GSM_TCHH_FRAME", 0x0302},
{"GSM_TCH_FRAME_AMR", 0x0303},
{"GSM_BAD_FRAME", 0x03ff},
{NULL, 0} };

2
openbsc/src/libtrau/trau_mux.c
View File

@ -314,7 +314,7 @@ struct msgb *trau_decode_efr(uint32_t callref,
return msg;
bad_frame:
frame->msg_type = GSM_TCHF_BAD_FRAME;
frame->msg_type = GSM_BAD_FRAME;
return msg;
}

2
openbsc/tests/trau/trau_test.c
View File

@ -57,7 +57,7 @@ void test_trau_fr_efr(unsigned char *data)
msg = trau_decode_efr(1, &tf);
OSMO_ASSERT(msg != NULL);
frame = (struct gsm_data_frame *)msg->data;
OSMO_ASSERT(frame->msg_type == GSM_TCHF_BAD_FRAME);
OSMO_ASSERT(frame->msg_type == GSM_BAD_FRAME);
msgb_free(msg);
}