Browse Source

Remove Logger.hpp references.

pull/1/head
Adam Ierymenko 11 years ago
parent
commit
c894710ac1
  1. 1
      node/Multicaster.cpp
  2. 3
      node/Node.cpp
  3. 1
      node/OutboundMulticast.cpp
  4. 1
      node/Peer.hpp
  5. 12
      node/RuntimeEnvironment.hpp
  6. 1
      node/Switch.hpp

1
node/Multicaster.cpp

@ -38,7 +38,6 @@
#include "CMWC4096.hpp"
#include "C25519.hpp"
#include "CertificateOfMembership.hpp"
#include "Logger.hpp"
namespace ZeroTier {

3
node/Node.cpp

@ -38,7 +38,6 @@
#include "Topology.hpp"
#include "Buffer.hpp"
#include "Packet.hpp"
#include "Logger.hpp"
#include "Address.hpp"
#include "Identity.hpp"
#include "SelfAwareness.hpp"
@ -107,7 +106,6 @@ Node::Node(
delete RR->mc;
delete RR->sw;
delete RR->prng;
delete RR->log;
delete RR;
throw;
}
@ -138,7 +136,6 @@ Node::~Node()
delete RR->mc;
delete RR->sw;
delete RR->prng;
delete RR->log;
delete RR;
}

1
node/OutboundMulticast.cpp

@ -32,7 +32,6 @@
#include "Network.hpp"
#include "CertificateOfMembership.hpp"
#include "Node.hpp"
#include "Logger.hpp"
namespace ZeroTier {

1
node/Peer.hpp

@ -43,7 +43,6 @@
#include "Address.hpp"
#include "Utils.hpp"
#include "Identity.hpp"
#include "Logger.hpp"
#include "InetAddress.hpp"
#include "Packet.hpp"
#include "SharedPtr.hpp"

12
node/RuntimeEnvironment.hpp

@ -36,7 +36,6 @@
namespace ZeroTier {
class NodeConfig;
class Logger;
class Switch;
class Topology;
class CMWC4096;
@ -48,15 +47,6 @@ class SelfAwareness;
/**
* Holds global state for an instance of ZeroTier::Node
*
* I do not believe in mutable static variables, period, or in global static
* instances of objects that don't basically represent constants. It makes
* unit testing, embedding, threading, and other things hard and is poor
* practice.
*
* So we put everything that we would want to be global, like Logger, here
* and we give everybody this as _r. The Node creates and initializes this
* on startup and deletes things on shutdown.
*/
class RuntimeEnvironment
{
@ -65,7 +55,6 @@ public:
node(n),
identity(),
netconfMaster((NetworkConfigMaster *)0),
log((Logger *)0),
prng((CMWC4096 *)0),
sw((Switch *)0),
mc((Multicaster *)0),
@ -92,7 +81,6 @@ public:
* These are constant and never null after startup unless indicated.
*/
Logger *log; // null if logging is disabled
CMWC4096 *prng;
Switch *sw;
Multicaster *mc;

1
node/Switch.hpp

@ -59,7 +59,6 @@
namespace ZeroTier {
class RuntimeEnvironment;
class Logger;
class Peer;
/**

Loading…
Cancel
Save