Archives/lokinet
2
0
Fork 0
mirror of https://github.com/oxen-io/lokinet.git synced 2024-11-11 07:10:36 +00:00
Code Issues Projects Releases Wiki Activity

Add IPv6 addr/routing for macos

Browse Source
This commit is contained in:
Jason Rhinelander 2021-09-03 15:35:09 -03:00
parent b52cf97e11
commit c52782ab32
3 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
llarp/apple/PacketTunnelProvider.m
View File

@ -8,6 +8,7 @@
void* lokinet; void* lokinet;
@public NEPacketTunnelNetworkSettings* settings; @public NEPacketTunnelNetworkSettings* settings;
@public NEIPv4Route* tun_route4; @public NEIPv4Route* tun_route4;
@public NEIPv6Route* tun_route6;
LLARPDNSTrampoline* dns_tramp; LLARPDNSTrampoline* dns_tramp;
} }
@ -135,7 +136,7 @@ static void del_default_route(void* ctx) {
LLARPPacketTunnel* t = (__bridge LLARPPacketTunnel*) ctx; LLARPPacketTunnel* t = (__bridge LLARPPacketTunnel*) ctx;
t->settings.IPv4Settings.includedRoutes = @[t->tun_route4]; t->settings.IPv4Settings.includedRoutes = @[t->tun_route4];
t->settings.IPv6Settings.includedRoutes = @[]; // No tun_route6 yet. t->settings.IPv6Settings.includedRoutes = @[t->tun_route6];
[t updateNetworkSettings]; [t updateNetworkSettings];
} }
@ -206,6 +207,7 @@ static void del_default_route(void* ctx) {
dns.matchDomains = @[@""]; dns.matchDomains = @[@""];
dns.matchDomainsNoSearch = true; dns.matchDomainsNoSearch = true;
dns.searchDomains = @[]; dns.searchDomains = @[];
settings.DNSSettings = dns;
NWHostEndpoint* upstreamdns_ep; NWHostEndpoint* upstreamdns_ep;
if (strlen(conf.upstream_dns)) if (strlen(conf.upstream_dns))
@ -216,7 +218,16 @@ static void del_default_route(void* ctx) {
tun_route4 = [[NEIPv4Route alloc] initWithDestinationAddress:ip subnetMask: mask]; tun_route4 = [[NEIPv4Route alloc] initWithDestinationAddress:ip subnetMask: mask];
ipv4.includedRoutes = @[tun_route4]; ipv4.includedRoutes = @[tun_route4];
settings.IPv4Settings = ipv4; settings.IPv4Settings = ipv4;
settings.DNSSettings = dns;
NSString* ip6 = [NSString stringWithUTF8String:conf.tunnel_ipv6_ip];
NSNumber* ip6_prefix = [NSNumber numberWithUnsignedInt:conf.tunnel_ipv6_prefix];
NEIPv6Settings* ipv6 = [[NEIPv6Settings alloc] initWithAddresses:@[ip6]
networkPrefixLengths:@[ip6_prefix]];
tun_route6 = [[NEIPv6Route alloc] initWithDestinationAddress:ip6
networkPrefixLength:ip6_prefix];
ipv6.includedRoutes = @[tun_route6];
settings.IPv6Settings = ipv6;
__weak LLARPPacketTunnel* weakSelf = self; __weak LLARPPacketTunnel* weakSelf = self;
[self setTunnelNetworkSettings:settings completionHandler:^(NSError* err) { [self setTunnelNetworkSettings:settings completionHandler:^(NSError* err) {
if (err) { if (err) {

12
llarp/apple/context_wrapper.cpp
View File

@ -60,8 +60,16 @@ llarp_apple_init(llarp_apple_config* appleconf)
auto mask = llarp::net::TruncateV6(range.netmask_bits).ToString(); auto mask = llarp::net::TruncateV6(range.netmask_bits).ToString();
if (addr.size() > 15 || mask.size() > 15) if (addr.size() > 15 || mask.size() > 15)
throw std::runtime_error{"Unexpected non-IPv4 tunnel range configured"}; throw std::runtime_error{"Unexpected non-IPv4 tunnel range configured"};
std::strcpy(appleconf->tunnel_ipv4_ip, addr.c_str()); std::strncpy(appleconf->tunnel_ipv4_ip, addr.c_str(), sizeof(appleconf->tunnel_ipv4_ip));
std::strcpy(appleconf->tunnel_ipv4_netmask, mask.c_str()); std::strncpy(appleconf->tunnel_ipv4_netmask, mask.c_str(), sizeof(appleconf->tunnel_ipv4_netmask));
// TODO: in the future we want to do this properly with our pubkey (see issue #1705), but that's
// going to take a bit more work because we currently can't *get* the (usually) ephemeral pubkey
// at this stage of lokinet configuration. So for now we just stick our IPv4 address into it
// until #1705 gets implemented.
llarp::huint128_t ipv6{llarp::uint128_t{0xfd2e'6c6f'6b69'0000, llarp::net::TruncateV6(range.addr).h}};
std::strncpy(appleconf->tunnel_ipv6_ip, ipv6.ToString().c_str(), sizeof(appleconf->tunnel_ipv6_ip));
appleconf->tunnel_ipv6_prefix = 48;
appleconf->upstream_dns[0] = '\0'; appleconf->upstream_dns[0] = '\0';
for (auto& upstream : config->dns.m_upstreamDNS) for (auto& upstream : config->dns.m_upstreamDNS)

11
llarp/apple/context_wrapper.h
View File

@ -69,12 +69,17 @@ extern "C"
const char* default_bootstrap; const char* default_bootstrap;
/// llarp_apple_init writes the IP address for the primary tunnel IP address here, /// llarp_apple_init writes the IP address for the primary tunnel IP address here,
/// null-terminated. /// null-terminated.
char tunnel_ipv4_ip[16]; char tunnel_ipv4_ip[INET_ADDRSTRLEN];
/// llarp_apple_init writes the netmask of the tunnel address here, null-terminated. /// llarp_apple_init writes the netmask of the tunnel address here, null-terminated.
char tunnel_ipv4_netmask[16]; char tunnel_ipv4_netmask[INET_ADDRSTRLEN];
/// Writes the IPv6 address for the tunnel here, null-terminated.
char tunnel_ipv6_ip[INET6_ADDRSTRLEN];
/// IPv6 address prefix.
uint16_t tunnel_ipv6_prefix;
/// The first upstream DNS server's IPv4 address the OS should use when in exit mode. /// The first upstream DNS server's IPv4 address the OS should use when in exit mode.
/// (Currently on mac in exit mode we only support querying the first such configured server). /// (Currently on mac in exit mode we only support querying the first such configured server).
char upstream_dns[16]; char upstream_dns[INET_ADDRSTRLEN];
uint16_t upstream_dns_port; uint16_t upstream_dns_port;
/// \defgroup callbacks Callbacks /// \defgroup callbacks Callbacks