Move more stuff into osdep/ -- node/ will not use threads directly.

include/ZeroTierOne.h

@@ -88,7 +88,7 @@ enum ZT1_ResultCode
 /**
  * Status codes sent to status update callback when things happen
  */
-enum ZT1_NodeStatusChangeCode
+enum ZT1_NodeStatusCode
 {
 	/**
 	 * Node is online
@@ -512,7 +512,7 @@ typedef void (*ZT1_VirtualNetworkConfigCallback)(ZT1_Node *,uint64_t,const ZT1_V
  *
  * This is called whenever the node's status changes in some significant way.
  */
-typedef void (*ZT1_StatusCallback)(ZT1_Node *,enum ZT1_NodeStatusChangeCode);
+typedef void (*ZT1_StatusCallback)(ZT1_Node *,enum ZT1_NodeStatusCode);
 
 /**
  * Function to get an object from the data store

node/Network.hpp

@@ -54,7 +54,6 @@
 #include "Multicaster.hpp"
 #include "NetworkConfig.hpp"
 #include "CertificateOfMembership.hpp"
-#include "Thread.hpp"
 
 namespace ZeroTier {
 
@@ -447,12 +446,6 @@ public:
 	 */
 	void destroy();
 
-	/**
-	 * Thread main method; do not call elsewhere
-	 */
-	void threadMain()
-		throw();
-
 private:
 	static void _CBhandleTapData(void *arg,const MAC &from,const MAC &to,unsigned int etherType,const Buffer<4096> &data);
 
@@ -495,8 +488,6 @@ private:
 		NETCONF_FAILURE_INIT_FAILED
 	} _netconfFailure;
 
-	Thread _setupThread;
-
 	Mutex _lock;
 
 	AtomicCounter __refCount;

osdep/BSDEthernetTap.hpp

@@ -33,7 +33,7 @@
 
 #include <stdexcept>
 
-#include "../node/EthernetTap.hpp"
+#include "EthernetTap.hpp"
 #include "../node/Thread.hpp"
 
 namespace ZeroTier {

osdep/BSDEthernetTapFactory.hpp

@@ -31,7 +31,7 @@
 #include <vector>
 #include <string>
 
-#include "../node/EthernetTapFactory.hpp"
+#include "EthernetTapFactory.hpp"
 #include "../node/Mutex.hpp"
 
 namespace ZeroTier {

node/EthernetTap.hpp → osdep/EthernetTap.hpp

@@ -34,10 +34,10 @@
 #include <string>
 #include <set>
 
-#include "Constants.hpp"
-#include "MAC.hpp"
-#include "InetAddress.hpp"
-#include "Buffer.hpp"
+#include "../node/Constants.hpp"
+#include "../node/MAC.hpp"
+#include "../node/InetAddress.hpp"
+#include "../node/Buffer.hpp"
 #include "MulticastGroup.hpp"
 #include "NonCopyable.hpp"