Change in osmo-bsc[master]: LCLS: fix codec mismatch detection

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10905 )

Change subject: LCLS: fix codec mismatch detection
......................................................................

LCLS: fix codec mismatch detection

gsm_subscriber_connection.user_plane.chan_mode and .full_rate were unused
since and forgotten to be removed in:

commit 31f525e7560ad13e32cfc5e0b5f1862c0efcb991
Date   Mon May 14 18:14:15 2018 +0200
"large refactoring: use FSMs for lchans; add inter-BSC HO"

Instead of above unused struct members, use lchan->{full_rate,tch_mode}.

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.

Change-Id: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb
Related: OS#1602
---
M src/osmo-bsc/osmo_bsc_lcls.c
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c
index 6aeccb3..00c3296 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 mismatch (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 mismatch (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: merged
Gerrit-Change-Id: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb
Gerrit-Change-Number: 10905
Gerrit-PatchSet: 4
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-Assignee: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>
Gerrit-CC: Neels Hofmeyr <nhofmeyr at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180917/1cc93593/attachment.htm>