#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;
}
*/
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);
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)
{
*/
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;
}