ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-23 14:52:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix to IPv6 picking for small ranges.

Browse Source
This commit is contained in:
Adam Ierymenko 2016-07-07 15:55:40 -07:00
parent 6e08e1ae97
commit b9329dc49a
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
controller/SqliteNetworkController.cpp
View File

@ -807,18 +807,16 @@ NetworkController::ResultCode SqliteNetworkController::doNetworkConfigRequest(co
xx[0] = Utils::hton(x[0]);
xx[1] = Utils::hton(x[1] + identity.address().toInt());
} else {
if (x[1] == 0xffffffffffffffffULL) {
if (x[0] == 0xffffffffffffffffULL)
break;
++x[0];
x[1] = 0;
} else {
++x[1];
}
if ((x[0] >= e[0])&&(x[1] >= e[1]))
break;
xx[0] = Utils::hton(x[0]);
xx[1] = Utils::hton(x[1]);
// Otherwise pick random addresses -- this technically doesn't explore the whole range if the lower 64 bit range is >= 1 but that won't matter since that would be huge anyway
Utils::getSecureRandom((void *)xx,16);
if ((e[0] > s[0]))
xx[0] %= (e[0] - s[0]);
else xx[0] = 0;
if ((e[1] > s[1]))
xx[1] %= (e[1] - s[1]);
else xx[1] = 0;
xx[0] = Utils::hton(x[0] + xx[0]);
xx[1] = Utils::hton(x[1] + xx[1]);
}
InetAddress ip6((const void *)xx,16,0);