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/vnet/ethernet/mac_address.c | |
| 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/vnet/ethernet/mac_address.c')
| -rw-r--r-- | src/vnet/ethernet/mac_address.c | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/src/vnet/ethernet/mac_address.c b/src/vnet/ethernet/mac_address.c index 419a5b0879f..eab7cef35a5 100644 --- a/src/vnet/ethernet/mac_address.c +++ b/src/vnet/ethernet/mac_address.c @@ -37,13 +37,28 @@ uword unformat_mac_address_t (unformat_input_t * input, va_list * args) { mac_address_t *mac = va_arg (*args, mac_address_t *); + u32 i, a[3]; - 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; + 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 (1); + else if (unformat (input, "%_%x.%x.%x%_", &a[0], &a[1], &a[2])) + { + for (i = 0; i < ARRAY_LEN (a); i++) + if (a[i] >= (1 << 16)) + return 0; - return 1; + mac->bytes[0] = (a[0] >> 8) & 0xff; + mac->bytes[1] = (a[0] >> 0) & 0xff; + mac->bytes[2] = (a[1] >> 8) & 0xff; + mac->bytes[3] = (a[1] >> 0) & 0xff; + mac->bytes[4] = (a[2] >> 8) & 0xff; + mac->bytes[5] = (a[2] >> 0) & 0xff; + + return (1); + } + return (0); } /* |