andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-24 02:00:24 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Add support for native WG configs without PSK parameter

Browse Source
This commit is contained in:
Mykola Baibuz
2024-04-19 22:14:06 +03:00
parent d90685600e
commit 23715fca8b
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/daemon/daemon.cpp
+2 -1
View File
@@ -248,9 +248,10 @@ bool Daemon::parseConfig(const QJsonObject& obj, InterfaceConfig& config) {
GETVALUE("privateKey", config.m_privateKey, String); GETVALUE("privateKey", config.m_privateKey, String);
GETVALUE("serverPublicKey", config.m_serverPublicKey, String); GETVALUE("serverPublicKey", config.m_serverPublicKey, String);
GETVALUE("serverPskKey", config.m_serverPskKey, String);
GETVALUE("serverPort", config.m_serverPort, Double); GETVALUE("serverPort", config.m_serverPort, Double);
config.m_serverPskKey = obj.value("serverPskKey").toString();
if (!obj.contains("deviceMTU") || obj.value("deviceMTU").toString().toInt() == 0) if (!obj.contains("deviceMTU") || obj.value("deviceMTU").toString().toInt() == 0)
{ {
config.m_deviceMTU = 1420; config.m_deviceMTU = 1420;
client/platforms/linux/daemon/wireguardutilslinux.cpp
+2
View File
@@ -199,7 +199,9 @@ bool WireguardUtilsLinux::updatePeer(const InterfaceConfig& config) {
QTextStream out(&message); QTextStream out(&message);
out << "set=1\n"; out << "set=1\n";
out << "public_key=" << QString(publicKey.toHex()) << "\n"; out << "public_key=" << QString(publicKey.toHex()) << "\n";
if (!config.m_serverPskKey.isNull()) {
out << "preshared_key=" << QString(pskKey.toHex()) << "\n"; out << "preshared_key=" << QString(pskKey.toHex()) << "\n";
}
if (!config.m_serverIpv4AddrIn.isNull()) { if (!config.m_serverIpv4AddrIn.isNull()) {
out << "endpoint=" << config.m_serverIpv4AddrIn << ":"; out << "endpoint=" << config.m_serverIpv4AddrIn << ":";
} else if (!config.m_serverIpv6AddrIn.isNull()) { } else if (!config.m_serverIpv6AddrIn.isNull()) {
client/platforms/macos/daemon/wireguardutilsmacos.cpp
+2
View File
@@ -199,7 +199,9 @@ bool WireguardUtilsMacos::updatePeer(const InterfaceConfig& config) {
QTextStream out(&message); QTextStream out(&message);
out << "set=1\n"; out << "set=1\n";
out << "public_key=" << QString(publicKey.toHex()) << "\n"; out << "public_key=" << QString(publicKey.toHex()) << "\n";
if (!config.m_serverPskKey.isNull()) {
out << "preshared_key=" << QString(pskKey.toHex()) << "\n"; out << "preshared_key=" << QString(pskKey.toHex()) << "\n";
}
if (!config.m_serverIpv4AddrIn.isNull()) { if (!config.m_serverIpv4AddrIn.isNull()) {
out << "endpoint=" << config.m_serverIpv4AddrIn << ":"; out << "endpoint=" << config.m_serverIpv4AddrIn << ":";
} else if (!config.m_serverIpv6AddrIn.isNull()) { } else if (!config.m_serverIpv6AddrIn.isNull()) {
client/platforms/windows/daemon/wireguardutilswindows.cpp
+2
View File
@@ -148,7 +148,9 @@ bool WireguardUtilsWindows::updatePeer(const InterfaceConfig& config) {
QTextStream out(&message); QTextStream out(&message);
out << "set=1\n"; out << "set=1\n";
out << "public_key=" << QString(publicKey.toHex()) << "\n"; out << "public_key=" << QString(publicKey.toHex()) << "\n";
if (!config.m_serverPskKey.isNull()) {
out << "preshared_key=" << QString(pskKey.toHex()) << "\n"; out << "preshared_key=" << QString(pskKey.toHex()) << "\n";
}
if (!config.m_serverIpv4AddrIn.isNull()) { if (!config.m_serverIpv4AddrIn.isNull()) {
out << "endpoint=" << config.m_serverIpv4AddrIn << ":"; out << "endpoint=" << config.m_serverIpv4AddrIn << ":";
} else if (!config.m_serverIpv6AddrIn.isNull()) { } else if (!config.m_serverIpv6AddrIn.isNull()) {