commit 234f9cb701c83a85ccbfbfb904aa04d87662bdc5
author Neels Hofmeyr <neels@hofmeyr.de> Tue Oct 24 17:23:04 2017 +0200
committer Neels Hofmeyr <nhofmeyr@sysmocom.de> Fri Oct 27 00:35:01 2017 +0000
tree d34061bdf903438a9022b794de0894e5a4634494
parent 16140f70c5d8138311397388cc938e10f0d992db

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

src/ctrl.c

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;
 

src/ctrl.h

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);

src/hlr.c

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);