ARP: ignore non-connected routes and non-interface sources when determing if source...
[vpp.git] / src / vnet / ethernet / arp.c
index c74a097..d5dc9cc 100644 (file)
@@ -22,6 +22,7 @@
 #include <vnet/l2/l2_input.h>
 #include <vppinfra/mhash.h>
 #include <vnet/fib/ip4_fib.h>
+#include <vnet/fib/fib_entry_src.h>
 #include <vnet/adj/adj_nbr.h>
 #include <vnet/adj/adj_mcast.h>
 #include <vnet/mpls/mpls.h>
@@ -107,6 +108,8 @@ typedef struct
 #define ETHERNET_ARP_ARGS_POPULATE  (1<<2)
 } vnet_arp_set_ip4_over_ethernet_rpc_args_t;
 
+static const u8 vrrp_prefix[] = { 0x00, 0x00, 0x5E, 0x00, 0x01 };
+
 static void
 set_ip4_over_ethernet_rpc_callback (vnet_arp_set_ip4_over_ethernet_rpc_args_t
                                    * a);
@@ -507,6 +510,7 @@ arp_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai)
     case IP_LOOKUP_NEXT_PUNT:
     case IP_LOOKUP_NEXT_LOCAL:
     case IP_LOOKUP_NEXT_REWRITE:
+    case IP_LOOKUP_NEXT_MCAST_MIDCHAIN:
     case IP_LOOKUP_NEXT_MIDCHAIN:
     case IP_LOOKUP_NEXT_ICMP_ERROR:
     case IP_LOOKUP_N_NEXT:
@@ -563,6 +567,7 @@ vnet_arp_set_ip4_over_ethernet_internal (vnet_main_t * vnm,
 
       e->sw_if_index = sw_if_index;
       e->ip4_address = a->ip4;
+      e->fib_entry_index = FIB_NODE_INDEX_INVALID;
       clib_memcpy (e->ethernet_address,
                   a->ethernet, sizeof (e->ethernet_address));
 
@@ -578,11 +583,14 @@ vnet_arp_set_ip4_over_ethernet_internal (vnet_main_t * vnm,
          fib_index =
            ip4_fib_table_get_index_for_sw_if_index (e->sw_if_index);
          e->fib_entry_index =
-           fib_table_entry_update_one_path (fib_index, &pfx, FIB_SOURCE_ADJ,
-                                            FIB_ENTRY_FLAG_ATTACHED,
-                                            FIB_PROTOCOL_IP4, &pfx.fp_addr,
-                                            e->sw_if_index, ~0, 1, NULL,
-                                            FIB_ROUTE_PATH_FLAG_NONE);
+           fib_table_entry_path_add (fib_index, &pfx, FIB_SOURCE_ADJ,
+                                     FIB_ENTRY_FLAG_ATTACHED,
+                                     FIB_PROTOCOL_IP4, &pfx.fp_addr,
+                                     e->sw_if_index, ~0, 1, NULL,
+                                     FIB_ROUTE_PATH_FLAG_NONE);
+       }
+      else
+       {
          e->flags |= ETHERNET_ARP_IP4_ENTRY_FLAG_NO_FIB_ENTRY;
        }
     }
