diff options
| author |   Neale Ranns <nranns@cisco.com> | 2018-08-10 05:30:06 -0700 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-01-30 19:47:53 +0000 |
| commit | 37029305c671f4e2d091d6f6c22142634e409043 (patch) | |
| tree | f47257c77b860213fcd1901686874dee43ad1f73 /src/plugins | |
| parent | 13b2ba2ad5527c8185dce368993a3877e7daf7a2 (diff) | |
Use IP and MAC API types for neighbors
use address_t and mac_address_t for IPv6 and ARP entries
and all other API calls in ip.api aprat from the route ones,
that will follow in a separate commit
Change-Id: I67161737c2184d3f8fc1e79ebd2b55121c5b0191
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/gbp/gbp_endpoint.c | 2 | ||||
| -rw-r--r-- | src/plugins/mactime/mactime.c | 3 | ||||
| -rw-r--r-- | src/plugins/mactime/mactime.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/gbp/gbp_endpoint.c b/src/plugins/gbp/gbp_endpoint.c index 0746b70d57f..f32a8820238 100644 --- a/src/plugins/gbp/gbp_endpoint.c +++ b/src/plugins/gbp/gbp_endpoint.c @@ -111,7 +111,7 @@ static void gbp_endpoint_extract_key_mac_itf (const clib_bihash_kv_16_8_t * key, mac_address_t * mac, u32 * sw_if_index) { - mac_address_from_u64 (key->key[0], mac); + mac_address_from_u64 (mac, key->key[0]); *sw_if_index = key->key[1]; } diff --git a/src/plugins/mactime/mactime.c b/src/plugins/mactime/mactime.c index 837b317027d..572b913ba07 100644 --- a/src/plugins/mactime/mactime.c +++ b/src/plugins/mactime/mactime.c @@ -553,8 +553,7 @@ show_mactime_command_fn (vlib_main_t * vm, for (j = 0; j < vec_len (mm->arp_cache_copy); j++) { n = mm->arp_cache_copy + j; - if (!memcmp (dp->mac_address, n->ethernet_address, - sizeof (n->ethernet_address))) + if (!memcmp (dp->mac_address, n->mac.bytes, sizeof (n->mac))) { vlib_cli_output (vm, "%17s%U", " ", format_ip4_address, &n->ip4_address); diff --git a/src/plugins/mactime/mactime.h b/src/plugins/mactime/mactime.h index 1a13e41f606..8d4165212a4 100644 --- a/src/plugins/mactime/mactime.h +++ b/src/plugins/mactime/mactime.h @@ -21,7 +21,7 @@ #include <vnet/vnet.h> #include <vnet/ip/ip.h> #include <vnet/ethernet/ethernet.h> -#include <vnet/ethernet/arp_packet.h> +#include <vnet/ethernet/arp.h> #include <vlib/counter.h> #include <vppinfra/hash.h> |