<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25640">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">abis: Fix line leaked & recreated upon every reconnect<br><br>Previous code creating a new line was really a workaround to have it<br>working while previous lines were being stacked internally inside<br>libosmo-abis.<br>Let's handle reference counts for the line properly and keep using the<br>same line always (since it can be further configured by libosmo-abis' VTY).<br>Recent patches to libosmo-abis fixed a bug where e1inp_line_update()<br>would only work the first time it was called on a e1np_line, and follow<br>up calls would be no-ops. This fix allows re-configuring and hence<br>reusing the same line to reconnect to BSC.<br><br>Depends: libosmo-abis Change-Id: Iff8092f88726cf238dac2abb99e135ac5864272d<br>Change-Id: Id7fd3ef81bbc517821def31f1a60f905a0e2fb52<br>---<br>M src/common/abis.c<br>1 file changed, 5 insertions(+), 12 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 93635c2..11111fa 100644</span><br><span>--- a/src/common/abis.c</span><br><span>+++ b/src/common/abis.c</span><br><span>@@ -81,7 +81,6 @@</span><br><span> struct bsc_oml_host *current_bsc;</span><br><span> struct gsm_bts *bts;</span><br><span> char *model_name;</span><br><span style="color: hsl(0, 100%, 40%);">- int line_ctr;</span><br><span> };</span><br><span> </span><br><span> static void reset_oml_link(struct gsm_bts *bts)</span><br><span>@@ -156,22 +155,16 @@</span><br><span> bts_dev_info.unit_name = bts->description;</span><br><span> bts_dev_info.location2 = priv->model_name;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- line = e1inp_line_find(priv->line_ctr);</span><br><span style="color: hsl(0, 100%, 40%);">- if (line) {</span><br><span style="color: hsl(0, 100%, 40%);">- e1inp_line_get2(line, __FILE__); /* We want a new reference for returned line */</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(0, 100%, 40%);">- line = e1inp_line_create(priv->line_ctr, "ipa"); /* already comes with a reference */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* The abis connection may fail and we may have to try again with a different BSC (if configured). The next</span><br><span style="color: hsl(0, 100%, 40%);">- * attempt must happen on a different line. */</span><br><span style="color: hsl(0, 100%, 40%);">- priv->line_ctr++;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ line = e1inp_line_find(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!line)</span><br><span style="color: hsl(120, 100%, 40%);">+ line = e1inp_line_create(0, "ipa");</span><br><span> if (!line) {</span><br><span> osmo_fsm_inst_state_chg(fi, ABIS_LINK_ST_FAILED, 0, 0);</span><br><span> return;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- e1inp_line_bind_ops(line, &line_ops);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Line always comes already with a "ctor" reference, enough to keep it alive forever. */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ e1inp_line_bind_ops(line, &line_ops);</span><br><span> /* This will open the OML connection now */</span><br><span> if (e1inp_line_update(line) < 0) {</span><br><span> osmo_fsm_inst_state_chg(fi, ABIS_LINK_ST_FAILED, 0, 0);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25640">change 25640</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/+/25640"/><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: Id7fd3ef81bbc517821def31f1a60f905a0e2fb52 </div>
<div style="display:none"> Gerrit-Change-Number: 25640 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>