@@ -823,151 +831,39 @@ unset_random_arp_entry (void)
 
 static int
 arp_unnumbered (vlib_buffer_t * p0,
-               u32 pi0, ethernet_header_t * eth0, u32 sw_if_index)
+               u32 input_sw_if_index, u32 conn_sw_if_index)
 {
-  vlib_main_t *vm = vlib_get_main ();
   vnet_main_t *vnm = vnet_get_main ();
   vnet_interface_main_t *vim = &vnm->interface_main;
   vnet_sw_interface_t *si;
-  vnet_hw_interface_t *hi;
-  u32 unnum_src_sw_if_index;
-  u32 *broadcast_swifs = 0;
-  u32 *buffers = 0;
-  u32 n_alloc = 0;
-  vlib_buffer_t *b0;
-  int i;
-  u8 dst_mac_address[6];
-  i16 header_size;
-  ethernet_arp_header_t *arp0;
 
-  /* Save the dst mac address */
-  clib_memcpy (dst_mac_address, eth0->dst_address, sizeof (dst_mac_address));
+  /* verify that the input interface is unnumbered to the connected.
+   * the connected interface is the interface on which the subnet is
+   * configured */
+  si = &vim->sw_interfaces[input_sw_if_index];
 
-  /* Figure out which sw_if_index supplied the address */
-  unnum_src_sw_if_index = sw_if_index;
-
-  /* Track down all users of the unnumbered source */
-  /* *INDENT-OFF* */
-  pool_foreach (si, vim->sw_interfaces,
-  ({
-    if (si->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED &&
-       (si->unnumbered_sw_if_index == unnum_src_sw_if_index))
-      {
-       vec_add1 (broadcast_swifs, si->sw_if_index);
-      }
-  }));
-  /* *INDENT-ON* */
-
-  /* If there are no interfaces un-unmbered to this interface,
-     we are done  here. */
-  if (0 == vec_len (broadcast_swifs))
-    return 0;
-
-  /* Allocate buffering if we need it */
-  if (vec_len (broadcast_swifs) > 1)
-    {
-      vec_validate (buffers, vec_len (broadcast_swifs) - 2);
-      n_alloc = vlib_buffer_alloc (vm, buffers, vec_len (buffers));
-      _vec_len (buffers) = n_alloc;
-      for (i = 0; i < n_alloc; i++)
-       {
-         b0 = vlib_get_buffer (vm, buffers[i]);
-
-         /* xerox (partially built) ARP pkt */
-         clib_memcpy (b0->data, p0->data,
-                      p0->current_length + p0->current_data);
-         b0->current_data = p0->current_data;
-         b0->current_length = p0->current_length;
-         vnet_buffer (b0)->sw_if_index[VLIB_RX] =
-           vnet_buffer (p0)->sw_if_index[VLIB_RX];
-       }
-    }
-
-  vec_insert (buffers, 1, 0);
-  buffers[0] = pi0;
-
-  for (i = 0; i < vec_len (buffers); i++)
+  if (!(si->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED &&
+       (si->unnumbered_sw_if_index == conn_sw_if_index)))
     {
-      b0 = vlib_get_buffer (vm, buffers[i]);
-      arp0 = vlib_buffer_get_current (b0);
-
-      hi = vnet_get_sup_hw_interface (vnm, broadcast_swifs[i]);
-      si = vnet_get_sw_interface (vnm, broadcast_swifs[i]);
-
-      /* For decoration, most likely */
-      vnet_buffer (b0)->sw_if_index[VLIB_TX] = hi->sw_if_index;
-
-      /* Fix ARP pkt src address */
-      clib_memcpy (arp0->ip4_over_ethernet[0].ethernet, hi->hw_address, 6);
-
-      /* Build L2 encaps for this swif */
-      header_size = sizeof (ethernet_header_t);
-      if (si->sub.eth.flags.one_tag)
-       header_size += 4;
-      else if (si->sub.eth.flags.two_tags)
-       header_size += 8;
-
-      vlib_buffer_advance (b0, -header_size);
-      eth0 = vlib_buffer_get_current (b0);
-
-      if (si->sub.eth.flags.one_tag)
-       {
-         ethernet_vlan_header_t *outer = (void *) (eth0 + 1);
-
-         eth0->type = si->sub.eth.flags.dot1ad ?
-           clib_host_to_net_u16 (ETHERNET_TYPE_DOT1AD) :
-           clib_host_to_net_u16 (ETHERNET_TYPE_VLAN);
-         outer->priority_cfi_and_id =
-           clib_host_to_net_u16 (si->sub.eth.outer_vlan_id);
-         outer->type = clib_host_to_net_u16 (ETHERNET_TYPE_ARP);
-
-       }
-      else if (si->sub.eth.flags.two_tags)
-       {
-         ethernet_vlan_header_t *outer = (void *) (eth0 + 1);
-         ethernet_vlan_header_t *inner = (void *) (outer + 1);
-
-         eth0->type = si->sub.eth.flags.dot1ad ?
-           clib_host_to_net_u16 (ETHERNET_TYPE_DOT1AD) :
-           clib_host_to_net_u16 (ETHERNET_TYPE_VLAN);
-         outer->priority_cfi_and_id =
-           clib_host_to_net_u16 (si->sub.eth.outer_vlan_id);
-         outer->type = clib_host_to_net_u16 (ETHERNET_TYPE_VLAN);
-         inner->priority_cfi_and_id =
-           clib_host_to_net_u16 (si->sub.eth.inner_vlan_id);
-         inner->type = clib_host_to_net_u16 (ETHERNET_TYPE_ARP);
-
-       }
-      else
-       {
-         eth0->type = clib_host_to_net_u16 (ETHERNET_TYPE_ARP);
-       }
-
-      /* Restore the original dst address, set src address */
-      clib_memcpy (eth0->dst_address, dst_mac_address,
-                  sizeof (eth0->dst_address));
-      clib_memcpy (eth0->src_address, hi->hw_address,
-                  sizeof (eth0->src_address));
-
-      /* Transmit replicas */
-      if (i > 0)
-       {
-         vlib_frame_t *f =
-           vlib_get_frame_to_node (vm, hi->output_node_index);
-         u32 *to_next = vlib_frame_vector_args (f);
-         to_next[0] = buffers[i];
-         f->n_vectors = 1;
-         vlib_put_frame_to_node (vm, hi->output_node_index, f);
-       }
+      /* the input interface is not unnumbered to the interface on which
+       * the sub-net is configured that covers the ARP request.
+       * So this is not the case for unnumbered.. */
+      return 0;
     }
 
-  /* The regular path outputs the original pkt.. */
-  vnet_buffer (p0)->sw_if_index[VLIB_TX] = broadcast_swifs[0];
+  return !0;
+}
 
