diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-08-27 21:50:47 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-08-29 02:02:10 +0200 |
| commit | d8b41fc677ad4a83a414d17215da2cd767cc47ad (patch) | |
| tree | b3b6a4fa8b543d714e901987c18680888e1bbcc1 /src | |
| parent | 4c6d3ea5137681e1a62fd0df0e54de36242723f9 (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/osmo-bsc/handover_fsm.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index e3e8ae115..a42f10ccc 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -487,25 +487,8 @@ static bool parse_ho_request(struct gsm_subscriber_connection *conn, const struc 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"); |