diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2021-10-08 17:51:50 +0200 |
|---|---|---|
| committer | pespin <pespin@sysmocom.de> | 2021-10-08 20:58:50 +0000 |
| commit | be688f1603c515b6918bf89b0c6c8342ffcee1b5 (patch) | |
| tree | 7d9c3f69446449f0aeb86f79cca650f9435e95c6 | |
| parent | 9419319ab5d984ac2acb50ef386fe62f2852e35e (diff) | |
nm_*_fsm: reset mo.nm_attr from previous runs when entering state NOT_INSTALLED
Code in oml.c, upon receiving net attributes, merges the new attributes
with old ones (for some reason I don't really know). Hence, if we
disconnect from a BSC and go to NOT_INSTALLED state, we must free
previous nm_attr in order to avoid mixing them once we connect to a new
(potentially different) BSC upon reconnect.
Related: OS#5248
Change-Id: I45cc22dd68121a7930301581bfd0a8db37879c77
| -rw-r--r-- | src/common/nm_bb_transc_fsm.c | 3 | ||||
| -rw-r--r-- | src/common/nm_bts_fsm.c | 1 | ||||
| -rw-r--r-- | src/common/nm_channel_fsm.c | 1 | ||||
| -rw-r--r-- | src/common/nm_radio_carrier_fsm.c | 3 |
4 files changed, 8 insertions, 0 deletions
diff --git a/src/common/nm_bb_transc_fsm.c b/src/common/nm_bb_transc_fsm.c index 40d5134e..ca78256c 100644 --- a/src/common/nm_bb_transc_fsm.c +++ b/src/common/nm_bb_transc_fsm.c @@ -59,6 +59,9 @@ static void ev_dispatch_children(struct gsm_bts_bb_trx *bb_transc, uint32_t even static void st_op_disabled_notinstalled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct gsm_bts_bb_trx *bb_transc = (struct gsm_bts_bb_trx *)fi->priv; + /* Reset state: */ + TALLOC_FREE(bb_transc->mo.nm_attr); + bb_transc->mo.setattr_success = false; bb_transc->mo.opstart_success = false; oml_mo_state_chg(&bb_transc->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED, NM_STATE_LOCKED); diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c index c825ab5e..c9dcd4c6 100644 --- a/src/common/nm_bts_fsm.c +++ b/src/common/nm_bts_fsm.c @@ -59,6 +59,7 @@ static void st_op_disabled_notinstalled_on_enter(struct osmo_fsm_inst *fi, uint3 struct gsm_bts *bts = (struct gsm_bts *)fi->priv; /* Reset state: */ bts->si_valid = 0; + TALLOC_FREE(bts->mo.nm_attr); bts->mo.setattr_success = false; bts->mo.opstart_success = false; diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c index 8ffddae8..503ddfb9 100644 --- a/src/common/nm_channel_fsm.c +++ b/src/common/nm_channel_fsm.c @@ -59,6 +59,7 @@ static void st_op_disabled_notinstalled_on_enter(struct osmo_fsm_inst *fi, uint3 gsm_ts_release(ts); if (ts->vamos.peer) gsm_ts_release(ts->vamos.peer); + TALLOC_FREE(ts->mo.nm_attr); ts->mo.setattr_success = false; ts->mo.opstart_success = false; diff --git a/src/common/nm_radio_carrier_fsm.c b/src/common/nm_radio_carrier_fsm.c index be03d1d9..88930dd7 100644 --- a/src/common/nm_radio_carrier_fsm.c +++ b/src/common/nm_radio_carrier_fsm.c @@ -48,6 +48,9 @@ static void st_op_disabled_notinstalled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv; + /* Reset state: */ + TALLOC_FREE(trx->mo.nm_attr); + trx->mo.setattr_success = false; trx->mo.opstart_success = false; oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED, NM_STATE_LOCKED); |