diff --git a/client/3rd-prebuilt b/client/3rd-prebuilt index c969f28b..eb43e90f 160000 --- a/client/3rd-prebuilt +++ b/client/3rd-prebuilt @@ -1 +1 @@ -Subproject commit c969f28b84f8343cdae0b5f39cfd876f8a1e01cb +Subproject commit eb43e90f389745af6d7ca3be92a96e400ba6dc6c diff --git a/client/platforms/linux/daemon/wireguardutilslinux.cpp b/client/platforms/linux/daemon/wireguardutilslinux.cpp index f7fc1496..c16aa2c9 100644 --- a/client/platforms/linux/daemon/wireguardutilslinux.cpp +++ b/client/platforms/linux/daemon/wireguardutilslinux.cpp @@ -18,7 +18,7 @@ #include "logger.h" 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 { Logger logger("WireguardUtilsLinux"); diff --git a/client/platforms/macos/daemon/wireguardutilsmacos.cpp b/client/platforms/macos/daemon/wireguardutilsmacos.cpp index d47bb791..8affd724 100644 --- a/client/platforms/macos/daemon/wireguardutilsmacos.cpp +++ b/client/platforms/macos/daemon/wireguardutilsmacos.cpp @@ -16,7 +16,7 @@ #include "logger.h" 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 { Logger logger("WireguardUtilsMacos"); diff --git a/client/platforms/windows/daemon/windowsdaemon.h b/client/platforms/windows/daemon/windowsdaemon.h index d3e81a18..9d051bae 100644 --- a/client/platforms/windows/daemon/windowsdaemon.h +++ b/client/platforms/windows/daemon/windowsdaemon.h @@ -11,7 +11,7 @@ #include "windowstunnelservice.h" #include "wireguardutilswindows.h" -#define TUNNEL_SERVICE_NAME L"WireGuardTunnel$AmneziaVPN" +#define TUNNEL_SERVICE_NAME L"AmneziaWGTunnel$AmneziaVPN" class WindowsDaemon final : public Daemon { Q_DISABLE_COPY_MOVE(WindowsDaemon) diff --git a/client/platforms/windows/daemon/windowstunnelservice.cpp b/client/platforms/windows/daemon/windowstunnelservice.cpp index ae358dd4..1438133c 100644 --- a/client/platforms/windows/daemon/windowstunnelservice.cpp +++ b/client/platforms/windows/daemon/windowstunnelservice.cpp @@ -17,7 +17,7 @@ #define TUNNEL_NAMED_PIPE \ "\\\\." \ - "\\pipe\\ProtectedPrefix\\Administrators\\WireGuard\\AmneziaVPN" + "\\pipe\\ProtectedPrefix\\Administrators\\AmneziaWG\\AmneziaVPN" constexpr uint32_t WINDOWS_TUNNEL_MONITOR_TIMEOUT_MSEC = 2000; diff --git a/client/protocols/protocols_defs.h b/client/protocols/protocols_defs.h index 90ef92fe..8cf0584b 100644 --- a/client/protocols/protocols_defs.h +++ b/client/protocols/protocols_defs.h @@ -173,7 +173,12 @@ namespace amnezia constexpr char defaultSubnetCidr[] = "24"; 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 serverPublicKeyPath[] = "/opt/amnezia/wireguard/wireguard_server_public_key.key"; constexpr char serverPskKeyPath[] = "/opt/amnezia/wireguard/wireguard_psk.key"; @@ -189,7 +194,11 @@ namespace amnezia namespace awg { 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 serverPublicKeyPath[] = "/opt/amnezia/awg/wireguard_server_public_key.key"; diff --git a/deploy/data/windows/x32/post_install.cmd b/deploy/data/windows/x32/post_install.cmd index 155234e2..c192deec 100644 --- a/deploy/data/windows/x32/post_install.cmd +++ b/deploy/data/windows/x32/post_install.cmd @@ -1,5 +1,5 @@ -sc stop WireGuardTunnel$AmneziaVPN -sc delete WireGuardTunnel$AmneziaVPN +sc stop AmneziaWGTunnel$AmneziaVPN +sc delete AmneziaWGTunnel$AmneziaVPN taskkill /IM "AmneziaVPN-service.exe" /F taskkill /IM "AmneziaVPN.exe" /F exit /b 0 diff --git a/deploy/data/windows/x32/post_uninstall.cmd b/deploy/data/windows/x32/post_uninstall.cmd index a26c8a08..83f8a8b7 100644 --- a/deploy/data/windows/x32/post_uninstall.cmd +++ b/deploy/data/windows/x32/post_uninstall.cmd @@ -5,8 +5,8 @@ echo %AmneziaPath% timeout /t 1 sc stop AmneziaVPN-service sc delete AmneziaVPN-service -sc stop WireGuardTunnel$AmneziaVPN -sc delete WireGuardTunnel$AmneziaVPN +sc stop AmneziaWGTunnel$AmneziaVPN +sc delete AmneziaWGTunnel$AmneziaVPN taskkill /IM "AmneziaVPN-service.exe" /F taskkill /IM "AmneziaVPN.exe" /F exit /b 0 diff --git a/deploy/data/windows/x64/post_install.cmd b/deploy/data/windows/x64/post_install.cmd index 155234e2..c192deec 100644 --- a/deploy/data/windows/x64/post_install.cmd +++ b/deploy/data/windows/x64/post_install.cmd @@ -1,5 +1,5 @@ -sc stop WireGuardTunnel$AmneziaVPN -sc delete WireGuardTunnel$AmneziaVPN +sc stop AmneziaWGTunnel$AmneziaVPN +sc delete AmneziaWGTunnel$AmneziaVPN taskkill /IM "AmneziaVPN-service.exe" /F taskkill /IM "AmneziaVPN.exe" /F exit /b 0 diff --git a/deploy/data/windows/x64/post_uninstall.cmd b/deploy/data/windows/x64/post_uninstall.cmd index a26c8a08..83f8a8b7 100644 --- a/deploy/data/windows/x64/post_uninstall.cmd +++ b/deploy/data/windows/x64/post_uninstall.cmd @@ -5,8 +5,8 @@ echo %AmneziaPath% timeout /t 1 sc stop AmneziaVPN-service sc delete AmneziaVPN-service -sc stop WireGuardTunnel$AmneziaVPN -sc delete WireGuardTunnel$AmneziaVPN +sc stop AmneziaWGTunnel$AmneziaVPN +sc delete AmneziaWGTunnel$AmneziaVPN taskkill /IM "AmneziaVPN-service.exe" /F taskkill /IM "AmneziaVPN.exe" /F exit /b 0