Skip to content

Commit 8e7cce4

Browse files
pimterrypimterry
committed
Move all VPN code into the tech.httptoolkit.android namespace
This also updates some related tagging logic, so all logging is now clearly prefixed with our namespace.
1 parent 726d972 commit 8e7cce4

28 files changed

+132
-99
lines changed

‎app/src/main/java/tech/httptoolkit/android/ProxySetup.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import java.security.cert.CertificateFactory
2626
import java.security.cert.X509Certificate
2727
import java.util.concurrent.TimeUnit
2828

29-
private const val TAG = "ProxySetup"
29+
private val TAG = formatTag("tech.httptoolkit.android.ProxySetup")
3030

3131
// Takes an android.httptoolkit.tech/connect URI, extracts & parses the connection config
3232
// within, into a format ready for testing and then usage.

‎app/src/main/java/tech/httptoolkit/android/ProxyVpnRunnable.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package tech.httptoolkit.android
33
import android.os.ParcelFileDescriptor
44
import android.util.Log
55
import android.util.SparseArray
6-
import com.lipisoft.toyshark.ClientPacketWriterImpl
7-
import com.lipisoft.toyshark.SessionHandler
8-
import com.lipisoft.toyshark.SessionManager
9-
import com.lipisoft.toyshark.socket.SocketNIODataService
10-
import com.lipisoft.toyshark.transport.tcp.PacketHeaderException
6+
import tech.httptoolkit.android.vpn.ClientPacketWriterImpl
7+
import tech.httptoolkit.android.vpn.SessionHandler
8+
import tech.httptoolkit.android.vpn.SessionManager
9+
import tech.httptoolkit.android.vpn.socket.SocketNIODataService
10+
import tech.httptoolkit.android.vpn.transport.tcp.PacketHeaderException
1111
import io.sentry.Sentry
1212
import java.io.FileInputStream
1313
import java.io.FileOutputStream

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import android.os.ParcelFileDescriptor
1010
import android.util.Log
1111
import androidx.core.app.NotificationCompat
1212
import androidx.localbroadcastmanager.content.LocalBroadcastManager
13-
import com.lipisoft.toyshark.socket.IProtectSocket
14-
import com.lipisoft.toyshark.socket.SocketProtector
13+
import tech.httptoolkit.android.vpn.socket.IProtectSocket
14+
import tech.httptoolkit.android.vpn.socket.SocketProtector
1515
import io.sentry.Sentry
1616
import java.io.*
1717

‎app/src/main/java/tech/httptoolkit/android/Tag.kt‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
11
package tech.httptoolkit.android
22

3+
import android.os.Build
4+
5+
fun formatTag(tag: String): String {
6+
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
7+
tag
8+
} else {
9+
tag.substring(0, 23) // Before API 24 there's a 23 char length limit
10+
}
11+
}
12+
313
val Any.TAG: String
414
get() {
5-
return javaClass.name
15+
val name = if (javaClass.name.startsWith("tech.httptoolkit.android")) {
16+
javaClass.name
17+
} else {
18+
// In some cases (e.g. coroutines) our code runs in the context of
19+
// other classes - make sure we prefix it for findability regardless.
20+
"tech.httptoolkit.android ($javaClass.name)"
21+
}
22+
23+
return formatTag(name)
624
}

‎app/src/main/java/com/lipisoft/toyshark/ClientPacketWriterImpl.java‎ renamed to ‎app/src/main/java/tech/httptoolkit/android/vpn/ClientPacketWriterImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.lipisoft.toyshark;
17+
package tech.httptoolkit.android.vpn;
1818

1919
import java.io.FileOutputStream;
2020
import java.io.IOException;

‎app/src/main/java/com/lipisoft/toyshark/IClientPacketWriter.java‎ renamed to ‎app/src/main/java/tech/httptoolkit/android/vpn/IClientPacketWriter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.lipisoft.toyshark;
16+
package tech.httptoolkit.android.vpn;
1717

1818
import java.io.IOException;
1919

‎app/src/main/java/com/lipisoft/toyshark/Packet.java‎ renamed to ‎app/src/main/java/tech/httptoolkit/android/vpn/Packet.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.lipisoft.toyshark;
17+
package tech.httptoolkit.android.vpn;
1818

1919
import androidx.annotation.NonNull;
2020
import androidx.annotation.Nullable;
2121

