aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-09-26 01:07:19 +0200
committerHarald Welte <laforge@gnumonks.org>2016-09-27 05:55:55 +0000
commit39ee92606213a9fd36b10183bb461fa6e2d3a407 (patch)
treeebbe8ba8fece47a9e9c5cfbb701b16416e199b54
parent0476e2854e89f6d30f3a7713e000657087e0fcaa (diff)
hnbgw: vty conformance: rename iuh 'bind' command to 'local-ip'
The standard osmo VTY terminology is 'remote-ip', 'remote-port', 'local-ip', 'local-port'. Conform to that. osmo-hnbgw is so far not rolled out widely, so it makes sense to do this now. Change-Id: Ifda2653bf58044552a5f1477cd7008dec3fb9100
-rw-r--r--include/osmocom/iuh/hnbgw.h2
-rw-r--r--src/hnbgw.c2
-rw-r--r--src/hnbgw_vty.c10
3 files changed, 7 insertions, 7 deletions
diff --git a/include/osmocom/iuh/hnbgw.h b/include/osmocom/iuh/hnbgw.h
index dfe287c..dfc9d82 100644
--- a/include/osmocom/iuh/hnbgw.h
+++ b/include/osmocom/iuh/hnbgw.h
@@ -106,7 +106,7 @@ struct ue_context {
struct hnb_context *hnb;
};
-#define HNBGW_IUH_BIND_ADDR_DEFAULT "0.0.0.0"
+#define HNBGW_IUH_LOCAL_IP_DEFAULT "0.0.0.0"
struct hnb_gw {
struct {
diff --git a/src/hnbgw.c b/src/hnbgw.c
index bd0b3ba..500cf0f 100644
--- a/src/hnbgw.c
+++ b/src/hnbgw.c
@@ -312,7 +312,7 @@ const char *hnbgw_get_iuh_bind_addr(struct hnb_gw *gw)
{
const char *addr = gw->config.iuh_bind_addr;
if (!addr)
- addr = HNBGW_IUH_BIND_ADDR_DEFAULT;
+ addr = HNBGW_IUH_LOCAL_IP_DEFAULT;
return addr;
}
diff --git a/src/hnbgw_vty.c b/src/hnbgw_vty.c
index d6fad64..5dee41a 100644
--- a/src/hnbgw_vty.c
+++ b/src/hnbgw_vty.c
@@ -105,9 +105,9 @@ DEFUN(show_talloc, show_talloc_cmd, "show talloc", SHOW_STR "Display talloc info
return CMD_SUCCESS;
}
-DEFUN(cfg_hnbgw_iuh_bind, cfg_hnbgw_iuh_bind_cmd, "bind A.B.C.D",
+DEFUN(cfg_hnbgw_iuh_local_ip, cfg_hnbgw_iuh_local_ip_cmd, "local-ip A.B.C.D",
"Accept Iuh connections on local interface\n"
- "Local interface IP address (default: " HNBGW_IUH_BIND_ADDR_DEFAULT ")")
+ "Local interface IP address (default: " HNBGW_IUH_LOCAL_IP_DEFAULT ")")
{
talloc_free((void*)g_hnb_gw->config.iuh_bind_addr);
g_hnb_gw->config.iuh_bind_addr = talloc_strdup(tall_hnb_ctx, argv[0]);
@@ -137,8 +137,8 @@ static int config_write_hnbgw_iuh(struct vty *vty)
vty_out(vty, " iuh%s", VTY_NEWLINE);
addr = g_hnb_gw->config.iuh_bind_addr;
- if (addr && (strcmp(addr, HNBGW_IUH_BIND_ADDR_DEFAULT) != 0))
- vty_out(vty, " bind %s%s", addr, VTY_NEWLINE);
+ if (addr && (strcmp(addr, HNBGW_IUH_LOCAL_IP_DEFAULT) != 0))
+ vty_out(vty, " local-ip %s%s", addr, VTY_NEWLINE);
if (g_hnb_gw->config.hnbap_allow_tmsi)
vty_out(vty, " hnbap-allow-tmsi 1%s", VTY_NEWLINE);
@@ -159,7 +159,7 @@ void hnbgw_vty_init(struct hnb_gw *gw, void *tall_ctx)
install_node(&iuh_node, config_write_hnbgw_iuh);
vty_install_default(IUH_NODE);
- install_element(IUH_NODE, &cfg_hnbgw_iuh_bind_cmd);
+ install_element(IUH_NODE, &cfg_hnbgw_iuh_local_ip_cmd);
install_element(IUH_NODE, &cfg_hnbgw_iuh_hnbap_allow_tmsi_cmd);
install_element_ve(&show_hnb_cmd);