ctrl: take both address and port from vty config
Change-Id: Ic2c56ffee6237333d919c72bf26076ac24a1fa52
This commit is contained in:
parent
fc33972530
commit
c230853446
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue