ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-05-01 16:30:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add an interface description to EthernetTap, mostly for Windows.

Browse Source
This commit is contained in:
Adam Ierymenko 2013-08-19 17:44:46 -04:00
parent 3daf73710a
commit dbb509a302
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node/EthernetTap.cpp
View File

@ -148,6 +148,7 @@ EthernetTap::EthernetTap(
const RuntimeEnvironment *renv, const RuntimeEnvironment *renv,
const MAC &mac, const MAC &mac,
unsigned int mtu, unsigned int mtu,
const char *desc,
void (*handler)(void *,const MAC &,const MAC &,unsigned int,const Buffer<4096> &), void (*handler)(void *,const MAC &,const MAC &,unsigned int,const Buffer<4096> &),
void *arg) void *arg)
throw(std::runtime_error) : throw(std::runtime_error) :
@ -248,6 +249,7 @@ EthernetTap::EthernetTap(
const RuntimeEnvironment *renv, const RuntimeEnvironment *renv,
const MAC &mac, const MAC &mac,
unsigned int mtu, unsigned int mtu,
const char *desc,
void (*handler)(void *,const MAC &,const MAC &,unsigned int,const Buffer<4096> &), void (*handler)(void *,const MAC &,const MAC &,unsigned int,const Buffer<4096> &),
void *arg) void *arg)
throw(std::runtime_error) : throw(std::runtime_error) :

2
node/EthernetTap.hpp
View File

@ -62,6 +62,7 @@ public:
* @param renv Runtime environment * @param renv Runtime environment
* @param mac MAC address of device * @param mac MAC address of device
* @param mtu MTU of device * @param mtu MTU of device
* @param desc If non-NULL, a description (not used on all OSes)
* @param handler Handler function to be called when data is received from the tap * @param handler Handler function to be called when data is received from the tap
* @param arg First argument to handler function * @param arg First argument to handler function
* @throws std::runtime_error Unable to allocate device * @throws std::runtime_error Unable to allocate device
@ -70,6 +71,7 @@ public:
const RuntimeEnvironment *renv, const RuntimeEnvironment *renv,
const MAC &mac, const MAC &mac,
unsigned int mtu, unsigned int mtu,
const char *desc,
void (*handler)(void *,const MAC &,const MAC &,unsigned int,const Buffer<4096> &), void (*handler)(void *,const MAC &,const MAC &,unsigned int,const Buffer<4096> &),
void *arg) void *arg)
throw(std::runtime_error); throw(std::runtime_error);

2
node/Network.cpp
View File

@ -150,7 +150,7 @@ SharedPtr<Network> Network::newInstance(const RuntimeEnvironment *renv,uint64_t
nw->_rlLimit.bytesPerSecond = ZT_MULTICAST_DEFAULT_BYTES_PER_SECOND; nw->_rlLimit.bytesPerSecond = ZT_MULTICAST_DEFAULT_BYTES_PER_SECOND;
nw->_rlLimit.maxBalance = ZT_MULTICAST_DEFAULT_RATE_MAX_BALANCE; nw->_rlLimit.maxBalance = ZT_MULTICAST_DEFAULT_RATE_MAX_BALANCE;
nw->_rlLimit.minBalance = ZT_MULTICAST_DEFAULT_RATE_MIN_BALANCE; nw->_rlLimit.minBalance = ZT_MULTICAST_DEFAULT_RATE_MIN_BALANCE;
nw->_tap = new EthernetTap(renv,renv->identity.address().toMAC(),ZT_IF_MTU,&_CBhandleTapData,nw.ptr()); nw->_tap = new EthernetTap(renv,renv->identity.address().toMAC(),ZT_IF_MTU,(const char *)0,&_CBhandleTapData,nw.ptr());
nw->_id = id; nw->_id = id;
nw->_lastConfigUpdate = 0; nw->_lastConfigUpdate = 0;
nw->_destroyOnDelete = false; nw->_destroyOnDelete = false;