diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 274fe398aa1403b54c62c8dcb218d03ebf954709..28d327ece2829036a85fa3ed44d4a9e7c730ff4f 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -44,6 +44,7 @@
#include "lzf.h"
#include "lua_script.h"
#include "lua_hook.h"
+#include "md5.h"
#ifdef CLIENT_LOADINGSCREEN
// cl loading screen
@@ -116,6 +117,9 @@ static UINT8 resynch_local_inprogress = false; // WE are desynched and getting p
static UINT8 player_joining = false;
UINT8 hu_resynching = 0;
+UINT8 adminpassmd5[16];
+boolean adminpasswordset = false;
+
// Client specific
static ticcmd_t localcmds;
static ticcmd_t localcmds2;
@@ -3760,6 +3764,7 @@ static void HandlePacketFromPlayer(SINT8 node)
XBOXSTATIC INT32 netconsole;
XBOXSTATIC tic_t realend, realstart;
XBOXSTATIC UINT8 *pak, *txtpak, numtxtpak;
+ XBOXSTATIC UINT8 finalmd5[16];/* Well, it's the cool thing to do? */
FILESTAMP
txtpak = NULL;
@@ -3958,6 +3963,32 @@ FILESTAMP
textcmd[0] += (UINT8)netbuffer->u.textcmd[0];
}
break;
+ case PT_LOGIN:
+ if (client)
+ break;
+
+#ifndef NOMD5
+ if (doomcom->datalength < 16)/* ignore partial sends */
+ break;
+
+ if (!adminpasswordset)
+ {
+ CONS_Printf(M_GetText("Password from %s failed (no password set).\n"), player_names[netconsole]);
+ break;
+ }
+
+ // Do the final pass to compare with the sent md5
+ D_MD5PasswordPass(adminpassmd5, 16, va("PNUM%02d", netconsole), &finalmd5);
+
+ if (!memcmp(netbuffer->u.md5sum, finalmd5, 16))
+ {
+ CONS_Printf(M_GetText("%s passed authentication.\n"), player_names[netconsole]);
+ COM_BufInsertText(va("promote %d\n", netconsole)); // do this immediately
+ }
+ else
+ CONS_Printf(M_GetText("Password from %s failed.\n"), player_names[netconsole]);
+#endif
+ break;
case PT_NODETIMEOUT:
case PT_CLIENTQUIT:
if (client)
@@ -4841,3 +4872,29 @@ tic_t GetLag(INT32 node)
{
return gametic - nettics[node];
}
+
+void D_MD5PasswordPass(const UINT8 *buffer, size_t len, const char *salt, void *dest)
+{
+#ifdef NOMD5
+ (void)buffer;
+ (void)len;
+ (void)salt;
+ memset(dest, 0, 16);
+#else
+ XBOXSTATIC char tmpbuf[256];
+ const size_t sl = strlen(salt);
+
+ if (len > 256-sl)
+ len = 256-sl;
+
+ memcpy(tmpbuf, buffer, len);
+ memmove(&tmpbuf[len], salt, sl);
+ //strcpy(&tmpbuf[len], salt);
+ len += strlen(salt);
+ if (len < 256)
+ memset(&tmpbuf[len],0,256-len);
+
+ // Yes, we intentionally md5 the ENTIRE buffer regardless of size...
+ md5_buffer(tmpbuf, 256, dest);
+#endif
+}
diff --git a/src/d_clisrv.h b/src/d_clisrv.h
index 8443b3fc0e72ca6600daca61244d484e355fe9cf..c005f3f9a699862a474d66449f710826ae236ba5 100644
--- a/src/d_clisrv.h
+++ b/src/d_clisrv.h
@@ -70,6 +70,9 @@ typedef enum
PT_NODETIMEOUT, // Packet sent to self if the connection times out.
PT_RESYNCHING, // Packet sent to resync players.
// Blocks game advance until synched.
+
+ PT_LOGIN, // Login attempt from the client.
+
#ifdef NEWPING
PT_PING, // Packet sent to tell clients the other client's latency to server.
#endif
@@ -398,6 +401,7 @@ typedef struct
UINT8 textcmd[MAXTEXTCMD+1]; // 66049 bytes (wut??? 64k??? More like 257 bytes...)
filetx_pak filetxpak; // 139 bytes
clientconfig_pak clientcfg; // 136 bytes
+ UINT8 md5sum[16];
serverinfo_pak serverinfo; // 1024 bytes
serverrefuse_pak serverrefuse; // 65025 bytes (somehow I feel like those values are garbage...)
askinfo_pak askinfo; // 61 bytes
@@ -526,5 +530,10 @@ void D_ResetTiccmds(void);
tic_t GetLag(INT32 node);
UINT8 GetFreeXCmdSize(void);
+void D_MD5PasswordPass(const UINT8 *buffer, size_t len, const char *salt, void *dest);
+
extern UINT8 hu_resynching;
+
+extern UINT8 adminpassmd5[16];
+extern boolean adminpasswordset;
#endif
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index af37d56200491d263e0610808dc6994b670b147e..cc9127af018ca6f6863cd124efe1e9f9026d54cf 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -34,18 +34,19 @@
#include "p_spec.h"
#include "m_cheat.h"
#include "d_clisrv.h"
+#include "d_net.h"
#include "v_video.h"
#include "d_main.h"
#include "m_random.h"
#include "f_finale.h"
#include "filesrch.h"
#include "mserv.h"
-#include "md5.h"
#include "z_zone.h"
#include "lua_script.h"
#include "lua_hook.h"
#include "m_cond.h"
#include "m_anigif.h"
+#include "md5.h"
#ifdef NETGAME_DEVMODE
#define CV_RESTRICT CV_NETVAR
@@ -143,7 +144,6 @@ static void Command_Clearscores_f(void);
// Remote Administration
static void Command_Changepassword_f(void);
static void Command_Login_f(void);
-static void Got_Login(UINT8 **cp, INT32 playernum);
static void Got_Verification(UINT8 **cp, INT32 playernum);
static void Got_Removal(UINT8 **cp, INT32 playernum);
static void Command_Verify_f(void);
@@ -437,7 +437,6 @@ void D_RegisterServerCommands(void)
// Remote Administration
COM_AddCommand("password", Command_Changepassword_f);
- RegisterNetXCmd(XD_LOGIN, Got_Login);
COM_AddCommand("login", Command_Login_f); // useful in dedicated to kick off remote admin
COM_AddCommand("promote", Command_Verify_f);
RegisterNetXCmd(XD_VERIFIED, Got_Verification);
@@ -2652,35 +2651,7 @@ static void Got_Teamchange(UINT8 **cp, INT32 playernum)
// Attempts to make password system a little sane without
// rewriting the entire goddamn XD_file system
//
-#include "md5.h"
-static void D_MD5PasswordPass(const UINT8 *buffer, size_t len, const char *salt, void *dest)
-{
-#ifdef NOMD5
- (void)buffer;
- (void)len;
- (void)salt;
- memset(dest, 0, 16);
-#else
- XBOXSTATIC char tmpbuf[256];
- const size_t sl = strlen(salt);
-
- if (len > 256-sl)
- len = 256-sl;
- memcpy(tmpbuf, buffer, len);
- memmove(&tmpbuf[len], salt, sl);
- //strcpy(&tmpbuf[len], salt);
- len += strlen(salt);
- if (len < 256)
- memset(&tmpbuf[len],0,256-len);
-
- // Yes, we intentionally md5 the ENTIRE buffer regardless of size...
- md5_buffer(tmpbuf, 256, dest);
-#endif
-}
-
#define BASESALT "basepasswordstorage"
-static UINT8 adminpassmd5[16];
-static boolean adminpasswordset = false;
void D_SetPassword(const char *pw)
{
@@ -2718,7 +2689,6 @@ static void Command_Login_f(void)
// If we have no MD5 support then completely disable XD_LOGIN responses for security.
CONS_Alert(CONS_NOTICE, "Remote administration commands are not supported in this build.\n");
#else
- XBOXSTATIC UINT8 finalmd5[16];
const char *pw;
if (!netgame)
@@ -2738,47 +2708,15 @@ static void Command_Login_f(void)
pw = COM_Argv(1);
// Do the base pass to get what the server has (or should?)
- D_MD5PasswordPass((const UINT8 *)pw, strlen(pw), BASESALT, &finalmd5);
+ D_MD5PasswordPass((const UINT8 *)pw, strlen(pw), BASESALT, &netbuffer->u.md5sum);
// Do the final pass to get the comparison the server will come up with
- D_MD5PasswordPass(finalmd5, 16, va("PNUM%02d", consoleplayer), &finalmd5);
+ D_MD5PasswordPass(netbuffer->u.md5sum, 16, va("PNUM%02d", consoleplayer), &netbuffer->u.md5sum);
CONS_Printf(M_GetText("Sending login... (Notice only given if password is correct.)\n"));
- SendNetXCmd(XD_LOGIN, finalmd5, 16);
-#endif
-}
-
-static void Got_Login(UINT8 **cp, INT32 playernum)
-{
-#ifdef NOMD5
- // If we have no MD5 support then completely disable XD_LOGIN responses for security.
- (void)cp;
- (void)playernum;
-#else
- UINT8 sentmd5[16], finalmd5[16];
-
- READMEM(*cp, sentmd5, 16);
-
- if (client)
- return;
-
- if (!adminpasswordset)
- {
- CONS_Printf(M_GetText("Password from %s failed (no password set).\n"), player_names[playernum]);
- return;
- }
-
- // Do the final pass to compare with the sent md5
- D_MD5PasswordPass(adminpassmd5, 16, va("PNUM%02d", playernum), &finalmd5);
-
- if (!memcmp(sentmd5, finalmd5, 16))
- {
- CONS_Printf(M_GetText("%s passed authentication.\n"), player_names[playernum]);
- COM_BufInsertText(va("promote %d\n", playernum)); // do this immediately
- }
- else
- CONS_Printf(M_GetText("Password from %s failed.\n"), player_names[playernum]);
+ netbuffer->packettype = PT_LOGIN;
+ HSendPacket(servernode, true, 0, 16);
#endif
}
diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index b82065c82148b47a86c218157b4a0ac5c45b23a7..2446933567f3193b36bf678af553014dc23c087c 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -125,8 +125,8 @@ typedef enum
XD_ADDPLAYER, // 10
XD_TEAMCHANGE, // 11
XD_CLEARSCORES, // 12
- XD_LOGIN, // 13
- XD_VERIFIED, // 14
+ // UNUSED 13 (Because I don't want to change these comments)
+ XD_VERIFIED = 14,//14
XD_RANDOMSEED, // 15
XD_RUNSOC, // 16
XD_REQADDFILE, // 17