Skip to content

Force Proxy to any Windows/MacOS/Linux Application TCP and UDP traffic

improved performance, impvord memory size, fixed allocation, added cleanup. improved compilation

anof-cyber1d968b3c3ce5
diff --git a/Linux/cli/Makefile b/Linux/cli/Makefile
index 083a14b..d392069 100644
--- a/Linux/cli/Makefile
+++ b/Linux/cli/Makefile
@@ -1,6 +1,14 @@
CC = gcc
-CFLAGS = -Wall -Wextra -O2 -I../src
-LDFLAGS = -L../src
+CFLAGS = -Wall -Wextra -O3 -I../src \
+ -fstack-protector-strong \
+ -D_FORTIFY_SOURCE=2 \
+ -fPIE \
+ -Wformat -Wformat-security \
+ -Werror=format-security \
+ -fno-strict-overflow \
+ -fno-delete-null-pointer-checks \
+ -fwrapv
+LDFLAGS = -L../src -pie -Wl,-z,relro,-z,now -Wl,-z,noexecstack -s
LIBS = -lproxybridge -lpthread
TARGET = proxybridge-cli
@@ -11,6 +19,8 @@ all: $(TARGET)
$(TARGET): $(OBJECTS)
$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
+ @echo "Stripping debug symbols..."
+ strip --strip-all $@
%.o: %.c
$(CC) $(CFLAGS) -c $< -o $@
diff --git a/Linux/src/Makefile b/Linux/src/Makefile
index d134594..29effb0 100644
--- a/Linux/src/Makefile
+++ b/Linux/src/Makefile
@@ -1,6 +1,14 @@
CC = gcc
-CFLAGS = -Wall -Wextra -O2 -fPIC -D_GNU_SOURCE
-LDFLAGS = -shared
+CFLAGS = -Wall -Wextra -O3 -fPIC -D_GNU_SOURCE \
+ -fstack-protector-strong \
+ -D_FORTIFY_SOURCE=2 \
+ -fPIE \
+ -Wformat -Wformat-security \
+ -Werror=format-security \
+ -fno-strict-overflow \
+ -fno-delete-null-pointer-checks \
+ -fwrapv
+LDFLAGS = -shared -Wl,-z,relro,-z,now -Wl,-z,noexecstack -s
LIBS = -lpthread -lnetfilter_queue -lnfnetlink
TARGET = libproxybridge.so
@@ -11,6 +19,8 @@ all: $(TARGET)
$(TARGET): $(OBJECTS)
$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ @echo "Stripping debug symbols..."
+ strip --strip-unneeded $@
%.o: %.c
$(CC) $(CFLAGS) -c $< -o $@
diff --git a/Linux/src/ProxyBridge.c b/Linux/src/ProxyBridge.c
index ebbc06e..9f981a4 100644
--- a/Linux/src/ProxyBridge.c
+++ b/Linux/src/ProxyBridge.c
@@ -1793,27 +1793,89 @@ static void remove_connection(uint16_t src_port)
static void cleanup_stale_connections(void)
{
- uint64_t current_time = get_monotonic_ms();
- pthread_mutex_lock(&lock);
+ uint64_t now = get_monotonic_ms();
+ int removed = 0;
+ // Process each hash bucket with minimal lock time
for (int i = 0; i < CONNECTION_HASH_SIZE; i++)
{
+ pthread_mutex_lock(&lock);
CONNECTION_INFO **conn_ptr = &connection_hash_table[i];
+
while (*conn_ptr != NULL)
{
- if (current_time - (*conn_ptr)->last_activity > 120000) // 120 sec timeout
+ if (now - (*conn_ptr)->last_activity > 60000) // 60 sec timeout (same as Windows)
{
CONNECTION_INFO *to_free = *conn_ptr;
*conn_ptr = (*conn_ptr)->next;
- free(to_free);
+ pthread_mutex_unlock(&lock);
+ free(to_free); // Free outside lock
+ removed++;
+ pthread_mutex_lock(&lock);
}
else
{
conn_ptr = &(*conn_ptr)->next;
}
}
+ pthread_mutex_unlock(&lock);
+ }
+
+ // Cleanup PID cache
+ uint64_t now_cache = get_monotonic_ms();
+ int cache_removed = 0;
+ for (int i = 0; i < PID_CACHE_SIZE; i++)
+ {
+ pthread_mutex_lock(&lock);
+ PID_CACHE_ENTRY **entry_ptr = &pid_cache[i];
+ while (*entry_ptr != NULL)
+ {
+ if (now_cache - (*entry_ptr)->timestamp > 10000) // 10 sec cache TTL
+ {
+ PID_CACHE_ENTRY *to_free = *entry_ptr;
+ *entry_ptr = (*entry_ptr)->next;
+ pthread_mutex_unlock(&lock);
+ free(to_free); // Free outside lock
+ cache_removed++;
+ pthread_mutex_lock(&lock);
+ }
+ else
+ {
+ entry_ptr = &(*entry_ptr)->next;
+ }
+ }
+ pthread_mutex_unlock(&lock);
+ }
+
+ // Keep only last 100 logged connections for memory efficiency
+ pthread_mutex_lock(&lock);
+ int logged_count = 0;
+ LOGGED_CONNECTION *temp = logged_connections;
+ while (temp != NULL)
+ {
+ logged_count++;
+ temp = temp->next;
}
+ if (logged_count > 100)
+ {
+ temp = logged_connections;
+ for (int i = 0; i < 99 && temp != NULL; i++)
+ {
+ temp = temp->next;
+ }
+ if (temp != NULL && temp->next != NULL)
+ {
+ LOGGED_CONNECTION *to_free = temp->next;
+ temp->next = NULL;
+ while (to_free != NULL)
+ {
+ LOGGED_CONNECTION *next = to_free->next;
+ free(to_free);
+ to_free = next;
+ }
+ }
+ }
pthread_mutex_unlock(&lock);
}
@@ -1999,7 +2061,7 @@ static void* cleanup_worker(void *arg)
(void)arg;
while (running)
{
- sleep(30);
+ sleep(30); // 30 seconds
if (running)
{
cleanup_stale_connections();
@@ -2333,9 +2395,16 @@ bool ProxyBridge_Start(void)
nfq_destroy_queue(nfq_qh);
nfq_close(nfq_h);
running = false;
+ pthread_cancel(cleanup_thread);
+ pthread_cancel(proxy_thread);
+ if (udp_relay_thread != 0)
+ pthread_cancel(udp_relay_thread);
return false;
}
+ // Set larger queue length for better performance (16384 like Windows)
+ nfq_set_queue_maxlen(nfq_qh, 16384);
+
// setup iptables rules for packet interception - USE MANGLE table so it runs BEFORE nat
log_message("setting up iptables rules");
// mangle table runs before nat, so we can mark packets there
@@ -2430,6 +2499,19 @@ bool ProxyBridge_Stop(void)
cleanup_thread = 0;
}
+ // Free all connections in hash table
+ pthread_mutex_lock(&lock);
+ for (int i = 0; i < CONNECTION_HASH_SIZE; i++)
+ {
+ while (connection_hash_table[i] != NULL)
+ {
+ CONNECTION_INFO *to_free = connection_hash_table[i];
+ connection_hash_table[i] = connection_hash_table[i]->next;
+ free(to_free);
+ }
+ }
+ pthread_mutex_unlock(&lock);
+
clear_logged_connections();
clear_pid_cache();
@@ -2594,3 +2676,23 @@ int ProxyBridge_TestConnection(const char* target_host, uint16_t target_port, ch
return ret;
}
+
+// Library destructor - automatically cleanup when library is unloaded
+__attribute__((destructor))
+static void library_cleanup(void)
+{
+ if (running)
+ {
+ log_message("library unloading - cleaning up automatically");
+ ProxyBridge_Stop();
+ }
+ else
+ {
+ // Even if not running, ensure iptables rules are removed
+ // This handles cases where the app crashed before calling Stop
+ system("iptables -t mangle -D OUTPUT -p tcp -j NFQUEUE --queue-num 0 2>/dev/null");
+ system("iptables -t mangle -D OUTPUT -p udp -j NFQUEUE --queue-num 0 2>/dev/null");
+ system("iptables -t nat -D OUTPUT -p tcp -m mark --mark 1 -j REDIRECT --to-port 34010 2>/dev/null");
+ system("iptables -t nat -D OUTPUT -p udp -m mark --mark 2 -j REDIRECT --to-port 34011 2>/dev/null");
+ }
+}