aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2019-10-08 01:11:55 +0200
committerNeels Hofmeyr <neels@hofmeyr.de>2019-10-08 08:20:16 +0200
commit287063d56e55304ee9b4a56fdeeadf28d21328a2 (patch)
treefa4b93e586568bd729b547281dcabd12180e5d62
parent88102322a05479b1af5ef7e93a58e40d81a867d9 (diff)
fsm: use deferred deallocation and term_stops_actions
Since osmo-bsc uses the MGCP client FSMs, it is required to enable these new features to guarantee safe operation. The issue is described in detail in commit logs linked below. Notably, osmo-msc currently chooses to omit error handling during MGCP events (marked "FIXME"). An upcoming patch implements this error handling, and would make osmo-msc vulnerable to crash from unexpected MGCP messages. Depends: Ief4dba9ea587c9b4aea69993e965fbb20fb80e78 (libosmocore), I0adc13a1a998e953b6c850efa2761350dd07e03a (libosmocore) Related: I7df2e9202b04e7ca7366bb0a8ec53cf3bb14faf3 (osmo-mgw) Change-Id: I08c03946605aa12e0a5ce8b3c773704ef5327a7a
-rw-r--r--src/osmo-msc/msc_main.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c
index 3860589e7..b08126f4b 100644
--- a/src/osmo-msc/msc_main.c
+++ b/src/osmo-msc/msc_main.c
@@ -500,7 +500,8 @@ int main(int argc, char **argv)
/* Track the use of talloc NULL memory contexts */
talloc_enable_null_tracking();
- osmo_fsm_term_safely(true);
+ osmo_fsm_set_dealloc_ctx(OTC_SELECT);
+ osmo_fsm_set_term_stops_actions(true);
msc_vty_info.copyright = osmomsc_copyright;
@@ -721,7 +722,7 @@ TODO: we probably want some of the _net_ ctrl commands from bsc_base_ctrl_cmds_i
while (!quit) {
log_reset_context();
- osmo_select_main(0);
+ osmo_select_main_ctx(0);
}
msc_network_shutdown(msc_network);