diff options
| author | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2014-01-17 17:09:59 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2014-01-17 17:09:59 -0800 |
| commit | 07f505971c16f25c05357b49ae550509d77a7e95 (patch) | |
| tree | 894cb8b07adea45f29381ef7371f4e7cde1f408f /node/NodeConfig.cpp | |
| parent | 7eccc5ebf2c0f25b2091d1b618b901e69b97ac0a (diff) | |
| download | infinitytier-07f505971c16f25c05357b49ae550509d77a7e95.tar.gz infinitytier-07f505971c16f25c05357b49ae550509d77a7e95.zip | |
Windows build fixes.
Diffstat (limited to 'node/NodeConfig.cpp')
| -rw-r--r-- | node/NodeConfig.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/node/NodeConfig.cpp b/node/NodeConfig.cpp index 770f1f6f..374e9916 100644 --- a/node/NodeConfig.cpp +++ b/node/NodeConfig.cpp @@ -77,7 +77,7 @@ NodeConfig::NodeConfig(const RuntimeEnvironment *renv,const char *authToken,unsi if (!d->second) { std::string::size_type dot = d->first.rfind(".conf"); if (dot != std::string::npos) { - uint64_t nwid = strtoull(d->first.substr(0,dot).c_str(),(char **)0,16); + uint64_t nwid = Utils::hexStrToU64(d->first.substr(0,dot).c_str()); // TODO: remove legacy code once out of beta if (nwid == 0x6c92786fee000001ULL) { @@ -230,7 +230,7 @@ std::vector<std::string> NodeConfig::execute(const char *command) } } else if (cmd[0] == "join") { if (cmd.size() > 1) { - uint64_t nwid = strtoull(cmd[1].c_str(),(char **)0,16); + uint64_t nwid = Utils::hexStrToU64(cmd[1].c_str()); if (nwid > 0) { Mutex::Lock _l(_networks_m); if (_networks.count(nwid)) { @@ -255,7 +255,7 @@ std::vector<std::string> NodeConfig::execute(const char *command) } else if (cmd[0] == "leave") { if (cmd.size() > 1) { Mutex::Lock _l(_networks_m); - uint64_t nwid = strtoull(cmd[1].c_str(),(char **)0,16); + uint64_t nwid = Utils::hexStrToU64(cmd[1].c_str()); std::map< uint64_t,SharedPtr<Network> >::iterator nw(_networks.find(nwid)); if (nw == _networks.end()) { _P("404 leave %.16llx ERROR: not a member of that network",(unsigned long long)nwid); |