diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-06-18 08:25:30 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-06-18 08:25:30 -0700 |
| commit | 5d467f0f4590cfcbdc1b0699fe07e5a0f6e27764 (patch) | |
| tree | 3502ce815d57b95be69b45771f201fc5d3d60dea /node | |
| parent | 2162a419e376ae20e208722f7f196f90794e51b4 (diff) | |
| download | infinitytier-5d467f0f4590cfcbdc1b0699fe07e5a0f6e27764.tar.gz infinitytier-5d467f0f4590cfcbdc1b0699fe07e5a0f6e27764.zip | |
Some TRACE improvements and comment revs.
Diffstat (limited to 'node')
| -rw-r--r-- | node/Constants.hpp | 2 | ||||
| -rw-r--r-- | node/MAC.hpp | 2 | ||||
| -rw-r--r-- | node/Switch.cpp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/node/Constants.hpp b/node/Constants.hpp index 5021724f..4d720d5d 100644 --- a/node/Constants.hpp +++ b/node/Constants.hpp @@ -133,7 +133,7 @@ error_no_byte_order_defined; #define ZT_UDP_DEFAULT_PAYLOAD_MTU 1444 /** - * MTU used for Ethernet tap device + * Default MTU used for Ethernet tap device * * This is pretty much an unchangeable global constant. To make it change * across nodes would require logic to send ICMP packet too big messages, diff --git a/node/MAC.hpp b/node/MAC.hpp index 634f9033..cd749911 100644 --- a/node/MAC.hpp +++ b/node/MAC.hpp @@ -224,7 +224,7 @@ public: throw() { unsigned char a = ((unsigned char)(nwid & 0xfe) | 0x02); // locally administered, not multicast, from LSB of network ID - return ((a == 0x52) ? 0x32 : a); // blacklist 0x52 since it's used by KVM + return ((a == 0x52) ? 0x32 : a); // blacklist 0x52 since it's used by KVM, libvirt, and other popular virtualization engines... seems de-facto standard on Linux } /** diff --git a/node/Switch.cpp b/node/Switch.cpp index 1c2fe8b1..88ad8f5d 100644 --- a/node/Switch.cpp +++ b/node/Switch.cpp @@ -141,6 +141,8 @@ void Switch::onLocalEthernet(const SharedPtr<Network> &network,const MAC &from,c return; } + TRACE("%s: MULTICAST %s -> %s %s %d",network->tapDeviceName().c_str(),from.toString().c_str(),mg.toString().c_str(),etherTypeName(etherType),(int)data.size()); + const unsigned int mcid = ++_multicastIdCounter & 0xffffff; const uint16_t bloomNonce = (uint16_t)(_r->prng->next32() & 0xffff); // doesn't need to be cryptographically strong unsigned char bloom[ZT_PROTO_VERB_MULTICAST_FRAME_LEN_PROPAGATION_BLOOM]; |