Rename method mncc_rcv_tchf() to mncc_rcv_data(), because the check applies
to all types of data frames, not only TCH/F data.
---
openbsc/include/openbsc/mncc.h | 8 ++++++++
openbsc/src/libmsc/mncc_builtin.c | 22 ++++++++--------------
openbsc/src/libmsc/mncc_sock.c | 3 +--
3 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/openbsc/include/openbsc/mncc.h b/openbsc/include/openbsc/mncc.h
index c61f6b8..ffac7fd 100644
--- a/openbsc/include/openbsc/mncc.h
+++ b/openbsc/include/openbsc/mncc.h
@@ -191,4 +191,12 @@ int mncc_sock_from_cc(struct gsm_network *net, struct msgb
*msg);
int mncc_sock_init(struct gsm_network *gsmnet);
+#define mncc_is_data_frame(msg_type) \
+ (msg_type == GSM_TCHF_FRAME \
+ || msg_type == GSM_TCHF_FRAME_EFR \
+ || msg_type == GSM_TCHH_FRAME \
+ || msg_type == GSM_TCH_FRAME_AMR \
+ || msg_type == GSM_BAD_FRAME)
+
+
#endif
diff --git a/openbsc/src/libmsc/mncc_builtin.c
b/openbsc/src/libmsc/mncc_builtin.c
index be35454..a5a463b 100644
--- a/openbsc/src/libmsc/mncc_builtin.c
+++ b/openbsc/src/libmsc/mncc_builtin.c
@@ -273,8 +273,8 @@ static int mncc_rel_cnf(struct gsm_call *call, int
msg_type, struct gsm_mncc *re
return 0;
}
-/* receiving a TCH/F frame from the BSC code */
-static int mncc_rcv_tchf(struct gsm_call *call, int msg_type,
+/* receiving a (speech) traffic frame from the BSC code */
+static int mncc_rcv_data(struct gsm_call *call, int msg_type,
struct gsm_data_frame *dfr)
{
struct gsm_trans *remote_trans;
@@ -339,16 +339,14 @@ int int_mncc_recv(struct gsm_network *net, struct msgb
*msg)
DEBUGP(DMNCC, "(call %x) Call created.\n", call->callref);
}
- switch (msg_type) {
- case GSM_TCHF_FRAME:
- case GSM_TCHF_FRAME_EFR:
- break;
- default:
- DEBUGP(DMNCC, "(call %x) Received message %s\n", call->callref,
- get_mncc_name(msg_type));
- break;
+ if (mncc_is_data_frame(msg_type)) {
+ rc = mncc_rcv_data(call, msg_type, arg);
+ goto out_free;
}
+ DEBUGP(DMNCC, "(call %x) Received message %s\n", call->callref,
+ get_mncc_name(msg_type));
+
switch(msg_type) {
case MNCC_SETUP_IND:
rc = mncc_setup_ind(call, msg_type, arg);
@@ -408,10 +406,6 @@ int int_mncc_recv(struct gsm_network *net, struct msgb
*msg)
call->callref, data->cause.value);
rc = mncc_tx_to_cc(net, MNCC_RETRIEVE_REJ, data);
break;
- case GSM_TCHF_FRAME:
- case GSM_TCHF_FRAME_EFR:
- rc = mncc_rcv_tchf(call, msg_type, arg);
- break;
default:
LOGP(DMNCC, LOGL_NOTICE, "(call %x) Message unhandled\n",
callref);
break;
diff --git a/openbsc/src/libmsc/mncc_sock.c b/openbsc/src/libmsc/mncc_sock.c
index cf4bca8..dd0a44f 100644
--- a/openbsc/src/libmsc/mncc_sock.c
+++ b/openbsc/src/libmsc/mncc_sock.c
@@ -54,8 +54,7 @@ int mncc_sock_from_cc(struct gsm_network *net, struct msgb
*msg)
if (net->mncc_state->conn_bfd.fd < 0) {
LOGP(DMNCC, LOGL_ERROR, "mncc_sock receives %s for external CC
app "
"but socket is gone\n", get_mncc_name(msg_type));
- if (msg_type != GSM_TCHF_FRAME &&
- msg_type != GSM_TCHF_FRAME_EFR) {
+ if (!mncc_is_data_frame(msg_type)) {
/* release the request */
struct gsm_mncc mncc_out;
memset(&mncc_out, 0, sizeof(mncc_out));
--
1.8.1.5
