mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2026-04-24 00:00:05 +08:00
Squashed 'Sources/OpenVPNAdapter/Libraries/Vendors/openvpn/' changes from 554d8b888..cc90cde57
cc90cde57 win: use 'MSVC 2017 Professional' as default compiler 4b072bce1 [OVPN3-311] function.hpp: fix Windows build 48b9b78de [OVPN3-310] logging: fix 'OPENVPN_LOG_NTNL': identifier not found 5a4a87552 cosmetics: helper function to check registry errors fc52fd8a5 [OC-78] proxy: support PROXY_AUTO_CONFIG_URL on Windows f5178cff9 [OC-77] proxy: refactor proxy settings code 18e50ec3f ReplyParser: added undefined status 8178ae06f unix file utils: added update_file_mod_time_nanoseconds() 8f20f7693 build: use LZ4_SYS=1 default when target is Linux 4bd996e61 timestr: added date_time_utc() and nanosec_time_to_string() 0eaa2586f string: added remove_spaces() method d47ae03cc OptionList: added get_c_str() method 1eb9cd657 unix file utils: added mtime_ns parameter to write_binary_unix() and write_binary_atomic() bf00c6e3e Time::delta_str(): use "INF" to denote infinite time 0e598a87b kovpn.hpp: asio must be included before sys/ and linux/ headers to avoid redefinition conflicts 1d2ce460d BufferType: added read_alloc_buf() method 148ae6085 BufferType: added reset_offset() method 6218ed618 Factor out IP::random_addr_v4() and IP::random_addr_v6() from IP::random_addr(). 5468670b9 pool: minor changes 36a885a82 route: allow for specialized IPv4/v6 RouteType 5e29e6628 BufferType: added typedef T value_type d92021c99 strerror.hpp: added #include <errno.h> for benefit of users 363cbece3 Function: misc cleanup d88435ecd IP::Route: added defined() method 3371cb745 kovpn.hpp: fix centos build with DCO enabled dc9e48d98 Fix bug in macos tunnel interface setup. Second ip address should be gateway address bcdb27993 Merged in schwabe/fix_clang_warnings (pull request #25) ede5e90ff Merged in schabe/fix_swig_ipadr (pull request #27) c0d580d24 Merged in schwabe/fix_openvpn_extern (pull request #26) 0965882e5 Merged in schwabe/stats_morecpus (pull request #23) 5f1f8470b Revert bugfix for not compiling IA32 ASM of 2.7.5 bde2c41be dep: switch from mbeTLS 2.7.0 to 2.7.5 9d06b5c97 [OC-77] proxy: support PROXY_AUTO_CONFIG_URL on macOS 3f2ad8e8c Hide const std::string IP methods from SWIG ba264862a Send also kovpn statistics of CPU Cores >= 16 via status message 2991d38b3 Fix warnings reported by LLVM/Clang 02d2a7975 Fix multiple inclusion of OpenVPN3 header with OPENPVN_EXTERN git-subtree-dir: Sources/OpenVPNAdapter/Libraries/Vendors/openvpn git-subtree-split: cc90cde5769dcf9e13fdd9e85d6d0857963dabce
This commit is contained in:
Sergey Abramchuk
@@ -0,0 +1,184 @@
|
||||
// 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-2018 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/>.
|
||||
|
||||
#pragma once
|
||||
|
||||
namespace openvpn {
|
||||
class DSDict {
|
||||
public:
|
||||
OPENVPN_EXCEPTION(dsdict_error);
|
||||
|
||||
DSDict(CF::DynamicStore& sc_arg, const std::string& sname_arg, const std::string& dskey_arg)
|
||||
: sc(sc_arg),
|
||||
sname(sname_arg),
|
||||
dskey(dskey_arg),
|
||||
dict(CF::DynamicStoreCopyDict(sc_arg, dskey)) { }
|
||||
|
||||
bool dirty() const
|
||||
{
|
||||
return mod.defined() ? !CFEqual(dict(), mod()) : false;
|
||||
}
|
||||
|
||||
bool push_to_store()
|
||||
{
|
||||
if (dirty())
|
||||
{
|
||||
const CF::String keystr = CF::string(dskey);
|
||||
if (SCDynamicStoreSetValue(sc(), keystr(), mod()))
|
||||
{
|
||||
OPENVPN_LOG("DSDict: updated " << dskey);
|
||||
return true;
|
||||
}
|
||||
else
|
||||
OPENVPN_LOG("DSDict: ERROR updating " << dskey);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool remove_from_store()
|
||||
{
|
||||
if (dirty())
|
||||
throw dsdict_error("internal error: remove_from_store called on modified dict");
|
||||
const CF::String keystr = CF::string(dskey);
|
||||
if (SCDynamicStoreRemoveValue(sc(), keystr()))
|
||||
{
|
||||
OPENVPN_LOG("DSDict: removed " << dskey);
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
OPENVPN_LOG("DSDict: ERROR removing " << dskey);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
void will_modify()
|
||||
{
|
||||
if (!mod.defined())
|
||||
mod = CF::mutable_dict_copy(dict);
|
||||
}
|
||||
|
||||
void mod_reset()
|
||||
{
|
||||
mod = CF::mutable_dict();
|
||||
}
|
||||
|
||||
void backup_orig(const std::string& key, const bool wipe_orig=true)
|
||||
{
|
||||
const CF::String k = CF::string(key);
|
||||
const CF::String orig = orig_key(key);
|
||||
if (!CFDictionaryContainsKey(dict(), orig()))
|
||||
{
|
||||
const CF::String delval = delete_value();
|
||||
CFTypeRef v = CFDictionaryGetValue(dict(), k());
|
||||
if (!v)
|
||||
v = delval();
|
||||
will_modify();
|
||||
CFDictionarySetValue(mod(), orig(), v);
|
||||
}
|
||||
if (wipe_orig)
|
||||
{
|
||||
will_modify();
|
||||
CFDictionaryRemoveValue(mod(), k());
|
||||
}
|
||||
}
|
||||
|
||||
void restore_orig()
|
||||
{
|
||||
const CFIndex size = CFDictionaryGetCount(dict());
|
||||
std::unique_ptr<const void *[]> keys(new const void *[size]);
|
||||
std::unique_ptr<const void *[]> values(new const void *[size]);
|
||||
CFDictionaryGetKeysAndValues(dict(), keys.get(), values.get());
|
||||
const CF::String orig_prefix = orig_key("");
|
||||
const CFIndex orig_prefix_len = CFStringGetLength(orig_prefix());
|
||||
const CF::String delval = delete_value();
|
||||
for (CFIndex i = 0; i < size; ++i)
|
||||
{
|
||||
const CF::String key = CF::string_cast(keys[i]);
|
||||
if (CFStringHasPrefix(key(), orig_prefix()))
|
||||
{
|
||||
const CFIndex key_len = CFStringGetLength(key());
|
||||
if (key_len > orig_prefix_len)
|
||||
{
|
||||
const CFRange r = CFRangeMake(orig_prefix_len, key_len - orig_prefix_len);
|
||||
const CF::String k(CFStringCreateWithSubstring(kCFAllocatorDefault, key(), r));
|
||||
const CFTypeRef v = values[i];
|
||||
const CF::String vstr = CF::string_cast(v);
|
||||
will_modify();
|
||||
if (vstr.defined() && CFStringCompare(vstr(), delval(), 0) == kCFCompareEqualTo)
|
||||
CFDictionaryRemoveValue(mod(), k());
|
||||
else
|
||||
CFDictionaryReplaceValue(mod(), k(), v);
|
||||
CFDictionaryRemoveValue(mod(), key());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
std::string to_string() const
|
||||
{
|
||||
std::ostringstream os;
|
||||
os << "*** DSDict " << dskey << std::endl;
|
||||
std::string orig = CF::description(dict());
|
||||
string::trim_crlf(orig);
|
||||
os << "ORIG " << orig << std::endl;
|
||||
if (dirty())
|
||||
{
|
||||
std::string modstr = CF::description(mod());
|
||||
string::trim_crlf(modstr);
|
||||
os << "MODIFIED " << modstr << std::endl;
|
||||
}
|
||||
return os.str();
|
||||
}
|
||||
|
||||
static CF::DynamicStore ds_create(const std::string& sname)
|
||||
{
|
||||
CF::String sn = CF::string(sname);
|
||||
return CF::DynamicStore(SCDynamicStoreCreate(kCFAllocatorDefault, sn(), nullptr, nullptr));
|
||||
}
|
||||
|
||||
static bool signal_network_reconfiguration(const std::string& sname)
|
||||
{
|
||||
const char *key = "Setup:/Network/Global/IPv4";
|
||||
CF::DynamicStore sc = ds_create(sname);
|
||||
const CF::String cfkey = CF::string(key);
|
||||
OPENVPN_LOG("DSDict: SCDynamicStoreNotifyValue " << key);
|
||||
return bool(SCDynamicStoreNotifyValue(sc(), cfkey()));
|
||||
}
|
||||
|
||||
CF::DynamicStore sc;
|
||||
const std::string sname;
|
||||
const std::string dskey;
|
||||
const CF::Dict dict;
|
||||
CF::MutableDict mod;
|
||||
|
||||
private:
|
||||
CF::String orig_key(const std::string& key) const
|
||||
{
|
||||
return CF::string(sname + "Orig" + key);
|
||||
}
|
||||
|
||||
CF::String delete_value() const
|
||||
{
|
||||
return CF::string(sname + "DeleteValue");
|
||||
}
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user