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
This commit is contained in:
parent
344ee30bd4
commit
f9773b0b97
|
@ -283,9 +283,6 @@ struct gsm_network {
|
||||||
uint8_t a5_encryption_mask;
|
uint8_t a5_encryption_mask;
|
||||||
bool authentication_required;
|
bool authentication_required;
|
||||||
int send_mm_info;
|
int send_mm_info;
|
||||||
struct {
|
|
||||||
int active;
|
|
||||||
} handover;
|
|
||||||
|
|
||||||
struct rate_ctr_group *msc_ctrs;
|
struct rate_ctr_group *msc_ctrs;
|
||||||
struct osmo_counter *active_calls;
|
struct osmo_counter *active_calls;
|
||||||
|
|
|
@ -166,8 +166,7 @@ static int mncc_notify_ind(struct gsm_call *call, int msg_type,
|
||||||
static int mncc_setup_cnf(struct gsm_call *call, int msg_type,
|
static int mncc_setup_cnf(struct gsm_call *call, int msg_type,
|
||||||
struct gsm_mncc *connect)
|
struct gsm_mncc *connect)
|
||||||
{
|
{
|
||||||
struct gsm_mncc connect_ack, frame_recv;
|
struct gsm_mncc connect_ack;
|
||||||
struct gsm_network *net = call->net;
|
|
||||||
struct gsm_call *remote;
|
struct gsm_call *remote;
|
||||||
struct gsm_mncc_bridge bridge = { .msg_type = MNCC_BRIDGE };
|
struct gsm_mncc_bridge bridge = { .msg_type = MNCC_BRIDGE };
|
||||||
|
|
||||||
|
@ -189,21 +188,7 @@ static int mncc_setup_cnf(struct gsm_call *call, int msg_type,
|
||||||
bridge.callref[1] = call->remote_ref;
|
bridge.callref[1] = call->remote_ref;
|
||||||
DEBUGP(DMNCC, "(call %x) Bridging with remote.\n", call->callref);
|
DEBUGP(DMNCC, "(call %x) Bridging with remote.\n", call->callref);
|
||||||
|
|
||||||
/* proxy mode */
|
return mncc_tx_to_cc(call->net, MNCC_BRIDGE, &bridge);
|
||||||
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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int mncc_disc_ind(struct gsm_call *call, int msg_type,
|
static int mncc_disc_ind(struct gsm_call *call, int msg_type,
|
||||||
|
|
Loading…
Reference in New Issue