From 23b5ace90ed9d141237873db9e18e54e65f62c4f Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Mon, 22 May 2017 21:28:09 +0200 Subject: msc: enable basic CTRL commands So far CTRL was not used by anyone, and was still disabled from the initial implementation of the OsmoMSC. Now we need it in osmo-gsm-tester. Only add the MSC specific CTRL commands, the bsc_base_ctrl_cmds_install() still needs to be split up. Change-Id: Id8f72000e0f4dea081bfce94fde8cd54290dfa7d --- openbsc/src/osmo-msc/msc_main.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/openbsc/src/osmo-msc/msc_main.c b/openbsc/src/osmo-msc/msc_main.c index 73069737e..83d8fa4aa 100644 --- a/openbsc/src/osmo-msc/msc_main.c +++ b/openbsc/src/osmo-msc/msc_main.c @@ -427,19 +427,14 @@ int main(int argc, char **argv) smpp_openbsc_start(msc_network); #endif -#if 0 - the bsc_ctrl_node_lookup() only returns BSC specific ctrl nodes - /* start control interface after reading config for * ctrl_vty_get_bind_addr() */ - msc_network->ctrl = bsc_controlif_setup(msc_network, - ctrl_vty_get_bind_addr(), - OSMO_CTRL_PORT_MSC); + msc_network->ctrl = ctrl_interface_setup_dynip(msc_network, ctrl_vty_get_bind_addr(), + OSMO_CTRL_PORT_MSC, NULL); if (!msc_network->ctrl) { printf("Failed to initialize control interface. Exiting.\n"); return -1; } -#endif #if 0 TODO: we probably want some of the _net_ ctrl commands from bsc_base_ctrl_cmds_install(). @@ -449,12 +444,10 @@ TODO: we probably want some of the _net_ ctrl commands from bsc_base_ctrl_cmds_i } #endif -#if 0 if (msc_ctrl_cmds_install(msc_network) != 0) { printf("Failed to initialize the MSC control commands.\n"); return -1; } -#endif /* seed the PRNG */ srand(time(NULL)); -- cgit v1.2.3