added dinput.lib requirement in darkplaces.dsp

[xonotic/darkplaces.git] / netconn.c

diff --git a/netconn.c b/netconn.c
index 6352cf782a0410fc1e914159a60c6c5b67d2bab6..4234d323f32576c1b3026e459b2f15c30520dc0e 100755 (executable)
--- a/netconn.c
+++ b/netconn.c
@@ -1733,7 +1733,7 @@ void NetConn_ClientFrame(void)
                while (cl_sockets[i] && (length = NetConn_Read(cl_sockets[i], readbuffer, sizeof(readbuffer), &peeraddress)) > 0)
                        NetConn_ClientParsePacket(cl_sockets[i], readbuffer, length, &peeraddress);
        NetConn_QueryQueueFrame();
-       if (cls.netcon && realtime > cls.netcon->timeout)
+       if (cls.netcon && realtime > cls.netcon->timeout && !sv.active)
        {
                Con_Print("Connection timed out\n");
                CL_Disconnect();
@@ -2091,18 +2091,36 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat
                {
                        int i;
                        char *s = string + 5;
+                       char *endpos = string + length + 1; // one behind the NUL, so adding strlen+1 will eventually reach it
                        char password[64];
                        for (i = 0;*s > ' ';s++)
                                if (i < (int)sizeof(password) - 1)
                                        password[i++] = *s;
+                       if(*s <= ' ' && s != endpos) // skip leading ugly space
+                               ++s;
                        password[i] = 0;
                        if (password[0] > ' ' && !strcmp(rcon_password.string, password))
                        {
                                // looks like a legitimate rcon command with the correct password
-                               Con_Printf("server received rcon command from %s:\n%s\n", host_client ? host_client->name : addressstring2, s);
+                               char *s_ptr = s;
+                               Con_Printf("server received rcon command from %s:\n", host_client ? host_client->name : addressstring2);
+                               while(s_ptr != endpos)
+                               {
+                                       size_t l = strlen(s_ptr);
+                                       if(l)
+                                               Con_Printf(" %s;", s_ptr);
+                                       s_ptr += l + 1;
+                               }
+                               Con_Printf("\n");
                                rcon_redirect = true;
                                rcon_redirect_bufferpos = 0;
-                               Cmd_ExecuteString(s, src_command);
+                               while(s != endpos)
+                               {
+                                       size_t l = strlen(s);
+                                       if(l)
+                                               Cmd_ExecuteString(s, src_command);
+                                       s += l + 1;
+                               }
                                rcon_redirect_buffer[rcon_redirect_bufferpos] = 0;
                                rcon_redirect = false;
                                // print resulting text to client