diff options
author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-09-03 16:05:18 -0700 |
---|---|---|
committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-09-03 16:05:18 -0700 |
commit | b9d4b42f93bf364c9a8e4ae5147ef2b6a6fa9f1a (patch) | |
tree | e3d8d47efb504562af658dc7b312ff39e722c06a /netcon/NetconEthernetTap.hpp | |
parent | bf4cab5f2f4c9109d8c33c2c0e04456e17ef1f84 (diff) | |
download | infinitytier-b9d4b42f93bf364c9a8e4ae5147ef2b6a6fa9f1a.tar.gz infinitytier-b9d4b42f93bf364c9a8e4ae5147ef2b6a6fa9f1a.zip |
A few more fixes, ready to integrate main payload.
Diffstat (limited to 'netcon/NetconEthernetTap.hpp')
-rw-r--r-- | netcon/NetconEthernetTap.hpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/netcon/NetconEthernetTap.hpp b/netcon/NetconEthernetTap.hpp index 785ace12..1ecbdcaf 100644 --- a/netcon/NetconEthernetTap.hpp +++ b/netcon/NetconEthernetTap.hpp @@ -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; |