summaryrefslogtreecommitdiff
path: root/bgpd
diff options
context:
space:
mode:
authorJorge Boncompte [DTI2] <jorge@dti2.net>2012-06-20 16:34:01 +0200
committerDavid Lamparter <equinox@opensourcerouting.org>2012-06-21 09:49:15 +0200
commitbb782fb50efcd972d4357f9a7164de2c317d2eef (patch)
tree4f17b1f789945f6d47894be1ba93ca283be2f314 /bgpd
parente2c38e6c9767e30d5683022653b1cf91b186f9d4 (diff)
bgpd: Partially revert f018db8, fixes BZ#730
The change from bgp_node_get() to bgp_node_lookup() broke aggregation. Signed-off-by: Jorge Boncompte [DTI2] <jorge@dti2.net> Tested-by: Martin Winter <mwinter@opensourcerouting.org> Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'bgpd')
-rw-r--r--bgpd/bgp_route.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index cd8f3fea..0337224a 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -4678,9 +4678,7 @@ bgp_aggregate_increment (struct bgp *bgp, struct prefix *p,
if (BGP_INFO_HOLDDOWN (ri))
return;
- child = bgp_node_lookup (table, p);
- if (! child)
- return;
+ child = bgp_node_get (table, p);
/* Aggregate address configuration check. */
for (rn = child; rn; rn = rn->parent)
@@ -4714,9 +4712,7 @@ bgp_aggregate_decrement (struct bgp *bgp, struct prefix *p,
if (p->prefixlen == 0)
return;
- child = bgp_node_lookup (table, p);
- if (! child)
- return;
+ child = bgp_node_get (table, p);
/* Aggregate address configuration check. */
for (rn = child; rn; rn = rn->parent)