X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sv_user.c;h=6d9a39d103bea67b4dbb088581d4827044d8db63;hb=6914302f2f1a7c6849604ace4967e39bf32ff0e6;hp=18878ec16c55b5207625fa203fe449bc867cf048;hpb=83903eb7d63631e1b0be6395495903b2cf15d1fb;p=xonotic%2Fdarkplaces.git diff --git a/sv_user.c b/sv_user.c index 18878ec1..6d9a39d1 100644 --- a/sv_user.c +++ b/sv_user.c @@ -20,21 +20,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // sv_user.c -- server code for moving users #include "quakedef.h" - -cvar_t sv_edgefriction = {0, "edgefriction", "2", "how much you slow down when nearing a ledge you might fall off"}; -cvar_t sv_idealpitchscale = {0, "sv_idealpitchscale","0.8", "how much to look up/down slopes and stairs when not using freelook"}; -cvar_t sv_maxspeed = {CVAR_NOTIFY, "sv_maxspeed", "320", "maximum speed a player can accelerate to when on ground (can be exceeded by tricks)"}; -cvar_t sv_maxairspeed = {0, "sv_maxairspeed", "30", "maximum speed a player can accelerate to when airborn (note that it is possible to completely stop by moving the opposite direction)"}; -cvar_t sv_accelerate = {0, "sv_accelerate", "10", "rate at which a player accelerates to sv_maxspeed"}; -cvar_t sv_airaccelerate = {0, "sv_airaccelerate", "-1", "rate at which a player accelerates to sv_maxairspeed while in the air, if less than 0 the sv_accelerate variable is used instead"}; -cvar_t sv_wateraccelerate = {0, "sv_wateraccelerate", "-1", "rate at which a player accelerates to sv_maxspeed while in the air, if less than 0 the sv_accelerate variable is used instead"}; -cvar_t sv_clmovement_enable = {0, "sv_clmovement_enable", "1", "whether to allow clients to use cl_movement prediction, which can cause choppy movement on the server which may annoy other players"}; -cvar_t sv_clmovement_minping = {0, "sv_clmovement_minping", "0", "if client ping is below this time in milliseconds, then their ability to use cl_movement prediction is disabled for a while (as they don't need it)"}; -cvar_t sv_clmovement_minping_disabletime = {0, "sv_clmovement_minping_disabletime", "1000", "when client falls below minping, disable their prediction for this many milliseconds (should be at least 1000 or else their prediction may turn on/off frequently)"}; -cvar_t sv_clmovement_waitforinput = {0, "sv_clmovement_waitforinput", "16", "when a client does not send input for this many frames, force them to move anyway (unlike QuakeWorld)"}; +#include "sv_demo.h" +#define DEBUGMOVES 0 static usercmd_t cmd; - +extern cvar_t sv_autodemo_perclient; /* =============== @@ -68,7 +58,7 @@ void SV_SetIdealPitch (void) bottom[1] = top[1]; bottom[2] = top[2] - 160; - tr = SV_Move (top, vec3_origin, vec3_origin, bottom, MOVE_NOMONSTERS, host_client->edict, SUPERCONTENTS_SOLID); + tr = SV_TraceLine(top, bottom, MOVE_NOMONSTERS, host_client->edict, SUPERCONTENTS_SOLID); // if looking at a wall, leave ideal the way is was if (tr.startsolid) return; @@ -134,7 +124,7 @@ void SV_UserFriction (void) start[2] = host_client->edict->fields.server->origin[2] + host_client->edict->fields.server->mins[2]; stop[2] = start[2] - 34; - trace = SV_Move (start, vec3_origin, vec3_origin, stop, MOVE_NOMONSTERS, host_client->edict, SV_GenericHitSuperContentsMask(host_client->edict)); + trace = SV_TraceLine(start, stop, MOVE_NOMONSTERS, host_client->edict, SV_GenericHitSuperContentsMask(host_client->edict)); if (trace.fraction == 1.0) friction = sv_friction.value*sv_edgefriction.value; @@ -175,6 +165,7 @@ void SV_Accelerate (void) host_client->edict->fields.server->velocity[i] += accelspeed*wishdir[i]; } +extern cvar_t sv_gameplayfix_q2airaccelerate; void SV_AirAccelerate (vec3_t wishveloc) { int i; @@ -187,7 +178,7 @@ void SV_AirAccelerate (vec3_t wishveloc) addspeed = wishspd - currentspeed; if (addspeed <= 0) return; - accelspeed = (sv_airaccelerate.value < 0 ? sv_accelerate.value : sv_airaccelerate.value)*wishspeed * sv.frametime; + accelspeed = (sv_airaccelerate.value < 0 ? sv_accelerate.value : sv_airaccelerate.value)*(sv_gameplayfix_q2airaccelerate.integer ? wishspd : wishspeed) * sv.frametime; if (accelspeed > addspeed) accelspeed = addspeed; @@ -359,7 +350,7 @@ void SV_AirMove (void) // noclip VectorCopy (wishvel, host_client->edict->fields.server->velocity); } - else if (onground && (!sv_gameplayfix_qwplayerphysics.integer || !(host_client->edict->fields.server->button2 || !((int)host_client->edict->fields.server->flags & FL_JUMPRELEASED)))) + else if (onground) { SV_UserFriction (); SV_Accelerate (); @@ -383,10 +374,26 @@ void SV_ClientThink (void) { vec3_t v_angle; + //Con_Printf("clientthink for %ims\n", (int) (sv.frametime * 1000)); + + SV_ApplyClientMove(); + // make sure the velocity is sane (not a NaN) + SV_CheckVelocity(host_client->edict); + + // LordHavoc: QuakeC replacement for SV_ClientThink (player movement) + if (prog->funcoffsets.SV_PlayerPhysics && sv_playerphysicsqc.integer) + { + prog->globals.server->time = sv.time; + prog->globals.server->self = PRVM_EDICT_TO_PROG(host_client->edict); + PRVM_ExecuteProgram (prog->funcoffsets.SV_PlayerPhysics, "QC function SV_PlayerPhysics is missing"); + SV_CheckVelocity(host_client->edict); + return; + } + if (host_client->edict->fields.server->movetype == MOVETYPE_NONE) return; - onground = (int)host_client->edict->fields.server->flags & FL_ONGROUND; + onground = ((int)host_client->edict->fields.server->flags & FL_ONGROUND) != 0; DropPunchAngle (); @@ -409,6 +416,7 @@ void SV_ClientThink (void) if ( (int)host_client->edict->fields.server->flags & FL_WATERJUMP ) { SV_WaterJump (); + SV_CheckVelocity(host_client->edict); return; } @@ -426,10 +434,12 @@ void SV_ClientThink (void) if ((host_client->edict->fields.server->waterlevel >= 2) && (host_client->edict->fields.server->movetype != MOVETYPE_NOCLIP)) { SV_WaterMove (); + SV_CheckVelocity(host_client->edict); return; } SV_AirMove (); + SV_CheckVelocity(host_client->edict); } /* @@ -450,12 +460,15 @@ void SV_ReadClientMove (void) if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__); // read ping time - if (sv.protocol != PROTOCOL_QUAKE && sv.protocol != PROTOCOL_QUAKEDP && sv.protocol != PROTOCOL_NEHAHRAMOVIE && sv.protocol != PROTOCOL_DARKPLACES1 && sv.protocol != PROTOCOL_DARKPLACES2 && sv.protocol != PROTOCOL_DARKPLACES3 && sv.protocol != PROTOCOL_DARKPLACES4 && sv.protocol != PROTOCOL_DARKPLACES5 && sv.protocol != PROTOCOL_DARKPLACES6) + if (sv.protocol != PROTOCOL_QUAKE && sv.protocol != PROTOCOL_QUAKEDP && sv.protocol != PROTOCOL_NEHAHRAMOVIE && sv.protocol != PROTOCOL_NEHAHRABJP && sv.protocol != PROTOCOL_NEHAHRABJP2 && sv.protocol != PROTOCOL_NEHAHRABJP3 && sv.protocol != PROTOCOL_DARKPLACES1 && sv.protocol != PROTOCOL_DARKPLACES2 && sv.protocol != PROTOCOL_DARKPLACES3 && sv.protocol != PROTOCOL_DARKPLACES4 && sv.protocol != PROTOCOL_DARKPLACES5 && sv.protocol != PROTOCOL_DARKPLACES6) move->sequence = MSG_ReadLong (); - move->time = MSG_ReadFloat (); + move->time = move->clienttime = MSG_ReadFloat (); if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__); move->receivetime = (float)sv.time; +#if DEBUGMOVES + Con_Printf("%s move%i #%i %ims (%ims) %i %i '%i %i %i' '%i %i %i'\n", move->time > move->receivetime ? "^3read future" : "^4read normal", sv_numreadmoves + 1, move->sequence, (int)floor((move->time - host_client->cmd.time) * 1000.0 + 0.5), (int)floor(move->time * 1000.0 + 0.5), move->impulse, move->buttons, (int)move->viewangles[0], (int)move->viewangles[1], (int)move->viewangles[2], (int)move->forwardmove, (int)move->sidemove, (int)move->upmove); +#endif // limit reported time to current time // (incase the client is trying to cheat) move->time = min(move->time, move->receivetime + sv.frametime); @@ -463,7 +476,7 @@ void SV_ReadClientMove (void) // read current angles for (i = 0;i < 3;i++) { - if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE) + if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE || sv.protocol == PROTOCOL_NEHAHRABJP || sv.protocol == PROTOCOL_NEHAHRABJP2 || sv.protocol == PROTOCOL_NEHAHRABJP3) move->viewangles[i] = MSG_ReadAngle8i(); else if (sv.protocol == PROTOCOL_DARKPLACES1) move->viewangles[i] = MSG_ReadAngle16i(); @@ -483,7 +496,7 @@ void SV_ReadClientMove (void) // read buttons // be sure to bitwise OR them into the move->buttons because we want to // accumulate button presses from multiple packets per actual move - if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE || sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5) + if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE || sv.protocol == PROTOCOL_NEHAHRABJP || sv.protocol == PROTOCOL_NEHAHRABJP2 || sv.protocol == PROTOCOL_NEHAHRABJP3 || sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5) move->buttons = MSG_ReadByte (); else move->buttons = MSG_ReadLong (); @@ -494,7 +507,7 @@ void SV_ReadClientMove (void) if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__); // PRYDON_CLIENTCURSOR - if (sv.protocol != PROTOCOL_QUAKE && sv.protocol != PROTOCOL_QUAKEDP && sv.protocol != PROTOCOL_NEHAHRAMOVIE && sv.protocol != PROTOCOL_DARKPLACES1 && sv.protocol != PROTOCOL_DARKPLACES2 && sv.protocol != PROTOCOL_DARKPLACES3 && sv.protocol != PROTOCOL_DARKPLACES4 && sv.protocol != PROTOCOL_DARKPLACES5) + if (sv.protocol != PROTOCOL_QUAKE && sv.protocol != PROTOCOL_QUAKEDP && sv.protocol != PROTOCOL_NEHAHRAMOVIE && sv.protocol != PROTOCOL_NEHAHRABJP && sv.protocol != PROTOCOL_NEHAHRABJP2 && sv.protocol != PROTOCOL_NEHAHRABJP3 && sv.protocol != PROTOCOL_DARKPLACES1 && sv.protocol != PROTOCOL_DARKPLACES2 && sv.protocol != PROTOCOL_DARKPLACES3 && sv.protocol != PROTOCOL_DARKPLACES4 && sv.protocol != PROTOCOL_DARKPLACES5) { // 30 bytes move->cursor_screen[0] = MSG_ReadShort() * (1.0f / 32767.0f); @@ -527,12 +540,6 @@ void SV_ReadClientMove (void) move->buttons |= host_client->cmd.buttons; } - // disable clientside movement prediction in some cases - if (ceil((move->receivetime - move->time) * 1000.0) < sv_clmovement_minping.integer) - host_client->clmovement_disabletimeout = realtime + sv_clmovement_minping_disabletime.value / 1000.0; - if (!sv_clmovement_enable.integer || host_client->clmovement_disabletimeout > realtime) - move->sequence = 0; - // now store this move for later execution // (we have to buffer the moves because of old ones being repeated) if (sv_numreadmoves < CL_MAX_USERCMDS) @@ -548,12 +555,20 @@ void SV_ExecuteClientMoves(void) #ifdef NUM_PING_TIMES double total; #endif + prvm_eval_t *val; if (sv_numreadmoves < 1) return; // only start accepting input once the player is spawned if (!host_client->spawned) return; - if (sv_readmoves[sv_numreadmoves-1].sequence && sv_clmovement_enable.integer && sv_clmovement_waitforinput.integer > 0) +#if DEBUGMOVES + Con_Printf("SV_ExecuteClientMoves: read %i moves at sv.time %f\n", sv_numreadmoves, (float)sv.time); +#endif + // disable clientside movement prediction in some cases + if (ceil(max(sv_readmoves[sv_numreadmoves-1].receivetime - sv_readmoves[sv_numreadmoves-1].time, 0) * 1000.0) < sv_clmovement_minping.integer) + host_client->clmovement_disabletimeout = realtime + sv_clmovement_minping_disabletime.value / 1000.0; + // several conditions govern whether clientside movement prediction is allowed + if (sv_readmoves[sv_numreadmoves-1].sequence && sv_clmovement_enable.integer && sv_clmovement_inputtimeout.value > 0 && host_client->clmovement_disabletimeout <= realtime && host_client->edict->fields.server->movetype == MOVETYPE_WALK && (!(val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.disableclientprediction)) || !val->_float)) { // process the moves in order and ignore old ones // but always trust the latest move @@ -563,10 +578,22 @@ void SV_ExecuteClientMoves(void) for (moveindex = 0;moveindex < sv_numreadmoves;moveindex++) { usercmd_t *move = sv_readmoves + moveindex; - if (host_client->cmd.sequence < move->sequence || moveindex == sv_numreadmoves - 1) + if (host_client->movesequence < move->sequence || moveindex == sv_numreadmoves - 1) { +#if DEBUGMOVES + Con_Printf("%smove #%i %ims (%ims) %i %i '%i %i %i' '%i %i %i'\n", (move->time - host_client->cmd.time) > sv.frametime * 1.01 ? "^1" : "^2", move->sequence, (int)floor((move->time - host_client->cmd.time) * 1000.0 + 0.5), (int)floor(move->time * 1000.0 + 0.5), move->impulse, move->buttons, (int)move->viewangles[0], (int)move->viewangles[1], (int)move->viewangles[2], (int)move->forwardmove, (int)move->sidemove, (int)move->upmove); +#endif // this is a new move - moveframetime = bound(0, move->time - host_client->cmd.time, 0.1); + move->time = bound(sv.time - 1, move->time, sv.time); // prevent slowhack/speedhack combos + move->time = max(move->time, host_client->cmd.time); // prevent backstepping of time + moveframetime = bound(0, move->time - host_client->cmd.time, min(0.1, sv_clmovement_inputtimeout.value)); + + // discard (treat like lost) moves with too low distance from + // the previous one to prevent hacks using float inaccuracy + // clients will see this as packet loss in the netgraph + if(moveframetime < 0.0005) + continue; + //Con_Printf("movesequence = %i (%i lost), moveframetime = %f\n", move->sequence, move->sequence ? move->sequence - host_client->movesequence - 1 : 0, moveframetime); host_client->cmd = *move; host_client->movesequence = move->sequence; @@ -576,7 +603,7 @@ void SV_ExecuteClientMoves(void) // (they can't go beyond the current time so there is no cheat issue // with this approach, and if they don't send input for a while they // start moving anyway, so the longest 'lagaport' possible is - // determined by the sv_clmovement_waitforinput cvar) + // determined by the sv_clmovement_inputtimeout cvar) if (moveframetime <= 0) continue; oldframetime = prog->globals.server->frametime; @@ -589,12 +616,12 @@ void SV_ExecuteClientMoves(void) if (sv.frametime > 0.05) { prog->globals.server->frametime = sv.frametime = moveframetime * 0.5f; - SV_Physics_ClientEntity(host_client->edict); + SV_Physics_ClientMove(); } - SV_Physics_ClientEntity(host_client->edict); + SV_Physics_ClientMove(); sv.frametime = oldframetime2; prog->globals.server->frametime = oldframetime; - host_client->clmovement_skipphysicsframes = sv_clmovement_waitforinput.integer; + host_client->clmovement_inputtimeout = sv_clmovement_inputtimeout.value; } } } @@ -614,13 +641,21 @@ void SV_ExecuteClientMoves(void) } // now copy the new move host_client->cmd = sv_readmoves[sv_numreadmoves-1]; + host_client->cmd.time = max(host_client->cmd.time, sv.time); + // physics will run up to sv.time, so allow no predicted moves + // before that otherwise, there is a speedhack by turning + // prediction on and off repeatedly on client side because the + // engine would run BOTH client and server physics for the same + // time + host_client->movesequence = 0; + // make sure that normal physics takes over immediately + host_client->clmovement_inputtimeout = 0; } - host_client->movesequence = host_client->cmd.sequence; // calculate average ping time - host_client->ping = host_client->cmd.receivetime - host_client->cmd.time; + host_client->ping = host_client->cmd.receivetime - host_client->cmd.clienttime; #ifdef NUM_PING_TIMES - host_client->ping_times[host_client->num_pings % NUM_PING_TIMES] = host_client->cmd.receivetime - host_client->cmd.time; + host_client->ping_times[host_client->num_pings % NUM_PING_TIMES] = host_client->cmd.receivetime - host_client->cmd.clienttime; host_client->num_pings++; for (i=0, total = 0;i < NUM_PING_TIMES;i++) total += host_client->ping_times[i]; @@ -679,7 +714,10 @@ void SV_ApplyClientMove (void) void SV_FrameLost(int framenum) { if (host_client->entitydatabase5) + { EntityFrame5_LostFrame(host_client->entitydatabase5, framenum); + EntityFrameCSQC_LostFrame(host_client, framenum); + } } void SV_FrameAck(int framenum) @@ -702,7 +740,10 @@ extern sizebuf_t vm_tempstringsbuf; void SV_ReadClientMessage(void) { int cmd, num, start; - char *s; + char *s, *p, *q; + + if(sv_autodemo_perclient.integer >= 2) + SV_WriteDemoMessage(host_client, &(host_client->netconnection->message), true); //MSG_BeginReading (); sv_numreadmoves = 0; @@ -743,7 +784,25 @@ void SV_ReadClientMessage(void) break; case clc_stringcmd: + // allow reliable messages now as the client is done with initial loading + if (host_client->sendsignon == 2) + host_client->sendsignon = 0; s = MSG_ReadString (); + q = NULL; + for(p = s; *p; ++p) switch(*p) + { + case 10: + case 13: + if(!q) + q = p; + break; + default: + if(q) + goto clc_stringcmd_invalid; // newline seen, THEN something else -> possible exploit + break; + } + if(q) + *q = 0; if (strncasecmp(s, "spawn", 5) == 0 || strncasecmp(s, "begin", 5) == 0 || strncasecmp(s, "prespawn", 8) == 0) @@ -761,6 +820,12 @@ void SV_ReadClientMessage(void) Cmd_ExecuteString (s, src_client); break; +clc_stringcmd_invalid: + Con_Printf("Received invalid stringcmd from %s\n", host_client->name); + if(developer.integer) + Com_HexDumpToConsole((unsigned char *) s, strlen(s)); + break; + case clc_disconnect: SV_DropClient (false); // client wants to disconnect return; @@ -797,13 +862,13 @@ void SV_ReadClientMessage(void) int crc; unsigned char *temp; FS_Seek(host_client->download_file, 0, SEEK_SET); - temp = Mem_Alloc(tempmempool, size); + temp = (unsigned char *) Mem_Alloc(tempmempool, size); FS_Read(host_client->download_file, temp, size); crc = CRC_Block(temp, size); Mem_Free(temp); // calculated crc, send the file info to the client // (so that it can verify the data) - Host_ClientCommands(va("\ncl_downloadfinished %i %i %s\n", size, crc, host_client->download_name)); + Host_ClientCommands("\ncl_downloadfinished %i %i %s\n", size, crc, host_client->download_name); Con_DPrintf("Download of %s by %s has finished\n", host_client->download_name, host_client->name); FS_Close(host_client->download_file); host_client->download_file = NULL; @@ -825,7 +890,7 @@ void SV_ReadClientMessage(void) if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__); num = MSG_ReadLong(); if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__); - if (developer_networkentities.integer >= 1) + if (developer_networkentities.integer >= 10) Con_Printf("recv clc_ackframe %i\n", num); // if the client hasn't progressed through signons yet, // ignore any clc_ackframes we get (they're probably from the