From e3ecd253ea81a8f83d27e0234531d08e6c18c2bc Mon Sep 17 00:00:00 2001
From: emanuele-f <black.silver@hotmail.it>
Date: Wed, 8 Dec 2021 18:33:17 +0100
Subject: [PATCH] Fix crash after 28ff23e

---
 app/src/main/java/com/emanuelef/remote_capture/Billing.java | 2 ++
 app/src/main/jni/common/utils.c                             | 2 +-
 app/src/main/jni/core/capture_vpn.c                         | 4 ++--
 submodules/zdtun                                            | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/emanuelef/remote_capture/Billing.java b/app/src/main/java/com/emanuelef/remote_capture/Billing.java
index e24c5ce5..f612fc2d 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/Billing.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/Billing.java
@@ -19,6 +19,7 @@
 
 package com.emanuelef.remote_capture;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Build;
@@ -117,6 +118,7 @@ public class Billing {
         }
     }
 
+    @SuppressWarnings("deprecation")
     public String getSystemId() {
         // NOTE: On Android >= O, the ID is unique to each combination of package, key, user and device
         String system_id = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) ?
diff --git a/app/src/main/jni/common/utils.c b/app/src/main/jni/common/utils.c
index 8b7fe852..923a7fb7 100644
--- a/app/src/main/jni/common/utils.c
+++ b/app/src/main/jni/common/utils.c
@@ -229,7 +229,7 @@ void hexdump(const char *buf, size_t bufsize) {
                 out[idx] = '\0';
                 log_d("%s", out);
             }
-            idx = sprintf(out, "%06x", off);
+            idx = sprintf(out, "%06zx", off);
         }
 
         out[idx++] = ' ';
diff --git a/app/src/main/jni/core/capture_vpn.c b/app/src/main/jni/core/capture_vpn.c
index 86e04439..480936f8 100644
--- a/app/src/main/jni/core/capture_vpn.c
+++ b/app/src/main/jni/core/capture_vpn.c
@@ -508,9 +508,8 @@ int run_vpn(pcapdroid_t *pd, int tunfd) {
                 pd_conn_t *data = zdtun_conn_get_userdata(conn);
 
                 pd_process_packet(pd, &pkt, true, tuple, data, get_pkt_timestamp(pd, &tv), &pctx);
-                data->vpn.fw_pctx = &pctx;
-
                 if(data->sent_pkts == 0) {
+                    // Newly created connections
                     data->blacklisted_internal = !check_dns_req_allowed(pd, conn, &pctx);
                     data->to_block |= data->blacklisted_internal;
 
@@ -533,6 +532,7 @@ int run_vpn(pcapdroid_t *pd, int tunfd) {
                 }
 
                 // NOTE: zdtun_forward may cause nested calls to remote2vpn
+                data->vpn.fw_pctx = &pctx;
                 if(zdtun_forward(zdt, &pkt, conn) != 0) {
                     char buf[512];
 
diff --git a/submodules/zdtun b/submodules/zdtun
index a000e4f3..78b2d9ca 160000
--- a/submodules/zdtun
+++ b/submodules/zdtun
@@ -1 +1 @@
-Subproject commit a000e4f3b12817b453ed728ac6f33e26b455c288
+Subproject commit 78b2d9ca5be93496a308439b38dd7ae6674e2b41