[PATCH] osmo-bsc[master]: HO: cfg: tweak vty write

[Neels Hofmeyr]

Review at  https://gerrit.osmocom.org/6470

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
---
M include/osmocom/bsc/handover_vty.h
M src/libbsc/bsc_vty.c
M src/libbsc/handover_vty.c
3 files changed, 17 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/70/6470/1

diff --git a/include/osmocom/bsc/handover_vty.h b/include/osmocom/bsc/handover_vty.h
index 48af136..6ad5276 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 f1cbb54..bbf8716 100644
--- a/src/libbsc/bsc_vty.c
+++ b/src/libbsc/bsc_vty.c
@@ -818,7 +818,7 @@
 	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);
 }
@@ -850,7 +850,7 @@
 	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 225e9a9..3ebdc0f 100644
--- a/src/libbsc/handover_vty.c
+++ b/src/libbsc/handover_vty.c
@@ -70,7 +70,7 @@
 #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 @@
 #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) \

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibea4c20abc50c3d655f6bbb1a643477dfc722c8e
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>