diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-03-20 14:24:15 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-03-20 14:24:15 -0700 |
| commit | 97e6b3814441343c4bfcd0b9a434aeee8e041b04 (patch) | |
| tree | 4c1065fe2ab08fed1e14aa54badbbfc80f8893d7 /node | |
| parent | 7a45ff460d493dd6cf94441039a795b3ce9ffe1f (diff) | |
| download | infinitytier-97e6b3814441343c4bfcd0b9a434aeee8e041b04.tar.gz infinitytier-97e6b3814441343c4bfcd0b9a434aeee8e041b04.zip | |
MULTICAST_FRAME TRACE improvements.
Diffstat (limited to 'node')
| -rw-r--r-- | node/PacketDecoder.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/node/PacketDecoder.cpp b/node/PacketDecoder.cpp index c638f094..a1336de2 100644 --- a/node/PacketDecoder.cpp +++ b/node/PacketDecoder.cpp @@ -490,18 +490,15 @@ bool PacketDecoder::_doMULTICAST_FRAME(const RuntimeEnvironment *_r,const Shared const unsigned int signatureLen = at<uint16_t>(ZT_PROTO_VERB_MULTICAST_FRAME_IDX_FRAME + frameLen); const unsigned char *const signature = field(ZT_PROTO_VERB_MULTICAST_FRAME_IDX_FRAME + frameLen + 2,signatureLen); - /* - TRACE("MULTICAST_FRAME %d bytes guid#%.16llx from %s(%s) to %s on network %.16llx",(int)frameLen,(unsigned long long)guid,sourceMac.toString().c_str(),origin.toString().c_str(),dest.toString().c_str(),(unsigned long long)nwid); - TRACE(" received from upstream peer: %s(%s)",source().toString().c_str(),_remoteAddress.toString().c_str()); - TRACE(" restrict prefix: %.8lx / %d",(unsigned long)prefix,(int)prefixBits); - TRACE(" ethernet type: %.4x(%s)",etherType,Switch::etherTypeName(etherType)); - TRACE(" signature length: %d",(int)signatureLen); - { - unsigned char h[64]; - SHA512::hash(h,frame,frameLen); - TRACE(" frame data SHA-512: %s",Utils::hex(h,64).c_str()); - } - */ + TRACE("MULTICAST_FRAME @%.16llx #%.16llx from %s<%s> via %s(%s) to %s [ %s, %d bytes, depth %d ]", + (unsigned long long)nwid, + (unsigned long long)guid, + sourceMac.toString().c_str(),origin.toString().c_str(), + source().toString().c_str(),_remoteAddress.toString().c_str(), + dest.toString().c_str(), + Switch::etherTypeName(etherType), + (int)frameLen, + (int)depth); SharedPtr<Network> network(_r->nc->network(nwid)); |