From b342f56beceae9207e188bebc536cd39d4ef4c6b Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 6 Aug 2013 10:15:05 -0400 Subject: Network constructor deuglification, remove unused old encrypt/decrypt methods from Identity. --- node/NodeConfig.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'node/NodeConfig.cpp') 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::iterator nwid(nwids.begin());nwid!=nwids.end();++nwid) { try { - SharedPtr nw(new Network(_r,*nwid)); + SharedPtr 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 NodeConfig::execute(const char *command) _P("400 already a member of %.16llx",(unsigned long long)nwid); } else { try { - SharedPtr nw(new Network(_r,nwid)); + SharedPtr 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()); -- cgit v1.2.3