|
|
|
@ -4,6 +4,7 @@
|
|
|
|
#include <llarp/config/config.hpp>
|
|
|
|
#include <llarp/config/config.hpp>
|
|
|
|
#include <llarp/ev/vpn.hpp>
|
|
|
|
#include <llarp/ev/vpn.hpp>
|
|
|
|
#include <llarp/util/thread/queue.hpp>
|
|
|
|
#include <llarp/util/thread/queue.hpp>
|
|
|
|
|
|
|
|
#include <llarp/util/logging/apple_logger.hpp>
|
|
|
|
|
|
|
|
|
|
|
|
#include <string>
|
|
|
|
#include <string>
|
|
|
|
|
|
|
|
|
|
|
|
@ -11,54 +12,51 @@ namespace llarp::apple
|
|
|
|
{
|
|
|
|
{
|
|
|
|
struct FrameworkContext : public llarp::Context
|
|
|
|
struct FrameworkContext : public llarp::Context
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
explicit FrameworkContext(NEPacketTunnelProvider* tunnel);
|
|
|
|
explicit FrameworkContext(NEPacketTunnelProvider * tunnel);
|
|
|
|
|
|
|
|
|
|
|
|
~FrameworkContext()
|
|
|
|
|
|
|
|
{}
|
|
|
|
|
|
|
|
|
|
|
|
~FrameworkContext() {}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
std::shared_ptr<vpn::Platform>
|
|
|
|
std::shared_ptr<vpn::Platform>
|
|
|
|
makeVPNPlatform() override;
|
|
|
|
makeVPNPlatform() override;
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
void
|
|
|
|
Start();
|
|
|
|
Start();
|
|
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
private:
|
|
|
|
NEPacketTunnelProvider * m_Tunnel;
|
|
|
|
NEPacketTunnelProvider* const m_Tunnel;
|
|
|
|
std::unique_ptr<std::thread> m_Runner;
|
|
|
|
std::unique_ptr<std::thread> m_Runner;
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
class VPNInterface final : public vpn::NetworkInterface
|
|
|
|
class VPNInterface final : public vpn::NetworkInterface
|
|
|
|
{
|
|
|
|
{
|
|
|
|
NEPacketTunnelProvider * m_Tunnel;
|
|
|
|
NEPacketTunnelProvider* const m_Tunnel;
|
|
|
|
|
|
|
|
|
|
|
|
static inline constexpr auto PacketQueueSize = 1024;
|
|
|
|
static inline constexpr auto PacketQueueSize = 1024;
|
|
|
|
|
|
|
|
|
|
|
|
thread::Queue<net::IPPacket> m_ReadQueue;
|
|
|
|
thread::Queue<net::IPPacket> m_ReadQueue;
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
void
|
|
|
|
OfferReadPacket(NSData * data)
|
|
|
|
OfferReadPacket(NSData* data)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
llarp::net::IPPacket pkt;
|
|
|
|
llarp::net::IPPacket pkt;
|
|
|
|
const llarp_buffer_t buf{static_cast<const uint8_t *>(data.bytes), data.length};
|
|
|
|
const llarp_buffer_t buf{static_cast<const uint8_t*>(data.bytes), data.length};
|
|
|
|
if(pkt.Load(buf))
|
|
|
|
if (pkt.Load(buf))
|
|
|
|
m_ReadQueue.tryPushBack(std::move(pkt));
|
|
|
|
m_ReadQueue.tryPushBack(std::move(pkt));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public:
|
|
|
|
public:
|
|
|
|
explicit VPNInterface(NEPacketTunnelProvider * tunnel)
|
|
|
|
explicit VPNInterface(NEPacketTunnelProvider* tunnel)
|
|
|
|
: m_Tunnel{tunnel},
|
|
|
|
: m_Tunnel{tunnel}, m_ReadQueue{PacketQueueSize}
|
|
|
|
m_ReadQueue{PacketQueueSize}
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
auto handler =
|
|
|
|
auto handler = [this](NSArray<NSData*>* packets, NSArray<NSNumber*>*) {
|
|
|
|
[this](NSArray<NSData*> * packets, NSArray<NSNumber*> *)
|
|
|
|
NSUInteger num = [packets count];
|
|
|
|
|
|
|
|
for (NSUInteger idx = 0; idx < num; ++idx)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
NSUInteger num = [packets count];
|
|
|
|
NSData* pkt = [packets objectAtIndex:idx];
|
|
|
|
for(NSUInteger idx = 0; idx < num ; ++idx)
|
|
|
|
OfferReadPacket(pkt);
|
|
|
|
{
|
|
|
|
}
|
|
|
|
NSData * pkt = [packets objectAtIndex:idx];
|
|
|
|
};
|
|
|
|
OfferReadPacket(pkt);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
[m_Tunnel.packetFlow readPacketsWithCompletionHandler:handler];
|
|
|
|
[m_Tunnel.packetFlow readPacketsWithCompletionHandler:handler];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -73,12 +71,12 @@ namespace llarp::apple
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return "";
|
|
|
|
return "";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
net::IPPacket
|
|
|
|
net::IPPacket
|
|
|
|
ReadNextPacket() override
|
|
|
|
ReadNextPacket() override
|
|
|
|
{
|
|
|
|
{
|
|
|
|
net::IPPacket pkt{};
|
|
|
|
net::IPPacket pkt{};
|
|
|
|
if(not m_ReadQueue.empty())
|
|
|
|
if (not m_ReadQueue.empty())
|
|
|
|
pkt = m_ReadQueue.popFront();
|
|
|
|
pkt = m_ReadQueue.popFront();
|
|
|
|
return pkt;
|
|
|
|
return pkt;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -87,61 +85,53 @@ namespace llarp::apple
|
|
|
|
WritePacket(net::IPPacket pkt) override
|
|
|
|
WritePacket(net::IPPacket pkt) override
|
|
|
|
{
|
|
|
|
{
|
|
|
|
const sa_family_t fam = pkt.IsV6() ? AF_INET6 : AF_INET;
|
|
|
|
const sa_family_t fam = pkt.IsV6() ? AF_INET6 : AF_INET;
|
|
|
|
const uint8_t * pktbuf = pkt.buf;
|
|
|
|
const uint8_t* pktbuf = pkt.buf;
|
|
|
|
const size_t pktsz = pkt.sz;
|
|
|
|
const size_t pktsz = pkt.sz;
|
|
|
|
NSData * datapkt = [NSData dataWithBytes:pktbuf length:pktsz];
|
|
|
|
NSData* datapkt = [NSData dataWithBytes:pktbuf length:pktsz];
|
|
|
|
NEPacket * npkt = [[NEPacket alloc] initWithData:datapkt protocolFamily:fam];
|
|
|
|
NEPacket* npkt = [[NEPacket alloc] initWithData:datapkt protocolFamily:fam];
|
|
|
|
NSArray * pkts = @[npkt];
|
|
|
|
NSArray* pkts = @[npkt];
|
|
|
|
return [m_Tunnel.packetFlow writePacketObjects:pkts];
|
|
|
|
return [m_Tunnel.packetFlow writePacketObjects:pkts];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
class VPNPlatform final : public vpn::Platform
|
|
|
|
class VPNPlatform final : public vpn::Platform
|
|
|
|
{
|
|
|
|
{
|
|
|
|
NEPacketTunnelProvider * m_Tunnel;
|
|
|
|
NEPacketTunnelProvider* const m_Tunnel;
|
|
|
|
public:
|
|
|
|
|
|
|
|
explicit VPNPlatform(NEPacketTunnelProvider * tunnel)
|
|
|
|
public:
|
|
|
|
: m_Tunnel{tunnel}
|
|
|
|
explicit VPNPlatform(NEPacketTunnelProvider* tunnel) : m_Tunnel{tunnel}
|
|
|
|
{
|
|
|
|
{}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
std::shared_ptr<vpn::NetworkInterface> ObtainInterface(vpn::InterfaceInfo) override
|
|
|
|
std::shared_ptr<vpn::NetworkInterface>
|
|
|
|
|
|
|
|
ObtainInterface(vpn::InterfaceInfo) override
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return std::make_shared<VPNInterface>(m_Tunnel);
|
|
|
|
return std::make_shared<VPNInterface>(m_Tunnel);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
FrameworkContext::FrameworkContext(NEPacketTunnelProvider* tunnel)
|
|
|
|
FrameworkContext::FrameworkContext(NEPacketTunnelProvider * tunnel) :
|
|
|
|
: llarp::Context{}, m_Tunnel{tunnel}
|
|
|
|
llarp::Context{},
|
|
|
|
{}
|
|
|
|
m_Tunnel{tunnel}
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
void
|
|
|
|
FrameworkContext::Start()
|
|
|
|
FrameworkContext::Start()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
std::promise<void> result;
|
|
|
|
std::promise<void> result;
|
|
|
|
|
|
|
|
|
|
|
|
m_Runner = std::make_unique<std::thread>(
|
|
|
|
m_Runner = std::make_unique<std::thread>([&result, this]() {
|
|
|
|
[&result, this]()
|
|
|
|
const RuntimeOptions opts{};
|
|
|
|
|
|
|
|
try
|
|
|
|
{
|
|
|
|
{
|
|
|
|
const RuntimeOptions opts{};
|
|
|
|
Setup(opts);
|
|
|
|
try
|
|
|
|
Configure(llarp::Config::NetworkExtensionConfig());
|
|
|
|
{
|
|
|
|
}
|
|
|
|
Setup(opts);
|
|
|
|
catch (std::exception&)
|
|
|
|
Configure(llarp::Config::NetworkExtensionConfig());
|
|
|
|
{
|
|
|
|
}
|
|
|
|
result.set_exception(std::current_exception());
|
|
|
|
catch(std::exception & )
|
|
|
|
return;
|
|
|
|
{
|
|
|
|
}
|
|
|
|
result.set_exception(std::current_exception());
|
|
|
|
result.set_value();
|
|
|
|
return;
|
|
|
|
Run(opts);
|
|
|
|
}
|
|
|
|
});
|
|
|
|
result.set_value();
|
|
|
|
|
|
|
|
Run(opts);
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
auto ftr = result.get_future();
|
|
|
|
auto ftr = result.get_future();
|
|
|
|
ftr.get();
|
|
|
|
ftr.get();
|
|
|
|
@ -154,13 +144,13 @@ namespace llarp::apple
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
struct ContextWrapper
|
|
|
|
struct ContextWrapper
|
|
|
|
{
|
|
|
|
{
|
|
|
|
std::shared_ptr<llarp::apple::FrameworkContext> m_Context;
|
|
|
|
std::unique_ptr<llarp::apple::FrameworkContext> m_Context;
|
|
|
|
public:
|
|
|
|
|
|
|
|
explicit ContextWrapper(NEPacketTunnelProvider * tunnel) :
|
|
|
|
public:
|
|
|
|
m_Context{std::make_shared<llarp::apple::FrameworkContext>(tunnel)}
|
|
|
|
explicit ContextWrapper(NEPacketTunnelProvider* tunnel)
|
|
|
|
|
|
|
|
: m_Context{std::make_unique<llarp::apple::FrameworkContext>(tunnel)}
|
|
|
|
{}
|
|
|
|
{}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
void
|
|
|
|
@ -176,20 +166,35 @@ public:
|
|
|
|
m_Context->Wait();
|
|
|
|
m_Context->Wait();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static std::string_view
|
|
|
|
|
|
|
|
DataAsStringView(NSData* data)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return std::string_view{reinterpret_cast<const char*>(data.bytes), data.length};
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static NSData*
|
|
|
|
|
|
|
|
StringViewToData(std::string_view data)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
const char* ptr = data.data();
|
|
|
|
|
|
|
|
const size_t sz = data.size();
|
|
|
|
|
|
|
|
return [NSData dataWithBytes:ptr length:sz];
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@implementation LLARPPacketTunnel
|
|
|
|
@implementation LLARPPacketTunnel
|
|
|
|
|
|
|
|
|
|
|
|
- (void)startTunnelWithOptions:(NSDictionary<NSString *,NSObject *> *)options completionHandler:(void (^)(NSError *error))completionHandler {
|
|
|
|
- (void)startTunnelWithOptions:(NSDictionary<NSString*, NSObject*>*)options
|
|
|
|
|
|
|
|
completionHandler:(void (^)(NSError*))completionHandler
|
|
|
|
|
|
|
|
{
|
|
|
|
m_Context = new ContextWrapper{self};
|
|
|
|
m_Context = new ContextWrapper{self};
|
|
|
|
m_Context->Start();
|
|
|
|
m_Context->Start();
|
|
|
|
completionHandler(nullptr);
|
|
|
|
[self setTunnelNetworkSettings:nullptr completionHandler:completionHandler];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
- (void)stopTunnelWithReason:(NEProviderStopReason)reason
|
|
|
|
- (void)stopTunnelWithReason:(NEProviderStopReason)reason
|
|
|
|
completionHandler:(void (^)(void))completionHandler {
|
|
|
|
completionHandler:(void (^)(void))completionHandler
|
|
|
|
if(m_Context)
|
|
|
|
{
|
|
|
|
|
|
|
|
if (m_Context)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
m_Context->Stop();
|
|
|
|
m_Context->Stop();
|
|
|
|
delete m_Context;
|
|
|
|
delete m_Context;
|
|
|
|
@ -198,5 +203,13 @@ completionHandler:(void (^)(void))completionHandler {
|
|
|
|
completionHandler();
|
|
|
|
completionHandler();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- (void)handleAppMessage:(NSData*)messageData
|
|
|
|
|
|
|
|
completionHandler:(void (^)(NSData* responseData))completionHandler
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
const auto data = DataAsStringView(messageData);
|
|
|
|
|
|
|
|
LogInfo("app message: ", data);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
completionHandler(StringViewToData("ok"));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@end
|
|
|
|
@end
|
|
|
|
|
jeff
3 years ago
committed by
Jeff Becker