IT WORKSgit add -pgit add -p

Author: compscidr

app/src/main/java/network/grape/service/GrapeVpnService.java

@@ -157,7 +157,7 @@ public void startTrafficHandler() throws IOException {
     vpnWriterThread = new Thread(vpnWriter);
 
     List<InetAddress> filters = new ArrayList<>();
-    // filters.add(InetAddress.getByName("10.0.0.111"));
+    //filters.add(InetAddress.getByName("10.0.0.111"));
     SessionHandler handler =
         new SessionHandler(sessionManager, new SocketProtector(this), vpnWriter, filters);
 

lib/src/main/java/network/grape/lib/session/Session.java

@@ -111,6 +111,7 @@ public String getKey() {
 
   synchronized int appendOutboundData(ByteBuffer data) {
     final int remaining = data.remaining();
+    logger.info("POS: {} REMAINING: {}", data.position(), data.remaining());
     sendingStream.write(data.array(), data.position(), data.remaining());
     logger.info(
         "Enqueued: " + remaining + " bytes in the outbound queue for " + this + " total size: "

lib/src/main/java/network/grape/lib/session/SessionHandler.java

@@ -260,7 +260,7 @@ protected void handleTcpPacket(ByteBuffer payload, IpHeader ipHeader, TcpHeader
           sendFinAck(ipHeader, tcpHeader, session);
         } else if (session.isAckedToFin() && !tcpHeader.isFin()) {
           // the last ACK from VPN after FIN-ACK flag was set
-          sessionManager.closeSession(session);
+          //sessionManager.closeSession(session);
           logger.info("Got last ACK after FIN, session is now closed");
         }
       }
@@ -565,7 +565,7 @@ protected void ackFinAck(IpHeader ipHeader, TcpHeader tcpHeader, Session session
       vpnWriter.getOutputStream().write(data);
       if (session != null) {
         session.getSelectionKey().cancel();
-        sessionManager.closeSession(session);
+        //sessionManager.closeSession(session);
         logger.info("ACK to client's FIN and close session: " + session.getKey());
       }
     } catch (IOException ex) {

lib/src/main/java/network/grape/lib/util/PacketUtil.java

@@ -1,6 +1,8 @@
 package network.grape.lib.util;
 
 import java.nio.Buffer;
+import java.util.Arrays;
+
 import network.grape.lib.transport.tcp.TcpHeader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -61,6 +63,12 @@ public static int getNetworkInt(byte[] buffer, int start, int length) {
     return value;
   }
 
+  public static byte[] addElementUsingArraysCopyOf(byte[] srcArray, byte elementToAdd) {
+    byte[] destArray = Arrays.copyOf(srcArray, srcArray.length + 1);
+    destArray[destArray.length - 1] = elementToAdd;
+    return destArray;
+  }
+
   /**
    * Computes the checksum of a byte array with a given offset and length.
    *
@@ -70,6 +78,11 @@ public static int getNetworkInt(byte[] buffer, int start, int length) {
    * @return the checksum (short) as two byte array so its easy to copy back into place
    */
   public static byte[] calculateChecksum(byte[] data, int offset, int length) {
+    if (length % 2 != 0) {
+      data = addElementUsingArraysCopyOf(data, (byte) 0);
+    }
+
+
     int start = offset;
     int sum = 0;
     while (start < length) {

lib/src/main/java/network/grape/lib/vpn/SocketDataReaderWorker.java

@@ -7,6 +7,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.UnknownHostException;
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.channels.ClosedByInterruptException;
 import java.nio.channels.DatagramChannel;
@@ -19,6 +20,7 @@
 import network.grape.lib.network.ip.IpHeader;
 import network.grape.lib.session.Session;
 import network.grape.lib.session.SessionManager;
+import network.grape.lib.transport.TransportHeader;
 import network.grape.lib.transport.tcp.TcpHeader;
 import network.grape.lib.transport.udp.UdpHeader;
 import network.grape.lib.transport.udp.UdpPacketFactory;
@@ -66,7 +68,7 @@ public void run() {
     }
 
     if (session.isAbortingConnection()) {
-      abortSession(session);
+      //abortSession(session);
     } else {
       session.setBusyRead(false);
     }
@@ -150,12 +152,13 @@ protected void readTcp(Session session) {
         if (!session.isClientWindowFull()) {
           len = channel.read(buffer);
           if (len > 0) {
+            logger.info("GOT {} bytes from TCP endpoint", len);
             sendToRequester(buffer, len, session);
             buffer.clear();
           } else if (len == -1) {
-            logger.info("End of data from remote server, will send FIN to session: " + sessionKey);
-            sendFin(session);
-            session.setAbortingConnection(true);
+            //logger.info("End of data from remote server, will send FIN to session: " + sessionKey);
+            //sendFin(session);
+            //session.setAbortingConnection(true);
           }
         } else {
           logger.info("client window full, now pause for " + sessionKey);
@@ -198,7 +201,6 @@ private void sendToRequester(ByteBuffer buffer, int dataSize, Session session) {
   private void pushDataToClient(Session session) {
     if (!session.hasReceivedData()) {
       logger.info("No data for VPN");
-      ;
     }
 
     // likely 60 to leave room for TCP and IP headers
@@ -222,8 +224,25 @@ private void pushDataToClient(Session session) {
           session.isHasReceivedLastSegment(), session.getRecSequence(), unAck,
           session.getTimestampSender(), session.getTimestampReplyTo());
 
+      try {
+        ByteBuffer temp = ByteBuffer.allocate(data.length);
+        temp.put(data);
+        temp.rewind();
+        Ip4Header ip4Header = Ip4Header.parseBuffer(temp);
+        TransportHeader transportHeader = TcpHeader.parseBuffer(temp);
+        logger.info("SENDING TO VPN CLIENT: {} {}", ip4Header, transportHeader);
+        //logger.info(BufferUtil.hexDump(data, 0, data.length, true, true));
+      } catch (PacketHeaderException e) {
+        e.printStackTrace();
+        logger.info(BufferUtil.hexDump(data, 0, data.length, true, true));
+      } catch (UnknownHostException e) {
+        e.printStackTrace();
+      }
+
       try {
         outputStream.write(data);
+        outputStream.flush();
+        logger.info("Wrote {} bytes to VPN from {}", data.length, ipHeader.getDestinationAddress());
 //        logger.info("Wrote " + data.length + " to VPN \n "
 //            + BufferUtil.hexDump(data, 0, data.length, true, true));
       } catch (IOException ex) {

lib/src/main/java/network/grape/lib/vpn/SocketDataWriterWorker.java

@@ -47,9 +47,8 @@ public void run() {
     }
     session.setBusyWrite(false);
 
-    // todo: find a way to factor this into common code with the reader
     if (session.isAbortingConnection()) {
-      abortSession(session);
+      //abortSession(session);
     }
   }
 
@@ -63,6 +62,7 @@ protected void writeTcp(Session session) {
 
     try {
       logger.debug("writing TCP data to: " + sessionKey);
+      System.out.println("WRITE TCP TO " + sessionKey + " SIZE: " + data.length);
       channel.write(buffer);
     } catch (NotYetConnectedException ex) {
       logger.error("writing to unconnected socket for key: " + sessionKey + " :" + ex.toString());

lib/src/main/java/network/grape/lib/vpn/SocketWorker.java

@@ -67,6 +67,7 @@ protected void abortSession(Session session) {
       return;
     }
 
-    sessionManager.closeSession(session);
+    //todo figure out if this should be here
+    //sessionManager.closeSession(session);
   }
 }