X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=netconn.c;h=e3fe3123a17369ce93d596ff566e8c3e24db504d;hb=a2445d85eccf4d0c5766f44f02cd04a600c4bad4;hp=be111a9f692781b149d436dcf05512895e0129a1;hpb=2ae3083935124e371626b519c5bd45ee2b28c7d6;p=xonotic%2Fdarkplaces.git diff --git a/netconn.c b/netconn.c index be111a9f..e3fe3123 100755 --- a/netconn.c +++ b/netconn.c @@ -28,14 +28,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. cvar_t sv_public = {0, "sv_public", "0"}; static cvar_t sv_heartbeatperiod = {CVAR_SAVE, "sv_heartbeatperiod", "180"}; +// FIXME: resolve DNS on masters whenever their value changes and cache it (to avoid major delays in active servers when they heartbeat) static cvar_t sv_masters [] = { {CVAR_SAVE, "sv_master1", ""}, {CVAR_SAVE, "sv_master2", ""}, {CVAR_SAVE, "sv_master3", ""}, {CVAR_SAVE, "sv_master4", ""}, - {0, "sv_masterextra1", "ghdigital.com"}, - {0, "sv_masterextra2", "dpmaster.deathmask.net"}, + {0, "sv_masterextra1", "69.59.212.88"}, // ghdigital.com + {0, "sv_masterextra2", "66.169.205.13"}, // dpmaster.deathmask.net {0, NULL, NULL} }; @@ -49,12 +50,8 @@ cvar_t net_connecttimeout = {0, "net_connecttimeout","10"}; cvar_t hostname = {CVAR_SAVE, "hostname", "UNNAMED"}; cvar_t developer_networking = {0, "developer_networking", "0"}; -cvar_t cl_netlocalping_min = {0, "cl_netlocalping_min","0"}; -cvar_t cl_netlocalping_max = {0, "cl_netlocalping_max","0"}; -static cvar_t cl_netpacketloss_receive = {0, "cl_netpacketloss_receive","0"}; -static cvar_t cl_netpacketloss_send = {0, "cl_netpacketloss_send","0"}; -static cvar_t sv_netpacketloss_receive = {0, "sv_netpacketloss_receive","0"}; -static cvar_t sv_netpacketloss_send = {0, "sv_netpacketloss_send","0"}; +cvar_t cl_netlocalping = {0, "cl_netlocalping","0"}; +static cvar_t cl_netpacketloss = {0, "cl_netpacketloss","0"}; /* statistic counters */ @@ -98,13 +95,9 @@ int NetConn_Read(lhnetsocket_t *mysocket, void *data, int maxlength, lhnetaddres { int length = LHNET_Read(mysocket, data, maxlength, peeraddress); int i; - if (cl_netpacketloss_receive.integer) + if (cl_netpacketloss.integer) for (i = 0;i < cl_numsockets;i++) - if (cl_sockets[i] == mysocket && (rand() % 100) < cl_netpacketloss_receive.integer) - return 0; - if (sv_netpacketloss_receive.integer) - for (i = 0;i < cl_numsockets;i++) - if (sv_sockets[i] == mysocket && (rand() % 100) < sv_netpacketloss_receive.integer) + if (cl_sockets[i] == mysocket && (rand() % 100) < cl_netpacketloss.integer) return 0; if (developer_networking.integer && length != 0) { @@ -126,13 +119,9 @@ int NetConn_Write(lhnetsocket_t *mysocket, const void *data, int length, const l { int ret; int i; - if (cl_netpacketloss_send.integer) - for (i = 0;i < cl_numsockets;i++) - if (cl_sockets[i] == mysocket && (rand() % 100) < cl_netpacketloss_send.integer) - return length; - if (sv_netpacketloss_send.integer) + if (cl_netpacketloss.integer) for (i = 0;i < cl_numsockets;i++) - if (sv_sockets[i] == mysocket && (rand() % 100) < sv_netpacketloss_send.integer) + if (cl_sockets[i] == mysocket && (rand() % 100) < cl_netpacketloss.integer) return length; ret = LHNET_Write(mysocket, data, length, peeraddress); if (developer_networking.integer) @@ -431,13 +420,7 @@ netconn_t *NetConn_Open(lhnetsocket_t *mysocket, lhnetaddress_t *peeraddress) conn = Mem_Alloc(netconn_mempool, sizeof(*conn)); conn->mysocket = mysocket; conn->peeraddress = *peeraddress; - // updated by receiving "rate" command from client - conn->rate = NET_MINRATE; - // no limits for local player - if (LHNETADDRESS_GetAddressType(peeraddress) == LHNETADDRESSTYPE_LOOP) - conn->rate = 1000000000; conn->canSend = true; - conn->connecttime = realtime; conn->lastMessageTime = realtime; // LordHavoc: (inspired by ProQuake) use a short connect timeout to // reduce effectiveness of connection request floods @@ -615,16 +598,19 @@ int NetConn_ReceivedMessage(netconn_t *conn, qbyte *data, int length) void NetConn_ConnectionEstablished(lhnetsocket_t *mysocket, lhnetaddress_t *peeraddress) { + cls.connect_trying = false; + M_Update_Return_Reason(""); + // the connection request succeeded, stop current connection and set up a new connection + CL_Disconnect(); cls.netcon = NetConn_Open(mysocket, peeraddress); Con_Printf("Connection accepted to %s\n", cls.netcon->address); key_dest = key_game; m_state = m_none; - cls.connect_trying = false; cls.demonum = -1; // not in the demo loop now cls.state = ca_connected; cls.signon = 0; // need all the signon messages before playing CL_ClearState(); - Host_Reconnect_f(); + SCR_BeginLoadingPlaque(); } int NetConn_IsLocalGame(void) @@ -671,22 +657,25 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, { LHNETADDRESS_ToString(peeraddress, addressstring2, sizeof(addressstring2), true); Con_Printf("\"%s\" received, sending connect request back to %s\n", string, addressstring2); + M_Update_Return_Reason("Got challenge response"); NetConn_WriteString(mysocket, va("\377\377\377\377connect\\protocol\\darkplaces 3\\challenge\\%s", string + 10), peeraddress); return true; } if (length == 6 && !memcmp(string, "accept", 6) && cls.connect_trying) { + M_Update_Return_Reason("Accepted"); NetConn_ConnectionEstablished(mysocket, peeraddress); return true; } if (length > 7 && !memcmp(string, "reject ", 7) && cls.connect_trying) { + char rejectreason[32]; cls.connect_trying = false; string += 7; - length = max(length - 7, (int)sizeof(m_return_reason) - 1); - memcpy(m_return_reason, string, length); - m_return_reason[length] = 0; - Con_Printf("%s\n", m_return_reason); + length = max(length - 7, (int)sizeof(rejectreason) - 1); + memcpy(rejectreason, string, length); + rejectreason[length] = 0; + M_Update_Return_Reason(rejectreason); return true; } if (length >= 13 && !memcmp(string, "infoResponse\x0A", 13)) @@ -865,14 +854,15 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, length -= 4; LHNETADDRESS_SetPort(&clientportaddress, port); } + M_Update_Return_Reason("Accepted"); NetConn_ConnectionEstablished(mysocket, &clientportaddress); } break; case CCREP_REJECT: if (developer.integer) Con_Printf("Datagram_ParseConnectionless: received CCREP_REJECT from %s.\n", addressstring2); - Con_Printf("%s\n", data); - strlcpy (m_return_reason, data, sizeof (m_return_reason)); + cls.connect_trying = false; + M_Update_Return_Reason(data); break; #if 0 case CCREP_SERVER_INFO: @@ -944,26 +934,9 @@ void NetConn_ClientFrame(void) if (cls.connect_remainingtries == 0) { cls.connect_trying = false; - if (m_state == m_slist) - strcpy (m_return_reason, "Connect: Failed"); - else - Con_Print("Connect failed\n"); + M_Update_Return_Reason("Connect: Failed"); return; } - if (cls.connect_nextsendtime) - { - if (m_state == m_slist) - strcpy (m_return_reason, "Connect: Still trying"); - else - Con_Print("Still trying...\n"); - } - else - { - if (m_state == m_slist) - strcpy (m_return_reason, "Connect: Trying"); - else - Con_Print("Trying...\n"); - } cls.connect_nextsendtime = realtime + 1; cls.connect_remainingtries--; // try challenge first (newer server) @@ -1016,7 +989,6 @@ static void NetConn_BuildChallengeString(char *buffer, int bufferlength) buffer[i] = 0; } -extern void SV_ConnectClient(int clientnum, netconn_t *netconnection); int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, lhnetaddress_t *peeraddress) { int i, n, ret, clientnum, responselength, best; @@ -1095,7 +1067,7 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, if (clientnum < svs.maxclients) { // duplicate connection request - if (realtime - client->netconnection->connecttime < 2.0) + if (realtime - client->connecttime < 2.0) { // client is still trying to connect, // so we send a duplicate reply @@ -1222,7 +1194,7 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, if (clientnum < svs.maxclients) { // duplicate connection request - if (realtime - client->netconnection->connecttime < 2.0) + if (realtime - client->connecttime < 2.0) { // client is still trying to connect, // so we send a duplicate reply @@ -1336,8 +1308,8 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, MSG_WriteString(&net_message, client->name); MSG_WriteLong(&net_message, client->colors); MSG_WriteLong(&net_message, (int)client->edict->v->frags); - MSG_WriteLong(&net_message, (int)(realtime - client->netconnection->connecttime)); - MSG_WriteString(&net_message, client->netconnection->address); + MSG_WriteLong(&net_message, (int)(realtime - client->connecttime)); + MSG_WriteString(&net_message, client->netconnection ? client->netconnection->address : "botclient"); *((int *)net_message.data) = BigLong(NETFLAG_CTL | (net_message.cursize & NETFLAG_LENGTH_MASK)); NetConn_Write(mysocket, net_message.data, net_message.cursize, peeraddress); SZ_Clear(&net_message); @@ -1385,7 +1357,6 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, { if (host_client->netconnection && host_client->netconnection->mysocket == mysocket && !LHNETADDRESS_Compare(&host_client->netconnection->peeraddress, peeraddress)) { - sv_player = host_client->edict; if ((ret = NetConn_ReceivedMessage(host_client->netconnection, data, length)) == 2) SV_ReadClientMessage(); return ret; @@ -1407,10 +1378,9 @@ void NetConn_ServerFrame(void) for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++) { // never timeout loopback connections - if (host_client->netconnection && realtime > host_client->netconnection->timeout && LHNETADDRESS_GetAddressType(LHNET_AddressFromSocket(host_client->netconnection->mysocket)) != LHNETADDRESSTYPE_LOOP) + if (host_client->netconnection && realtime > host_client->netconnection->timeout && LHNETADDRESS_GetAddressType(&host_client->netconnection->peeraddress) != LHNETADDRESSTYPE_LOOP) { Con_Printf("Client \"%s\" connection timed out\n", host_client->name); - sv_player = host_client->edict; SV_DropClient(false); } } @@ -1466,7 +1436,7 @@ void NetConn_QueryMasters(void) if (!masterquerycount) { Con_Print("Unable to query master servers, no suitable network sockets active.\n"); - strcpy(m_return_reason, "No network"); + M_Update_Return_Reason("No network"); } } @@ -1595,12 +1565,8 @@ void NetConn_Init(void) Cvar_RegisterVariable(&net_messagetimeout); Cvar_RegisterVariable(&net_messagerejointimeout); Cvar_RegisterVariable(&net_connecttimeout); - Cvar_RegisterVariable(&cl_netlocalping_min); - Cvar_RegisterVariable(&cl_netlocalping_max); - Cvar_RegisterVariable(&cl_netpacketloss_receive); - Cvar_RegisterVariable(&cl_netpacketloss_send); - Cvar_RegisterVariable(&sv_netpacketloss_receive); - Cvar_RegisterVariable(&sv_netpacketloss_send); + Cvar_RegisterVariable(&cl_netlocalping); + Cvar_RegisterVariable(&cl_netpacketloss); Cvar_RegisterVariable(&hostname); Cvar_RegisterVariable(&developer_networking); Cvar_RegisterVariable(&cl_netport); @@ -1611,6 +1577,7 @@ void NetConn_Init(void) Cvar_RegisterVariable(&sv_heartbeatperiod); for (i = 0;sv_masters[i].name;i++) Cvar_RegisterVariable(&sv_masters[i]); +// COMMANDLINEOPTION: Server: -ip sets the ip address of this machine for purposes of networking (default 0.0.0.0 also known as INADDR_ANY), use only if you have multiple network adapters and need to choose one specifically. if ((i = COM_CheckParm("-ip")) && i + 1 < com_argc) { if (LHNETADDRESS_FromString(&tempaddress, com_argv[i + 1], 0) == 1) @@ -1621,6 +1588,7 @@ void NetConn_Init(void) else Con_Printf("-ip option used, but unable to parse the address \"%s\"\n", com_argv[i + 1]); } +// COMMANDLINEOPTION: Server: -port sets the port to use for a server (default 26000, the same port as QUAKE itself), useful if you host multiple servers on your machine if (((i = COM_CheckParm("-port")) || (i = COM_CheckParm("-ipport")) || (i = COM_CheckParm("-udpport"))) && i + 1 < com_argc) { i = atoi(com_argv[i + 1]);