diff --git a/app/src/main/java/com/emanuelef/remote_capture/AppsLoader.java b/app/src/main/java/com/emanuelef/remote_capture/AppsLoader.java index a0f8440c..7a647a31 100644 --- a/app/src/main/java/com/emanuelef/remote_capture/AppsLoader.java +++ b/app/src/main/java/com/emanuelef/remote_capture/AppsLoader.java @@ -51,14 +51,23 @@ public class AppsLoader implements LoaderManager.LoaderCallbacksipproto, 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; } diff --git a/app/src/main/jni/vpnproxy-jni/vpnproxy.c b/app/src/main/jni/vpnproxy-jni/vpnproxy.c index 7b43058f..d0738325 100644 --- a/app/src/main/jni/vpnproxy-jni/vpnproxy.c +++ b/app/src/main/jni/vpnproxy-jni/vpnproxy.c @@ -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); }