Merge branch 'update_obfsvpn' into 'master'

Update obfsvpn

See merge request leap/bitmask_android!243

1 files changed, 19 insertions, 7 deletions

diff --git a/app/src/main/java/de/blinkt/openvpn/core/connection/Obfs4Connection.java b/app/src/main/java/de/blinkt/openvpn/core/connection/Obfs4Connection.java
index c77c23fd..d152031a 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/connection/Obfs4Connection.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/connection/Obfs4Connection.java
@@ -4,6 +4,7 @@ import static se.leap.bitmaskclient.base.utils.ConfigHelper.ObfsVpnHelper.useObf
 import static se.leap.bitmaskclient.pluggableTransports.ShapeshifterClient.DISPATCHER_IP;
 import static se.leap.bitmaskclient.pluggableTransports.ShapeshifterClient.DISPATCHER_PORT;
 
+import se.leap.bitmaskclient.pluggableTransports.HoppingObfsVpnClient;
 import se.leap.bitmaskclient.pluggableTransports.Obfs4Options;
 import se.leap.bitmaskclient.pluggableTransports.ObfsVpnClient;
 
@@ -19,21 +20,32 @@ public class Obfs4Connection extends Connection {
 
     public Obfs4Connection(Obfs4Options options) {
         if (useObfsVpn()) {
-            setServerName(options.remoteIP);
-            setServerPort(options.remotePort);
+            setServerName(options.gatewayIP);
+            setServerPort(options.transport.getPorts()[0]);
             setProxyName(ObfsVpnClient.SOCKS_IP);
-            setProxyPort(String.valueOf(ObfsVpnClient.SOCKS_PORT.get()));
             setProxyType(ProxyType.SOCKS5);
+            switch (options.transport.getTransportType()) {
+                case OBFS4:
+                    setUseUdp(false);
+                    setProxyPort(String.valueOf(ObfsVpnClient.SOCKS_PORT.get()));
+                    break;
+                case OBFS4_HOP:
+                    setUseUdp(true);
+                    setProxyPort(String.valueOf(HoppingObfsVpnClient.PORT));
+                    break;
+                default:break;
+            }
         } else {
             setServerName(DISPATCHER_IP);
             setServerPort(DISPATCHER_PORT);
             setProxyName("");
             setProxyPort("");
             setProxyType(ProxyType.NONE);
+
+            // while udp/kcp might be used on the wire,
+            // we don't use udp for openvpn in case of a obfs4 connection
+            setUseUdp(false);
         }
-        // while udp/kcp might be used on the wire,
-        // we don't use udp for openvpn in case of a obfs4 connection
-        setUseUdp(false);
         setProxyAuthUser(null);
         setProxyAuthPassword(null);
         setUseProxyAuth(false);
@@ -53,7 +65,7 @@ public class Obfs4Connection extends Connection {
     }
 
 
-    public Obfs4Options getDispatcherOptions() {
+    public Obfs4Options getObfs4Options() {
         return options;
     }