From 6c5d590169a9f70dd9dc5f76f4d64b09218dad78 Mon Sep 17 00:00:00 2001
From: Nethius <nethiuswork@gmail.com>
Date: Mon, 19 Aug 2024 16:17:09 +0700
Subject: [PATCH] fixed xray port processing (#983)

* fixed xray port processing

* fixed saving port when changing xray settings and saving transport protocol when changing all the protocols settings
---
 client/protocols/protocols_defs.cpp           |  1 +
 .../xray/configure_container.sh               |  4 +-
 client/server_scripts/xray/template.json      |  2 +-
 client/ui/models/protocols/awgConfigModel.cpp | 65 +++++++------------
 .../ui/models/protocols/cloakConfigModel.cpp  | 13 ++--
 .../ui/models/protocols/ikev2ConfigModel.cpp  | 10 +--
 .../models/protocols/openvpnConfigModel.cpp   | 59 ++++++-----------
 .../protocols/shadowsocksConfigModel.cpp      | 13 ++--
 .../models/protocols/wireguardConfigModel.cpp |  3 +
 .../ui/models/protocols/xrayConfigModel.cpp   |  7 +-
 10 files changed, 70 insertions(+), 107 deletions(-)

diff --git a/client/protocols/protocols_defs.cpp b/client/protocols/protocols_defs.cpp
index 2c9cf1862..ac5bb1ad8 100644
--- a/client/protocols/protocols_defs.cpp
+++ b/client/protocols/protocols_defs.cpp
@@ -154,6 +154,7 @@ bool ProtocolProps::defaultPortChangeable(Proto p)
     case Proto::Awg: return true;
     case Proto::Ikev2: return false;
     case Proto::L2tp: return false;
+    case Proto::Xray: return true;
 
     case Proto::TorWebSite: return false;
     case Proto::Dns: return false;
diff --git a/client/server_scripts/xray/configure_container.sh b/client/server_scripts/xray/configure_container.sh
index bf6f4a425..a84751c7f 100644
--- a/client/server_scripts/xray/configure_container.sh
+++ b/client/server_scripts/xray/configure_container.sh
@@ -29,7 +29,7 @@ cat > /opt/amnezia/xray/server.json <<EOF
     },
     "inbounds": [
         {
-            "port": "$XRAY_SERVER_PORT",
+            "port": $XRAY_SERVER_PORT,
             "protocol": "vless",
             "settings": {
                 "clients": [
@@ -44,7 +44,7 @@ cat > /opt/amnezia/xray/server.json <<EOF
                 "network": "tcp",
                 "security": "reality",
                 "realitySettings": {
-                    "dest": "$XRAY_SITE_NAME:$XRAY_SERVER_PORT",
+                    "dest": "$XRAY_SITE_NAME:443",
                     "serverNames": [
                         "$XRAY_SITE_NAME"
                     ],
diff --git a/client/server_scripts/xray/template.json b/client/server_scripts/xray/template.json
index efc4a1378..a2132aa37 100644
--- a/client/server_scripts/xray/template.json
+++ b/client/server_scripts/xray/template.json
@@ -19,7 +19,7 @@
                 "vnext": [
                     {
                         "address": "$SERVER_IP_ADDRESS",
-                        "port": "$XRAY_SERVER_PORT",
+                        "port": $XRAY_SERVER_PORT,
                         "users": [
                             {
                                 "id": "$XRAY_CLIENT_ID",
diff --git a/client/ui/models/protocols/awgConfigModel.cpp b/client/ui/models/protocols/awgConfigModel.cpp
index 6b9234f40..658658df0 100644
--- a/client/ui/models/protocols/awgConfigModel.cpp
+++ b/client/ui/models/protocols/awgConfigModel.cpp
@@ -26,24 +26,12 @@ bool AwgConfigModel::setData(const QModelIndex &index, const QVariant &value, in
     case Roles::JunkPacketCountRole: m_protocolConfig.insert(config_key::junkPacketCount, value.toString()); break;
     case Roles::JunkPacketMinSizeRole: m_protocolConfig.insert(config_key::junkPacketMinSize, value.toString()); break;
     case Roles::JunkPacketMaxSizeRole: m_protocolConfig.insert(config_key::junkPacketMaxSize, value.toString()); break;
-    case Roles::InitPacketJunkSizeRole:
-        m_protocolConfig.insert(config_key::initPacketJunkSize, value.toString());
-        break;
-    case Roles::ResponsePacketJunkSizeRole:
-        m_protocolConfig.insert(config_key::responsePacketJunkSize, value.toString());
-        break;
-    case Roles::InitPacketMagicHeaderRole:
-        m_protocolConfig.insert(config_key::initPacketMagicHeader, value.toString());
-        break;
-    case Roles::ResponsePacketMagicHeaderRole:
-        m_protocolConfig.insert(config_key::responsePacketMagicHeader, value.toString());
-        break;
-    case Roles::UnderloadPacketMagicHeaderRole:
-        m_protocolConfig.insert(config_key::underloadPacketMagicHeader, value.toString());
-        break;
-    case Roles::TransportPacketMagicHeaderRole:
-        m_protocolConfig.insert(config_key::transportPacketMagicHeader, value.toString());
-        break;
+    case Roles::InitPacketJunkSizeRole: m_protocolConfig.insert(config_key::initPacketJunkSize, value.toString()); break;
+    case Roles::ResponsePacketJunkSizeRole: m_protocolConfig.insert(config_key::responsePacketJunkSize, value.toString()); break;
+    case Roles::InitPacketMagicHeaderRole: m_protocolConfig.insert(config_key::initPacketMagicHeader, value.toString()); break;
+    case Roles::ResponsePacketMagicHeaderRole: m_protocolConfig.insert(config_key::responsePacketMagicHeader, value.toString()); break;
+    case Roles::UnderloadPacketMagicHeaderRole: m_protocolConfig.insert(config_key::underloadPacketMagicHeader, value.toString()); break;
+    case Roles::TransportPacketMagicHeaderRole: m_protocolConfig.insert(config_key::transportPacketMagicHeader, value.toString()); break;
     }
 
     emit dataChanged(index, index, QList { role });
@@ -82,6 +70,8 @@ void AwgConfigModel::updateModel(const QJsonObject &config)
 
     QJsonObject protocolConfig = config.value(config_key::awg).toObject();
 
+    auto defaultTransportProto = ProtocolProps::transportProtoToString(ProtocolProps::defaultTransportProto(Proto::Awg), Proto::Awg);
+    m_protocolConfig.insert(config_key::transport_proto, protocolConfig.value(config_key::transport_proto).toString(defaultTransportProto));
     m_protocolConfig[config_key::last_config] = protocolConfig.value(config_key::last_config);
     m_protocolConfig[config_key::port] = protocolConfig.value(config_key::port).toString(protocols::awg::defaultPort);
     m_protocolConfig[config_key::mtu] = protocolConfig.value(config_key::mtu).toString(protocols::awg::defaultMtu);
@@ -98,14 +88,11 @@ void AwgConfigModel::updateModel(const QJsonObject &config)
     m_protocolConfig[config_key::initPacketMagicHeader] =
             protocolConfig.value(config_key::initPacketMagicHeader).toString(protocols::awg::defaultInitPacketMagicHeader);
     m_protocolConfig[config_key::responsePacketMagicHeader] =
-            protocolConfig.value(config_key::responsePacketMagicHeader)
-                    .toString(protocols::awg::defaultResponsePacketMagicHeader);
+            protocolConfig.value(config_key::responsePacketMagicHeader).toString(protocols::awg::defaultResponsePacketMagicHeader);
     m_protocolConfig[config_key::underloadPacketMagicHeader] =
-            protocolConfig.value(config_key::underloadPacketMagicHeader)
-                    .toString(protocols::awg::defaultUnderloadPacketMagicHeader);
+            protocolConfig.value(config_key::underloadPacketMagicHeader).toString(protocols::awg::defaultUnderloadPacketMagicHeader);
     m_protocolConfig[config_key::transportPacketMagicHeader] =
-            protocolConfig.value(config_key::transportPacketMagicHeader)
-                    .toString(protocols::awg::defaultTransportPacketMagicHeader);
+            protocolConfig.value(config_key::transportPacketMagicHeader).toString(protocols::awg::defaultTransportPacketMagicHeader);
 
     endResetModel();
 }
@@ -163,22 +150,17 @@ AwgConfig::AwgConfig(const QJsonObject &jsonConfig)
     port = jsonConfig.value(config_key::port).toString(protocols::awg::defaultPort);
     mtu = jsonConfig.value(config_key::mtu).toString(protocols::awg::defaultMtu);
     junkPacketCount = jsonConfig.value(config_key::junkPacketCount).toString(protocols::awg::defaultJunkPacketCount);
-    junkPacketMinSize =
-            jsonConfig.value(config_key::junkPacketMinSize).toString(protocols::awg::defaultJunkPacketMinSize);
-    junkPacketMaxSize =
-            jsonConfig.value(config_key::junkPacketMaxSize).toString(protocols::awg::defaultJunkPacketMaxSize);
-    initPacketJunkSize =
-            jsonConfig.value(config_key::initPacketJunkSize).toString(protocols::awg::defaultInitPacketJunkSize);
-    responsePacketJunkSize =
-            jsonConfig.value(config_key::responsePacketJunkSize).toString(protocols::awg::defaultResponsePacketJunkSize);
-    initPacketMagicHeader =
-            jsonConfig.value(config_key::initPacketMagicHeader).toString(protocols::awg::defaultInitPacketMagicHeader);
-    responsePacketMagicHeader = jsonConfig.value(config_key::responsePacketMagicHeader)
-                                        .toString(protocols::awg::defaultResponsePacketMagicHeader);
-    underloadPacketMagicHeader = jsonConfig.value(config_key::underloadPacketMagicHeader)
-                                         .toString(protocols::awg::defaultUnderloadPacketMagicHeader);
-    transportPacketMagicHeader = jsonConfig.value(config_key::transportPacketMagicHeader)
-                                         .toString(protocols::awg::defaultTransportPacketMagicHeader);
+    junkPacketMinSize = jsonConfig.value(config_key::junkPacketMinSize).toString(protocols::awg::defaultJunkPacketMinSize);
+    junkPacketMaxSize = jsonConfig.value(config_key::junkPacketMaxSize).toString(protocols::awg::defaultJunkPacketMaxSize);
+    initPacketJunkSize = jsonConfig.value(config_key::initPacketJunkSize).toString(protocols::awg::defaultInitPacketJunkSize);
+    responsePacketJunkSize = jsonConfig.value(config_key::responsePacketJunkSize).toString(protocols::awg::defaultResponsePacketJunkSize);
+    initPacketMagicHeader = jsonConfig.value(config_key::initPacketMagicHeader).toString(protocols::awg::defaultInitPacketMagicHeader);
+    responsePacketMagicHeader =
+            jsonConfig.value(config_key::responsePacketMagicHeader).toString(protocols::awg::defaultResponsePacketMagicHeader);
+    underloadPacketMagicHeader =
+            jsonConfig.value(config_key::underloadPacketMagicHeader).toString(protocols::awg::defaultUnderloadPacketMagicHeader);
+    transportPacketMagicHeader =
+            jsonConfig.value(config_key::transportPacketMagicHeader).toString(protocols::awg::defaultTransportPacketMagicHeader);
 }
 
 bool AwgConfig::hasEqualServerSettings(const AwgConfig &other) const
@@ -186,8 +168,7 @@ bool AwgConfig::hasEqualServerSettings(const AwgConfig &other) const
     if (port != other.port || junkPacketCount != other.junkPacketCount || junkPacketMinSize != other.junkPacketMinSize
         || junkPacketMaxSize != other.junkPacketMaxSize || initPacketJunkSize != other.initPacketJunkSize
         || responsePacketJunkSize != other.responsePacketJunkSize || initPacketMagicHeader != other.initPacketMagicHeader
-        || responsePacketMagicHeader != other.responsePacketMagicHeader
-        || underloadPacketMagicHeader != other.underloadPacketMagicHeader
+        || responsePacketMagicHeader != other.responsePacketMagicHeader || underloadPacketMagicHeader != other.underloadPacketMagicHeader
         || transportPacketMagicHeader != other.transportPacketMagicHeader) {
         return false;
     }
diff --git a/client/ui/models/protocols/cloakConfigModel.cpp b/client/ui/models/protocols/cloakConfigModel.cpp
index 203f08b52..a9f06f4da 100644
--- a/client/ui/models/protocols/cloakConfigModel.cpp
+++ b/client/ui/models/protocols/cloakConfigModel.cpp
@@ -51,14 +51,11 @@ void CloakConfigModel::updateModel(const QJsonObject &config)
     m_fullConfig = config;
     QJsonObject protocolConfig = config.value(config_key::cloak).toObject();
 
-    m_protocolConfig.insert(config_key::cipher,
-                            protocolConfig.value(config_key::cipher).toString(protocols::cloak::defaultCipher));
-
-    m_protocolConfig.insert(config_key::port,
-                            protocolConfig.value(config_key::port).toString(protocols::cloak::defaultPort));
-
-    m_protocolConfig.insert(config_key::site,
-                            protocolConfig.value(config_key::site).toString(protocols::cloak::defaultRedirSite));
+    auto defaultTransportProto = ProtocolProps::transportProtoToString(ProtocolProps::defaultTransportProto(Proto::Cloak), Proto::Cloak);
+    m_protocolConfig.insert(config_key::transport_proto, protocolConfig.value(config_key::transport_proto).toString(defaultTransportProto));
+    m_protocolConfig.insert(config_key::cipher, protocolConfig.value(config_key::cipher).toString(protocols::cloak::defaultCipher));
+    m_protocolConfig.insert(config_key::port, protocolConfig.value(config_key::port).toString(protocols::cloak::defaultPort));
+    m_protocolConfig.insert(config_key::site, protocolConfig.value(config_key::site).toString(protocols::cloak::defaultRedirSite));
 
     endResetModel();
 }
diff --git a/client/ui/models/protocols/ikev2ConfigModel.cpp b/client/ui/models/protocols/ikev2ConfigModel.cpp
index a11b66523..05494a075 100644
--- a/client/ui/models/protocols/ikev2ConfigModel.cpp
+++ b/client/ui/models/protocols/ikev2ConfigModel.cpp
@@ -35,8 +35,7 @@ QVariant Ikev2ConfigModel::data(const QModelIndex &index, int role) const
 
     switch (role) {
     case Roles::PortRole: return m_protocolConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort);
-    case Roles::CipherRole:
-        return m_protocolConfig.value(config_key::cipher).toString(protocols::shadowsocks::defaultCipher);
+    case Roles::CipherRole: return m_protocolConfig.value(config_key::cipher).toString(protocols::shadowsocks::defaultCipher);
     }
 
     return QVariant();
@@ -50,11 +49,8 @@ void Ikev2ConfigModel::updateModel(const QJsonObject &config)
     m_fullConfig = config;
     QJsonObject protocolConfig = config.value(config_key::shadowsocks).toObject();
 
-    m_protocolConfig.insert(config_key::cipher,
-                            protocolConfig.value(config_key::cipher).toString(protocols::shadowsocks::defaultCipher));
-
-    m_protocolConfig.insert(config_key::port,
-                            protocolConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort));
+    m_protocolConfig.insert(config_key::cipher, protocolConfig.value(config_key::cipher).toString(protocols::shadowsocks::defaultCipher));
+    m_protocolConfig.insert(config_key::port, protocolConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort));
 
     endResetModel();
 }
diff --git a/client/ui/models/protocols/openvpnConfigModel.cpp b/client/ui/models/protocols/openvpnConfigModel.cpp
index 30d00306c..a04c2b1ad 100644
--- a/client/ui/models/protocols/openvpnConfigModel.cpp
+++ b/client/ui/models/protocols/openvpnConfigModel.cpp
@@ -19,9 +19,7 @@ bool OpenVpnConfigModel::setData(const QModelIndex &index, const QVariant &value
     }
 
     switch (role) {
-    case Roles::SubnetAddressRole:
-        m_protocolConfig.insert(amnezia::config_key::subnet_address, value.toString());
-        break;
+    case Roles::SubnetAddressRole: m_protocolConfig.insert(amnezia::config_key::subnet_address, value.toString()); break;
     case Roles::TransportProtoRole: m_protocolConfig.insert(config_key::transport_proto, value.toString()); break;
     case Roles::PortRole: m_protocolConfig.insert(config_key::port, value.toString()); break;
     case Roles::AutoNegotiateEncryprionRole: m_protocolConfig.insert(config_key::ncp_disable, !value.toBool()); break;
@@ -29,12 +27,8 @@ bool OpenVpnConfigModel::setData(const QModelIndex &index, const QVariant &value
     case Roles::CipherRole: m_protocolConfig.insert(config_key::cipher, value.toString()); break;
     case Roles::TlsAuthRole: m_protocolConfig.insert(config_key::tls_auth, value.toBool()); break;
     case Roles::BlockDnsRole: m_protocolConfig.insert(config_key::block_outside_dns, value.toBool()); break;
-    case Roles::AdditionalClientCommandsRole:
-        m_protocolConfig.insert(config_key::additional_client_config, value.toString());
-        break;
-    case Roles::AdditionalServerCommandsRole:
-        m_protocolConfig.insert(config_key::additional_server_config, value.toString());
-        break;
+    case Roles::AdditionalClientCommandsRole: m_protocolConfig.insert(config_key::additional_client_config, value.toString()); break;
+    case Roles::AdditionalServerCommandsRole: m_protocolConfig.insert(config_key::additional_server_config, value.toString()); break;
     }
 
     emit dataChanged(index, index, QList { role });
@@ -49,26 +43,21 @@ QVariant OpenVpnConfigModel::data(const QModelIndex &index, int role) const
 
     switch (role) {
     case Roles::SubnetAddressRole:
-        return m_protocolConfig.value(amnezia::config_key::subnet_address)
-                .toString(amnezia::protocols::openvpn::defaultSubnetAddress);
+        return m_protocolConfig.value(amnezia::config_key::subnet_address).toString(amnezia::protocols::openvpn::defaultSubnetAddress);
     case Roles::TransportProtoRole:
         return m_protocolConfig.value(config_key::transport_proto).toString(protocols::openvpn::defaultTransportProto);
     case Roles::PortRole: return m_protocolConfig.value(config_key::port).toString(protocols::openvpn::defaultPort);
     case Roles::AutoNegotiateEncryprionRole:
         return !m_protocolConfig.value(config_key::ncp_disable).toBool(protocols::openvpn::defaultNcpDisable);
     case Roles::HashRole: return m_protocolConfig.value(config_key::hash).toString(protocols::openvpn::defaultHash);
-    case Roles::CipherRole:
-        return m_protocolConfig.value(config_key::cipher).toString(protocols::openvpn::defaultCipher);
-    case Roles::TlsAuthRole:
-        return m_protocolConfig.value(config_key::tls_auth).toBool(protocols::openvpn::defaultTlsAuth);
+    case Roles::CipherRole: return m_protocolConfig.value(config_key::cipher).toString(protocols::openvpn::defaultCipher);
+    case Roles::TlsAuthRole: return m_protocolConfig.value(config_key::tls_auth).toBool(protocols::openvpn::defaultTlsAuth);
     case Roles::BlockDnsRole:
         return m_protocolConfig.value(config_key::block_outside_dns).toBool(protocols::openvpn::defaultBlockOutsideDns);
     case Roles::AdditionalClientCommandsRole:
-        return m_protocolConfig.value(config_key::additional_client_config)
-                .toString(protocols::openvpn::defaultAdditionalClientConfig);
+        return m_protocolConfig.value(config_key::additional_client_config).toString(protocols::openvpn::defaultAdditionalClientConfig);
     case Roles::AdditionalServerCommandsRole:
-        return m_protocolConfig.value(config_key::additional_server_config)
-                .toString(protocols::openvpn::defaultAdditionalServerConfig);
+        return m_protocolConfig.value(config_key::additional_server_config).toString(protocols::openvpn::defaultAdditionalServerConfig);
     case Roles::IsPortEditable: return m_container == DockerContainer::OpenVpn ? true : false;
     case Roles::IsTransportProtoEditable: return m_container == DockerContainer::OpenVpn ? true : false;
     case Roles::HasRemoveButton: return m_container == DockerContainer::OpenVpn ? true : false;
@@ -84,14 +73,13 @@ void OpenVpnConfigModel::updateModel(const QJsonObject &config)
     m_fullConfig = config;
     QJsonObject protocolConfig = config.value(config_key::openvpn).toObject();
 
-    m_protocolConfig.insert(config_key::subnet_address,
-                            protocolConfig.value(amnezia::config_key::subnet_address)
-                                    .toString(amnezia::protocols::openvpn::defaultSubnetAddress));
+    m_protocolConfig.insert(
+            config_key::subnet_address,
+            protocolConfig.value(amnezia::config_key::subnet_address).toString(amnezia::protocols::openvpn::defaultSubnetAddress));
 
     QString transportProto;
     if (m_container == DockerContainer::OpenVpn) {
-        transportProto =
-                protocolConfig.value(config_key::transport_proto).toString(protocols::openvpn::defaultTransportProto);
+        transportProto = protocolConfig.value(config_key::transport_proto).toString(protocols::openvpn::defaultTransportProto);
     } else {
         transportProto = "tcp";
     }
@@ -100,23 +88,18 @@ void OpenVpnConfigModel::updateModel(const QJsonObject &config)
 
     m_protocolConfig.insert(config_key::ncp_disable,
                             protocolConfig.value(config_key::ncp_disable).toBool(protocols::openvpn::defaultNcpDisable));
-    m_protocolConfig.insert(config_key::cipher,
-                            protocolConfig.value(config_key::cipher).toString(protocols::openvpn::defaultCipher));
-    m_protocolConfig.insert(config_key::hash,
-                            protocolConfig.value(config_key::hash).toString(protocols::openvpn::defaultHash));
+    m_protocolConfig.insert(config_key::cipher, protocolConfig.value(config_key::cipher).toString(protocols::openvpn::defaultCipher));
+    m_protocolConfig.insert(config_key::hash, protocolConfig.value(config_key::hash).toString(protocols::openvpn::defaultHash));
     m_protocolConfig.insert(config_key::block_outside_dns,
                             protocolConfig.value(config_key::block_outside_dns).toBool(protocols::openvpn::defaultBlockOutsideDns));
-    m_protocolConfig.insert(config_key::port,
-                            protocolConfig.value(config_key::port).toString(protocols::openvpn::defaultPort));
+    m_protocolConfig.insert(config_key::port, protocolConfig.value(config_key::port).toString(protocols::openvpn::defaultPort));
+    m_protocolConfig.insert(config_key::tls_auth, protocolConfig.value(config_key::tls_auth).toBool(protocols::openvpn::defaultTlsAuth));
     m_protocolConfig.insert(
-            config_key::tls_auth,
-            protocolConfig.value(config_key::tls_auth).toBool(protocols::openvpn::defaultTlsAuth));
-    m_protocolConfig.insert(config_key::additional_client_config,
-                            protocolConfig.value(config_key::additional_client_config)
-                                    .toString(protocols::openvpn::defaultAdditionalClientConfig));
-    m_protocolConfig.insert(config_key::additional_server_config,
-                            protocolConfig.value(config_key::additional_server_config)
-                                    .toString(protocols::openvpn::defaultAdditionalServerConfig));
+            config_key::additional_client_config,
+            protocolConfig.value(config_key::additional_client_config).toString(protocols::openvpn::defaultAdditionalClientConfig));
+    m_protocolConfig.insert(
+            config_key::additional_server_config,
+            protocolConfig.value(config_key::additional_server_config).toString(protocols::openvpn::defaultAdditionalServerConfig));
 
     endResetModel();
 }
diff --git a/client/ui/models/protocols/shadowsocksConfigModel.cpp b/client/ui/models/protocols/shadowsocksConfigModel.cpp
index 2fe2d2a9d..769bef20a 100644
--- a/client/ui/models/protocols/shadowsocksConfigModel.cpp
+++ b/client/ui/models/protocols/shadowsocksConfigModel.cpp
@@ -35,8 +35,7 @@ QVariant ShadowSocksConfigModel::data(const QModelIndex &index, int role) const
 
     switch (role) {
     case Roles::PortRole: return m_protocolConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort);
-    case Roles::CipherRole:
-        return m_protocolConfig.value(config_key::cipher).toString(protocols::shadowsocks::defaultCipher);
+    case Roles::CipherRole: return m_protocolConfig.value(config_key::cipher).toString(protocols::shadowsocks::defaultCipher);
     case Roles::IsPortEditableRole: return m_container == DockerContainer::ShadowSocks ? true : false;
     case Roles::IsCipherEditableRole: return m_container == DockerContainer::ShadowSocks ? true : false;
     }
@@ -52,11 +51,11 @@ void ShadowSocksConfigModel::updateModel(const QJsonObject &config)
     m_fullConfig = config;
     QJsonObject protocolConfig = config.value(config_key::shadowsocks).toObject();
 
-    m_protocolConfig.insert(config_key::cipher,
-                            protocolConfig.value(config_key::cipher).toString(protocols::shadowsocks::defaultCipher));
-
-    m_protocolConfig.insert(config_key::port,
-                            protocolConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort));
+    auto defaultTransportProto = ProtocolProps::transportProtoToString(ProtocolProps::defaultTransportProto(Proto::ShadowSocks), Proto::ShadowSocks);
+    m_protocolConfig.insert(config_key::transport_proto,
+                            protocolConfig.value(config_key::transport_proto).toString(defaultTransportProto));
+    m_protocolConfig.insert(config_key::cipher, protocolConfig.value(config_key::cipher).toString(protocols::shadowsocks::defaultCipher));
+    m_protocolConfig.insert(config_key::port, protocolConfig.value(config_key::port).toString(protocols::shadowsocks::defaultPort));
 
     endResetModel();
 }
