X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=netconn.c;h=3f0796e54e9485027ae685c18c4f981cfc751412;hp=eb605a1674f623c38874663749227e3d4f06e698;hb=05b2bea177017a0e9f6a03609e9f9521e2e2941f;hpb=04ebd98618c773b10ada031f18b99f11020b559f

diff --git a/netconn.c b/netconn.c
index eb605a16..3f0796e5 100755
--- a/netconn.c
+++ b/netconn.c
@@ -2125,8 +2125,14 @@ void NetConn_ClientFrame(void)
 		SZ_Clear(&net_message);
 	}
 	for (i = 0;i < cl_numsockets;i++)
+	{
 		while (cl_sockets[i] && (length = NetConn_Read(cl_sockets[i], readbuffer, sizeof(readbuffer), &peeraddress)) > 0)
+		{
+//			R_TimeReport("clientreadnetwork");
 			NetConn_ClientParsePacket(cl_sockets[i], readbuffer, length, &peeraddress);
+//			R_TimeReport("clientparsepacket");
+		}
+	}
 	NetConn_QueryQueueFrame();
 	if (cls.netcon && realtime > cls.netcon->timeout && !sv.active)
 	{
@@ -2207,7 +2213,7 @@ static qboolean NetConn_BuildStatusResponse(const char* challenge, char* out_msg
 						"%s",
 						fullstatus ? "statusResponse" : "infoResponse",
 						gamename, com_modname, gameversion.integer, svs.maxclients,
-						nb_clients, nb_bots, sv.name, hostname.string, NET_PROTOCOL_VERSION,
+						nb_clients, nb_bots, sv.worldbasename, hostname.string, NET_PROTOCOL_VERSION,
 						*qcstatus ? "\\qcstatus\\" : "", qcstatus,
 						challenge ? "\\challenge\\" : "", challenge ? challenge : "",
 						fullstatus ? "\n" : "");
@@ -2444,7 +2450,7 @@ qboolean plaintext_matching(lhnetaddress_t *peeraddress, const char *password, c
 const char *RCon_Authenticate(lhnetaddress_t *peeraddress, const char *password, const char *s, const char *endpos, rcon_matchfunc_t comparator, const char *cs, int cslen)
 {
 	const char *text, *userpass_start, *userpass_end, *userpass_startpass;
-	char buf[MAX_INPUTLINE];
+	static char buf[MAX_INPUTLINE];
 	qboolean hasquotes;
 	qboolean restricted = false;
 	qboolean have_usernames = false;
@@ -2582,7 +2588,8 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat
 	int i, ret, clientnum, best;
 	double besttime;
 	client_t *client;
-	char *s, *string, response[1400], addressstring2[128], stringbuf[16384];
+	char *s, *string, response[1400], addressstring2[128];
+	static char stringbuf[16384];
 	qboolean islocal = (LHNETADDRESS_GetAddressType(peeraddress) == LHNETADDRESSTYPE_LOOP);
 
 	if (!sv.active)