lib: enforce vrf_name_to_id by returning default_vrf when name is null

[mirror_frr.git] / ospfd / ospf_neighbor.c

diff --git a/ospfd/ospf_neighbor.c b/ospfd/ospf_neighbor.c
index 33492cf7c9b91585acf4f9148c9138f75f51b25e..a58bd93b6e8fbc0f5e167139ab8edf94f99b82c7 100644 (file)
--- a/ospfd/ospf_neighbor.c
+++ b/ospfd/ospf_neighbor.c
@@ -269,7 +269,10 @@ void ospf_nbr_add_self(struct ospf_interface *oi, struct in_addr router_id)
        rn = route_node_get(oi->nbrs, &p);
        if (rn->info) {
                /* There is already pseudo neighbor. */
-               assert(oi->nbr_self == rn->info);
+               if (IS_DEBUG_OSPF_EVENT)
+                       zlog_debug(
+                               "router_id %s already present in neighbor table. node refcount %u",
+                               inet_ntoa(router_id), rn->lock);
                route_unlock_node(rn);
        } else
                rn->info = oi->nbr_self;
@@ -460,9 +463,8 @@ struct ospf_neighbor *ospf_nbr_get(struct ospf_interface *oi,
 
        if (oi->type == OSPF_IFTYPE_VIRTUALLINK
            || oi->type == OSPF_IFTYPE_POINTOPOINT)
-               key.u.prefix4 =
-                       ospfh->router_id; /* index vlink and ptp nbrs by
-                                            router-id */
+               key.u.prefix4 = ospfh->router_id; /* index vlink and ptp nbrs by
+                                                    router-id */
        else
                key.u.prefix4 = iph->ip_src;