<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/16350">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">abis_nm.c: fix RSL connection temeout for trx->nr > 0<br><br>After sending of NM_MT_IPACC_RSL_CONNECT message, we start a timer,<br>and stop it on receipt of NM_MT_IPACC_RSL_CONNECT_{ACK,NACK}. When<br>running a multi-trx setup, one can see the following warnings:<br><br> DRSL NOTICE abis_nm.c:2852 (bts=0,trx=1) RSL connection request timed out<br> DRSL NOTICE abis_nm.c:2852 (bts=0,trx=2) RSL connection request timed out<br><br>even despite NM_MT_IPACC_RSL_CONNECT is actually being acknowledged.<br><br>The problem is in abis_nm_rx_ipacc(): we cannot just use sign_link->trx,<br>because the message itself was received over the OML link, so this<br>pointer always gives us C0/TRX0. Instead, we must find a TRX by its<br>number from the FOH header using gsm_bts_trx_by_nr().<br><br>Change-Id: Ib4b9a198da11c88a51cfa78ffb7e7235a6365ef4<br>---<br>M src/osmo-bsc/abis_nm.c<br>1 file changed, 18 insertions(+), 4 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/50/16350/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c</span><br><span>index ca0df68..81f09ce 100644</span><br><span>--- a/src/osmo-bsc/abis_nm.c</span><br><span>+++ b/src/osmo-bsc/abis_nm.c</span><br><span>@@ -2699,8 +2699,10 @@</span><br><span> struct tlv_parsed tp;</span><br><span> struct ipacc_ack_signal_data signal;</span><br><span> struct e1inp_sign_link *sign_link = msg->dst;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx *trx;</span><br><span> </span><br><span> foh = (struct abis_om_fom_hdr *) (oh->data + 1 + idstrlen);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx = gsm_bts_trx_by_nr(sign_link->trx->bts, foh->obj_inst.trx_nr);</span><br><span> </span><br><span> if (strncmp((char *)&oh->data[1], abis_nm_ipa_magic, idstrlen)) {</span><br><span> LOGPFOH(DNM, LOGL_ERROR, foh, "id string is not com.ipaccess !?!\n");</span><br><span>@@ -2727,7 +2729,9 @@</span><br><span> DEBUGPC(DNM, "STREAM=0x%02x ",</span><br><span> *TLVP_VAL(&tp, NM_ATT_IPACC_STREAM_ID));</span><br><span> DEBUGPC(DNM, "\n");</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_del(&sign_link->trx->rsl_connect_timeout);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx == NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto obj_inst_error;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_del(&trx->rsl_connect_timeout);</span><br><span> break;</span><br><span> case NM_MT_IPACC_RSL_CONNECT_NACK:</span><br><span> LOGPFOH(DNM, LOGL_ERROR, foh, "RSL CONNECT NACK ");</span><br><span>@@ -2736,7 +2740,9 @@</span><br><span> abis_nm_nack_cause_name(*TLVP_VAL(&tp, NM_ATT_NACK_CAUSES)));</span><br><span> else</span><br><span> LOGPC(DNM, LOGL_ERROR, "\n");</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_del(&sign_link->trx->rsl_connect_timeout);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx == NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto obj_inst_error;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_del(&trx->rsl_connect_timeout);</span><br><span> break;</span><br><span> case NM_MT_IPACC_SET_NVATTR_ACK:</span><br><span> DEBUGPFOH(DNM, foh, "SET NVATTR ACK\n");</span><br><span>@@ -2783,12 +2789,16 @@</span><br><span> case NM_MT_IPACC_RSL_CONNECT_NACK:</span><br><span> case NM_MT_IPACC_SET_NVATTR_NACK:</span><br><span> case NM_MT_IPACC_GET_NVATTR_NACK:</span><br><span style="color: hsl(0, 100%, 40%);">- signal.trx = gsm_bts_trx_by_nr(sign_link->trx->bts, foh->obj_inst.trx_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx == NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto obj_inst_error;</span><br><span style="color: hsl(120, 100%, 40%);">+ signal.trx = trx;</span><br><span> signal.msg_type = foh->msg_type;</span><br><span> osmo_signal_dispatch(SS_NM, S_NM_IPACC_NACK, &signal);</span><br><span> break;</span><br><span> case NM_MT_IPACC_SET_NVATTR_ACK:</span><br><span style="color: hsl(0, 100%, 40%);">- signal.trx = gsm_bts_trx_by_nr(sign_link->trx->bts, foh->obj_inst.trx_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx == NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto obj_inst_error;</span><br><span style="color: hsl(120, 100%, 40%);">+ signal.trx = trx;</span><br><span> signal.msg_type = foh->msg_type;</span><br><span> osmo_signal_dispatch(SS_NM, S_NM_IPACC_ACK, &signal);</span><br><span> break;</span><br><span>@@ -2797,6 +2807,10 @@</span><br><span> }</span><br><span> </span><br><span> return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+obj_inst_error:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFOH(DNM, LOGL_ERROR, foh, "Unknown object instance\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span> }</span><br><span> </span><br><span> /* send an ip-access manufacturer specific message */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/16350">change 16350</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/+/16350"/><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: Ib4b9a198da11c88a51cfa78ffb7e7235a6365ef4 </div>
<div style="display:none"> Gerrit-Change-Number: 16350 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>