<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10039">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">handover_logic: make sure IPACC is done before MGCP<br><br>During handover, the IPACC negotiaton on RSL level must be done<br>at least to the point where the BSC knows the IP-Address and the<br>Port of the new BTS. Only when this data is known the handover<br>logic may emit the GSCON_EV_HO_COMPL to tell the GSCON FSM that<br>the handover is complete (including IPACC)<br><br>- Add a signal handler that listens to SS_ABISIP signals.<br>- In cases where IPACC has not been done yet, postpone GSCON_EV_HO_COMPL<br> and let it send by the signal handler as soon as S_ABISIP_CRCX_ACK<br> arrives.<br><br>Change-Id: I01f05f5d8abe07a0d063e84a1984ac5797afb4f7<br>Related: OS#3396<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/handover_logic.c<br>M tests/handover/handover_test.c<br>3 files changed, 47 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/39/10039/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 5794617..1106176 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -428,6 +428,12 @@</span><br><span> uint8_t rr_cause;</span><br><span> bool valid;</span><br><span> } ass_compl;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* info we need to postpone the GSCON_EV_HO_COMPL event</span><br><span style="color: hsl(120, 100%, 40%);">+ * (see also handover_logic.c, function ho_gsm48_ho_compl() */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ bool postponed;</span><br><span style="color: hsl(120, 100%, 40%);">+ } ho_compl;</span><br><span> } abis_ip;</span><br><span> </span><br><span> uint8_t rqd_ta;</span><br><span>diff --git a/src/osmo-bsc/handover_logic.c b/src/osmo-bsc/handover_logic.c</span><br><span>index 960bf69..ebc80b2 100644</span><br><span>--- a/src/osmo-bsc/handover_logic.c</span><br><span>+++ b/src/osmo-bsc/handover_logic.c</span><br><span>@@ -329,8 +329,19 @@</span><br><span> handover_free(ho);</span><br><span> new_lchan->conn->ho = NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Inform the GSCON FSM that the handover is complete */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(new_lchan->conn->fi, GSCON_EV_HO_COMPL, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* It may be that the RSL RTP port/IP negotiation is not done yet. In</span><br><span style="color: hsl(120, 100%, 40%);">+ * this case we may not acknowledge the handover as completed yet. We</span><br><span style="color: hsl(120, 100%, 40%);">+ * must postpone GSCON_EV_HO_COMPL and wait for S_ABISIP_CRCX_ACK in</span><br><span style="color: hsl(120, 100%, 40%);">+ * order to be sure that the RTP port/IP information inside</span><br><span style="color: hsl(120, 100%, 40%);">+ * lchan->abis_ip is populated with valid data.</span><br><span style="color: hsl(120, 100%, 40%);">+ * (see also callback function: abisip_sig_cb()) */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (new_lchan->abis_ip.bound_port != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Inform the GSCON FSM that the handover is complete */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(new_lchan->conn->fi, GSCON_EV_HO_COMPL, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ new_lchan->abis_ip.ho_compl.postponed = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else</span><br><span style="color: hsl(120, 100%, 40%);">+ new_lchan->abis_ip.ho_compl.postponed = true;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -392,6 +403,25 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int abisip_sig_cb(unsigned int subsys, unsigned int signal,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *handler_data, void *signal_data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_lchan *lchan = signal_data;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (subsys != SS_ABISIP)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (signal) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case S_ABISIP_CRCX_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->abis_ip.ho_compl.postponed) {</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->abis_ip.ho_compl.postponed = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(lchan->conn->fi, GSCON_EV_HO_COMPL, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int ho_logic_sig_cb(unsigned int subsys, unsigned int signal,</span><br><span> void *handler_data, void *signal_data)</span><br><span> {</span><br><span>@@ -437,6 +467,11 @@</span><br><span> static __attribute__((constructor)) void on_dso_load_ho_logic(void)</span><br><span> {</span><br><span> osmo_signal_register_handler(SS_LCHAN, ho_logic_sig_cb, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Note: We must also listen to ABISIP events to make sure that all</span><br><span style="color: hsl(120, 100%, 40%);">+ * RTP port/IP negotiation with the BTS is done before we acknowledge</span><br><span style="color: hsl(120, 100%, 40%);">+ * the handover as completed. */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_signal_register_handler(SS_ABISIP, abisip_sig_cb, NULL);</span><br><span> }</span><br><span> </span><br><span> /* Count number of currently ongoing handovers</span><br><span>diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c</span><br><span>index 769fd06..57e7c11 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -416,6 +416,10 @@</span><br><span> msg->l2h = (unsigned char *)rh;</span><br><span> msg->l3h = (unsigned char *)gh;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Pretend that the the IPACC negotiation has been done already */</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->abis_ip.bound_port = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->abis_ip.ho_compl.postponed = false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> abis_rsl_rcvmsg(msg);</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10039">change 10039</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/10039"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I01f05f5d8abe07a0d063e84a1984ac5797afb4f7 </div>
<div style="display:none"> Gerrit-Change-Number: 10039 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>