git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Log anything that could prevent a daemon from starting.
[sliver-openvswitch.git]
/
lib
/
random.c
diff --git
a/lib/random.c
b/lib/random.c
index
6b02446
..
a802bc7
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.
@@
-23,6
+23,7
@@
#include <sys/time.h>
#include "entropy.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",
@@
-48,9
+49,7
@@
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;