Merge branch 'master' of https://github.com/guardianproject/orbot

guardianproject · Feb 16, 2022 · 5142d0e · 5142d0e
2 parents e79b3b3 + 2b5760d
commit 5142d0e
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 15 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,22 @@
 
+/** 16.6.0-RC-1-tor.0.4.6.9 16 Feb 2022 **/
+
+- update to use @bim https://github.com/bitmold/OrbotIPtProxy clean new IPtProxy + Go-tun2socks library
+- fix small issues for Android 12
+- clean-up Locale, byte reading, and a few other small bits and pieces
+
+b2bed029 (origin/master, origin/HEAD) clean-up byte reading code, and simplify
+4231a8f3 (newport/master) ensure we specify Locale to use
+9507e70c ensure threads are cleaned up, handle "UnknownPacket" types - this may help resolve onBoot issues with VPN
+79aee400 identify foreground service type for Android 12
+56e48419 Translated using Weblate (German)
+978a5d20 remove unused IPtProxy.aar local file
+5fda2139 (origin/OrbotIPtProxy, OrbotIPtProxy) Update BUILD.md
+884aa982 remove local AARs, use new jitpack OrbotIPtProxy
+33e8f3cd Add multidex support
+ca799988 Fix resolving IPtProxy for app-mini and appcore
+
+
 /** 16.6.0-BETA-1 (tor 0.4.6.9) 11 Feb 2022 **/
 
 MAJOR overhaul of VPN/tun traffic handling

diff --git a/app/build.gradle b/app/build.gradle
@@ -45,7 +45,7 @@ android {
             minSdkVersion 16
             applicationId 'org.torproject.android'
             targetSdkVersion 31
-            versionCode 1660200100
+            versionCode 1660300100
 
             versionName getVersionName()
             archivesBaseName = "Orbot-$versionName"

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -23,7 +23,10 @@ ext {
             guardian_jtorctl             : "0.4.5.7",
             ipt_proxy                    : "1.0.0",
             portmapper                   : "2.0.5",
-            tor_android                  : "0.4.6.9"
+            tor_android                  : "0.4.6.9",
+            dns_java                     : "3.4.3",
+            pcap_core                    : "1.8.2",
+            pcap_factory                 : "1.8.2"
     ]
 
     libs = [
@@ -52,6 +55,8 @@ ext {
             ipt_proxy                      : "com.github.bitmold:OrbotIPtProxy:$versions.ipt_proxy",
             portmapper                     : "com.offbynull.portmapper:portmapper:$versions.portmapper",
             tor_android                    : "info.guardianproject:tor-android:$versions.tor_android",
-            dns_java                       : "dnsjava:dnsjava:3.4.3"
+            dns_java                       : "dnsjava:dnsjava:$versions.dns_java",
+            pcap_core                      : "org.pcap4j:pcap4j-core:$versions.pcap_core",
+            pcap_factory                   : "org.pcap4j:pcap4j-packetfactory-static:$versions.pcap_factory"
     ]
 }
diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle
@@ -51,7 +51,7 @@ dependencies {
             libs.portmapper,
             libs.tor_android,
             libs.dns_java,
-            "org.pcap4j:pcap4j-core:1.8.2",
-            "org.pcap4j:pcap4j-packetfactory-static:1.8.2"
+            libs.pcap_core,
+            libs.pcap_factory
     )
 }
diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java
@@ -49,8 +49,8 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.InetAddress;
-import java.nio.ByteBuffer;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -311,19 +311,15 @@ private synchronized void setupTun2Socks(final VpnService.Builder builder) {
             mThreadPacket = new Thread() {
                 public void run () {
 
-                    // Allocate the buffer for a single packet.
-                    ByteBuffer buffer = ByteBuffer.allocate(32767);
-
+                    byte[] buffer = new byte[32767*2]; //64k
                     keepRunningPacket = true;
                     while (keepRunningPacket)
                     {
                         try {
 
-                            int pLen = fis.read(buffer.array());
-                            if (pLen > 0)
-                            {
-                                buffer.limit(pLen);
-                                byte[] pdata = buffer.array();
+                            int pLen = fis.read(buffer);
+                            if (pLen > 0) {
+                                byte[] pdata = Arrays.copyOf(buffer, pLen);
                                 Packet packet;
                                 try {
                                     packet = (Packet) IpSelector.newPacket(pdata,0,pdata.length);
@@ -339,7 +335,6 @@ public void run () {
                                 } catch (IllegalRawDataException e) {
                                     return;
                                 }
-                                buffer.clear();
 
                             }
                         } catch (Exception e) {