ip: Protocol Independent IP Neighbors

[vpp.git] / src / vnet / adj / adj_mcast.c

diff --git a/src/vnet/adj/adj_mcast.c b/src/vnet/adj/adj_mcast.c
index 4454afe..5906522 100644 (file)
--- a/src/vnet/adj/adj_mcast.c
+++ b/src/vnet/adj/adj_mcast.c
@@ -66,11 +66,12 @@ adj_mcast_add_or_lock (fib_protocol_t proto,
        adj->lookup_next_index = IP_LOOKUP_NEXT_MCAST;
        adj->ia_nh_proto = proto;
        adj->ia_link = link_type;
+        adj->ia_node_index = adj_get_mcast_node(proto);
        adj_mcasts[proto][sw_if_index] = adj_get_index(adj);
         adj_lock(adj_get_index(adj));
 
        vnet_rewrite_init(vnm, sw_if_index, link_type,
-                         adj_get_mcast_node(proto),
+                         adj->ia_node_index,
                          vnet_tx_node_index_for_sw_interface(vnm, sw_if_index),
                          &adj->rewrite_header);
 
@@ -88,6 +89,8 @@ adj_mcast_add_or_lock (fib_protocol_t proto,
         adj_lock(adj_get_index(adj));
     }
 
+    adj_delegate_adj_created(adj);
+
     return (adj_get_index(adj));
 }
 
@@ -329,7 +332,12 @@ format_adj_mcast (u8* s, va_list *ap)
 {
     index_t index = va_arg(*ap, index_t);
     CLIB_UNUSED(u32 indent) = va_arg(*ap, u32);
-    ip_adjacency_t * adj = adj_get(index);
+    ip_adjacency_t * adj;
+
+    if (!adj_is_valid(index))
+      return format(s, "<invalid adjacency>");
+
+    adj = adj_get(index);
 
     s = format(s, "%U-mcast: ",
                format_fib_protocol, adj->ia_nh_proto);