vswitchd: Make the MAC entry aging time configurable.

[sliver-openvswitch.git] / lib / uuid.c

diff --git a/lib/uuid.c b/lib/uuid.c
index a1100f2..e259024 100644 (file)
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -22,6 +22,7 @@
 #include <fcntl.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#include <unistd.h>
 
 #include "aes128.h"
 #include "entropy.h"
@@ -33,7 +34,6 @@ static uint64_t counter[2];
 BUILD_ASSERT_DECL(sizeof counter == 16);
 
 static void do_init(void);
-static void read_urandom(void *buffer, size_t n);
 
 /*
  * Initialize the UUID module.  Aborts the program with an error message if
@@ -156,23 +156,43 @@ uuid_from_string(struct uuid *uuid, const char *s)
 bool
 uuid_from_string_prefix(struct uuid *uuid, const char *s)
 {
-    static const char template[] = "00000000-1111-1111-2222-222233333333";
-    const char *t;
+    /* 0         1         2         3      */
+    /* 012345678901234567890123456789012345 */
+    /* ------------------------------------ */
+    /* 00000000-1111-1111-2222-222233333333 */
 
-    uuid_zero(uuid);
-    for (t = template; ; t++, s++) {
-        if (*t >= '0' && *t <= '3') {
-            uint32_t *part = &uuid->parts[*t - '0'];
-            if (!isxdigit(*s)) {
-                goto error;
-            }
-            *part = (*part << 4) + hexit_value(*s);
-        } else if (*t == 0) {
-            return true;
-        } else if (*t != *s) {
-            goto error;
-        }
+    bool ok;
+
+    uuid->parts[0] = hexits_value(s, 8, &ok);
+    if (!ok || s[8] != '-') {
+        goto error;
+    }
+
+    uuid->parts[1] = hexits_value(s + 9, 4, &ok) << 16;
+    if (!ok || s[13] != '-') {
+        goto error;
+    }
+
+    uuid->parts[1] += hexits_value(s + 14, 4, &ok);
+    if (!ok || s[18] != '-') {
+        goto error;
+    }
+
+    uuid->parts[2] = hexits_value(s + 19, 4, &ok) << 16;
+    if (!ok || s[23] != '-') {
+        goto error;
+    }
+
+    uuid->parts[2] += hexits_value(s + 24, 4, &ok);
+    if (!ok) {
+        goto error;
+    }
+
+    uuid->parts[3] = hexits_value(s + 28, 8, &ok);
+    if (!ok) {
+        goto error;
     }
+    return true;
 
 error:
     uuid_zero(uuid);