Pipes

[vpp.git] / src / vnet / ip / ip6_neighbor.c

diff --git a/src/vnet/ip/ip6_neighbor.c b/src/vnet/ip/ip6_neighbor.c
index e281d7e..87bda43 100644 (file)
--- a/src/vnet/ip/ip6_neighbor.c
+++ b/src/vnet/ip/ip6_neighbor.c
@@ -466,6 +466,8 @@ ip6_nbr_probe (ip_adjacency_t * adj)
   h = vlib_packet_template_get_packet (vm,
                                       &im->discover_neighbor_packet_template,
                                       &bi);
+  if (!h)
+    return;
 
   hi = vnet_get_sup_hw_interface (vnm, adj->rewrite_header.sw_if_index);
 
@@ -3285,6 +3287,8 @@ ip6_discover_neighbor_inline (vlib_main_t * vm,
 
            h0 = vlib_packet_template_get_packet
              (vm, &im->discover_neighbor_packet_template, &bi0);
+           if (!h0)
+             continue;
 
            /*
             * Build ethernet header.
@@ -4186,6 +4190,7 @@ enable_ip6_interface (vlib_main_t * vm, u32 sw_if_index)
 
                  sw_if0 = vnet_get_sw_interface (vnm, sw_if_index);
                  if (sw_if0->type == VNET_SW_INTERFACE_TYPE_SUB ||
+                     sw_if0->type == VNET_SW_INTERFACE_TYPE_PIPE ||
                      sw_if0->type == VNET_SW_INTERFACE_TYPE_P2P)
                    {
                      /* make up  an interface id */
@@ -5037,6 +5042,9 @@ send_ip6_na_w_addr (vlib_main_t * vm,
        vlib_packet_template_get_packet (vm,
                                         &i6m->discover_neighbor_packet_template,
                                         &bi);
+      if (!h)
+       return;
+
       ip6_set_reserved_multicast_address (&h->ip.dst_address,
                                          IP6_MULTICAST_SCOPE_link_local,
                                          IP6_MULTICAST_GROUP_ID_all_hosts);