void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a possible infinite loop in netconf service... in the long term need to fix IP assignment logic period cause the current incarnation sucks.

Browse source
This commit is contained in:
Adam Ierymenko 2014-02-06 10:59:50 -08:00
parent d0e5da2884
commit 6d17993eb6
1 changed files with 30 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
netconf-service/netconf.cpp
View file

@ -277,7 +277,7 @@ int main(int argc,char **argv)
std::string desc; std::string desc;
{ {
Query q = dbCon->query(); Query q = dbCon->query();
q << "SELECT name,`desc`,isOpen,multicastPrefixBits,multicastDepth,emulateArp,emulateNdp,arpCacheTtl,ndpCacheTtl FROM Network WHERE id = " << nwid; q << "SELECT * FROM Network WHERE id = " << nwid;
StoreQueryResult rs = q.store(); StoreQueryResult rs = q.store();
if (rs.num_rows() > 0) { if (rs.num_rows() > 0) {
name = rs[0]["name"].c_str(); name = rs[0]["name"].c_str();
@ -411,36 +411,38 @@ int main(int argc,char **argv)
uint32_t ipNet = (uint32_t)((unsigned long)rs[aaRow]["ipNet"]); uint32_t ipNet = (uint32_t)((unsigned long)rs[aaRow]["ipNet"]);
unsigned int netmaskBits = (unsigned int)rs[aaRow]["netmaskBits"]; unsigned int netmaskBits = (unsigned int)rs[aaRow]["netmaskBits"];
uint32_t tryIp = (((uint32_t)addressBytes[1]) << 24) | if ((netmaskBits > 0)&&(ipNet)) {
(((uint32_t)addressBytes[2]) << 16) | uint32_t tryIp = (((uint32_t)addressBytes[1]) << 24) |
(((uint32_t)addressBytes[3]) << 8) | (((uint32_t)addressBytes[2]) << 16) |
((((uint32_t)addressBytes[4]) % 254) + 1); (((uint32_t)addressBytes[3]) << 8) |
tryIp &= (0xffffffff >> netmaskBits); ((((uint32_t)addressBytes[4]) % 254) + 1);
tryIp |= ipNet; tryIp &= (0xffffffff >> netmaskBits);
tryIp |= ipNet;
for(int k=0;k<100000;++k) { for(int k=0;k<100000;++k) {
Query q2 = dbCon->query(); Query q2 = dbCon->query();
q2 << "INSERT INTO IPv4Static (Network_id,Node_id,ip,netmaskBits) VALUES (" << nwid << "," << peerIdentity.address().toInt() << "," << tryIp << "," << netmaskBits << ")"; q2 << "INSERT INTO IPv4Static (Network_id,Node_id,ip,netmaskBits) VALUES (" << nwid << "," << peerIdentity.address().toInt() << "," << tryIp << "," << netmaskBits << ")";
if (q2.exec()) { if (q2.exec()) {
sprintf(buf,"%u.%u.%u.%u",(unsigned int)((tryIp >> 24) & 0xff),(unsigned int)((tryIp >> 16) & 0xff),(unsigned int)((tryIp >> 8) & 0xff),(unsigned int)(tryIp & 0xff)); sprintf(buf,"%u.%u.%u.%u",(unsigned int)((tryIp >> 24) & 0xff),(unsigned int)((tryIp >> 16) & 0xff),(unsigned int)((tryIp >> 8) & 0xff),(unsigned int)(tryIp & 0xff));
if (ipv4Static.length()) if (ipv4Static.length())
ipv4Static.push_back(','); ipv4Static.push_back(',');
ipv4Static.append(buf); ipv4Static.append(buf);
ipv4Static.push_back('/'); ipv4Static.push_back('/');
sprintf(buf,"%u",netmaskBits); sprintf(buf,"%u",netmaskBits);
ipv4Static.append(buf); ipv4Static.append(buf);
break; break;
} else { // insert will fail if IP is in use due to uniqueness constraints in DB } else { // insert will fail if IP is in use due to uniqueness constraints in DB
++tryIp; ++tryIp;
if ((tryIp & 0xff) == 0) if ((tryIp & 0xff) == 0)
tryIp |= 1; tryIp |= 1;
tryIp &= (0xffffffff >> netmaskBits); tryIp &= (0xffffffff >> netmaskBits);
tryIp |= ipNet; tryIp |= ipNet;
}
} }
}
if (ipv4Static.length()) if (ipv4Static.length())
break; break;
}
} }
} }
} }