From d652ecff21356f5f453e33e9c4f6f60592dbb7cb Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <astanaar1@gmail.com>
Date: Sun, 29 Jan 2023 08:39:31 +0300
Subject: [PATCH] For the openvpn-cloak container, the choice of the transport
 protocol in the openvpn settings is blocked

---
 client/server_scripts/openvpn_cloak/Dockerfile |  1 -
 .../openvpn_cloak/configure_container.sh       |  4 ++--
 .../ui/pages_logic/protocols/OpenVpnLogic.cpp  | 18 +++++++++---------
 client/ui/qml/Pages/PageNewServerProtocols.qml |  2 +-
 client/ui/qml/Pages/PageServerContainers.qml   |  1 -
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/client/server_scripts/openvpn_cloak/Dockerfile b/client/server_scripts/openvpn_cloak/Dockerfile
index b3a6810d5..3cb14e828 100644
--- a/client/server_scripts/openvpn_cloak/Dockerfile
+++ b/client/server_scripts/openvpn_cloak/Dockerfile
@@ -1,5 +1,4 @@
 FROM alpine:3.15
-
 LABEL maintainer="AmneziaVPN"
 
 ARG SS_RELEASE="v1.13.1"
diff --git a/client/server_scripts/openvpn_cloak/configure_container.sh b/client/server_scripts/openvpn_cloak/configure_container.sh
index 26b514a4b..5e2deb452 100644
--- a/client/server_scripts/openvpn_cloak/configure_container.sh
+++ b/client/server_scripts/openvpn_cloak/configure_container.sh
@@ -1,6 +1,6 @@
 cat > /opt/amnezia/openvpn/server.conf <<EOF
 port $OPENVPN_PORT
-proto $OPENVPN_TRANSPORT_PROTO
+proto tcp
 dev tun
 ca /opt/amnezia/openvpn/ca.crt
 cert /opt/amnezia/openvpn/AmneziaReq.crt
@@ -39,7 +39,7 @@ cat > /opt/amnezia/cloak/ck-config.json <<EOF
 {
   "ProxyBook": {
      "openvpn": [
-     "$OPENVPN_TRANSPORT_PROTO",
+     "tcp",
      "localhost:$OPENVPN_PORT"
     ],
      "shadowsocks": [
diff --git a/client/ui/pages_logic/protocols/OpenVpnLogic.cpp b/client/ui/pages_logic/protocols/OpenVpnLogic.cpp
index d069bf877..7ed71962d 100644
--- a/client/ui/pages_logic/protocols/OpenVpnLogic.cpp
+++ b/client/ui/pages_logic/protocols/OpenVpnLogic.cpp
@@ -51,9 +51,15 @@ void OpenVpnLogic::updateProtocolPage(const QJsonObject &openvpnConfig, DockerCo
     set_lineEditSubnetText(openvpnConfig.value(config_key::subnet_address).
                                       toString(protocols::openvpn::defaultSubnetAddress));
 
-    QString trasnsport = openvpnConfig.value(config_key::transport_proto).
-            toString(protocols::openvpn::defaultTransportProto);
-
+    QString trasnsport;
+    if (container == DockerContainer::ShadowSocks || container == DockerContainer::Cloak) {
+        trasnsport = "tcp";
+        set_radioButtonUdpEnabled(false);
+        set_radioButtonTcpEnabled(false);
+    } else {
+        trasnsport = openvpnConfig.value(config_key::transport_proto).
+                toString(protocols::openvpn::defaultTransportProto);
+    }
     set_radioButtonUdpChecked(trasnsport == protocols::openvpn::defaultTransportProto);
     set_radioButtonTcpChecked(trasnsport != protocols::openvpn::defaultTransportProto);
 
@@ -80,12 +86,6 @@ void OpenVpnLogic::updateProtocolPage(const QJsonObject &openvpnConfig, DockerCo
             toString(protocols::openvpn::defaultAdditionalServerConfig);
     set_textAreaAdditionalServerConfig(additionalServerConfig);
 
-    if (container == DockerContainer::ShadowSocks) {
-        set_radioButtonUdpEnabled(false);
-        set_radioButtonTcpEnabled(false);
-        set_radioButtonTcpChecked(true);
-    }
-
     set_lineEditPortText(openvpnConfig.value(config_key::port).
                                     toString(protocols::openvpn::defaultPort));
 
diff --git a/client/ui/qml/Pages/PageNewServerProtocols.qml b/client/ui/qml/Pages/PageNewServerProtocols.qml
index aa7c3c234..0ce2090f1 100644
--- a/client/ui/qml/Pages/PageNewServerProtocols.qml
+++ b/client/ui/qml/Pages/PageNewServerProtocols.qml
@@ -63,7 +63,7 @@ PageBase {
             pageLoader.focus = true
         }
 
-        onContainerSelected: {
+        onContainerSelected: function(c_index){
             var containerProto =  ContainerProps.defaultProtocol(c_index)
 
             tf_port_num.text = ProtocolProps.defaultPort(containerProto)
diff --git a/client/ui/qml/Pages/PageServerContainers.qml b/client/ui/qml/Pages/PageServerContainers.qml
index 4b8383e66..782397c17 100644
--- a/client/ui/qml/Pages/PageServerContainers.qml
+++ b/client/ui/qml/Pages/PageServerContainers.qml
@@ -55,7 +55,6 @@ PageBase {
                 tf_port_num.text = qsTr("Default")
             }
             else tf_port_num.text = ProtocolProps.defaultPort(containerProto)
-
             cb_port_proto.currentIndex = ProtocolProps.defaultTransportProto(containerProto)
 
             tf_port_num.enabled = ProtocolProps.defaultPortChangeable(containerProto)