From f14aaa4ba1a744d74d431344e23932214bc42a08 Mon Sep 17 00:00:00 2001
From: Neels Hofmeyr <neels@hofmeyr.de>
Date: Tue, 23 Apr 2019 18:37:37 +0200
Subject: move mgw endpoint FSM to osmo-mgw.git

osmo-mgw.git also includes fixes of the MGW endpoint FSM, for example
I92a9944acc96398acd6649f9c3c5badec5dd6dcc.

Depends: I9a3effd38e72841529df6c135c077116981dea36 (osmo-mgw)
Change-Id: I03e6b48d9b0a5370310d5f56809259ff7909cf9d
---
 tests/handover/Makefile.am     |  3 +--
 tests/handover/handover_test.c | 16 ++++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'tests')

diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am
index 40ecf54ea..56aea50af 100644
--- a/tests/handover/Makefile.am
+++ b/tests/handover/Makefile.am
@@ -34,7 +34,7 @@ handover_test_SOURCES = \
 
 handover_test_LDFLAGS = \
 	-Wl,--wrap=abis_rsl_sendmsg \
-	-Wl,--wrap=mgw_endpoint_ci_request \
+	-Wl,--wrap=osmo_mgcpc_ep_ci_request \
 	$(NULL)
 
 handover_test_LDADD = \
@@ -64,7 +64,6 @@ handover_test_LDADD = \
 	$(top_builddir)/src/osmo-bsc/lchan_rtp_fsm.o \
 	$(top_builddir)/src/osmo-bsc/lchan_select.o \
 	$(top_builddir)/src/osmo-bsc/meas_rep.o \
-	$(top_builddir)/src/osmo-bsc/mgw_endpoint_fsm.o \
 	$(top_builddir)/src/osmo-bsc/neighbor_ident.o \
 	$(top_builddir)/src/osmo-bsc/net_init.o \
 	$(top_builddir)/src/osmo-bsc/osmo_bsc_lcls.o \
diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c
index cd3b7494b..a8a77be0c 100644
--- a/tests/handover/handover_test.c
+++ b/tests/handover/handover_test.c
@@ -27,7 +27,7 @@
 #include <osmocom/core/select.h>
 #include <osmocom/core/talloc.h>
 
-#include <osmocom/mgcp_client/mgcp_client_fsm.h>
+#include <osmocom/mgcp_client/mgcp_client_endpoint_fsm.h>
 
 #include <osmocom/bsc/abis_rsl.h>
 #include <osmocom/bsc/debug.h>
@@ -45,7 +45,6 @@
 #include <osmocom/bsc/bsc_subscr_conn_fsm.h>
 #include <osmocom/bsc/timeslot_fsm.h>
 #include <osmocom/bsc/lchan_fsm.h>
-#include <osmocom/bsc/mgw_endpoint_fsm.h>
 #include <osmocom/bsc/handover_fsm.h>
 #include <osmocom/bsc/bsc_msc_data.h>
 
@@ -53,14 +52,14 @@ void *ctx;
 
 struct gsm_network *bsc_gsmnet;
 
-/* override, requires '-Wl,--wrap=mgw_endpoint_ci_request'.
+/* override, requires '-Wl,--wrap=osmo_mgcpc_ep_ci_request'.
  * Catch modification of an MGCP connection. */
-void __real_mgw_endpoint_ci_request(struct mgwep_ci *ci,
+void __real_osmo_mgcpc_ep_ci_request(struct osmo_mgcpc_ep_ci *ci,
 				    enum mgcp_verb verb, const struct mgcp_conn_peer *verb_info,
 				    struct osmo_fsm_inst *notify,
 				    uint32_t event_success, uint32_t event_failure,
 				    void *notify_data);
-void __wrap_mgw_endpoint_ci_request(struct mgwep_ci *ci,
+void __wrap_osmo_mgcpc_ep_ci_request(struct osmo_mgcpc_ep_ci *ci,
 				    enum mgcp_verb verb, const struct mgcp_conn_peer *verb_info,
 				    struct osmo_fsm_inst *notify,
 				    uint32_t event_success, uint32_t event_failure,
@@ -234,9 +233,11 @@ void create_conn(struct gsm_lchan *lchan)
 
 	conn = bsc_subscr_con_allocate(net);
 
-	conn->user_plane.mgw_endpoint = mgw_endpoint_alloc(conn->fi,
+	conn->user_plane.mgw_endpoint = osmo_mgcpc_ep_alloc(conn->fi,
 							   GSCON_EV_FORGET_MGW_ENDPOINT,
-							   fake_mgcp_client, "test",
+							   fake_mgcp_client,
+							   net->mgw.tdefs,
+							   "test",
 							   "fake endpoint");
 	conn->sccp.msc = &fake_msc_data;
 
@@ -1432,7 +1433,6 @@ int main(int argc, char **argv)
 
 	ts_fsm_init();
 	lchan_fsm_init();
-	mgw_endpoint_fsm_init(bsc_gsmnet->T_defs);
 	bsc_subscr_conn_fsm_init();
 	handover_fsm_init();
 
-- 
cgit v1.2.3