From 2162a419e376ae20e208722f7f196f90794e51b4 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 17 Jun 2014 13:52:55 -0700 Subject: [PATCH] Some logging fixes. --- node/PacketDecoder.cpp | 2 -- node/Switch.cpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/node/PacketDecoder.cpp b/node/PacketDecoder.cpp index 9248fe325..32bcc0f54 100644 --- a/node/PacketDecoder.cpp +++ b/node/PacketDecoder.cpp @@ -536,7 +536,6 @@ bool PacketDecoder::_doMULTICAST_FRAME(const RuntimeEnvironment *_r,const Shared const unsigned int signatureLen = at(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 @%.16llx #%.16llx from %s<%s> via %s(%s) to %s [ %s, %d bytes, depth %d ]", (unsigned long long)nwid, (unsigned long long)guid, @@ -546,7 +545,6 @@ bool PacketDecoder::_doMULTICAST_FRAME(const RuntimeEnvironment *_r,const Shared Switch::etherTypeName(etherType), (int)frameLen, (int)depth); - */ SharedPtr network(_r->nc->network(nwid)); diff --git a/node/Switch.cpp b/node/Switch.cpp index d012b8414..1c2fe8b14 100644 --- a/node/Switch.cpp +++ b/node/Switch.cpp @@ -101,7 +101,7 @@ void Switch::onLocalEthernet(const SharedPtr &network,const MAC &from,c // Check to make sure this protocol is allowed on this network if (!nconf->permitsEtherType(etherType)) { - LOG("%s: ignored tap: %s -> %s: ethertype %s not allowed on network %.16llx",network->tapDeviceName().c_str(),from.toString().c_str(),to.toString().c_str(),etherTypeName(etherType),(unsigned long long)network->id()); + TRACE("%s: ignored tap: %s -> %s: ethertype %s not allowed on network %.16llx",network->tapDeviceName().c_str(),from.toString().c_str(),to.toString().c_str(),etherTypeName(etherType),(unsigned long long)network->id()); return; }