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 /main.cpp | |
| parent | 61d89bd1182273fb479a2eb250ce0cc452345d9b (diff) | |
| download | infinitytier-278c8fd9f1a36bc7b81cbfd50b93626d5341b8de.tar.gz infinitytier-278c8fd9f1a36bc7b81cbfd50b93626d5341b8de.zip | |
Wire up externally specified NetworkConfigMaster
Diffstat (limited to 'main.cpp')
| -rw-r--r-- | main.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -78,6 +78,10 @@ #include "osnet/NativeSocketManager.hpp" +#ifdef ZT_ENABLE_NETCONF_MASTER +#include "netconf/SqliteNetworkConfigMaster.hpp" +#endif // ZT_ENABLE_NETCONF_MASTER + #ifdef __WINDOWS__ #include "osnet/WindowsEthernetTapFactory.hpp" #include "osnet/WindowsRoutingTable.hpp" @@ -810,6 +814,7 @@ int main(int argc,char **argv) RoutingTable *routingTable = (RoutingTable *)0; SocketManager *socketManager = (SocketManager *)0; NodeControlService *controlService = (NodeControlService *)0; + NetworkConfigMaster *netconfMaster = (NetworkConfigMaster *)0; try { // Get or create authtoken.secret -- note that if this fails, authentication @@ -827,7 +832,7 @@ int main(int argc,char **argv) throw; } - node = new Node(homeDir,tapFactory,routingTable,socketManager,needsReset,(overrideRootTopology.length() > 0) ? overrideRootTopology.c_str() : (const char *)0); + node = new Node(homeDir,tapFactory,routingTable,socketManager,netconfMaster,needsReset,(overrideRootTopology.length() > 0) ? overrideRootTopology.c_str() : (const char *)0); controlService = new NodeControlService(node,authToken.c_str()); switch(node->run()) { |
