X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fethernet%2Farp.c;h=275d606266b16a83dac66d078fc3151b140b8438;hb=3b81a1e5f205482b8ea30edbfd39559c4368ac4d;hp=da56c2b64cc42ef91afa6f1c5adb84cb3c67191d;hpb=8b30e471df4d42214619e1d6c50cc8298426b45f;p=vpp.git diff --git a/src/vnet/ethernet/arp.c b/src/vnet/ethernet/arp.c index da56c2b64cc..275d606266b 100644 --- a/src/vnet/ethernet/arp.c +++ b/src/vnet/ethernet/arp.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include @@ -26,6 +26,7 @@ #include #include #include +#include /** * @file @@ -52,8 +53,8 @@ typedef struct ethernet_arp_interface_t_ 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; @@ -269,7 +270,7 @@ format_ethernet_arp_ip4_entry (u8 * s, va_list * va) 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, @@ -352,6 +353,8 @@ arp_nbr_probe (ip_adjacency_t * adj) h = vlib_packet_template_get_packet (vm, &im->ip4_arp_request_packet_template, &bi); + if (!h) + return; hi = vnet_get_sup_hw_interface (vnm, adj->rewrite_header.sw_if_index); @@ -490,6 +493,15 @@ arp_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai) arp_nbr_probe (adj); } break; + case IP_LOOKUP_NEXT_BCAST: + adj_nbr_update_rewrite (ai, + ADJ_NBR_REWRITE_FLAG_COMPLETE, + ethernet_build_rewrite + (vnm, + sw_if_index, + VNET_LINK_IP4, + VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST)); + break; case IP_LOOKUP_NEXT_MCAST: { /* @@ -508,10 +520,9 @@ arp_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai) * 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; } @@ -546,6 +557,62 @@ arp_adj_fib_add (ethernet_arp_ip4_entry_t * e, u32 fib_index) 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 @@ -576,19 +643,31 @@ vnet_arp_set_ip4_over_ethernet_internal (vnet_main_t * vnm, /* Refuse to over-write static arp. */ if (!is_static && (e->flags & ETHERNET_ARP_IP4_ENTRY_FLAG_STATIC)) - return -2; + { + /* if MAC address match, still check to send event */ + if (0 == memcmp (e->ethernet_address, + a->ethernet, sizeof (e->ethernet_address))) + goto check_customers; + return -2; + } make_new_arp_cache_entry = 0; } } 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); @@ -617,18 +696,28 @@ vnet_arp_set_ip4_over_ethernet_internal (vnet_main_t * vnm, */ 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. */ + /* Update ethernet address. */ clib_memcpy (e->ethernet_address, a->ethernet, sizeof (e->ethernet_address)); } - e->cpu_time_last_updated = clib_cpu_time_now (); + /* Update time stamp and flags. */ + 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); @@ -794,6 +883,7 @@ typedef enum _ (l3_type_not_ip4, "L3 type not IP4") \ _ (l3_src_address_not_local, "IP4 source address not local to subnet") \ _ (l3_dst_address_not_local, "IP4 destination address not local to subnet") \ + _ (l3_dst_address_unset, "IP4 destination address is unset") \ _ (l3_src_address_is_local, "IP4 source address matches local interface") \ _ (l3_src_address_learned, "ARP request IP4 source address learned") \ _ (replies_received, "ARP replies received") \ @@ -812,38 +902,6 @@ typedef enum 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) @@ -873,10 +931,6 @@ 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 (); - vnet_arp_set_ip4_over_ethernet (vnm, sw_if_index, addr, 0, 0); return (ETHERNET_ARP_ERROR_l3_src_address_learned); } @@ -911,12 +965,13 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) vnet_hw_interface_t *hw_if0; ethernet_arp_header_t *arp0; ethernet_header_t *eth_rx, *eth_tx; - ip4_address_t *if_addr0, proxy_src; + const ip4_address_t *if_addr0; + ip4_address_t proxy_src; u32 pi0, error0, next0, sw_if_index0, conn_sw_if_index0, fib_index0; 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; + const fib_prefix_t *pfx0; fib_entry_flag_t src_flags, dst_flags; u8 *rewrite0, rewrite0_len; @@ -946,6 +1001,9 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) (arp0->l3_type != clib_net_to_host_u16 (ETHERNET_TYPE_IP4) ? ETHERNET_ARP_ERROR_l3_type_not_ip4 : error0); + error0 = + (0 == arp0->ip4_over_ethernet[0].ip4.as_u32 ? + ETHERNET_ARP_ERROR_l3_dst_address_unset : error0); sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX]; @@ -979,15 +1037,15 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) /* * 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 + * routes that 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; + const fib_prefix_t *pfx; fib_entry_src_t *src; fib_source_t source; - fib_prefix_t pfx; int attached; int mask; @@ -1050,8 +1108,8 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) /* * shorter mask lookup for the next iteration. */ - fib_entry_get_prefix (src_fei, &pfx); - mask = pfx.fp_len - 1; + pfx = fib_entry_get_prefix (src_fei); + mask = pfx->fp_len - 1; /* * continue until we hit the default route or we find @@ -1076,7 +1134,23 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) } } - if (!(FIB_ENTRY_FLAG_CONNECTED & dst_flags)) + if (fib_entry_is_sourced (dst_fei, FIB_SOURCE_ADJ)) + { + /* + * We matched an adj-fib on ths source subnet (a /32 previously + * added as a result of ARP). If this request is a gratuitous + * ARP, then learn from it. + * The check for matching an adj-fib, is to prevent hosts + * from spamming us with gratuitous ARPS that might otherwise + * blow our ARP cache + */ + if (arp0->ip4_over_ethernet[0].ip4.as_u32 == + arp0->ip4_over_ethernet[1].ip4.as_u32) + error0 = arp_learn (vnm, am, sw_if_index0, + &arp0->ip4_over_ethernet[0]); + goto drop2; + } + else if (!(FIB_ENTRY_FLAG_CONNECTED & dst_flags)) { error0 = ETHERNET_ARP_ERROR_l3_dst_address_not_local; goto drop1; @@ -1093,8 +1167,8 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) } dst_is_local0 = (FIB_ENTRY_FLAG_LOCAL & dst_flags); - fib_entry_get_prefix (dst_fei, &pfx0); - if_addr0 = &pfx0.fp_addr.ip4; + pfx0 = fib_entry_get_prefix (dst_fei); + if_addr0 = &pfx0->fp_addr.ip4; is_vrrp_reply0 = ((arp0->opcode == @@ -1118,11 +1192,17 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) /* 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) + clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_reply)) { - error0 = arp_learn (vnm, am, sw_if_index0, - &arp0->ip4_over_ethernet[0]); + if (dst_is_local0) + error0 = arp_learn (vnm, am, sw_if_index0, + &arp0->ip4_over_ethernet[0]); + else + /* a reply for a non-local destination could be a GARP. + * GARPs for hosts we know were handled above, so this one + * we drop */ + error0 = ETHERNET_ARP_ERROR_l3_dst_address_not_local; + goto drop1; } else if (arp0->opcode == @@ -1193,9 +1273,8 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) continue; drop1: - if (0 == arp0->ip4_over_ethernet[0].ip4.as_u32 || - (arp0->ip4_over_ethernet[0].ip4.as_u32 == - arp0->ip4_over_ethernet[1].ip4.as_u32)) + if (arp0->ip4_over_ethernet[0].ip4.as_u32 == + arp0->ip4_over_ethernet[1].ip4.as_u32) { error0 = ETHERNET_ARP_ERROR_gratuitous_arp; goto drop2; @@ -1218,8 +1297,8 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) 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) && @@ -1300,6 +1379,13 @@ ip4_arp_entry_sort (void *a1, void *a2) 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) { @@ -1626,30 +1712,6 @@ arp_add_del_interface_address (ip4_main_t * im, } } -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, @@ -1746,9 +1808,8 @@ arp_entry_free (ethernet_arp_interface_t * eai, ethernet_arp_ip4_entry_t * e) { 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); } @@ -1771,10 +1832,9 @@ vnet_arp_unset_ip4_over_ethernet_internal (vnet_main_t * vnm, 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; @@ -1810,7 +1870,7 @@ vnet_arp_flush_ip4_over_ethernet_internal (vnet_main_t * vnm, */ 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) { @@ -1948,6 +2008,19 @@ vnet_arp_set_ip4_over_ethernet (vnet_main_t * vnm, 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) @@ -1958,8 +2031,8 @@ vnet_proxy_arp_add_del (ip4_address_t * lo_addr, 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; @@ -1979,8 +2052,8 @@ vnet_proxy_arp_add_del (ip4_address_t * lo_addr, /* 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; } @@ -2269,7 +2342,6 @@ 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; @@ -2288,13 +2360,16 @@ arp_term_l2bd (vlib_main_t * vm, ethertype0 = clib_net_to_host_u16 (*(u16 *) (l3h0 - 2)); arp0 = (ethernet_arp_header_t *) l3h0; - if (PREDICT_FALSE ((ethertype0 != ETHERNET_TYPE_ARP) || - (arp0->opcode != - clib_host_to_net_u16 - (ETHERNET_ARP_OPCODE_request)))) + if (ethertype0 != ETHERNET_TYPE_ARP) goto check_ip6_nd; - /* Must be ARP request packet here */ + if ((arp0->opcode != + clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_request)) && + (arp0->opcode != + clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_reply))) + goto check_ip6_nd; + + /* Must be ARP request/reply packet here */ if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) && (p0->flags & VLIB_BUFFER_IS_TRACED))) { @@ -2303,7 +2378,7 @@ arp_term_l2bd (vlib_main_t * vm, clib_memcpy (t0, l3h0, sizeof (ethernet_arp_input_trace_t)); } - error0 = ETHERNET_ARP_ERROR_replies_sent; + error0 = 0; error0 = (arp0->l2_type != clib_net_to_host_u16 (ETHERNET_ARP_HARDWARE_TYPE_ethernet) @@ -2318,22 +2393,25 @@ 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, unless it's - a reply from a VRRP virtual router */ + match, or if requester address is mcast */ if (PREDICT_FALSE (memcmp (eth0->src_address, arp0->ip4_over_ethernet[0].ethernet, - sizeof (eth0->src_address)) && !is_vrrp_reply0)) + sizeof (eth0->src_address)) || + ethernet_address_cast (arp0->ip4_over_ethernet[0].ethernet))) { - error0 = ETHERNET_ARP_ERROR_l2_address_mismatch; + /* VRRP virtual MAC may be different to SMAC in ARP reply */ + if (memcmp (arp0->ip4_over_ethernet[0].ethernet, vrrp_prefix, + sizeof (vrrp_prefix))) + { + error0 = ETHERNET_ARP_ERROR_l2_address_mismatch; + goto drop; + } + } + if (PREDICT_FALSE + (ip4_address_is_multicast (&arp0->ip4_over_ethernet[0].ip4))) + { + error0 = ETHERNET_ARP_ERROR_l3_src_address_not_local; goto drop; } @@ -2482,6 +2560,7 @@ ethernet_arp_change_mac (u32 sw_if_index) { ethernet_arp_main_t *am = ðernet_arp_main; ethernet_arp_ip4_entry_t *e; + adj_index_t ai; /* *INDENT-OFF* */ pool_foreach (e, am->ip4_entry_pool, @@ -2490,16 +2569,30 @@ ethernet_arp_change_mac (u32 sw_if_index) })); /* *INDENT-ON* */ - adj_glean_update_rewrite (adj_glean_get (FIB_PROTOCOL_IP4, sw_if_index)); + ai = adj_glean_get (FIB_PROTOCOL_IP4, sw_if_index); + + if (ADJ_INDEX_INVALID != ai) + adj_glean_update_rewrite (ai); } void -send_ip4_garp (vlib_main_t * vm, vnet_hw_interface_t * hi) +send_ip4_garp (vlib_main_t * vm, u32 sw_if_index) { ip4_main_t *i4m = &ip4_main; - u32 sw_if_index = hi->sw_if_index; ip4_address_t *ip4_addr = ip4_interface_first_address (i4m, sw_if_index, 0); + send_ip4_garp_w_addr (vm, ip4_addr, sw_if_index); +} + +void +send_ip4_garp_w_addr (vlib_main_t * vm, + const ip4_address_t * ip4_addr, u32 sw_if_index) +{ + ip4_main_t *i4m = &ip4_main; + vnet_main_t *vnm = vnet_get_main (); + u8 *rewrite, rewrite_len; + vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (vnm, sw_if_index); + if (ip4_addr) { clib_warning ("Sending GARP for IP4 address %U on sw_if_idex %d", @@ -2511,6 +2604,10 @@ send_ip4_garp (vlib_main_t * vm, vnet_hw_interface_t * hi) u32 bi = 0; ethernet_arp_header_t *h = vlib_packet_template_get_packet (vm, &i4m->ip4_arp_request_packet_template, &bi); + + if (!h) + return; + clib_memcpy (h->ip4_over_ethernet[0].ethernet, hi->hw_address, sizeof (h->ip4_over_ethernet[0].ethernet)); clib_memcpy (h->ip4_over_ethernet[1].ethernet, hi->hw_address, @@ -2520,11 +2617,14 @@ send_ip4_garp (vlib_main_t * vm, vnet_hw_interface_t * hi) /* Setup MAC header with ARP Etype and broadcast DMAC */ vlib_buffer_t *b = vlib_get_buffer (vm, bi); - vlib_buffer_advance (b, -sizeof (ethernet_header_t)); + rewrite = + ethernet_build_rewrite (vnm, sw_if_index, VNET_LINK_ARP, + VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST); + rewrite_len = vec_len (rewrite); + vlib_buffer_advance (b, -rewrite_len); ethernet_header_t *e = vlib_buffer_get_current (b); - e->type = clib_host_to_net_u16 (ETHERNET_TYPE_ARP); - clib_memcpy (e->src_address, hi->hw_address, sizeof (e->src_address)); - memset (e->dst_address, 0xff, sizeof (e->dst_address)); + clib_memcpy (e->dst_address, rewrite, rewrite_len); + vec_free (rewrite); /* Send GARP packet out the specified interface */ vnet_buffer (b)->sw_if_index[VLIB_RX] =