summaryrefslogtreecommitdiff
path: root/node
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2014-06-17 13:52:55 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2014-06-17 13:52:55 -0700
commit2162a419e376ae20e208722f7f196f90794e51b4 (patch)
treecbb265f543abaa508ea22ff85b2de5901cbeec14 /node
parentf15271f31ff4fa8f349e73604cdc57b1cea9e40e (diff)
downloadinfinitytier-2162a419e376ae20e208722f7f196f90794e51b4.tar.gz
infinitytier-2162a419e376ae20e208722f7f196f90794e51b4.zip
Some logging fixes.
Diffstat (limited to 'node')
-rw-r--r--node/PacketDecoder.cpp2
-rw-r--r--node/Switch.cpp2
2 files changed, 1 insertions, 3 deletions
diff --git a/node/PacketDecoder.cpp b/node/PacketDecoder.cpp
index 9248fe32..32bcc0f5 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<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 @%.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> network(_r->nc->network(nwid));
diff --git a/node/Switch.cpp b/node/Switch.cpp
index d012b841..1c2fe8b1 100644
--- a/node/Switch.cpp
+++ b/node/Switch.cpp
@@ -101,7 +101,7 @@ void Switch::onLocalEthernet(const SharedPtr<Network> &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;
}