bgpd: fix bgp_table range lookup

[mirror_frr.git] / bgpd / bgp_table.c

diff --git a/bgpd/bgp_table.c b/bgpd/bgp_table.c
index 728eeaa3a9ed5423c60885d0c6817120aea7e8b7..53175bfccf05828d513c1c0626541053ac35c2f1 100644 (file)
--- a/bgpd/bgp_table.c
+++ b/bgpd/bgp_table.c
@@ -67,6 +67,8 @@ static struct route_node *bgp_node_create(route_table_delegate_t *delegate,
 {
        struct bgp_node *node;
        node = XCALLOC(MTYPE_BGP_NODE, sizeof(struct bgp_node));
+
+       RB_INIT(bgp_adj_out_rb, &node->adj_out);
        return bgp_node_to_rnode(node);
 }
 
@@ -154,9 +156,12 @@ void bgp_table_range_lookup(const struct bgp_table *table, struct prefix *p,
        struct bgp_node *node = bgp_node_from_rnode(table->route_table->top);
        struct bgp_node *matched = NULL;
 
-       while (node && node->p.prefixlen <= p->prefixlen
-              && prefix_match(&node->p, p)) {
-               if (node->info && node->p.prefixlen == p->prefixlen) {
+       if (node == NULL)
+               return;
+
+       while (node->p.prefixlen <= p->prefixlen && prefix_match(&node->p, p)) {
+               if (bgp_node_has_bgp_path_info_data(node)
+                   && node->p.prefixlen == p->prefixlen) {
                        matched = node;
                        break;
                }
@@ -164,22 +169,22 @@ void bgp_table_range_lookup(const struct bgp_table *table, struct prefix *p,
                        &p->u.prefix, node->p.prefixlen)]);
        }
 
-       if (node == NULL)
-               return;
-
-       if ((matched == NULL && node->p.prefixlen > maxlen) || !node->parent)
+       if (matched == NULL && node->p.prefixlen <= maxlen
+           && prefix_match(p, &node->p) && node->parent == NULL)
+               matched = node;
+       else if ((matched == NULL && node->p.prefixlen > maxlen) || !node->parent)
                return;
        else if (matched == NULL)
                matched = node = bgp_node_from_rnode(node->parent);
 
-       if (matched->info) {
+       if (bgp_node_has_bgp_path_info_data(matched)) {
                bgp_lock_node(matched);
                listnode_add(matches, matched);
        }
 
        while ((node = bgp_route_next_until_maxlen(node, matched, maxlen))) {
                if (prefix_match(p, &node->p)) {
-                       if (node->info) {
+                       if (bgp_node_has_bgp_path_info_data(node)) {
                                bgp_lock_node(node);
                                listnode_add(matches, node);
                        }