Merge branch 'android_pt_transport_source' into feature/ios-openvpn3-

pluggable-transport-Cloak

client/configurators/openvpn_configurator.cpp

@@ -118,6 +118,10 @@ QString OpenVpnConfigurator::processConfigWithLocalSettings(QString jsonConfig)
             config.append("redirect-gateway def1 bypass-dhcp\n");
         }
     }
+    
+    // Prevent ipv6 leak
+    config.append("ifconfig-ipv6 fd15:53b6:dead::2/64  fd15:53b6:dead::1\n");
+    config.append("redirect-gateway ipv6\n");
 
 #if (defined Q_OS_MAC || defined(Q_OS_LINUX)) && !defined(Q_OS_ANDROID)
     config.replace("block-outside-dns", "");

client/configurators/vpn_configurator.h

@@ -30,7 +30,7 @@ public:
     QString &processConfigWithLocalSettings(int serverIndex, DockerContainer container, Proto proto, QString &config);
     QString &processConfigWithExportSettings(int serverIndex, DockerContainer container, Proto proto, QString &config);
 
-    // workaround for containers which is not support normal configaration
+    // workaround for containers which is not support normal configuration
     void updateContainerConfigAfterInstallation(DockerContainer container,
         QJsonObject &containerConfig, const QString &stdOut);
 

client/configurators/wireguard_configurator.cpp

@@ -72,7 +72,7 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
     ErrorCode e = ErrorCode::NoError;
     ServerController serverController(m_settings);
 
-    // Get list of already created clients (only IP addreses)
+    // Get list of already created clients (only IP addresses)
     QString nextIpNumber;
     {
         QString script = QString("cat %1 | grep AllowedIPs").arg(amnezia::protocols::wireguard::serverConfigPath);