Skip to content

Resolve route bug for MacOS #2548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
happyharryh wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Resolve route bug for MacOS #2548

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion osdep/MacDNSHelper.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "MacDNSHelper.hpp"

#include <stdio.h>
#include <sys/utsname.h>

#include <SystemConfiguration/SystemConfiguration.h>

Expand All @@ -19,6 +20,15 @@ static void printKeys (const void* key, const void* value, void* context) {
CFShow(value);
}

static int darwin_version_major () {
int version_major = -1;
struct utsname system_info;
if (uname(&system_info) == 0) {
sscanf(system_info.release, "%d", &version_major);
}
return version_major;
}

void MacDNSHelper::setDNS(uint64_t nwid, const char *domain, const std::vector<InetAddress> &servers)
{
SCDynamicStoreRef ds = SCDynamicStoreCreate(NULL, CFSTR("zerotier"), NULL, NULL);
Expand Down Expand Up @@ -164,8 +174,10 @@ static void printKeys (const void* key, const void* value, void* context) {
values[3] = cfrouter;


// skip setting Router to avoid breaking the routing table on MacOS Tahoe and later
static int size = darwin_version_major() < 25 ? SIZE : SIZE - 1;
CFDictionaryRef dict = CFDictionaryCreate(NULL,
(const void**)keys, (const void**)values, SIZE, &kCFCopyStringDictionaryKeyCallBacks,
(const void**)keys, (const void**)values, size, &kCFCopyStringDictionaryKeyCallBacks,
&kCFTypeDictionaryValueCallBacks);

// CFDictionaryApplyFunction(dict, printKeys, NULL);
Expand Down