X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fethernet%2Fmac_address.c;h=b7981299700ffbaaca87cd057648817ed9b819c0;hb=bdfe5955f;hp=419a5b0879fedbbb4462692dd1cd22fffe599345;hpb=86327be9751ad54cb24d16c161cacb001dc20772;p=vpp.git

diff --git a/src/vnet/ethernet/mac_address.c b/src/vnet/ethernet/mac_address.c
index 419a5b0879f..b7981299700 100644
--- a/src/vnet/ethernet/mac_address.c
+++ b/src/vnet/ethernet/mac_address.c
@@ -37,13 +37,38 @@ 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%_",
+		1, &mac->bytes[0], 1, &mac->bytes[1], 1, &mac->bytes[2],
+		1, &mac->bytes[3], 1, &mac->bytes[4], 1, &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);
+}
+
+void
+mac_address_increment (mac_address_t * mac)
+{
+  u64 a;
+
+  a = mac_address_as_u64 (mac);
+  a++;
+  mac_address_from_u64 (mac, a);
 }
 
 /*