aboutsummaryrefslogtreecommitdiffstats
path: root/src/vnet/ethernet
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2018-11-02 09:14:01 -0700
committerDamjan Marion <dmarion@me.com>2018-11-05 12:29:53 +0000
commit86327be9751ad54cb24d16c161cacb001dc20772 (patch)
treee9afa974edc516244805f1d0296909920dc8d49f /src/vnet/ethernet
parent871bca9aa7a850c66228ce7124d459a6e6f21e72 (diff)
Genric API types format/unformat support for VAT and custom dump
Change-Id: I8bc3a991f0ede0605d78b51ba609fbe5889513f2 Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/ethernet')
-rw-r--r--src/vnet/ethernet/ethernet_types_api.c8
-rw-r--r--src/vnet/ethernet/ethernet_types_api.h2
-rw-r--r--src/vnet/ethernet/mac_address.c22
-rw-r--r--src/vnet/ethernet/mac_address.h2
4 files changed, 21 insertions, 13 deletions
diff --git a/src/vnet/ethernet/ethernet_types_api.c b/src/vnet/ethernet/ethernet_types_api.c
index 9b2e99a6371..67e6231cfc8 100644
--- a/src/vnet/ethernet/ethernet_types_api.c
+++ b/src/vnet/ethernet/ethernet_types_api.c
@@ -41,14 +41,6 @@ mac_address_encode (const mac_address_t * in, vl_api_mac_address_t * out)
clib_memcpy (out->bytes, in->bytes, 6);
}
-extern u8 *
-format_vl_api_mac_address (u8 * s, va_list * args)
-{
- vl_api_mac_address_t *mac = va_arg (*args, vl_api_mac_address_t *);
-
- return (format (s, "%U", format_mac_address, mac->bytes));
-}
-
/*
* fd.io coding-style-patch-verification: ON
*
diff --git a/src/vnet/ethernet/ethernet_types_api.h b/src/vnet/ethernet/ethernet_types_api.h
index f326f8afa56..b65d9d46c86 100644
--- a/src/vnet/ethernet/ethernet_types_api.h
+++ b/src/vnet/ethernet/ethernet_types_api.h
@@ -32,8 +32,6 @@ extern void mac_address_decode (const struct _vl_api_mac_address *in,
extern void mac_address_encode (const mac_address_t * in,
struct _vl_api_mac_address *out);
-extern u8 *format_vl_api_mac_address (u8 * s, va_list * args);
-
#endif
/*
diff --git a/src/vnet/ethernet/mac_address.c b/src/vnet/ethernet/mac_address.c
index 72725c8e593..419a5b0879f 100644
--- a/src/vnet/ethernet/mac_address.c
+++ b/src/vnet/ethernet/mac_address.c
@@ -15,20 +15,36 @@
#include <vnet/ethernet/mac_address.h>
+/* *INDENT-OFF* */
const mac_address_t ZERO_MAC_ADDRESS = {
.bytes = {
- 0, 0, 0, 0, 0, 0,
- },
+ 0, 0, 0, 0, 0, 0,
+ },
};
+/* *INDENT-ON* */
u8 *
format_mac_address_t (u8 * s, va_list * args)
{
const mac_address_t *mac = va_arg (*args, mac_address_t *);
- return (format (s, "%U", format_mac_address, mac->bytes));
+ return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
+ mac->bytes[0], mac->bytes[1], mac->bytes[2],
+ mac->bytes[3], mac->bytes[4], mac->bytes[5]);
}
+uword
+unformat_mac_address_t (unformat_input_t * input, va_list * args)
+{
+ mac_address_t *mac = va_arg (*args, mac_address_t *);
+
+ if (!unformat (input, "%_%x:%x:%x:%x:%x:%x%_",
+ &mac->bytes[0], &mac->bytes[1], &mac->bytes[2],
+ &mac->bytes[3], &mac->bytes[4], &mac->bytes[5]))
+ return 0;
+
+ return 1;
+}
/*
* fd.io coding-style-patch-verification: ON
diff --git a/src/vnet/ethernet/mac_address.h b/src/vnet/ethernet/mac_address.h
index e97eab6c3d7..8e1559b8654 100644
--- a/src/vnet/ethernet/mac_address.h
+++ b/src/vnet/ethernet/mac_address.h
@@ -49,6 +49,8 @@ mac_address_from_u64 (u64 u, mac_address_t * mac)
ethernet_mac_address_from_u64 (u, mac->bytes);
}
+extern uword unformat_mac_address_t (unformat_input_t * input,
+ va_list * args);
extern u8 *format_mac_address_t (u8 * s, va_list * args);
#endif