Merge remote-tracking branch 'origin/master' into windowsDev

src/main/protocol/HPacket.java

@@ -235,6 +235,9 @@ public class HPacket implements StringifyAble {
     public void setReadIndex(int number)	{
         readIndex = number;
     }
+    public void resetReadIndex() {
+        setReadIndex(6);
+    }
 
     public boolean isCorrupted()	{
 

src/main/protocol/memory/Rc4Obtainer.java

@@ -58,9 +58,25 @@ public class Rc4Obtainer {
 
             if (DEBUG) System.out.println("[+] send encrypted");
 
-            List<byte[]> results = client.getRC4possibilities();
-            outerloop:
-            for (byte[] possible : results) {
+            List<byte[]> cached = client.getRC4cached();
+            boolean worked = onSendFirstEncryptedMessage(handler, cached);
+
+            if (!worked) {
+                worked = onSendFirstEncryptedMessage(handler, client.getRC4possibilities());
+                if (!worked) {
+                    System.err.println("COULD NOT FIND RC4 TABLE");
+                }
+            }
+
+
+
+            incomingHandler.unblock();
+            outgoingHandler.unblock();
+        }).start();
+    }
+
+    private boolean onSendFirstEncryptedMessage(Handler handler, List<byte[]> potentialRC4tables) {
+        for (byte[] possible : potentialRC4tables) {
 
             byte[] encBuffer = new byte[handler.getEncryptedBuffer().size()];
             for (int i = 0; i < encBuffer.length; i++) {
@@ -84,11 +100,10 @@ public class Rc4Obtainer {
 
                             if (payloadBuffer.peak().length == 0) {
                                 handler.setRc4(rc4Tryout);
-                                    break outerloop;
+                                return true;
                             }
 
-                            }
-                            catch (Exception e) {
+                        } catch (Exception e) {
 //                                e.printStackTrace();
                         }
 
@@ -96,13 +111,7 @@ public class Rc4Obtainer {
 
                 }
             }
-                
-
         }
-            
-
-            incomingHandler.unblock();
-            outgoingHandler.unblock();
-        }).start();
+        return false;
     }
 }

src/main/protocol/memory/habboclient/HabboClient.java

@@ -15,5 +15,8 @@ public abstract class HabboClient {
         this.hConnection = connection;
     }
 
+    // optional
+    public abstract List<byte[]> getRC4cached();
+
     public abstract List<byte[]> getRC4possibilities();
 }

src/main/protocol/memory/habboclient/linux/LinuxHabboClient.java

@@ -48,6 +48,11 @@ public class LinuxHabboClient extends HabboClient {
         if (DEBUG) System.out.println("* Found flashclient process: " + PID);
     }
 
+    @Override
+    public List<byte[]> getRC4cached() {
+        return new ArrayList<>();
+    }
+
 
     private void refreshMemoryMaps() {
         String filename = "/proc/"+this.PID+"/maps";

src/main/protocol/memory/habboclient/windows/WindowsHabboClient.java

@@ -36,6 +36,11 @@ public class WindowsHabboClient extends HabboClient {
         return possibleData;
     }
 
+    @Override
+    public List<byte[]> getRC4cached() {
+        return new ArrayList<>();
+    }
+
     @Override
     public List<byte[]> getRC4possibilities() {
         List<byte[]> result = new ArrayList<>();

src/main/protocol/packethandler/Handler.java

@@ -106,9 +106,11 @@ public abstract class Handler {
     void notifyListeners(HMessage message) {
         for (int x = 0; x < 3; x++) {
             for (int i = ((List<TrafficListener>)listeners[x]).size() - 1; i >= 0; i--) {
+                message.getPacket().resetReadIndex();
                 ((List<TrafficListener>)listeners[x]).get(i).onCapture(message);
             }
         }
+        message.getPacket().resetReadIndex();
     }
 
     public void sendToStream(byte[] buffer) {