CodeCow/PCAPdroid
1
0
Fork 0
mirror of https://github.com/emanuele-f/PCAPdroid.git synced 2026-06-22 21:07:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add more known apps

Browse Source
This commit is contained in:
emanuele-f 2021-03-04 10:50:58 +01:00
parent b31975c650
commit bea157d5e5
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/emanuelef/remote_capture/AppsLoader.java
View File

@ -51,14 +51,23 @@ public class AppsLoader implements LoaderManager.LoaderCallbacks<HashMap<Integer
Log.d(TAG, "num apps (system+user): " + packs.size());
long tstart = Utils.now();
// https://android.googlesource.com/platform/system/core/+/master/libcutils/include/private/android_filesystem_config.h
// NOTE: these virtual apps cannot be used as a permanent filter (via addAllowedApplication)
// as they miss a valid package name
apps.put(0, new AppDescriptor("Root",
mVirtualAppIcon,"root", 0, true, true));
apps.put(1000, new AppDescriptor("Android",
mVirtualAppIcon,"android", 1000, true, true));
apps.put(1013, new AppDescriptor("MediaServer",
mVirtualAppIcon,"mediaserver", 1013, true, true));
apps.put(1020, new AppDescriptor("MulticastDNSResponder",
mVirtualAppIcon,"multicastdnsresponder", 1020, true, true));
apps.put(1021, new AppDescriptor("GPS",
mVirtualAppIcon,"gps", 1021, true, true));
apps.put(1051, new AppDescriptor("netd",
mVirtualAppIcon,"netd", 1051, true, true));
apps.put(9999, new AppDescriptor("Nobody",
mVirtualAppIcon,"nobody", 9999, true, true));
// NOTE: a single uid can correspond to multiple apps, only take the first one
for (int i = 0; i < packs.size(); i++) {

8
app/src/main/jni/vpnproxy-jni/uid_resolver.c
View File

@ -258,14 +258,6 @@ jint get_uid_slow(struct vpnproxy_data *proxy,
//version, conn_info->ipproto, source, sport, dest, dport, uid);
}
if (uid == -1)
log_android(ANDROID_LOG_WARN, "uid [ipv%d][proto=%d] %s:%u -> %s:%u => not found",
version, conn_info->ipproto, source, sport, dest, dport);
else if (uid >= 0) {
// log_android(ANDROID_LOG_INFO, "uid v%d p%d %s/%u > %s/%u => %d",
// version, conn_info->ipproto, source, sport, dest, dport, uid);
}
return uid;
}

12
app/src/main/jni/vpnproxy-jni/vpnproxy.c
View File

@ -500,13 +500,13 @@ static void account_packet(zdtun_t *tun, const char *packet, int size, uint8_t f
/* ******************************************************* */
static int resolve_uid(vpnproxy_data_t *proxy, const zdtun_5tuple_t *conn_info) {
char buf[256];
jint uid;
tuple2str(conn_info, buf, sizeof(buf));
uid = get_uid(proxy, conn_info);
if(uid >= 0) {
#if 1
char buf[256];
char appbuf[128];
if(uid == 0)
@ -516,11 +516,11 @@ static int resolve_uid(vpnproxy_data_t *proxy, const zdtun_5tuple_t *conn_info)
else
getApplicationByUid(proxy, uid, appbuf, sizeof(appbuf));
log_android(ANDROID_LOG_INFO, "%s [%d/%s]",
tuple2str(conn_info, buf, sizeof(buf)), uid, appbuf);
#endif
} else
log_android(ANDROID_LOG_INFO, "%s [%d/%s]", buf, uid, appbuf);
} else {
uid = -1;
log_android(ANDROID_LOG_WARN, "%s => UID not found!", buf);
}
return(uid);
}