diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-03-31 15:23:14 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-03-31 15:23:14 -0700 |
| commit | 647ce82b86a56c45f07cd69d5cabedd083179365 (patch) | |
| tree | 9874c3c4b1c240b53cf8249f7c55ce11ec7994e2 | |
| parent | e61a40a956dfa538be8c8fec1448a9e51acd02e5 (diff) | |
| download | infinitytier-647ce82b86a56c45f07cd69d5cabedd083179365.tar.gz infinitytier-647ce82b86a56c45f07cd69d5cabedd083179365.zip | |
Move more stuff into osdep/ -- node/ will not use threads directly.
| -rw-r--r-- | include/ZeroTierOne.h | 4 | ||||
| -rw-r--r-- | node/Network.hpp | 9 | ||||
| -rw-r--r-- | osdep/BSDEthernetTap.hpp | 2 | ||||
| -rw-r--r-- | osdep/BSDEthernetTapFactory.hpp | 2 | ||||
| -rw-r--r-- | osdep/EthernetTap.hpp (renamed from node/EthernetTap.hpp) | 8 | ||||
| -rw-r--r-- | osdep/EthernetTapFactory.hpp (renamed from node/EthernetTapFactory.hpp) | 0 | ||||
| -rw-r--r-- | osdep/HttpClient.cpp (renamed from node/HttpClient.cpp) | 0 | ||||
| -rw-r--r-- | osdep/HttpClient.hpp (renamed from node/HttpClient.hpp) | 0 | ||||
| -rw-r--r-- | osdep/SoftwareUpdater.cpp (renamed from node/SoftwareUpdater.cpp) | 0 | ||||
| -rw-r--r-- | osdep/SoftwareUpdater.hpp (renamed from node/SoftwareUpdater.hpp) | 0 | ||||
| -rw-r--r-- | osdep/Thread.hpp (renamed from node/Thread.hpp) | 0 |
11 files changed, 8 insertions, 17 deletions
diff --git a/include/ZeroTierOne.h b/include/ZeroTierOne.h index 0a77ff34..2c875a4f 100644 --- a/include/ZeroTierOne.h +++ b/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 diff --git a/node/Network.hpp b/node/Network.hpp index 9c4d6746..dfbe4f8b 100644 --- a/node/Network.hpp +++ b/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; diff --git a/osdep/BSDEthernetTap.hpp b/osdep/BSDEthernetTap.hpp index 582292a1..453edea1 100644 --- a/osdep/BSDEthernetTap.hpp +++ b/osdep/BSDEthernetTap.hpp @@ -33,7 +33,7 @@ #include <stdexcept> -#include "../node/EthernetTap.hpp" +#include "EthernetTap.hpp" #include "../node/Thread.hpp" namespace ZeroTier { diff --git a/osdep/BSDEthernetTapFactory.hpp b/osdep/BSDEthernetTapFactory.hpp index 63e77339..5c681fb4 100644 --- a/osdep/BSDEthernetTapFactory.hpp +++ b/osdep/BSDEthernetTapFactory.hpp @@ -31,7 +31,7 @@ #include <vector> #include <string> -#include "../node/EthernetTapFactory.hpp" +#include "EthernetTapFactory.hpp" #include "../node/Mutex.hpp" namespace ZeroTier { diff --git a/node/EthernetTap.hpp b/osdep/EthernetTap.hpp index 94193e0c..f2675e11 100644 --- a/node/EthernetTap.hpp +++ b/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" diff --git a/node/EthernetTapFactory.hpp b/osdep/EthernetTapFactory.hpp index 4acb2369..4acb2369 100644 --- a/node/EthernetTapFactory.hpp +++ b/osdep/EthernetTapFactory.hpp diff --git a/node/HttpClient.cpp b/osdep/HttpClient.cpp index 6b96960b..6b96960b 100644 --- a/node/HttpClient.cpp +++ b/osdep/HttpClient.cpp diff --git a/node/HttpClient.hpp b/osdep/HttpClient.hpp index 925ce76e..925ce76e 100644 --- a/node/HttpClient.hpp +++ b/osdep/HttpClient.hpp diff --git a/node/SoftwareUpdater.cpp b/osdep/SoftwareUpdater.cpp index 345fc28e..345fc28e 100644 --- a/node/SoftwareUpdater.cpp +++ b/osdep/SoftwareUpdater.cpp diff --git a/node/SoftwareUpdater.hpp b/osdep/SoftwareUpdater.hpp index 6c1e573a..6c1e573a 100644 --- a/node/SoftwareUpdater.hpp +++ b/osdep/SoftwareUpdater.hpp diff --git a/node/Thread.hpp b/osdep/Thread.hpp index c8c99f29..c8c99f29 100644 --- a/node/Thread.hpp +++ b/osdep/Thread.hpp |