From c41a310fe2392e4ecbd94f67bd0559e1390fbdd6 Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Mon, 5 Dec 2016 13:30:10 +0100 Subject: [PATCH] move osmo_fsm_register() of fsm into constructor of l2tp_fsm.c --- siu/l2tp/l2tpd.c | 4 ---- siu/l2tp/l2tpd_fsm.c | 8 ++++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/siu/l2tp/l2tpd.c b/siu/l2tp/l2tpd.c index f83e86d..726ba56 100644 --- a/siu/l2tp/l2tpd.c +++ b/siu/l2tp/l2tpd.c @@ -83,10 +83,6 @@ int main(int argc, char **argv) l2tpd_log_init(); - /* register fsms */ - osmo_fsm_register(&l2tp_cc_fsm); - osmo_fsm_register(&l2tp_ic_fsm); - osmo_fsm_register(&l2tp_conf_fsm); l2i = talloc_zero(tall_l2tp_ctx, struct l2tpd_instance); l2i->cfg.bind_ip = "0.0.0.0"; diff --git a/siu/l2tp/l2tpd_fsm.c b/siu/l2tp/l2tpd_fsm.c index 8dcf9c5..35cd38e 100644 --- a/siu/l2tp/l2tpd_fsm.c +++ b/siu/l2tp/l2tpd_fsm.c @@ -361,3 +361,11 @@ struct osmo_fsm l2tp_ic_fsm = { .allstate_event_mask = S(L2IC_E_RX_CDN) | S(L2IC_E_LOCAL_CLOSE_REQ), .allstate_action = l2tp_ic_allstate, }; + +static __attribute__((constructor)) void l2tp_fsm_init(void) +{ + /* register fsms */ + osmo_fsm_register(&l2tp_cc_fsm); + osmo_fsm_register(&l2tp_ic_fsm); + osmo_fsm_register(&l2tp_conf_fsm); +}