<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21196">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">handover test: fix dyn ts: set pchan_is on act / rel<br><br>Before this, handover_test channel activation and release on dynamic timeslots<br>failed to reflect the correct pchan type that osmo-bsc uses.<br><br>Change-Id: I3284b4565ad2c3b124442f4373243da1518206ce<br>---<br>M tests/handover/handover_test.c<br>1 file changed, 33 insertions(+), 0 deletions(-)<br><br></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 2aa48b7..6a24fde 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -318,6 +318,14 @@</span><br><span> /* serious hack into osmo_fsm */</span><br><span> lchan->fi->state = LCHAN_ST_ESTABLISHED;</span><br><span> lchan->ts->fi->state = TS_ST_IN_USE;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->ts->pchan_on_init == GSM_PCHAN_TCH_F_TCH_H_PDCH)</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ts->pchan_is = full_rate ? GSM_PCHAN_TCH_F : GSM_PCHAN_TCH_H;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->ts->pchan_on_init == GSM_PCHAN_TCH_F_PDCH) {</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(full_rate);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ts->pchan_is = GSM_PCHAN_TCH_F;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> LOG_LCHAN(lchan, LOGL_DEBUG, "activated by handover_test.c\n");</span><br><span> </span><br><span> create_conn(lchan);</span><br><span>@@ -491,6 +499,7 @@</span><br><span> struct e1inp_sign_link *sign_link = msg->dst;</span><br><span> int rc;</span><br><span> struct gsm_lchan *lchan = rsl_lchan_lookup(sign_link->trx, dh->chan_nr, &rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_lchan *other_lchan;</span><br><span> </span><br><span> if (rc) {</span><br><span> printf("rsl_lchan_lookup() failed\n");</span><br><span>@@ -507,6 +516,30 @@</span><br><span> rc = parse_chan_rel(lchan, dh->data);</span><br><span> if (rc == 0)</span><br><span> send_chan_act_ack(chan_req_lchan, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* send dyn TS back to PDCH if unused */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (chan_req_lchan->ts->pchan_on_init) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_TCH_F_TCH_H_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_TCH_F_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (chan_req_lchan->ts->pchan_is) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_TCH_H:</span><br><span style="color: hsl(120, 100%, 40%);">+ other_lchan = &chan_req_lchan->ts->lchan[</span><br><span style="color: hsl(120, 100%, 40%);">+ (chan_req_lchan == &chan_req_lchan->ts->lchan[0])?</span><br><span style="color: hsl(120, 100%, 40%);">+ 1 : 0];</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan_state_is(other_lchan, LCHAN_ST_ESTABLISHED))</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* else fall thru */</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_TCH_F:</span><br><span style="color: hsl(120, 100%, 40%);">+ chan_req_lchan->ts->pchan_is = GSM_PCHAN_PDCH;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</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%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</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%);">+</span><br><span> break;</span><br><span> case RSL_MT_DATA_REQ:</span><br><span> rc = parse_ho_command(lchan, msg->l3h, msgb_l3len(msg));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21196">change 21196</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/+/21196"/><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: I3284b4565ad2c3b124442f4373243da1518206ce </div>
<div style="display:none"> Gerrit-Change-Number: 21196 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>