From 79924520085ec6a7ac368e62226e3ad5ff9cc025 Mon Sep 17 00:00:00 2001 From: Stephen Worley Date: Tue, 18 Aug 2020 16:53:44 -0400 Subject: [PATCH] lib: break up show nexthop API a bit for reuse Not everything cares about the vrf and backup info. Break up the API to add a simple version to just write gateway/interface info. Signed-off-by: Stephen Worley --- lib/nexthop_group.c | 13 ++++++++++--- lib/nexthop_group.h | 2 ++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/nexthop_group.c b/lib/nexthop_group.c index 8ae001e42a..696b17fedc 100644 --- a/lib/nexthop_group.c +++ b/lib/nexthop_group.c @@ -952,11 +952,10 @@ static struct cmd_node nexthop_group_node = { .config_write = nexthop_group_write, }; -void nexthop_group_write_nexthop(struct vty *vty, const struct nexthop *nh) +void nexthop_group_write_nexthop_simple(struct vty *vty, + const struct nexthop *nh) { char buf[100]; - struct vrf *vrf; - int i; vty_out(vty, "nexthop "); @@ -983,6 +982,14 @@ void nexthop_group_write_nexthop(struct vty *vty, const struct nexthop *nh) case NEXTHOP_TYPE_BLACKHOLE: break; } +} + +void nexthop_group_write_nexthop(struct vty *vty, const struct nexthop *nh) +{ + struct vrf *vrf; + int i; + + nexthop_group_write_nexthop_simple(vty, nh); if (nh->vrf_id != VRF_DEFAULT) { vrf = vrf_lookup_by_id(nh->vrf_id); diff --git a/lib/nexthop_group.h b/lib/nexthop_group.h index 0b5ac91bb2..3024a01357 100644 --- a/lib/nexthop_group.h +++ b/lib/nexthop_group.h @@ -135,6 +135,8 @@ extern bool nexthop_group_equal(const struct nexthop_group *nhg1, extern struct nexthop_group_cmd *nhgc_find(const char *name); +extern void nexthop_group_write_nexthop_simple(struct vty *vty, + const struct nexthop *nh); extern void nexthop_group_write_nexthop(struct vty *vty, const struct nexthop *nh);