Change in osmo-bsc[master]: fix lchan_rtp_fsm: missing event handling

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10559 )

Change subject: fix lchan_rtp_fsm: missing event handling
......................................................................

fix lchan_rtp_fsm: missing event handling

Release and Rollback events are allowed but unhandled in states
WAIT_MGW_CONFIGURED and ROLLBACK, and hence would result in an assertion. Add
handling in these states.

Change-Id: Iab233c592384902098644eee27bb8445fde3aa6f
---
M src/osmo-bsc/lchan_rtp_fsm.c
1 file changed, 13 insertions(+), 0 deletions(-)

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



diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c
index 2cc9a78..091af5e 100644
--- a/src/osmo-bsc/lchan_rtp_fsm.c
+++ b/src/osmo-bsc/lchan_rtp_fsm.c
@@ -467,6 +467,14 @@
 		lchan_rtp_fail("Error while redirecting the MGW to the lchan's RTP port");
 		return;
 
+	case LCHAN_RTP_EV_ROLLBACK:
+		lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_ROLLBACK);
+		return;
+
+	case LCHAN_RTP_EV_RELEASE:
+		osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, 0);
+		return;
+
 	default:
 		OSMO_ASSERT(false);
 	}
@@ -533,6 +541,11 @@
 		osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, 0);
 		return;
 
+	case LCHAN_RTP_EV_RELEASE:
+	case LCHAN_RTP_EV_ROLLBACK:
+		/* Already rolling back, ignore. */
+		return;
+
 	default:
 		OSMO_ASSERT(false);
 	}

-- 
To view, visit https://gerrit.osmocom.org/10559
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: Iab233c592384902098644eee27bb8445fde3aa6f
Gerrit-Change-Number: 10559
Gerrit-PatchSet: 2
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180822/6f05e15a/attachment.htm>