ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-25 07:31:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Drop extra debug output.

Browse Source
This commit is contained in:
Adam Ierymenko 2013-08-27 16:45:22 -04:00
parent c247a3d991
commit aa96bdfd1e
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
node/EthernetTap.cpp
View File

@ -1096,6 +1096,7 @@ bool EthernetTap::removeIP(const InetAddress &ip)
std::set<InetAddress> EthernetTap::allIps() const std::set<InetAddress> EthernetTap::allIps() const
{ {
static const InetAddress ifLoopback("fe80::1",64);
std::set<InetAddress> addrs; std::set<InetAddress> addrs;
try { try {
@ -1109,9 +1110,11 @@ std::set<InetAddress> EthernetTap::allIps() const
case AF_INET: case AF_INET:
addrs.insert(InetAddress(&(ipt->Table[i].Address.Ipv4.sin_addr.S_un.S_addr),4,ipt->Table[i].OnLinkPrefixLength)); addrs.insert(InetAddress(&(ipt->Table[i].Address.Ipv4.sin_addr.S_un.S_addr),4,ipt->Table[i].OnLinkPrefixLength));
break; break;
case AF_INET6: case AF_INET6: {
addrs.insert(InetAddress(ipt->Table[i].Address.Ipv6.sin6_addr.u.Byte,16,ipt->Table[i].OnLinkPrefixLength)); InetAddress ip(ipt->Table[i].Address.Ipv6.sin6_addr.u.Byte,16,ipt->Table[i].OnLinkPrefixLength);
break; if (ip != ifLoopback) // don't include fe80::1
addrs.insert(ip);
} break;
} }
} }
} }
@ -1147,8 +1150,30 @@ std::string EthernetTap::deviceName() const
bool EthernetTap::updateMulticastGroups(std::set<MulticastGroup> &groups) bool EthernetTap::updateMulticastGroups(std::set<MulticastGroup> &groups)
{ {
// TODO std::set<MulticastGroup> newGroups;
return false;
std::set<InetAddress> ipaddrs(allIps());
for(std::set<InetAddress>::const_iterator i(ipaddrs.begin());i!=ipaddrs.end();++i)
newGroups.insert(MulticastGroup::deriveMulticastGroupForAddressResolution(*i));
bool changed = false;
newGroups.insert(_blindWildcardMulticastGroup); // always join this
for(std::set<MulticastGroup>::iterator mg(newGroups.begin());mg!=newGroups.end();++mg) {
if (!groups.count(*mg)) {
groups.insert(*mg);
changed = true;
}
}
for(std::set<MulticastGroup>::iterator mg(groups.begin());mg!=groups.end();) {
if (!newGroups.count(*mg)) {
groups.erase(mg++);
changed = true;
} else ++mg;
}
return changed;
} }
void EthernetTap::threadMain() void EthernetTap::threadMain()