ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-01-03 03:36:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some TRACE improvements and comment revs.

Browse Source
This commit is contained in:
Adam Ierymenko 2014-06-18 08:25:30 -07:00
parent 2162a419e3
commit 5d467f0f45
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node/Constants.hpp
View File

@ -133,7 +133,7 @@ error_no_byte_order_defined;
#define ZT_UDP_DEFAULT_PAYLOAD_MTU 1444 #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 * This is pretty much an unchangeable global constant. To make it change
* across nodes would require logic to send ICMP packet too big messages, * across nodes would require logic to send ICMP packet too big messages,

2
node/MAC.hpp
View File

@ -224,7 +224,7 @@ public:
throw() throw()
{ {
unsigned char a = ((unsigned char)(nwid & 0xfe) | 0x02); // locally administered, not multicast, from LSB of network ID 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
} }
/** /**

2
node/Switch.cpp
View File

@ -141,6 +141,8 @@ void Switch::onLocalEthernet(const SharedPtr<Network> &network,const MAC &from,c
return; 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 unsigned int mcid = ++_multicastIdCounter & 0xffffff;
const uint16_t bloomNonce = (uint16_t)(_r->prng->next32() & 0xffff); // doesn't need to be cryptographically strong 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]; unsigned char bloom[ZT_PROTO_VERB_MULTICAST_FRAME_LEN_PROPAGATION_BLOOM];