22-
import com.lipisoft.toyshark.network.ip.IPv4Header;
23-
import com.lipisoft.toyshark.transport.ITransportHeader;
24-
import com.lipisoft.toyshark.transport.tcp.TCPHeader;
25-
import com.lipisoft.toyshark.transport.udp.UDPHeader;
22+
import tech.httptoolkit.android.vpn.network.ip.IPv4Header;
23+
import tech.httptoolkit.android.vpn.transport.ITransportHeader;
24+
import tech.httptoolkit.android.vpn.transport.tcp.TCPHeader;
25+
import tech.httptoolkit.android.vpn.transport.udp.UDPHeader;
2626

2727
/**
2828
* Data structure that encapsulate both IPv4Header and TCPHeader

‎app/src/main/java/com/lipisoft/toyshark/README.md‎ renamed to ‎app/src/main/java/tech/httptoolkit/android/vpn/README.md‎

File renamed without changes.

‎app/src/main/java/com/lipisoft/toyshark/Session.java‎ renamed to ‎app/src/main/java/tech/httptoolkit/android/vpn/Session.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.lipisoft.toyshark;
17+
package tech.httptoolkit.android.vpn;
1818

1919
import android.util.Log;
2020

21-
import com.lipisoft.toyshark.network.ip.IPv4Header;
22-
import com.lipisoft.toyshark.transport.tcp.TCPHeader;
23-
import com.lipisoft.toyshark.transport.udp.UDPHeader;
24-
import com.lipisoft.toyshark.util.PacketUtil;
21+
import tech.httptoolkit.android.vpn.network.ip.IPv4Header;
22+
import tech.httptoolkit.android.vpn.transport.tcp.TCPHeader;
23+
import tech.httptoolkit.android.vpn.transport.udp.UDPHeader;
24+
import tech.httptoolkit.android.vpn.util.PacketUtil;
2525

2626
import java.io.ByteArrayOutputStream;
2727
import java.io.IOException;

‎app/src/main/java/com/lipisoft/toyshark/SessionHandler.java‎ renamed to ‎app/src/main/java/tech/httptoolkit/android/vpn/SessionHandler.java‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,35 +14,37 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.lipisoft.toyshark;
17+
package tech.httptoolkit.android.vpn;
1818

1919
import java.io.IOException;
2020
import java.nio.ByteBuffer;
2121
import java.util.LinkedList;
2222
import java.util.Queue;
2323
import java.util.concurrent.ConcurrentLinkedQueue;
2424

25-
import com.lipisoft.toyshark.network.ip.IPPacketFactory;
26-
import com.lipisoft.toyshark.network.ip.IPv4Header;
27-
import com.lipisoft.toyshark.socket.SocketData;
28-
import com.lipisoft.toyshark.transport.tcp.PacketHeaderException;
29-
import com.lipisoft.toyshark.transport.tcp.TCPHeader;
30-
import com.lipisoft.toyshark.transport.tcp.TCPPacketFactory;
31-
import com.lipisoft.toyshark.transport.ITransportHeader;
32-
import com.lipisoft.toyshark.transport.udp.UDPHeader;
33-
import com.lipisoft.toyshark.transport.udp.UDPPacketFactory;
34-
import com.lipisoft.toyshark.util.PacketUtil;
25+
import tech.httptoolkit.android.vpn.network.ip.IPPacketFactory;
26+
import tech.httptoolkit.android.vpn.network.ip.IPv4Header;
27+
import tech.httptoolkit.android.vpn.socket.SocketData;
28+
import tech.httptoolkit.android.vpn.transport.tcp.PacketHeaderException;
29+
import tech.httptoolkit.android.vpn.transport.tcp.TCPHeader;
30+
import tech.httptoolkit.android.vpn.transport.tcp.TCPPacketFactory;
31+
import tech.httptoolkit.android.vpn.transport.ITransportHeader;
32+
import tech.httptoolkit.android.vpn.transport.udp.UDPHeader;
33+
import tech.httptoolkit.android.vpn.transport.udp.UDPPacketFactory;
34+
import tech.httptoolkit.android.vpn.util.PacketUtil;
3535

3636
import androidx.annotation.NonNull;
3737
import android.util.Log;
3838

39+
import tech.httptoolkit.android.TagKt;
40+
3941
/**
4042
* handle VPN client request and response. it create a new session for each VPN client.
4143
* @author Borey Sao
4244
* Date: May 22, 2014
4345
*/
4446
public class SessionHandler {
45-
private static final String TAG = "SessionHandler";
47+
private final String TAG = TagKt.getTAG(this);
4648

4749
private static final SessionHandler handler = new SessionHandler();
4850

0 commit comments

Comments
 (0)