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

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Fri Feb 16 15:37:09 UTC 2018


Harald Welte has submitted this change and it was merged.

Change subject: HO: cfg: tweak vty write
......................................................................


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

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



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 f5f77dd..d656322 100644
--- a/src/libbsc/bsc_vty.c
+++ b/src/libbsc/bsc_vty.c
@@ -822,7 +822,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);
 }
@@ -854,7 +854,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: merged
Gerrit-Change-Id: Ibea4c20abc50c3d655f6bbb1a643477dfc722c8e
Gerrit-PatchSet: 3
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder



More information about the gerrit-log mailing list