qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-05-07 16:31:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

cl_paranoid: setting to 0 will disable printing the server address for

Browse source 
connectionless packets
This commit is contained in:
Bill Currie 2001-12-05 21:56:52 +00:00
parent e0364392c7
commit d4df29de02
2 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
qw/include/client.h
View file

@ -153,6 +153,7 @@ typedef struct
struct info_s *userinfo; struct info_s *userinfo;
char servername[MAX_OSPATH]; // name of server from original connect char servername[MAX_OSPATH]; // name of server from original connect
netadr_t server_addr; // address of server
int qport; int qport;

47
qw/source/cl_main.c
View file

@ -124,6 +124,7 @@ cvar_t *rcon_address;
cvar_t *cl_writecfg; cvar_t *cl_writecfg;
cvar_t *cl_allow_cmd_pkt; cvar_t *cl_allow_cmd_pkt;
cvar_t *cl_paranoid;
cvar_t *cl_timeframes; cvar_t *cl_timeframes;
@ -257,7 +258,6 @@ CL_SendConnectPacket (void)
{ {
char data[2048]; char data[2048];
double t1, t2; double t1, t2;
netadr_t adr;
// JACK: Fixed bug where DNS lookups would cause two connects real fast // JACK: Fixed bug where DNS lookups would cause two connects real fast
// Now, adds lookup time to the connect time. // Now, adds lookup time to the connect time.
@ -268,20 +268,14 @@ CL_SendConnectPacket (void)
t1 = Sys_DoubleTime (); t1 = Sys_DoubleTime ();
if (!NET_StringToAdr (cls.servername, &adr)) { if (!NET_StringToAdr (cls.servername, &cls.server_addr)) {
Con_Printf ("Bad server address\n"); Con_Printf ("Bad server address\n");
connect_time = -1; connect_time = -1;
return; return;
} }
if (!NET_IsClientLegal (&adr)) { if (cls.server_addr.port == 0)
Con_Printf ("Illegal server address\n"); cls.server_addr.port = BigShort (27500);
connect_time = -1;
return;
}
if (adr.port == 0)
adr.port = BigShort (27500);
t2 = Sys_DoubleTime (); t2 = Sys_DoubleTime ();
connect_time = realtime + t2 - t1; // for retransmit requests connect_time = realtime + t2 - t1; // for retransmit requests
@ -299,7 +293,7 @@ CL_SendConnectPacket (void)
snprintf (data, sizeof (data), "%c%c%c%cconnect %i %i %i \"%s\"\n", snprintf (data, sizeof (data), "%c%c%c%cconnect %i %i %i \"%s\"\n",
255, 255, 255, 255, PROTOCOL_VERSION, cls.qport, cls.challenge, 255, 255, 255, 255, PROTOCOL_VERSION, cls.qport, cls.challenge,
Info_MakeString (cls.userinfo, 0)); Info_MakeString (cls.userinfo, 0));
NET_SendPacket (strlen (data), data, adr); NET_SendPacket (strlen (data), data, cls.server_addr);
} }
/* /*
@ -312,7 +306,6 @@ CL_CheckForResend (void)
{ {
char data[2048]; char data[2048];
double t1, t2; double t1, t2;
netadr_t adr;
if (connect_time == -1) if (connect_time == -1)
return; return;
@ -322,19 +315,14 @@ CL_CheckForResend (void)
return; return;
t1 = Sys_DoubleTime (); t1 = Sys_DoubleTime ();
if (!NET_StringToAdr (cls.servername, &adr)) { if (!NET_StringToAdr (cls.servername, &cls.server_addr)) {
Con_Printf ("Bad server address\n"); Con_Printf ("Bad server address\n");
connect_time = -1; connect_time = -1;
return; return;
} }
if (!NET_IsClientLegal (&adr)) {
Con_Printf ("Illegal server address\n");
connect_time = -1;
return;
}
if (adr.port == 0) if (cls.server_addr.port == 0)
adr.port = BigShort (27500); cls.server_addr.port = BigShort (27500);
t2 = Sys_DoubleTime (); t2 = Sys_DoubleTime ();
connect_time = realtime + t2 - t1; // for retransmit requests connect_time = realtime + t2 - t1; // for retransmit requests
@ -343,7 +331,7 @@ CL_CheckForResend (void)
Con_Printf ("Connecting to %s...\n", cls.servername); Con_Printf ("Connecting to %s...\n", cls.servername);
snprintf (data, sizeof (data), "%c%c%c%cgetchallenge\n", 255, 255, 255, snprintf (data, sizeof (data), "%c%c%c%cgetchallenge\n", 255, 255, 255,
255); 255);
NET_SendPacket (strlen (data), data, adr); NET_SendPacket (strlen (data), data, cls.server_addr);
} }
void void
@ -643,7 +631,6 @@ CL_AddQFInfoKeys (void)
Info_SetValueForStarKey (cls.userinfo, "*cap", cap, 0); Info_SetValueForStarKey (cls.userinfo, "*cap", cap, 0);
Info_SetValueForStarKey (cls.userinfo, "*qf_version", VERSION, 0); Info_SetValueForStarKey (cls.userinfo, "*qf_version", VERSION, 0);
Info_SetValueForStarKey (cls.userinfo, "*qsg_version", QW_QSG_VERSION, 0); Info_SetValueForStarKey (cls.userinfo, "*qsg_version", QW_QSG_VERSION, 0);
Con_Printf ("QuakeForge server detected\n");
} }
void void
@ -866,7 +853,9 @@ CL_ConnectionlessPacket (void)
c = MSG_ReadByte (net_message); c = MSG_ReadByte (net_message);
clcp_temp = 0; clcp_temp = 0;
if (!cls.demoplayback) if (!cls.demoplayback
&& (cl_paranoid->int_val
|| !NET_CompareAdr (net_from, cls.server_addr)))
Con_Printf ("%s: ", NET_AdrToString (net_from)); Con_Printf ("%s: ", NET_AdrToString (net_from));
// Con_DPrintf ("%s", net_message.data + 5); // Con_DPrintf ("%s", net_message.data + 5);
if (c == S2C_CONNECTION) { if (c == S2C_CONNECTION) {
@ -969,12 +958,16 @@ CL_ConnectionlessPacket (void)
} }
if (c == S2C_CHALLENGE) { if (c == S2C_CHALLENGE) {
Con_Printf ("challenge\n"); Con_Printf ("challenge");
s = MSG_ReadString (net_message); s = MSG_ReadString (net_message);
cls.challenge = atoi (s); cls.challenge = atoi (s);
if (strstr (s, "QF")) if (strstr (s, "QF")) {
Con_Printf (": QuakeForge server detected\n");
CL_AddQFInfoKeys (); CL_AddQFInfoKeys ();
} else {
Con_Printf ("\n");
}
CL_SendConnectPacket (); CL_SendConnectPacket ();
return; return;
} }
@ -1200,6 +1193,10 @@ CL_Init_Cvars (void)
"confirm quit command"); "confirm quit command");
cl_allow_cmd_pkt = Cvar_Get ("cl_allow_cmd_pkt", "1", CVAR_NONE, NULL, cl_allow_cmd_pkt = Cvar_Get ("cl_allow_cmd_pkt", "1", CVAR_NONE, NULL,
"enables packets from the likes of gamespy"); "enables packets from the likes of gamespy");
cl_paranoid = Cvar_Get ("cl_paranoid", "1", CVAR_NONE, NULL,
"print source address of connectionless packets"
" even when coming from the server being connected"
" to.");
cl_autoexec = Cvar_Get ("cl_autoexec", "0", CVAR_ROM, NULL, cl_autoexec = Cvar_Get ("cl_autoexec", "0", CVAR_ROM, NULL,
"exec autoexec.cfg on gamedir change"); "exec autoexec.cfg on gamedir change");
cl_quakerc = Cvar_Get ("cl_quakerc", "1", CVAR_NONE, NULL, cl_quakerc = Cvar_Get ("cl_quakerc", "1", CVAR_NONE, NULL,