move sudo docker volume rm -f

fix: wrong index on xray pages (#2669 )
* test crash xray * fixed save config xray * reset file * fixed text port & reset file * fixed textFieldWithHeaderType.textField
2026-06-02 08:32:28 +03:00 · 2026-06-01 14:51:12 +03:00 · 2026-06-01 12:22:54 +08:00 · 2026-06-01 11:54:34 +08:00
27 changed files with 224 additions and 609 deletions
--- a/client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/Wireguard.kt
+++ b/client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/Wireguard.kt
@@ -88,68 +88,33 @@ open class Wireguard : Protocol() {
            addDnsServer(parseInetAddress(dns.trim()))
        }

+        val defRoutes = hashSetOf(
+            InetNetwork("0.0.0.0", 0),
+            InetNetwork("::", 0)
+        )
+        val routes = hashSetOf<InetNetwork>()
+        configData.getJSONArray("allowed_ips").asSequence<String>().map { route ->
+            InetNetwork.parse(route.trim())
+        }.forEach(routes::add)
+        // if the allowed IPs list contains at least one non-default route, disable global split tunneling
+        if (routes.any { it !in defRoutes }) disableSplitTunneling()
+        addRoutes(routes)
+
        configData.optStringOrNull("mtu")?.let { setMtu(it.toInt()) }
-        configData.getString("client_priv_key").let { setPrivateKeyHex(it.base64ToHex()) }
+
+        val host = configData.getString("hostName").let { parseInetAddress(it.trim()) }
+        val port = configData.getInt("port")
+        setEndpoint(InetEndpoint(host, port))

        if (configData.optBoolean("isObfuscationEnabled")) {
            setUseProtocolExtension(true)
            configExtensionParameters(configData)
        }

-        val defRoutes = hashSetOf(InetNetwork("0.0.0.0", 0), InetNetwork("::", 0))
-        val peersArray = configData.optJSONArray("peers")
-
-        if (peersArray != null && peersArray.length() > 0) {
-            // Multi-peer: collect union of all peers' allowed IPs for the VPN interface routing table
-            val allRoutes = hashSetOf<InetNetwork>()
-            for (i in 0 until peersArray.length()) {
-                peersArray.getJSONObject(i).getJSONArray("allowed_ips").asSequence<String>()
-                    .map { InetNetwork.parse(it.trim()) }.forEach(allRoutes::add)
-            }
-            if (allRoutes.any { it !in defRoutes }) disableSplitTunneling()
-            addRoutes(allRoutes)
-
-            // Primary peer from first entry
-            val firstPeer = peersArray.getJSONObject(0)
-            val firstAllowedIps = firstPeer.getJSONArray("allowed_ips").asSequence<String>()
-                .map { InetNetwork.parse(it.trim()) }.toList()
-            setPeerAllowedIps(firstAllowedIps)
-            setEndpoint(InetEndpoint(parseInetAddress(firstPeer.getString("hostName").trim()), firstPeer.getInt("port")))
-            firstPeer.optStringOrNull("persistent_keep_alive")?.let { setPersistentKeepalive(it.toInt()) }
-            firstPeer.getString("server_pub_key").let { setPublicKeyHex(it.base64ToHex()) }
-            firstPeer.optStringOrNull("psk_key")?.let { setPreSharedKeyHex(it.base64ToHex()) }
-
-            // Additional peers
-            for (i in 1 until peersArray.length()) {
-                val peerData = peersArray.getJSONObject(i)
-                val peerAllowedIps = peerData.getJSONArray("allowed_ips").asSequence<String>()
-                    .map { InetNetwork.parse(it.trim()) }.toList()
-                addPeer(
-                    PeerConfig(
-                        publicKeyHex = peerData.getString("server_pub_key").base64ToHex(),
-                        preSharedKeyHex = peerData.optStringOrNull("psk_key")?.base64ToHex(),
-                        persistentKeepalive = peerData.optStringOrNull("persistent_keep_alive")?.toInt() ?: 0,
-                        endpoint = InetEndpoint(parseInetAddress(peerData.getString("hostName").trim()), peerData.getInt("port")),
-                        allowedIps = peerAllowedIps
-                    )
-                )
-            }
-        } else {
-            // Single peer (original behavior)
-            val routes = hashSetOf<InetNetwork>()
-            configData.getJSONArray("allowed_ips").asSequence<String>().map { route ->
-                InetNetwork.parse(route.trim())
-            }.forEach(routes::add)
-            if (routes.any { it !in defRoutes }) disableSplitTunneling()
-            addRoutes(routes)
-
-            val host = configData.getString("hostName").let { parseInetAddress(it.trim()) }
-            val port = configData.getInt("port")
-            setEndpoint(InetEndpoint(host, port))
-            configData.optStringOrNull("persistent_keep_alive")?.let { setPersistentKeepalive(it.toInt()) }
-            configData.getString("server_pub_key").let { setPublicKeyHex(it.base64ToHex()) }
-            configData.optStringOrNull("psk_key")?.let { setPreSharedKeyHex(it.base64ToHex()) }
-        }
+        configData.optStringOrNull("persistent_keep_alive")?.let { setPersistentKeepalive(it.toInt()) }
+        configData.getString("client_priv_key").let { setPrivateKeyHex(it.base64ToHex()) }
+        configData.getString("server_pub_key").let { setPublicKeyHex(it.base64ToHex()) }
+        configData.optStringOrNull("psk_key")?.let { setPreSharedKeyHex(it.base64ToHex()) }
    }

    protected fun WireguardConfig.Builder.configExtensionParameters(configData: JSONObject) {
@@ -236,11 +201,7 @@ open class Wireguard : Protocol() {
            Log.e(TAG, "Failed to get tunnel config")
            return -2
        }
-        // For multi-peer: take the max handshake time across all peers (any connected peer = tunnel active)
-        val lastHandshake = config.lines()
-            .filter { it.startsWith("last_handshake_time_sec=") }
-            .mapNotNull { it.substring(24).toLongOrNull() }
-            .maxOrNull()
+        val lastHandshake = config.lines().find { it.startsWith("last_handshake_time_sec=") }?.substring(24)?.toLong()
        if (lastHandshake == null) {
            Log.e(TAG, "Failed to get last_handshake_time_sec")
            return -2
--- a/client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/WireguardConfig.kt
+++ b/client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/WireguardConfig.kt
@@ -4,18 +4,9 @@ import android.util.Base64
 import org.amnezia.vpn.protocol.BadConfigException
 import org.amnezia.vpn.protocol.ProtocolConfig
 import org.amnezia.vpn.util.net.InetEndpoint
-import org.amnezia.vpn.util.net.InetNetwork

 private const val WIREGUARD_DEFAULT_MTU = 1280

-data class PeerConfig(
-    val publicKeyHex: String,
-    val preSharedKeyHex: String?,
-    val persistentKeepalive: Int,
-    val endpoint: InetEndpoint,
-    val allowedIps: List<InetNetwork>
-)
-
 open class WireguardConfig protected constructor(
    protocolConfigBuilder: ProtocolConfig.Builder,
    val endpoint: InetEndpoint,
@@ -40,8 +31,6 @@ open class WireguardConfig protected constructor(
    var i3: String?,
    var i4: String?,
    var i5: String?,
-    val peerAllowedIps: List<InetNetwork>?,
-    val additionalPeers: List<PeerConfig>,
 ) : ProtocolConfig(protocolConfigBuilder) {

    protected constructor(builder: Builder) : this(
@@ -68,8 +57,6 @@ open class WireguardConfig protected constructor(
        builder.i3,
        builder.i4,
        builder.i5,
-        builder.peerAllowedIps,
-        builder.additionalPeers.toList(),
    )

    fun toWgUserspaceString(): String = with(StringBuilder()) {
@@ -116,22 +103,14 @@ open class WireguardConfig protected constructor(

    open fun appendPeerLine(sb: StringBuilder) = with(sb) {
        appendLine("public_key=$publicKeyHex")
-        val primaryIps = peerAllowedIps ?: routes.filter { it.include }.map { it.inetNetwork }
-        primaryIps.forEach { net -> appendLine("allowed_ip=$net") }
+        routes.filter { it.include }.forEach { route ->
+            appendLine("allowed_ip=${route.inetNetwork}")
+        }
        appendLine("endpoint=$endpoint")
        if (persistentKeepalive != 0)
            appendLine("persistent_keepalive_interval=$persistentKeepalive")
        if (preSharedKeyHex != null)
            appendLine("preshared_key=$preSharedKeyHex")
-        for (peer in additionalPeers) {
-            appendLine("public_key=${peer.publicKeyHex}")
-            peer.allowedIps.forEach { net -> appendLine("allowed_ip=$net") }
-            appendLine("endpoint=${peer.endpoint}")
-            if (peer.persistentKeepalive != 0)
-                appendLine("persistent_keepalive_interval=${peer.persistentKeepalive}")
-            if (peer.preSharedKeyHex != null)
-                appendLine("preshared_key=${peer.preSharedKeyHex}")
-        }
    }

    open class Builder : ProtocolConfig.Builder(true) {
@@ -171,9 +150,6 @@ open class WireguardConfig protected constructor(
        internal var i4: String? = null
        internal var i5: String? = null

-        internal var peerAllowedIps: List<InetNetwork>? = null
-        internal val additionalPeers: MutableList<PeerConfig> = mutableListOf()
-
        fun setEndpoint(endpoint: InetEndpoint) = apply { this.endpoint = endpoint }

        fun setPersistentKeepalive(persistentKeepalive: Int) = apply { this.persistentKeepalive = persistentKeepalive }
@@ -203,9 +179,6 @@ open class WireguardConfig protected constructor(
        fun setI4(i4: String) = apply { this.i4 = i4 }
        fun setI5(i5: String) = apply { this.i5 = i5 }

-        fun setPeerAllowedIps(ips: List<InetNetwork>) = apply { this.peerAllowedIps = ips }
-        fun addPeer(peer: PeerConfig) = apply { this.additionalPeers += peer }
-
        override fun build(): WireguardConfig = configBuild().run { WireguardConfig(this@Builder) }
    }

--- a/client/core/controllers/selfhosted/importController.cpp
+++ b/client/core/controllers/selfhosted/importController.cpp
@@ -504,45 +504,24 @@ QJsonObject ImportController::extractOpenVpnConfig(const QString &data) const

 QJsonObject ImportController::extractWireGuardConfig(const QString &data, ConfigTypes &configType) const
 {
-    QMap<QString, QString> interfaceMap;
-    QList<QMap<QString, QString>> peerList;
-
-    enum class WgSection { None, Interface, Peer };
-    WgSection currentSection = WgSection::None;
-
-    const auto configByLines = data.split("\n");
+    QMap<QString, QString> configMap;
+    auto configByLines = data.split("\n");
    for (const QString &line : configByLines) {
-        const QString trimmedLine = line.trimmed();
-        if (trimmedLine == "[Interface]") {
-            currentSection = WgSection::Interface;
-        } else if (trimmedLine == "[Peer]") {
-            currentSection = WgSection::Peer;
-            peerList.append(QMap<QString, QString>());
-        } else if (!trimmedLine.isEmpty() && !trimmedLine.startsWith("#")) {
-            const QStringList parts = trimmedLine.split(" = ");
+        QString trimmedLine = line.trimmed();
+        if (trimmedLine.startsWith("[") && trimmedLine.endsWith("]")) {
+            continue;
+        } else {
+            QStringList parts = trimmedLine.split(" = ");
            if (parts.count() == 2) {
-                const QString key = parts.at(0).trimmed();
-                const QString value = parts.at(1).trimmed();
-                if (currentSection == WgSection::Interface) {
-                    interfaceMap[key] = value;
-                } else if (currentSection == WgSection::Peer && !peerList.isEmpty()) {
-                    peerList.last()[key] = value;
-                }
+                configMap[parts.at(0).trimmed()] = parts.at(1).trimmed();
            }
        }
    }

-    if (peerList.isEmpty()) {
-        qDebug() << "No [Peer] section found in WireGuard config";
-        return QJsonObject();
-    }
-
-    const QMap<QString, QString> &firstPeerMap = peerList.first();
-
    QJsonObject lastConfig;
    lastConfig[configKey::config] = data;

-    auto url { QUrl::fromUserInput(firstPeerMap.value(protocols::wireguard::Endpoint)) };
+    auto url { QUrl::fromUserInput(configMap.value(protocols::wireguard::Endpoint)) };
    QString hostName;
    QString port;
    if (!url.host().isEmpty()) {
@@ -561,55 +540,37 @@ QJsonObject ImportController::extractWireGuardConfig(const QString &data, Config
    lastConfig[configKey::hostName] = hostName;
    lastConfig[configKey::port] = port.toInt();

-    if (!interfaceMap.value(protocols::wireguard::PrivateKey).isEmpty()
-            && !interfaceMap.value(protocols::wireguard::Address).isEmpty()
-            && !firstPeerMap.value(protocols::wireguard::PublicKey).isEmpty()) {
-        lastConfig[configKey::clientPrivKey] = interfaceMap.value(protocols::wireguard::PrivateKey);
-        lastConfig[configKey::clientIp] = interfaceMap.value(protocols::wireguard::Address);
+    if (!configMap.value(protocols::wireguard::PrivateKey).isEmpty()
+            && !configMap.value(protocols::wireguard::Address).isEmpty()
+            && !configMap.value(protocols::wireguard::PublicKey).isEmpty()) {
+        lastConfig[configKey::clientPrivKey] = configMap.value(protocols::wireguard::PrivateKey);
+        lastConfig[configKey::clientIp] = configMap.value(protocols::wireguard::Address);

-        if (!firstPeerMap.value(protocols::wireguard::PresharedKey).isEmpty()) {
-            lastConfig[configKey::pskKey] = firstPeerMap.value(protocols::wireguard::PresharedKey);
-        } else if (!firstPeerMap.value(protocols::wireguard::PreSharedKey).isEmpty()) {
-            lastConfig[configKey::pskKey] = firstPeerMap.value(protocols::wireguard::PreSharedKey);
+        if (!configMap.value(protocols::wireguard::PresharedKey).isEmpty()) {
+            lastConfig[configKey::pskKey] = configMap.value(protocols::wireguard::PresharedKey);
+        } else if (!configMap.value(protocols::wireguard::PreSharedKey).isEmpty()) {
+            lastConfig[configKey::pskKey] = configMap.value(protocols::wireguard::PreSharedKey);
        }

-        lastConfig[configKey::serverPubKey] = firstPeerMap.value(protocols::wireguard::PublicKey);
+        lastConfig[configKey::serverPubKey] = configMap.value(protocols::wireguard::PublicKey);
    } else {
        qDebug() << "One of the key parameters is missing (PrivateKey, Address, PublicKey)";
        return QJsonObject();
    }

-    if (!firstPeerMap.value(protocols::wireguard::PersistentKeepalive).isEmpty()) {
-        lastConfig[configKey::persistentKeepAlive] = firstPeerMap.value(protocols::wireguard::PersistentKeepalive);
+    if (!configMap.value(protocols::wireguard::MTU).isEmpty()) {
+        lastConfig[configKey::mtu] = configMap.value(protocols::wireguard::MTU);
+    }
+
+    if (!configMap.value(protocols::wireguard::PersistentKeepalive).isEmpty()) {
+        lastConfig[configKey::persistentKeepAlive] = configMap.value(protocols::wireguard::PersistentKeepalive);
    }

    QJsonArray allowedIpsJsonArray = QJsonArray::fromStringList(
-                firstPeerMap.value(protocols::wireguard::AllowedIPs).split(", "));
+                configMap.value(protocols::wireguard::AllowedIPs).split(", "));

    lastConfig[configKey::allowedIps] = allowedIpsJsonArray;

-    if (peerList.size() > 1) {
-        QJsonArray peersArray;
-        for (const auto &peerMap : std::as_const(peerList)) {
-            QJsonObject peerObj;
-            const auto peerUrl = QUrl::fromUserInput(peerMap.value(protocols::wireguard::Endpoint));
-            peerObj[configKey::serverPubKey] = peerMap.value(protocols::wireguard::PublicKey);
-            if (!peerMap.value(protocols::wireguard::PresharedKey).isEmpty()) {
-                peerObj[configKey::pskKey] = peerMap.value(protocols::wireguard::PresharedKey);
-            } else if (!peerMap.value(protocols::wireguard::PreSharedKey).isEmpty()) {
-                peerObj[configKey::pskKey] = peerMap.value(protocols::wireguard::PreSharedKey);
-            }
-            peerObj[configKey::hostName] = peerUrl.host();
-            peerObj[configKey::port] = peerUrl.port() != -1 ? peerUrl.port() : QString(protocols::wireguard::defaultPort).toInt();
-            peerObj[configKey::allowedIps] = QJsonArray::fromStringList(peerMap.value(protocols::wireguard::AllowedIPs).split(", "));
-            if (!peerMap.value(protocols::wireguard::PersistentKeepalive).isEmpty()) {
-                peerObj[configKey::persistentKeepAlive] = peerMap.value(protocols::wireguard::PersistentKeepalive);
-            }
-            peersArray.append(peerObj);
-        }
-        lastConfig["peers"] = peersArray;
-    }
-
    QString protocolName = configKey::wireguard;
    QString protocolVersion;
    ConfigTypes detectedType = ConfigTypes::WireGuard;
@@ -627,25 +588,25 @@ QJsonObject ImportController::extractWireGuardConfig(const QString &data, Config
    };

    bool hasAllRequiredFields = std::all_of(requiredJunkFields.begin(), requiredJunkFields.end(),
-                                            [&interfaceMap](const QString &field) { return !interfaceMap.value(field).isEmpty(); });
+                                            [&configMap](const QString &field) { return !configMap.value(field).isEmpty(); });
    if (hasAllRequiredFields) {
        for (const QString &field : requiredJunkFields) {
-            lastConfig[field] = interfaceMap.value(field);
+            lastConfig[field] = configMap.value(field);
        }

        for (const QString &field : optionalJunkFields) {
-            if (!interfaceMap.value(field).isEmpty()) {
-                lastConfig[field] = interfaceMap.value(field);
+            if (!configMap.value(field).isEmpty()) {
+                lastConfig[field] = configMap.value(field);
            }
        }

-        bool hasCookieReplyPacketJunkSize = !interfaceMap.value(configKey::cookieReplyPacketJunkSize).isEmpty();
-        bool hasTransportPacketJunkSize = !interfaceMap.value(configKey::transportPacketJunkSize).isEmpty();
-        bool hasSpecialJunk = !interfaceMap.value(configKey::specialJunk1).isEmpty() ||
-                              !interfaceMap.value(configKey::specialJunk2).isEmpty() ||
-                              !interfaceMap.value(configKey::specialJunk3).isEmpty() ||
-                              !interfaceMap.value(configKey::specialJunk4).isEmpty() ||
-                              !interfaceMap.value(configKey::specialJunk5).isEmpty();
+        bool hasCookieReplyPacketJunkSize = !configMap.value(configKey::cookieReplyPacketJunkSize).isEmpty();
+        bool hasTransportPacketJunkSize = !configMap.value(configKey::transportPacketJunkSize).isEmpty();
+        bool hasSpecialJunk = !configMap.value(configKey::specialJunk1).isEmpty() ||
+                              !configMap.value(configKey::specialJunk2).isEmpty() ||
+                              !configMap.value(configKey::specialJunk3).isEmpty() ||
+                              !configMap.value(configKey::specialJunk4).isEmpty() ||
+                              !configMap.value(configKey::specialJunk5).isEmpty();

        if (hasCookieReplyPacketJunkSize && hasTransportPacketJunkSize) {
            protocolVersion = "2";
@@ -656,8 +617,8 @@ QJsonObject ImportController::extractWireGuardConfig(const QString &data, Config
        detectedType = ConfigTypes::Awg;
    }

-    if (!interfaceMap.value(protocols::wireguard::MTU).isEmpty()) {
-        lastConfig[configKey::mtu] = interfaceMap.value(protocols::wireguard::MTU);
+    if (!configMap.value(protocols::wireguard::MTU).isEmpty()) {
+        lastConfig[configKey::mtu] = configMap.value(protocols::wireguard::MTU);
    } else {
        lastConfig[configKey::mtu] = (protocolName == configKey::awg) 
                                       ? protocols::awg::defaultMtu 
--- a/client/core/controllers/selfhosted/installController.cpp
+++ b/client/core/controllers/selfhosted/installController.cpp
@@ -72,6 +72,21 @@ namespace
        }
        return false;
    }
+
+    bool usesNamedDataVolume(DockerContainer container)
+    {
+        return container == DockerContainer::MtProxy || container == DockerContainer::Telemt;
+    }
+
+    QString buildRemoveContainerScript(const amnezia::ScriptVars &vars, bool removeDataVolume)
+    {
+        QString script = SshSession::replaceVars(amnezia::scriptData(SharedScriptType::remove_container), vars);
+        if (removeDataVolume) {
+            script += QLatin1String("\nsudo docker volume rm -f $CONTAINER_NAME-data 2>/dev/null || true");
+            script = SshSession::replaceVars(script, vars);
+        }
+        return script;
+    }
 }

 InstallController::InstallController(SecureServersRepository *serversRepository,
@@ -120,14 +135,10 @@ ErrorCode InstallController::setupContainer(const ServerCredentials &credentials
        return e;
    qDebug().noquote() << "InstallController::setupContainer prepareHostWorker finished";

-    amnezia::ScriptVars removeContainerVars =
+    const amnezia::ScriptVars removeContainerVars =
            amnezia::genBaseVars(credentials, container, QString(), QString());
-    if (!isUpdate) {
-        removeContainerVars.append({ { "$REMOVE_CONTAINER_DATA", QStringLiteral("1") } });
-    }
-    sshSession.runScript(credentials,
-                         sshSession.replaceVars(amnezia::scriptData(SharedScriptType::remove_container),
-                                                removeContainerVars));
+    const bool removeDataVolume = !isUpdate && usesNamedDataVolume(container);
+    sshSession.runScript(credentials, buildRemoveContainerScript(removeContainerVars, removeDataVolume));
    qDebug().noquote() << "InstallController::setupContainer removeContainer finished";

    qDebug().noquote() << "buildContainerWorker start";
@@ -980,12 +991,11 @@ ErrorCode InstallController::removeContainer(const QString &serverId, DockerCont
        return ErrorCode::InternalError;
    }
    SshSession sshSession(this);
-    amnezia::ScriptVars removeContainerVars =
+    const amnezia::ScriptVars removeContainerVars =
            amnezia::genBaseVars(credentials, container, QString(), QString());
-    removeContainerVars.append({ { "$REMOVE_CONTAINER_DATA", QStringLiteral("1") } });
-    ErrorCode errorCode = sshSession.runScript(
-            credentials,
-            sshSession.replaceVars(amnezia::scriptData(SharedScriptType::remove_container), removeContainerVars));
+    const bool removeDataVolume = usesNamedDataVolume(container);
+    ErrorCode errorCode =
+            sshSession.runScript(credentials, buildRemoveContainerScript(removeContainerVars, removeDataVolume));

    if (errorCode == ErrorCode::NoError) {
        QMap<DockerContainer, ContainerConfig> containers = adminConfig->containers;
--- a/client/core/models/protocols/awgProtocolConfig.cpp
+++ b/client/core/models/protocols/awgProtocolConfig.cpp
@@ -205,11 +205,7 @@ QJsonObject AwgClientConfig::toJson() const
    if (isObfuscationEnabled) {
        obj[configKey::isObfuscationEnabled] = isObfuscationEnabled;
    }
-
-    if (!peers.isEmpty()) {
-        obj["peers"] = peers;
-    }
-
+    
    return obj;
 }

@@ -254,9 +250,7 @@ AwgClientConfig AwgClientConfig::fromJson(const QJsonObject& json)
    config.specialJunk5 = json.value(configKey::specialJunk5).toString();
    
    config.isObfuscationEnabled = json.value(configKey::isObfuscationEnabled).toBool(false);
-
-    config.peers = json.value("peers").toArray();
-
+    
    return config;
 }

--- a/client/core/models/protocols/awgProtocolConfig.h
+++ b/client/core/models/protocols/awgProtocolConfig.h
@@ -1,7 +1,6 @@
 #ifndef AWGPROTOCOLCONFIG_H
 #define AWGPROTOCOLCONFIG_H

-#include <QJsonArray>
 #include <QJsonObject>
 #include <QString>
 #include <QStringList>
@@ -61,7 +60,6 @@ struct AwgClientConfig {
    QStringList allowedIps;
    QString persistentKeepAlive;
    QString mtu;
-    QJsonArray peers;
    QString junkPacketCount;
    QString junkPacketMinSize;
    QString junkPacketMaxSize;
--- a/client/daemon/daemon.cpp
+++ b/client/daemon/daemon.cpp
@@ -441,37 +441,6 @@ bool Daemon::parseConfig(const QJsonObject& obj, InterfaceConfig& config) {
    config.m_specialJunk["I5"] = obj.value("I5").toString();
  }

-  if (obj.contains("primaryPeerAllowedIPAddressRanges") &&
-      obj.value("primaryPeerAllowedIPAddressRanges").isArray()) {
-    for (const QJsonValue& ipVal : obj.value("primaryPeerAllowedIPAddressRanges").toArray()) {
-      if (!ipVal.isObject()) continue;
-      QJsonObject ipObj = ipVal.toObject();
-      config.m_primaryPeerAllowedIPRanges.append(
-          IPAddress(QHostAddress(ipObj.value("address").toString()),
-                    ipObj.value("range").toInt()));
-    }
-  }
-
-  if (obj.contains("additionalPeers") && obj.value("additionalPeers").isArray()) {
-    for (const QJsonValue& peerVal : obj.value("additionalPeers").toArray()) {
-      if (!peerVal.isObject()) continue;
-      QJsonObject peerObj = peerVal.toObject();
-      InterfaceConfig::AdditionalPeerConfig peer;
-      peer.m_serverPublicKey = peerObj.value("serverPublicKey").toString();
-      peer.m_serverPskKey = peerObj.value("serverPskKey").toString();
-      peer.m_serverIpv4AddrIn = peerObj.value("serverIpv4AddrIn").toString();
-      peer.m_serverPort = peerObj.value("serverPort").toInt();
-      for (const QJsonValue& ipVal : peerObj.value("allowedIPAddressRanges").toArray()) {
-        if (!ipVal.isObject()) continue;
-        QJsonObject ipObj = ipVal.toObject();
-        peer.m_allowedIPAddressRanges.append(
-            IPAddress(QHostAddress(ipObj.value("address").toString()),
-                      ipObj.value("range").toInt()));
-      }
-      config.m_additionalPeers.append(peer);
-    }
-  }
-
  return true;
 }

--- a/client/daemon/interfaceconfig.h
+++ b/client/daemon/interfaceconfig.h
@@ -37,9 +37,6 @@ class InterfaceConfig {
  int m_serverPort = 0;
  int m_deviceMTU = 1420;
  QList<IPAddress> m_allowedIPAddressRanges;
-  // For multi-peer: primary peer's own IPs only (used for UAPI allowed_ips).
-  // Empty for single-peer (falls back to m_allowedIPAddressRanges).
-  QList<IPAddress> m_primaryPeerAllowedIPRanges;
  QStringList m_excludedAddresses;
  QStringList m_vpnDisabledApps;
  QStringList m_allowedDnsServers;
@@ -61,15 +58,6 @@ class InterfaceConfig {
  QString m_transportPacketMagicHeader;
  QMap<QString, QString> m_specialJunk;

-  struct AdditionalPeerConfig {
-    QString m_serverPublicKey;
-    QString m_serverPskKey;
-    QString m_serverIpv4AddrIn;
-    int m_serverPort = 0;
-    QList<IPAddress> m_allowedIPAddressRanges;
-  };
-  QList<AdditionalPeerConfig> m_additionalPeers;
-
  QJsonObject toJson() const;
  QString toWgConf(
      const QMap<QString, QString>& extra = QMap<QString, QString>()) const;
--- a/client/mozilla/localsocketcontroller.cpp
+++ b/client/mozilla/localsocketcontroller.cpp
@@ -169,96 +169,68 @@ void LocalSocketController::activate(const QJsonObject &rawConfig) {

  QJsonArray jsAllowedIPAddesses;

-  auto ipRangeToJson = [](const QString& ipRange) -> QJsonObject {
-    QJsonObject range;
-    const QStringList parts = ipRange.split('/');
-    range.insert("address", parts[0]);
-    range.insert("range", parts.size() > 1 ? parts[1].toInt() : 32);
-    range.insert("isIpv6", ipRange.contains(':'));
-    return range;
-  };
+  QJsonArray plainAllowedIP = wgConfig.value(amnezia::configKey::allowedIps).toArray();
+  QJsonArray defaultAllowedIP = { "0.0.0.0/0", "::/0" };

-  QJsonArray peersArray = wgConfig.value("peers").toArray();
-  bool isMultiPeer = peersArray.size() > 1;
-
-  if (isMultiPeer) {
-    // Union of all peers' IPs goes into allowedIPAddressRanges (used for route setup).
-    QSet<QString> seenIps;
-    for (const QJsonValue& peerVal : std::as_const(peersArray)) {
-      for (const QJsonValue& ipVal : peerVal.toObject().value(amnezia::configKey::allowedIps).toArray()) {
-        const QString ipRange = ipVal.toString().trimmed();
-        if (seenIps.contains(ipRange)) continue;
-        seenIps.insert(ipRange);
-        jsAllowedIPAddesses.append(ipRangeToJson(ipRange));
+  if (plainAllowedIP != defaultAllowedIP && !plainAllowedIP.isEmpty()) {
+    // Use AllowedIP list from WG config because of higher priority
+    for (auto v : plainAllowedIP) {
+      QString ipRange = v.toString();
+      if (ipRange.split('/').size() > 1){
+          QJsonObject range;
+          range.insert("address", ipRange.split('/')[0]);
+          range.insert("range", atoi(ipRange.split('/')[1].toLocal8Bit()));
+          range.insert("isIpv6", false);
+          jsAllowedIPAddesses.append(range);
+      } else {
+          QJsonObject range;
+          range.insert("address",ipRange);
+          range.insert("range", 32);
+          range.insert("isIpv6", false);
+          jsAllowedIPAddesses.append(range);
      }
    }
-
-    // Primary peer's own IPs only — used for UAPI allowed_ips to avoid trie conflicts.
-    QJsonArray primaryPeerIpsJson;
-    for (const QJsonValue& ipVal : peersArray[0].toObject().value(amnezia::configKey::allowedIps).toArray()) {
-      primaryPeerIpsJson.append(ipRangeToJson(ipVal.toString().trimmed()));
-    }
-    json.insert("primaryPeerAllowedIPAddressRanges", primaryPeerIpsJson);
-
-    QJsonArray additionalPeersJson;
-    for (int i = 1; i < peersArray.size(); ++i) {
-      const QJsonObject peerObj = peersArray[i].toObject();
-      QJsonObject additionalPeer;
-      additionalPeer.insert("serverPublicKey", peerObj.value(amnezia::configKey::serverPubKey));
-      additionalPeer.insert("serverPskKey", peerObj.value(amnezia::configKey::pskKey));
-      additionalPeer.insert("serverIpv4AddrIn", peerObj.value(amnezia::configKey::hostName));
-      additionalPeer.insert("serverPort", peerObj.value(amnezia::configKey::port).toInt());
-      QJsonArray additionalPeerIps;
-      for (const QJsonValue& ipVal : peerObj.value(amnezia::configKey::allowedIps).toArray()) {
-        additionalPeerIps.append(ipRangeToJson(ipVal.toString().trimmed()));
-      }
-      additionalPeer.insert("allowedIPAddressRanges", additionalPeerIps);
-      additionalPeersJson.append(additionalPeer);
-    }
-    json.insert("additionalPeers", additionalPeersJson);
  } else {
-    QJsonArray plainAllowedIP = wgConfig.value(amnezia::configKey::allowedIps).toArray();
-    QJsonArray defaultAllowedIP = { "0.0.0.0/0", "::/0" };

-    if (plainAllowedIP != defaultAllowedIP && !plainAllowedIP.isEmpty()) {
-      // Use AllowedIP list from WG config because of higher priority
-      for (auto v : plainAllowedIP) {
-        jsAllowedIPAddesses.append(ipRangeToJson(v.toString().trimmed()));
-      }
-    } else {
-      // Use APP split tunnel
+    // Use APP split tunnel
      if (splitTunnelType == 0 || splitTunnelType == 2) {
-        QJsonObject range_ipv4;
-        range_ipv4.insert("address", "0.0.0.0");
-        range_ipv4.insert("range", 0);
-        range_ipv4.insert("isIpv6", false);
-        jsAllowedIPAddesses.append(range_ipv4);
+          QJsonObject range_ipv4;
+          range_ipv4.insert("address", "0.0.0.0");
+          range_ipv4.insert("range", 0);
+          range_ipv4.insert("isIpv6", false);
+          jsAllowedIPAddesses.append(range_ipv4);

-        QJsonObject range_ipv6;
-        range_ipv6.insert("address", "::");
-        range_ipv6.insert("range", 0);
-        range_ipv6.insert("isIpv6", true);
-        jsAllowedIPAddesses.append(range_ipv6);
+          QJsonObject range_ipv6;
+          range_ipv6.insert("address", "::");
+          range_ipv6.insert("range", 0);
+          range_ipv6.insert("isIpv6", true);
+          jsAllowedIPAddesses.append(range_ipv6);
      }

      if (splitTunnelType == 1) {
-        for (auto v : splitTunnelSites) {
-          jsAllowedIPAddesses.append(ipRangeToJson(v.toString().trimmed()));
-        }
+          for (auto v : splitTunnelSites) {
+              QString ipRange = v.toString();
+              if (ipRange.split('/').size() > 1){
+                  QJsonObject range;
+                  range.insert("address", ipRange.split('/')[0]);
+                  range.insert("range", atoi(ipRange.split('/')[1].toLocal8Bit()));
+                  range.insert("isIpv6", false);
+                  jsAllowedIPAddesses.append(range);
+              } else {
+                  QJsonObject range;
+                  range.insert("address",ipRange);
+                  range.insert("range", 32);
+                  range.insert("isIpv6", false);
+                  jsAllowedIPAddesses.append(range);
+              }
+          }
      }
-    }
  }

  json.insert("allowedIPAddressRanges", jsAllowedIPAddesses);

  QJsonArray jsExcludedAddresses;
-  if (isMultiPeer) {
-    for (const QJsonValue& peerVal : std::as_const(peersArray)) {
-      jsExcludedAddresses.append(peerVal.toObject().value(amnezia::configKey::hostName));
-    }
-  } else {
-    jsExcludedAddresses.append(wgConfig.value(amnezia::configKey::hostName));
-  }
+  jsExcludedAddresses.append(wgConfig.value(amnezia::configKey::hostName));
  if (splitTunnelType == 2) {
    for (auto v : splitTunnelSites) {
          QString ipRange = v.toString();
--- a/client/platforms/ios/PacketTunnelProvider+WireGuard.swift
+++ b/client/platforms/ios/PacketTunnelProvider+WireGuard.swift
@@ -20,7 +20,7 @@ extension PacketTunnelProvider {

            let tunnelConfiguration = try TunnelConfiguration(fromWgQuickConfig: wgConfigStr)

-            if tunnelConfiguration.peers.first?.allowedIPs
+            if tunnelConfiguration.peers.first!.allowedIPs
                .map({ $0.stringRepresentation })
                .joined(separator: ", ") == "0.0.0.0/0, ::/0" {
                if wgConfig.splitTunnelType == 1 {
--- a/client/platforms/ios/WGConfig.swift
+++ b/client/platforms/ios/WGConfig.swift
@@ -1,23 +1,5 @@
 import Foundation

-struct WGPeerConfig: Decodable {
-  let serverPublicKey: String
-  let presharedKey: String?
-  let allowedIPs: [String]
-  let hostName: String
-  let port: Int
-  let persistentKeepAlive: String?
-
-  enum CodingKeys: String, CodingKey {
-    case serverPublicKey = "server_pub_key"
-    case presharedKey = "psk_key"
-    case allowedIPs = "allowed_ips"
-    case hostName
-    case port
-    case persistentKeepAlive = "persistent_keep_alive"
-  }
-}
-
 struct WGConfig: Decodable {
  let initPacketMagicHeader, responsePacketMagicHeader: String?
  let underloadPacketMagicHeader, transportPacketMagicHeader: String?
@@ -37,7 +19,6 @@ struct WGConfig: Decodable {
  var persistentKeepAlive: String
  let splitTunnelType: Int
  let splitTunnelSites: [String]
-  let peers: [WGPeerConfig]?

  enum CodingKeys: String, CodingKey {
    case initPacketMagicHeader = "H1", responsePacketMagicHeader = "H2"
@@ -58,7 +39,6 @@ struct WGConfig: Decodable {
    case persistentKeepAlive = "persistent_keep_alive"
    case splitTunnelType
    case splitTunnelSites
-    case peers
  }

  var settings: String {
@@ -123,7 +103,7 @@ struct WGConfig: Decodable {
    return settingsLines.joined(separator: "\n")
  }

-  private var interfaceSection: String {
+  var str: String {
    """
    [Interface]
    Address = \(clientIP)
@@ -131,30 +111,9 @@ struct WGConfig: Decodable {
    MTU = \(mtu)
    PrivateKey = \(clientPrivateKey)
    \(settings)
-    """
-  }
-
-  var str: String {
-    if let peers = peers, !peers.isEmpty {
-      let peerSections = peers.map { peer -> String in
-        var lines = ["[Peer]", "PublicKey = \(peer.serverPublicKey)"]
-        if let psk = peer.presharedKey, !psk.isEmpty {
-          lines.append("PresharedKey = \(psk)")
-        }
-        lines.append("AllowedIPs = \(peer.allowedIPs.joined(separator: ", "))")
-        lines.append("Endpoint = \(peer.hostName):\(peer.port)")
-        if let ka = peer.persistentKeepAlive {
-          lines.append("PersistentKeepalive = \(ka)")
-        }
-        return lines.joined(separator: "\n")
-      }.joined(separator: "\n")
-      return interfaceSection + "\n" + peerSections
-    }
-    return """
-    \(interfaceSection)
    [Peer]
    PublicKey = \(serverPublicKey)
-    \((presharedKey?.isEmpty ?? true) ? "" : "PresharedKey = \(presharedKey!)")
+    \(presharedKey == nil ? "" : "PresharedKey = \(presharedKey!)")
    AllowedIPs = \(allowedIPs.joined(separator: ", "))
    Endpoint = \(hostName):\(port)
    PersistentKeepalive = \(persistentKeepAlive)
@@ -162,21 +121,19 @@ struct WGConfig: Decodable {
  }

  var redux: String {
-    let peerCount = peers?.count ?? 1
-    let peerInfo = peers.map { peers in
-      peers.enumerated().map { i, peer in
-        "[Peer \(i + 1)] Endpoint = \(peer.hostName):\(peer.port), AllowedIPs = \(peer.allowedIPs.joined(separator: ", "))"
-      }.joined(separator: "\n")
-    } ?? "Endpoint = \(hostName):\(port), AllowedIPs = \(allowedIPs.joined(separator: ", "))"
-    return """
+    """
    [Interface]
    Address = \(clientIP)
    DNS = \(dns1), \(dns2)
    MTU = \(mtu)
    PrivateKey = ***
    \(settings)
-    PeerCount = \(peerCount)
-    \(peerInfo)
+    [Peer]
+    PublicKey = ***
+    PresharedKey = ***
+    AllowedIPs = \(allowedIPs.joined(separator: ", "))
+    Endpoint = \(hostName):\(port)
+    PersistentKeepalive = \(persistentKeepAlive)

    SplitTunnelType = \(splitTunnelType)
    SplitTunnelSites = \(splitTunnelSites.joined(separator: ", "))
--- a/client/platforms/ios/ios_controller.mm
+++ b/client/platforms/ios/ios_controller.mm
@@ -595,10 +595,6 @@ bool IosController::setupWireGuard()
        wgConfig.insert(configKey::persistentKeepAlive, "25");
    }

-    if (config.contains("peers") && config["peers"].isArray()) {
-        wgConfig.insert("peers", config["peers"]);
-    }
-
    if (config.contains(configKey::isObfuscationEnabled) && config.value(configKey::isObfuscationEnabled).toBool()) {
        wgConfig.insert(configKey::initPacketMagicHeader, config[configKey::initPacketMagicHeader]);
        wgConfig.insert(configKey::responsePacketMagicHeader, config[configKey::responsePacketMagicHeader]);
@@ -678,23 +674,7 @@ bool IosController::setupAwg()

    wgConfig.insert(configKey::hostName, config[configKey::hostName]);
    wgConfig.insert(configKey::port, config[configKey::port]);
-
-    bool isMultiPeer = config.contains("peers") && config["peers"].isArray()
-                       && !config["peers"].toArray().isEmpty();
-
    wgConfig.insert(configKey::clientIp, config[configKey::clientIp]);
-    if (isMultiPeer) {
-        wgConfig.insert("peers", config["peers"]);
-        wgConfig.insert(configKey::allowedIps, QJsonArray{}); // required by WGConfig decoder, unused in multi-peer path
-    } else {
-        if (config.contains(configKey::allowedIps) && config[configKey::allowedIps].isArray()) {
-            wgConfig.insert(configKey::allowedIps, config[configKey::allowedIps]);
-        } else {
-            QJsonArray allowed_ips { "0.0.0.0/0", "::/0" };
-            wgConfig.insert(configKey::allowedIps, allowed_ips);
-        }
-    }
-
    wgConfig.insert(configKey::clientPrivKey, config[configKey::clientPrivKey]);
    wgConfig.insert(configKey::serverPubKey, config[configKey::serverPubKey]);
    wgConfig.insert(configKey::pskKey, config[configKey::pskKey]);
@@ -708,6 +688,13 @@ bool IosController::setupAwg()

    wgConfig.insert(configKey::splitTunnelSites, splitTunnelSites);

+    if (config.contains(configKey::allowedIps) && config[configKey::allowedIps].isArray()) {
+        wgConfig.insert(configKey::allowedIps, config[configKey::allowedIps]);
+    } else {
+        QJsonArray allowed_ips { "0.0.0.0/0", "::/0" };
+        wgConfig.insert(configKey::allowedIps, allowed_ips);
+    }
+
    if (config.contains(configKey::persistentKeepAlive)) {
        wgConfig.insert(configKey::persistentKeepAlive, config[configKey::persistentKeepAlive]);
    } else {
--- a/client/platforms/linux/daemon/iputilslinux.cpp
+++ b/client/platforms/linux/daemon/iputilslinux.cpp
@@ -5,12 +5,8 @@
 #include "iputilslinux.h"

 #include <arpa/inet.h>
-#include <linux/if_addr.h>
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
 #include <net/if.h>
 #include <sys/ioctl.h>
-#include <sys/socket.h>
 #include <unistd.h>

 #include <QHostAddress>
@@ -75,104 +71,39 @@ bool IPUtilsLinux::setMTUAndUp(const InterfaceConfig& config) {
  return true;
 }

-static bool addIPv4AddressNetlink(int ifindex, const QHostAddress& addr,
-                                   int prefixlen) {
-  int nlsock = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-  if (nlsock < 0) return false;
-  auto guard = qScopeGuard([&] { close(nlsock); });
+bool IPUtilsLinux::addIP4AddressToDevice(const InterfaceConfig& config) {
+  struct ifreq ifr;
+  struct sockaddr_in* ifrAddr = (struct sockaddr_in*)&ifr.ifr_addr;

-  char buf[512];
-  memset(buf, 0, sizeof(buf));
+  // Name the interface and set family
+  strncpy(ifr.ifr_name, WG_INTERFACE, IFNAMSIZ);
+  ifr.ifr_addr.sa_family = AF_INET;

-  struct nlmsghdr* nlmsg = reinterpret_cast<struct nlmsghdr*>(buf);
-  nlmsg->nlmsg_len = NLMSG_LENGTH(sizeof(struct ifaddrmsg));
-  nlmsg->nlmsg_type = RTM_NEWADDR;
-  nlmsg->nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_REPLACE | NLM_F_ACK;
-  nlmsg->nlmsg_seq = 1;
-  nlmsg->nlmsg_pid = 0;
+  // Get the device address to add to interface
+  QPair<QHostAddress, int> parsedAddr =
+      QHostAddress::parseSubnet(config.m_deviceIpv4Address);
+  QByteArray _deviceAddr = parsedAddr.first.toString().toLocal8Bit();
+  char* deviceAddr = _deviceAddr.data();
+  inet_pton(AF_INET, deviceAddr, &ifrAddr->sin_addr);

-  struct ifaddrmsg* ifa = static_cast<struct ifaddrmsg*>(NLMSG_DATA(nlmsg));
-  ifa->ifa_family = AF_INET;
-  ifa->ifa_prefixlen = prefixlen;
-  ifa->ifa_flags = IFA_F_PERMANENT;
-  ifa->ifa_scope = RT_SCOPE_UNIVERSE;
-  ifa->ifa_index = ifindex;
-
-  struct in_addr ip4;
-  QByteArray addrBytes = addr.toString().toLocal8Bit();
-  inet_pton(AF_INET, addrBytes.constData(), &ip4);
-
-  auto appendAttr = [](struct nlmsghdr* nlmsg, size_t maxlen, int type,
-                        const void* data, size_t len) {
-    size_t newlen = NLMSG_ALIGN(nlmsg->nlmsg_len) + RTA_SPACE(len);
-    if (newlen > maxlen) return;
-    char* p = reinterpret_cast<char*>(nlmsg) + NLMSG_ALIGN(nlmsg->nlmsg_len);
-    struct rtattr* rta = reinterpret_cast<struct rtattr*>(p);
-    rta->rta_type = type;
-    rta->rta_len = RTA_LENGTH(len);
-    memcpy(RTA_DATA(rta), data, len);
-    nlmsg->nlmsg_len = newlen;
-  };
-
-  appendAttr(nlmsg, sizeof(buf), IFA_LOCAL, &ip4, sizeof(ip4));
-  appendAttr(nlmsg, sizeof(buf), IFA_ADDRESS, &ip4, sizeof(ip4));
-
-  struct sockaddr_nl nladdr;
-  memset(&nladdr, 0, sizeof(nladdr));
-  nladdr.nl_family = AF_NETLINK;
-
-  if (sendto(nlsock, buf, nlmsg->nlmsg_len, 0,
-             reinterpret_cast<struct sockaddr*>(&nladdr),
-             sizeof(nladdr)) < 0) {
+  // Create IPv4 socket to perform the ioctl operations on
+  int sockfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
+  if (sockfd < 0) {
+    logger.error() << "Failed to create ioctl socket.";
    return false;
  }
+  auto guard = qScopeGuard([&] { close(sockfd); });

-  char ackbuf[1024];
-  ssize_t acklen = recv(nlsock, ackbuf, sizeof(ackbuf), 0);
-  if (acklen >= static_cast<ssize_t>(sizeof(struct nlmsghdr))) {
-    struct nlmsghdr* ackmsg = reinterpret_cast<struct nlmsghdr*>(ackbuf);
-    if (ackmsg->nlmsg_type == NLMSG_ERROR) {
-      struct nlmsgerr* err = static_cast<struct nlmsgerr*>(NLMSG_DATA(ackmsg));
-      if (err->error != 0) {
-        errno = -err->error;
-        return false;
-      }
-    }
+  // Set ifr to interface
+  int ret = ioctl(sockfd, SIOCSIFADDR, &ifr);
+  if (ret) {
+    logger.error() << "Failed to set IPv4: " << deviceAddr
+                   << "error:" << strerror(errno);
+    return false;
  }
  return true;
 }

-bool IPUtilsLinux::addIP4AddressToDevice(const InterfaceConfig& config) {
-  if (config.m_deviceIpv4Address.isEmpty()) return true;
-
-  int ifindex = if_nametoindex(WG_INTERFACE);
-  if (ifindex == 0) {
-    logger.error() << "Failed to get ifindex for" << WG_INTERFACE;
-    return false;
-  }
-
-  bool ok = false;
-  const QStringList addresses =
-      config.m_deviceIpv4Address.split(',', Qt::SkipEmptyParts);
-  for (const QString& entry : addresses) {
-    QPair<QHostAddress, int> parsed =
-        QHostAddress::parseSubnet(entry.trimmed());
-    if (parsed.first.isNull()) {
-      logger.warning() << "Failed to parse IPv4 address:" << entry.trimmed();
-      continue;
-    }
-    if (!addIPv4AddressNetlink(ifindex, parsed.first, parsed.second)) {
-      logger.error() << "Failed to add IPv4" << parsed.first.toString() << "/"
-                     << parsed.second << ":" << strerror(errno);
-    } else {
-      logger.debug() << "Added IPv4" << parsed.first.toString() << "/"
-                     << parsed.second << "to" << WG_INTERFACE;
-      ok = true;
-    }
-  }
-  return ok;
-}
-
 bool IPUtilsLinux::addIP6AddressToDevice(const InterfaceConfig& config) {
  // Set up the ifr and the companion ifr6
  struct in6_ifreq ifr6;
--- a/client/platforms/linux/daemon/wireguardutilslinux.cpp
+++ b/client/platforms/linux/daemon/wireguardutilslinux.cpp
@@ -230,10 +230,7 @@ bool WireguardUtilsLinux::updatePeer(const InterfaceConfig& config) {

    out << "replace_allowed_ips=true\n";
    out << "persistent_keepalive_interval=" << WG_KEEPALIVE_PERIOD << "\n";
-    const QList<IPAddress>& primaryIPs = config.m_primaryPeerAllowedIPRanges.isEmpty()
-        ? config.m_allowedIPAddressRanges
-        : config.m_primaryPeerAllowedIPRanges;
-    for (const IPAddress& ip : primaryIPs) {
+    for (const IPAddress& ip : config.m_allowedIPAddressRanges) {
        out << "allowed_ip=" << ip.toString() << "\n";
    }

@@ -247,38 +244,8 @@ bool WireguardUtilsLinux::updatePeer(const InterfaceConfig& config) {
    int err = uapiErrno(uapiCommand(message));
    if (err != 0) {
        logger.error() << "Peer configuration failed:" << strerror(err);
-        return false;
    }
-
-    for (const InterfaceConfig::AdditionalPeerConfig& peer : config.m_additionalPeers) {
-        QByteArray pubKey = QByteArray::fromBase64(peer.m_serverPublicKey.toUtf8());
-        QByteArray pskKey = QByteArray::fromBase64(peer.m_serverPskKey.toUtf8());
-
-        QString peerMsg;
-        QTextStream peerOut(&peerMsg);
-        peerOut << "set=1\n";
-        peerOut << "public_key=" << QString(pubKey.toHex()) << "\n";
-        if (!peer.m_serverPskKey.isEmpty()) {
-            peerOut << "preshared_key=" << QString(pskKey.toHex()) << "\n";
-        }
-        peerOut << "endpoint=" << peer.m_serverIpv4AddrIn << ":" << peer.m_serverPort << "\n";
-        peerOut << "replace_allowed_ips=true\n";
-        peerOut << "persistent_keepalive_interval=" << WG_KEEPALIVE_PERIOD << "\n";
-        for (const IPAddress& ip : peer.m_allowedIPAddressRanges) {
-            peerOut << "allowed_ip=" << ip.toString() << "\n";
-        }
-
-        if ((config.m_hopType != InterfaceConfig::MultiHopExit) && m_rtmonitor) {
-            m_rtmonitor->addExclusionRoute(IPAddress(peer.m_serverIpv4AddrIn));
-        }
-
-        int peerErr = uapiErrno(uapiCommand(peerMsg));
-        if (peerErr != 0) {
-            logger.error() << "Additional peer configuration failed:" << strerror(peerErr);
-        }
-    }
-
-    return true;
+    return (err == 0);
 }

 bool WireguardUtilsLinux::deletePeer(const InterfaceConfig& config) {
--- a/client/platforms/macos/daemon/iputilsmacos.cpp
+++ b/client/platforms/macos/daemon/iputilsmacos.cpp
@@ -80,9 +80,7 @@ bool IPUtilsMacos::setMTUAndUp(const InterfaceConfig& config) {
 }

 bool IPUtilsMacos::addIP4AddressToDevice(const InterfaceConfig& config) {
-  if (config.m_deviceIpv4Address.isEmpty()) {
-    return true;
-  }
+  Q_UNUSED(config);
  QString ifname = MacOSDaemon::instance()->m_wgutils->interfaceName();
  struct ifaliasreq ifr;
  struct sockaddr_in* ifrAddr = (struct sockaddr_in*)&ifr.ifra_addr;
@@ -93,28 +91,25 @@ bool IPUtilsMacos::addIP4AddressToDevice(const InterfaceConfig& config) {
  memset(&ifr, 0, sizeof(ifr));
  strncpy(ifr.ifra_name, qPrintable(ifname), IFNAMSIZ);

-  // Extract the host IP from CIDR notation (e.g. "10.8.0.2/24" → "10.8.0.2").
-  // parseSubnet() zeroes host bits so we split manually to preserve the host address.
-  QByteArray _deviceAddr = config.m_deviceIpv4Address.split('/').first().toLocal8Bit();
+  // Get the device address to add to interface
+  QPair<QHostAddress, int> parsedAddr =
+      QHostAddress::parseSubnet(config.m_deviceIpv4Address);
+  QByteArray _deviceAddr = parsedAddr.first.toString().toLocal8Bit();
  char* deviceAddr = _deviceAddr.data();
  ifrAddr->sin_family = AF_INET;
  ifrAddr->sin_len = sizeof(struct sockaddr_in);
-  if (inet_pton(AF_INET, deviceAddr, &ifrAddr->sin_addr) != 1) {
-    logger.error() << "Failed to parse IPv4 address:" << deviceAddr;
-    return false;
-  }
+  inet_pton(AF_INET, deviceAddr, &ifrAddr->sin_addr);

  // Set the netmask to /32
  ifrMask->sin_family = AF_INET;
  ifrMask->sin_len = sizeof(struct sockaddr_in);
  memset(&ifrMask->sin_addr, 0xff, sizeof(ifrMask->sin_addr));

-  // For P2P (utun) interfaces, ifra_broadaddr is the destination address.
-  // Set it equal to the local address to create only a host route (not a network
-  // route that would cause a routing loop).
+  // Set the broadcast address.
  ifrBcast->sin_family = AF_INET;
  ifrBcast->sin_len = sizeof(struct sockaddr_in);
-  ifrBcast->sin_addr.s_addr = ifrAddr->sin_addr.s_addr;
+  ifrBcast->sin_addr.s_addr =
+      (ifrAddr->sin_addr.s_addr | ~ifrMask->sin_addr.s_addr);

  // Create an IPv4 socket to perform the ioctl operations on
  int sockfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
--- a/client/platforms/macos/daemon/wireguardutilsmacos.cpp
+++ b/client/platforms/macos/daemon/wireguardutilsmacos.cpp
@@ -230,11 +230,7 @@ bool WireguardUtilsMacos::updatePeer(const InterfaceConfig& config) {

  out << "replace_allowed_ips=true\n";
  out << "persistent_keepalive_interval=" << WG_KEEPALIVE_PERIOD << "\n";
-  // For multi-peer use only the primary peer's own IPs to avoid routing trie conflicts.
-  const QList<IPAddress>& primaryIPs = config.m_primaryPeerAllowedIPRanges.isEmpty()
-      ? config.m_allowedIPAddressRanges
-      : config.m_primaryPeerAllowedIPRanges;
-  for (const IPAddress& ip : primaryIPs) {
+  for (const IPAddress& ip : config.m_allowedIPAddressRanges) {
    out << "allowed_ip=" << ip.toString() << "\n";
  }

@@ -248,38 +244,8 @@ bool WireguardUtilsMacos::updatePeer(const InterfaceConfig& config) {
  int err = uapiErrno(uapiCommand(message));
  if (err != 0) {
    logger.error() << "Peer configuration failed:" << strerror(err);
-    return false;
  }
-
-  for (const InterfaceConfig::AdditionalPeerConfig& peer : config.m_additionalPeers) {
-    QByteArray pubKey = QByteArray::fromBase64(peer.m_serverPublicKey.toUtf8());
-    QByteArray pskKey = QByteArray::fromBase64(peer.m_serverPskKey.toUtf8());
-
-    QString peerMsg;
-    QTextStream peerOut(&peerMsg);
-    peerOut << "set=1\n";
-    peerOut << "public_key=" << QString(pubKey.toHex()) << "\n";
-    if (!peer.m_serverPskKey.isEmpty()) {
-      peerOut << "preshared_key=" << QString(pskKey.toHex()) << "\n";
-    }
-    peerOut << "endpoint=" << peer.m_serverIpv4AddrIn << ":" << peer.m_serverPort << "\n";
-    peerOut << "replace_allowed_ips=true\n";
-    peerOut << "persistent_keepalive_interval=" << WG_KEEPALIVE_PERIOD << "\n";
-    for (const IPAddress& ip : peer.m_allowedIPAddressRanges) {
-      peerOut << "allowed_ip=" << ip.toString() << "\n";
-    }
-
-    if ((config.m_hopType != InterfaceConfig::MultiHopExit) && m_rtmonitor) {
-      m_rtmonitor->addExclusionRoute(IPAddress(peer.m_serverIpv4AddrIn));
-    }
-
-    int peerErr = uapiErrno(uapiCommand(peerMsg));
-    if (peerErr != 0) {
-      logger.error() << "Additional peer configuration failed:" << strerror(peerErr);
-    }
-  }
-
-  return true;
+  return (err == 0);
 }

 bool WireguardUtilsMacos::deletePeer(const InterfaceConfig& config) {
--- a/client/platforms/windows/daemon/wireguardutilswindows.cpp
+++ b/client/platforms/windows/daemon/wireguardutilswindows.cpp
@@ -181,10 +181,7 @@ bool WireguardUtilsWindows::updatePeer(const InterfaceConfig& config) {

  out << "replace_allowed_ips=true\n";
  out << "persistent_keepalive_interval=" << WG_KEEPALIVE_PERIOD << "\n";
-  const QList<IPAddress>& primaryIPs = config.m_primaryPeerAllowedIPRanges.isEmpty()
-      ? config.m_allowedIPAddressRanges
-      : config.m_primaryPeerAllowedIPRanges;
-  for (const IPAddress& ip : primaryIPs) {
+  for (const IPAddress& ip : config.m_allowedIPAddressRanges) {
    out << "allowed_ip=" << ip.toString() << "\n";
  }

@@ -196,33 +193,6 @@ bool WireguardUtilsWindows::updatePeer(const InterfaceConfig& config) {

  QString reply = m_tunnel.uapiCommand(message);
  logger.debug() << "DATA:" << reply;
-
-  for (const InterfaceConfig::AdditionalPeerConfig& peer : config.m_additionalPeers) {
-    QByteArray pubKey = QByteArray::fromBase64(peer.m_serverPublicKey.toUtf8());
-    QByteArray pskKey = QByteArray::fromBase64(peer.m_serverPskKey.toUtf8());
-
-    QString peerMsg;
-    QTextStream peerOut(&peerMsg);
-    peerOut << "set=1\n";
-    peerOut << "public_key=" << QString(pubKey.toHex()) << "\n";
-    if (!peer.m_serverPskKey.isEmpty()) {
-      peerOut << "preshared_key=" << QString(pskKey.toHex()) << "\n";
-    }
-    peerOut << "endpoint=" << peer.m_serverIpv4AddrIn << ":" << peer.m_serverPort << "\n";
-    peerOut << "replace_allowed_ips=true\n";
-    peerOut << "persistent_keepalive_interval=" << WG_KEEPALIVE_PERIOD << "\n";
-    for (const IPAddress& ip : peer.m_allowedIPAddressRanges) {
-      peerOut << "allowed_ip=" << ip.toString() << "\n";
-    }
-
-    if (m_routeMonitor && config.m_hopType != InterfaceConfig::MultiHopExit) {
-      m_routeMonitor->addExclusionRoute(IPAddress(peer.m_serverIpv4AddrIn));
-    }
-
-    QString peerReply = m_tunnel.uapiCommand(peerMsg);
-    logger.debug() << "Additional peer DATA:" << peerReply;
-  }
-
  return true;
 }

--- a/client/server_scripts/remove_all_containers.sh
+++ b/client/server_scripts/remove_all_containers.sh
@@ -1,5 +1,6 @@
 sudo docker ps -a | grep amnezia | awk '{print $1}' | xargs sudo docker stop;\
 sudo docker ps -a | grep amnezia | awk '{print $1}' | xargs sudo docker rm -fv;\
 sudo docker images -a --format table | grep amnezia | awk '{print $3, $1 ":" $2}' | xargs sudo docker rmi;\
+sudo docker volume ls | grep amnezia | awk '{print $2}' | xargs sudo docker volume rm -f;\
 sudo docker network ls | grep amnezia-dns-net | awk '{print $1}' | xargs sudo docker network rm;\
 sudo rm -frd /opt/amnezia
--- a/client/server_scripts/remove_container.sh
+++ b/client/server_scripts/remove_container.sh
@@ -1,4 +1,3 @@
 sudo docker stop $CONTAINER_NAME;\
 sudo docker rm -fv $CONTAINER_NAME;\
-sudo docker rmi $CONTAINER_NAME;\
-test "$REMOVE_CONTAINER_DATA" = "1" && sudo docker volume rm -f ${CONTAINER_NAME}-data 2>/dev/null || true
+sudo docker rmi $CONTAINER_NAME;
--- a/client/ui/controllers/api/subscriptionUiController.cpp
+++ b/client/ui/controllers/api/subscriptionUiController.cpp
@@ -1,9 +1,5 @@
 #include "subscriptionUiController.h"

-#ifdef Q_OS_IOS
-#include "platforms/ios/ios_controller.h"
-#endif
-
 #include "amneziaApplication.h"
 #include "core/configurators/wireguardConfigurator.h"
 #include "core/utils/serverConfigUtils.h"
--- a/client/ui/qml/Pages2/PageProtocolXrayFlowSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolXrayFlowSettings.qml
@@ -112,7 +112,7 @@ PageType {
                    return
                }
                PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                InstallController.updateContainer(ServersUiController.processedIndex, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
            }
            var noButtonFunction = function () {
                if (typeof GC !== "undefined" && !GC.isMobile()) {
--- a/client/ui/qml/Pages2/PageProtocolXraySecuritySettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolXraySecuritySettings.qml
@@ -279,7 +279,7 @@ PageType {
                    return
                }
                PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                InstallController.updateContainer(ServersUiController.processedIndex, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
            }
            var noButtonFunction = function () {
                if (typeof GC !== "undefined" && !GC.isMobile()) {
--- a/client/ui/qml/Pages2/PageProtocolXraySettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolXraySettings.qml
@@ -17,6 +17,10 @@ import "../Components"
 PageType {
    id: root

+    enableTimer: false
+
+    property bool portDirty: false
+
    function formatTransport(value) {
        if (value === "raw") return "RAW (TCP)"
        if (value === "xhttp") return "XHTTP"
@@ -39,8 +43,8 @@ PageType {
        anchors.right: parent.right
        anchors.topMargin: 20 + PageController.safeAreaTopMargin

-        onFocusChanged: {
-            if (this.activeFocus) {
+        onActiveFocusChanged: {
+            if (backButton.enabled && backButton.activeFocus) {
                listView.positionViewAtBeginning()
            }
        }
@@ -60,8 +64,6 @@ PageType {
        delegate: ColumnLayout {
            width: listView.width

-            property alias focusItemId: textFieldWithHeaderType.textField
-
            spacing: 0

            Text {
@@ -107,13 +109,32 @@ PageType {
                Layout.rightMargin: 16
                enabled: listView.enabled
                headerText: qsTr("Port")
-                textField.text: port
+
+                Binding {
+                    target: textFieldWithHeaderType.textField
+                    property: "text"
+                    value: port
+                    when: !textFieldWithHeaderType.textField.activeFocus
+                    restoreMode: Binding.RestoreNone
+                }
+
                textField.maximumLength: 5
                textField.validator: IntValidator {
                    bottom: 1; top: 65535
                }
+                textField.onActiveFocusChanged: {
+                    if (textField.activeFocus && textField.text === "" && port !== "") {
+                        textField.text = port
+                    }
+                }
+                textField.onTextChanged: {
+                    root.portDirty = (textField.text !== port)
+                }
                textField.onEditingFinished: {
-                    if (textField.text !== port) port = textField.text
+                    if (textField.text !== port) {
+                        port = textField.text
+                    }
+                    root.portDirty = false
                }
                checkEmptyText: true
            }
@@ -172,9 +193,8 @@ PageType {
                Layout.leftMargin: 16
                Layout.rightMargin: 16
                visible: listView.enabled
-                         && (XrayConfigModel.hasUnsavedChanges
-                             || textFieldWithHeaderType.textField.text !== port)
-                enabled: visible && textFieldWithHeaderType.errorText === ""
+                         && (XrayConfigModel.hasUnsavedChanges || root.portDirty)
+                enabled: visible && textFieldWithHeaderType.textField.text !== ""
                text: qsTr("Save")
                onClicked: function() {
                    forceActiveFocus()
--- a/client/ui/qml/Pages2/PageProtocolXrayTransportSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolXrayTransportSettings.qml
@@ -742,7 +742,7 @@ PageType {
                    return
                }
                PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                InstallController.updateContainer(ServersUiController.processedIndex, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
            }
            var noButtonFunction = function () {
                if (typeof GC !== "undefined" && !GC.isMobile()) {
--- a/client/ui/qml/Pages2/PageProtocolXrayXPaddingBytesSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolXrayXPaddingBytesSettings.qml
@@ -95,7 +95,7 @@ PageType {
                    return
                }
                PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                InstallController.updateContainer(ServersUiController.processedIndex, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
            }
            var noButtonFunction = function () {
                if (typeof GC !== "undefined" && !GC.isMobile()) {
--- a/client/ui/qml/Pages2/PageProtocolXrayXPaddingSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolXrayXPaddingSettings.qml
@@ -211,7 +211,7 @@ PageType {
                    return
                }
                PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                InstallController.updateContainer(ServersUiController.processedIndex, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
            }
            var noButtonFunction = function () {
                if (typeof GC !== "undefined" && !GC.isMobile()) {
--- a/client/ui/qml/Pages2/PageProtocolXrayXmuxSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolXrayXmuxSettings.qml
@@ -208,7 +208,7 @@ PageType {
                    return
                }
                PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                InstallController.updateContainer(ServersUiController.processedIndex, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
+                InstallController.updateContainer(ServersUiController.processedServerId, ServersUiController.processedContainerIndex, ProtocolEnum.Xray)
            }
            var noButtonFunction = function () {
                if (typeof GC !== "undefined" && !GC.isMobile()) {
Author	SHA1	Message	Date
dranik	43370ed081	move sudo docker volume rm -f	2026-06-01 14:51:12 +03:00
yp	a9861d18b7	fix: wrong index on xray pages (#2669 ) * test crash xray * fixed save config xray * reset file * fixed text port & reset file * fixed textFieldWithHeaderType.textField	2026-06-01 12:22:54 +08:00
lunardunno	c14138f031	fix: deleting volumes when cleaning the server (#2673 ) * Deleting volumes when cleaning the server * force the remove volumes	2026-06-01 11:54:34 +08:00