mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactoring

This commit is contained in:
M66B 2016-01-07 11:56:24 +01:00
parent 164c9a4155
commit 06ec2537fb
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/netguard/Packet.java → app/src/main/java/eu/faircode/netguard/IPv4Packet.java
View File

@ -29,7 +29,7 @@ import java.net.InetAddress;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Scanner; import java.util.Scanner;
public class Packet { public class IPv4Packet {
private static final String TAG = "NetGuard.Packet"; private static final String TAG = "NetGuard.Packet";
private ByteBuffer packet; private ByteBuffer packet;
@ -37,10 +37,10 @@ public class Packet {
public UDPHeader UDP = null; public UDPHeader UDP = null;
public TCP TCP = null; public TCP TCP = null;
private Packet() { private IPv4Packet() {
} }
public Packet(ByteBuffer buffer) throws IOException { public IPv4Packet(ByteBuffer buffer) throws IOException {
packet = buffer; packet = buffer;
try { try {

6
app/src/main/java/eu/faircode/netguard/LogAdapter.java
View File

@ -57,11 +57,11 @@ public class LogAdapter extends CursorAdapter {
tvIP.setText(whois); tvIP.setText(whois);
if (version == 4) if (version == 4)
if (protocol == Packet.IPv4Header.ICMP) if (protocol == IPv4Packet.IPv4Header.ICMP)
tvProtocol.setText("ICMP"); tvProtocol.setText("ICMP");
else if (protocol == Packet.IPv4Header.TCP) else if (protocol == IPv4Packet.IPv4Header.TCP)
tvProtocol.setText("TCP"); tvProtocol.setText("TCP");
else if (protocol == Packet.IPv4Header.UDP) else if (protocol == IPv4Packet.IPv4Header.UDP)
tvProtocol.setText("UDP"); tvProtocol.setText("UDP");
else else
tvProtocol.setText(protocol < 0 ? "" : Integer.toString(protocol)); tvProtocol.setText(protocol < 0 ? "" : Integer.toString(protocol));

2
app/src/main/java/eu/faircode/netguard/SinkholeService.java
View File

@ -701,7 +701,7 @@ public class SinkholeService extends VpnService {
byte version = (byte) (buffer.get() >> 4); byte version = (byte) (buffer.get() >> 4);
if (version == 4) { if (version == 4) {
buffer.position(0); buffer.position(0);
Packet pkt = new Packet(buffer); IPv4Packet pkt = new IPv4Packet(buffer);
Log.i(TAG, "Packet to " + pkt.IPv4.destinationAddress.toString()); Log.i(TAG, "Packet to " + pkt.IPv4.destinationAddress.toString());
new DatabaseHelper(SinkholeService.this).insertLog( new DatabaseHelper(SinkholeService.this).insertLog(
version, version,