fix two bugs in srcon/rcon_secure 2. It now WORKS.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9287 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/host_cmd.c b/host_cmd.c
index 5b45a09d7eef736571c9bd7361fb34ec1abb8c7b..21ddd7aa7e40022f7907694cc672c7a9a66f735c 100644 (file)
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -2459,8 +2459,8 @@ void Host_Rcon_f (void) // credit: taken from QuakeWorld
                                NetConn_WriteString(mysocket, "\377\377\377\377getchallenge", &to); // otherwise we'll request the challenge later
                        strlcpy(cls.rcon_commands[cls.rcon_ringpos], Cmd_Args(), sizeof(cls.rcon_commands[cls.rcon_ringpos]));
                        cls.rcon_addresses[cls.rcon_ringpos] = to;
-                       cls.rcon_ringpos = (cls.rcon_ringpos) % 64;
-                       cls.rcon_timeout[i] = realtime + rcon_secure_challengetimeout.value;
+                       cls.rcon_timeout[cls.rcon_ringpos] = realtime + rcon_secure_challengetimeout.value;
+                       cls.rcon_ringpos = (cls.rcon_ringpos + 1) % MAX_RCONS;
                }
                else if(rcon_secure.integer)
                {

diff --git a/netconn.c b/netconn.c
index a66e2f323da0925e79cbe75db4885b3f51dd4075..32269068b357bcf66eaf82ae467274f86eee1cd5 100755 (executable)
--- a/netconn.c
+++ b/netconn.c
@@ -1579,7 +1579,7 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat
                        int i, j;
                        for (j = 0;j < MAX_RCONS;j++)
                        {
-                               i = (cls.rcon_ringpos + j + 1) % MAX_RCONS;
+                               i = (cls.rcon_ringpos + j) % MAX_RCONS;
                                if(cls.rcon_commands[i][0])
                                        if (!LHNETADDRESS_Compare(peeraddress, &cls.rcon_addresses[i]))
                                                break;