diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-07-07 16:58:05 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-07-07 16:58:05 -0700 |
| commit | dab0fb9e05677bdc6294f196fcf8234892c582c1 (patch) | |
| tree | ba53dd4b8dfc3c5e52e11a1f554f1d28808d0a47 /node/Topology.cpp | |
| parent | e14d5d49a1bfe8a82e1bb6d0e6c480e273058ee8 (diff) | |
| download | infinitytier-dab0fb9e05677bdc6294f196fcf8234892c582c1.tar.gz infinitytier-dab0fb9e05677bdc6294f196fcf8234892c582c1.zip | |
Remote trace: plumbing, replace old TRACE with calls to Trace object.
Diffstat (limited to 'node/Topology.cpp')
| -rw-r--r-- | node/Topology.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/node/Topology.cpp b/node/Topology.cpp index e7bbdfae..edca0180 100644 --- a/node/Topology.cpp +++ b/node/Topology.cpp @@ -90,11 +90,6 @@ Topology::Topology(const RuntimeEnvironment *renv,void *tPtr) : SharedPtr<Peer> Topology::addPeer(void *tPtr,const SharedPtr<Peer> &peer) { -#ifdef ZT_TRACE - if ((!peer)||(peer->address() == RR->identity.address())) - return SharedPtr<Peer>(); -#endif - SharedPtr<Peer> np; { Mutex::Lock _l(_peers_m); @@ -103,16 +98,13 @@ SharedPtr<Peer> Topology::addPeer(void *tPtr,const SharedPtr<Peer> &peer) hp = peer; np = hp; } - return np; } SharedPtr<Peer> Topology::getPeer(void *tPtr,const Address &zta) { - if (zta == RR->identity.address()) { - TRACE("BUG: ignored attempt to getPeer() for self, returned NULL"); + if (zta == RR->identity.address()) return SharedPtr<Peer>(); - } { Mutex::Lock _l(_peers_m); |