ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-19 13:07:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add test network support to Network.

Browse Source
This commit is contained in:
Adam Ierymenko 2014-10-03 16:14:34 -07:00
parent 13fc20b0ee
commit aad344bb84
2 changed files with 88 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
node/Network.cpp
View File

@ -140,7 +140,7 @@ bool Network::updateMulticastGroups()
} else return false; } else return false;
} }
bool Network::setConfiguration(const Dictionary &conf,bool saveToDisk) bool Network::applyConfiguration(const SharedPtr<NetworkConfig> &conf)
{ {
Mutex::Lock _l(_lock); Mutex::Lock _l(_lock);
@ -148,26 +148,16 @@ bool Network::setConfiguration(const Dictionary &conf,bool saveToDisk)
return false; return false;
try { try {
SharedPtr<NetworkConfig> newConfig(new NetworkConfig(conf)); // throws if invalid if ((conf->networkId() == _id)&&(conf->issuedTo() == RR->identity.address())) {
if ((newConfig->networkId() == _id)&&(newConfig->issuedTo() == RR->identity.address())) {
std::set<InetAddress> oldStaticIps; std::set<InetAddress> oldStaticIps;
if (_config) if (_config)
oldStaticIps = _config->staticIps(); oldStaticIps = _config->staticIps();
_config = newConfig; _config = conf;
_lastConfigUpdate = Utils::now(); _lastConfigUpdate = Utils::now();
_netconfFailure = NETCONF_FAILURE_NONE; _netconfFailure = NETCONF_FAILURE_NONE;
if (saveToDisk) {
std::string confPath(RR->homePath + ZT_PATH_SEPARATOR_S + "networks.d" + ZT_PATH_SEPARATOR_S + idString() + ".conf");
if (!Utils::writeFile(confPath.c_str(),conf.toString())) {
LOG("error: unable to write network configuration file at: %s",confPath.c_str());
} else {
Utils::lockDownFile(confPath.c_str(),false);
}
}
EthernetTap *t = _tap; EthernetTap *t = _tap;
if (t) { if (t) {
char fname[1024]; char fname[1024];
@ -224,8 +214,32 @@ bool Network::setConfiguration(const Dictionary &conf,bool saveToDisk)
return false; return false;
} }
bool Network::setConfiguration(const Dictionary &conf,bool saveToDisk)
{
try {
SharedPtr<NetworkConfig> newConfig(new NetworkConfig(conf)); // throws if invalid
if (applyConfiguration(newConfig)) {
if (saveToDisk) {
std::string confPath(RR->homePath + ZT_PATH_SEPARATOR_S + "networks.d" + ZT_PATH_SEPARATOR_S + idString() + ".conf");
if (!Utils::writeFile(confPath.c_str(),conf.toString())) {
LOG("error: unable to write network configuration file at: %s",confPath.c_str());
} else {
Utils::lockDownFile(confPath.c_str(),false);
}
}
return true;
}
} catch ( ... ) {
LOG("ignored invalid configuration for network %.16llx (dictionary decode failed)",(unsigned long long)_id);
}
return false;
}
void Network::requestConfiguration() void Network::requestConfiguration()
{ {
if (_id == ZT_TEST_NETWORK_ID) // pseudo-network-ID, no netconf master
return;
if (controller() == RR->identity.address()) { if (controller() == RR->identity.address()) {
// netconf master cannot be a member of its own nets // netconf master cannot be a member of its own nets
LOG("unable to request network configuration for network %.16llx: I am the network master, cannot query self",(unsigned long long)_id); LOG("unable to request network configuration for network %.16llx: I am the network master, cannot query self",(unsigned long long)_id);
@ -488,58 +502,65 @@ void Network::_restoreState()
std::string confPath(RR->homePath + ZT_PATH_SEPARATOR_S + "networks.d" + ZT_PATH_SEPARATOR_S + idstr + ".conf"); std::string confPath(RR->homePath + ZT_PATH_SEPARATOR_S + "networks.d" + ZT_PATH_SEPARATOR_S + idstr + ".conf");
std::string mcdbPath(RR->homePath + ZT_PATH_SEPARATOR_S + "networks.d" + ZT_PATH_SEPARATOR_S + idstr + ".mcerts"); std::string mcdbPath(RR->homePath + ZT_PATH_SEPARATOR_S + "networks.d" + ZT_PATH_SEPARATOR_S + idstr + ".mcerts");
// Read configuration file containing last config from netconf master if (_id == ZT_TEST_NETWORK_ID) {
{ applyConfiguration(NetworkConfig::createTestNetworkConfig(RR->identity.address()));
std::string confs;
if (Utils::readFile(confPath.c_str(),confs)) { // "Touch" path to this ID to remember test network membership
try { FILE *tmp = fopen(confPath.c_str(),"w");
if (confs.length()) if (tmp) fclose(tmp);
setConfiguration(Dictionary(confs),false); } else {
} catch ( ... ) {} // ignore invalid config on disk, we will re-request from netconf master // Read configuration file containing last config from netconf master
} else { {
// If the conf file isn't present, "touch" it so we'll remember std::string confs;
// the existence of this network. if (Utils::readFile(confPath.c_str(),confs)) {
FILE *tmp = fopen(confPath.c_str(),"w"); try {
if (tmp) if (confs.length())
fclose(tmp); setConfiguration(Dictionary(confs),false);
} catch ( ... ) {} // ignore invalid config on disk, we will re-request from netconf master
} else {
// "Touch" path to remember membership in lieu of real config from netconf master
FILE *tmp = fopen(confPath.c_str(),"w");
if (tmp) fclose(tmp);
}
} }
} }
// Read most recent membership cert dump { // Read most recent membership cert dump if there is one
if ((_config)&&(!_config->isPublic())&&(Utils::fileExists(mcdbPath.c_str()))) {
CertificateOfMembership com;
Mutex::Lock _l(_lock); Mutex::Lock _l(_lock);
if ((_config)&&(!_config->isPublic())&&(Utils::fileExists(mcdbPath.c_str()))) {
CertificateOfMembership com;
_membershipCertificates.clear(); _membershipCertificates.clear();
FILE *mcdb = fopen(mcdbPath.c_str(),"rb"); FILE *mcdb = fopen(mcdbPath.c_str(),"rb");
if (mcdb) { if (mcdb) {
try { try {
char magic[6]; char magic[6];
if ((fread(magic,6,1,mcdb) == 1)&&(!memcmp("ZTMCD0",magic,6))) { if ((fread(magic,6,1,mcdb) == 1)&&(!memcmp("ZTMCD0",magic,6))) {
long rlen = 0; long rlen = 0;
do { do {
long rlen = (long)fread(const_cast<char *>(static_cast<const char *>(buf.data())) + buf.size(),1,ZT_NETWORK_CERT_WRITE_BUF_SIZE - buf.size(),mcdb); long rlen = (long)fread(const_cast<char *>(static_cast<const char *>(buf.data())) + buf.size(),1,ZT_NETWORK_CERT_WRITE_BUF_SIZE - buf.size(),mcdb);
if (rlen < 0) rlen = 0; if (rlen < 0) rlen = 0;
buf.setSize(buf.size() + (unsigned int)rlen); buf.setSize(buf.size() + (unsigned int)rlen);
unsigned int ptr = 0; unsigned int ptr = 0;
while ((ptr < (ZT_NETWORK_CERT_WRITE_BUF_SIZE / 2))&&(ptr < buf.size())) { while ((ptr < (ZT_NETWORK_CERT_WRITE_BUF_SIZE / 2))&&(ptr < buf.size())) {
ptr += com.deserialize(buf,ptr); ptr += com.deserialize(buf,ptr);
if (com.issuedTo()) if (com.issuedTo())
_membershipCertificates[com.issuedTo()] = com; _membershipCertificates[com.issuedTo()] = com;
} }
buf.behead(ptr); buf.behead(ptr);
} while (rlen > 0); } while (rlen > 0);
fclose(mcdb); fclose(mcdb);
} else { } else {
fclose(mcdb);
Utils::rm(mcdbPath);
}
} catch ( ... ) {
// Membership cert dump file invalid. We'll re-learn them off the net.
_membershipCertificates.clear();
fclose(mcdb); fclose(mcdb);
Utils::rm(mcdbPath); Utils::rm(mcdbPath);
} }
} catch ( ... ) {
// Membership cert dump file invalid. We'll re-learn them off the net.
_membershipCertificates.clear();
fclose(mcdb);
Utils::rm(mcdbPath);
} }
} }
} }

19
node/Network.hpp
View File

@ -173,20 +173,23 @@ public:
return (_myMulticastGroups.count(mg) > 0); return (_myMulticastGroups.count(mg) > 0);
} }
/**
* Apply a NetworkConfig to this network
*
* @param conf Configuration in NetworkConfig form
* @return True if configuration was accepted
*/
bool applyConfiguration(const SharedPtr<NetworkConfig> &conf);
/** /**
* Set or update this network's configuration * Set or update this network's configuration
* *
* This is called in IncomingPacket when an update comes over the wire, or * This decodes a network configuration in key=value dictionary form,
* internally when an old config is reloaded from disk. * applies it if valid, and persists it to disk if saveToDisk is true.
*
* This also cancels any netconf failure flags.
*
* The network can't accept configuration when in INITIALIZATION state,
* and so in that state this will just return false.
* *
* @param conf Configuration in key/value dictionary form * @param conf Configuration in key/value dictionary form
* @param saveToDisk IF true (default), write config to disk * @param saveToDisk IF true (default), write config to disk
* @return True if configuration was accepted, false if still initializing or config was not valid * @return True if configuration was accepted
*/ */
bool setConfiguration(const Dictionary &conf,bool saveToDisk = true); bool setConfiguration(const Dictionary &conf,bool saveToDisk = true);