laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/30662 )
Change subject: ctrl: take both address and port from vty config
......................................................................
ctrl: take both address and port from vty config
Change-Id: Ic2c56ffee6237333d919c72bf26076ac24a1fa52
---
M include/osmocom/bsc/ctrl.h
M src/osmo-bsc/bsc_ctrl_lookup.c
M src/osmo-bsc/osmo_bsc_main.c
3 files changed, 4 insertions(+), 10 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/include/osmocom/bsc/ctrl.h b/include/osmocom/bsc/ctrl.h
index af42b39..86d1bda 100644
--- a/include/osmocom/bsc/ctrl.h
+++ b/include/osmocom/bsc/ctrl.h
@@ -6,8 +6,7 @@
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 6a11e32..145cda3 100644
--- a/src/osmo-bsc/bsc_ctrl_lookup.c
+++ b/src/osmo-bsc/bsc_ctrl_lookup.c
@@ -111,10 +111,7 @@
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 2656d23..e1e1cb5 100644
--- a/src/osmo-bsc/osmo_bsc_main.c
+++ b/src/osmo-bsc/osmo_bsc_main.c
@@ -945,9 +945,7 @@
/* 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);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30662
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ic2c56ffee6237333d919c72bf26076ac24a1fa52
Gerrit-Change-Number: 30662
Gerrit-PatchSet: 3
Gerrit-Owner: msuraev <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
