github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-14 02:27:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

A few more fixes, ready to integrate main payload.

Browse source
This commit is contained in:
Adam Ierymenko 2015-09-03 16:05:18 -07:00
commit b9d4b42f93
2 changed files with 38 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
netcon/NetconEthernetTap.hpp
View file

@ -40,6 +40,7 @@
#include "../node/Constants.hpp"
#include "../node/MulticastGroup.hpp"
#include "../node/Mutex.hpp"
#include "../node/InetAddress.hpp"
#include "../osdep/Thread.hpp"
#include "../osdep/Phy.hpp"
@ -95,14 +96,20 @@ private:
void (*_handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int);
void *_arg;
Phy<NetconEthernetTap *> *_phy;
Phy<NetconEthernetTap *> _phy;
PhySocket *_unixListenSocket;
uint64_t _nwid;
Thread _thread;
std::string _homePath;
std::string _dev; // path to Unix domain socket
std::vector<MulticastGroup> _multicastGroups;
std::vector<MulticastGroup> _lastMulticastGroupList;
Mutex _lastMulticastGroupList_m;
std::vector<InetAddress> _ips;
Mutex _ips_m;
unsigned int _mtu;
volatile bool _enabled;
volatile bool _run;