diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-10-01 16:31:46 -0400 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-10-01 16:31:46 -0400 |
| commit | 676f391ccf5c1112d1725992dd444ac4084b570a (patch) | |
| tree | f312c2623888649c0c0a89778f9f0573ee885786 /node | |
| parent | 3443b203e4035104071f5af0143591dcd48a4974 (diff) | |
| download | infinitytier-676f391ccf5c1112d1725992dd444ac4084b570a.tar.gz infinitytier-676f391ccf5c1112d1725992dd444ac4084b570a.zip | |
Multicast debug changes.
Diffstat (limited to 'node')
| -rw-r--r-- | node/Multicaster.hpp | 2 | ||||
| -rw-r--r-- | node/PacketDecoder.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/node/Multicaster.hpp b/node/Multicaster.hpp index e86de0a0..46ab08ea 100644 --- a/node/Multicaster.hpp +++ b/node/Multicaster.hpp @@ -67,6 +67,8 @@ public: /** * Bring a peer closer in terms of propagation priority * + * This gets called from PacketDecoder when a unicast frame is received. + * * @param nwid Network ID * @param a Address to bring closer (e.g. due to unicast message) * @param now Current time diff --git a/node/PacketDecoder.cpp b/node/PacketDecoder.cpp index 3269504b..1560ec1e 100644 --- a/node/PacketDecoder.cpp +++ b/node/PacketDecoder.cpp @@ -487,7 +487,7 @@ bool PacketDecoder::_doMULTICAST_FRAME(const RuntimeEnvironment *_r,const Shared #ifdef ZT_TRACE_MULTICAST char mct[256]; - Utils::snprintf(mct,sizeof(mct),"%s <- %.16llx %.16llx %s via %s depth:%u len:%u",_r->identity.address().toString().c_str(),nwid,guid,origin.toString().c_str(),source().toString().c_str(),depth,frameLen); + Utils::snprintf(mct,sizeof(mct),"%c %s <- %.16llx %.16llx %s via %s depth:%u len:%u",(_r->topology->amSupernode() ? 'S' : '-'),_r->identity.address().toString().c_str(),nwid,guid,origin.toString().c_str(),source().toString().c_str(),depth,frameLen); _r->demarc->send(Demarc::ANY_PORT,ZT_DEFAULTS.multicastTraceWatcher,mct,strlen(mct),-1); #endif @@ -599,7 +599,7 @@ bool PacketDecoder::_doMULTICAST_FRAME(const RuntimeEnvironment *_r,const Shared #ifdef ZT_TRACE_MULTICAST char mct[256]; - Utils::snprintf(mct,sizeof(mct),"%s -> %.16llx %.16llx %s via %s",_r->identity.address().toString().c_str(),nwid,guid,origin.toString().c_str(),nextHop.toString().c_str()); + Utils::snprintf(mct,sizeof(mct),"%c %s -> %.16llx %.16llx %s via %s",(_r->topology->amSupernode() ? 'S' : '-'),_r->identity.address().toString().c_str(),nwid,guid,origin.toString().c_str(),nextHop.toString().c_str()); _r->demarc->send(Demarc::ANY_PORT,ZT_DEFAULTS.multicastTraceWatcher,mct,strlen(mct),-1); #endif |