summaryrefslogtreecommitdiffstats
path: root/src/vnet/ethernet/mac_address.h
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2018-08-10 05:30:06 -0700
committerDamjan Marion <dmarion@me.com>2019-01-30 19:47:53 +0000
commit37029305c671f4e2d091d6f6c22142634e409043 (patch)
treef47257c77b860213fcd1901686874dee43ad1f73 /src/vnet/ethernet/mac_address.h
parent13b2ba2ad5527c8185dce368993a3877e7daf7a2 (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/vnet/ethernet/mac_address.h')
-rw-r--r--src/vnet/ethernet/mac_address.h68
1 files changed, 64 insertions, 4 deletions
diff --git a/src/vnet/ethernet/mac_address.h b/src/vnet/ethernet/mac_address.h
index e89fb6516a0..87a66a242be 100644
--- a/src/vnet/ethernet/mac_address.h
+++ b/src/vnet/ethernet/mac_address.h
@@ -16,7 +16,7 @@
#ifndef __MAC_ADDRESS_H__
#define __MAC_ADDRESS_H__
-#include <vnet/ethernet/ethernet.h>
+#include <vlib/vlib.h>
typedef struct mac_address_t_
{
@@ -36,18 +36,59 @@ STATIC_ASSERT ((sizeof (mac_address_t) == 6),
extern const mac_address_t ZERO_MAC_ADDRESS;
+always_inline u64
+ethernet_mac_address_u64 (const u8 * a)
+{
+ return (((u64) a[0] << (u64) (5 * 8))
+ | ((u64) a[1] << (u64) (4 * 8))
+ | ((u64) a[2] << (u64) (3 * 8))
+ | ((u64) a[3] << (u64) (2 * 8))
+ | ((u64) a[4] << (u64) (1 * 8)) | ((u64) a[5] << (u64) (0 * 8)));
+}
+
+always_inline void
+ethernet_mac_address_from_u64 (u64 u, u8 * a)
+{
+ i8 ii;
+
+ for (ii = 5; ii >= 0; ii--)
+ {
+ a[ii] = u & 0xFF;
+ u = u >> 8;
+ }
+}
+
+static inline int
+ethernet_mac_address_is_multicast_u64 (u64 a)
+{
+ return (a & (1ULL << (5 * 8))) != 0;
+}
+
+static inline int
+ethernet_mac_address_is_zero (const u8 * mac)
+{
+ return ((*((u32 *) mac) == 0) && (*((u16 *) (mac + 4)) == 0));
+}
+
+static inline int
+ethernet_mac_address_equal (const u8 * a, const u8 * b)
+{
+ return ((*((u32 *) a) == (*((u32 *) b))) &&
+ (*((u16 *) (a + 4)) == (*((u16 *) (b + 4)))));
+}
+
static_always_inline void
mac_address_from_bytes (mac_address_t * mac, const u8 * bytes)
{
/* zero out the last 2 bytes, then copy over only 6 */
- clib_memcpy (mac->bytes, bytes, 6);
+ clib_memcpy_fast (mac->bytes, bytes, 6);
}
static_always_inline void
mac_address_to_bytes (const mac_address_t * mac, u8 * bytes)
{
/* zero out the last 2 bytes, then copy over only 6 */
- clib_memcpy (bytes, mac->bytes, 6);
+ clib_memcpy_fast (bytes, mac->bytes, 6);
}
static_always_inline int
@@ -67,7 +108,7 @@ mac_address_as_u64 (const mac_address_t * mac)
}
static_always_inline void
-mac_address_from_u64 (u64 u, mac_address_t * mac)
+mac_address_from_u64 (mac_address_t * mac, u64 u)
{
clib_memcpy (mac->bytes, &u, 6);
}
@@ -78,6 +119,25 @@ mac_address_copy (mac_address_t * dst, const mac_address_t * src)
mac_address_from_bytes (dst, src->bytes);
}
+static_always_inline int
+mac_address_cmp (const mac_address_t * a, const mac_address_t * b)
+{
+ return (memcmp (a->bytes, b->bytes, 6));
+}
+
+static_always_inline int
+mac_address_equal (const mac_address_t * a, const mac_address_t * b)
+{
+ return (a->u.last_2 == b->u.last_2 && a->u.first_4 == b->u.first_4);
+}
+
+static_always_inline void
+mac_address_set_zero (mac_address_t * mac)
+{
+ mac->u.first_4 = 0;
+ mac->u.last_2 = 0;
+}
+
extern uword unformat_mac_address_t (unformat_input_t * input,
va_list * args);
extern u8 *format_mac_address_t (u8 * s, va_list * args);