[tor-commits] [orbot/master] Closes #554, IPtProxy 1.3.0 added

[n8fr8@xxxxxxxxxxxxxx]

commit c984dcc5254eda6a55e91a6d5bfe74023fb60978
Author: b <dsnake@xxxxxxxxxxxxxx>
Date:   Tue Dec 14 18:29:43 2021 -0500

    Closes #554, IPtProxy 1.3.0 added
---
 dependencies.gradle                                                | 2 +-
 .../src/main/java/org/torproject/android/service/OrbotService.java | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 555c4977..c9b4f783 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -20,7 +20,7 @@ ext {
             guardian_geoip               : "20191217",
             guardian_jsocks              : "1.0.4",
             guardian_jtorctl             : "0.4.5.7",
-            ipt_proxy                    : "1.2.0",
+            ipt_proxy                    : "1.3.0",
             portmapper                   : "2.0.5",
             tor_android                  : "0.4.6.7"
     ]
diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
index 1b15e0da..495e2739 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -354,10 +354,10 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
         String target = getCdnFront("snowflake-target");
         String front = getCdnFront("snowflake-front");
         String stunServer = getCdnFront("snowflake-stun");
+        String ampCache = "https://cdn.ampproject.org/";;
 
-        IPtProxy.startSnowflake(stunServer, target, front,
+        IPtProxy.startSnowflake(stunServer, target, front, ampCache,
                  null, true, false, true, 1);
-
     }
 
     /*
@@ -368,10 +368,11 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
         String broker = "https://snowflake-broker.bamsoftware.com/";;
         String relay = "wss://snowflake.bamsoftware.com/";
         String stun = "stun:stun.stunprotocol.org:3478";
+        String natProbe = null;
         String logFile = null;
         boolean keepLocalAddresses = true;
         boolean unsafeLogging = false;
-        IPtProxy.startSnowflakeProxy(capacity, broker, relay, stun, logFile, keepLocalAddresses, unsafeLogging);
+        IPtProxy.startSnowflakeProxy(capacity, broker, relay, stun, natProbe, logFile, keepLocalAddresses, unsafeLogging, null);
 
         logNotice("Snowflake Proxy mode ENABLED");
     }



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits