msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/30663 )

Change subject: ctrl: take both address and port from vty config ......................................................................

ctrl: take both address and port from vty config

Change-Id: Ieca05004255c40287e6427560c2636b39529cf07 --- M include/osmo-bts/control_if.h M src/common/bts_ctrl_lookup.c M src/common/main.c 3 files changed, 4 insertions(+), 7 deletions(-)

Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified

diff --git a/include/osmo-bts/control_if.h b/include/osmo-bts/control_if.h index 490c87a..f6d877b 100644 --- a/include/osmo-bts/control_if.h +++ b/include/osmo-bts/control_if.h @@ -1,5 +1,4 @@ #pragma once

int bts_ctrl_cmds_install(struct gsm_bts *bts); -struct ctrl_handle *bts_controlif_setup(struct gsm_bts *bts, - const char *bind_addr, uint16_t port); +struct ctrl_handle *bts_controlif_setup(struct gsm_bts *bts, uint16_t port); diff --git a/src/common/bts_ctrl_lookup.c b/src/common/bts_ctrl_lookup.c index a3e3c8b..7a1dfdf 100644 --- a/src/common/bts_ctrl_lookup.c +++ b/src/common/bts_ctrl_lookup.c @@ -88,14 +88,12 @@ return -ERANGE; }

-struct ctrl_handle *bts_controlif_setup(struct gsm_bts *bts, - const char *bind_addr, uint16_t port) +struct ctrl_handle *bts_controlif_setup(struct gsm_bts *bts, uint16_t port) { struct ctrl_handle *hdl; int rc = 0;

- hdl = ctrl_interface_setup_dynip(bts, bind_addr, port, - bts_ctrl_node_lookup); + hdl = ctrl_interface_setup(bts, port, bts_ctrl_node_lookup); if (!hdl) return NULL;

diff --git a/src/common/main.c b/src/common/main.c index ea6c61e..a67364e 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -365,7 +365,7 @@ gsmtap_source_add_sink(g_bts->gsmtap.inst); }

- bts_controlif_setup(g_bts, ctrl_vty_get_bind_addr(), OSMO_CTRL_PORT_BTS); + bts_controlif_setup(g_bts, OSMO_CTRL_PORT_BTS);

rc = telnet_init_dynif(tall_bts_ctx, NULL, vty_get_bind_addr(), g_vty_port_num);