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

Pass key into player_t for other stuff to work with it

Browse source
This commit is contained in:
AJ Martinez 2023-03-18 02:01:45 -07:00 • committed by James R
parent 568dc59aa5
commit 9b77d95357
4 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/d_clisrv.c
View file

@ -157,6 +157,7 @@ char connectedservername[MAXSERVERNAME];
boolean acceptnewnode = true; boolean acceptnewnode = true;
char lastReceivedKey[MAXNETNODES][32]; char lastReceivedKey[MAXNETNODES][32];
char lastComputedChallenge[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;
@ -832,6 +833,8 @@ static boolean CL_SendJoin(void)
memcpy(&netbuffer->u.clientcfg.availabilities, R_GetSkinAvailabilities(false, false), MAXAVAILABILITY*sizeof(UINT8)); memcpy(&netbuffer->u.clientcfg.availabilities, R_GetSkinAvailabilities(false, false), MAXAVAILABILITY*sizeof(UINT8));
memcpy(&netbuffer->u.clientcfg.challengeResponse, awaitingChallenge, 32);
return HSendPacket(servernode, false, 0, sizeof (clientconfig_pak)); return HSendPacket(servernode, false, 0, sizeof (clientconfig_pak));
} }
@ -3684,6 +3687,7 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
players[newplayernum].splitscreenindex = splitscreenplayer; players[newplayernum].splitscreenindex = splitscreenplayer;
players[newplayernum].bot = false; players[newplayernum].bot = false;
memcpy(players[newplayernum].public_key, lastReceivedKey[node], sizeof(public_key));
playerconsole[newplayernum] = console; playerconsole[newplayernum] = console;
splitscreen_original_party_size[console] = splitscreen_original_party_size[console] =
@ -4136,6 +4140,10 @@ static void HandleConnect(SINT8 node)
SV_SendRefuse(node, va(M_GetText("Too many people are connecting.\nPlease wait %d seconds and then\ntry rejoining."), SV_SendRefuse(node, va(M_GetText("Too many people are connecting.\nPlease wait %d seconds and then\ntry rejoining."),
(joindelay - 2 * cv_joindelay.value * TICRATE) / TICRATE)); (joindelay - 2 * cv_joindelay.value * TICRATE) / TICRATE));
} }
else if (netgame && node != 0 && !memcmp(netbuffer->u.clientcfg.challengeResponse, lastComputedChallenge[node], 32))
{
SV_SendRefuse(node, M_GetText("Failed to validate key exchange."));
}
else else
{ {
boolean newnode = false; boolean newnode = false;

1
src/d_clisrv.h
View file

@ -461,6 +461,7 @@ extern boolean acceptnewnode;
extern SINT8 servernode; extern SINT8 servernode;
extern char connectedservername[MAXSERVERNAME]; extern char connectedservername[MAXSERVERNAME];
extern char lastReceivedKey[MAXNETNODES][32]; extern char lastReceivedKey[MAXNETNODES][32];
extern char lastComputedChallenge[MAXNETNODES][32];
void Command_Ping_f(void); void Command_Ping_f(void);
extern tic_t connectiontimeout; extern tic_t connectiontimeout;

6
src/d_netfil.c
View file

@ -1319,13 +1319,15 @@ void PT_ClientKey(INT32 node)
clientkey_pak *packet = (void*)&netbuffer->u.clientkey; clientkey_pak *packet = (void*)&netbuffer->u.clientkey;
// TODO // TODO
// Stage 1: Exchange packets with no verification of their contents (YOU ARE HERE) // Stage 1: Exchange packets with no verification of their contents
// Stage 2: Exchange packets with a check, but no crypto // Stage 2: Exchange packets with a check, but no crypto (YOU ARE HERE)
// Stage 3: The crypto part // Stage 3: The crypto part
memcpy(lastReceivedKey[node], packet->key, 32); memcpy(lastReceivedKey[node], packet->key, 32);
netbuffer->packettype = PT_SERVERCHALLENGE; netbuffer->packettype = PT_SERVERCHALLENGE;
csprng(lastComputedChallenge[node], sizeof(serverchallenge_pak));
memcpy(&netbuffer->u.serverchallenge, lastComputedChallenge[node], sizeof(serverchallenge_pak));
HSendPacket(node, false, 0, sizeof (serverchallenge_pak)); HSendPacket(node, false, 0, sizeof (serverchallenge_pak));
} }

2
src/d_player.h
View file

@ -713,6 +713,8 @@ struct player_t
mobj_t *stumbleIndicator; mobj_t *stumbleIndicator;
mobj_t *sliptideZipIndicator; mobj_t *sliptideZipIndicator;
char public_key[32];
#ifdef HWRENDER #ifdef HWRENDER
fixed_t fovadd; // adjust FOV for hw rendering fixed_t fovadd; // adjust FOV for hw rendering
#endif #endif