mirror of
https://github.com/OpenVPN/openvpn3.git
synced 2024-09-19 19:52:15 +02:00
Merge changes from Core library v3.6.1 release
This commit is contained in:
commit
3c86a086e1
4
deps/lib-versions
vendored
4
deps/lib-versions
vendored
@ -19,8 +19,8 @@ export CITYHASH_CSUM=f70368facd15735dffc77fe2b27ab505bfdd05be5e9166d94149a8744c2
|
||||
export LZO_VERSION=lzo-2.10
|
||||
export LZO_CSUM=c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072
|
||||
|
||||
export OPENSSL_VERSION=openssl-1.1.1h
|
||||
export OPENSSL_CSUM=5c9ca8774bd7b03e5784f26ae9e9e6d749c9da2438545077e6b3d755a06595d9
|
||||
export OPENSSL_VERSION=openssl-1.1.1j
|
||||
export OPENSSL_CSUM=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
|
||||
|
||||
export XXHASH_VERSION=0.8.0
|
||||
export XXHASH_CSUM=7054c3ebd169c97b64a92d7b994ab63c70dd53a06974f1f630ab782c28db0f4f
|
@ -24,5 +24,5 @@
|
||||
#pragma once
|
||||
|
||||
#ifndef OPENVPN_VERSION
|
||||
#define OPENVPN_VERSION "3.6_git:master"
|
||||
#define OPENVPN_VERSION "3.6.1"
|
||||
#endif
|
||||
|
@ -146,6 +146,9 @@ namespace openvpn {
|
||||
if (ring_buffer)
|
||||
register_rings(th(), ring_buffer);
|
||||
|
||||
if (!wintun && tap.index_defined())
|
||||
Util::flush_arp(tap.index, os);
|
||||
|
||||
return th.release();
|
||||
}
|
||||
|
||||
|
@ -689,7 +689,7 @@ namespace openvpn {
|
||||
inline void flush_arp(const DWORD adapter_index,
|
||||
std::ostream& os)
|
||||
{
|
||||
const DWORD status = ::FlushIpNetTable(adapter_index);
|
||||
const DWORD status = ::FlushIpNetTable2(AF_INET, adapter_index);
|
||||
if (status == NO_ERROR)
|
||||
os << "TAP: ARP flush succeeded" << std::endl;
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user