X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=net_dgrm.c;h=7829b1c628e23d68b3bdfe0ec33db998de0e3995;hp=ac8cfa6c6db871664fc06a22a4e579526e106381;hb=a93f765011a787f3f9343f65f6a309a90446c711;hpb=63e01393ed618f8561aee961acfc8a25bb30eb7f

diff --git a/net_dgrm.c b/net_dgrm.c
index ac8cfa6c..7829b1c6 100644
--- a/net_dgrm.c
+++ b/net_dgrm.c
@@ -323,12 +323,9 @@ int	Datagram_GetMessage (qsocket_t *sock)
 			ReSendMessage (sock);
 
 	while(1)
-	{	
+	{
 		length = sfunc.Read (sock->socket, (qbyte *)&packetBuffer, NET_DATAGRAMSIZE, &readaddr);
 
-//	if ((rand() & 255) > 220)
-//		continue;
-
 		if (length == 0)
 			break;
 
@@ -489,20 +486,12 @@ void NET_Stats_f (void)
 	{
 		for (s = net_activeSockets; s; s = s->next)
 			PrintStats(s);
-		// LordHavoc: sockets are dynamically allocated now
-		//for (s = net_freeSockets; s; s = s->next)
-		//	PrintStats(s);
 	}
 	else
 	{
 		for (s = net_activeSockets; s; s = s->next)
 			if (Q_strcasecmp(Cmd_Argv(1), s->address) == 0)
 				break;
-		// LordHavoc: sockets are dynamically allocated now
-		//if (s == NULL)
-		//	for (s = net_freeSockets; s; s = s->next)
-		//		if (Q_strcasecmp(Cmd_Argv(1), s->address) == 0)
-		//			break;
 		if (s == NULL)
 			return;
 		PrintStats(s);
@@ -529,6 +518,7 @@ static void Test_Poll(void)
 	int		frags;
 	int		connectTime;
 	qbyte	playerNumber;
+	int		c;
 
 	net_landriverlevel = testDriver;
 
@@ -550,7 +540,8 @@ static void Test_Poll(void)
 		if ((control & NETFLAG_LENGTH_MASK) != len)
 			break;
 
-		if (MSG_ReadByte() != CCREP_PLAYER_INFO)
+		c = MSG_ReadByte();
+		if (c != CCREP_PLAYER_INFO)
 			Sys_Error("Unexpected repsonse to Player Info request\n");
 
 		playerNumber = MSG_ReadByte();
@@ -651,6 +642,7 @@ static void Test2_Poll(void)
 	struct qsockaddr clientaddr;
 	int		control;
 	int		len;
+	int		c;
 	char	name[256];
 	char	value[256];
 
@@ -673,7 +665,8 @@ static void Test2_Poll(void)
 	if ((control & NETFLAG_LENGTH_MASK) != len)
 		goto Error;
 
-	if (MSG_ReadByte() != CCREP_RULE_INFO)
+	c = MSG_ReadByte();
+	if (c != CCREP_RULE_INFO)
 		goto Error;
 
 	strcpy(name, MSG_ReadString());
@@ -839,6 +832,7 @@ static qsocket_t *_Datagram_CheckNewConnections (void)
 	int			command;
 	int			control;
 	int			ret;
+	int			c;
 
 	acceptsock = dfunc.CheckNewConnections();
 	if (acceptsock == -1)
@@ -929,23 +923,7 @@ static qsocket_t *_Datagram_CheckNewConnections (void)
 
 		// find the search start location
 		prevCvarName = MSG_ReadString();
-		if (*prevCvarName)
-		{
-			var = Cvar_FindVar (prevCvarName);
-			if (!var)
-				return NULL;
-			var = var->next;
-		}
-		else
-			var = cvar_vars;
-
-		// search for the next server cvar
-		while (var)
-		{
-			if (var->flags & CVAR_NOTIFY)
-				break;
-			var = var->next;
-		}
+		var = Cvar_FindVarAfter(prevCvarName, CVAR_NOTIFY);
 
 		// send the response
 
@@ -971,7 +949,8 @@ static qsocket_t *_Datagram_CheckNewConnections (void)
 	if (strcmp(MSG_ReadString(), "QUAKE") != 0)
 		return NULL;
 
-	if (MSG_ReadByte() != NET_PROTOCOL_VERSION)
+	c = MSG_ReadByte();
+	if (c != NET_PROTOCOL_VERSION)
 	{
 		SZ_Clear(&net_message);
 		// save space for the header, filled in later
@@ -1080,7 +1059,6 @@ static qsocket_t *_Datagram_CheckNewConnections (void)
 	MSG_WriteByte(&net_message, CCREP_ACCEPT);
 	dfunc.GetSocketAddr(newsock, &newaddr);
 	MSG_WriteLong(&net_message, dfunc.GetSocketPort(&newaddr));
-//	MSG_WriteString(&net_message, dfunc.AddrToString(&newaddr));
 	*((int *)net_message.data) = BigLong(NETFLAG_CTL | (net_message.cursize & NETFLAG_LENGTH_MASK));
 	dfunc.Write (acceptsock, net_message.data, net_message.cursize, &clientaddr);
 	SZ_Clear(&net_message);
@@ -1108,6 +1086,7 @@ static void _Datagram_SearchForHosts (qboolean xmit)
 	struct qsockaddr readaddr;
 	struct qsockaddr myaddr;
 	int		control;
+	int		c;
 
 	dfunc.GetSocketAddr (dfunc.controlSock, &myaddr);
 	if (xmit)
@@ -1147,7 +1126,8 @@ static void _Datagram_SearchForHosts (qboolean xmit)
 		if ((control & NETFLAG_LENGTH_MASK) != ret)
 			continue;
 
-		if (MSG_ReadByte() != CCREP_SERVER_INFO)
+		c = MSG_ReadByte();
+		if (c != CCREP_SERVER_INFO)
 			continue;
 
 		dfunc.GetAddrFromName(MSG_ReadString(), &readaddr);
@@ -1166,7 +1146,8 @@ static void _Datagram_SearchForHosts (qboolean xmit)
 		strcpy(hostcache[n].map, MSG_ReadString());
 		hostcache[n].users = MSG_ReadByte();
 		hostcache[n].maxusers = MSG_ReadByte();
-		if (MSG_ReadByte() != NET_PROTOCOL_VERSION)
+		c = MSG_ReadByte();
+		if (c != NET_PROTOCOL_VERSION)
 		{
 			strcpy(hostcache[n].cname, hostcache[n].name);
 			hostcache[n].cname[14] = 0;
@@ -1265,12 +1246,10 @@ static qsocket_t *_Datagram_Connect (char *host)
 				// is it from the right place?
 				if (sfunc.AddrCompare(&readaddr, &sendaddr) != 0)
 				{
-//#ifdef DEBUG
 					Con_DPrintf("wrong reply address\n");
 					Con_DPrintf("Expected: %s\n", StrAddr (&sendaddr));
 					Con_DPrintf("Received: %s\n", StrAddr (&readaddr));
 					CL_UpdateScreen ();
-//#endif
 					ret = 0;
 					continue;
 				}
@@ -1388,3 +1367,4 @@ qsocket_t *Datagram_Connect (char *host)
 				break;
 	return ret;
 }
+