ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-23 14:52:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

local.conf in NodeConfig

Browse Source
This commit is contained in:
Adam Ierymenko 2014-02-10 14:22:57 -08:00
parent e54a34d8dd
commit cd339486b7
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
node/NodeConfig.cpp
View File

@ -109,10 +109,13 @@ NodeConfig::NodeConfig(const RuntimeEnvironment *renv,const char *authToken,unsi
LOG("unable to create network %.16llx: (unknown exception)",(unsigned long long)*nwid);
}
}
_readLocalConfig();
}
NodeConfig::~NodeConfig()
{
_writeLocalConfig();
}
void NodeConfig::clean()
@ -122,6 +125,9 @@ void NodeConfig::clean()
n->second->clean();
}
/////////////////////////////////////////////////////////////////////////////
// UDP localhost control bus
// Macro used in execute() to push lines onto the return packet
#undef _P
#define _P(f,...) { r.push_back(std::string()); Utils::stdsprintf(r.back(),(f),##__VA_ARGS__); }
@ -389,4 +395,21 @@ void NodeConfig::_CBcontrolPacketHandler(UdpSocket *sock,void *arg,const InetAdd
}
}
/////////////////////////////////////////////////////////////////////////////
void NodeConfig::_readLocalConfig()
{
std::string localDotConf(_r->homePath + ZT_PATH_SEPARATOR_S + "local.conf");
std::string buf;
if (Utils::readFile(localDotConf.c_str(),buf)) {
Mutex::Lock _l(_localConfig_m);
_localConfig.fromString(buf.c_str());
}
}
void NodeConfig::_writeLocalConfig()
{
Utils::writeFile(((_r->homePath + ZT_PATH_SEPARATOR_S + "local.conf")).c_str(),_localConfig.toString());
}
} // namespace ZeroTier

11
node/NodeConfig.hpp
View File

@ -41,6 +41,7 @@
#include "Utils.hpp"
#include "UdpSocket.hpp"
#include "Buffer.hpp"
#include "Dictionary.hpp"
namespace ZeroTier {
@ -121,7 +122,7 @@ public:
}
/**
* Execute a command
* Execute a control command (called when stuff comes in via control bus)
*
* @param command Command and arguments separated by whitespace (must already be trimmed of CR+LF, etc.)
* @return One or more command results (lines of output)
@ -159,12 +160,18 @@ public:
private:
static void _CBcontrolPacketHandler(UdpSocket *sock,void *arg,const InetAddress &remoteAddr,const void *data,unsigned int len);
void _readLocalConfig();
void _writeLocalConfig();
const RuntimeEnvironment *_r;
unsigned char _controlSocketKey[32];
UdpSocket _controlSocket;
std::map< uint64_t,SharedPtr<Network> > _networks;
Dictionary _localConfig; // persisted as local.conf
Mutex _localConfig_m;
std::map< uint64_t,SharedPtr<Network> > _networks; // persisted in networks.d/
Mutex _networks_m;
};