<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/24319">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts: Clean up TS selection in sign_link_up<br><br>Change-Id: I0c92dfd05bf2ae40887980ef10b7e4c679213b6a<br>---<br>M src/common/abis.c<br>M tests/handover/handover_test.c<br>2 files changed, 22 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/abis.c b/src/common/abis.c</span><br><span>index be7e906..55962bd 100644</span><br><span>--- a/src/common/abis.c</span><br><span>+++ b/src/common/abis.c</span><br><span>@@ -99,25 +99,27 @@</span><br><span> static struct e1inp_sign_link *sign_link_up(void *unit, struct e1inp_line *line,</span><br><span> enum e1inp_sign_type type)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct e1inp_sign_link *sign_link = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1inp_ts *sign_ts;</span><br><span> struct gsm_bts_trx *trx;</span><br><span> int trx_nr;</span><br><span> </span><br><span> switch (type) {</span><br><span> case E1INP_SIGN_OML:</span><br><span style="color: hsl(120, 100%, 40%);">+ sign_ts = e1inp_line_ipa_oml_ts(line);</span><br><span> LOGP(DABIS, LOGL_INFO, "OML Signalling link up\n");</span><br><span style="color: hsl(0, 100%, 40%);">- e1inp_ts_config_sign(&line->ts[E1INP_SIGN_OML-1], line);</span><br><span style="color: hsl(0, 100%, 40%);">- sign_link = g_bts->oml_link =</span><br><span style="color: hsl(0, 100%, 40%);">- e1inp_sign_link_create(&line->ts[E1INP_SIGN_OML-1],</span><br><span style="color: hsl(0, 100%, 40%);">- E1INP_SIGN_OML, g_bts->c0, 255, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ e1inp_ts_config_sign(sign_ts, line);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_bts->oml_link = e1inp_sign_link_create(sign_ts, E1INP_SIGN_OML,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_bts->c0, IPAC_PROTO_OML, 0);</span><br><span> if (clock_gettime(CLOCK_MONOTONIC, &g_bts->oml_conn_established_timestamp) != 0)</span><br><span> memset(&g_bts->oml_conn_established_timestamp, 0,</span><br><span> sizeof(g_bts->oml_conn_established_timestamp));</span><br><span> drain_oml_queue(g_bts);</span><br><span> bts_link_estab(g_bts);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return g_bts->oml_link;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case E1INP_SIGN_RSL:</span><br><span> trx_nr = type - E1INP_SIGN_RSL;</span><br><span style="color: hsl(120, 100%, 40%);">+ sign_ts = e1inp_line_ipa_rsl_ts(line, trx_nr);</span><br><span> LOGP(DABIS, LOGL_INFO, "RSL Signalling link for TRX%d up\n",</span><br><span> trx_nr);</span><br><span> trx = gsm_bts_trx_num(g_bts, trx_nr);</span><br><span>@@ -126,16 +128,17 @@</span><br><span> trx_nr);</span><br><span> break;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- e1inp_ts_config_sign(&line->ts[type-1], line);</span><br><span style="color: hsl(0, 100%, 40%);">- sign_link = trx->rsl_link =</span><br><span style="color: hsl(0, 100%, 40%);">- e1inp_sign_link_create(&line->ts[type-1],</span><br><span style="color: hsl(0, 100%, 40%);">- E1INP_SIGN_RSL, trx,</span><br><span style="color: hsl(0, 100%, 40%);">- trx->rsl_tei, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ e1inp_ts_config_sign(sign_ts, line);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->rsl_link = e1inp_sign_link_create(sign_ts, E1INP_SIGN_RSL,</span><br><span style="color: hsl(120, 100%, 40%);">+ trx, trx->rsl_tei, 0);</span><br><span> trx_link_estab(trx);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ return trx->rsl_link;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return sign_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DABIS, LOGL_ERROR, "Unknwon Signalling link up %d\n", (int)type);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span> }</span><br><span> </span><br><span> static void sign_link_down(struct e1inp_line *line)</span><br><span>diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c</span><br><span>index 6af8fac..9c9b020 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -58,6 +58,7 @@</span><br><span> {</span><br><span> void *tall_bts_ctx;</span><br><span> struct e1inp_line *line;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1inp_ts *sign_ts;</span><br><span> struct gsm_lchan *lchan;</span><br><span> struct osmo_phsap_prim nl1sap;</span><br><span> struct msgb *msg;</span><br><span>@@ -90,9 +91,9 @@</span><br><span> </span><br><span> line = e1inp_line_create(0, "ipa");</span><br><span> OSMO_ASSERT(line);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- e1inp_ts_config_sign(&line->ts[E1INP_SIGN_RSL-1], line);</span><br><span style="color: hsl(0, 100%, 40%);">- trx->rsl_link = e1inp_sign_link_create(&line->ts[E1INP_SIGN_RSL-1], E1INP_SIGN_RSL, NULL, 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ sign_ts = e1inp_line_ipa_rsl_ts(line, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ e1inp_ts_config_sign(sign_ts, line);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->rsl_link = e1inp_sign_link_create(sign_ts, E1INP_SIGN_RSL, NULL, 0, 0);</span><br><span> OSMO_ASSERT(trx->rsl_link);</span><br><span> trx->rsl_link->trx = trx;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/24319">change 24319</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-bts/+/24319"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0c92dfd05bf2ae40887980ef10b7e4c679213b6a </div>
<div style="display:none"> Gerrit-Change-Number: 24319 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>