diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2019-04-23 18:37:37 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2019-04-30 02:24:18 +0200 |
| commit | f14aaa4ba1a744d74d431344e23932214bc42a08 (patch) | |
| tree | 96951088d517116bc00f753a3b869b6d6550111c /src/osmo-bsc/handover_fsm.c | |
| parent | a6078fe1d8701d15262e7eb5b3d50d13d1702bbc (diff) | |
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
Diffstat (limited to 'src/osmo-bsc/handover_fsm.c')
| -rw-r--r-- | src/osmo-bsc/handover_fsm.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index fe3b8b2db..0d1449fc8 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -25,6 +25,8 @@ #include <osmocom/gsm/rsl.h> #include <osmocom/gsm/gsm0808.h> +#include <osmocom/mgcp_client/mgcp_client_endpoint_fsm.h> + #include <osmocom/bsc/debug.h> #include <osmocom/bsc/bsc_subscriber.h> @@ -38,7 +40,6 @@ #include <osmocom/bsc/bsc_msc_data.h> #include <osmocom/bsc/osmo_bsc.h> #include <osmocom/bsc/osmo_bsc_lcls.h> -#include <osmocom/bsc/mgw_endpoint_fsm.h> #include <osmocom/bsc/codec_pref.h> #include <osmocom/bsc/gsm_08_08.h> @@ -240,7 +241,7 @@ static void ho_fsm_update_id(struct osmo_fsm_inst *fi, const char *label) static void handover_reset(struct gsm_subscriber_connection *conn) { - struct mgwep_ci *ci; + struct osmo_mgcpc_ep_ci *ci; if (conn->ho.new_lchan) /* New lchan was activated but never passed to a conn */ lchan_release(conn->ho.new_lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); @@ -250,7 +251,7 @@ static void handover_reset(struct gsm_subscriber_connection *conn) gscon_forget_mgw_endpoint_ci(conn, ci); /* If this is the last endpoint released, the mgw_endpoint_fsm will terminate and tell * the gscon about it. */ - mgw_endpoint_ci_dlcx(ci); + osmo_mgcpc_ep_ci_dlcx(ci); } conn->ho = (struct handover){ @@ -1074,7 +1075,7 @@ static void ho_fsm_wait_mgw_endpoint_to_msc(struct osmo_fsm_inst *fi, uint32_t e /* For AoIP, we created the MGW endpoint. Ensure it is really there, and log it. */ if (gscon_is_aoip(conn)) { const struct mgcp_conn_peer *mgw_info; - mgw_info = mgwep_ci_get_rtp_info(conn->user_plane.mgw_endpoint_ci_msc); + mgw_info = osmo_mgcpc_ep_ci_get_rtp_info(conn->user_plane.mgw_endpoint_ci_msc); if (!mgw_info) { ho_fail(HO_RESULT_ERROR, "Unable to retrieve RTP port info allocated by MGW for" |