aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2017-10-24 17:23:04 +0200
committerNeels Hofmeyr <neels@hofmeyr.de>2017-10-24 17:23:05 +0200
commit1eed54f449413a6168f2f74c74cf39f5cb1475d8 (patch)
treed0af9514addd35a4171f452332ec17940f4c5bb5
parent36bec87104576f6e7f192698c1efa6a40ce15409 (diff)
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
-rw-r--r--src/ctrl.c12
-rw-r--r--src/ctrl.h3
-rw-r--r--src/hlr.c2
3 files changed, 8 insertions, 9 deletions
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 @@ int hlr_ctrl_cmds_install()
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 @@ int main(int argc, char **argv)
}
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);