From 09990cddffba0183965879de56564bca97e9a3d7 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 1 Jun 2018 14:13:58 -0400 Subject: [PATCH] bgpd: Cleanup bgp_aggregate_set/unset to not worry about safi so much The bgp_aggregate_set/unset functions are only called from the cli invocations which control what AFI/SAFI we are looking at. Tests for safi are unimportant. Signed-off-by: Donald Sharp --- bgpd/bgp_route.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 591af0f8cf..73331f8eee 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -5898,9 +5898,6 @@ static int bgp_aggregate_unset(struct vty *vty, const char *prefix_str, struct bgp_node *rn; struct bgp_aggregate *aggregate; - if (safi == SAFI_FLOWSPEC) - return CMD_WARNING_CONFIG_FAILED; - /* Convert string to prefix structure. */ ret = str2prefix(prefix_str, &p); if (!ret) { @@ -5918,13 +5915,7 @@ static int bgp_aggregate_unset(struct vty *vty, const char *prefix_str, } aggregate = rn->info; - if (aggregate->safi == SAFI_UNICAST) - bgp_aggregate_delete(bgp, &p, afi, SAFI_UNICAST, aggregate); - if (aggregate->safi == SAFI_LABELED_UNICAST) - bgp_aggregate_delete(bgp, &p, afi, SAFI_LABELED_UNICAST, - aggregate); - if (aggregate->safi == SAFI_MULTICAST) - bgp_aggregate_delete(bgp, &p, afi, SAFI_MULTICAST, aggregate); + bgp_aggregate_delete(bgp, &p, afi, safi, aggregate); /* Unlock aggregate address configuration. */ rn->info = NULL; @@ -5944,9 +5935,6 @@ static int bgp_aggregate_set(struct vty *vty, const char *prefix_str, afi_t afi, struct bgp_node *rn; struct bgp_aggregate *aggregate; - if (safi == SAFI_FLOWSPEC) - return CMD_WARNING_CONFIG_FAILED; - /* Convert string to prefix structure. */ ret = str2prefix(prefix_str, &p); if (!ret) { @@ -5977,13 +5965,7 @@ static int bgp_aggregate_set(struct vty *vty, const char *prefix_str, afi_t afi, rn->info = aggregate; /* Aggregate address insert into BGP routing table. */ - if (safi == SAFI_UNICAST) - bgp_aggregate_add(bgp, &p, afi, SAFI_UNICAST, aggregate); - if (safi == SAFI_LABELED_UNICAST) - bgp_aggregate_add(bgp, &p, afi, SAFI_LABELED_UNICAST, - aggregate); - if (safi == SAFI_MULTICAST) - bgp_aggregate_add(bgp, &p, afi, SAFI_MULTICAST, aggregate); + bgp_aggregate_add(bgp, &p, afi, safi, aggregate); return CMD_SUCCESS; } -- 2.39.5