diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-03-13 13:53:15 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-03-13 13:53:15 -0700 |
| commit | 278c8fd9f1a36bc7b81cbfd50b93626d5341b8de (patch) | |
| tree | 05982f038be7be478ae3bd58cae976dcbf01a6d8 /node/Node.cpp | |
| parent | 61d89bd1182273fb479a2eb250ce0cc452345d9b (diff) | |
| download | infinitytier-278c8fd9f1a36bc7b81cbfd50b93626d5341b8de.tar.gz infinitytier-278c8fd9f1a36bc7b81cbfd50b93626d5341b8de.zip | |
Wire up externally specified NetworkConfigMaster
Diffstat (limited to 'node/Node.cpp')
| -rw-r--r-- | node/Node.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/node/Node.cpp b/node/Node.cpp index 28c9ddaa..d013444a 100644 --- a/node/Node.cpp +++ b/node/Node.cpp @@ -108,7 +108,6 @@ struct _NodeImpl delete renv.mc; renv.mc = (Multicaster *)0; delete renv.antiRec; renv.antiRec = (AntiRecursion *)0; delete renv.sw; renv.sw = (Switch *)0; // order matters less from here down - delete renv.netconfMaster; renv.netconfMaster = (NetworkConfigMaster *)0; delete renv.http; renv.http = (HttpClient *)0; delete renv.prng; renv.prng = (CMWC4096 *)0; delete renv.log; renv.log = (Logger *)0; // but stop logging last of all @@ -129,6 +128,7 @@ Node::Node( EthernetTapFactory *tf, RoutingTable *rt, SocketManager *sm, + NetworkConfigMaster *nm, bool resetIdentity, const char *overrideRootTopology) throw() : _impl(new _NodeImpl) @@ -142,6 +142,7 @@ Node::Node( impl->renv.tapFactory = tf; impl->renv.routingTable = rt; impl->renv.sm = sm; + impl->renv.netconfMaster = nm; if (resetIdentity) { // Forget identity and peer database, peer keys, etc. |