path: root/src/osmo-bsc/mgw_endpoint_fsm.c
diff options
authorNeels Hofmeyr <neels@hofmeyr.de>2019-01-28 03:52:14 +0100
committerNeels Hofmeyr <neels@hofmeyr.de>2019-04-23 21:57:44 +0200
commita6078fe1d8701d15262e7eb5b3d50d13d1702bbc (patch)
treef59a29deaff503daf3b7354685148a1cbc6eaf5f /src/osmo-bsc/mgw_endpoint_fsm.c
parent62f3b302b09ec183b601776e4a3d2b5658a5abe2 (diff)
use libosmocore osmo_tdef
Move the T_defs API to libosmocore as osmo_tdefs: remove the local T_defs API and use libosmocore's osmo_tdef* API instead. The root reason is moving the mgw_endpoint_fsm to libosmo-mgcp-client to be able to use it in osmo-msc for inter-MSC handover. When adding osmo_tdef, the new concept of timer groups was added to the API. It would make sense to apply group names here as well, but do not modify the VTY configuration for timers. The future might bring separate groups (or not). Depends: Ibd6b1ed7f1bd6e1f2e0fde53352055a4468f23e5 (libosmocore) Change-Id: I66674a5d8403d820038762888c846bae10ceac58
Diffstat (limited to 'src/osmo-bsc/mgw_endpoint_fsm.c')
1 files changed, 4 insertions, 5 deletions
diff --git a/src/osmo-bsc/mgw_endpoint_fsm.c b/src/osmo-bsc/mgw_endpoint_fsm.c
index 5462914fb..fa65166b7 100644
--- a/src/osmo-bsc/mgw_endpoint_fsm.c
+++ b/src/osmo-bsc/mgw_endpoint_fsm.c
@@ -29,7 +29,6 @@
#include <osmocom/netif/rtp.h>
#include <osmocom/bsc/debug.h>
-#include <osmocom/bsc/gsm_timers.h>
#include <osmocom/bsc/mgw_endpoint_fsm.h>
#include <osmocom/bsc/lchan_fsm.h>
@@ -196,9 +195,9 @@ static void fill_event_names()
-static struct T_def *g_T_defs = NULL;
+static struct osmo_tdef *g_T_defs = NULL;
-void mgw_endpoint_fsm_init(struct T_def *T_defs)
+void mgw_endpoint_fsm_init(struct osmo_tdef *T_defs)
g_T_defs = T_defs;
OSMO_ASSERT(osmo_fsm_register(&mgwep_fsm) == 0);
@@ -380,7 +379,7 @@ bool mgwep_ci_get_crcx_info_to_sockaddr(const struct mgwep_ci *ci, struct sockad
-static const struct state_timeout mgwep_fsm_timeouts[32] = {
+static const struct osmo_tdef_state_timeout mgwep_fsm_timeouts[32] = {
@@ -388,7 +387,7 @@ static const struct state_timeout mgwep_fsm_timeouts[32] = {
* The actual timeout value is in turn obtained from g_T_defs.
* Assumes local variable fi exists. */
#define mgwep_fsm_state_chg(state) \
- fsm_inst_state_chg_T(fi, state, mgwep_fsm_timeouts, g_T_defs, 5)
+ osmo_tdef_fsm_inst_state_chg(fi, state, mgwep_fsm_timeouts, g_T_defs, 5)
void mgw_endpoint_ci_request(struct mgwep_ci *ci,
enum mgcp_verb verb, const struct mgcp_conn_peer *verb_info,