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}
};
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
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);
{
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))
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:
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)
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;
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
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
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);
{
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;
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);
}
}
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");
}
}
projects / xonotic / darkplaces.git / blobdiff