mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2026-04-24 00:00:05 +08:00
Squashed 'OpenVPN Adapter/Vendors/openvpn/' changes from da99df6..4095565
4095565 OpenVPN 3 client: added tun abstraction layer. 4bfaafc AsioTimer: use expires_after() method when possible. 782e8eb Apple: moved some source files. f89da96 OpenVPN 3 client: added single-thread mode: 233dfde OpenVPN 3 client: fixed state->session typos. d689b6d Added new Apple Core Foundation wrappers: 3838a62 i/o layer: added OPENVPN_IO_REQUIRES_STOP compile flag. 138ec96 asiopolysock.hpp: don't call SockOpt::set_cloexec(fd) if fd is undefined (i.e. fd == -1). 10eb723 Apple CF wrapper: renamed OWN/BORROW. 962fe87 Apple CF wrapper: simplify cf.hpp dependency profile. 4fcc99c Objective C++: fix symbol conflicts. 8f63cbb tunwrapasio.hpp: make generic with respect to i/o layer. 67e0013 AsioTimer: added expires_after() method. fc7eaaf Apple CF wrappers: moved CFRunLoop/CFRunLoopSource wrapper to applecrypto/cf, where all other CF wrappers currently reside. 1215912 Revamped Function (our own functor object) to be more flexible. 10fa276 process.hpp: added compile option to avoid async pipe usage. 9e09451 gwv4.hpp: added missing includes 916856d build script: updated Objective-C support when OBJC=1. git-subtree-dir: OpenVPN Adapter/Vendors/openvpn git-subtree-split: 4095565b4de2c7d738e728cae989f632100a8ce8
This commit is contained in:
@@ -26,8 +26,10 @@
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <netinet/in.h>
|
||||
#include <net/route.h>
|
||||
#include <net/if.h>
|
||||
#include <net/if_dl.h>
|
||||
|
||||
#include <cstring>
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
#include <openvpn/common/process.hpp>
|
||||
#include <openvpn/apple/macver.hpp>
|
||||
#include <openvpn/apple/scdynstore.hpp>
|
||||
#include <openvpn/applecrypto/cf/cfhelper.hpp>
|
||||
#include <openvpn/apple/cf/cfhelper.hpp>
|
||||
#include <openvpn/tun/builder/capture.hpp>
|
||||
|
||||
namespace openvpn {
|
||||
|
||||
@@ -29,8 +29,8 @@
|
||||
|
||||
#include <openvpn/log/logthread.hpp>
|
||||
#include <openvpn/common/action.hpp>
|
||||
#include <openvpn/applecrypto/cf/cftimer.hpp>
|
||||
#include <openvpn/apple/runloop.hpp>
|
||||
#include <openvpn/apple/cf/cftimer.hpp>
|
||||
#include <openvpn/apple/cf/cfrunloop.hpp>
|
||||
#include <openvpn/tun/mac/macdns.hpp>
|
||||
|
||||
namespace openvpn {
|
||||
@@ -183,7 +183,7 @@ namespace openvpn {
|
||||
// as well.
|
||||
void thread_func()
|
||||
{
|
||||
runloop.reset(CFRunLoopGetCurrent(), CF::BORROW);
|
||||
runloop.reset(CFRunLoopGetCurrent(), CF::GET);
|
||||
Log::Context logctx(logwrap);
|
||||
|
||||
try {
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <openvpn/common/exception.hpp>
|
||||
#include <openvpn/addr/ip.hpp>
|
||||
#include <openvpn/apple/scdynstore.hpp>
|
||||
#include <openvpn/applecrypto/cf/cfhelper.hpp>
|
||||
#include <openvpn/apple/cf/cfhelper.hpp>
|
||||
|
||||
namespace openvpn {
|
||||
struct MacGWInfo
|
||||
|
||||
Reference in New Issue
Block a user