diff options
| author |   Neale Ranns <nranns@cisco.com> | 2018-08-22 04:27:15 -0700 |
|---|---|---|
| committer |   John Lo <loj@cisco.com> | 2018-08-22 16:03:26 +0000 |
| commit | 571ab20d1da227fb66d52ed52cce0cbd4591e1c9 (patch) | |
| tree | 2e48450bf4119aef5363e265ef728395430225e8 /src/vnet/ethernet | |
| parent | 828d27ea0edb97280a0164041a286973fa74b5a2 (diff) | |
Consolidate the [un]format_mac_address implementations
Change-Id: Ic4c42c5610a827234e6582501f0ddcba47aa34ee
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/ethernet')
| -rw-r--r-- | src/vnet/ethernet/ethernet.h | 2 | ||||
| -rw-r--r-- | src/vnet/ethernet/format.c | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/vnet/ethernet/ethernet.h b/src/vnet/ethernet/ethernet.h index 79ae7e6e909..0bfd48723e2 100644 --- a/src/vnet/ethernet/ethernet.h +++ b/src/vnet/ethernet/ethernet.h @@ -339,6 +339,7 @@ void ethernet_register_l2_input (vlib_main_t * vm, u32 node_index); 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); @@ -347,6 +348,7 @@ u8 *format_ethernet_header_with_length (u8 * s, va_list * args); /* 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. */ diff --git a/src/vnet/ethernet/format.c b/src/vnet/ethernet/format.c index 13a209fb684..1ca1bce8f2a 100644 --- a/src/vnet/ethernet/format.c +++ b/src/vnet/ethernet/format.c @@ -55,6 +55,12 @@ format_ethernet_address (u8 * s, va_list * args) } u8 * +format_mac_address (u8 * s, va_list * args) +{ + return (format_ethernet_address (s, args)); +} + +u8 * format_ethernet_type (u8 * s, va_list * args) { ethernet_type_t type = va_arg (*args, u32); @@ -231,6 +237,13 @@ unformat_ethernet_address (unformat_input_t * input, va_list * args) || unformat_user (input, unformat_ethernet_address_cisco, result)); } +uword +unformat_mac_address (unformat_input_t * input, va_list * args) +{ + return (unformat_ethernet_address (input, args)); +} + + /* Returns ethernet type as an int in host byte order. */ uword unformat_ethernet_type_host_byte_order (unformat_input_t * input, |