diff options
| author | Max <msuraev@sysmocom.de> | 2022-12-17 20:22:45 +0300 |
|---|---|---|
| committer | msuraev <msuraev@sysmocom.de> | 2022-12-20 15:22:23 +0000 |
| commit | c2308534461a34b65681c45d2211478d89a0e8f5 (patch) | |
| tree | f9f8412af92eb2a5e9f6eda21c3bdb49683967ad | |
| parent | fc3397253054bd6bf6b11db0436bf8112e80adb1 (diff) | |
ctrl: take both address and port from vty config
Change-Id: Ic2c56ffee6237333d919c72bf26076ac24a1fa52
| -rw-r--r-- | include/osmocom/bsc/ctrl.h | 3 | ||||
| -rw-r--r-- | src/osmo-bsc/bsc_ctrl_lookup.c | 7 | ||||
| -rw-r--r-- | src/osmo-bsc/osmo_bsc_main.c | 4 |
3 files changed, 4 insertions, 10 deletions
diff --git a/include/osmocom/bsc/ctrl.h b/include/osmocom/bsc/ctrl.h index af42b3982..86d1bdae4 100644 --- a/include/osmocom/bsc/ctrl.h +++ b/include/osmocom/bsc/ctrl.h @@ -6,8 +6,7 @@ struct gsm_network; struct gsm_bts; struct bsc_msc_data; -struct ctrl_handle *bsc_controlif_setup(struct gsm_network *net, - const char *bind_addr, uint16_t port); +struct ctrl_handle *bsc_controlif_setup(struct gsm_network *net, uint16_t port); /* Used internally in different ctrl source code files: */ int bsc_bts_ctrl_cmds_install(void); diff --git a/src/osmo-bsc/bsc_ctrl_lookup.c b/src/osmo-bsc/bsc_ctrl_lookup.c index 6a11e321e..145cda320 100644 --- a/src/osmo-bsc/bsc_ctrl_lookup.c +++ b/src/osmo-bsc/bsc_ctrl_lookup.c @@ -111,10 +111,7 @@ err_index: return -ERANGE; } -struct ctrl_handle *bsc_controlif_setup(struct gsm_network *net, - const char *bind_addr, uint16_t port) +struct ctrl_handle *bsc_controlif_setup(struct gsm_network *net, uint16_t port) { - return ctrl_interface_setup_dynip2(net, bind_addr, port, - bsc_ctrl_node_lookup, - _LAST_CTRL_NODE_BSC); + return ctrl_interface_setup2(net, port, bsc_ctrl_node_lookup, _LAST_CTRL_NODE_BSC); } diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 2656d236e..e1e1cb5c8 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -945,9 +945,7 @@ int main(int argc, char **argv) /* start control interface after reading config for * ctrl_vty_get_bind_addr() */ - bsc_gsmnet->ctrl = bsc_controlif_setup(bsc_gsmnet, - ctrl_vty_get_bind_addr(), - OSMO_CTRL_PORT_NITB_BSC); + bsc_gsmnet->ctrl = bsc_controlif_setup(bsc_gsmnet, OSMO_CTRL_PORT_NITB_BSC); if (!bsc_gsmnet->ctrl) { fprintf(stderr, "Failed to init the control interface. Exiting.\n"); exit(1); |