diff --git a/client/ui/models/protocols/wireguardConfigModel.cpp b/client/ui/models/protocols/wireguardConfigModel.cpp
index 8903f40f6..65bf2bb3c 100644
--- a/client/ui/models/protocols/wireguardConfigModel.cpp
+++ b/client/ui/models/protocols/wireguardConfigModel.cpp
@@ -51,6 +51,9 @@ void WireGuardConfigModel::updateModel(const QJsonObject &config)
     m_fullConfig = config;
     QJsonObject protocolConfig = config.value(config_key::wireguard).toObject();
 
+    auto defaultTransportProto = ProtocolProps::transportProtoToString(ProtocolProps::defaultTransportProto(Proto::WireGuard), Proto::WireGuard);
+    m_protocolConfig.insert(config_key::transport_proto,
+                            protocolConfig.value(config_key::transport_proto).toString(defaultTransportProto));
     m_protocolConfig[config_key::last_config] = protocolConfig.value(config_key::last_config);
     m_protocolConfig[config_key::port] =
         protocolConfig.value(config_key::port).toString(protocols::wireguard::defaultPort);
diff --git a/client/ui/models/protocols/xrayConfigModel.cpp b/client/ui/models/protocols/xrayConfigModel.cpp
index d5b504818..84bbb2f75 100644
--- a/client/ui/models/protocols/xrayConfigModel.cpp
+++ b/client/ui/models/protocols/xrayConfigModel.cpp
@@ -47,8 +47,11 @@ void XrayConfigModel::updateModel(const QJsonObject &config)
     m_fullConfig = config;
     QJsonObject protocolConfig = config.value(config_key::xray).toObject();
 
-    m_protocolConfig.insert(config_key::site,
-                            protocolConfig.value(config_key::site).toString(protocols::xray::defaultSite));
+    auto defaultTransportProto = ProtocolProps::transportProtoToString(ProtocolProps::defaultTransportProto(Proto::Xray), Proto::Xray);
+    m_protocolConfig.insert(config_key::transport_proto,
+                            protocolConfig.value(config_key::transport_proto).toString(defaultTransportProto));
+    m_protocolConfig.insert(config_key::port, protocolConfig.value(config_key::port).toString(protocols::xray::defaultPort));
+    m_protocolConfig.insert(config_key::site, protocolConfig.value(config_key::site).toString(protocols::xray::defaultSite));
 
     endResetModel();
 }