thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 12:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

State scaffolding for challenge-response

Browse source
This commit is contained in:
AJ Martinez 2023-03-18 01:24:13 -07:00 • committed by James R
parent 805186c3a9
commit 568dc59aa5
3 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/d_clisrv.c
View file

@ -161,6 +161,8 @@ char lastReceivedKey[MAXNETNODES][32];
boolean serverisfull = false; //lets us be aware if the server was full after we check files, but before downloading, so we can ask if the user still wants to download or not boolean serverisfull = false; //lets us be aware if the server was full after we check files, but before downloading, so we can ask if the user still wants to download or not
tic_t firstconnectattempttime = 0; tic_t firstconnectattempttime = 0;
char awaitingChallenge[32];
// engine // engine
// Must be a power of two // Must be a power of two
@ -833,6 +835,14 @@ static boolean CL_SendJoin(void)
return HSendPacket(servernode, false, 0, sizeof (clientconfig_pak)); return HSendPacket(servernode, false, 0, sizeof (clientconfig_pak));
} }
static boolean CL_SendKey(void)
{
netbuffer->packettype = PT_CLIENTKEY;
memcpy(netbuffer->u.clientkey.key, public_key, sizeof(public_key));
return HSendPacket(servernode, false, 0, sizeof (clientkey_pak) );
}
static void static void
CopyCaretColors (char *p, const char *s, int n) CopyCaretColors (char *p, const char *s, int n)
{ {
@ -1883,6 +1893,7 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
return false; return false;
} }
case CL_LOADFILES: case CL_LOADFILES:
CONS_Printf("loadfiles\n");
if (CL_LoadServerFiles()) if (CL_LoadServerFiles())
cl_mode = CL_SETUPFILES; cl_mode = CL_SETUPFILES;
@ -1892,7 +1903,7 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
{ {
*asksent = 0; //This ensure the first join ask is right away *asksent = 0; //This ensure the first join ask is right away
firstconnectattempttime = I_GetTime(); firstconnectattempttime = I_GetTime();
cl_mode = CL_ASKJOIN; cl_mode = CL_SENDKEY;
} }
break; break;
case CL_ASKJOIN: case CL_ASKJOIN:
@ -1929,8 +1940,19 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
} }
break; break;
case CL_SENDKEY: case CL_SENDKEY:
CONS_Printf("sendkey\n");
if (I_GetTime() >= *asksent && CL_SendKey())
{
*asksent = I_GetTime() + NEWTICRATE*3;
cl_mode = CL_WAITCHALLENGE;
}
break; break;
case CL_WAITCHALLENGE: case CL_WAITCHALLENGE:
CONS_Printf("waitchallenge\n");
if (I_GetTime() >= *asksent)
{
cl_mode = CL_SENDKEY;
}
break; break;
case CL_DOWNLOADSAVEGAME: case CL_DOWNLOADSAVEGAME:
// At this state, the first (and only) needed file is the gamestate // At this state, the first (and only) needed file is the gamestate
@ -4501,11 +4523,14 @@ static void HandlePacketFromAwayNode(SINT8 node)
if (node == servernode) if (node == servernode)
break; break;
/* FALLTHRU */ /* FALLTHRU */
case PT_CLIENTKEY: case PT_CLIENTKEY:
if (server) if (server)
PT_ClientKey(node); PT_ClientKey(node);
break; break;
case PT_SERVERCHALLENGE:
memset(awaitingChallenge, 0, 32); // TODO: ACTUALLY COMPUTE CHALLENGE RESPONSE IDIOT
cl_mode = CL_ASKJOIN;
break;
default: default:
DEBFILE(va("unknown packet received (%d) from unknown host\n",netbuffer->packettype)); DEBFILE(va("unknown packet received (%d) from unknown host\n",netbuffer->packettype));
Net_CloseConnection(node); Net_CloseConnection(node);

1
src/d_clisrv.h
View file

@ -256,6 +256,7 @@ struct clientconfig_pak
UINT8 mode; UINT8 mode;
char names[MAXSPLITSCREENPLAYERS][MAXPLAYERNAME]; char names[MAXSPLITSCREENPLAYERS][MAXPLAYERNAME];
UINT8 availabilities[MAXAVAILABILITY]; UINT8 availabilities[MAXAVAILABILITY];
char challengeResponse[32];
} ATTRPACK; } ATTRPACK;
#define SV_SPEEDMASK 0x03 // used to send kartspeed #define SV_SPEEDMASK 0x03 // used to send kartspeed

3
src/d_main.h
View file

@ -31,6 +31,9 @@ extern const char *pandf; //Alam: how to path?
extern char srb2path[256]; //Alam: SRB2's Home extern char srb2path[256]; //Alam: SRB2's Home
extern char addonsdir[MAX_WADPATH]; // Where addons are stored extern char addonsdir[MAX_WADPATH]; // Where addons are stored
extern uint8_t public_key[32];
extern uint8_t secret_key[32];
// the infinite loop of D_SRB2Loop() called from win_main for windows version // the infinite loop of D_SRB2Loop() called from win_main for windows version
void D_SRB2Loop(void) FUNCNORETURN; void D_SRB2Loop(void) FUNCNORETURN;