<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21200">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">handover_test: drop secondary array of lchans<br><br>Change-Id: I7c80a16324d764969f279a5e1d6f55b0dbe9c17b<br>---<br>M tests/handover/handover_test.c<br>1 file changed, 11 insertions(+), 31 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/00/21200/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 ea78fbf..d442d99 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -1770,8 +1770,6 @@</span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span> char **test_case;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_lchan *lchan[256];</span><br><span style="color: hsl(0, 100%, 40%);">- int lchan_num = 0;</span><br><span> int i;</span><br><span> int algorithm;</span><br><span> int test_case_i;</span><br><span>@@ -1913,19 +1911,21 @@</span><br><span> test_case += 3;</span><br><span> } else</span><br><span> if (!strcmp(*test_case, "create-ms")) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "- Creating mobile #%d at BTS %s on "</span><br><span style="color: hsl(0, 100%, 40%);">- "%s with %s codec\n", lchan_num, test_case[1],</span><br><span style="color: hsl(0, 100%, 40%);">- test_case[2], test_case[3]);</span><br><span style="color: hsl(0, 100%, 40%);">- lchan[lchan_num] = create_lchan(bts_by_num_str(test_case[1]),</span><br><span style="color: hsl(0, 100%, 40%);">- !strcmp(test_case[2], "TCH/F"), test_case[3]);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!lchan[lchan_num]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *bts_nr_str = test_case[1];</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *tch_type = test_case[2];</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *codec = test_case[3];</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_lchan *lchan;</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "- Creating mobile at BTS %s on "</span><br><span style="color: hsl(120, 100%, 40%);">+ "%s with %s codec\n", bts_nr_str, tch_type, codec);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan = create_lchan(bts_by_num_str(bts_nr_str),</span><br><span style="color: hsl(120, 100%, 40%);">+ !strcmp(tch_type, "TCH/F"), codec);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!lchan) {</span><br><span> printf("Failed to create lchan!\n");</span><br><span> return EXIT_FAILURE;</span><br><span> }</span><br><span> fprintf(stderr, " * New MS is at BTS %d TS %d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- lchan[lchan_num]->ts->trx->bts->nr,</span><br><span style="color: hsl(0, 100%, 40%);">- lchan[lchan_num]->ts->nr);</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_num++;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ts->trx->bts->nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ts->nr);</span><br><span> test_case += 4;</span><br><span> } else</span><br><span> if (!strcmp(*test_case, "set-ta")) {</span><br><span>@@ -2086,19 +2086,6 @@</span><br><span> test_case += 1;</span><br><span> got_chan_req = 0;</span><br><span> got_ho_req = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- /* switch lchan */</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < lchan_num; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan[i] == ho_req_lchan) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, " * MS %d changes from "</span><br><span style="color: hsl(0, 100%, 40%);">- "BTS=%d TS=%d to BTS=%d "</span><br><span style="color: hsl(0, 100%, 40%);">- "TS=%d\n", i,</span><br><span style="color: hsl(0, 100%, 40%);">- lchan[i]->ts->trx->bts->nr,</span><br><span style="color: hsl(0, 100%, 40%);">- lchan[i]->ts->nr,</span><br><span style="color: hsl(0, 100%, 40%);">- chan_req_lchan->ts->trx->bts->nr,</span><br><span style="color: hsl(0, 100%, 40%);">- chan_req_lchan->ts->nr);</span><br><span style="color: hsl(0, 100%, 40%);">- lchan[i] = chan_req_lchan;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> send_ho_complete(chan_req_lchan, true);</span><br><span> } else</span><br><span> if (!strcmp(*test_case, "ho-failed")) {</span><br><span>@@ -2181,13 +2168,6 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < lchan_num; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_subscriber_connection *conn = lchan[i]->conn;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan[i]->conn = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- conn->lchan = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_term(conn->fi, OSMO_FSM_TERM_REGULAR, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> fprintf(stderr, "--------------------\n");</span><br><span> </span><br><span> printf("Test OK\n");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21200">change 21200</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/+/21200"/><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: I7c80a16324d764969f279a5e1d6f55b0dbe9c17b </div>
<div style="display:none"> Gerrit-Change-Number: 21200 </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>