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

More logging

This commit is contained in:
M66B 2016-02-03 19:50:12 +01:00
parent 836000529a
commit 0209cc2afd
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -457,7 +457,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
public Cursor getDns() {
SQLiteDatabase db = this.getReadableDatabase();
String query = "SELECT access.uid, dns.resource, access.dport, access.block";
String query = "SELECT access.uid, access.daddr, dns.resource, access.dport, access.block";
query += " FROM access";
query += " JOIN dns";
query += " ON dns.qname = access.daddr";

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

@ -924,11 +924,13 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
Cursor cursor = dh.getDns();
int colUid = cursor.getColumnIndex("uid");
int colDAddr = cursor.getColumnIndex("daddr");
int colResource = cursor.getColumnIndex("resource");
int colDPort = cursor.getColumnIndex("dport");
int colBlock = cursor.getColumnIndex("block");
while (cursor.moveToNext()) {
int uid = cursor.getInt(colUid);
String daddr = cursor.getString(colDAddr);
String dresource = cursor.getString(colResource);
int dport = cursor.isNull(colDPort) ? -1 : cursor.getInt(colDPort);
boolean block = (cursor.getInt(colBlock) > 0);
@ -940,7 +942,7 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
try {
map.get(uid).get(dport).put(InetAddress.getByName(dresource), block);
Log.i(TAG, "Set filter uid=" + uid + " " + dresource + "/" + dport + "=" + block);
Log.i(TAG, "Set filter uid=" + uid + " " + daddr + " " + dresource + "/" + dport + "=" + block);
} catch (UnknownHostException ex) {
Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
}

2
app/src/main/jni/netguard/netguard.c
View File

@ -1437,7 +1437,7 @@ void handle_ip(const struct arguments *args, const uint8_t *pkt, const size_t le
handle_tcp(args, pkt, length, payload, uid);
}
else
log_android(ANDROID_LOG_DEBUG, "Address %s/%u syn %d not allowed", dest, dport, syn);
log_android(ANDROID_LOG_INFO, "Address %s/%u syn %d not allowed", dest, dport, syn);
#ifdef PROFILE_EVENTS
gettimeofday(&end, NULL);