<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21982">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">handover_test: saner chan act handling<br><br>Do not clear pending chan act requests when sending a measurement report<br>or starting congestion check. This potentially left channel activations<br>unnoticed and dangling, e.g. for repeated meas-rep.<br><br>A typical test should indeed handle pending channel activation requests<br>before potentially triggering more, safeguard against this by asserting<br>that only one channel activation is pending.<br><br>Place unhandled channel activations in new_chan_req pointer, moving to<br>last_chan_req upon handling it. Instead of the got_chan_req flag and<br>additional chan_req_lchan pointer, just keep a last_chan_req pointer.<br><br>Change-Id: If06587058798d96afca86358030dc0c1c3c6df39<br>---<br>M tests/handover/handover_test.c<br>1 file changed, 27 insertions(+), 46 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/82/21982/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c</span><br><span>index 3747bd8..eddf753 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -525,20 +525,8 @@</span><br><span> </span><br><span> /* parse channel request */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int got_chan_req = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-static struct gsm_lchan *chan_req_lchan = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int parse_chan_act(struct gsm_lchan *lchan, uint8_t *data)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- chan_req_lchan = lchan;</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int parse_chan_rel(struct gsm_lchan *lchan, uint8_t *data)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- chan_req_lchan = lchan;</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(120, 100%, 40%);">+static struct gsm_lchan *new_chan_req = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+static struct gsm_lchan *last_chan_req = NULL;</span><br><span> </span><br><span> /* parse handover request */</span><br><span> </span><br><span>@@ -703,35 +691,30 @@</span><br><span> </span><br><span> switch (dh->c.msg_type) {</span><br><span> case RSL_MT_CHAN_ACTIV:</span><br><span style="color: hsl(0, 100%, 40%);">- rc = parse_chan_act(lchan, dh->data);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (got_chan_req) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Test script is erratic: a channel is requested"</span><br><span style="color: hsl(0, 100%, 40%);">- " while a previous channel request is still unhandled\n");</span><br><span style="color: hsl(0, 100%, 40%);">- exit(1);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- got_chan_req = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (new_chan_req) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Test script is erratic: a channel is requested"</span><br><span style="color: hsl(120, 100%, 40%);">+ " while a previous channel request is still unhandled\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(1);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ new_chan_req = lchan;</span><br><span> break;</span><br><span> case RSL_MT_RF_CHAN_REL:</span><br><span style="color: hsl(0, 100%, 40%);">- rc = parse_chan_rel(lchan, dh->data);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- send_chan_act_ack(chan_req_lchan, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ send_chan_act_ack(lchan, 0);</span><br><span> </span><br><span> /* send dyn TS back to PDCH if unused */</span><br><span style="color: hsl(0, 100%, 40%);">- switch (chan_req_lchan->ts->pchan_on_init) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (lchan->ts->pchan_on_init) {</span><br><span> case GSM_PCHAN_TCH_F_TCH_H_PDCH:</span><br><span> case GSM_PCHAN_TCH_F_PDCH:</span><br><span style="color: hsl(0, 100%, 40%);">- switch (chan_req_lchan->ts->pchan_is) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (lchan->ts->pchan_is) {</span><br><span> case GSM_PCHAN_TCH_H:</span><br><span style="color: hsl(0, 100%, 40%);">- other_lchan = &chan_req_lchan->ts->lchan[</span><br><span style="color: hsl(0, 100%, 40%);">- (chan_req_lchan == &chan_req_lchan->ts->lchan[0])?</span><br><span style="color: hsl(120, 100%, 40%);">+ other_lchan = &lchan->ts->lchan[</span><br><span style="color: hsl(120, 100%, 40%);">+ (lchan == &lchan->ts->lchan[0])?</span><br><span> 1 : 0];</span><br><span> if (lchan_state_is(other_lchan, LCHAN_ST_ESTABLISHED))</span><br><span> break;</span><br><span> /* else fall thru */</span><br><span> case GSM_PCHAN_TCH_F:</span><br><span style="color: hsl(0, 100%, 40%);">- chan_req_lchan->ts->pchan_is = GSM_PCHAN_PDCH;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ts->pchan_is = GSM_PCHAN_PDCH;</span><br><span> break;</span><br><span> default:</span><br><span> break;</span><br><span>@@ -895,7 +878,6 @@</span><br><span> fprintf(stderr, " * Neighbor cell #%d, actual BTS %d: rxlev=%d\n", i, neighbor_bts_nr,</span><br><span> nm[i].rxlev);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- got_chan_req = 0;</span><br><span> gen_meas_rep(lc, rxlev, rxqual, ta, argc, nm);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -943,7 +925,6 @@</span><br><span> "Trigger a congestion check\n")</span><br><span> {</span><br><span> fprintf(stderr, "- Triggering congestion check\n");</span><br><span style="color: hsl(0, 100%, 40%);">- got_chan_req = 0;</span><br><span> hodec2_congestion_check(bsc_gsmnet);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -953,8 +934,8 @@</span><br><span> "Expect that no channel request was sent from BSC to any cell\n")</span><br><span> {</span><br><span> fprintf(stderr, "- Expecting no channel request\n");</span><br><span style="color: hsl(0, 100%, 40%);">- if (got_chan_req) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, " * Got channel request at %s\n", gsm_lchan_name(chan_req_lchan));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (new_chan_req) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, " * Got channel request at %s\n", gsm_lchan_name(new_chan_req));</span><br><span> fprintf(stderr, "Test failed, because channel was requested\n");</span><br><span> exit(1);</span><br><span> }</span><br><span>@@ -966,18 +947,19 @@</span><br><span> {</span><br><span> fprintf(stderr, "- Expecting channel request at %s\n",</span><br><span> gsm_lchan_name(lchan));</span><br><span style="color: hsl(0, 100%, 40%);">- if (!got_chan_req) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!new_chan_req) {</span><br><span> fprintf(stderr, "Test failed, because no channel was requested\n");</span><br><span> exit(1);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, " * Got channel request at %s\n", gsm_lchan_name(chan_req_lchan));</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan != chan_req_lchan) {</span><br><span style="color: hsl(120, 100%, 40%);">+ last_chan_req = new_chan_req;</span><br><span style="color: hsl(120, 100%, 40%);">+ new_chan_req = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, " * Got channel request at %s\n", gsm_lchan_name(last_chan_req));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan != last_chan_req) {</span><br><span> fprintf(stderr, "Test failed, because channel was requested on a different lchan than expected\n"</span><br><span> "expected: %s got: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_lchan_name(lchan), gsm_lchan_name(chan_req_lchan));</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_lchan_name(lchan), gsm_lchan_name(last_chan_req));</span><br><span> exit(1);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- got_ho_req = 0;</span><br><span> send_chan_act_ack(lchan, 1);</span><br><span> }</span><br><span> </span><br><span>@@ -1019,7 +1001,7 @@</span><br><span> "ho-detect",</span><br><span> "Send Handover Detection to the most recent HO target lchan\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!got_chan_req) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!last_chan_req) {</span><br><span> fprintf(stderr, "Cannot ack handover/assignment, because no chan request\n");</span><br><span> exit(1);</span><br><span> }</span><br><span>@@ -1027,7 +1009,7 @@</span><br><span> fprintf(stderr, "Cannot ack handover/assignment, because no ho request\n");</span><br><span> exit(1);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- send_ho_detect(chan_req_lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ send_ho_detect(last_chan_req);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -1035,7 +1017,7 @@</span><br><span> "ho-complete",</span><br><span> "Send Handover Complete for the most recent HO target lchan\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!got_chan_req) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!last_chan_req) {</span><br><span> fprintf(stderr, "Cannot ack handover/assignment, because no chan request\n");</span><br><span> exit(1);</span><br><span> }</span><br><span>@@ -1043,7 +1025,7 @@</span><br><span> fprintf(stderr, "Cannot ack handover/assignment, because no ho request\n");</span><br><span> exit(1);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- send_ho_complete(chan_req_lchan, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ send_ho_complete(last_chan_req, true);</span><br><span> lchan_release_ack(ho_req_lchan);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -1070,14 +1052,13 @@</span><br><span> "ho-failed",</span><br><span> "Fail the most recent handover request\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!got_chan_req) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!last_chan_req) {</span><br><span> fprintf(stderr, "Cannot fail handover, because no chan request\n");</span><br><span> exit(1);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- got_chan_req = 0;</span><br><span> got_ho_req = 0;</span><br><span> send_ho_complete(ho_req_lchan, false);</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_release_ack(chan_req_lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_release_ack(last_chan_req);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21982">change 21982</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/c/osmo-bsc/+/21982"/><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-Change-Id: If06587058798d96afca86358030dc0c1c3c6df39 </div>
<div style="display:none"> Gerrit-Change-Number: 21982 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>