From ac85b34476afc341af7e09e9eca368835cd9d68b Mon Sep 17 00:00:00 2001
From: Neels Hofmeyr <neels@hofmeyr.de>
Date: Thu, 12 Jul 2018 21:23:26 +0200
Subject: lchan_fsm: split off lchan_rtp_fsm, establish RTP a bit earlier

Change-Id: Id7a4407d9b63be05ce63f5f2768b7d7e3d5c86fb
---
 src/osmo-bsc/bsc_subscr_conn_fsm.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/osmo-bsc/bsc_subscr_conn_fsm.c')

diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c
index 0ed98d838..bd4176125 100644
--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c
+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c
@@ -28,6 +28,7 @@
 #include <osmocom/bsc/gsm_data.h>
 #include <osmocom/bsc/handover_fsm.h>
 #include <osmocom/bsc/lchan_fsm.h>
+#include <osmocom/bsc/lchan_rtp_fsm.h>
 #include <osmocom/bsc/bsc_subscriber.h>
 #include <osmocom/bsc/osmo_bsc_sigtran.h>
 #include <osmocom/bsc/osmo_bsc_lcls.h>
@@ -597,7 +598,10 @@ void gscon_change_primary_lchan(struct gsm_subscriber_connection *conn, struct g
 	conn->lchan = new_lchan;
 	conn->lchan->conn = conn;
 
-	if (old_lchan) {
+	if (conn->lchan->fi_rtp)
+		osmo_fsm_inst_dispatch(conn->lchan->fi_rtp, LCHAN_RTP_EV_ESTABLISHED, 0);
+
+	if (old_lchan && (old_lchan != new_lchan)) {
 		lchan_forget_conn(old_lchan);
 		lchan_release(old_lchan, false, false, 0);
 	}
-- 
cgit v1.2.3