-  vec_free (broadcast_swifs);
-  vec_free (buffers);
+static u32
+arp_learn (vnet_main_t * vnm,
+          ethernet_arp_main_t * am, u32 sw_if_index, void *addr)
+{
+  if (am->limit_arp_cache_size &&
+      pool_elts (am->ip4_entry_pool) >= am->limit_arp_cache_size)
+    unset_random_arp_entry ();
 
-  return !0;
+  vnet_arp_set_ip4_over_ethernet (vnm, sw_if_index, addr, 0, 0);
+  return (ETHERNET_ARP_ERROR_l3_src_address_learned);
 }
 
 static uword
@@ -999,14 +895,16 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
          vlib_buffer_t *p0;
          vnet_hw_interface_t *hw_if0;
          ethernet_arp_header_t *arp0;
-         ethernet_header_t *eth0;
+         ethernet_header_t *eth_rx, *eth_tx;
          ip4_address_t *if_addr0, proxy_src;
          u32 pi0, error0, next0, sw_if_index0, conn_sw_if_index0, fib_index0;
-         u8 is_request0, dst_is_local0, is_unnum0;
+         u8 is_request0, dst_is_local0, is_unnum0, is_vrrp_reply0;
          ethernet_proxy_arp_t *pa;
          fib_node_index_t dst_fei, src_fei;
          fib_prefix_t pfx0;
          fib_entry_flag_t src_flags, dst_flags;
+         ip_adjacency_t *adj0 = NULL;
+         adj_index_t ai;
 
          pi0 = from[0];
          to_next[0] = pi0;
@@ -1018,6 +916,8 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
 
          p0 = vlib_get_buffer (vm, pi0);
          arp0 = vlib_buffer_get_current (p0);
+         /* Fill in ethernet header. */
+         eth_rx = ethernet_buffer_get_header (p0);
 
          is_request0 = arp0->opcode
            == clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_request);
@@ -1056,94 +956,168 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
                                          32);
          dst_flags = fib_entry_get_flags (dst_fei);
 
