Change in osmo-bsc[master]: lchan_fsm: allow late RTP release events without erroring

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10835 )

Change subject: lchan_fsm: allow late RTP release events without erroring
......................................................................

lchan_fsm: allow late RTP release events without erroring

Change-Id: Ia463f97402b957bd13a95d18d291d1c1f006f089
---
M src/osmo-bsc/lchan_fsm.c
1 file changed, 9 insertions(+), 0 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c
index 7d47380..1ef7869 100644
--- a/src/osmo-bsc/lchan_fsm.c
+++ b/src/osmo-bsc/lchan_fsm.c
@@ -967,6 +967,10 @@
 			lchan_fsm_state_chg(LCHAN_ST_UNUSED);
 		break;
 
+	case LCHAN_EV_RTP_RELEASED:
+		/* ignore late lchan_rtp_fsm release events */
+		return;
+
 	default:
 		OSMO_ASSERT(false);
 	}
@@ -1119,6 +1123,7 @@
 		.name = "WAIT_BEFORE_RF_RELEASE",
 		.in_event_mask = 0
 			| S(LCHAN_EV_RLL_REL_IND) /* allow late REL_IND of SAPI[0] */
+			| S(LCHAN_EV_RTP_RELEASED) /* ignore late lchan_rtp_fsm release events */
 			,
 		.out_state_mask = 0
 			| S(LCHAN_ST_UNUSED)
@@ -1131,6 +1136,7 @@
 		.action = lchan_fsm_wait_rf_release_ack,
 		.in_event_mask = 0
 			| S(LCHAN_EV_RSL_RF_CHAN_REL_ACK)
+			| S(LCHAN_EV_RTP_RELEASED) /* ignore late lchan_rtp_fsm release events */
 			,
 		.out_state_mask = 0
 			| S(LCHAN_ST_UNUSED)
@@ -1140,6 +1146,9 @@
 	},
 	[LCHAN_ST_WAIT_AFTER_ERROR] = {
 		.name = "WAIT_AFTER_ERROR",
+		.in_event_mask = 0
+			| S(LCHAN_EV_RTP_RELEASED) /* ignore late lchan_rtp_fsm release events */
+			,
 		.out_state_mask = 0
 			| S(LCHAN_ST_UNUSED)
 			,

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

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia463f97402b957bd13a95d18d291d1c1f006f089
Gerrit-Change-Number: 10835
Gerrit-PatchSet: 2
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180910/50b89af9/attachment.htm>