From 487910487dabf570b438e69eb26d0d5cb4cf383f Mon Sep 17 00:00:00 2001
From: ercoppa <ercoppa@gmail.com>
Date: Tue, 2 Jun 2026 18:41:05 +0200
Subject: [PATCH] FIX: generateGerbilConfig hardcoded the WireGuard listen port
 to 51820 and never sent a relay port

---
 server/routers/gerbil/getConfig.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/routers/gerbil/getConfig.ts b/server/routers/gerbil/getConfig.ts
index 6f5eb8785..bd57eae39 100644
--- a/server/routers/gerbil/getConfig.ts
+++ b/server/routers/gerbil/getConfig.ts
@@ -20,6 +20,7 @@ const getConfigSchema = z.object({
 
 export type GetConfigResponse = {
     listenPort: number;
+    relayPort: number;
     ipAddress: string;
     peers: {
         publicKey: string | null;
@@ -142,7 +143,10 @@ export async function generateGerbilConfig(exitNode: ExitNode) {
     peers = [...sitePeers, ...clientPeers];
 
     const configResponse: GetConfigResponse = {
-        listenPort: exitNode.listenPort || 51820,
+        listenPort:
+            exitNode.listenPort ||
+            config.getRawConfig().gerbil.start_port,
+        relayPort: config.getRawConfig().gerbil.clients_start_port,
         ipAddress: exitNode.address,
         peers
     };