ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-19 04:57:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

same IPv6 temp address detection code for macOS works on FreeBSD.

Browse Source 
update ifdefs & go
This commit is contained in:
Grant Limberg 2021-05-27 16:43:12 -04:00
parent ab87b8f881
commit 1859365f9d
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osdep/Binder.hpp
View File

@ -40,7 +40,7 @@
#endif
#endif
#if defined(__APPLE__) && defined(TARGET_OS_MAC)
#if defined(__unix__) && !defined(__LINUX__)
#include <net/if.h>
#include <netinet6/in6_var.h>
#include <sys/ioctl.h>
@ -311,8 +311,7 @@ class Binder {
if (! gotViaProc) {
struct ifaddrs* ifatbl = (struct ifaddrs*)0;
struct ifaddrs* ifa;
#if defined(__APPLE__)
#if defined(__unix__) && !defined(__LINUX__)
// set up an IPv6 socket so we can check the state of interfaces via SIOCGIFAFLAG_IN6
int infoSock = socket(AF_INET6, SOCK_DGRAM, 0);
#endif
@ -321,8 +320,8 @@ class Binder {
while (ifa) {
if ((ifa->ifa_name) && (ifa->ifa_addr)) {
InetAddress ip = *(ifa->ifa_addr);
#if defined(__APPLE__) && defined(TARGET_OS_MAC)
// Check if the address is an IPv6 Temporary Address, macOS version
#if defined(__unix__) && !defined(__LINUX__)
// Check if the address is an IPv6 Temporary Address, macOS/BSD version
if (ifa->ifa_addr->sa_family == AF_INET6) {
struct sockaddr_in6* sa6 = (struct sockaddr_in6*)ifa->ifa_addr;
struct in6_ifreq ifr6;
@ -369,7 +368,7 @@ class Binder {
else {
interfacesEnumerated = false;
}
#if defined(__APPLE__)
#if defined(__unix__) && !defined(__LINUX__)
close(infoSock);
#endif
}