Change in osmo-hlr[master]: ctrl: take both address and port from vty config

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/30665 ) Change subject: ctrl: take both address and port from vty config ...................................................................... ctrl: take both address and port from vty config Change-Id: Iecae15333a4e77b38d9bce8c8e591af3d5fcf347 --- M include/osmocom/hlr/hlr.h M src/ctrl.c M src/hlr.c 3 files changed, 2 insertions(+), 7 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/hlr/hlr.h b/include/osmocom/hlr/hlr.h index e8df5cd..3acb3c5 100644 --- a/include/osmocom/hlr/hlr.h +++ b/include/osmocom/hlr/hlr.h @@ -48,7 +48,6 @@ /* Control Interface */ struct ctrl_handle *ctrl; - const char *ctrl_bind_addr; /* Local bind addr */ char *gsup_bind_addr; diff --git a/src/ctrl.c b/src/ctrl.c index 11b0f5c..4e4afeb 100644 --- a/src/ctrl.c +++ b/src/ctrl.c @@ -771,11 +771,8 @@ struct ctrl_handle *hlr_controlif_setup(struct hlr *hlr) { int rc; - struct ctrl_handle *hdl = ctrl_interface_setup_dynip2(hlr, - hlr->ctrl_bind_addr, - OSMO_CTRL_PORT_HLR, - hlr_ctrl_node_lookup, - _LAST_CTRL_NODE_HLR); + struct ctrl_handle *hdl = ctrl_interface_setup2(hlr, OSMO_CTRL_PORT_HLR, hlr_ctrl_node_lookup, + _LAST_CTRL_NODE_HLR); if (!hdl) return NULL; diff --git a/src/hlr.c b/src/hlr.c index 193dd38..037ebfe 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -830,7 +830,6 @@ } proxy_init(g_hlr->gs); - g_hlr->ctrl_bind_addr = ctrl_vty_get_bind_addr(); g_hlr->ctrl = hlr_controlif_setup(g_hlr); dgsm_start(hlr_ctx); -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/30665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Iecae15333a4e77b38d9bce8c8e591af3d5fcf347 Gerrit-Change-Number: 30665 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged