removed support for old server infos

6 files changed, 17 insertions, 71 deletions

diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index ccc21da7..60a2cf12 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -1081,21 +1081,16 @@ void CClient::ProcessPacket(CNetChunk *pPacket)
 		{
 			int PacketType = 0;
 			if(pPacket->m_DataSize >= (int)sizeof(SERVERBROWSE_INFO) && mem_comp(pPacket->m_pData, SERVERBROWSE_INFO, sizeof(SERVERBROWSE_INFO)) == 0)
-				PacketType = 2;
-
-			if(pPacket->m_DataSize >= (int)sizeof(SERVERBROWSE_OLD_INFO) && mem_comp(pPacket->m_pData, SERVERBROWSE_OLD_INFO, sizeof(SERVERBROWSE_OLD_INFO)) == 0)
-				PacketType = 1;
+				PacketType = 3;
 
 			if(PacketType)
 			{
 				// we got ze info
 				CUnpacker Up;
 				CServerInfo Info = {0};
-				int Token = -1;
-
+				
 				Up.Reset((unsigned char*)pPacket->m_pData+sizeof(SERVERBROWSE_INFO), pPacket->m_DataSize-sizeof(SERVERBROWSE_INFO));
-				if(PacketType >= 2)
-					Token = str_toint(Up.GetString());
+				int Token = str_toint(Up.GetString());
 				str_copy(Info.m_aVersion, Up.GetString(CUnpacker::SANITIZE_CC|CUnpacker::SKIP_START_WHITESPACES), sizeof(Info.m_aVersion));
 				str_copy(Info.m_aName, Up.GetString(CUnpacker::SANITIZE_CC|CUnpacker::SKIP_START_WHITESPACES), sizeof(Info.m_aName));
 				str_copy(Info.m_aMap, Up.GetString(CUnpacker::SANITIZE_CC|CUnpacker::SKIP_START_WHITESPACES), sizeof(Info.m_aMap));
@@ -1130,12 +1125,7 @@ void CClient::ProcessPacket(CNetChunk *pPacket)
 						m_CurrentServerInfoRequestTime = -1;
 					}
 					else
-					{
-						if(PacketType == 2)
-							m_ServerBrowser.Set(pPacket->m_Address, IServerBrowser::SET_TOKEN, Token, &Info);
-						else
-							m_ServerBrowser.Set(pPacket->m_Address, IServerBrowser::SET_OLD_INTERNET, -1, &Info);
-					}
+						m_ServerBrowser.Set(pPacket->m_Address, IServerBrowser::SET_TOKEN, Token, &Info);
 				}
 			}
 		}
diff --git a/src/engine/client/srvbrowse.cpp b/src/engine/client/srvbrowse.cpp
index 540cadf3..a023b878 100644
--- a/src/engine/client/srvbrowse.cpp
+++ b/src/engine/client/srvbrowse.cpp
@@ -437,29 +437,6 @@ void CServerBrowser::Set(const NETADDR &Addr, int Type, int Token, const CServer
 			RemoveRequest(pEntry);
 		}
 	}
-	else if(Type == IServerBrowser::SET_OLD_INTERNET)
-	{
-		pEntry = Find(Addr);
-		if(pEntry)
-		{
-			SetInfo(pEntry, *pInfo);
-
-			if(m_ServerlistType == IServerBrowser::TYPE_LAN)
-				pEntry->m_Info.m_Latency = min(static_cast<int>((time_get()-m_BroadcastTime)*1000/time_freq()), 999);
-			else
-				pEntry->m_Info.m_Latency = min(static_cast<int>((time_get()-pEntry->m_RequestTime)*1000/time_freq()), 999);
-			RemoveRequest(pEntry);
-		}
-	}
-	else if(Type == IServerBrowser::SET_OLD_LAN)
-	{
-		pEntry = Find(Addr);
-		if(pEntry)
-		if(!pEntry)
-			pEntry = Add(Addr);
-		if(pEntry)
-			SetInfo(pEntry, *pInfo);
-	}
 
 	Sort();
 }
diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp
index 7977c4fc..bd6f9829 100644
--- a/src/engine/server/server.cpp
+++ b/src/engine/server/server.cpp
@@ -875,18 +875,9 @@ void CServer::SendServerInfo(NETADDR *pAddr, int Token)
 	
 	p.Reset();
 
-	if(Token >= 0)
-	{
-		// new token based format
-		p.AddRaw(SERVERBROWSE_INFO, sizeof(SERVERBROWSE_INFO));
-		str_format(aBuf, sizeof(aBuf), "%d", Token);
-		p.AddString(aBuf, 6);
-	}
-	else
-	{
-		// old format
-		p.AddRaw(SERVERBROWSE_OLD_INFO, sizeof(SERVERBROWSE_OLD_INFO));
-	}
+	p.AddRaw(SERVERBROWSE_INFO, sizeof(SERVERBROWSE_INFO));
+	str_format(aBuf, sizeof(aBuf), "%d", Token);
+	p.AddString(aBuf, 6);
 	
 	p.AddString(GameServer()->Version(), 32);
 	p.AddString(g_Config.m_SvName, 64);
@@ -930,7 +921,7 @@ void CServer::UpdateServerInfo()
 		if(m_aClients[i].m_State != CClient::STATE_EMPTY)
 		{
 			NETADDR Addr = m_NetServer.ClientAddr(i);
-			SendServerInfo(&Addr, -1); 	// SERVERBROWSE_OLD_INFO
+			SendServerInfo(&Addr, -1);
 		}
 	}
 }
@@ -975,13 +966,6 @@ void CServer::PumpNetwork()
 				{
 					SendServerInfo(&Packet.m_Address, ((unsigned char *)Packet.m_pData)[sizeof(SERVERBROWSE_GETINFO)]);
 				}
-				
-				
-				if(Packet.m_DataSize == sizeof(SERVERBROWSE_OLD_GETINFO) &&
-					mem_comp(Packet.m_pData, SERVERBROWSE_OLD_GETINFO, sizeof(SERVERBROWSE_OLD_GETINFO)) == 0)
-				{
-					SendServerInfo(&Packet.m_Address, -1);
-				}
 			}
 		}
 		else
diff --git a/src/engine/serverbrowser.h b/src/engine/serverbrowser.h
index 07f544e8..ff83714d 100644
--- a/src/engine/serverbrowser.h
+++ b/src/engine/serverbrowser.h
@@ -68,12 +68,9 @@ public:
 		TYPE_LAN = 1,
 		TYPE_FAVORITES = 2,
 
-		// TODO: clean this up
 		SET_MASTER_ADD=1,
 		SET_FAV_ADD,
-		SET_TOKEN,
-		SET_OLD_INTERNET,
-		SET_OLD_LAN
+		SET_TOKEN
 	};
 
 	virtual void Refresh(int Type) = 0;
diff --git a/src/mastersrv/mastersrv.h b/src/mastersrv/mastersrv.h
index 8cd5adc8..9da82bff 100644
--- a/src/mastersrv/mastersrv.h
+++ b/src/mastersrv/mastersrv.h
@@ -18,11 +18,8 @@ static const unsigned char SERVERBROWSE_LIST[] = {255, 255, 255, 255, 'l', 'i',
 static const unsigned char SERVERBROWSE_GETCOUNT[] = {255, 255, 255, 255, 'c', 'o', 'u', 'n'};
 static const unsigned char SERVERBROWSE_COUNT[] = {255, 255, 255, 255, 's', 'i', 'z', 'e'};
 
-static const unsigned char SERVERBROWSE_GETINFO[] = {255, 255, 255, 255, 'g', 'i', 'e', '2'};
-static const unsigned char SERVERBROWSE_INFO[] = {255, 255, 255, 255, 'i', 'n', 'f', '2'};
-
-static const unsigned char SERVERBROWSE_OLD_GETINFO[] = {255, 255, 255, 255, 'g', 'i', 'e', 'f'};
-static const unsigned char SERVERBROWSE_OLD_INFO[] = {255, 255, 255, 255, 'i', 'n', 'f', 'o'};
+static const unsigned char SERVERBROWSE_GETINFO[] = {255, 255, 255, 255, 'g', 'i', 'e', '3'};
+static const unsigned char SERVERBROWSE_INFO[] = {255, 255, 255, 255, 'i', 'n', 'f', '3'};
 
 static const unsigned char SERVERBROWSE_FWCHECK[] = {255, 255, 255, 255, 'f', 'w', '?', '?'};
 static const unsigned char SERVERBROWSE_FWRESPONSE[] = {255, 255, 255, 255, 'f', 'w', '!', '!'};
diff --git a/src/tools/fake_server.cpp b/src/tools/fake_server.cpp
index 93a0a75e..ac7a8ed9 100644
--- a/src/tools/fake_server.cpp
+++ b/src/tools/fake_server.cpp
@@ -66,9 +66,10 @@ static void WriteInt(int i)
 
 static void BuildInfoMsg()
 {
-	aInfoMsgSize = sizeof(SERVERBROWSE_OLD_INFO);
-	mem_copy(aInfoMsg, SERVERBROWSE_OLD_INFO, aInfoMsgSize);
-	
+	aInfoMsgSize = sizeof(SERVERBROWSE_INFO);
+	mem_copy(aInfoMsg, SERVERBROWSE_INFO, aInfoMsgSize);
+	WriteInt(-1);
+
 	WriteStr(pVersion);
 	WriteStr(pServerName);
 	WriteStr(pMap);
@@ -123,8 +124,8 @@ static int Run()
 		{
 			if(p.m_ClientID == -1)
 			{
-				if(p.m_DataSize == sizeof(SERVERBROWSE_OLD_GETINFO) &&
-					mem_comp(p.m_pData, SERVERBROWSE_OLD_GETINFO, sizeof(SERVERBROWSE_OLD_GETINFO)) == 0)
+				if(p.m_DataSize == sizeof(SERVERBROWSE_GETINFO) &&
+					mem_comp(p.m_pData, SERVERBROWSE_GETINFO, sizeof(SERVERBROWSE_GETINFO)) == 0)
 				{
 					SendServerInfo(&p.m_Address);
 				}