diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-08-06 10:15:05 -0400 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-08-06 10:15:05 -0400 |
| commit | b342f56beceae9207e188bebc536cd39d4ef4c6b (patch) | |
| tree | 0c3259cca1ab6735ed0f89661aecbd21499aed63 /node/NodeConfig.cpp | |
| parent | 28a73b620e60dd5d9c77aa7494d4c71da8b1d08c (diff) | |
| download | infinitytier-b342f56beceae9207e188bebc536cd39d4ef4c6b.tar.gz infinitytier-b342f56beceae9207e188bebc536cd39d4ef4c6b.zip | |
Network constructor deuglification, remove unused old encrypt/decrypt methods from Identity.
Diffstat (limited to 'node/NodeConfig.cpp')
| -rw-r--r-- | node/NodeConfig.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/node/NodeConfig.cpp b/node/NodeConfig.cpp index a8599508..e87c7ec0 100644 --- a/node/NodeConfig.cpp +++ b/node/NodeConfig.cpp @@ -76,10 +76,8 @@ NodeConfig::NodeConfig(const RuntimeEnvironment *renv,const char *authToken) for(std::set<uint64_t>::iterator nwid(nwids.begin());nwid!=nwids.end();++nwid) { try { - SharedPtr<Network> nw(new Network(_r,*nwid)); + SharedPtr<Network> nw(Network::newInstance(_r,*nwid)); _networks[*nwid] = nw; - nw->restoreState(); - nw->requestConfiguration(); } catch (std::exception &exc) { LOG("unable to create network %.16llx: %s",(unsigned long long)*nwid,exc.what()); } catch ( ... ) { @@ -181,10 +179,8 @@ std::vector<std::string> NodeConfig::execute(const char *command) _P("400 already a member of %.16llx",(unsigned long long)nwid); } else { try { - SharedPtr<Network> nw(new Network(_r,nwid)); + SharedPtr<Network> nw(Network::newInstance(_r,nwid)); _networks[nwid] = nw; - nw->restoreState(); - nw->requestConfiguration(); _P("200 join %.16llx OK",(unsigned long long)nwid); } catch (std::exception &exc) { _P("500 join %.16llx ERROR: %s",(unsigned long long)nwid,exc.what()); |