ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-04-25 13:29:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix addIp being called with applied ips (#1897)

Browse Source 
This was getting called outside of the check for existing ips
Because of the added ifdef and a brace getting moved to the
wrong place.

```
if (! n.tap()->addIp(*ip)) {
	fprintf(stderr, "ERROR: unable to add ip address %s" ZT_EOL_S, ip->toString(ipbuf));
}
WinFWHelper::newICMPRule(*ip, n.config().nwid);

```
This commit is contained in:
Travis LaDuke 2023-03-10 07:57:54 -08:00 committed by GitHub
parent 12cdf39165
commit a372619fee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
service/OneService.cpp
View File

@ -2307,8 +2307,10 @@ public:
auto same_subnet = [ip](InetAddress i){ auto same_subnet = [ip](InetAddress i){
return ip->network() == i.network(); return ip->network() == i.network();
}; };
#endif
if (std::find(n.managedIps().begin(),n.managedIps().end(),*ip) == n.managedIps().end()) { if (std::find(n.managedIps().begin(),n.managedIps().end(),*ip) == n.managedIps().end()) {
#ifdef __APPLE__
// if same subnet as a previously added address // if same subnet as a previously added address
if ( if (
std::find_if(n.managedIps().begin(),n.managedIps().end(), same_subnet) != n.managedIps().end() || std::find_if(n.managedIps().begin(),n.managedIps().end(), same_subnet) != n.managedIps().end() ||
@ -2322,15 +2324,17 @@ public:
} else { } else {
newManagedIps2.push_back(*ip); newManagedIps2.push_back(*ip);
} }
}
#endif #endif
if (!n.tap()->addIp(*ip)) if (! n.tap()->addIp(*ip)) {
fprintf(stderr,"ERROR: unable to add ip address %s" ZT_EOL_S, ip->toString(ipbuf)); fprintf(stderr, "ERROR: unable to add ip address %s" ZT_EOL_S, ip->toString(ipbuf));
}
#ifdef __WINDOWS__ else {
#ifdef __WINDOWS__
WinFWHelper::newICMPRule(*ip, n.config().nwid); WinFWHelper::newICMPRule(*ip, n.config().nwid);
#endif #endif
}
}
} }
#ifdef __APPLE__ #ifdef __APPLE__