-         src_fei = ip4_fib_table_lookup (ip4_fib_get (fib_index0),
-                                         &arp0->ip4_over_ethernet[0].ip4,
-                                         32);
-         src_flags = fib_entry_get_flags (src_fei);
-
          conn_sw_if_index0 = fib_entry_get_resolving_interface (dst_fei);
 
+         /* Honor unnumbered interface, if any */
+         is_unnum0 = sw_if_index0 != conn_sw_if_index0;
+
+         {
+           /*
+            * we're looking for FIB entries that indicate the source
+            * is attached. There may be more specific non-attached
+            * routes tht match the source, but these do not influence
+            * whether we respond to an ARP request, i.e. they do not
+            * influence whether we are the correct way for the sender
+            * to reach us, they only affect how we reach the sender.
+            */
+           fib_entry_t *src_fib_entry;
+           fib_entry_src_t *src;
+           fib_source_t source;
+           fib_prefix_t pfx;
+           int attached;
+           int mask;
+
+           mask = 32;
+           attached = 0;
+
+           do
+             {
+               src_fei = ip4_fib_table_lookup (ip4_fib_get (fib_index0),
+                                               &arp0->
+                                               ip4_over_ethernet[0].ip4,
+                                               mask);
+               src_fib_entry = fib_entry_get (src_fei);
+
+               /*
+                * It's possible that the source that provides the
+                * flags we need, or the flags we must not have,
+                * is not the best source, so check then all.
+                */
+                /* *INDENT-OFF* */
+                FOR_EACH_SRC_ADDED(src_fib_entry, src, source,
+                ({
+                  src_flags = fib_entry_get_flags_for_source (src_fei, source);
+
+                  /* Reject requests/replies with our local interface
+                     address. */
+                  if (FIB_ENTRY_FLAG_LOCAL & src_flags)
+                    {
+                      error0 = ETHERNET_ARP_ERROR_l3_src_address_is_local;
+                      goto drop2;
+                    }
+                  /* A Source must also be local to subnet of matching
+                   * interface address. */
+                  if ((FIB_ENTRY_FLAG_ATTACHED & src_flags) ||
+                      (FIB_ENTRY_FLAG_CONNECTED & src_flags))
+                    {
+                      attached = 1;
+                      break;
+                    }
+                  /*
+                   * else
+                   *  The packet was sent from an address that is not
+                   *  connected nor attached i.e. it is not from an
+                   *  address that is covered by a link's sub-net,
+                   *  nor is it a already learned host resp.
+                   */
+                }));
+                /* *INDENT-ON* */
+
+               /*
+                * shorter mask lookup for the next iteration.
+                */
+               fib_entry_get_prefix (src_fei, &pfx);
+               mask = pfx.fp_len - 1;
+
+               /*
+                * continue until we hit the default route or we find
+                * the attached we are looking for. The most likely
+                * outcome is we find the attached with the first source
+                * on the first lookup.
+                */
+             }
+           while (!attached &&
+                  !fib_entry_is_sourced (src_fei, FIB_SOURCE_DEFAULT_ROUTE));
+
+           if (!attached)
+             {
+               /*
+                * the matching route is a not attached, i.e. it was
+                * added as a result of routing, rather than interface/ARP
+                * configuration. If the matching route is not a host route
+                * (i.e. a /32)
+                */
+               error0 = ETHERNET_ARP_ERROR_l3_src_address_not_local;
+               goto drop2;
+             }
+         }
+
          if (!(FIB_ENTRY_FLAG_CONNECTED & dst_flags))
            {
              error0 = ETHERNET_ARP_ERROR_l3_dst_address_not_local;
              goto drop1;
            }
 
