#include <vnet/feature/feature.h>
always_inline u64
-ethernet_mac_address_u64 (u8 * a)
+ethernet_mac_address_u64 (const u8 * a)
{
return (((u64) a[0] << (u64) (5 * 8))
| ((u64) a[1] << (u64) (4 * 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)
{
}
static inline int
-ethernet_mac_address_is_zero (u8 * mac)
+ethernet_mac_address_is_zero (const u8 * mac)
{
return ((*((u32 *) mac) == 0) && (*((u16 *) (mac + 4)) == 0));
}
void ethernet_register_l3_redirect (vlib_main_t * vm, u32 node_index);
/* Formats ethernet address X:X:X:X:X:X */
+u8 *format_mac_address (u8 * s, va_list * args);
u8 *format_ethernet_address (u8 * s, va_list * args);
u8 *format_ethernet_type (u8 * s, va_list * args);
u8 *format_ethernet_vlan_tci (u8 * s, va_list * va);
/* Parse ethernet address in either X:X:X:X:X:X unix or X.X.X cisco format. */
uword unformat_ethernet_address (unformat_input_t * input, va_list * args);
+uword unformat_mac_address (unformat_input_t * input, va_list * args);
/* Parse ethernet type as 0xXXXX or type name from ethernet/types.def.
In either host or network byte order. */
if ((subint->flags & match_flags) == match_flags)
goto matched;
- // check for untagged interface
- subint = &main_intf->untagged_subint;
+ // check for default interface
+ subint = &main_intf->default_subint;
if ((subint->flags & match_flags) == match_flags)
goto matched;
- // check for default interface
- subint = &main_intf->default_subint;
+ // check for untagged interface
+ subint = &main_intf->untagged_subint;
if ((subint->flags & match_flags) == match_flags)
goto matched;
// Compare two ethernet macs. Return 1 if they are the same, 0 if different
always_inline u32
-eth_mac_equal (u8 * mac1, u8 * mac2)
+eth_mac_equal (const u8 * mac1, const u8 * mac2)
{
return (*((u32 *) (mac1 + 0)) == *((u32 *) (mac2 + 0)) &&
*((u32 *) (mac1 + 2)) == *((u32 *) (mac2 + 2)));