Move rest of NodeControl stuff out of node/ and into control/

5 files changed, 123 insertions, 278 deletions

diff --git a/node/Node.cpp b/node/Node.cpp
index 9fe7a3cb..36a199b9 100644
--- a/node/Node.cpp
+++ b/node/Node.cpp
@@ -338,35 +338,37 @@ Node::ReasonForTermination Node::run()
 		_r->prng = new CMWC4096();
 
 		// Read identity public and secret, generating if not present
-		bool gotId = false;
-		std::string identitySecretPath(_r->homePath + ZT_PATH_SEPARATOR_S + "identity.secret");
-		std::string identityPublicPath(_r->homePath + ZT_PATH_SEPARATOR_S + "identity.public");
-		std::string idser;
-		if (Utils::readFile(identitySecretPath.c_str(),idser))
-			gotId = _r->identity.fromString(idser);
-		if ((gotId)&&(!_r->identity.locallyValidate()))
-			gotId = false;
-		if (gotId) {
-			// Make sure identity.public matches identity.secret
-			idser = std::string();
-			Utils::readFile(identityPublicPath.c_str(),idser);
-			std::string pubid(_r->identity.toString(false));
-			if (idser != pubid) {
-				if (!Utils::writeFile(identityPublicPath.c_str(),pubid))
+		{
+			bool gotId = false;
+			std::string identitySecretPath(_r->homePath + ZT_PATH_SEPARATOR_S + "identity.secret");
+			std::string identityPublicPath(_r->homePath + ZT_PATH_SEPARATOR_S + "identity.public");
+			std::string idser;
+			if (Utils::readFile(identitySecretPath.c_str(),idser))
+				gotId = _r->identity.fromString(idser);
+			if ((gotId)&&(!_r->identity.locallyValidate()))
+				gotId = false;
+			if (gotId) {
+				// Make sure identity.public matches identity.secret
+				idser = std::string();
+				Utils::readFile(identityPublicPath.c_str(),idser);
+				std::string pubid(_r->identity.toString(false));
+				if (idser != pubid) {
+					if (!Utils::writeFile(identityPublicPath.c_str(),pubid))
+						return impl->terminateBecause(Node::NODE_UNRECOVERABLE_ERROR,"could not write identity.public (home path not writable?)");
+				}
+			} else {
+				LOG("no identity found or identity invalid, generating one... this might take a few seconds...");
+				_r->identity.generate();
+				LOG("generated new identity: %s",_r->identity.address().toString().c_str());
+				idser = _r->identity.toString(true);
+				if (!Utils::writeFile(identitySecretPath.c_str(),idser))
+					return impl->terminateBecause(Node::NODE_UNRECOVERABLE_ERROR,"could not write identity.secret (home path not writable?)");
+				idser = _r->identity.toString(false);
+				if (!Utils::writeFile(identityPublicPath.c_str(),idser))
 					return impl->terminateBecause(Node::NODE_UNRECOVERABLE_ERROR,"could not write identity.public (home path not writable?)");
 			}
-		} else {
-			LOG("no identity found or identity invalid, generating one... this might take a few seconds...");
-			_r->identity.generate();
-			LOG("generated new identity: %s",_r->identity.address().toString().c_str());
-			idser = _r->identity.toString(true);
-			if (!Utils::writeFile(identitySecretPath.c_str(),idser))
-				return impl->terminateBecause(Node::NODE_UNRECOVERABLE_ERROR,"could not write identity.secret (home path not writable?)");
-			idser = _r->identity.toString(false);
-			if (!Utils::writeFile(identityPublicPath.c_str(),idser))
-				return impl->terminateBecause(Node::NODE_UNRECOVERABLE_ERROR,"could not write identity.public (home path not writable?)");
+			Utils::lockDownFile(identitySecretPath.c_str(),false);
 		}
-		Utils::lockDownFile(identitySecretPath.c_str(),false);
 
 		// Make sure networks.d exists
 		{
@@ -378,21 +380,6 @@ Node::ReasonForTermination Node::run()
 #endif
 		}
 
-		// Read configuration authentication token, generating if not present
-		std::string configAuthTokenPath(_r->homePath + ZT_PATH_SEPARATOR_S + "authtoken.secret");
-		std::string configAuthToken;
-		if (!Utils::readFile(configAuthTokenPath.c_str(),configAuthToken)) {
-			configAuthToken = "";
-			unsigned int sr = 0;
-			for(unsigned int i=0;i<24;++i) {
-				Utils::getSecureRandom(&sr,sizeof(sr));
-				configAuthToken.push_back("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"[sr % 62]);
-			}
-			if (!Utils::writeFile(configAuthTokenPath.c_str(),configAuthToken))
-				return impl->terminateBecause(Node::NODE_UNRECOVERABLE_ERROR,"could not write authtoken.secret (home path not writable?)");
-		}
-		Utils::lockDownFile(configAuthTokenPath.c_str(),false);
-
 		_r->http = new HttpClient();
 		_r->antiRec = new AntiRecursion();
 		_r->mc = new Multicaster();
@@ -400,7 +387,7 @@ Node::ReasonForTermination Node::run()
 		_r->sm = new SocketManager(impl->udpPort,impl->tcpPort,&_CBztTraffic,_r);
 		_r->topology = new Topology(_r,Utils::fileExists((_r->homePath + ZT_PATH_SEPARATOR_S + "iddb.d").c_str()));
 		try {
-			_r->nc = new NodeConfig(_r,configAuthToken.c_str());
+			_r->nc = new NodeConfig(_r);
 		} catch (std::exception &exc) {
 			return impl->terminateBecause(Node::NODE_UNRECOVERABLE_ERROR,"unable to initialize IPC socket: is ZeroTier One already running?");
 		}
@@ -416,28 +403,30 @@ Node::ReasonForTermination Node::run()
 #endif
 
 		// Initialize root topology from defaults or root-toplogy file in home path on disk
-		std::string rootTopologyPath(_r->homePath + ZT_PATH_SEPARATOR_S + "root-topology");
-		std::string rootTopology;
-		if (!Utils::readFile(rootTopologyPath.c_str(),rootTopology))
-			rootTopology = ZT_DEFAULTS.defaultRootTopology;
-		try {
-			Dictionary rt(rootTopology);
-
-			if (Topology::authenticateRootTopology(rt)) {
-				// Set supernodes if root topology signature is valid
-				_r->topology->setSupernodes(Dictionary(rt.get("supernodes",""))); // set supernodes from root-topology
-
-				// If root-topology contains noupdate=1, disable further updates and only use what was on disk
-				impl->disableRootTopologyUpdates = (Utils::strToInt(rt.get("noupdate","0").c_str()) > 0);
-			} else {
-				// Revert to built-in defaults if root topology fails signature check
-				LOG("%s failed signature check, using built-in defaults instead",rootTopologyPath.c_str());
-				Utils::rm(rootTopologyPath.c_str());
-				_r->topology->setSupernodes(Dictionary(Dictionary(ZT_DEFAULTS.defaultRootTopology).get("supernodes","")));
-				impl->disableRootTopologyUpdates = false;
+		{
+			std::string rootTopologyPath(_r->homePath + ZT_PATH_SEPARATOR_S + "root-topology");
+			std::string rootTopology;
+			if (!Utils::readFile(rootTopologyPath.c_str(),rootTopology))
+				rootTopology = ZT_DEFAULTS.defaultRootTopology;
+			try {
+				Dictionary rt(rootTopology);
+
+				if (Topology::authenticateRootTopology(rt)) {
+					// Set supernodes if root topology signature is valid
+					_r->topology->setSupernodes(Dictionary(rt.get("supernodes",""))); // set supernodes from root-topology
+
+					// If root-topology contains noupdate=1, disable further updates and only use what was on disk
+					impl->disableRootTopologyUpdates = (Utils::strToInt(rt.get("noupdate","0").c_str()) > 0);
+				} else {
+					// Revert to built-in defaults if root topology fails signature check
+					LOG("%s failed signature check, using built-in defaults instead",rootTopologyPath.c_str());
+					Utils::rm(rootTopologyPath.c_str());
+					_r->topology->setSupernodes(Dictionary(Dictionary(ZT_DEFAULTS.defaultRootTopology).get("supernodes","")));
+					impl->disableRootTopologyUpdates = false;
+				}
+			} catch ( ... ) {
+				return impl->terminateBecause(Node::NODE_UNRECOVERABLE_ERROR,"invalid root-topology format");
 			}
-		} catch ( ... ) {
-			return impl->terminateBecause(Node::NODE_UNRECOVERABLE_ERROR,"invalid root-topology format");
 		}
 	} catch (std::bad_alloc &exc) {
 		return impl->terminateBecause(Node::NODE_UNRECOVERABLE_ERROR,"memory allocation failure");
@@ -487,6 +476,9 @@ Node::ReasonForTermination Node::run()
 		uint64_t networkConfigurationFingerprint = 0;
 		_r->timeOfLastResynchronize = Utils::now();
 
+		// We are up and running
+		_r->initialized = true;
+
 		while (impl->reasonForTermination == NODE_RUNNING) {
 			/* This is how the service automatically shuts down when the OSX .app is
 			 * thrown in the trash. It's not used on any other platform for now but
@@ -705,6 +697,38 @@ bool Node::online()
 	return false;
 }
 
+bool Node::started()
+	throw()
+{
+	_NodeImpl *impl = (_NodeImpl *)_impl;
+	return impl->started;
+}
+
+bool Node::running()
+	throw()
+{
+	_NodeImpl *impl = (_NodeImpl *)_impl;
+	return impl->running;
+}
+
+bool Node::initialized()
+	throw()
+{
+	_NodeImpl *impl = (_NodeImpl *)_impl;
+	RuntimeEnvironment *_r = (RuntimeEnvironment *)&(impl->renv);
+	return ((_r)&&(_r->initialized));
+}
+
+uint64_t Node::address()
+	throw()
+{
+	_NodeImpl *impl = (_NodeImpl *)_impl;
+	RuntimeEnvironment *_r = (RuntimeEnvironment *)&(impl->renv);
+	if ((!_r)||(!_r->initialized))
+		return 0;
+	return _r->identity.address().toInt();
+}
+
 void Node::join(uint64_t nwid)
 	throw()
 {
@@ -957,7 +981,8 @@ ZT1_Node_NetworkList *Node::listNetworks()
 void Node::freeQueryResult(void *qr)
 	throw()
 {
-	::free(qr);
+	if (qr)
+		::free(qr);
 }
 
 bool Node::updateCheck()
diff --git a/node/Node.hpp b/node/Node.hpp
index 29fe494c..32342349 100644
--- a/node/Node.hpp
+++ b/node/Node.hpp
@@ -28,6 +28,8 @@
 #ifndef ZT_NODE_HPP
 #define ZT_NODE_HPP
 
+#include <stdint.h>
+
 #include "../include/ZeroTierOne.h"
 
 namespace ZeroTier {
@@ -138,6 +140,30 @@ public:
 		throw();
 
 	/**
+	 * @return True if run() has been called
+	 */
+	bool started()
+		throw();
+
+	/**
+	 * @return True if run() has not yet returned
+	 */
+	bool running()
+		throw();
+
+	/**
+	 * @return True if initialization phase of startup is complete
+	 */
+	bool initialized()
+		throw();
+
+	/**
+	 * @return This node's address (in least significant 40 bits of 64-bit int) or 0 if not yet initialized
+	 */
+	uint64_t address()
+		throw();
+
+	/**
 	 * Join a network
 	 *
 	 * Use getNetworkStatus() to check the network's status after joining. If you
diff --git a/node/NodeConfig.cpp b/node/NodeConfig.cpp
index 996163d0..bd676660 100644
--- a/node/NodeConfig.cpp
+++ b/node/NodeConfig.cpp
@@ -51,10 +51,8 @@
 
 namespace ZeroTier {
 
-NodeConfig::NodeConfig(const RuntimeEnvironment *renv,const char *authToken) :
+NodeConfig::NodeConfig(const RuntimeEnvironment *renv) :
 	_r(renv)
-//	_ipcListener((std::string(ZT_IPC_ENDPOINT_BASE) + renv->identity.address().toString()).c_str(),&_CBcommandHandler,this),
-//	_authToken(authToken)
 {
 	{
 		Mutex::Lock _l(_localConfig_m);
@@ -89,14 +87,6 @@ NodeConfig::NodeConfig(const RuntimeEnvironment *renv,const char *authToken) :
 NodeConfig::~NodeConfig()
 {
 	_writeLocalConfig();
-
-	// Close any open IPC connections
-	/*
-	Mutex::Lock _l(_connections_m);
-	for(std::map< IpcConnection *,bool >::iterator c(_connections.begin());c!=_connections.end();++c)
-		delete c->first;
-	_connections.clear();
-	*/
 }
 
 void NodeConfig::putLocalConfig(const std::string &key,const char *value)
@@ -129,192 +119,6 @@ void NodeConfig::clean()
 		n->second->clean();
 }
 
-/*
-void NodeConfig::_CBcommandHandler(void *arg,IpcConnection *ipcc,IpcConnection::EventType event,const char *commandLine)
-{
-	switch(event) {
-		case IpcConnection::IPC_EVENT_COMMAND:
-			((NodeConfig *)arg)->_doCommand(ipcc,commandLine);
-			break;
-		case IpcConnection::IPC_EVENT_NEW_CONNECTION: {
-			Mutex::Lock _l(((NodeConfig *)arg)->_connections_m);
-			((NodeConfig *)arg)->_connections[ipcc] = false; // not yet authenticated
-		}	break;
-		case IpcConnection::IPC_EVENT_CONNECTION_CLOSED: {
-			Mutex::Lock _l(((NodeConfig *)arg)->_connections_m);
-			((NodeConfig *)arg)->_connections.erase(ipcc);
-			delete ipcc;
-		}	break;
-	}
-}
-
-// Used with Topology::eachPeer to dump peer stats
-class _DumpPeerStatistics
-{
-public:
-	_DumpPeerStatistics(IpcConnection *i) :
-		ipcc(i),
-		now(Utils::now())
-	{
-	}
-	inline void operator()(Topology &t,const SharedPtr<Peer> &p)
-	{
-		std::vector<Path> pp(p->paths());
-		std::string pathsStr;
-		for(std::vector<Path>::const_iterator ppp(pp.begin());ppp!=pp.end();++ppp) {
-			if (pathsStr.length())
-				pathsStr.push_back(',');
-			pathsStr.append(ppp->toString());
-		}
-		ipcc->printf("200 listpeers %s %s %u %s"ZT_EOL_S,
-			p->address().toString().c_str(),
-			((pathsStr.length() > 0) ? pathsStr.c_str() : "-"),
-			p->latency(),
-			p->remoteVersion().c_str());
-	}
-	IpcConnection *ipcc;
-	uint64_t now;
-};
-
-void NodeConfig::_doCommand(IpcConnection *ipcc,const char *commandLine)
-{
-	if ((!commandLine)||(!commandLine[0]))
-		return;
-	std::vector<std::string> r;
-	std::vector<std::string> cmd(Utils::split(commandLine,"\r\n \t","\\","'"));
-
-	if ((cmd.empty())||(cmd[0] == "help")) {
-		ipcc->printf("200 help help"ZT_EOL_S);
-		ipcc->printf("200 help auth <token>"ZT_EOL_S);
-		ipcc->printf("200 help info"ZT_EOL_S);
-		ipcc->printf("200 help listpeers"ZT_EOL_S);
-		ipcc->printf("200 help listnetworks"ZT_EOL_S);
-		ipcc->printf("200 help join <network ID>"ZT_EOL_S);
-		ipcc->printf("200 help leave <network ID>"ZT_EOL_S);
-		ipcc->printf("200 help terminate [<reason>]"ZT_EOL_S);
-		ipcc->printf("200 help updatecheck"ZT_EOL_S);
-	} else if (cmd[0] == "auth") {
-		if ((cmd.size() > 1)&&(_authToken == cmd[1])) {
-			Mutex::Lock _l(_connections_m);
-			_connections[ipcc] = true;
-			ipcc->printf("200 auth OK"ZT_EOL_S);
-		} else ipcc->printf("403 auth failed"ZT_EOL_S);
-	} else {
-		{
-			Mutex::Lock _l(_connections_m);
-			if (!_connections[ipcc]) {
-				ipcc->printf("403 %s unauthorized"ZT_EOL_S"."ZT_EOL_S,cmd[0].c_str());
-				return;
-			}
-		}
-
-		if (cmd[0] == "info") {
-			// We are online if at least one supernode has spoken to us since the last time our
-			// network environment changed and also less than ZT_PEER_LINK_ACTIVITY_TIMEOUT ago.
-			bool isOnline = false;
-			uint64_t now = Utils::now();
-			uint64_t since = _r->timeOfLastResynchronize;
-			std::vector< SharedPtr<Peer> > snp(_r->topology->supernodePeers());
-			for(std::vector< SharedPtr<Peer> >::const_iterator sn(snp.begin());sn!=snp.end();++sn) {
-				uint64_t lastRec = (*sn)->lastDirectReceive();
-				if ((lastRec)&&(lastRec > since)&&((now - lastRec) < ZT_PEER_PATH_ACTIVITY_TIMEOUT)) {
-					isOnline = true;
-					break;
-				}
-			}
-
-			ipcc->printf("200 info %s %s %s"ZT_EOL_S,_r->identity.address().toString().c_str(),(isOnline ? "ONLINE" : "OFFLINE"),Node::versionString());
-		} else if (cmd[0] == "listpeers") {
-			ipcc->printf("200 listpeers <ztaddr> <paths> <latency> <version>"ZT_EOL_S);
-			_r->topology->eachPeer(_DumpPeerStatistics(ipcc));
-		} else if (cmd[0] == "listnetworks") {
-			Mutex::Lock _l(_networks_m);
-			ipcc->printf("200 listnetworks <nwid> <name> <mac> <status> <config age> <type> <dev> <ips>"ZT_EOL_S);
-			for(std::map< uint64_t,SharedPtr<Network> >::const_iterator nw(_networks.begin());nw!=_networks.end();++nw) {
-				std::string tmp;
-				std::set<InetAddress> ips(nw->second->ips());
-				for(std::set<InetAddress>::iterator i(ips.begin());i!=ips.end();++i) {
-					if (tmp.length())
-						tmp.push_back(',');
-					tmp.append(i->toString());
-				}
-
-				SharedPtr<NetworkConfig> nconf(nw->second->config2());
-
-				long long age = (nconf) ? ((long long)Utils::now() - (long long)nconf->timestamp()) : (long long)0;
-				if (age < 0)
-					age = 0;
-				age /= 1000;
-
-				std::string dn(nw->second->tapDeviceName());
-				ipcc->printf("200 listnetworks %.16llx %s %s %s %lld %s %s %s"ZT_EOL_S,
-					(unsigned long long)nw->first,
-					((nconf) ? nconf->name().c_str() : "?"),
-					nw->second->mac().toString().c_str(),
-					Network::statusString(nw->second->status()),
-					age,
-					((nconf) ? (nconf->isPublic() ? "public" : "private") : "?"),
-					(dn.length() > 0) ? dn.c_str() : "?",
-					((tmp.length() > 0) ? tmp.c_str() : "-"));
-			}
-		} else if (cmd[0] == "join") {
-			if (cmd.size() > 1) {
-				uint64_t nwid = Utils::hexStrToU64(cmd[1].c_str());
-				if (nwid > 0) {
-					Mutex::Lock _l(_networks_m);
-					if (_networks.count(nwid)) {
-						ipcc->printf("409 already a member of %.16llx"ZT_EOL_S,(unsigned long long)nwid);
-					} else {
-						try {
-							SharedPtr<Network> nw(Network::newInstance(_r,this,nwid));
-							_networks[nwid] = nw;
-							ipcc->printf("200 join %.16llx OK"ZT_EOL_S,(unsigned long long)nwid);
-						} catch (std::exception &exc) {
-							ipcc->printf("500 join %.16llx ERROR: %s"ZT_EOL_S,(unsigned long long)nwid,exc.what());
-						} catch ( ... ) {
-							ipcc->printf("500 join %.16llx ERROR: (unknown exception)"ZT_EOL_S,(unsigned long long)nwid);
-						}
-					}
-				} else {
-					ipcc->printf("400 join requires a network ID (>0) in hexadecimal format"ZT_EOL_S);
-				}
-			} else {
-				ipcc->printf("400 join requires a network ID (>0) in hexadecimal format"ZT_EOL_S);
-			}
-		} else if (cmd[0] == "leave") {
-			if (cmd.size() > 1) {
-				Mutex::Lock _l(_networks_m);
-				uint64_t nwid = Utils::hexStrToU64(cmd[1].c_str());
-				std::map< uint64_t,SharedPtr<Network> >::iterator nw(_networks.find(nwid));
-				if (nw == _networks.end()) {
-					ipcc->printf("404 leave %.16llx ERROR: not a member of that network"ZT_EOL_S,(unsigned long long)nwid);
-				} else {
-					nw->second->destroy();
-					_networks.erase(nw);
-				}
-			} else {
-				ipcc->printf("400 leave requires a network ID (>0) in hexadecimal format"ZT_EOL_S);
-			}
-		} else if (cmd[0] == "terminate") {
-			if (cmd.size() > 1)
-				_r->node->terminate(Node::NODE_NORMAL_TERMINATION,cmd[1].c_str());
-			else _r->node->terminate(Node::NODE_NORMAL_TERMINATION,"terminate via IPC command");
-		} else if (cmd[0] == "updatecheck") {
-			if (_r->updater) {
-				ipcc->printf("200 checking for software updates now at: %s"ZT_EOL_S,ZT_DEFAULTS.updateLatestNfoURL.c_str());
-				_r->updater->checkNow();
-			} else {
-				ipcc->printf("500 software updates are not enabled"ZT_EOL_S);
-			}
-		} else {
-			ipcc->printf("404 %s No such command. Use 'help' for help."ZT_EOL_S,cmd[0].c_str());
-		}
-	}
-
-	ipcc->printf("."ZT_EOL_S); // blank line ends response
-}
-*/
-
 void NodeConfig::_readLocalConfig()
 {
 	// assumes _localConfig_m is locked
diff --git a/node/NodeConfig.hpp b/node/NodeConfig.hpp
index d374eee6..c53ffd6e 100644
--- a/node/NodeConfig.hpp
+++ b/node/NodeConfig.hpp
@@ -54,10 +54,9 @@ class NodeConfig
 public:
 	/**
 	 * @param renv Runtime environment
-	 * @param authToken Configuration authentication token
 	 * @throws std::runtime_error Unable to initialize or listen for IPC connections
 	 */
-	NodeConfig(const RuntimeEnvironment *renv,const char *authToken);
+	NodeConfig(const RuntimeEnvironment *renv);
 
 	~NodeConfig();
 
@@ -164,27 +163,12 @@ public:
 		return tapDevs;
 	}
 
-private:
-	/*
-	static void _CBcommandHandler(void *arg,IpcConnection *ipcc,IpcConnection::EventType event,const char *commandLine);
-	void _doCommand(IpcConnection *ipcc,const char *commandLine);
-	*/
-
 	void _readLocalConfig();
 	void _writeLocalConfig();
 
 	const RuntimeEnvironment *_r;
-
-	/*
-	IpcListener _ipcListener;
-	std::string _authToken;
-	std::map< IpcConnection *,bool > _connections;
-	Mutex _connections_m;
-	*/
-
 	Dictionary _localConfig; // persisted as local.conf
 	Mutex _localConfig_m;
-
 	std::map< uint64_t,SharedPtr<Network> > _networks; // persisted in networks.d/
 	Mutex _networks_m;
 };
diff --git a/node/RuntimeEnvironment.hpp b/node/RuntimeEnvironment.hpp
index 21fbc73a..767dd564 100644
--- a/node/RuntimeEnvironment.hpp
+++ b/node/RuntimeEnvironment.hpp
@@ -66,6 +66,9 @@ class RuntimeEnvironment
 {
 public:
 	RuntimeEnvironment() :
+		homePath(),
+		identity(),
+		initialized(false),
 		shutdownInProgress(false),
 		tcpTunnelingEnabled(false),
 		timeOfLastResynchronize(0),
@@ -94,6 +97,9 @@ public:
 	// This node's identity
 	Identity identity;
 
+	// Are we initialized?
+	volatile bool initialized;
+
 	// Indicates that we are shutting down -- this is hacky, want to factor out
 	volatile bool shutdownInProgress;