aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2018-02-12 16:48:45 +0100
committerNeels Hofmeyr <neels@hofmeyr.de>2018-02-16 16:11:16 +0100
commitdfd36da120b936c9e49df5a19fcd60fd89613946 (patch)
treee18c868441cf71f61fc10bd032e999bd4a68f70a
parenta60f344212855dc8c9b3efe8b6a8ccdb3045e5ee (diff)
HO: cfg: tweak vty write
Have expicitly named vty write functions for bts and net levels, so that it is trivial to add commands that exist only on one of each (like the upcoming congestion check timer config for hodec2). Change-Id: Ibea4c20abc50c3d655f6bbb1a643477dfc722c8e
-rw-r--r--include/osmocom/bsc/handover_vty.h3
-rw-r--r--src/libbsc/bsc_vty.c4
-rw-r--r--src/libbsc/handover_vty.c14
3 files changed, 17 insertions, 4 deletions
diff --git a/include/osmocom/bsc/handover_vty.h b/include/osmocom/bsc/handover_vty.h
index 48af136e5..6ad5276e2 100644
--- a/include/osmocom/bsc/handover_vty.h
+++ b/include/osmocom/bsc/handover_vty.h
@@ -4,4 +4,5 @@
#include <osmocom/bsc/handover_cfg.h>
void ho_vty_init();
-void ho_vty_write(struct vty *vty, const char *indent, struct handover_cfg *ho);
+void ho_vty_write_net(struct vty *vty, struct gsm_network *net);
+void ho_vty_write_bts(struct vty *vty, struct gsm_bts *bts);
diff --git a/src/libbsc/bsc_vty.c b/src/libbsc/bsc_vty.c
index f5f77dd90..d65632237 100644
--- a/src/libbsc/bsc_vty.c
+++ b/src/libbsc/bsc_vty.c
@@ -822,7 +822,7 @@ static void config_write_bts_single(struct vty *vty, struct gsm_bts *bts)
if (bts->pcu_sock_path)
vty_out(vty, " pcu-socket %s%s", bts->pcu_sock_path, VTY_NEWLINE);
- ho_vty_write(vty, " ", bts->ho);
+ ho_vty_write_bts(vty, bts);
config_write_bts_model(vty, bts);
}
@@ -854,7 +854,7 @@ static int config_write_net(struct vty *vty)
vty_out(vty, " neci %u%s", gsmnet->neci, VTY_NEWLINE);
vty_out(vty, " paging any use tch %d%s", gsmnet->pag_any_tch, VTY_NEWLINE);
- ho_vty_write(vty, " ", gsmnet->ho);
+ ho_vty_write_net(vty, gsmnet);
VTY_OUT_TIMER(3101);
VTY_OUT_TIMER(3103);
diff --git a/src/libbsc/handover_vty.c b/src/libbsc/handover_vty.c
index 225e9a909..3ebdc0fea 100644
--- a/src/libbsc/handover_vty.c
+++ b/src/libbsc/handover_vty.c
@@ -70,7 +70,7 @@ HO_CFG_ALL_MEMBERS
#undef HO_CFG_ONE_MEMBER
-void ho_vty_write(struct vty *vty, const char *indent, struct handover_cfg *ho)
+static void ho_vty_write(struct vty *vty, const char *indent, struct handover_cfg *ho)
{
#define HO_CFG_ONE_MEMBER(TYPE, NAME, DEFAULT_VAL, \
VTY_CMD, VTY_CMD_ARG, VTY_ARG_EVAL, \
@@ -84,6 +84,18 @@ void ho_vty_write(struct vty *vty, const char *indent, struct handover_cfg *ho)
#undef HO_CFG_ONE_MEMBER
}
+void ho_vty_write_bts(struct vty *vty, struct gsm_bts *bts)
+{
+ ho_vty_write(vty, " ", bts->ho);
+}
+
+void ho_vty_write_net(struct vty *vty, struct gsm_network *net)
+{
+ ho_vty_write(vty, " ", net->ho);
+
+ /* future: net specific vty commands */
+}
+
static void ho_vty_init_cmds(int parent_node)
{
#define HO_CFG_ONE_MEMBER(TYPE, NAME, DEFAULT_VAL, VTY1, VTY2, VTY3, VTY4, VTY5, VTY6) \