Move IP in with the other per-protocol data structures & parsing

Author: pimterry

app/src/main/java/tech/httptoolkit/android/vpn/Packet.java

@@ -17,9 +17,8 @@
 package tech.httptoolkit.android.vpn;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
-import tech.httptoolkit.android.vpn.network.ip.IPv4Header;
+import tech.httptoolkit.android.vpn.transport.ip.IPv4Header;
 import tech.httptoolkit.android.vpn.transport.ITransportHeader;
 import tech.httptoolkit.android.vpn.transport.tcp.TCPHeader;
 import tech.httptoolkit.android.vpn.transport.udp.UDPHeader;

app/src/main/java/tech/httptoolkit/android/vpn/Session.java

@@ -18,7 +18,7 @@
 
 import android.util.Log;
 
-import tech.httptoolkit.android.vpn.network.ip.IPv4Header;
+import tech.httptoolkit.android.vpn.transport.ip.IPv4Header;
 import tech.httptoolkit.android.vpn.socket.ICloseSession;
 import tech.httptoolkit.android.vpn.transport.tcp.TCPHeader;
 import tech.httptoolkit.android.vpn.transport.udp.UDPHeader;

app/src/main/java/tech/httptoolkit/android/vpn/SessionHandler.java

@@ -23,8 +23,8 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import tech.httptoolkit.android.vpn.network.ip.IPPacketFactory;
-import tech.httptoolkit.android.vpn.network.ip.IPv4Header;
+import tech.httptoolkit.android.vpn.transport.ip.IPPacketFactory;
+import tech.httptoolkit.android.vpn.transport.ip.IPv4Header;
 import tech.httptoolkit.android.vpn.socket.SocketNIODataService;
 import tech.httptoolkit.android.vpn.transport.PacketHeaderException;
 import tech.httptoolkit.android.vpn.transport.icmp.ICMPPacket;

app/src/main/java/tech/httptoolkit/android/vpn/socket/SocketChannelReader.java

@@ -5,8 +5,8 @@
 
 import tech.httptoolkit.android.vpn.ClientPacketWriter;
 import tech.httptoolkit.android.vpn.Session;
-import tech.httptoolkit.android.vpn.network.ip.IPPacketFactory;
-import tech.httptoolkit.android.vpn.network.ip.IPv4Header;
+import tech.httptoolkit.android.vpn.transport.ip.IPPacketFactory;
+import tech.httptoolkit.android.vpn.transport.ip.IPv4Header;
 import tech.httptoolkit.android.vpn.transport.PacketHeaderException;
 import tech.httptoolkit.android.vpn.transport.tcp.TCPHeader;
 import tech.httptoolkit.android.vpn.transport.tcp.TCPPacketFactory;

app/src/main/java/tech/httptoolkit/android/vpn/transport/icmp/ICMPPacket.java

@@ -1,7 +1,5 @@
 package tech.httptoolkit.android.vpn.transport.icmp;
 
-import java.nio.ByteBuffer;
-
 import tech.httptoolkit.android.vpn.transport.PacketHeaderException;
 
 public class ICMPPacket {

app/src/main/java/tech/httptoolkit/android/vpn/transport/icmp/ICMPPacketFactory.java

@@ -1,15 +1,12 @@
 package tech.httptoolkit.android.vpn.transport.icmp;
 
-import android.util.Log;
-
 import androidx.annotation.NonNull;
 
 import java.io.ByteArrayOutputStream;
 import java.nio.ByteBuffer;
 
-import tech.httptoolkit.android.TagKt;
-import tech.httptoolkit.android.vpn.network.ip.IPPacketFactory;
-import tech.httptoolkit.android.vpn.network.ip.IPv4Header;
+import tech.httptoolkit.android.vpn.transport.ip.IPPacketFactory;
+import tech.httptoolkit.android.vpn.transport.ip.IPv4Header;
 import tech.httptoolkit.android.vpn.transport.PacketHeaderException;
 
 import static tech.httptoolkit.android.vpn.util.PacketUtil.calculateChecksum;

…roid/vpn/network/ip/IPPacketFactory.java …id/vpn/transport/ip/IPPacketFactory.javaapp/src/main/java/tech/httptoolkit/android/vpn/network/ip/IPPacketFactory.java renamed to app/src/main/java/tech/httptoolkit/android/vpn/transport/ip/IPPacketFactory.java app/src/main/java/tech/httptoolkit/android/vpn/network/ip/IPPacketFactory.java renamed to app/src/main/java/tech/httptoolkit/android/vpn/transport/ip/IPPacketFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
 */
 
-package tech.httptoolkit.android.vpn.network.ip;
+package tech.httptoolkit.android.vpn.transport.ip;
 
 import androidx.annotation.NonNull;
 

…t/android/vpn/network/ip/IPv4Header.java …android/vpn/transport/ip/IPv4Header.javaapp/src/main/java/tech/httptoolkit/android/vpn/network/ip/IPv4Header.java renamed to app/src/main/java/tech/httptoolkit/android/vpn/transport/ip/IPv4Header.java app/src/main/java/tech/httptoolkit/android/vpn/network/ip/IPv4Header.java renamed to app/src/main/java/tech/httptoolkit/android/vpn/transport/ip/IPv4Header.java

@@ -14,9 +14,7 @@
  * limitations under the License.
 */
 
-package tech.httptoolkit.android.vpn.network.ip;
-
-import androidx.annotation.Nullable;
+package tech.httptoolkit.android.vpn.transport.ip;
 
 /**
  * Data structure for IPv4 header as defined in RFC 791.

app/src/main/java/tech/httptoolkit/android/vpn/transport/tcp/TCPPacketFactory.java

@@ -21,8 +21,8 @@
 import android.util.Log;
 
 import tech.httptoolkit.android.vpn.Packet;
-import tech.httptoolkit.android.vpn.network.ip.IPPacketFactory;
-import tech.httptoolkit.android.vpn.network.ip.IPv4Header;
+import tech.httptoolkit.android.vpn.transport.ip.IPPacketFactory;
+import tech.httptoolkit.android.vpn.transport.ip.IPv4Header;
 import tech.httptoolkit.android.vpn.transport.PacketHeaderException;
 import tech.httptoolkit.android.vpn.util.PacketUtil;
 

app/src/main/java/tech/httptoolkit/android/vpn/transport/udp/UDPPacketFactory.java

@@ -2,8 +2,8 @@
 
 import androidx.annotation.NonNull;
 
-import tech.httptoolkit.android.vpn.network.ip.IPPacketFactory;
-import tech.httptoolkit.android.vpn.network.ip.IPv4Header;
+import tech.httptoolkit.android.vpn.transport.ip.IPPacketFactory;
+import tech.httptoolkit.android.vpn.transport.ip.IPv4Header;
 import tech.httptoolkit.android.vpn.transport.PacketHeaderException;
 import tech.httptoolkit.android.vpn.util.PacketUtil;