[MERGED] osmo-hlr[master]: cosmetic: tweak params of hlr_controlif_setup()

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged.

Change subject: cosmetic: tweak params of hlr_controlif_setup()
......................................................................


cosmetic: tweak params of hlr_controlif_setup()

Cosmetically prepare for adding new CTRL commands in hlr_controlif_setup():
- drop unused 'gs' param.
- use ctrl_interface_setup_dynip2(), so far with default CTRL nodes; custom
  nodes will be added soon.

Prepares: I98ee6a06b3aa6a67adb868e0b63b0e04eb42eb50
Change-Id: I63004a7953b04988449697dbc5d55d7ed0c6d82d
---
M src/ctrl.c
M src/ctrl.h
M src/hlr.c
3 files changed, 8 insertions(+), 9 deletions(-)

Approvals:
  Max: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/ctrl.c b/src/ctrl.c
index 3bd4d8f..b49765d 100644
--- a/src/ctrl.c
+++ b/src/ctrl.c
@@ -94,14 +94,14 @@
 	return rc;
 }
 
-struct ctrl_handle *hlr_controlif_setup(struct hlr *ctx,
-					struct osmo_gsup_server *gs)
+struct ctrl_handle *hlr_controlif_setup(struct hlr *hlr)
 {
 	int rc;
-	struct ctrl_handle *hdl = ctrl_interface_setup_dynip(ctx,
-							     ctx->ctrl_bind_addr,
-							     OSMO_CTRL_PORT_HLR,
-							     NULL);
+	struct ctrl_handle *hdl = ctrl_interface_setup_dynip2(hlr,
+							      hlr->ctrl_bind_addr,
+							      OSMO_CTRL_PORT_HLR,
+							      NULL,
+							      0);
 	if (!hdl)
 		return NULL;
 
diff --git a/src/ctrl.h b/src/ctrl.h
index 663de30..239deea 100644
--- a/src/ctrl.h
+++ b/src/ctrl.h
@@ -27,5 +27,4 @@
 #include "gsup_server.h"
 
 int hlr_ctrl_cmds_install();
-struct ctrl_handle *hlr_controlif_setup(struct hlr *ctx,
-					struct osmo_gsup_server *gs);
+struct ctrl_handle *hlr_controlif_setup(struct hlr *hlr);
diff --git a/src/hlr.c b/src/hlr.c
index b32f709..6310526 100644
--- a/src/hlr.c
+++ b/src/hlr.c
@@ -474,7 +474,7 @@
 	}
 
 	g_hlr->ctrl_bind_addr = ctrl_vty_get_bind_addr();
-	g_hlr->ctrl = hlr_controlif_setup(g_hlr, g_hlr->gs);
+	g_hlr->ctrl = hlr_controlif_setup(g_hlr);
 
 	osmo_init_ignore_signals();
 	signal(SIGINT, &signal_hdlr);

-- 
To view, visit https://gerrit.osmocom.org/4396
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I63004a7953b04988449697dbc5d55d7ed0c6d82d
Gerrit-PatchSet: 2
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>