Compile fixes, integration of fast PRNG.

This commit is contained in:
Adam Ierymenko 2013-07-13 14:28:26 -04:00
parent 3e49337d9a
commit 97cbd98bc5
11 changed files with 154 additions and 66 deletions

View file

@ -31,7 +31,6 @@
#include <string>
#include "Identity.hpp"
#include "Condition.hpp"
#include "CMWC4096.hpp"
namespace ZeroTier {
@ -42,6 +41,7 @@ class Switch;
class Topology;
class SysEnv;
class Multicaster;
class CMWC4096;
/**
* Holds global state for an instance of ZeroTier::Node
@ -61,6 +61,7 @@ public:
RuntimeEnvironment() :
identity(),
log((Logger *)0),
prng((CMWC4096 *)0),
nc((NodeConfig *)0),
demarc((Demarc *)0),
multicaster((Multicaster *)0),
@ -78,13 +79,11 @@ public:
// signal() to prematurely interrupt main loop wait
Condition mainLoopWaitCondition;
// non-cryptographic fast PRNG
CMWC4096 prng;
Identity configAuthority;
Identity identity;
Logger *log; // may be null
CMWC4096 *prng;
NodeConfig *nc;
Demarc *demarc;
Multicaster *multicaster;