github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-14 02:27:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'dev' into edge

Browse source
This commit is contained in:
Adam Ierymenko 2019-08-26 11:09:19 -07:00
commit b6d7a95028
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
7 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
node/Membership.hpp
View file

@ -186,10 +186,10 @@ private:
{
if ((ip.isV6())&&(nconf.ndpEmulation())) {
const InetAddress sixpl(InetAddress::makeIpv66plane(nconf.networkId,nconf.issuedTo.toInt()));
for(int i=0;i<nconf.staticIpCount;++i) {
for(unsigned int i=0;i<nconf.staticIpCount;++i) {
if (nconf.staticIps[i].ipsEqual(sixpl)) {
bool prefixMatches = true;
for(int j=0;j<5;++j) { // check for match on /40
for(unsigned int j=0;j<5;++j) { // check for match on /40
if ((((const struct sockaddr_in6 *)&ip)->sin6_addr.s6_addr)[j] != (((const struct sockaddr_in6 *)&sixpl)->sin6_addr.s6_addr)[j]) {
prefixMatches = false;
break;
@ -202,10 +202,10 @@ private:
}
const InetAddress rfc4193(InetAddress::makeIpv6rfc4193(nconf.networkId,nconf.issuedTo.toInt()));
for(int i=0;i<nconf.staticIpCount;++i) {
for(unsigned int i=0;i<nconf.staticIpCount;++i) {
if (nconf.staticIps[i].ipsEqual(rfc4193)) {
bool prefixMatches = true;
for(int j=0;j<11;++j) { // check for match on /88
for(unsigned int j=0;j<11;++j) { // check for match on /88
if ((((const struct sockaddr_in6 *)&ip)->sin6_addr.s6_addr)[j] != (((const struct sockaddr_in6 *)&rfc4193)->sin6_addr.s6_addr)[j]) {
prefixMatches = false;
break;