diff options
| author | Vadim Yanitskiy <axilirator@gmail.com> | 2018-08-28 03:45:11 +0700 |
|---|---|---|
| committer | Vadim Yanitskiy <axilirator@gmail.com> | 2018-10-03 18:44:10 +0700 |
| commit | 679efd19677c35b1390b751c3512c0e61d37d499 (patch) | |
| tree | 6ed320e0ee699aabbdc1a111d70c2e1a5d7f6f36 | |
| parent | 5408068c0ed90d07400e4c2a1a3e143e79f13afc (diff) | |
mobile/voice.c: properly set frame type and length
Change-Id: I4e850d2637a338032395cedd5ad540d61899eb75
| -rw-r--r-- | src/host/layer23/src/mobile/voice.c | 50 |
1 files changed, 45 insertions, 5 deletions
diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c index ddecb82a..cb2b99b0 100644 --- a/src/host/layer23/src/mobile/voice.c +++ b/src/host/layer23/src/mobile/voice.c @@ -24,6 +24,7 @@ #include <errno.h> #include <osmocom/core/msgb.h> +#include <osmocom/codec/codec.h> #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/mobile/settings.h> @@ -37,6 +38,7 @@ static int gsm_recv_voice(struct osmocom_ms *ms, struct msgb *msg) { struct gsm_data_frame *frame; + size_t frame_len; /* Make sure that a MNCC handler is set */ if (!ms->mncc_entity.mncc_recv) { @@ -54,8 +56,25 @@ static int gsm_recv_voice(struct osmocom_ms *ms, struct msgb *msg) frame = (struct gsm_data_frame *) msgb_push(msg, sizeof(struct gsm_data_frame)); - /* FIXME: set proper msg_type */ - frame->msg_type = GSM_TCHF_FRAME; + /* Determine a frame type */ + frame_len = msgb_l3len(msg); + switch (frame_len) { + case GSM_FR_BYTES: + frame->msg_type = GSM_TCHF_FRAME; + break; + case GSM_EFR_BYTES: + frame->msg_type = GSM_TCHF_FRAME_EFR; + break; + case (GSM_HR_BYTES + 1): + frame->msg_type = GSM_TCHH_FRAME; + break; + case GSM_TCH_FRAME_AMR: /* FIXME! */ + default: + /* TODO: add some logging here */ + msgb_free(msg); + return -ENOTSUP; + } + frame->callref = ms->mncc_entity.ref; /* Forward to an MNCC-handler */ @@ -103,13 +122,34 @@ int gsm_send_voice(struct osmocom_ms *ms, struct msgb *msg) int gsm_send_voice_mncc(struct osmocom_ms *ms, struct gsm_data_frame *frame) { + unsigned int frame_len; struct msgb *nmsg; - nmsg = msgb_alloc_headroom(33 + 64, 64, "TCH/F"); + /* Determine frame length */ + switch (frame->msg_type) { + case GSM_TCHF_FRAME: + frame_len = GSM_FR_BYTES; + break; + case GSM_TCHF_FRAME_EFR: + frame_len = GSM_EFR_BYTES; + break; + case GSM_TCHH_FRAME: + frame_len = (GSM_HR_BYTES + 1); + break; + case GSM_TCH_FRAME_AMR: + default: + /* TODO: add some logging here */ + return -ENOTSUP; + } + + /* Allocate a message for the lower layers */ + nmsg = msgb_alloc_headroom(frame_len + 64, 64, "TCH frame"); if (!nmsg) return -ENOMEM; - nmsg->l2h = msgb_put(nmsg, 33); - memcpy(nmsg->l2h, frame->data, 33); + + /* Copy payload from a frame */ + nmsg->l2h = msgb_put(nmsg, frame_len); + memcpy(nmsg->l2h, frame->data, frame_len); return gsm_send_voice(ms, nmsg); } |