X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fadj%2Fadj_mcast.c;h=573105b7228012c4bdffbc1009dd04e49bbf6e48;hb=2f4586d9b3507243918c11ce99b9d151d5bde7a0;hp=9fbad482600fff21441a40cdb737407bf1a40502;hpb=d723161e038d00e59766aa67a6a0dcc350227e4b;p=vpp.git

diff --git a/src/vnet/adj/adj_mcast.c b/src/vnet/adj/adj_mcast.c
index 9fbad482600..573105b7228 100644
--- 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);
 
@@ -81,6 +82,8 @@ adj_mcast_add_or_lock (fib_protocol_t proto,
 	 */
 	vnet_update_adjacency_for_sw_interface(vnm, sw_if_index,
                                                adj_get_index(adj));
+
+	adj_delegate_adj_created(adj);
     }
     else
     {
@@ -95,7 +98,7 @@ adj_mcast_add_or_lock (fib_protocol_t proto,
  * adj_mcast_update_rewrite
  *
  * Update the adjacency's rewrite string. A NULL string implies the
- * rewirte is reset (i.e. when ARP/ND etnry is gone).
+ * rewrite is reset (i.e. when ARP/ND entry is gone).
  * NB: the adj being updated may be handling traffic in the DP.
  */
 void
@@ -129,7 +132,7 @@ adj_mcast_update_rewrite (adj_index_t adj_index,
  * adj_mcast_midchain_update_rewrite
  *
  * Update the adjacency's rewrite string. A NULL string implies the
- * rewirte is reset (i.e. when ARP/ND etnry is gone).
+ * rewrite is reset (i.e. when ARP/ND entry is gone).
  * NB: the adj being updated may be handling traffic in the DP.
  */
 void
@@ -148,7 +151,7 @@ adj_mcast_midchain_update_rewrite (adj_index_t adj_index,
     adj = adj_get(adj_index);
 
     /*
-     * one time only update. since we don't support chainging the tunnel
+     * one time only update. since we don't support changing the tunnel
      * src,dst, this is all we need.
      */
     ASSERT(adj->lookup_next_index == IP_LOOKUP_NEXT_MCAST);
@@ -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);
@@ -380,12 +388,14 @@ const static dpo_vft_t adj_mcast_dpo_vft = {
     .dv_unlock = adj_dpo_unlock,
     .dv_format = format_adj_mcast,
     .dv_get_urpf = adj_dpo_get_urpf,
+    .dv_get_mtu = adj_dpo_get_mtu,
 };
 const static dpo_vft_t adj_mcast_midchain_dpo_vft = {
     .dv_lock = adj_dpo_lock,
     .dv_unlock = adj_dpo_unlock,
     .dv_format = format_adj_mcast_midchain,
     .dv_get_urpf = adj_dpo_get_urpf,
+    .dv_get_mtu = adj_dpo_get_mtu,
 };
 
 /**