dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10905
Change subject: LCLS: use type and tch_mode from lchan to check codec
......................................................................
LCLS: use type and tch_mode from lchan to check codec
When not explicitly allowed via VTY settings, the LCLS mechanisms will
avoid to locally switch connections with different codecs/rates. For
example GSM HR and GSM FR would not be locally switched.
At the moment osmo_bsc_lcls.c uses abandonned struct members to check if
there is a codec mismatch, so a mismatch will never be detected.
- Use struct memfffubers tch_mode and type from struct gsm_lchan *lchan
instead of full_rate and chan_mode in struct gsm_subscriber_connection
Change-Id: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb
Related: OS#1602
---
M src/osmo-bsc/osmo_bsc_lcls.c
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/05/10905/1
diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c
index 6aeccb3..42bb5fa 100644
--- a/src/osmo-bsc/osmo_bsc_lcls.c
+++ b/src/osmo-bsc/osmo_bsc_lcls.c
@@ -274,15 +274,15 @@
return false;
}
- if (conn->user_plane.full_rate != conn->lcls.other->user_plane.full_rate
+ if (conn->lchan->type != conn->lcls.other->lchan->type
&& conn->sccp.msc->lcls_codec_mismatch_allow == false) {
- LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismiatch
(channel rate)\n");
+ LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismiatch
(channel type)\n");
return false;
}
- if (conn->user_plane.chan_mode != conn->lcls.other->user_plane.chan_mode
+ if (conn->lchan->tch_mode != conn->lcls.other->lchan->tch_mode
&& conn->sccp.msc->lcls_codec_mismatch_allow == false) {
- LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismiatch
(channel mode)\n");
+ LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismiatch
(TCH-Mode)\n");
return false;
}
--
To view, visit https://gerrit.osmocom.org/10905
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb
Gerrit-Change-Number: 10905
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <[email protected]>
