diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-04-06 15:47:57 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-04-06 15:47:57 -0700 |
| commit | a86300c58fe29e9a8626f935f0b3ed25e844b0aa (patch) | |
| tree | 80341df73ad66c70e0cf28ac265e106ddae52994 /node/Network.hpp | |
| parent | 488f5bf977887d1e2e744fbf1c027068bc4f7524 (diff) | |
| download | infinitytier-a86300c58fe29e9a8626f935f0b3ed25e844b0aa.tar.gz infinitytier-a86300c58fe29e9a8626f935f0b3ed25e844b0aa.zip | |
Network build fixes and cleanup of remaining internal references to _tap
Diffstat (limited to 'node/Network.hpp')
| -rw-r--r-- | node/Network.hpp | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/node/Network.hpp b/node/Network.hpp index c9e62128..5693ff49 100644 --- a/node/Network.hpp +++ b/node/Network.hpp @@ -30,6 +30,8 @@ #include <stdint.h> +#include "../include/ZeroTierOne.h" + #include <string> #include <map> #include <vector> @@ -46,8 +48,6 @@ #include "MulticastGroup.hpp" #include "MAC.hpp" #include "Dictionary.hpp" -#include "Identity.hpp" -#include "InetAddress.hpp" #include "BandwidthAccount.hpp" #include "Multicaster.hpp" #include "NetworkConfig.hpp" @@ -79,20 +79,6 @@ public: static const MulticastGroup BROADCAST; /** - * Possible network states - */ - enum Status - { - NETWORK_INITIALIZING = 0, // Creating tap device and setting up state - NETWORK_WAITING_FOR_FIRST_AUTOCONF = 1, // Waiting for initial setup with netconf master - NETWORK_OK = 2, // Network is up, seems to be working - NETWORK_ACCESS_DENIED = 3, // Netconf node reported permission denied - NETWORK_NOT_FOUND = 4, // Netconf node reported network not found - NETWORK_INITIALIZATION_FAILED = 5, // Cannot initialize device (OS/installation problem?) - NETWORK_NO_MORE_DEVICES = 6 // OS cannot create any more tap devices (some OSes have a limit) - }; - - /** * @return Network ID */ inline uint64_t id() const throw() { return _id; } @@ -206,7 +192,7 @@ public: /** * @return Status of this network */ - Status status() const; + ZT1_VirtualNetworkStatus status() const; /** * Update and check multicast rate balance for a multicast group |