-         /* Honor unnumbered interface, if any */
-         is_unnum0 = sw_if_index0 != conn_sw_if_index0;
-
-         /* Source must also be local to subnet of matching interface address. */
-         if (!((FIB_ENTRY_FLAG_ATTACHED & src_flags) ||
-               (FIB_ENTRY_FLAG_CONNECTED & src_flags)))
-           {
-             /*
-              * The packet was sent from an address that is not connected nor attached
-              * i.e. it is not from an address that is covered by a link's sub-net,
-              * nor is it a already learned host resp.
-              */
-             error0 = ETHERNET_ARP_ERROR_l3_src_address_not_local;
-             goto drop2;
-           }
          if (sw_if_index0 != fib_entry_get_resolving_interface (src_fei))
            {
              /*
               * The interface the ARP was received on is not the interface
-              * on which the covering prefix is configured. Maybe this is a case
-              * for unnumbered.
+              * on which the covering prefix is configured. Maybe this is a
+              * case for unnumbered.
               */
              is_unnum0 = 1;
            }
 
-         /* Reject requests/replies with our local interface address. */
-         if (FIB_ENTRY_FLAG_LOCAL & src_flags)
-           {
-             error0 = ETHERNET_ARP_ERROR_l3_src_address_is_local;
-             goto drop2;
-           }
-
          dst_is_local0 = (FIB_ENTRY_FLAG_LOCAL & dst_flags);
          fib_entry_get_prefix (dst_fei, &pfx0);
          if_addr0 = &pfx0.fp_addr.ip4;
 
-         /* Fill in ethernet header. */
-         eth0 = ethernet_buffer_get_header (p0);
+         is_vrrp_reply0 =
+           ((arp0->opcode ==
+             clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_reply))
+            &&
+            (!memcmp
+             (arp0->ip4_over_ethernet[0].ethernet, vrrp_prefix,
+              sizeof (vrrp_prefix))));
 
          /* Trash ARP packets whose ARP-level source addresses do not
-            match their L2-frame-level source addresses */
-         if (memcmp (eth0->src_address, arp0->ip4_over_ethernet[0].ethernet,
-                     sizeof (eth0->src_address)))
+            match their L2-frame-level source addresses, unless it's
+            a reply from a VRRP virtual router */
+         if (memcmp
+             (eth_rx->src_address, arp0->ip4_over_ethernet[0].ethernet,
+              sizeof (eth_rx->src_address)) && !is_vrrp_reply0)
            {
              error0 = ETHERNET_ARP_ERROR_l2_address_mismatch;
              goto drop2;
            }
 
-         /* Learn or update sender's mapping only for requests or unicasts
-            that don't match local interface address. */
-         if (ethernet_address_cast (eth0->dst_address) ==
-             ETHERNET_ADDRESS_UNICAST || is_request0)
-           {
-             if (am->limit_arp_cache_size &&
-                 pool_elts (am->ip4_entry_pool) >= am->limit_arp_cache_size)
-               unset_random_arp_entry ();
-
-             vnet_arp_set_ip4_over_ethernet (vnm, sw_if_index0,
-                                             &arp0->ip4_over_ethernet[0],
-                                             0 /* is_static */ , 0);
-             error0 = ETHERNET_ARP_ERROR_l3_src_address_learned;
-           }
-
-         /* Only send a reply for requests sent which match a local interface. */
-         if (!(is_request0 && dst_is_local0))
+         /* Learn or update sender's mapping only for replies to addresses
+          * that are local to the subnet */
+         if (arp0->opcode ==
+             clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_reply) &&
+             dst_is_local0)
            {
-             error0 =
-               (arp0->opcode ==
-                clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_reply) ?
-                ETHERNET_ARP_ERROR_replies_received : error0);
+             error0 = arp_learn (vnm, am, sw_if_index0,
+                                 &arp0->ip4_over_ethernet[0]);
              goto drop1;
            }
 
          /* Send a reply. */
        send_reply:
+         ai = fib_entry_get_adj (src_fei);
+         if (ADJ_INDEX_INVALID != ai)
+           {
+             adj0 = adj_get (ai);
+           }
+         else
+           {
+             error0 = ETHERNET_ARP_ERROR_missing_interface_address;
+             goto drop2;
+           }
+         /* Figure out how much to rewind current data from adjacency. */
+         vlib_buffer_advance (p0, -adj0->rewrite_header.data_bytes);
+         eth_tx = vlib_buffer_get_current (p0);
+
          vnet_buffer (p0)->sw_if_index[VLIB_TX] = sw_if_index0;
          hw_if0 = vnet_get_sup_hw_interface (vnm, sw_if_index0);
 
