projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-bugtool: Use RUNDIR macro for ovs-appctl target.
[openvswitch]
/
lib
/
random.c
diff --git
a/lib/random.c
b/lib/random.c
index 88ddb4a57824e9d7440a6b90b4fd76338d50362b..a802bc743a99c1e9a3a6615747eb348beab5b529 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
Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* 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 <config.h>
#include "random.h"
+#include <assert.h>
#include <errno.h>
#include <stdlib.h>
#include <sys/time.h>
#include "entropy.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",
#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;
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;
}
}
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)
{
void
random_bytes(void *p_, size_t n)
{
@@
-103,7
+110,7
@@
static uint32_t
random_next(void)
{
seed ^= seed << 13;
random_next(void)
{
seed ^= seed << 13;
- seed
>>=
17;
+ seed
^= seed >>
17;
seed ^= seed << 5;
return seed;
seed ^= seed << 5;
return seed;