Remove SocketData traffic recorder

Useful for debugging in ToyShark I guess, but effectively a memory leak
of all traffic by design, yikes.

Author: pimterry

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

@@ -18,13 +18,11 @@
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.util.LinkedList;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 import tech.httptoolkit.android.vpn.network.ip.IPPacketFactory;
 import tech.httptoolkit.android.vpn.network.ip.IPv4Header;
-import tech.httptoolkit.android.vpn.socket.SocketData;
 import tech.httptoolkit.android.vpn.transport.tcp.PacketHeaderException;
 import tech.httptoolkit.android.vpn.transport.tcp.TCPHeader;
 import tech.httptoolkit.android.vpn.transport.tcp.TCPPacketFactory;
@@ -50,15 +48,12 @@ public class SessionHandler {
 
 	private Queue<Session> writableSessionsQueue = new ConcurrentLinkedQueue<>();
 	private IClientPacketWriter writer;
-	private SocketData packetData;
 
 	public static SessionHandler getInstance(){
 		return handler;
 	}
 
-	private SessionHandler(){
-		packetData = SocketData.getInstance();
-	}
+	private SessionHandler() { }
 
 	public Queue<Session> getWritableSessions() {
 		return this.writableSessionsQueue;
@@ -189,7 +184,6 @@ private void handleTCPPacket(ByteBuffer clientPacketData, IPv4Header ipHeader, T
 	public void handlePacket(@NonNull ByteBuffer stream) throws PacketHeaderException {
 		final byte[] rawPacket = new byte[stream.limit()];
 		stream.get(rawPacket, 0, stream.limit());
-		packetData.addData(rawPacket);
 		stream.rewind();
 
 		final IPv4Header ipHeader = IPPacketFactory.createIPv4Header(stream);
@@ -215,7 +209,6 @@ private void sendRstPacket(IPv4Header ip, TCPHeader tcp, int dataLength){
 		byte[] data = TCPPacketFactory.createRstData(ip, tcp, dataLength);
 		try {
 			writer.write(data);
-			packetData.addData(data);
 			Log.d(TAG,"Sent RST Packet to client with dest => " +
 					PacketUtil.intToIPAddress(ip.getDestinationIP()) + ":" +
 					tcp.getDestinationPort());
@@ -228,7 +221,6 @@ private void sendLastAck(IPv4Header ip, TCPHeader tcp){
 		byte[] data = TCPPacketFactory.createResponseAckData(ip, tcp, tcp.getSequenceNumber()+1);
 		try {
 			writer.write(data);
-			packetData.addData(data);
 			Log.d(TAG,"Sent last ACK Packet to client with dest => " +
 					PacketUtil.intToIPAddress(ip.getDestinationIP()) + ":" +
 					tcp.getDestinationPort());
@@ -243,7 +235,6 @@ private void ackFinAck(IPv4Header ip, TCPHeader tcp, Session session){
 		byte[] data = TCPPacketFactory.createFinAckData(ip, tcp, ack, seq, true, true);
 		try {
 			writer.write(data);
-			packetData.addData(data);
 			if(session != null){
 				session.cancelKey();
 				SessionManager.INSTANCE.closeSession(session);
@@ -261,7 +252,6 @@ private void sendFinAck(IPv4Header ip, TCPHeader tcp, Session session){
 		final ByteBuffer stream = ByteBuffer.wrap(data);
 		try {
 			writer.write(data);
-			packetData.addData(data);
 			Log.d(TAG,"00000000000 FIN-ACK packet data to vpn client 000000000000");
 			IPv4Header vpnip = null;
 			try {
@@ -319,7 +309,6 @@ private void sendAck(IPv4Header ipheader, TCPHeader tcpheader, int acceptedDataL
 		byte[] data = TCPPacketFactory.createResponseAckData(ipheader, tcpheader, acknumber);
 		try {
 			writer.write(data);
-			packetData.addData(data);
 		} catch (IOException e) {
 			Log.e(TAG,"Failed to send ACK packet: " + e.getMessage());
 		}
@@ -332,7 +321,6 @@ private void sendAckForDisorder(IPv4Header ipHeader, TCPHeader tcpheader, int ac
 		byte[] data = TCPPacketFactory.createResponseAckData(ipHeader, tcpheader, ackNumber);
 		try {
 			writer.write(data);
-			packetData.addData(data);
 		} catch (IOException e) {
 			Log.e(TAG,"Failed to send ACK packet: " + e.getMessage());
 		}
@@ -406,7 +394,6 @@ private void replySynAck(IPv4Header ip, TCPHeader tcp){
 
 		try {
 			writer.write(packet.getBuffer());
-			packetData.addData(packet.getBuffer());
 			Log.d(TAG,"Send SYN-ACK to client");
 		} catch (IOException e) {
 			Log.e(TAG,"Error sending data to client: "+e.getMessage());

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

@@ -36,10 +36,8 @@ class SocketDataReaderWorker implements Runnable {
 	private final String TAG = TagKt.getTAG(this);
 	private IClientPacketWriter writer;
 	private String sessionKey;
-	private SocketData pData;
 
 	SocketDataReaderWorker(IClientPacketWriter writer, String sessionKey) {
-		pData = SocketData.getInstance();
 		this.writer = writer;
 		this.sessionKey = sessionKey;
 	}
@@ -181,7 +179,6 @@ private void pushDataToClient(@NonNull Session session){
 					session.getTimestampSender(), session.getTimestampReplyto());
 			try {
 				writer.write(data);
-				pData.addData(data);
 			} catch (IOException e) {
 				Log.e(TAG,"Failed to send ACK + Data packet: " + e.getMessage());
 			}
@@ -195,7 +192,6 @@ private void sendFin(Session session){
 				session.getTimestampSender(), session.getTimestampReplyto());
 		try {
 			writer.write(data);
-			pData.addData(data);
 		} catch (IOException e) {
 			Log.e(TAG,"Failed to send FIN packet: " + e.getMessage());
 		}
@@ -224,8 +220,6 @@ private void readUDP(Session session){
 							session.getLastIpHeader(), session.getLastUdpHeader(), data);
 					//write to client
 					writer.write(packetData);
-					//publish to packet subscriber
-					pData.addData(packetData);
 					Log.d(TAG,"SDR: sent " + len + " bytes to UDP client, packetData.length: "
 							+ packetData.length);
 					buffer.clear();

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

@@ -114,8 +114,6 @@ private void writeTCP(Session session) {
 					session.getLastIpHeader(), session.getLastTcpHeader(), 0);
 			try {
 				writer.write(rstData);
-				SocketData socketData = SocketData.getInstance();
-				socketData.addData(rstData);
 			} catch (IOException ex) {
 				ex.printStackTrace();
 			}