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 to routes config in controller API.

Browse Source
This commit is contained in:
Adam Ierymenko 2016-06-13 15:58:00 -07:00
parent 734cbb2f1e
commit 769351b30f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
controller/SqliteNetworkController.cpp
View File

@ -115,14 +115,14 @@ static void _ipToBlob(const InetAddress &a,char *ipBlob,int &ipVersion) /* blob[
{ {
switch(a.ss_family) { switch(a.ss_family) {
case AF_INET: case AF_INET:
if ((a.netmaskBits() > 0)&&(a.netmaskBits() <= 32)) { if ((a.netmaskBits() >= 0)&&(a.netmaskBits() <= 32)) {
memset(ipBlob,0,12); memset(ipBlob,0,12);
memcpy(ipBlob + 12,a.rawIpData(),4); memcpy(ipBlob + 12,a.rawIpData(),4);
ipVersion = 4; ipVersion = 4;
} }
break; break;
case AF_INET6: case AF_INET6:
if ((a.netmaskBits() > 0)&&(a.netmaskBits() <= 128)) { if ((a.netmaskBits() >= 0)&&(a.netmaskBits() <= 128)) {
memcpy(ipBlob,a.rawIpData(),16); memcpy(ipBlob,a.rawIpData(),16);
ipVersion = 6; ipVersion = 6;
} }
@ -788,10 +788,10 @@ unsigned int SqliteNetworkController::handleControlPlaneHttpPOST(
r_target = InetAddress(std::string(r->u.object.values[rk].value->u.string.ptr)); r_target = InetAddress(std::string(r->u.object.values[rk].value->u.string.ptr));
else if ((!strcmp(r->u.object.values[rk].name,"via"))&&(r->u.object.values[rk].value->type == json_string)) else if ((!strcmp(r->u.object.values[rk].name,"via"))&&(r->u.object.values[rk].value->type == json_string))
r_via = InetAddress(std::string(r->u.object.values[rk].value->u.string.ptr),0); r_via = InetAddress(std::string(r->u.object.values[rk].value->u.string.ptr),0);
else if ((!strcmp(r->u.object.values[rk].name,"flags"))&&(r->u.object.values[rk].value->type == json_string)) else if ((!strcmp(r->u.object.values[rk].name,"flags"))&&(r->u.object.values[rk].value->type == json_integer))
r_flags = (int)(Utils::strToUInt(r->u.object.values[rk].value->u.string.ptr) & 0xffff); r_flags = (int)(r->u.object.values[rk].value->u.integer & 0xffff);
else if ((!strcmp(r->u.object.values[rk].name,"metric"))&&(r->u.object.values[rk].value->type == json_string)) else if ((!strcmp(r->u.object.values[rk].name,"metric"))&&(r->u.object.values[rk].value->type == json_integer))
r_metric = (int)(Utils::strToUInt(r->u.object.values[rk].value->u.string.ptr) & 0xffff); r_metric = (int)(r->u.object.values[rk].value->u.integer & 0xffff);
} }
if ((r_target)&&((!r_via)||(r_via.ss_family == r_target.ss_family))) { if ((r_target)&&((!r_via)||(r_via.ss_family == r_target.ss_family))) {
int r_ipVersion = 0; int r_ipVersion = 0;