<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25730">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;">nm_*_fsm: reset mo.nm_attr from previous runs when entering state NOT_INSTALLED<br><br>Code in oml.c, upon receiving net attributes, merges the new attributes<br>with old ones (for some reason I don't really know). Hence, if we<br>disconnect from a BSC and go to NOT_INSTALLED state, we must free<br>previous nm_attr in order to avoid mixing them once we connect to a new<br>(potentially different) BSC upon reconnect.<br><br>Related: OS#5248<br>Change-Id: I45cc22dd68121a7930301581bfd0a8db37879c77<br>---<br>M src/common/nm_bb_transc_fsm.c<br>M src/common/nm_bts_fsm.c<br>M src/common/nm_channel_fsm.c<br>M src/common/nm_radio_carrier_fsm.c<br>4 files changed, 8 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/nm_bb_transc_fsm.c b/src/common/nm_bb_transc_fsm.c</span><br><span>index 40d5134..ca78256 100644</span><br><span>--- a/src/common/nm_bb_transc_fsm.c</span><br><span>+++ b/src/common/nm_bb_transc_fsm.c</span><br><span>@@ -59,6 +59,9 @@</span><br><span> static void st_op_disabled_notinstalled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span> {</span><br><span>    struct gsm_bts_bb_trx *bb_transc = (struct gsm_bts_bb_trx *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+      /* Reset state: */</span><br><span style="color: hsl(120, 100%, 40%);">+    TALLOC_FREE(bb_transc->mo.nm_attr);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     bb_transc->mo.setattr_success = false;</span><br><span>    bb_transc->mo.opstart_success = false;</span><br><span>    oml_mo_state_chg(&bb_transc->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED, NM_STATE_LOCKED);</span><br><span>diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c</span><br><span>index c825ab5..c9dcd4c 100644</span><br><span>--- a/src/common/nm_bts_fsm.c</span><br><span>+++ b/src/common/nm_bts_fsm.c</span><br><span>@@ -59,6 +59,7 @@</span><br><span>        struct gsm_bts *bts = (struct gsm_bts *)fi->priv;</span><br><span>         /* Reset state: */</span><br><span>   bts->si_valid = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ TALLOC_FREE(bts->mo.nm_attr);</span><br><span> </span><br><span>         bts->mo.setattr_success = false;</span><br><span>  bts->mo.opstart_success = false;</span><br><span>diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c</span><br><span>index 8ffddae..503ddfb 100644</span><br><span>--- a/src/common/nm_channel_fsm.c</span><br><span>+++ b/src/common/nm_channel_fsm.c</span><br><span>@@ -59,6 +59,7 @@</span><br><span>     gsm_ts_release(ts);</span><br><span>  if (ts->vamos.peer)</span><br><span>               gsm_ts_release(ts->vamos.peer);</span><br><span style="color: hsl(120, 100%, 40%);">+    TALLOC_FREE(ts->mo.nm_attr);</span><br><span> </span><br><span>  ts->mo.setattr_success = false;</span><br><span>   ts->mo.opstart_success = false;</span><br><span>diff --git a/src/common/nm_radio_carrier_fsm.c b/src/common/nm_radio_carrier_fsm.c</span><br><span>index be03d1d..88930dd 100644</span><br><span>--- a/src/common/nm_radio_carrier_fsm.c</span><br><span>+++ b/src/common/nm_radio_carrier_fsm.c</span><br><span>@@ -48,6 +48,9 @@</span><br><span> static void st_op_disabled_notinstalled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span> {</span><br><span>      struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+  /* Reset state: */</span><br><span style="color: hsl(120, 100%, 40%);">+    TALLOC_FREE(trx->mo.nm_attr);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>   trx->mo.setattr_success = false;</span><br><span>  trx->mo.opstart_success = false;</span><br><span>  oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED, NM_STATE_LOCKED);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25730">change 25730</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/+/25730"/><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: I45cc22dd68121a7930301581bfd0a8db37879c77 </div>
<div style="display:none"> Gerrit-Change-Number: 25730 </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: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>