clean-up byte reading code, and simplify

guardianproject · Feb 16, 2022 · b2bed02 · b2bed02
1 parent 4231a8f
commit b2bed02
Showing 1 changed file with 5 additions and 8 deletions.
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
@@ -338,20 +338,18 @@ public void writePacket(byte[] packet) {
                 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());
+                            int pLen = fis.read(buffer);
                             if (pLen > 0)
                             {
-                                buffer.limit(pLen);
-                                byte[] pdata = buffer.array();
-                                Packet packet = null;
+                                byte[] pdata = Arrays.copyOf(buffer, pLen);
+                                Packet packet;
+
                                 try {
                                     packet = (Packet) IpSelector.newPacket(pdata,0,pdata.length);
 
@@ -375,7 +373,6 @@ public void run ()
                                 } catch (IllegalRawDataException e) {
                                     return;
                                 }
-                                buffer.clear();
 
                             }
                         } catch (Exception e) {