mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2026-04-24 00:00:05 +08:00
82fea30fcc
3e002c8 remove unused Jenkinsfile 16b1055 [OVPN3-140] Update company names in copyrights 6caca2c [OVPN3-140] Relicense back to AGPLv3 4f9ae74 cliproto: react to tls_warnings 546547b Proto: export tls_warnings attribute from SSL session 7cbaa26 SSLAPI: add tls_warning attribute 7ed93a3 clievent: add Warn event class 7a71ba1 win: get 'arch' param value from environment 61bb21b win: make parameter optional 15d66c4 [OVPN3-141] win: disable WPO 97d9c28 [OU-15] mbedtls: remove duplicated code 95aec32 [OU-15] mbedtls: refactor X509Cert to allow reuse der2pem 946753e [OVPN3-135] Win: remove unneeded default route d7f8c47 nrpt: create separate policy per dns suffix 577b5ca cli.cpp: fix typ0 in define fc8f89d [OVPN3-129] android: ensure all SWIG files are archived and saved e143bc0 [OVPN3-129] android: improve build system in order to perform full build 06d23ec [OVPN3-129] build-system: let scripts download dependencies 76bb99c fix usage of to_string() in Android 44c183a time: mute type conversion warnings for UWP client 7d7490c transport: enable socket protect call for UWP 1c003ac transport: pass protocol type to external factory c0de92c transport: add stop_requeueing method e2c60c8 android: build core library with MD5 support 3928069 [OVPN3-119] mbedTLS: create INSECURE profile including MD5 4f99310 remove function accidentally duplicated by last merge b91d841 self-test: add missing includes 19e33c4 [OA-14] mbedTLS: relax x509 date/time format check f3cf645 [OVPN3-116] disable SSL_CBC_RECORD_SPLITTING fca9ed2 [OVPN3-105] ParseClientConfig: avoid crash when not all key material is provided 7299fef [OC-42] Android: specify API level on command line d3da3df android: build client lib for x86 (for emulator) 8e501c5 Update version for mbedTLS and lz4 e57676e ParseClientConfig: export config to json format 9aa715f ParseClientConfig: export configuration to ovpn file format 1eab4cb ParseClientConfig: add helper constructor 71a59e4 ParseClientConfig: store the entire ovpn profile e0bb85a Transport: convert from transport protocol to config string 2fe56c3 Compress: convert from ctx type to config string 174ee25 OpenSSL: implement stub methods for new private_key_type/length() SSLAPIs 3d57708 mbedTLS: implement private_key_type/length() API a3210f0 SSLAPI: add private_key_type/length() getter methods 8ffe888 OpenSSL: implement stub methods for new extract_* SSLAPIs 16e9160 mbedTLS: implement extended API for key material extraction fe3d519 SSLAPI: extend API with methods to extract key material 2b4c850 Debugging: added header and build flag for valgrind run-time extensions. b948cde ManClientInstance::Factory: added virtual stop() method. 121e975 client API: added portOverride 106981c JSON: allow alternative JSON library implementations f206ae2 logging: added logdatetime.hpp which prepends date/time to log lines 49e933d Time: added to_double, delta_float, and delta_str methods 569b1da daemon.hpp: added class WritePid for managing pid files 63e9e04 ClientProto: reset CoarseTime object when AsioTimer is canceled f64b501 Cleanup: allow functor to be passed by value. ebe2560 RunContext: add configurable exit via EXIT_IN env var for debugging 1fbff4f tls-crypt: revised server-side validate_initial_packet() methods to use a BufferAllocated rather than a Buffer. 0090c51 SSLConst: added new ssl_flags() method which filters out non-ssl flags from given argument. 8379b0a CryptoDCInstance: added new RekeyType PRIMARY_SECONDARY_SWAP and use it in ProtoContext::promote_secondary_to_primary() since it more accurately reflects the underlying implementation. 18f45c2 ManClientInstance::Send: added AuthStatus::Type parameter to disconnect_user() method. 4bba803 Listen::List: added expand_ports() method. 5122e7d Listen::List: in port_offset(), set n_threads to 0 since number-of-threads data for port_offset items isn't really relevant. 4e11a6c StaticKey: added render_to_base64() and init_from_rng() methods. 190ece9 CryptoAlgs: added mode() method. 76e65cf CryptoAlgs: added AEAD_NONCE_TAIL_SIZE constant (set to 8 bytes) to represent the size in bytes of AEAD "nonce tail" normally taken from the HMAC key material. 2738718 compress: added method_to_string() method, i.e. the inverse of parse_method(). 7b47f99 compress: since parse_method() performs a linear search on method, reorder so that more frequently used methods appear at the top of the list. b428f74 library: added integer is_pow2() and log2() methods based on efficient __builtin_ffs and __builtin_clz intrinsics. 4926011 Android: adapt toolchain scripts to new SDK and move to API 26 ad4e995 mbedTLS: use mbedtls API to initialize cert object 908c611 transport: use socket_protect to communicate socket handle on UWP 92a6216 build win: read certain params from env 8166ea8 common: define uwp platform macro 0186bf6 common: report platform name as "uwp" 3f291b0 netconf: disable getting hwaddr for UWP 6365d26 transport: external factory 2ffa0c9 transport: synchronous DNS lookup 2c09c7c cliconnect.hpp: support for AsioWork always on 4f5a04d rand.hpp: allow external entropy source b19c5da time.hpp: use GetTickCount64 on Vista and newer 712ccfc android: export DEP_DIR via vars files only if not already defined 1b5a784 asio: make sure to switch to DEP_DIR before building 4302651 changes to support android building 6f56b2b Merge pull request #21 from OpenVPN/make_test_proto_deterministic 3a5ef2b travis-ci: make testing binary deterministic b76882d mbedtls: fix typ0 in exception message 40065a6 avoid "uninitialized variable warning" f33e7c2 [OVPN3-5] tls-crypt: add tls-crypt support in proto.hpp test unit 74c5f4f [OVPN3-5] tls-crypt: introduce tls-crypt support 389353c proto.cpp: uninit process at the end of the execution 56a831f [OVPN3-5] crypto/ssl: add support for AES-256-CTR 7cbf539 [OVPN3-5] build script: allow user to specify its own mbedTLS folder and LDFLAGS 8ae2a3f Integrate Google Test framework 68ae101 Add swig build to jenkins pipeline d496311 ovpncli.hpp: inline LogInfo constructor for clarity 96e0d89 Revert "Merged in OVPN3-21-prepend-log-record-with-unique- (pull request #7)" 7db95cc Make build fail on compilation errors 860129a TunBuilderCapture: make (to|from)_json methods public 2486494 random: added helper class Rand2 containing a crypto and non-crypto RNG 04175c2 appversion.hpp: Stringize VERSION -> MY_VERSION 81cb887 build script: added DPROF=1 flag a3dd47f timestr.hpp: moved milliseconds_since_epoch() to time/epoch.hpp 59b9492 sslchoose.hpp: added SSL_LIB_NAME 8fcb797 ProtoContext::KeyContext::raw_recv() : fix state transition e49e993 ProtoContext: comment edit 1d941aa VPNServerNetblock::Netblock refactor 7190495 Server-side renamings to break up long class names using namespaces. 3f74ec1 Listen::List: minor changes 79c789b RandomAPI: comment edit 5b5af36 Added SSLConst::SERVER_TO_SERVER flag fe00df4 OpenSSLContext::Config::set_rng: call assert_crypto() 3ae0076 In sslchoose.hpp, move OPENVPN_LOG_SSL macro to new file ssllog.hpp 1502cf6 URL::Parse: made is_valid_uri_char() standalone and moved to validate_uri.hpp 2dcb189 Added HTTP::Status::SwitchingProtocols constant 2f57024 HTTP::HeaderList: added get_value_trim_lower() method bee94d2 HTTP::HeaderList: get_value() and get_value_trim() should return std::string instead of const std::string 5debab1 Frame::Context: #define OPENVPN_NO_IO to allow building without i/o layer faf8f8f StaticKey: added parse_from_base64() method d11f250 HashString: added final_base64() method c373bf8 CompressContext: use C++11 member initialization and remove explicit attribute on constructor bd75cd7 RCPtr: added operator==() and operator!=() methods 7be33c5 PThreadBarrier: fixed incorrect comment 6f5f77b Link: use move semantics 17a5d89 inotify.hpp: no longer used 8ce39fc added render_hex() and render_hex_sep() methods that accept void* data ddc8e8a Function: use std::forward 76ee587 write_binary_atomic(): added tmpdir (temporary directory) parameter f366d55 base64: encode() now accepts void* data 462fe90 BufferType: added read(), write(), and prepend() variants that accept void* data 9ad1be4 IP::RouteType: added host_bits() method 3ebc8c7 IPv[46]::Addr::to_sockaddr() now accepts optional port number ce0977b Support Cityhash. fdbb0b9 IP::Addr: added validate_prefix_len() 25146d8 IP::Addr::from_ipv[4|6](): use move semantics a264f99 Merge pull request #20 from OpenVPN/fix_travis_ci_coverity 966e212 travis: don't mess up the SSL libs for wget/curl 2b8f09d Merge pull request #19 from OpenVPN/antonio/travis-ci-to-coverity 127cbb0 travis.yml: send build to Coverity SCAN when building master 2bca49b Merge pull request #15 from OpenVPN/antonio/travis-ci a5ce566 add basic support for Travis CI f9b14e9 macOS: add basic logging support 2b9188d Remotelist: pass meaningful port value to resolve::async_resolve() 4ebdbd0 Merged in OVPN3-38-improve-jenkins-pipeline-script (pull request #8) 832cf7f Report build status to Bitbucket 62423c9 Merged in OVPN3-21-prepend-log-record-with-unique- (pull request #7) cce2455 Prepend log string with unique reference. f26b08b Merged in OVPN3-25-pipeline-build (pull request #4) dc5ff1f Add OpenSSL version building. c77e1d6 Add pipeline script for multiplatform build. 4fab9b0 Merged in OVPN3-18-vs-project (pull request #2) 8eb0d6c Add Visual Studio project info to README 67c4989 Visual Studio 2015 solution and project files 52bfcd3 Merged in OVPN3-17 (pull request #1) 5f648ce Document Windows build process 3213c48 Support for local build settings b3ec01b Support for gpl version of mbedtls 903abc8 Support for zipballs 4029579 AsioPolySock: support bind to local address. 1e85566 Use openvpn::strerror_str() instead of std::strerror(). 3ba37fc OpenVPN 3 client: added OPENVPN_OVPNCLI_ASYNC_SETUP flag. git-subtree-dir: OpenVPN Adapter/Vendors/openvpn git-subtree-split: 3e002c83ce2e9f9f40ddcee750d3cfa664238abe
474 lines
14 KiB
C++
474 lines
14 KiB
C++
// OpenVPN -- An application to securely tunnel IP networks
|
|
// over a single port, with support for SSL/TLS-based
|
|
// session authentication and key exchange,
|
|
// packet encryption, packet authentication, and
|
|
// packet compression.
|
|
//
|
|
// Copyright (C) 2012-2017 OpenVPN Inc.
|
|
//
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Affero General Public License Version 3
|
|
// as published by the Free Software Foundation.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Affero General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Affero General Public License
|
|
// along with this program in the COPYING file.
|
|
// If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
// Client tun setup for Mac
|
|
|
|
#ifndef OPENVPN_TUN_MAC_CLIENT_TUNSETUP_H
|
|
#define OPENVPN_TUN_MAC_CLIENT_TUNSETUP_H
|
|
|
|
#include <string>
|
|
#include <sstream>
|
|
#include <ostream>
|
|
|
|
#include <openvpn/common/exception.hpp>
|
|
#include <openvpn/common/rc.hpp>
|
|
#include <openvpn/common/size.hpp>
|
|
#include <openvpn/common/arraysize.hpp>
|
|
#include <openvpn/common/action.hpp>
|
|
#include <openvpn/common/process.hpp>
|
|
#include <openvpn/common/jsonlib.hpp>
|
|
#include <openvpn/error/excode.hpp>
|
|
#include <openvpn/tun/layer.hpp>
|
|
#include <openvpn/tun/mac/tunutil.hpp>
|
|
#include <openvpn/tun/mac/utun.hpp>
|
|
#include <openvpn/tun/mac/macgw.hpp>
|
|
#include <openvpn/tun/mac/macdns_watchdog.hpp>
|
|
#include <openvpn/tun/builder/rgwflags.hpp>
|
|
#include <openvpn/tun/builder/setup.hpp>
|
|
|
|
#ifdef HAVE_JSON
|
|
#include <openvpn/common/jsonhelper.hpp>
|
|
#endif
|
|
|
|
namespace openvpn {
|
|
namespace TunMac {
|
|
class Setup : public TunBuilderSetup::Base
|
|
{
|
|
public:
|
|
typedef RCPtr<Setup> Ptr;
|
|
|
|
OPENVPN_EXCEPTION(tun_mac_setup);
|
|
|
|
struct Config : public TunBuilderSetup::Config
|
|
{
|
|
std::string iface_name;
|
|
Layer layer; // OSI layer
|
|
bool tun_prefix = false;
|
|
|
|
#ifdef HAVE_JSON
|
|
virtual Json::Value to_json() override
|
|
{
|
|
Json::Value root(Json::objectValue);
|
|
root["iface_name"] = Json::Value(iface_name);
|
|
root["layer"] = Json::Value(layer.str());
|
|
root["tun_prefix"] = Json::Value(tun_prefix);
|
|
return root;
|
|
};
|
|
|
|
virtual void from_json(const Json::Value& root, const std::string& title) override
|
|
{
|
|
json::assert_dict(root, title);
|
|
json::to_string(root, iface_name, "iface_name", title);
|
|
layer = Layer::from_str(json::get_string(root, "layer", title));
|
|
json::to_bool(root, tun_prefix, "tun_prefix", title);
|
|
}
|
|
#endif
|
|
};
|
|
|
|
virtual int establish(const TunBuilderCapture& pull, // defined by TunBuilderSetup::Base
|
|
TunBuilderSetup::Config* config,
|
|
Stop* stop,
|
|
std::ostream& os) override
|
|
{
|
|
// get configuration
|
|
Config *conf = dynamic_cast<Config *>(config);
|
|
if (!conf)
|
|
throw tun_mac_setup("missing config");
|
|
|
|
// close out old remove cmds, if they exist
|
|
destroy(os);
|
|
|
|
// Open tun device. Try Mac OS X integrated utun device first
|
|
// (layer 3 only). If utun fails and MAC_TUNTAP_FALLBACK is defined,
|
|
// then fall back to TunTap third-party device.
|
|
// If successful, conf->iface_name will be set to tun iface name.
|
|
int fd = -1;
|
|
conf->tun_prefix = false;
|
|
try {
|
|
# if defined(MAC_TUNTAP_FALLBACK)
|
|
# if !defined(ASIO_DISABLE_KQUEUE)
|
|
# error Mac OS X TunTap adapter is incompatible with kqueue; rebuild with ASIO_DISABLE_KQUEUE
|
|
# endif
|
|
if (conf->layer() == Layer::OSI_LAYER_3)
|
|
{
|
|
try {
|
|
fd = UTun::utun_open(conf->iface_name);
|
|
conf->tun_prefix = true;
|
|
}
|
|
catch (const std::exception& e)
|
|
{
|
|
os << e.what() << std::endl;
|
|
}
|
|
}
|
|
if (fd == -1)
|
|
fd = Util::tuntap_open(conf->layer, conf->iface_name);
|
|
# else
|
|
fd = UTun::utun_open(conf->iface_name);
|
|
conf->tun_prefix = true;
|
|
# endif
|
|
}
|
|
catch (const std::exception& e)
|
|
{
|
|
throw ErrorCode(Error::TUN_IFACE_CREATE, true, e.what());
|
|
}
|
|
|
|
// create ActionLists for setting up and removing adapter properties
|
|
ActionList::Ptr add_cmds(new ActionList());
|
|
remove_cmds.reset(new ActionList());
|
|
|
|
// populate add/remove lists with actions
|
|
tun_config(conf->iface_name, pull, *add_cmds, *remove_cmds, os);
|
|
|
|
// execute the add actions
|
|
add_cmds->execute(os);
|
|
|
|
// now that the add actions have succeeded,
|
|
// enable the remove actions
|
|
remove_cmds->enable_destroy(true);
|
|
|
|
os << "open " << conf->iface_name << " SUCCEEDED" << std::endl;
|
|
return fd;
|
|
}
|
|
|
|
virtual void destroy(std::ostream& os) override // defined by DestructorBase
|
|
{
|
|
if (remove_cmds)
|
|
{
|
|
remove_cmds->destroy(os);
|
|
remove_cmds.reset();
|
|
}
|
|
}
|
|
|
|
virtual ~Setup()
|
|
{
|
|
std::ostringstream os;
|
|
destroy(os);
|
|
}
|
|
|
|
private:
|
|
enum { // add_del_route flags
|
|
R_IPv6=(1<<0),
|
|
R_IFACE=(1<<1),
|
|
R_IFACE_HINT=(1<<2),
|
|
R_ONLINK=(1<<3),
|
|
R_REJECT=(1<<4),
|
|
R_BLACKHOLE=(1<<5),
|
|
};
|
|
|
|
static void add_del_route(const std::string& addr_str,
|
|
const int prefix_len,
|
|
const std::string& gateway_str,
|
|
const std::string& iface,
|
|
const unsigned int flags,
|
|
Action::Ptr& create,
|
|
Action::Ptr& destroy)
|
|
{
|
|
if (flags & R_IPv6)
|
|
{
|
|
const IPv6::Addr addr = IPv6::Addr::from_string(addr_str);
|
|
const IPv6::Addr netmask = IPv6::Addr::netmask_from_prefix_len(prefix_len);
|
|
const IPv6::Addr net = addr & netmask;
|
|
|
|
Command::Ptr add(new Command);
|
|
add->argv.push_back("/sbin/route");
|
|
add->argv.push_back("add");
|
|
add->argv.push_back("-net");
|
|
add->argv.push_back("-inet6");
|
|
add->argv.push_back(net.to_string());
|
|
add->argv.push_back("-prefixlen");
|
|
add->argv.push_back(to_string(prefix_len));
|
|
if (flags & R_REJECT)
|
|
add->argv.push_back("-reject");
|
|
if (flags & R_BLACKHOLE)
|
|
add->argv.push_back("-blackhole");
|
|
if (!iface.empty())
|
|
{
|
|
if (flags & R_IFACE)
|
|
{
|
|
add->argv.push_back("-iface");
|
|
add->argv.push_back(iface);
|
|
}
|
|
}
|
|
if (!gateway_str.empty() && !(flags & R_IFACE))
|
|
{
|
|
std::string g = gateway_str;
|
|
if (flags & R_IFACE_HINT)
|
|
g += '%' + iface;
|
|
add->argv.push_back(g);
|
|
}
|
|
create = add;
|
|
|
|
// for the destroy command, copy the add command but replace "add" with "delete"
|
|
Command::Ptr del(add->copy());
|
|
del->argv[1] = "delete";
|
|
destroy = del;
|
|
}
|
|
else
|
|
{
|
|
const IPv4::Addr addr = IPv4::Addr::from_string(addr_str);
|
|
const IPv4::Addr netmask = IPv4::Addr::netmask_from_prefix_len(prefix_len);
|
|
const IPv4::Addr net = addr & netmask;
|
|
|
|
Command::Ptr add(new Command);
|
|
add->argv.push_back("/sbin/route");
|
|
add->argv.push_back("add");
|
|
if (flags & R_ONLINK)
|
|
{
|
|
add->argv.push_back("-cloning");
|
|
add->argv.push_back("-net");
|
|
add->argv.push_back(net.to_string());
|
|
add->argv.push_back("-netmask");
|
|
add->argv.push_back(netmask.to_string());
|
|
add->argv.push_back("-interface");
|
|
add->argv.push_back(iface);
|
|
}
|
|
else
|
|
{
|
|
add->argv.push_back("-net");
|
|
add->argv.push_back(net.to_string());
|
|
add->argv.push_back("-netmask");
|
|
add->argv.push_back(netmask.to_string());
|
|
if (flags & R_REJECT)
|
|
add->argv.push_back("-reject");
|
|
if (flags & R_BLACKHOLE)
|
|
add->argv.push_back("-blackhole");
|
|
if (!iface.empty())
|
|
{
|
|
if (flags & R_IFACE)
|
|
{
|
|
add->argv.push_back("-iface");
|
|
add->argv.push_back(iface);
|
|
}
|
|
}
|
|
add->argv.push_back(gateway_str);
|
|
}
|
|
create = add;
|
|
|
|
// for the destroy command, copy the add command but replace "add" with "delete"
|
|
Command::Ptr del(add->copy());
|
|
del->argv[1] = "delete";
|
|
destroy = del;
|
|
}
|
|
}
|
|
|
|
static void add_del_route(const std::string& addr_str,
|
|
const int prefix_len,
|
|
const std::string& gateway_str,
|
|
const std::string& iface,
|
|
const unsigned int flags,
|
|
ActionList& create,
|
|
ActionList& destroy)
|
|
{
|
|
Action::Ptr c, d;
|
|
add_del_route(addr_str, prefix_len, gateway_str, iface, flags, c, d);
|
|
create.add(c);
|
|
destroy.add(d);
|
|
}
|
|
|
|
static void tun_config(const std::string& iface_name,
|
|
const TunBuilderCapture& pull,
|
|
ActionList& create,
|
|
ActionList& destroy,
|
|
std::ostream& os)
|
|
{
|
|
// get default gateway
|
|
MacGWInfo gw;
|
|
|
|
// set local4 and local6 to point to IPv4/6 route configurations
|
|
const TunBuilderCapture::RouteAddress* local4 = nullptr;
|
|
const TunBuilderCapture::RouteAddress* local6 = nullptr;
|
|
if (pull.tunnel_address_index_ipv4 >= 0)
|
|
local4 = &pull.tunnel_addresses[pull.tunnel_address_index_ipv4];
|
|
if (pull.tunnel_address_index_ipv6 >= 0)
|
|
local6 = &pull.tunnel_addresses[pull.tunnel_address_index_ipv6];
|
|
|
|
// Interface down
|
|
Command::Ptr iface_down(new Command);
|
|
iface_down->argv.push_back("/sbin/ifconfig");
|
|
iface_down->argv.push_back(iface_name);
|
|
iface_down->argv.push_back("down");
|
|
create.add(iface_down);
|
|
|
|
// Set IPv4 Interface
|
|
if (local4)
|
|
{
|
|
// Process ifconfig
|
|
const IPv4::Addr netmask = IPv4::Addr::netmask_from_prefix_len(local4->prefix_length);
|
|
{
|
|
Command::Ptr cmd(new Command);
|
|
cmd->argv.push_back("/sbin/ifconfig");
|
|
cmd->argv.push_back(iface_name);
|
|
cmd->argv.push_back(local4->address);
|
|
cmd->argv.push_back(local4->address);
|
|
cmd->argv.push_back("netmask");
|
|
cmd->argv.push_back(netmask.to_string());
|
|
cmd->argv.push_back("mtu");
|
|
cmd->argv.push_back(to_string(pull.mtu));
|
|
cmd->argv.push_back("up");
|
|
create.add(cmd);
|
|
}
|
|
add_del_route(local4->address, local4->prefix_length, local4->address, iface_name, 0, create, destroy);
|
|
}
|
|
|
|
// Set IPv6 Interface
|
|
if (local6 && !pull.block_ipv6)
|
|
{
|
|
{
|
|
Command::Ptr cmd(new Command);
|
|
cmd->argv.push_back("/sbin/ifconfig");
|
|
cmd->argv.push_back(iface_name);
|
|
cmd->argv.push_back("inet6");
|
|
cmd->argv.push_back(local6->address + '/' + to_string(local6->prefix_length));
|
|
cmd->argv.push_back("up");
|
|
create.add(cmd);
|
|
}
|
|
add_del_route(local6->address, local6->prefix_length, "", iface_name, R_IPv6|R_IFACE, create, destroy);
|
|
}
|
|
|
|
// Process Routes
|
|
{
|
|
for (std::vector<TunBuilderCapture::Route>::const_iterator i = pull.add_routes.begin(); i != pull.add_routes.end(); ++i)
|
|
{
|
|
const TunBuilderCapture::Route& route = *i;
|
|
if (route.ipv6)
|
|
{
|
|
if (!pull.block_ipv6)
|
|
add_del_route(route.address, route.prefix_length, local6->gateway, iface_name, R_IPv6|R_IFACE, create, destroy);
|
|
}
|
|
else
|
|
{
|
|
if (local4 && !local4->gateway.empty())
|
|
add_del_route(route.address, route.prefix_length, local4->gateway, iface_name, 0, create, destroy);
|
|
else
|
|
os << "ERROR: IPv4 route pushed without IPv4 ifconfig and/or route-gateway" << std::endl;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Process exclude routes
|
|
if (!pull.exclude_routes.empty())
|
|
{
|
|
for (std::vector<TunBuilderCapture::Route>::const_iterator i = pull.exclude_routes.begin(); i != pull.exclude_routes.end(); ++i)
|
|
{
|
|
const TunBuilderCapture::Route& route = *i;
|
|
if (route.ipv6)
|
|
{
|
|
if (!pull.block_ipv6)
|
|
{
|
|
if (gw.v6.defined())
|
|
add_del_route(route.address, route.prefix_length, gw.v6.router.to_string(), gw.v6.iface, R_IPv6|R_IFACE_HINT, create, destroy);
|
|
else
|
|
os << "NOTE: cannot determine gateway for exclude IPv6 routes" << std::endl;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (gw.v4.defined())
|
|
add_del_route(route.address, route.prefix_length, gw.v4.router.to_string(), gw.v4.iface, 0, create, destroy);
|
|
else
|
|
os << "NOTE: cannot determine gateway for exclude IPv4 routes" << std::endl;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Process IPv4 redirect-gateway
|
|
if (pull.reroute_gw.ipv4)
|
|
{
|
|
// add server bypass route
|
|
if (gw.v4.defined())
|
|
{
|
|
if (!pull.remote_address.ipv6 && !(pull.reroute_gw.flags & RedirectGatewayFlags::RG_LOCAL))
|
|
{
|
|
Action::Ptr c, d;
|
|
add_del_route(pull.remote_address.address, 32, gw.v4.router.to_string(), gw.v4.iface, 0, c, d);
|
|
create.add(c);
|
|
destroy.add(d);
|
|
//add_del_route(gw.v4.router.to_string(), 32, "", gw.v4.iface, R_ONLINK, create, destroy); // fixme -- needed for block-local
|
|
}
|
|
}
|
|
else
|
|
os << "ERROR: cannot detect IPv4 default gateway" << std::endl;
|
|
|
|
if (!(pull.reroute_gw.flags & RGWFlags::EmulateExcludeRoutes))
|
|
{
|
|
add_del_route("0.0.0.0", 1, local4->gateway, iface_name, 0, create, destroy);
|
|
add_del_route("128.0.0.0", 1, local4->gateway, iface_name, 0, create, destroy);
|
|
}
|
|
}
|
|
|
|
// Process IPv6 redirect-gateway
|
|
if (pull.reroute_gw.ipv6 && !pull.block_ipv6)
|
|
{
|
|
// add server bypass route
|
|
if (gw.v6.defined())
|
|
{
|
|
if (pull.remote_address.ipv6 && !(pull.reroute_gw.flags & RedirectGatewayFlags::RG_LOCAL))
|
|
{
|
|
Action::Ptr c, d;
|
|
add_del_route(pull.remote_address.address, 128, gw.v6.router.to_string(), gw.v6.iface, R_IPv6|R_IFACE_HINT, c, d);
|
|
create.add(c);
|
|
destroy.add(d);
|
|
//add_del_route(gw.v6.router.to_string(), 128, "", gw.v6.iface, R_IPv6|R_ONLINK, create, destroy); // fixme -- needed for block-local
|
|
}
|
|
}
|
|
else
|
|
os << "ERROR: cannot detect IPv6 default gateway" << std::endl;
|
|
|
|
if (!(pull.reroute_gw.flags & RGWFlags::EmulateExcludeRoutes))
|
|
{
|
|
add_del_route("0000::", 1, local6->gateway, iface_name, R_IPv6|R_IFACE, create, destroy);
|
|
add_del_route("8000::", 1, local6->gateway, iface_name, R_IPv6|R_IFACE, create, destroy);
|
|
}
|
|
}
|
|
|
|
// Process block-ipv6
|
|
if (pull.block_ipv6)
|
|
{
|
|
add_del_route("2000::", 4, "::1", "lo0", R_IPv6|R_REJECT|R_IFACE_HINT, create, destroy);
|
|
add_del_route("3000::", 4, "::1", "lo0", R_IPv6|R_REJECT|R_IFACE_HINT, create, destroy);
|
|
add_del_route("fc00::", 7, "::1", "lo0", R_IPv6|R_REJECT|R_IFACE_HINT, create, destroy);
|
|
}
|
|
|
|
// Interface down
|
|
destroy.add(iface_down);
|
|
|
|
// configure DNS
|
|
{
|
|
MacDNS::Config::Ptr dns(new MacDNS::Config(pull));
|
|
MacDNSWatchdog::add_actions(dns,
|
|
MacDNSWatchdog::FLUSH_RECONFIG
|
|
#ifdef ENABLE_DNS_WATCHDOG
|
|
| MacDNSWatchdog::SYNCHRONOUS
|
|
| MacDNSWatchdog::ENABLE_WATCHDOG
|
|
#endif
|
|
,
|
|
create,
|
|
destroy);
|
|
}
|
|
}
|
|
|
|
ActionList::Ptr remove_cmds;
|
|
};
|
|
}
|
|
}
|
|
|
|
#endif
|