diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-08-23 11:52:10 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-08-23 11:52:10 -0700 |
| commit | 68b4ca9b3181e69108bb4120c1c4230e3d09293b (patch) | |
| tree | 169545591184606f83fa80dde734050af61e7e99 /node/Network.cpp | |
| parent | 0dfc08b31724fe42ad7dc6253b3b673aec90c838 (diff) | |
| download | infinitytier-68b4ca9b3181e69108bb4120c1c4230e3d09293b.tar.gz infinitytier-68b4ca9b3181e69108bb4120c1c4230e3d09293b.zip | |
Cleanup.
Diffstat (limited to 'node/Network.cpp')
| -rw-r--r-- | node/Network.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node/Network.cpp b/node/Network.cpp index 2a33321c..d8e3b07a 100644 --- a/node/Network.cpp +++ b/node/Network.cpp @@ -416,7 +416,7 @@ Network::Network(const RuntimeEnvironment *renv,uint64_t nwid,void *uptr) : std::string conf(RR->node->dataStoreGet(confn)); if (conf.length()) { dconf->load(conf.c_str()); - if (nconf->fromDictionary(Identity(),*dconf)) { + if (nconf->fromDictionary(*dconf)) { this->setConfiguration(*nconf,false); _lastConfigUpdate = 0; // we still want to re-request a new config from the network gotConf = true; @@ -672,7 +672,7 @@ void Network::handleInboundConfigChunk(const uint64_t inRePacketId,const void *d try { Identity controllerId(RR->topology->getIdentity(this->controller())); if (controllerId) { - if (nc->fromDictionary(controllerId,*dict)) { + if (nc->fromDictionary(*dict)) { this->setConfiguration(*nc,true); } else { TRACE("error parsing new config with length %u: deserialization of NetworkConfig failed (certificate error?)",(unsigned int)newConfig.length()); |