<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12014">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Vadim Yanitskiy: Looks good to me, but someone else must approve
Pau Espin Pedrol: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">drop unused gsm_network->handover.active<br><br>gsm_network contains an int handover.active which is always zero. Drop it.<br><br>There is real handover code coming up soon, one part of this is to avoid<br>confusion.<br><br>The internal MNCC code queried it to decide whether to MNCC_BRIDGE or proxy RTP<br>(MNCC_FRAME_RECV). Since RTP is being handled by osmo-mgw since forever, drop<br>that entire condition from mncc_builtin.<br><br>Change-Id: Ie16e718266882588b38297121364ca0b7fdfe948<br>---<br>M include/osmocom/msc/gsm_data.h<br>M src/libmsc/mncc_builtin.c<br>2 files changed, 2 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h</span><br><span>index 4d3a2e4..94a6ffd 100644</span><br><span>--- a/include/osmocom/msc/gsm_data.h</span><br><span>+++ b/include/osmocom/msc/gsm_data.h</span><br><span>@@ -283,9 +283,6 @@</span><br><span> uint8_t a5_encryption_mask;</span><br><span> bool authentication_required;</span><br><span> int send_mm_info;</span><br><span style="color: hsl(0, 100%, 40%);">- struct {</span><br><span style="color: hsl(0, 100%, 40%);">- int active;</span><br><span style="color: hsl(0, 100%, 40%);">- } handover;</span><br><span> </span><br><span> struct rate_ctr_group *msc_ctrs;</span><br><span> struct osmo_counter *active_calls;</span><br><span>diff --git a/src/libmsc/mncc_builtin.c b/src/libmsc/mncc_builtin.c</span><br><span>index d6f3e3d..135a5e4 100644</span><br><span>--- a/src/libmsc/mncc_builtin.c</span><br><span>+++ b/src/libmsc/mncc_builtin.c</span><br><span>@@ -166,8 +166,7 @@</span><br><span> static int mncc_setup_cnf(struct gsm_call *call, int msg_type,</span><br><span> struct gsm_mncc *connect)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_mncc connect_ack, frame_recv;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_network *net = call->net;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_mncc connect_ack;</span><br><span> struct gsm_call *remote;</span><br><span> struct gsm_mncc_bridge bridge = { .msg_type = MNCC_BRIDGE };</span><br><span> </span><br><span>@@ -189,21 +188,7 @@</span><br><span> bridge.callref[1] = call->remote_ref;</span><br><span> DEBUGP(DMNCC, "(call %x) Bridging with remote.\n", call->callref);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* proxy mode */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!net->handover.active) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* in the no-handover case, we can bridge, i.e. use</span><br><span style="color: hsl(0, 100%, 40%);">- * the old RTP proxy code */</span><br><span style="color: hsl(0, 100%, 40%);">- return mncc_tx_to_cc(call->net, MNCC_BRIDGE, &bridge);</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- /* in case of handover, we need to re-write the RTP</span><br><span style="color: hsl(0, 100%, 40%);">- * SSRC, sequence and timestamp values and thus</span><br><span style="color: hsl(0, 100%, 40%);">- * need to enable RTP receive for both directions */</span><br><span style="color: hsl(0, 100%, 40%);">- memset(&frame_recv, 0, sizeof(struct gsm_mncc));</span><br><span style="color: hsl(0, 100%, 40%);">- frame_recv.callref = call->callref;</span><br><span style="color: hsl(0, 100%, 40%);">- mncc_tx_to_cc(call->net, MNCC_FRAME_RECV, &frame_recv);</span><br><span style="color: hsl(0, 100%, 40%);">- frame_recv.callref = call->remote_ref;</span><br><span style="color: hsl(0, 100%, 40%);">- return mncc_tx_to_cc(call->net, MNCC_FRAME_RECV, &frame_recv);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ return mncc_tx_to_cc(call->net, MNCC_BRIDGE, &bridge);</span><br><span> }</span><br><span> </span><br><span> static int mncc_disc_ind(struct gsm_call *call, int msg_type,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12014">change 12014</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12014"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ie16e718266882588b38297121364ca0b7fdfe948 </div>
<div style="display:none"> Gerrit-Change-Number: 12014 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>