Port glean neighbor entry support to IPv6

[vpp.git] / vnet / vnet / ip / lookup.c

diff --git a/vnet/vnet/ip/lookup.c b/vnet/vnet/ip/lookup.c
index 9e3cdc0..df14a5f 100644 (file)
--- a/vnet/vnet/ip/lookup.c
+++ b/vnet/vnet/ip/lookup.c
@@ -998,8 +998,8 @@ u8 * format_ip_adjacency (u8 * s, va_list * args)
        case IP_LOOKUP_NEXT_ARP:
          if (adj->if_address_index != ~0)
            s = format (s, " %U", format_ip_interface_address, lm, adj->if_address_index);
-         if (adj->arp.next_hop.ip4.as_u32)
-           s = format (s, " via %U", format_ip4_address, &adj->arp.next_hop.ip4.as_u32);
+         if (adj->arp.next_hop.ip6.as_u64[0] || adj->arp.next_hop.ip6.as_u64[1])
+           s = format (s, " via %U", format_ip46_address, &adj->arp.next_hop);
          break;
        case IP_LOOKUP_NEXT_LOCAL:
          if (adj->if_address_index != ~0)
@@ -1091,7 +1091,7 @@ static uword unformat_ip_adjacency (unformat_input_t * input, va_list * args)
 
   if (unformat (input, "arp %U %U",
                unformat_vnet_sw_interface, vnm, &sw_if_index,
-               unformat_ip46_address, &a46, is_ip6))
+               unformat_ip46_address, &a46, is_ip6?IP46_TYPE_IP6:IP46_TYPE_IP4))
     {
       ip_lookup_main_t * lm = is_ip6 ? &ip6_main.lookup_main : &ip4_main.lookup_main;
       ip_adjacency_t * a_adj;