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

Save enumeration of statically assigned IPs so they will always be reassigned on device "power cycle."

Browse source
This commit is contained in:
Adam Ierymenko 2015-07-30 14:10:32 -07:00
parent 499b2dccad
commit 922d9657b9
3 changed files with 76 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

7
osdep/WindowsEthernetTap.hpp
View file

@ -41,6 +41,7 @@
#include "../node/Mutex.hpp"
#include "../node/Array.hpp"
#include "../node/MulticastGroup.hpp"
#include "../node/InetAddress.hpp"
#include "../osdep/Thread.hpp"
namespace ZeroTier {
@ -117,11 +118,10 @@ public:
throw();
private:
bool _disableTapDevice();
bool _enableTapDevice();
NET_IFINDEX _getDeviceIndex(); // throws on failure
std::vector<std::string> _getRegistryIPv4Value(const char *regKey);
void _setRegistryIPv4Value(const char *regKey,const std::vector<std::string> &value);
void _syncIps();
void (*_handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int);
void *_arg;
@ -137,6 +137,9 @@ private:
std::string _netCfgInstanceId;
std::string _deviceInstanceId;
std::vector<InetAddress> _assignedIps; // IPs assigned with addIp
Mutex _assignedIps_m;
std::vector<MulticastGroup> _multicastGroups;
std::queue< std::pair< Array<char,ZT_IF_MTU + 32>,unsigned int > > _injectPending;