@@ -1163,69 +1137,25 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
          /* Hardware must be ethernet-like. */
          ASSERT (vec_len (hw_if0->hw_address) == 6);
 
-         clib_memcpy (eth0->dst_address, eth0->src_address, 6);
-         clib_memcpy (eth0->src_address, hw_if0->hw_address, 6);
+         /* the rx nd tx ethernet headers wil overlap in the case
+          * when we received a tagged VLAN=0 packet, but we are sending
+          * back untagged */
+         memmove (eth_tx->dst_address, eth_rx->src_address, 6);
+         clib_memcpy (eth_tx->src_address, hw_if0->hw_address, 6);
 
-         /* Figure out how much to rewind current data from adjacency. */
-         /* get the adj from the destination's covering connected */
          if (NULL == pa)
            {
              if (is_unnum0)
                {
-                 if (!arp_unnumbered (p0, pi0, eth0, conn_sw_if_index0))
+                 if (!arp_unnumbered (p0, sw_if_index0, conn_sw_if_index0))
                    goto drop2;
                }
-             else
-               {
-                 ip_adjacency_t *adj0 = NULL;
-                 adj_index_t ai;
-
-                 if (FIB_ENTRY_FLAG_ATTACHED & src_flags)
-                   {
-                     /*
-                      * If the source is attached use the adj from that source.
-                      */
-                     ai = fib_entry_get_adj (src_fei);
-                     if (ADJ_INDEX_INVALID != ai)
-                       {
-                         adj0 = adj_get (ai);
-                       }
-                   }
-                 else
-                   {
-                     /*
-                      * Get the glean adj from the cover. This is presumably interface
-                      * sourced, and therefre needs to be a glean adj.
-                      */
-                     ai = fib_entry_get_adj_for_source
-                       (ip4_fib_table_lookup
-                        (ip4_fib_get (fib_index0),
-                         &arp0->ip4_over_ethernet[1].ip4, 31),
-                        FIB_SOURCE_INTERFACE);
-
-                     if (ADJ_INDEX_INVALID != ai)
-                       {
-                         adj0 = adj_get (ai);
-
-                         if (adj0->lookup_next_index == IP_LOOKUP_NEXT_GLEAN)
-                           {
-                             adj0 = NULL;
-                           }
-                       }
-                   }
-                 if (NULL != adj0)
-                   {
-                     vlib_buffer_advance (p0,
-                                          -adj0->rewrite_header.data_bytes);
-                   }
-                 else
-                   {
-                     error0 = ETHERNET_ARP_ERROR_missing_interface_address;
-                     goto drop2;
-                   }
-               }
            }
 
+         /* We are going to reply to this request, so learn the sender */
+         error0 = arp_learn (vnm, am, sw_if_index0,
+                             &arp0->ip4_over_ethernet[1]);
+
          vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
                                           n_left_to_next, pi0, next0);
 
@@ -1265,20 +1195,14 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
                if ((this_addr >= lo_addr && this_addr <= hi_addr) &&
                    (fib_index0 == pa->fib_index))
                  {
-                   eth0 = ethernet_buffer_get_header (p0);
                    proxy_src.as_u32 =
                      arp0->ip4_over_ethernet[1].ip4.data_u32;
 
                    /*
-                    * Rewind buffer, direct code above not to
-                    * think too hard about it.
+                    * change the interface address to the proxied
                     */
                    if_addr0 = &proxy_src;
                    is_unnum0 = 0;
-                   i32 ethernet_start =
-                     vnet_buffer (p0)->ethernet.start_of_ethernet_header;
-                   i32 rewind = p0->current_data - ethernet_start;
-                   vlib_buffer_advance (p0, -rewind);
                    n_proxy_arp_replies_sent++;
                    goto send_reply;
                  }
