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

So Linux has getifaddrs() too! Yay!

Browse source
This commit is contained in:
Adam Ierymenko 2014-02-02 02:21:09 -05:00
parent 8236f20759
commit 0fdefdf7a4
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
node/EthernetTap.cpp
View file

@ -130,6 +130,7 @@ static const _CommandFinder UNIX_COMMANDS;
#include <linux/if_tun.h> #include <linux/if_tun.h>
#include <linux/if_addr.h> #include <linux/if_addr.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
#include <ifaddrs.h>
#endif // __LINUX__ #endif // __LINUX__
#ifdef __APPLE__ #ifdef __APPLE__
@ -569,7 +570,6 @@ bool EthernetTap::removeIP(const InetAddress &ip)
return false; return false;
} }
#ifdef __APPLE__
std::set<InetAddress> EthernetTap::ips() const std::set<InetAddress> EthernetTap::ips() const
{ {
struct ifaddrs *ifa = (struct ifaddrs *)0; struct ifaddrs *ifa = (struct ifaddrs *)0;
@ -606,11 +606,6 @@ std::set<InetAddress> EthernetTap::ips() const
return r; return r;
} }
#else
std::set<InetAddress> EthernetTap::ips() const
{
}
#endif
void EthernetTap::put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len) void EthernetTap::put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len)
{ {