From df59f3580dde30d70a4a59fd9f344d1facb2d1c7 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Mon, 30 Aug 2021 18:27:52 -0700
Subject: [PATCH] Don't do anything hole punching related if rendezvousserver
 is unset

---
 src/d_clisrv.c | 22 ++++++++++++++--------
 src/i_tcp.c    |  3 ++-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index f6db0cbe..049feded 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1909,8 +1909,11 @@ static void SendAskInfo(INT32 node)
 	// our address to the host, it'll be able to speak to us.
 	HSendPacket(node, false, 0, sizeof (askinfo_pak));
 
-	if (node != 0 && node != BROADCASTADDR)
+	if (node != 0 && node != BROADCASTADDR &&
+			cv_rendezvousserver.string[0])
+	{
 		I_NetRequestHolePunch();
+	}
 }
 
 serverelem_t serverlist[MAXSERVERLIST];
@@ -5730,14 +5733,17 @@ static void UpdatePingTable(void)
 
 static void RenewHolePunch(void)
 {
-	static time_t past;
-
-	const time_t now = time(NULL);
-
-	if ((now - past) > 20)
+	if (cv_rendezvousserver.string[0])
 	{
-		I_NetRegisterHolePunch();
-		past = now;
+		static time_t past;
+
+		const time_t now = time(NULL);
+
+		if ((now - past) > 20)
+		{
+			I_NetRegisterHolePunch();
+			past = now;
+		}
 	}
 }
 
diff --git a/src/i_tcp.c b/src/i_tcp.c
index 9b250b75..cf99fccb 100644
--- a/src/i_tcp.c
+++ b/src/i_tcp.c
@@ -600,7 +600,8 @@ void Command_Numnodes(void)
 #ifndef NONET
 static boolean hole_punch(ssize_t c)
 {
-	if (c == 10 && holepunchpacket->magic == hole_punch_magic)
+	if (cv_rendezvousserver.string[0] &&
+			c == 10 && holepunchpacket->magic == hole_punch_magic)
 	{
 		mysockaddr_t addr;
 		addr.ip4.sin_family      = AF_INET;