From 48a14a37349f4487430adfe7997b8b95c9b96963 Mon Sep 17 00:00:00 2001
From: Radegast <jsimek.cz@gmail.com>
Date: Mon, 30 Jul 2012 12:57:16 +0200
Subject: [PATCH] general: removed all occurrences of NET_AdrToStringwPort,
 refs #49

---
 src/client/cl_main.c   | 10 +++++-----
 src/qcommon/net_ip.c   | 12 ++++++------
 src/server/sv_ccmds.c  |  2 +-
 src/server/sv_client.c |  4 ++--
 src/server/sv_main.c   |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/client/cl_main.c b/src/client/cl_main.c
index c7cdaa664..b4f70d444 100644
--- a/src/client/cl_main.c
+++ b/src/client/cl_main.c
@@ -1447,7 +1447,7 @@ void CL_Connect_f(void)
 		clc.serverAddress.port = BigShort(PORT_SERVER);
 	}
 
-	ip_port = NET_AdrToStringwPort(clc.serverAddress);
+	ip_port = NET_AdrToString(clc.serverAddress);
 
 	Com_Printf("%s resolved to %s\n", cls.servername, ip_port);
 
@@ -2490,7 +2490,7 @@ void CL_ConnectionlessPacket(netadr_t from, msg_t *msg)
 
 	c = Cmd_Argv(0);
 
-	Com_DPrintf("CL packet %s: %s\n", NET_AdrToStringwPort(from), c);
+	Com_DPrintf("CL packet %s: %s\n", NET_AdrToString(from), c);
 
 	// challenge from the server we are connecting to
 	if (!Q_stricmp(c, "challengeResponse"))
@@ -2540,7 +2540,7 @@ void CL_ConnectionlessPacket(netadr_t from, msg_t *msg)
 		{
 			Com_Printf("connectResponse from a different address.  Ignored.\n");
 			Com_Printf("%s should have been %s\n", NET_AdrToString(from),
-			           NET_AdrToStringwPort(clc.serverAddress));
+			           NET_AdrToString(clc.serverAddress));
 			return;
 		}
 
@@ -2672,7 +2672,7 @@ void CL_PacketEvent(netadr_t from, msg_t *msg)
 	if (!NET_CompareAdr(from, clc.netchan.remoteAddress))
 	{
 		Com_DPrintf("%s:sequenced packet without connection\n"
-		            , NET_AdrToStringwPort(from));
+		            , NET_AdrToString(from));
 		// FIXME: send a client disconnect?
 		return;
 	}
@@ -4529,7 +4529,7 @@ void CL_GetPing(int n, char *buf, int buflen, int *pingtime)
 		return;
 	}
 
-	str = NET_AdrToStringwPort(cl_pinglist[n].adr);
+	str = NET_AdrToString(cl_pinglist[n].adr);
 	Q_strncpyz(buf, str, buflen);
 
 	time = cl_pinglist[n].time;
diff --git a/src/qcommon/net_ip.c b/src/qcommon/net_ip.c
index 206490469..55437ff5a 100644
--- a/src/qcommon/net_ip.c
+++ b/src/qcommon/net_ip.c
@@ -505,12 +505,8 @@ qboolean NET_CompareBaseAdrMask(netadr_t a, netadr_t b, int netmask)
 
 
 /*
-===================
-NET_CompareBaseAdr
-
-Compares without the port
-===================
-*/
+ * @brief Compares ip addresses without the port.
+ */
 qboolean NET_CompareBaseAdr(netadr_t a, netadr_t b)
 {
 	return NET_CompareBaseAdrMask(a, b, -1);
@@ -548,6 +544,10 @@ const char *NET_AdrToString(netadr_t a)
 	return s;
 }
 
+/*
+ * @warning Function is broken, because NET_AdrToString already adds port to IPv4 addresses.
+ * @deprecated Use NET_AdrToString for compatibility with W:ET 2.60b.
+ */
 const char *NET_AdrToStringwPort(netadr_t a)
 {
 	static char s[NET_ADDRSTRMAXLEN];
diff --git a/src/server/sv_ccmds.c b/src/server/sv_ccmds.c
index 372fdbffa..2fddb0f32 100644
--- a/src/server/sv_ccmds.c
+++ b/src/server/sv_ccmds.c
@@ -518,7 +518,7 @@ static void SV_Status_f(void)
 
 		Com_Printf("%7i ", svs.time - cl->lastPacketTime);
 
-		s = NET_AdrToStringwPort(cl->netchan.remoteAddress);
+		s = NET_AdrToString(cl->netchan.remoteAddress);
 		Com_Printf("%s", s);
 
 		l = 22 - strlen(s);
diff --git a/src/server/sv_client.c b/src/server/sv_client.c
index 9acf0d911..656cd2e4f 100644
--- a/src/server/sv_client.c
+++ b/src/server/sv_client.c
@@ -202,7 +202,7 @@ void SV_DirectConnect(netadr_t from)
 			return;
 		}
 		// force the IP key/value pair so the game can filter based on ip
-		Info_SetValueForKey(userinfo, "ip", va("%s:%d", NET_AdrToString(from), qport));
+		Info_SetValueForKey(userinfo, "ip", NET_AdrToString(from));
 
 		if (svs.challenges[i].firstPing == 0)
 		{
@@ -1473,7 +1473,7 @@ void SV_UserinfoChanged(client_t *cl)
 	//Com_DPrintf("Maintain IP in userinfo for '%s'\n", cl->name);
 	if (!NET_IsLocalAddress(cl->netchan.remoteAddress))
 	{
-		Info_SetValueForKey(cl->userinfo, "ip", va("%s:%d", NET_AdrToString(cl->netchan.remoteAddress), cl->netchan.qport));
+		Info_SetValueForKey(cl->userinfo, "ip", NET_AdrToString(cl->netchan.remoteAddress));
 	}
 	else
 	{
diff --git a/src/server/sv_main.c b/src/server/sv_main.c
index f06671ab2..958dbdd00 100644
--- a/src/server/sv_main.c
+++ b/src/server/sv_main.c
@@ -301,7 +301,7 @@ void SV_MasterHeartbeat(const char *message)
 
 				if (res)
 				{
-					Com_Printf("%s resolved to %s\n", sv_master[i]->string, NET_AdrToStringwPort(adr[i][0]));
+					Com_Printf("%s resolved to %s\n", sv_master[i]->string, NET_AdrToString(adr[i][0]));
 				}
 				else
 				{
@@ -322,7 +322,7 @@ void SV_MasterHeartbeat(const char *message)
 
 				if (res)
 				{
-					Com_Printf("%s resolved to %s\n", sv_master[i]->string, NET_AdrToStringwPort(adr[i][1]));
+					Com_Printf("%s resolved to %s\n", sv_master[i]->string, NET_AdrToString(adr[i][1]));
 				}
 				else
 				{