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

fix binding temporary ipv6 addresses on macos (#1910)

Browse Source 
The check code wasn't running.

I don't know why !defined(TARGET_OS_IOS) would exclude code on
desktop macOS. I did a quick search and changed it to defined(TARGET_OS_MAC).
Not 100% sure what the most correct solution there is.

You can verify the old and new versions with

`ifconfig | grep temporary`

plus

`zerotier-cli info -j` -> listeningOn
This commit is contained in:
Travis LaDuke 2023-03-21 12:25:01 -07:00 committed by GitHub
parent ce9330e9bb
commit 314099a267
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osdep/Binder.hpp
View File

@ -42,7 +42,7 @@
#if (defined(__unix__) || defined(__APPLE__)) && !defined(__LINUX__) && !defined(ZT_SDK) #if (defined(__unix__) || defined(__APPLE__)) && !defined(__LINUX__) && !defined(ZT_SDK)
#include <net/if.h> #include <net/if.h>
#if ! defined(TARGET_OS_IOS) #if defined(TARGET_OS_OSX)
#include <netinet6/in6_var.h> #include <netinet6/in6_var.h>
#endif #endif
#include <sys/ioctl.h> #include <sys/ioctl.h>
@ -333,7 +333,7 @@ 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(__unix__) || defined(__APPLE__)) && !defined(__LINUX__) && !defined(ZT_SDK) && !defined(TARGET_OS_IOS) #if (defined(__unix__) || defined(__APPLE__)) && !defined(__LINUX__) && !defined(ZT_SDK) && defined(TARGET_OS_OSX)
// Check if the address is an IPv6 Temporary Address, macOS/BSD version // 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;
@ -349,8 +349,8 @@ class Binder {
// if this is a temporary IPv6 address, skip to the next address // if this is a temporary IPv6 address, skip to the next address
if (flags & IN6_IFF_TEMPORARY) { if (flags & IN6_IFF_TEMPORARY) {
char buf[64];
#ifdef ZT_TRACE #ifdef ZT_TRACE
char buf[64];
fprintf(stderr, "skip binding to temporary IPv6 address: %s\n", ip.toIpString(buf)); fprintf(stderr, "skip binding to temporary IPv6 address: %s\n", ip.toIpString(buf));
#endif #endif
ifa = ifa->ifa_next; ifa = ifa->ifa_next;