Tons more refactoring: simplify Network, move explicit management of Tap out, redo COM serialization, etc.
This commit is contained in:
Adam Ierymenko
parent
49349470a0
commit
1f28ce3980
11 changed files with 240 additions and 487 deletions
414
node/Network.cpp
414
node/Network.cpp
|
|
@ -33,83 +33,85 @@
|
|||
#include "Constants.hpp"
|
||||
#include "Network.hpp"
|
||||
#include "RuntimeEnvironment.hpp"
|
||||
#include "NodeConfig.hpp"
|
||||
#include "Switch.hpp"
|
||||
#include "Packet.hpp"
|
||||
#include "Buffer.hpp"
|
||||
#include "EthernetTap.hpp"
|
||||
#include "EthernetTapFactory.hpp"
|
||||
|
||||
#define ZT_NETWORK_CERT_WRITE_BUF_SIZE 131072
|
||||
#include "NetworkConfigMaster.hpp"
|
||||
|
||||
namespace ZeroTier {
|
||||
|
||||
const ZeroTier::MulticastGroup Network::BROADCAST(ZeroTier::MAC(0xff),0);
|
||||
|
||||
const char *Network::statusString(const Status s)
|
||||
throw()
|
||||
Network::Network(const RuntimeEnvironment *renv,uint64_t nwid) :
|
||||
RR(renv),
|
||||
_id(nwid),
|
||||
_mac(renv->identity.address(),nwid),
|
||||
_enabled(true),
|
||||
_lastConfigUpdate(0),
|
||||
_destroyed(false),
|
||||
_netconfFailure(NETCONF_FAILURE_NONE)
|
||||
{
|
||||
switch(s) {
|
||||
case NETWORK_INITIALIZING: return "INITIALIZING";
|
||||
case NETWORK_WAITING_FOR_FIRST_AUTOCONF: return "WAITING_FOR_FIRST_AUTOCONF";
|
||||
case NETWORK_OK: return "OK";
|
||||
case NETWORK_ACCESS_DENIED: return "ACCESS_DENIED";
|
||||
case NETWORK_NOT_FOUND: return "NOT_FOUND";
|
||||
case NETWORK_INITIALIZATION_FAILED: return "INITIALIZATION_FAILED";
|
||||
case NETWORK_NO_MORE_DEVICES: return "NO_MORE_DEVICES";
|
||||
char confn[128],mcdbn[128];
|
||||
Utils::snprintf(confn,sizeof(confn),"networks.d/%.16llx.conf",_id);
|
||||
Utils::snprintf(mcdbn,sizeof(mcdbn),"networks.d/%.16llx.mcerts",_id);
|
||||
|
||||
if (_id == ZT_TEST_NETWORK_ID) {
|
||||
applyConfiguration(NetworkConfig::createTestNetworkConfig(RR->identity.address()));
|
||||
|
||||
// Save a one-byte CR to persist membership in the test network
|
||||
RR->node->dataStorePut(confn,"\n",1,false);
|
||||
} else {
|
||||
bool gotConf = false;
|
||||
try {
|
||||
std::string conf(RR->node->dataStoreGet(confn));
|
||||
if (conf.length()) {
|
||||
setConfiguration(Dictionary(conf),false);
|
||||
gotConf = true;
|
||||
}
|
||||
} catch ( ... ) {} // ignore invalids, we'll re-request
|
||||
|
||||
if (!gotConf) {
|
||||
// Save a one-byte CR to persist membership while we request a real netconf
|
||||
RR->node->dataStorePut(confn,"\n",1,false);
|
||||
}
|
||||
|
||||
try {
|
||||
std::string mcdb(RR->node->dataStoreGet(mcdbn));
|
||||
if (mcdb.length() > 6) {
|
||||
const char *p = mcdb.data();
|
||||
const char *e = p + mcdb.length();
|
||||
if (!memcmp("ZTMCD0",p,6)) {
|
||||
p += 6;
|
||||
Mutex::Lock _l(_lock);
|
||||
while (p != e) {
|
||||
CertificateOfMembership com;
|
||||
com.deserialize2(p,e);
|
||||
if (!com)
|
||||
break;
|
||||
_membershipCertificates.insert(std::pair< Address,CertificateOfMembership >(com.issuedTo(),com));
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch ( ... ) {} // ignore invalid MCDB, we'll re-learn from peers
|
||||
}
|
||||
return "(invalid)";
|
||||
|
||||
requestConfiguration();
|
||||
}
|
||||
|
||||
Network::~Network()
|
||||
{
|
||||
_lock.lock();
|
||||
if ((_setupThread)&&(!_destroyed)) {
|
||||
_lock.unlock();
|
||||
Thread::join(_setupThread);
|
||||
} else _lock.unlock();
|
||||
|
||||
{
|
||||
Mutex::Lock _l(_lock);
|
||||
if (_tap)
|
||||
RR->tapFactory->close(_tap,_destroyed);
|
||||
}
|
||||
|
||||
if (_destroyed) {
|
||||
Utils::rm(std::string(RR->homePath + ZT_PATH_SEPARATOR_S + "networks.d" + ZT_PATH_SEPARATOR_S + idString() + ".conf"));
|
||||
Utils::rm(std::string(RR->homePath + ZT_PATH_SEPARATOR_S + "networks.d" + ZT_PATH_SEPARATOR_S + idString() + ".mcerts"));
|
||||
char n[128];
|
||||
Utils::snprintf(n,sizeof(n),"networks.d/%.16llx.conf",_id);
|
||||
RR->node->dataStoreDelete(n);
|
||||
Utils::snprintf(n,sizeof(n),"networks.d/%.16llx.mcerts",_id);
|
||||
RR->node->dataStoreDelete(n);
|
||||
} else {
|
||||
clean();
|
||||
_dumpMembershipCerts();
|
||||
}
|
||||
}
|
||||
|
||||
SharedPtr<Network> Network::newInstance(const RuntimeEnvironment *renv,NodeConfig *nc,uint64_t id)
|
||||
{
|
||||
SharedPtr<Network> nw(new Network());
|
||||
nw->_id = id;
|
||||
nw->_nc = nc;
|
||||
nw->_mac.fromAddress(renv->identity.address(),id);
|
||||
nw->RR = renv;
|
||||
nw->_tap = (EthernetTap *)0;
|
||||
nw->_enabled = true;
|
||||
nw->_lastConfigUpdate = 0;
|
||||
nw->_destroyed = false;
|
||||
nw->_netconfFailure = NETCONF_FAILURE_NONE;
|
||||
|
||||
if (nw->controller() == renv->identity.address()) // TODO: fix Switch to allow packets to self
|
||||
throw std::runtime_error("cannot join a network for which I am the netconf master");
|
||||
|
||||
try {
|
||||
nw->_restoreState();
|
||||
nw->requestConfiguration();
|
||||
} catch ( ... ) {
|
||||
nw->_lastConfigUpdate = 0; // call requestConfiguration() again
|
||||
}
|
||||
|
||||
return nw;
|
||||
}
|
||||
|
||||
// Function object used by rescanMulticastGroups()
|
||||
class AnnounceMulticastGroupsToPeersWithActiveDirectPaths
|
||||
{
|
||||
|
|
@ -154,105 +156,16 @@ private:
|
|||
std::vector<Address> _supernodeAddresses;
|
||||
};
|
||||
|
||||
bool Network::rescanMulticastGroups()
|
||||
{
|
||||
bool updated = false;
|
||||
|
||||
{
|
||||
Mutex::Lock _l(_lock);
|
||||
EthernetTap *t = _tap;
|
||||
if (t) {
|
||||
// Grab current groups from the local tap
|
||||
updated = t->updateMulticastGroups(_myMulticastGroups);
|
||||
|
||||
// Merge in learned groups from any hosts bridged in behind us
|
||||
for(std::map<MulticastGroup,uint64_t>::const_iterator mg(_multicastGroupsBehindMe.begin());mg!=_multicastGroupsBehindMe.end();++mg)
|
||||
_myMulticastGroups.insert(mg->first);
|
||||
|
||||
// Add or remove BROADCAST group based on broadcast enabled netconf flag
|
||||
if ((_config)&&(_config->enableBroadcast())) {
|
||||
if (!_myMulticastGroups.count(BROADCAST)) {
|
||||
_myMulticastGroups.insert(BROADCAST);
|
||||
updated = true;
|
||||
}
|
||||
} else {
|
||||
if (_myMulticastGroups.count(BROADCAST)) {
|
||||
_myMulticastGroups.erase(BROADCAST);
|
||||
updated = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (updated) {
|
||||
AnnounceMulticastGroupsToPeersWithActiveDirectPaths afunc(RR,this);
|
||||
RR->topology->eachPeer<AnnounceMulticastGroupsToPeersWithActiveDirectPaths &>(afunc);
|
||||
}
|
||||
|
||||
return updated;
|
||||
}
|
||||
|
||||
bool Network::applyConfiguration(const SharedPtr<NetworkConfig> &conf)
|
||||
{
|
||||
Mutex::Lock _l(_lock);
|
||||
|
||||
if (_destroyed)
|
||||
return false;
|
||||
|
||||
try {
|
||||
if ((conf->networkId() == _id)&&(conf->issuedTo() == RR->identity.address())) {
|
||||
std::vector<InetAddress> oldStaticIps;
|
||||
if (_config)
|
||||
oldStaticIps = _config->staticIps();
|
||||
|
||||
_config = conf;
|
||||
|
||||
_lastConfigUpdate = Utils::now();
|
||||
_lastConfigUpdate = RR->node->now();
|
||||
_netconfFailure = NETCONF_FAILURE_NONE;
|
||||
|
||||
EthernetTap *t = _tap;
|
||||
if (t) {
|
||||
char fname[1024];
|
||||
_mkNetworkFriendlyName(fname,sizeof(fname));
|
||||
t->setFriendlyName(fname);
|
||||
|
||||
// Remove previously configured static IPs that are gone
|
||||
for(std::vector<InetAddress>::const_iterator oldip(oldStaticIps.begin());oldip!=oldStaticIps.end();++oldip) {
|
||||
if (std::find(_config->staticIps().begin(),_config->staticIps().end(),*oldip) == _config->staticIps().end())
|
||||
t->removeIP(*oldip);
|
||||
}
|
||||
|
||||
// Add new static IPs that were not in previous config
|
||||
for(std::vector<InetAddress>::const_iterator newip(_config->staticIps().begin());newip!=_config->staticIps().end();++newip) {
|
||||
if (std::find(oldStaticIps.begin(),oldStaticIps.end(),*newip) == oldStaticIps.end())
|
||||
t->addIP(*newip);
|
||||
}
|
||||
|
||||
#ifdef __APPLE__
|
||||
// Make sure there's an IPv6 link-local address on Macs if IPv6 is enabled
|
||||
// Other OSes don't need this -- Mac seems not to want to auto-assign
|
||||
// This might go away once we integrate properly w/Mac network setup stuff.
|
||||
if (_config->permitsEtherType(ZT_ETHERTYPE_IPV6)) {
|
||||
bool haveV6LinkLocal = false;
|
||||
std::set<InetAddress> ips(t->ips());
|
||||
for(std::set<InetAddress>::const_iterator i(ips.begin());i!=ips.end();++i) {
|
||||
if ((i->isV6())&&(i->isLinkLocal())) {
|
||||
haveV6LinkLocal = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!haveV6LinkLocal)
|
||||
t->addIP(InetAddress::makeIpv6LinkLocal(_mac));
|
||||
}
|
||||
#endif // __APPLE__
|
||||
|
||||
// ... IPs that were never controlled by static assignment are left
|
||||
// alone, as these may be DHCP or user-configured.
|
||||
} else {
|
||||
if (!_setupThread)
|
||||
_setupThread = Thread::start<Network>(this);
|
||||
}
|
||||
|
||||
return true;
|
||||
} else {
|
||||
LOG("ignored invalid configuration for network %.16llx (configuration contains mismatched network ID or issued-to address)",(unsigned long long)_id);
|
||||
|
|
@ -262,7 +175,6 @@ bool Network::applyConfiguration(const SharedPtr<NetworkConfig> &conf)
|
|||
} catch ( ... ) {
|
||||
LOG("ignored invalid configuration for network %.16llx (unknown exception)",(unsigned long long)_id);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -277,12 +189,9 @@ int Network::setConfiguration(const Dictionary &conf,bool saveToDisk)
|
|||
}
|
||||
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);
|
||||
}
|
||||
char n[128];
|
||||
Utils::snprintf(n,sizeof(n),"networks.d/%.16llx.conf",_id);
|
||||
RR->node->dataStorePut(n,conf.toString(),true);
|
||||
}
|
||||
return 2; // OK and configuration has changed
|
||||
}
|
||||
|
|
@ -298,9 +207,26 @@ void Network::requestConfiguration()
|
|||
return;
|
||||
|
||||
if (controller() == RR->identity.address()) {
|
||||
// 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);
|
||||
return;
|
||||
if (RR->netconfMaster) {
|
||||
SharedPtr<NetworkConfig> nconf(config2());
|
||||
Dictionary newconf;
|
||||
switch(RR->netconfMaster->doNetworkConfigRequest(InetAddress(),RR->identity,_id,Dictionary(),(nconf) ? nconf->revision() : (uint64_t)0,newconf)) {
|
||||
case NetworkConfigMaster::NETCONF_QUERY_OK:
|
||||
this->setConfiguration(newconf,true);
|
||||
return;
|
||||
case NetworkConfigMaster::NETCONF_QUERY_OBJECT_NOT_FOUND:
|
||||
this->setNotFound();
|
||||
return;
|
||||
case NetworkConfigMaster::NETCONF_QUERY_ACCESS_DENIED:
|
||||
this->setAccessDenied();
|
||||
return;
|
||||
default:
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
this->setNotFound();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
TRACE("requesting netconf for network %.16llx from netconf master %s",(unsigned long long)_id,controller().toString().c_str());
|
||||
|
|
@ -310,7 +236,7 @@ void Network::requestConfiguration()
|
|||
{
|
||||
Mutex::Lock _l(_lock);
|
||||
if (_config)
|
||||
outp.append((uint64_t)_config->timestamp());
|
||||
outp.append((uint64_t)_config->revision());
|
||||
else outp.append((uint64_t)0);
|
||||
}
|
||||
RR->sw->send(outp,true);
|
||||
|
|
@ -494,178 +420,24 @@ void Network::destroy()
|
|||
_tap = (EthernetTap *)0;
|
||||
}
|
||||
|
||||
// Ethernet tap creation thread -- required on some platforms where tap
|
||||
// creation may be time consuming (e.g. Windows). Thread exits after tap
|
||||
// device setup.
|
||||
void Network::threadMain()
|
||||
throw()
|
||||
{
|
||||
char fname[1024],lcentry[128];
|
||||
Utils::snprintf(lcentry,sizeof(lcentry),"_dev_for_%.16llx",(unsigned long long)_id);
|
||||
|
||||
EthernetTap *t = (EthernetTap *)0;
|
||||
try {
|
||||
std::string desiredDevice(_nc->getLocalConfig(lcentry));
|
||||
_mkNetworkFriendlyName(fname,sizeof(fname));
|
||||
|
||||
t = RR->tapFactory->open(_mac,ZT_IF_MTU,ZT_DEFAULT_IF_METRIC,_id,(desiredDevice.length() > 0) ? desiredDevice.c_str() : (const char *)0,fname,_CBhandleTapData,this);
|
||||
|
||||
std::string dn(t->deviceName());
|
||||
if ((dn.length())&&(dn != desiredDevice))
|
||||
_nc->putLocalConfig(lcentry,dn);
|
||||
} catch (std::exception &exc) {
|
||||
delete t;
|
||||
t = (EthernetTap *)0;
|
||||
LOG("network %.16llx failed to initialize: %s",_id,exc.what());
|
||||
_netconfFailure = NETCONF_FAILURE_INIT_FAILED;
|
||||
} catch ( ... ) {
|
||||
delete t;
|
||||
t = (EthernetTap *)0;
|
||||
LOG("network %.16llx failed to initialize: unknown error",_id);
|
||||
_netconfFailure = NETCONF_FAILURE_INIT_FAILED;
|
||||
}
|
||||
|
||||
{
|
||||
Mutex::Lock _l(_lock);
|
||||
if (_tap) // the tap creation thread can technically be re-launched, though this isn't done right now
|
||||
RR->tapFactory->close(_tap,false);
|
||||
_tap = t;
|
||||
if (t) {
|
||||
if (_config) {
|
||||
for(std::vector<InetAddress>::const_iterator newip(_config->staticIps().begin());newip!=_config->staticIps().end();++newip)
|
||||
t->addIP(*newip);
|
||||
}
|
||||
t->setEnabled(_enabled);
|
||||
}
|
||||
}
|
||||
|
||||
rescanMulticastGroups();
|
||||
}
|
||||
|
||||
void Network::_CBhandleTapData(void *arg,const MAC &from,const MAC &to,unsigned int etherType,const Buffer<4096> &data)
|
||||
{
|
||||
SharedPtr<Network> network((Network *)arg,true);
|
||||
if ((!network)||(!network->_enabled)||(network->status() != NETWORK_OK))
|
||||
return;
|
||||
try {
|
||||
network->RR->sw->onLocalEthernet(network,from,to,etherType,data);
|
||||
} catch (std::exception &exc) {
|
||||
TRACE("unexpected exception handling local packet: %s",exc.what());
|
||||
} catch ( ... ) {
|
||||
TRACE("unexpected exception handling local packet");
|
||||
}
|
||||
}
|
||||
|
||||
void Network::_restoreState()
|
||||
{
|
||||
Buffer<ZT_NETWORK_CERT_WRITE_BUF_SIZE> buf;
|
||||
|
||||
std::string idstr(idString());
|
||||
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");
|
||||
|
||||
if (_id == ZT_TEST_NETWORK_ID) {
|
||||
applyConfiguration(NetworkConfig::createTestNetworkConfig(RR->identity.address()));
|
||||
|
||||
// "Touch" path to this ID to remember test network membership
|
||||
FILE *tmp = fopen(confPath.c_str(),"w");
|
||||
if (tmp) fclose(tmp);
|
||||
} else {
|
||||
// Read configuration file containing last config from netconf master
|
||||
{
|
||||
std::string confs;
|
||||
if (Utils::readFile(confPath.c_str(),confs)) {
|
||||
try {
|
||||
if (confs.length())
|
||||
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 if there is one
|
||||
Mutex::Lock _l(_lock);
|
||||
if ((_config)&&(!_config->isPublic())&&(Utils::fileExists(mcdbPath.c_str()))) {
|
||||
CertificateOfMembership com;
|
||||
|
||||
_membershipCertificates.clear();
|
||||
|
||||
FILE *mcdb = fopen(mcdbPath.c_str(),"rb");
|
||||
if (mcdb) {
|
||||
try {
|
||||
char magic[6];
|
||||
if ((fread(magic,6,1,mcdb) == 1)&&(!memcmp("ZTMCD0",magic,6))) {
|
||||
long rlen = 0;
|
||||
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);
|
||||
if (rlen < 0) rlen = 0;
|
||||
buf.setSize(buf.size() + (unsigned int)rlen);
|
||||
unsigned int ptr = 0;
|
||||
while ((ptr < (ZT_NETWORK_CERT_WRITE_BUF_SIZE / 2))&&(ptr < buf.size())) {
|
||||
ptr += com.deserialize(buf,ptr);
|
||||
if (com.issuedTo())
|
||||
_membershipCertificates[com.issuedTo()] = com;
|
||||
}
|
||||
buf.behead(ptr);
|
||||
} while (rlen > 0);
|
||||
fclose(mcdb);
|
||||
} else {
|
||||
fclose(mcdb);
|
||||
Utils::rm(mcdbPath);
|
||||
}
|
||||
} catch ( ... ) {
|
||||
// Membership cert dump file invalid. We'll re-learn them off the net.
|
||||
_membershipCertificates.clear();
|
||||
fclose(mcdb);
|
||||
Utils::rm(mcdbPath);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Network::_dumpMembershipCerts()
|
||||
{
|
||||
Buffer<ZT_NETWORK_CERT_WRITE_BUF_SIZE> buf;
|
||||
std::string mcdbPath(RR->homePath + ZT_PATH_SEPARATOR_S + "networks.d" + ZT_PATH_SEPARATOR_S + idString() + ".mcerts");
|
||||
char n[128];
|
||||
std::string buf("ZTMCD0");
|
||||
|
||||
Utils::snprintf(n,sizeof(n),"networks.d/%.16llx.mcerts",_id);
|
||||
|
||||
Mutex::Lock _l(_lock);
|
||||
|
||||
if (!_config)
|
||||
return;
|
||||
|
||||
if ((!_id)||(_config->isPublic())) {
|
||||
Utils::rm(mcdbPath);
|
||||
if ((!_config)||(_config.isPublic())||(_membershipCertificates.size() == 0)) {
|
||||
RR->node->dataStoreDelete(n);
|
||||
return;
|
||||
}
|
||||
|
||||
FILE *mcdb = fopen(mcdbPath.c_str(),"wb");
|
||||
if (!mcdb)
|
||||
return;
|
||||
for(std::map<Address,CertificateOfMembership>::iterator c(_membershipCertificates.begin());c!=_membershipCertificates.end();++c)
|
||||
c->second.serialize2(buf);
|
||||
|
||||
if (fwrite("ZTMCD0",6,1,mcdb) != 1) {
|
||||
fclose(mcdb);
|
||||
Utils::rm(mcdbPath);
|
||||
return;
|
||||
}
|
||||
|
||||
for(std::map<Address,CertificateOfMembership>::iterator c=(_membershipCertificates.begin());c!=_membershipCertificates.end();++c) {
|
||||
buf.clear();
|
||||
c->second.serialize(buf);
|
||||
if (buf.size() > 0) {
|
||||
if (fwrite(buf.data(),buf.size(),1,mcdb) != 1) {
|
||||
fclose(mcdb);
|
||||
Utils::rm(mcdbPath);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fclose(mcdb);
|
||||
Utils::lockDownFile(mcdbPath.c_str(),false);
|
||||
RR->node->dataStorePut(n,buf,true);
|
||||
}
|
||||
|
||||
} // namespace ZeroTier
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue