From 02c1918621bc988121466d7e56a81e3c57eae431 Mon Sep 17 00:00:00 2001
From: ruti <>
Date: Mon, 24 Feb 2025 19:11:13 +0300
Subject: [PATCH] Fix logging on Android

---
 desync.c | 4 ++--
 error.h  | 2 ++
 proxy.c  | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/desync.c b/desync.c
index e88d88a..c1e0731 100644
--- a/desync.c
+++ b/desync.c
@@ -504,7 +504,7 @@ ssize_t desync(struct poolhd *pool,
     ssize_t skip = val->pair->round_sent;
     unsigned int part_skip = val->pair->part_sent;
     
-    if (!skip && params.debug) {
+    if (!skip && LOG_ENABLED) {
         init_proto_info(buffer, *np, &info);
         
         if (info.host_pos) {
@@ -668,7 +668,7 @@ ssize_t desync_udp(int sfd, char *buffer,
 {
     struct desync_params *dp = &params.dp[dp_c];
     
-    if (params.debug) {
+    if (LOG_ENABLED) {
         INIT_HEX_STR(buffer, (n > 16 ? 16 : n));
         LOG(LOG_S, "bytes: %s (%zd)\n", HEX_STR, n);
     }
diff --git a/error.h b/error.h
index 516fae2..6ddb75f 100644
--- a/error.h
+++ b/error.h
@@ -63,6 +63,7 @@ static int unie(int e)
     #define LOG_L ANDROID_LOG_VERBOSE
     #define LOG(s, str, ...) \
         __android_log_print(s, "proxy", str, ##__VA_ARGS__)
+    #define LOG_ENABLED 1
 #else
     #define LOG_E -1
     #define LOG_S 1
@@ -75,6 +76,7 @@ static int unie(int e)
             va_end(args);
         }
     }
+    #define LOG_ENABLED (params.debug >= LOG_S)
 #endif
 
 #define INIT_ADDR_STR(dst) \
diff --git a/proxy.c b/proxy.c
index e3e0ba0..cc55526 100644
--- a/proxy.c
+++ b/proxy.c
@@ -430,7 +430,7 @@ int create_conn(struct poolhd *pool,
         close(sfd);
         return -1;
     }
-    if (params.debug) {
+    if (LOG_ENABLED) {
         INIT_ADDR_STR((*dst));
         LOG(LOG_S, "new conn: fd=%d, pair=%d, addr=%s:%d\n", 
             sfd, val->fd, ADDR_STR, ntohs(dst->in.sin_port));
@@ -516,7 +516,7 @@ static int udp_associate(struct poolhd *pool,
         close(cfd);
         return -1;
     }
-    if (params.debug) {
+    if (LOG_ENABLED) {
         INIT_ADDR_STR((*dst));
         LOG(LOG_S, "udp associate: fds=%d,%d,%d addr=%s:%d\n", 
             ufd, cfd, val->fd, ADDR_STR, ntohs(dst->in.sin_port));