Reduce unnecessary repetitive logging

This was sort of useful when debugging low-level session handling,
but it's incredibly noisy with real traffic, to the point that it
affects performance on device substantially when during dev &
testing. Better to focus logging on the major events: conn setup,
teardown & errors.

Author: pimterry

app/src/main/java/tech/httptoolkit/android/ProxyVpnService.kt

@@ -192,6 +192,8 @@ class ProxyVpnService : VpnService(), IProtectSocket {
     }
 
     private fun stopVpn() {
+        Log.i(TAG, "VPN stopping..")
+
         if (vpnRunnable != null) {
             app!!.trackEvent("VPN", "vpn-stopped")
             app!!.resumeEvents()

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

@@ -51,7 +51,6 @@ public ClientPacketWriter(FileOutputStream clientWriter) {
 
 	public void write(byte[] data) {
 		if (data.length > 30000) throw new Error("Packet too large");
-		Log.i(TAG, "Putting " + data.length + " bytes on the write queue");
 		packetQueue.addLast(data);
 	}
 

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

@@ -115,11 +115,9 @@ private void handleUDPPacket(ByteBuffer clientPacketData, IPv4Header ipHeader) t
 			int len = manager.addClientData(clientPacketData, session);
 			session.setDataForSendingReady(true);
 
-			Log.i(TAG, "Subscribe UDP to OP_WRITE");
 			// Ping the NIO thread to write this, when the session is next writable
 			session.subscribeKey(SelectionKey.OP_WRITE);
 			nioService.refreshSelect(session);
-			Log.d(TAG,"added UDP data for bg worker to send: "+len);
 		}
 
 		manager.keepSessionAlive(session);
@@ -140,7 +138,7 @@ private void handleTCPPacket(ByteBuffer clientPacketData, IPv4Header ipHeader) t
 			String key = Session.getSessionKey(destinationIP, destinationPort, sourceIP, sourcePort);
 			Session session = manager.getSessionByKey(key);
 
-			if(session == null) {
+			if (session == null) {
 				Log.w(TAG, "Ack for unknown session: " + key);
 				if (tcpheader.isFIN()) {
 					sendLastAck(ipHeader, tcpheader);
@@ -286,9 +284,6 @@ private void pushDataToDestination(Session session, TCPHeader tcp){
 		// Ping the NIO thread to write this, when the session is next writable
 		session.subscribeKey(SelectionKey.OP_WRITE);
 		nioService.refreshSelect(session);
-
-		Log.d(TAG,"set data ready for sending to dest, bg will do it. data size: "
-                + session.getSendingDataSize());
 	}
 
 	/**
@@ -300,7 +295,6 @@ private void pushDataToDestination(Session session, TCPHeader tcp){
 	 */
 	private void sendAck(IPv4Header ipheader, TCPHeader tcpheader, int acceptedDataLength, Session session){
 		long acknumber = session.getRecSequence() + acceptedDataLength;
-		Log.d(TAG,"sent ack, ack# "+session.getRecSequence()+" + "+acceptedDataLength+" = "+acknumber);
 		session.setRecSequence(acknumber);
 		byte[] data = TCPPacketFactory.createResponseAckData(ipheader, tcpheader, acknumber);
 

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

@@ -45,8 +45,6 @@ public SocketChannelReader(ClientPacketWriter writer) {
 	public void read(Session session) {
 		AbstractSelectableChannel channel = session.getChannel();
 
-		Log.d(TAG, "Reading from session " + session);
-
 		if(channel instanceof SocketChannel) {
 			readTCP(session);
 		} else if(channel instanceof DatagramChannel){
@@ -58,7 +56,7 @@ public void read(Session session) {
 		// Resubscribe to reads, so that we're triggered again if more data arrives later.
 		session.subscribeKey(SelectionKey.OP_READ);
 
-		if(session.isAbortingConnection()) {
+		if (session.isAbortingConnection()) {
 			Log.d(TAG,"removing aborted connection -> "+ session);
 			session.cancelKey();
 			if (channel instanceof SocketChannel){
@@ -85,7 +83,7 @@ public void read(Session session) {
 	}
 
 	private void readTCP(@NonNull Session session) {
-		if(session.isAbortingConnection()){
+		if (session.isAbortingConnection()) {
 			return;
 		}
 
@@ -191,16 +189,15 @@ private void readUDP(Session session){
 
 		try {
 			do{
-				if(session.isAbortingConnection()){
+				if (session.isAbortingConnection()) {
 					break;
 				}
+
 				len = channel.read(buffer);
-				if(len > 0){
-					Date date = new Date();
-					long responseTime = date.getTime() - session.connectionStartTime;
-					
+				if (len > 0) {
 					buffer.limit(len);
 					buffer.flip();
+
 					//create UDP packet
 					byte[] data = new byte[len];
 					System.arraycopy(buffer.array(),0, data, 0, len);
@@ -213,25 +210,11 @@ private void readUDP(Session session){
 					Log.d(TAG,"SDR: sent " + len + " bytes to UDP client, packetData.length: "
 							+ packetData.length);
 					buffer.clear();
-					
-					try {
-						final ByteBuffer stream = ByteBuffer.wrap(packetData);
-						IPv4Header ip = IPPacketFactory.createIPv4Header(stream);
-						UDPHeader udp = UDPPacketFactory.createUDPHeader(stream);
-						String str = PacketUtil.getUDPoutput(ip, udp);
-						Log.d(TAG,"++++++ SD: packet sending to client ++++++++");
-						Log.d(TAG,"got response time: " + responseTime);
-						Log.d(TAG,str);
-						Log.d(TAG,"++++++ SD: end sending packet to client ++++");
-					} catch (PacketHeaderException e) {
-						e.printStackTrace();
-					}
 				}
 			} while(len > 0);
 		}catch(NotYetConnectedException ex){
 			Log.e(TAG,"failed to read from unconnected UDP socket");
 		} catch (IOException e) {
-			e.printStackTrace();
 			Log.e(TAG,"Failed to read from UDP socket, aborting connection");
 			session.setAbortingConnection(true);
 		}

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

@@ -47,7 +47,7 @@ public void write(@NonNull Session session) {
 			throw new IllegalArgumentException("Unexpected channel type: " + channel);
 		}
 
-		if(session.isAbortingConnection()){
+		if (session.isAbortingConnection()) {
 			Log.d(TAG,"removing aborted connection -> " + session);
 			session.cancelKey();
 
@@ -76,11 +76,7 @@ public void write(@NonNull Session session) {
 	}
 
 	private void writeUDP(Session session) {
-		String name = PacketUtil.intToIPAddress(session.getDestIp())+":"+session.getDestPort()+
-				"-"+PacketUtil.intToIPAddress(session.getSourceIp())+":"+session.getSourcePort();
-
 		try {
-			Log.d(TAG,"writing data to remote UDP: "+name);
 			writePendingData(session);
 			Date dt = new Date();
 			session.connectionStartTime = dt.getTime();
@@ -95,11 +91,7 @@ private void writeUDP(Session session) {
 	}
 
 	private void writeTCP(Session session) {
-		String name = PacketUtil.intToIPAddress(session.getDestIp())+":"+session.getDestPort()+
-				"-"+PacketUtil.intToIPAddress(session.getSourceIp())+":"+session.getSourcePort();
-
 		try {
-			Log.d(TAG,"writing TCP data to: " + name);
 			writePendingData(session);
 		} catch (NotYetConnectedException ex) {
 			Log.e(TAG,"failed to write to unconnected socket: " + ex.getMessage());
@@ -127,8 +119,6 @@ private void writePendingData(Session session) throws IOException {
 		buffer.put(data);
 		buffer.flip();
 
-		Log.d(TAG, "Write " + buffer.remaining() + " bytes from " + session + " to " + channel);
-
 		while (buffer.hasRemaining()) {
 			int bytesWritten = channel instanceof SocketChannel
 				? ((SocketChannel) channel).write(buffer)

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

@@ -1,6 +1,5 @@
 package tech.httptoolkit.android.vpn.socket;
 
-import android.annotation.SuppressLint;
 import android.util.Log;
 
 import tech.httptoolkit.android.vpn.ClientPacketWriter;
@@ -20,13 +19,8 @@
 import java.nio.channels.UnsupportedAddressTypeException;
 import java.nio.channels.spi.AbstractSelectableChannel;
 import java.util.Iterator;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
-import java.util.function.Consumer;
 
 import tech.httptoolkit.android.TagKt;