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

Fix for netconf advertising of multicast propagation parameters, and defaults in Network.hpp.

Browse Source
This commit is contained in:
Adam Ierymenko 2013-09-19 16:16:48 -04:00
parent 795f41c331
commit c26b64f24b
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netconf-service/netconf.cpp
View File

@ -298,9 +298,9 @@ int main(int argc,char **argv)
netconf["ts"] = buf; netconf["ts"] = buf;
netconf["peer"] = peerIdentity.address().toString(); netconf["peer"] = peerIdentity.address().toString();
sprintf(buf,"%x",mcb); sprintf(buf,"%x",mcb);
netconf["mcb"] = mcb; netconf["mcb"] = buf;
sprintf(buf,"%x",mcd); sprintf(buf,"%x",mcd);
netconf["mcd"] = mcd; netconf["mcd"] = buf;
if (!isOpen) { if (!isOpen) {
// TODO: handle closed networks, look up private membership, // TODO: handle closed networks, look up private membership,

10
node/Network.hpp
View File

@ -325,7 +325,10 @@ public:
const_iterator mcb(find("mcb")); const_iterator mcb(find("mcb"));
if (mcb == end()) if (mcb == end())
return ZT_MULTICAST_DEFAULT_PROPAGATION_BREADTH; return ZT_MULTICAST_DEFAULT_PROPAGATION_BREADTH;
return Utils::hexStrToUInt(mcb->second.c_str()); unsigned int mcb2 = Utils::hexStrToUInt(mcb->second.c_str());
if (mcb2)
return mcb2;
return ZT_MULTICAST_DEFAULT_PROPAGATION_BREADTH;
} }
/** /**
@ -336,7 +339,10 @@ public:
const_iterator mcd(find("mcd")); const_iterator mcd(find("mcd"));
if (mcd == end()) if (mcd == end())
return ZT_MULTICAST_DEFAULT_PROPAGATION_DEPTH; return ZT_MULTICAST_DEFAULT_PROPAGATION_DEPTH;
return Utils::hexStrToUInt(mcd->second.c_str()); unsigned int mcd2 = Utils::hexStrToUInt(mcd->second.c_str());
if (mcd2)
return mcd2;
return ZT_MULTICAST_DEFAULT_PROPAGATION_DEPTH;
} }
/** /**