Change in osmo-msc[master]: drop unused gsm_network->handover.active

[Neels Hofmeyr]

Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12014


Change subject: drop unused gsm_network->handover.active
......................................................................

drop unused gsm_network->handover.active

gsm_network contains an int handover.active which is always zero. Drop it.

There is real handover code coming up soon, one part of this is to avoid
confusion.

The internal MNCC code queried it to decide whether to MNCC_BRIDGE or proxy RTP
(MNCC_FRAME_RECV). Since RTP is being handled by osmo-mgw since forever, drop
that entire condition from mncc_builtin.

Change-Id: Ie16e718266882588b38297121364ca0b7fdfe948
---
M include/osmocom/msc/gsm_data.h
M src/libmsc/mncc_builtin.c
2 files changed, 1 insertion(+), 18 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/14/12014/1

diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h
index 4d3a2e4..94a6ffd 100644
--- a/include/osmocom/msc/gsm_data.h
+++ b/include/osmocom/msc/gsm_data.h
@@ -283,9 +283,6 @@
 	uint8_t a5_encryption_mask;
 	bool authentication_required;
 	int send_mm_info;
-	struct {
-		int active;
-	} handover;
 
 	struct rate_ctr_group *msc_ctrs;
 	struct osmo_counter *active_calls;
diff --git a/src/libmsc/mncc_builtin.c b/src/libmsc/mncc_builtin.c
index d6f3e3d..2efab1f 100644
--- a/src/libmsc/mncc_builtin.c
+++ b/src/libmsc/mncc_builtin.c
@@ -189,21 +189,7 @@
 	bridge.callref[1] = call->remote_ref;
 	DEBUGP(DMNCC, "(call %x) Bridging with remote.\n", call->callref);
 
-	/* proxy mode */
-	if (!net->handover.active) {
-		/* in the no-handover case, we can bridge, i.e. use
-		 * the old RTP proxy code */
-		return mncc_tx_to_cc(call->net, MNCC_BRIDGE, &bridge);
-	} else {
-		/* in case of handover, we need to re-write the RTP
-		 * SSRC, sequence and timestamp values and thus
-		 * need to enable RTP receive for both directions */
-		memset(&frame_recv, 0, sizeof(struct gsm_mncc));
-		frame_recv.callref = call->callref;
-		mncc_tx_to_cc(call->net, MNCC_FRAME_RECV, &frame_recv);
-		frame_recv.callref = call->remote_ref;
-		return mncc_tx_to_cc(call->net, MNCC_FRAME_RECV, &frame_recv);
-	}
+	return mncc_tx_to_cc(call->net, MNCC_BRIDGE, &bridge);
 }
 
 static int mncc_disc_ind(struct gsm_call *call, int msg_type,

-- 
To view, visit https://gerrit.osmocom.org/12014
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie16e718266882588b38297121364ca0b7fdfe948
Gerrit-Change-Number: 12014
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181129/83a3e4ff/attachment.htm>