Update AWG (v0.2.8) (#809)

* Fix udpgso

* Fix amneziawg run dir

* Update Windows AWG binaries

* Update AWG (v0.2.8)

* Fix Windows pipe name

* Fix Windows tunnel service name

* Update Windows x86 AWG binary

* Change default MTU for WireGuard and AWG

* Fix preprocessor macros
This commit is contained in:
albexk 2024-05-20 19:46:05 +03:00 committed by GitHub
parent a365eff76f
commit 6a1e3c07b1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 24 additions and 15 deletions

@ -1 +1 @@
Subproject commit c969f28b84f8343cdae0b5f39cfd876f8a1e01cb Subproject commit eb43e90f389745af6d7ca3be92a96e400ba6dc6c

View file

@ -18,7 +18,7 @@
#include "logger.h" #include "logger.h"
constexpr const int WG_TUN_PROC_TIMEOUT = 5000; constexpr const int WG_TUN_PROC_TIMEOUT = 5000;
constexpr const char* WG_RUNTIME_DIR = "/var/run/wireguard"; constexpr const char* WG_RUNTIME_DIR = "/var/run/amneziawg";
namespace { namespace {
Logger logger("WireguardUtilsLinux"); Logger logger("WireguardUtilsLinux");

View file

@ -16,7 +16,7 @@
#include "logger.h" #include "logger.h"
constexpr const int WG_TUN_PROC_TIMEOUT = 5000; constexpr const int WG_TUN_PROC_TIMEOUT = 5000;
constexpr const char* WG_RUNTIME_DIR = "/var/run/wireguard"; constexpr const char* WG_RUNTIME_DIR = "/var/run/amneziawg";
namespace { namespace {
Logger logger("WireguardUtilsMacos"); Logger logger("WireguardUtilsMacos");

View file

@ -11,7 +11,7 @@
#include "windowstunnelservice.h" #include "windowstunnelservice.h"
#include "wireguardutilswindows.h" #include "wireguardutilswindows.h"
#define TUNNEL_SERVICE_NAME L"WireGuardTunnel$AmneziaVPN" #define TUNNEL_SERVICE_NAME L"AmneziaWGTunnel$AmneziaVPN"
class WindowsDaemon final : public Daemon { class WindowsDaemon final : public Daemon {
Q_DISABLE_COPY_MOVE(WindowsDaemon) Q_DISABLE_COPY_MOVE(WindowsDaemon)

View file

@ -17,7 +17,7 @@
#define TUNNEL_NAMED_PIPE \ #define TUNNEL_NAMED_PIPE \
"\\\\." \ "\\\\." \
"\\pipe\\ProtectedPrefix\\Administrators\\WireGuard\\AmneziaVPN" "\\pipe\\ProtectedPrefix\\Administrators\\AmneziaWG\\AmneziaVPN"
constexpr uint32_t WINDOWS_TUNNEL_MONITOR_TIMEOUT_MSEC = 2000; constexpr uint32_t WINDOWS_TUNNEL_MONITOR_TIMEOUT_MSEC = 2000;

View file

@ -173,7 +173,12 @@ namespace amnezia
constexpr char defaultSubnetCidr[] = "24"; constexpr char defaultSubnetCidr[] = "24";
constexpr char defaultPort[] = "51820"; constexpr char defaultPort[] = "51820";
constexpr char defaultMtu[] = "1420";
#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
constexpr char defaultMtu[] = "1280";
#else
constexpr char defaultMtu[] = "1376";
#endif
constexpr char serverConfigPath[] = "/opt/amnezia/wireguard/wg0.conf"; constexpr char serverConfigPath[] = "/opt/amnezia/wireguard/wg0.conf";
constexpr char serverPublicKeyPath[] = "/opt/amnezia/wireguard/wireguard_server_public_key.key"; constexpr char serverPublicKeyPath[] = "/opt/amnezia/wireguard/wireguard_server_public_key.key";
constexpr char serverPskKeyPath[] = "/opt/amnezia/wireguard/wireguard_psk.key"; constexpr char serverPskKeyPath[] = "/opt/amnezia/wireguard/wireguard_psk.key";
@ -189,7 +194,11 @@ namespace amnezia
namespace awg namespace awg
{ {
constexpr char defaultPort[] = "55424"; constexpr char defaultPort[] = "55424";
constexpr char defaultMtu[] = "1420"; #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
constexpr char defaultMtu[] = "1280";
#else
constexpr char defaultMtu[] = "1376";
#endif
constexpr char serverConfigPath[] = "/opt/amnezia/awg/wg0.conf"; constexpr char serverConfigPath[] = "/opt/amnezia/awg/wg0.conf";
constexpr char serverPublicKeyPath[] = "/opt/amnezia/awg/wireguard_server_public_key.key"; constexpr char serverPublicKeyPath[] = "/opt/amnezia/awg/wireguard_server_public_key.key";

View file

@ -1,5 +1,5 @@
sc stop WireGuardTunnel$AmneziaVPN sc stop AmneziaWGTunnel$AmneziaVPN
sc delete WireGuardTunnel$AmneziaVPN sc delete AmneziaWGTunnel$AmneziaVPN
taskkill /IM "AmneziaVPN-service.exe" /F taskkill /IM "AmneziaVPN-service.exe" /F
taskkill /IM "AmneziaVPN.exe" /F taskkill /IM "AmneziaVPN.exe" /F
exit /b 0 exit /b 0

View file

@ -5,8 +5,8 @@ echo %AmneziaPath%
timeout /t 1 timeout /t 1
sc stop AmneziaVPN-service sc stop AmneziaVPN-service
sc delete AmneziaVPN-service sc delete AmneziaVPN-service
sc stop WireGuardTunnel$AmneziaVPN sc stop AmneziaWGTunnel$AmneziaVPN
sc delete WireGuardTunnel$AmneziaVPN sc delete AmneziaWGTunnel$AmneziaVPN
taskkill /IM "AmneziaVPN-service.exe" /F taskkill /IM "AmneziaVPN-service.exe" /F
taskkill /IM "AmneziaVPN.exe" /F taskkill /IM "AmneziaVPN.exe" /F
exit /b 0 exit /b 0

View file

@ -1,5 +1,5 @@
sc stop WireGuardTunnel$AmneziaVPN sc stop AmneziaWGTunnel$AmneziaVPN
sc delete WireGuardTunnel$AmneziaVPN sc delete AmneziaWGTunnel$AmneziaVPN
taskkill /IM "AmneziaVPN-service.exe" /F taskkill /IM "AmneziaVPN-service.exe" /F
taskkill /IM "AmneziaVPN.exe" /F taskkill /IM "AmneziaVPN.exe" /F
exit /b 0 exit /b 0

View file

@ -5,8 +5,8 @@ echo %AmneziaPath%
timeout /t 1 timeout /t 1
sc stop AmneziaVPN-service sc stop AmneziaVPN-service
sc delete AmneziaVPN-service sc delete AmneziaVPN-service
sc stop WireGuardTunnel$AmneziaVPN sc stop AmneziaWGTunnel$AmneziaVPN
sc delete WireGuardTunnel$AmneziaVPN sc delete AmneziaWGTunnel$AmneziaVPN
taskkill /IM "AmneziaVPN-service.exe" /F taskkill /IM "AmneziaVPN-service.exe" /F
taskkill /IM "AmneziaVPN.exe" /F taskkill /IM "AmneziaVPN.exe" /F
exit /b 0 exit /b 0