From b22b7d56ef86c63211f5aa3e6e08f3924ef45858 Mon Sep 17 00:00:00 2001
From: emanuele-f <black.silver@hotmail.it>
Date: Fri, 20 Aug 2021 00:59:25 +0200
Subject: [PATCH] Fix filter by UID

---
 app/src/main/jni/pcapd/pcapd.c               | 3 +--
 app/src/main/jni/vpnproxy-jni/capture_root.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/jni/pcapd/pcapd.c b/app/src/main/jni/pcapd/pcapd.c
index e755c383..7c9785b0 100644
--- a/app/src/main/jni/pcapd/pcapd.c
+++ b/app/src/main/jni/pcapd/pcapd.c
@@ -60,7 +60,7 @@ typedef struct {
   char *ifnames[MAX_IFACES];
   char *bpf;
   char *log_file;
-  uid_t uid_filter;
+  int uid_filter;
   int num_interfaces;
   int daemonize;
   int dump_datalink;
@@ -373,7 +373,6 @@ static int init_pcapd_capture(pcapd_runtime_t *rt, pcapd_conf_t *conf) {
   return 0;
 
 err:
-  finish_pcapd_capture(rt);
   return -1;
 }
 
diff --git a/app/src/main/jni/vpnproxy-jni/capture_root.c b/app/src/main/jni/vpnproxy-jni/capture_root.c
index 99d5058e..aadaad32 100644
--- a/app/src/main/jni/vpnproxy-jni/capture_root.c
+++ b/app/src/main/jni/vpnproxy-jni/capture_root.c
@@ -180,9 +180,8 @@ static int connectPcapd(vpnproxy_data_t *proxy) {
 
     log_d("Connected to pcapd");
 
-    unlink(PCAPD_SOCKET_PATH);
-
     cleanup:
+    unlink(PCAPD_SOCKET_PATH);
     close(sock);
 
     return client;