From f4836bda0e7afe00f50758d188ecf2c36bd232bb Mon Sep 17 00:00:00 2001
From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 24 Feb 2006 04:46:27 +0000
Subject: [PATCH] removed canSend field from netconn_t, and added a fromserver
 variable in client parsing just for clarity

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6022 d7cf8633-e32d-0410-b094-e92efae38249
---
 netconn.c | 17 ++++++++---------
 netconn.h |  2 --
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/netconn.c b/netconn.c
index 9628a380..c729f2b2 100755
--- a/netconn.c
+++ b/netconn.c
@@ -440,7 +440,7 @@ int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data)
 	unsigned int *header;
 
 	// if a reliable message fragment has been lost, send it again
-	if (!conn->canSend && conn->sendMessageLength && (realtime - conn->lastSendTime) > 1.0)
+	if (conn->sendMessageLength && (realtime - conn->lastSendTime) > 1.0)
 	{
 		if (conn->sendMessageLength <= MAX_PACKETFRAGMENT)
 		{
@@ -468,7 +468,7 @@ int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data)
 	}
 
 	// if we have a new reliable message to send, do so
-	if (conn->canSend && conn->message.cursize)
+	if (!conn->sendMessageLength && conn->message.cursize)
 	{
 		if (conn->message.cursize > (int)sizeof(conn->sendMessage))
 		{
@@ -506,7 +506,6 @@ int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data)
 		memcpy(sendbuffer + NET_HEADERSIZE, conn->sendMessage, dataLen);
 
 		conn->sendSequence++;
-		conn->canSend = false;
 
 		NetConn_Write(conn->mysocket, (void *)&sendbuffer, packetLen, &conn->peeraddress);
 
@@ -670,7 +669,6 @@ netconn_t *NetConn_Open(lhnetsocket_t *mysocket, lhnetaddress_t *peeraddress)
 	conn = (netconn_t *)Mem_Alloc(netconn_mempool, sizeof(*conn));
 	conn->mysocket = mysocket;
 	conn->peeraddress = *peeraddress;
-	conn->canSend = true;
 	conn->lastMessageTime = realtime;
 	conn->message.data = conn->messagedata;
 	conn->message.maxsize = sizeof(conn->messagedata);
@@ -831,10 +829,7 @@ static int NetConn_ReceivedMessage(netconn_t *conn, unsigned char *data, int len
 							}
 						}
 						else
-						{
 							conn->sendMessageLength = 0;
-							conn->canSend = true;
-						}
 					}
 					else
 						Con_DPrint("Duplicate ACK received\n");
@@ -914,11 +909,15 @@ int NetConn_IsLocalGame(void)
 
 static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *data, int length, lhnetaddress_t *peeraddress)
 {
+	qboolean fromserver;
 	int ret, c, control;
 	const char *s;
 	char *string, addressstring2[128], cname[128], ipstring[32];
 	char stringbuf[16384];
 
+	// quakeworld ingame packet
+	fromserver = cls.netcon && mysocket == cls.netcon->mysocket && !LHNETADDRESS_Compare(&cls.netcon->peeraddress, peeraddress);
+
 	if (length >= 5 && data[0] == 255 && data[1] == 255 && data[2] == 255 && data[3] == 255)
 	{
 		// received a command string - strip off the packaging and put it
@@ -1182,7 +1181,7 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat
 		return true;
 	}
 	ret = 0;
-	if (length >= (int)NET_HEADERSIZE && cls.netcon && mysocket == cls.netcon->mysocket && !LHNETADDRESS_Compare(&cls.netcon->peeraddress, peeraddress) && (ret = NetConn_ReceivedMessage(cls.netcon, data, length)) == 2)
+	if (fromserver && length >= (int)NET_HEADERSIZE && (ret = NetConn_ReceivedMessage(cls.netcon, data, length)) == 2)
 		CL_ParseServerMessage();
 	return ret;
 }
@@ -1954,7 +1953,7 @@ static void Net_Heartbeat_f(void)
 
 void PrintStats(netconn_t *conn)
 {
-	Con_Printf("address=%21s canSend=%u sendSeq=%6u recvSeq=%6u\n", conn->address, conn->canSend, conn->sendSequence, conn->receiveSequence);
+	Con_Printf("address=%21s canSend=%u sendSeq=%6u recvSeq=%6u\n", conn->address, !conn->sendMessageLength, conn->sendSequence, conn->receiveSequence);
 }
 
 void Net_Stats_f(void)
diff --git a/netconn.h b/netconn.h
index cd44ab16..d29bc2e6 100755
--- a/netconn.h
+++ b/netconn.h
@@ -125,8 +125,6 @@ typedef struct netconn_s
 	double lastMessageTime;
 	double lastSendTime;
 
-	qboolean canSend;
-
 	// writing buffer to send to peer as the next reliable message
 	// can be added to at any time, copied into sendMessage buffer when it is
 	// possible to send a reliable message and then cleared
-- 
2.39.2