networkthreading: fix it up

Author: RaphaelIT7

source/modules/networkthreading.cpp

@@ -90,7 +90,8 @@ struct QueuedPacket {
 			pBytes = nullptr;
 		}
 
-		ConDMsg(PROJECT_NAME " - networkthreading: Freeing %i bytes after packet was now processed (%p)\n", pPacket.size, this);
+		if (g_pNetworkThreadingModule.InDebug() == 1)
+			Msg(PROJECT_NAME " - networkthreading: Freeing %i bytes after packet was now processed (%p)\n", pPacket.size, this);
 	}
 
 	netpacket_s pPacket;
@@ -117,9 +118,11 @@ static void AddPacketToQueueForMainThread(netpacket_s* pPacket, bool bIsConnecti
 	memcpy(pQueue->pBytes, pPacket->data, pPacket->size);
 
 	pQueue->pPacket.data = pQueue->pBytes; // Update the pointer for later access
-	pQueue->pPacket.message.StartReading( pQueue->pPacket.data, pQueue->pPacket.size ); // also needs updating
+	pQueue->pPacket.message.StartReading( pQueue->pPacket.data, pQueue->pPacket.size, pPacket->message.GetNumBitsRead() ); // also needs updating
+	pQueue->pPacket.pNext = NULL;
 
-	ConDMsg(PROJECT_NAME " - networkthreading: Added %i bytes packet to queue (%p)\n", pPacket->size, pQueue);
+	if (g_pNetworkThreadingModule.InDebug() == 1)
+		Msg(PROJECT_NAME " - networkthreading: Added %i bytes packet to queue (%p)\n", pPacket->size, pQueue);
 
 	AUTO_LOCK(g_pQueuePacketsMutex);
 	g_pQueuedPackets.push_back(pQueue);
@@ -145,7 +148,9 @@ static HandleStatus ShouldHandlePacket(netpacket_s* pPacket, bool isConnectionle
 		if (networkthreading_parallelprocessing.GetBool())
 		{
 			if (c == A2S_GETCHALLENGE || c == A2S_SERVERQUERY_GETCHALLENGE || c == A2S_INFO || c == A2S_PLAYER || c == A2S_RULES)
+			{
 				return HandleStatus::HANDLE_NOW;
+			}
 		}
 	}
 
@@ -225,7 +230,7 @@ static SIMPLETHREAD_RETURNVALUE NetworkThread(void* pThreadData)
 			CNetChan* netchan = func_NET_FindNetChannel(nSocket, packet->from);
 			if (netchan)
 			{
-				HandleStatus pStatus = ShouldHandlePacket(packet, true);
+				HandleStatus pStatus = ShouldHandlePacket(packet, false);
 				if (pStatus == HandleStatus::HANDLE_NOW) {
 					netchan->ProcessPacket(packet, true);
 				} else {
@@ -234,7 +239,8 @@ static SIMPLETHREAD_RETURNVALUE NetworkThread(void* pThreadData)
 			} else {
 				char pNetAddr[64]; // Needed since else .ToString is not threadsafe!
 				(*(netadrnew_s*)&packet->from).ToString(pNetAddr, sizeof(pNetAddr), false);
-				ConDMsg(PROJECT_NAME " - networkthreading: Discarding of %i bytes since there is no channel for %s!\n", packet->size, pNetAddr);
+				if (g_pNetworkThreadingModule.InDebug() == 1)
+					Msg(PROJECT_NAME " - networkthreading: Discarding of %i bytes since there is no channel for %s!\n", packet->size, pNetAddr);
 			}
 		}
 
@@ -273,8 +279,14 @@ static void hook_NET_ProcessSocket(int nSocket, IConnectionlessPacketHandler* pH
 	for (QueuedPacket* pQueuePacket : g_pQueuedPackets)
 	{
 		if (pQueuePacket->bIsConnectionless) {
+			if (g_pNetworkThreadingModule.InDebug() == 1)
+				Msg(PROJECT_NAME " - networkthreading: Processed %i bytes as connectionless! (%p)\n", pQueuePacket->pPacket.size, pQueuePacket);
+
 			Util::server->ProcessConnectionlessPacket(&pQueuePacket->pPacket);
 		} else {
+			if (g_pNetworkThreadingModule.InDebug() == 1)
+				Msg(PROJECT_NAME " - networkthreading: Processed %i bytes as net channel! (%p)\n", pQueuePacket->pPacket.size, pQueuePacket);
+
 			CNetChan* netchan = func_NET_FindNetChannel(nSocket, pQueuePacket->pPacket.from);
 			if (netchan)
 				netchan->ProcessPacket(&pQueuePacket->pPacket, true);