Change in osmo-bsc[master]: inter-BSC HO incoming: drop old/wrong RTP port code

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10635 )

Change subject: inter-BSC HO incoming: drop old/wrong RTP port code
......................................................................

inter-BSC HO incoming: drop old/wrong RTP port code

Drop nonsensical legacy code.

The Circuit Identifier Code in A/SCCPlite does *not* indicate the RTP port to
use. Rather, it indicates the MGW endpoint name to use when configuring the
BSC's side of the MGW endpoint, and only the MGW will ever know the RTP port.

Change-Id: I471bd5e5cc2a083dd37290aeaae5c334ca5f7eed
---
M src/osmo-bsc/handover_fsm.c
1 file changed, 0 insertions(+), 17 deletions(-)

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



diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c
index e3e8ae1..a42f10c 100644
--- a/src/osmo-bsc/handover_fsm.c
+++ b/src/osmo-bsc/handover_fsm.c
@@ -487,25 +487,8 @@
 	OSMO_STRLCPY_ARRAY(req->cell_id_target_name, gsm0808_cell_id_name(&req->cell_id_target));
 
 	if ((e = TLVP_GET(tp, GSM0808_IE_CIRCUIT_IDENTITY_CODE))) {
-		int timeslot;
-		int multiplex;
-
 		/* CIC is permitted in both AoIP and SCCPlite */
 		req->msc_assigned_cic = osmo_load16be(e->val);
-
-		/* For SCCPlite, the CIC implies the RTP port to use */
-		if (sccplite) {
-			timeslot = req->msc_assigned_cic & 0x1f;
-			multiplex = (req->msc_assigned_cic & ~0x1f) >> 5;
-			req->msc_assigned_rtp_port = mgcp_timeslot_to_port(multiplex, timeslot,
-									   conn->sccp.msc->rtp_base);
-			LOG_HO(conn, LOGL_DEBUG, "Derived RTP port from MSC assigned CIC:"
-			       " CIC=0x%x (timeslot=%d multiplex=%d) rtp_base=%d=0x%x RTP-port=%u\n",
-			       req->msc_assigned_cic, timeslot, multiplex,
-			       conn->sccp.msc->rtp_base, conn->sccp.msc->rtp_base,
-			       req->msc_assigned_rtp_port);
-		}
-
 	} else if (sccplite) {
 		/* no CIC but SCCPlite: illegal */
 		LOG_HO(conn, LOGL_ERROR, "SCCPlite MSC, but no CIC in incoming inter-BSC Handover\n");

-- 
To view, visit https://gerrit.osmocom.org/10635
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: I471bd5e5cc2a083dd37290aeaae5c334ca5f7eed
Gerrit-Change-Number: 10635
Gerrit-PatchSet: 3
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180829/0d4e98b8/attachment.htm>