diff options
| author | Max <msuraev@sysmocom.de> | 2022-12-17 20:46:47 +0300 |
|---|---|---|
| committer | msuraev <msuraev@sysmocom.de> | 2022-12-22 09:40:08 +0000 |
| commit | 6a6a47f554a35e66e60f31e741f57095d740cf94 (patch) | |
| tree | 4ba67a9208bbb89a91a0058a048a44f3954ea67e | |
| parent | 63baf960c621aa3bd30f5a7acff4b04401821a4e (diff) | |
ctrl: take both address and port from vty config
Change-Id: Ieca05004255c40287e6427560c2636b39529cf07
| -rw-r--r-- | include/osmo-bts/control_if.h | 3 | ||||
| -rw-r--r-- | src/common/bts_ctrl_lookup.c | 6 | ||||
| -rw-r--r-- | src/common/main.c | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/include/osmo-bts/control_if.h b/include/osmo-bts/control_if.h index 490c87af..f6d877bc 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 a3e3c8bc..7a1dfdfe 100644 --- a/src/common/bts_ctrl_lookup.c +++ b/src/common/bts_ctrl_lookup.c @@ -88,14 +88,12 @@ err_index: 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 ea6c61e4..a67364e1 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -365,7 +365,7 @@ int bts_main(int argc, char **argv) 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); |