dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Network build fixes and cleanup of remaining internal references to _tap

Browse source
This commit is contained in:
Adam Ierymenko 2015-04-06 15:47:57 -07:00
parent 488f5bf977
commit a86300c58f
5 changed files with 22 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

20
node/Network.hpp
View file

@ -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"
@ -78,20 +78,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
*/
@ -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