aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2015-09-21 11:28:03 +0200
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2015-09-21 14:34:22 +0200
commit1eaa3d72eaa10bb854b2adff48d3f7f3e06dcb8c (patch)
treee247e4309ea8c261a5074c04f2ffe8fac99ae896
parent668f8df3be7f644056d16ea4a7fd7929429da0b4 (diff)
audio/rsl: Honor the speech mode and don't send anything
Spotted by Ciaby while debugging an audio issue. Do not send anything to port==0 to the BSC/NITB. Look at the upper bits of the speech_mode to determine if sending is allowed. 0x1 means recv_only and all other modes allow us to send. Manually verified with a single phone call with LCR bridge mode to send a CRCX early but a MDCX sendrecv later. The audio starts to flow after the MDCX message. Virtual Addr space didn't increase over 10 calls. The l1p_msg is freed by the caller. The code might not re-set speech_mode from one call to another but if it is ever != 0 it can be expected that the BSC will always set it. This is because we do not (and don't want to) allocate the lchan dynamically on every usage. Fixes: SYS#2111
-rw-r--r--src/osmo-bts-sysmo/tch.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/osmo-bts-sysmo/tch.c b/src/osmo-bts-sysmo/tch.c
index 422df0f..9e8903b 100644
--- a/src/osmo-bts-sysmo/tch.c
+++ b/src/osmo-bts-sysmo/tch.c
@@ -529,6 +529,11 @@ void bts_model_rtp_rx_cb(struct osmo_rtp_socket *rs, const uint8_t *rtp_pl,
msgb_enqueue(&lchan->dl_tch_queue, msg);
}
+static int is_recv_only(uint8_t speech_mode)
+{
+ return (speech_mode & 0xF0) == (1 << 4);
+}
+
/*! \brief receive a traffic L1 primitive for a given lchan */
int l1if_tch_rx(struct gsm_lchan *lchan, struct msgb *l1p_msg)
{
@@ -539,6 +544,9 @@ int l1if_tch_rx(struct gsm_lchan *lchan, struct msgb *l1p_msg)
uint8_t payload_len;
struct msgb *rmsg = NULL;
+ if (is_recv_only(lchan->abis_ip.speech_mode))
+ return -EAGAIN;
+
if (data_ind->msgUnitParam.u8Size < 1) {
LOGP(DL1C, LOGL_ERROR, "%s Rx Payload size 0\n",
gsm_lchan_name(lchan));