Change in osmo-bsc[master]: cosmetic: gscon: don't re-enter ST_CLEARING

[Neels Hofmeyr]

Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10193


Change subject: cosmetic: gscon: don't re-enter ST_CLEARING
......................................................................

cosmetic: gscon: don't re-enter ST_CLEARING

I often see "ERROR [ST_CLEARING] Entering ST_CLEARING not permitted!", avoid
the bogus error messages by checking entering ST_CLEARING only if not in it
yet. Still don't allow re-entering, to not restart the timeout.

Change-Id: Ia1f171c08dcbc529f907a20eed43bf5ee3a452b3
---
M src/osmo-bsc/bsc_subscr_conn_fsm.c
1 file changed, 6 insertions(+), 3 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/93/10193/1

diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c
index 60a9a75..fd3c293 100644
--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c
+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c
@@ -290,7 +290,8 @@
 			       osmo_fsm_inst_state_name(conn->fi));
 		}
 		gscon_bssmap_clear(conn, GSM0808_CAUSE_EQUIPMENT_FAILURE);
-		osmo_fsm_inst_state_chg(fi, ST_CLEARING, 60, 999);
+		if (conn->fi->state != ST_CLEARING)
+			osmo_fsm_inst_state_chg(fi, ST_CLEARING, 60, 999);
 		return;
 	default:
 		OSMO_ASSERT(false);
@@ -626,7 +627,8 @@
 		conn->lchan = NULL;
 	}
 	if (!conn->lchan) {
-		osmo_fsm_inst_state_chg(conn->fi, ST_CLEARING, 60, 999);
+		if (conn->fi->state != ST_CLEARING)
+			osmo_fsm_inst_state_chg(conn->fi, ST_CLEARING, 60, 999);
 		gscon_bssmap_clear(conn, GSM0808_CAUSE_EQUIPMENT_FAILURE);
 	}
 }
@@ -670,7 +672,8 @@
 	switch (event) {
 	case GSCON_EV_A_CLEAR_CMD:
 		/* MSC tells us to cleanly shut down */
-		osmo_fsm_inst_state_chg(fi, ST_CLEARING, 60, 999);
+		if (conn->fi->state != ST_CLEARING)
+			osmo_fsm_inst_state_chg(fi, ST_CLEARING, 60, 999);
 		LOGPFSML(fi, LOGL_DEBUG, "Releasing all lchans (if any) after BSSMAP Clear Command\n");
 		gscon_release_lchans(conn, true);
 		/* FIXME: Release all terestrial resources in ST_CLEARING */

-- 
To view, visit https://gerrit.osmocom.org/10193
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1f171c08dcbc529f907a20eed43bf5ee3a452b3
Gerrit-Change-Number: 10193
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180727/ee462fe1/attachment.htm>