ofp-util: Work on decoding OF1.1 flow_mods.

[openvswitch] / lib / random.c

diff --git a/lib/random.c b/lib/random.c
index 88ddb4a57824e9d7440a6b90b4fd76338d50362b..3ea65d59cadf967ab5854c04969055596b116440 100644 (file)
--- a/lib/random.c
+++ b/lib/random.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,11 +17,13 @@
 #include <config.h>
 #include "random.h"
 
+#include <assert.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/time.h>
 
 #include "entropy.h"
+#include "timeval.h"
 #include "util.h"
 
 /* This is the 32-bit PRNG recommended in G. Marsaglia, "Xorshift RNGs",
@@ -47,15 +49,20 @@ random_init(void)
         struct timeval tv;
         uint32_t entropy;
 
-        if (gettimeofday(&tv, NULL) < 0) {
-            ovs_fatal(errno, "gettimeofday");
-        }
+        xgettimeofday(&tv);
         get_entropy_or_die(&entropy, 4);
 
         seed = tv.tv_sec ^ tv.tv_usec ^ entropy;
     }
 }
 
+void
+random_set_seed(uint32_t seed_)
+{
+    assert(seed_);
+    seed = seed_;
+}
+
 void
 random_bytes(void *p_, size_t n)
 {
@@ -93,6 +100,18 @@ random_uint32(void)
     return random_next();
 }
 
+uint64_t
+random_uint64(void)
+{
+    uint64_t x;
+
+    random_init();
+
+    x = random_next();
+    x |= (uint64_t) random_next() << 32;
+    return x;
+}
+
 int
 random_range(int max)
 {
@@ -103,7 +122,7 @@ static uint32_t
 random_next(void)
 {
     seed ^= seed << 13;
-    seed >>= 17;
+    seed ^= seed >> 17;
     seed ^= seed << 5;
 
     return seed;