#include <vnet/ip/ip.h>
#include <vnet/ip/ip6.h>
#include <vnet/ethernet/ethernet.h>
-#include <vnet/ethernet/arp_packet.h>
+#include <vnet/ethernet/arp.h>
#include <vnet/l2/l2_input.h>
#include <vppinfra/mhash.h>
#include <vnet/fib/ip4_fib.h>
typedef struct
{
- u32 lo_addr;
- u32 hi_addr;
+ ip4_address_t lo_addr;
+ ip4_address_t hi_addr;
u32 fib_index;
} ethernet_proxy_arp_t;
flags = format (flags, "N");
s = format (s, "%=12U%=16U%=6s%=20U%U",
- format_vlib_cpu_time, vnm->vlib_main, e->cpu_time_last_updated,
+ format_vlib_time, vnm->vlib_main, e->time_last_updated,
format_ip4_address, &e->ip4_address,
flags ? (char *) flags : "",
format_ethernet_address, e->ethernet_address,
* Complete the remaining fields of the adj's rewrite to direct the
* complete of the rewrite at switch time by copying in the IP
* dst address's bytes.
- * Ofset is 2 bytes into the MAC desintation address. And we copy 23 bits
- * from the address.
+ * Ofset is 2 bytes into the MAC desintation address.
*/
- adj_mcast_update_rewrite (ai, rewrite, offset, 0x007fffff);
+ adj_mcast_update_rewrite (ai, rewrite, offset);
break;
}
fib_table_lock (fib_index, FIB_PROTOCOL_IP4, FIB_SOURCE_ADJ);
}
+void
+arp_adj_fib_remove (ethernet_arp_ip4_entry_t * e, u32 fib_index)
+{
+ 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,
+ DPO_PROTO_IP4,
+ &pfx.fp_addr,
+ e->sw_if_index, ~0, 1,
+ FIB_ROUTE_PATH_FLAG_NONE);
+ fib_table_unlock (fib_index, FIB_PROTOCOL_IP4, FIB_SOURCE_ADJ);
+ }
+}
+
+static ethernet_arp_ip4_entry_t *
+force_reuse_arp_entry (void)
+{
+ ethernet_arp_ip4_entry_t *e;
+ ethernet_arp_main_t *am = ðernet_arp_main;
+ u32 count = 0;
+ u32 index = pool_next_index (am->ip4_entry_pool, am->arp_delete_rotor);
+ if (index == ~0) /* Try again from elt 0 */
+ index = pool_next_index (am->ip4_entry_pool, index);
+
+ /* Find a non-static random entry to free up for reuse */
+ do
+ {
+ if ((count++ == 100) || (index == ~0))
+ return NULL; /* give up after 100 entries */
+ e = pool_elt_at_index (am->ip4_entry_pool, index);
+ am->arp_delete_rotor = index;
+ index = pool_next_index (am->ip4_entry_pool, index);
+ }
+ while (e->flags & ETHERNET_ARP_IP4_ENTRY_FLAG_STATIC);
+
+ /* Remove ARP entry from its interface and update fib */
+ hash_unset
+ (am->ethernet_arp_by_sw_if_index[e->sw_if_index].arp_entries,
+ e->ip4_address.as_u32);
+ arp_adj_fib_remove
+ (e, ip4_fib_table_get_index_for_sw_if_index (e->sw_if_index));
+ adj_nbr_walk_nh4 (e->sw_if_index,
+ &e->ip4_address, arp_mk_incomplete_walk, NULL);
+ return e;
+}
+
static int
vnet_arp_set_ip4_over_ethernet_internal (vnet_main_t * vnm,
vnet_arp_set_ip4_over_ethernet_rpc_args_t
if (make_new_arp_cache_entry)
{
- pool_get (am->ip4_entry_pool, e);
-
- if (NULL == arp_int->arp_entries)
+ if (am->limit_arp_cache_size &&
+ pool_elts (am->ip4_entry_pool) >= am->limit_arp_cache_size)
{
- arp_int->arp_entries = hash_create (0, sizeof (u32));
+ e = force_reuse_arp_entry ();
+ if (NULL == e)
+ return -2;
}
+ else
+ pool_get (am->ip4_entry_pool, e);
+
+ if (NULL == arp_int->arp_entries)
+ arp_int->arp_entries = hash_create (0, sizeof (u32));
hash_set (arp_int->arp_entries, a->ip4.as_u32, e - am->ip4_entry_pool);
*/
if (0 == memcmp (e->ethernet_address,
a->ethernet, sizeof (e->ethernet_address)))
- goto check_customers;
+ {
+ e->time_last_updated = vlib_time_now (vm);
+ goto check_customers;
+ }
/* Update time stamp and ethernet address. */
clib_memcpy (e->ethernet_address, a->ethernet,
sizeof (e->ethernet_address));
}
- e->cpu_time_last_updated = clib_cpu_time_now ();
+ e->time_last_updated = vlib_time_now (vm);
if (is_static)
- e->flags |= ETHERNET_ARP_IP4_ENTRY_FLAG_STATIC;
+ {
+ e->flags &= ~ETHERNET_ARP_IP4_ENTRY_FLAG_DYNAMIC;
+ e->flags |= ETHERNET_ARP_IP4_ENTRY_FLAG_STATIC;
+ }
else
- e->flags |= ETHERNET_ARP_IP4_ENTRY_FLAG_DYNAMIC;
+ {
+ e->flags &= ~ETHERNET_ARP_IP4_ENTRY_FLAG_STATIC;
+ e->flags |= ETHERNET_ARP_IP4_ENTRY_FLAG_DYNAMIC;
+ }
adj_nbr_walk_nh4 (sw_if_index, &e->ip4_address, arp_mk_complete_walk, e);
ETHERNET_ARP_N_ERROR,
} ethernet_arp_input_error_t;
-
-static void
-unset_random_arp_entry (void)
-{
- ethernet_arp_main_t *am = ðernet_arp_main;
- ethernet_arp_ip4_entry_t *e;
- vnet_main_t *vnm = vnet_get_main ();
- ethernet_arp_ip4_over_ethernet_address_t delme;
- u32 index;
-
- index = pool_next_index (am->ip4_entry_pool, am->arp_delete_rotor);
- am->arp_delete_rotor = index;
-
- /* Try again from elt 0, could happen if an intfc goes down */
- if (index == ~0)
- {
- index = pool_next_index (am->ip4_entry_pool, am->arp_delete_rotor);
- am->arp_delete_rotor = index;
- }
-
- /* Nothing left in the pool */
- if (index == ~0)
- return;
-
- e = pool_elt_at_index (am->ip4_entry_pool, index);
-
- clib_memcpy (&delme.ethernet, e->ethernet_address, 6);
- delme.ip4.as_u32 = e->ip4_address.as_u32;
-
- vnet_arp_unset_ip4_over_ethernet (vnm, e->sw_if_index, &delme);
-}
-
static int
arp_unnumbered (vlib_buffer_t * p0,
u32 input_sw_if_index, u32 conn_sw_if_index)
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 ();
-
vnet_arp_set_ip4_over_ethernet (vnm, sw_if_index, addr, 0, 0);
return (ETHERNET_ARP_ERROR_l3_src_address_learned);
}
vec_foreach (pa, am->proxy_arps)
{
- u32 lo_addr = clib_net_to_host_u32 (pa->lo_addr);
- u32 hi_addr = clib_net_to_host_u32 (pa->hi_addr);
+ u32 lo_addr = clib_net_to_host_u32 (pa->lo_addr.as_u32);
+ u32 hi_addr = clib_net_to_host_u32 (pa->hi_addr.as_u32);
/* an ARP request hit in the proxy-arp table? */
if ((this_addr >= lo_addr && this_addr <= hi_addr) &&
return cmp;
}
+ethernet_arp_ip4_entry_t *
+ip4_neighbors_pool (void)
+{
+ ethernet_arp_main_t *am = ðernet_arp_main;
+ return am->ip4_entry_pool;
+}
+
ethernet_arp_ip4_entry_t *
ip4_neighbor_entries (u32 sw_if_index)
{
}
}
-void
-arp_adj_fib_remove (ethernet_arp_ip4_entry_t * e, u32 fib_index)
-{
- 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,
- DPO_PROTO_IP4,
- &pfx.fp_addr,
- e->sw_if_index, ~0, 1,
- FIB_ROUTE_PATH_FLAG_NONE);
- fib_table_unlock (fib_index, FIB_PROTOCOL_IP4, FIB_SOURCE_ADJ);
- }
-}
-
static void
arp_table_bind (ip4_main_t * im,
uword opaque,
{
ethernet_arp_main_t *am = ðernet_arp_main;
- arp_adj_fib_remove (e,
- ip4_fib_table_get_index_for_sw_if_index
- (e->sw_if_index));
+ arp_adj_fib_remove
+ (e, ip4_fib_table_get_index_for_sw_if_index (e->sw_if_index));
hash_unset (eai->arp_entries, e->ip4_address.as_u32);
pool_put (am->ip4_entry_pool, e);
}
if (NULL != e)
{
- arp_entry_free (eai, e);
-
adj_nbr_walk_nh4 (e->sw_if_index,
&e->ip4_address, arp_mk_incomplete_walk, NULL);
+ arp_entry_free (eai, e);
}
return 0;
*/
if (e->flags & ETHERNET_ARP_IP4_ENTRY_FLAG_STATIC)
{
- e->flags &= ETHERNET_ARP_IP4_ENTRY_FLAG_DYNAMIC;
+ e->flags &= ~ETHERNET_ARP_IP4_ENTRY_FLAG_DYNAMIC;
}
else if (e->flags & ETHERNET_ARP_IP4_ENTRY_FLAG_DYNAMIC)
{
return 0;
}
+void
+proxy_arp_walk (proxy_arp_walk_t cb, void *data)
+{
+ ethernet_arp_main_t *am = ðernet_arp_main;
+ ethernet_proxy_arp_t *pa;
+
+ vec_foreach (pa, am->proxy_arps)
+ {
+ if (!cb (&pa->lo_addr, &pa->hi_addr, pa->fib_index, data))
+ break;
+ }
+}
+
int
vnet_proxy_arp_add_del (ip4_address_t * lo_addr,
ip4_address_t * hi_addr, u32 fib_index, int is_del)
vec_foreach (pa, am->proxy_arps)
{
- if (pa->lo_addr == lo_addr->as_u32
- && pa->hi_addr == hi_addr->as_u32 && pa->fib_index == fib_index)
+ if (pa->lo_addr.as_u32 == lo_addr->as_u32 &&
+ pa->hi_addr.as_u32 == hi_addr->as_u32 && pa->fib_index == fib_index)
{
found_at_index = pa - am->proxy_arps;
break;
/* add, not in table */
vec_add2 (am->proxy_arps, pa, 1);
- pa->lo_addr = lo_addr->as_u32;
- pa->hi_addr = hi_addr->as_u32;
+ pa->lo_addr.as_u32 = lo_addr->as_u32;
+ pa->hi_addr.as_u32 = hi_addr->as_u32;
pa->fib_index = fib_index;
return 0;
}