@@ -1681,9 +1605,24 @@ arp_entry_free (ethernet_arp_interface_t * eai, ethernet_arp_ip4_entry_t * e)
 {
   ethernet_arp_main_t *am = &ethernet_arp_main;
 
-  /* it's safe to delete the ADJ source on the FIB entry, even if it
-   * was added */
-  fib_table_entry_delete_index (e->fib_entry_index, FIB_SOURCE_ADJ);
+  if (FIB_NODE_INDEX_INVALID != e->fib_entry_index)
+    {
+      fib_prefix_t pfx = {
+       .fp_len = 32,
+       .fp_proto = FIB_PROTOCOL_IP4,
+       .fp_addr.ip4 = e->ip4_address,
+      };
+      u32 fib_index;
+
+      fib_index = ip4_fib_table_get_index_for_sw_if_index (e->sw_if_index);
+
+      fib_table_entry_path_remove (fib_index, &pfx,
+                                  FIB_SOURCE_ADJ,
+                                  FIB_PROTOCOL_IP4,
+                                  &pfx.fp_addr,
+                                  e->sw_if_index, ~0, 1,
+                                  FIB_ROUTE_PATH_FLAG_NONE);
+    }
   hash_unset (eai->arp_entries, e->ip4_address.as_u32);
   pool_put (am->ip4_entry_pool, e);
 }
@@ -1914,18 +1853,15 @@ vnet_proxy_arp_add_del (ip4_address_t * lo_addr,
 int
 vnet_proxy_arp_fib_reset (u32 fib_id)
 {
-  ip4_main_t *im = &ip4_main;
   ethernet_arp_main_t *am = &ethernet_arp_main;
   ethernet_proxy_arp_t *pa;
   u32 *entries_to_delete = 0;
   u32 fib_index;
-  uword *p;
   int i;
 
-  p = hash_get (im->fib_index_by_table_id, fib_id);
-  if (!p)
+  fib_index = fib_table_find (FIB_PROTOCOL_IP4, fib_id);
+  if (~0 == fib_index)
     return VNET_API_ERROR_NO_SUCH_ENTRY;
-  fib_index = p[0];
 
   vec_foreach (pa, am->proxy_arps)
   {
@@ -1984,11 +1920,10 @@ ip_arp_add_del_command_fn (vlib_main_t * vm,
 
       else if (unformat (input, "fib-id %d", &fib_id))
        {
-         ip4_main_t *im = &ip4_main;
-         uword *p = hash_get (im->fib_index_by_table_id, fib_id);
-         if (!p)
+         fib_index = fib_table_find (FIB_PROTOCOL_IP4, fib_id);
+
+         if (~0 == fib_index)
            return clib_error_return (0, "fib ID %d doesn't exist\n", fib_id);
-         fib_index = p[0];
        }
 
       else if (unformat (input, "proxy %U - %U",
@@ -2195,6 +2130,7 @@ arp_term_l2bd (vlib_main_t * vm,
          u16 bd_index0;
          u32 ip0;
          u8 *macp0;
+         u8 is_vrrp_reply0;
 
          pi0 = from[0];
          to_next[0] = pi0;
@@ -2243,12 +2179,20 @@ arp_term_l2bd (vlib_main_t * vm,
          if (error0)
            goto drop;
 
+         is_vrrp_reply0 =
+           ((arp0->opcode ==
+             clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_reply))
+            &&
+            (!memcmp
+             (arp0->ip4_over_ethernet[0].ethernet, vrrp_prefix,
+              sizeof (vrrp_prefix))));
+
          /* Trash ARP packets whose ARP-level source addresses do not
-            match their L2-frame-level source addresses  */
+            match their L2-frame-level source addresses, unless it's
+            a reply from a VRRP virtual router */
          if (PREDICT_FALSE
-             (memcmp
-              (eth0->src_address, arp0->ip4_over_ethernet[0].ethernet,
-               sizeof (eth0->src_address))))
+             (memcmp (eth0->src_address, arp0->ip4_over_ethernet[0].ethernet,
+                      sizeof (eth0->src_address)) && !is_vrrp_reply0))
            {
              error0 = ETHERNET_ARP_ERROR_l2_address_mismatch;
              goto drop;