Browse Source

same IPv6 temp address detection code for macOS works on FreeBSD.
update ifdefs & go

Grant Limberg 4 years ago
parent
commit
1859365f9d
1 changed files with 5 additions and 6 deletions
  1. 5 6
      osdep/Binder.hpp

+ 5 - 6
osdep/Binder.hpp

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