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:
@@ -22,6 +22,8 @@
|
||||
#ifndef OPENVPN_TUN_PERSIST_TUNWRAPASIO_H
|
||||
#define OPENVPN_TUN_PERSIST_TUNWRAPASIO_H
|
||||
|
||||
#include <utility>
|
||||
|
||||
namespace openvpn {
|
||||
|
||||
// This object supports that subset of the Asio stream
|
||||
@@ -48,17 +50,14 @@ namespace openvpn {
|
||||
// subset of methods used by TunIO).
|
||||
// Prototypes from asio/windows/basic_stream_handle.hpp
|
||||
|
||||
template <typename MutableBufferSequence, typename ReadHandler>
|
||||
ASIO_INITFN_RESULT_TYPE(ReadHandler,
|
||||
void (openvpn_io::error_code, std::size_t))
|
||||
async_read_some(const MutableBufferSequence& buffers,
|
||||
ASIO_MOVE_ARG(ReadHandler) handler)
|
||||
template <typename MUTABLE_BUFFER, typename HANDLER>
|
||||
void async_read_some(const MUTABLE_BUFFER& buffers, HANDLER&& handler)
|
||||
{
|
||||
return tun_wrap->obj()->async_read_some(buffers, handler);
|
||||
return tun_wrap->obj()->async_read_some(buffers, std::move(handler));
|
||||
}
|
||||
|
||||
template <typename ConstBufferSequence>
|
||||
std::size_t write_some(const ConstBufferSequence& buffers)
|
||||
template <typename CONST_BUFFER>
|
||||
std::size_t write_some(const CONST_BUFFER& buffers)
|
||||
{
|
||||
return tun_wrap->obj()->write_some(buffers);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user