void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 20:43:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

BSDEthernetTap build fixes.

Browse source
This commit is contained in:
Adam Ierymenko 2015-05-17 18:31:41 -07:00
parent ddaf3ef347
commit 0e87002d78
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
osdep/BSDEthernetTap.cpp
View file

@ -230,7 +230,7 @@ static bool ___removeIp(const std::string &_dev,const InetAddress &ip)
return false; // never reached, make compiler shut up about return value return false; // never reached, make compiler shut up about return value
} }
bool BSDEthernetTap::addIP(const InetAddress &ip) bool BSDEthernetTap::addIp(const InetAddress &ip)
{ {
if (!ip) if (!ip)
return false; return false;
@ -259,8 +259,10 @@ bool BSDEthernetTap::addIP(const InetAddress &ip)
return false; return false;
} }
bool BSDEthernetTap::removeIP(const InetAddress &ip) bool BSDEthernetTap::removeIp(const InetAddress &ip)
{ {
if (!ip)
return false;
std::vector<InetAddress> allIps(ips()); std::vector<InetAddress> allIps(ips());
if (std::find(allIps.begin(),allIps.end(),ip) != allIps.end()) { if (std::find(allIps.begin(),allIps.end(),ip) != allIps.end()) {
if (___removeIp(_dev,ip)) if (___removeIp(_dev,ip))
@ -269,11 +271,11 @@ bool BSDEthernetTap::removeIP(const InetAddress &ip)
return false; return false;
} }
std::set<InetAddress> BSDEthernetTap::ips() const std::vector<InetAddress> BSDEthernetTap::ips() const
{ {
struct ifaddrs *ifa = (struct ifaddrs *)0; struct ifaddrs *ifa = (struct ifaddrs *)0;
if (getifaddrs(&ifa)) if (getifaddrs(&ifa))
return std::set<InetAddress>(); return std::vector<InetAddress>();
std::vector<InetAddress> r; std::vector<InetAddress> r;
@ -454,7 +456,6 @@ void BSDEthernetTap::threadMain()
to.setTo(getBuf,6); to.setTo(getBuf,6);
from.setTo(getBuf + 6,6); from.setTo(getBuf + 6,6);
unsigned int etherType = ntohs(((const uint16_t *)getBuf)[6]); unsigned int etherType = ntohs(((const uint16_t *)getBuf)[6]);
data.copyFrom(getBuf + 14,(unsigned int)r - 14);
// TODO: VLAN support // TODO: VLAN support
_handler(_arg,_nwid,from,to,etherType,0,(const void *)(getBuf + 14),r - 14); _handler(_arg,_nwid,from,to,etherType,0,(const void *)(getBuf + 14),r - 14);
} }