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

Since which tap to use is chosen statically at compile time and the factories are gone, there is now no need for inheritance or virtual methods (indirect calls) here. Should improve performance slightly to get rid of them.

Browse source
This commit is contained in:
Adam Ierymenko 2015-04-10 10:19:45 -07:00
commit 08a11a6f32
3 changed files with 11 additions and 200 deletions
Download patch file Download diff file Expand all files Collapse all files

28
osdep/OSXEthernetTap.hpp
View file

@ -33,19 +33,14 @@
#include <stdexcept>
#include "EthernetTap.hpp"
#include "Thread.hpp"
namespace ZeroTier {
/**
* OSX Ethernet tap using ZeroTier kernel extension zt# devices
*
* This also installs a friendly-named network device in the system network
* configuration, permitting network devices to be seen and configured in
* the OSX system preferences app.
*/
class OSXEthernetTap : public EthernetTap
class OSXEthernetTap
{
public:
OSXEthernetTap(
@ -58,18 +53,17 @@ public:
void (*handler)(void *,const MAC &,const MAC &,unsigned int,const Buffer<4096> &),
void *arg);
virtual ~OSXEthernetTap();
~OSXEthernetTap();
virtual void setEnabled(bool en);
virtual bool enabled() const;
virtual bool addIP(const InetAddress &ip);
virtual bool removeIP(const InetAddress &ip);
virtual std::set<InetAddress> ips() const;
virtual void put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len);
virtual std::string deviceName() const;
virtual void setFriendlyName(const char *friendlyName);
virtual bool updateMulticastGroups(std::set<MulticastGroup> &groups);
virtual bool injectPacketFromHost(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len);
void setEnabled(bool en);
bool enabled() const;
bool addIP(const InetAddress &ip);
bool removeIP(const InetAddress &ip);
std::set<InetAddress> ips() const;
void put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len);
std::string deviceName() const;
void setFriendlyName(const char *friendlyName);
bool updateMulticastGroups(std::set<MulticastGroup> &groups);
void threadMain()
throw();