{CF_CLIENT | CF_SERVER | CF_ARCHIVE, "sv_master2", "", "user-chosen master server 2"},
{CF_CLIENT | CF_SERVER | CF_ARCHIVE, "sv_master3", "", "user-chosen master server 3"},
{CF_CLIENT | CF_SERVER | CF_ARCHIVE, "sv_master4", "", "user-chosen master server 4"},
- {CF_CLIENT | CF_SERVER, "sv_masterextra1", "dpmaster.deathmask.net", "dpmaster.deathmask.net - default master server 1 (admin: Willis)"}, // admin: Willis
- {CF_CLIENT | CF_SERVER, "sv_masterextra2", "dpmaster.tchr.no", "dpmaster.tchr.no - default master server 2 (admin: tChr)"}, // admin: tChr
+ {CF_CLIENT | CF_SERVER, "sv_masterextra1", "dpmaster.deathmask.net", "dpmaster.deathmask.net - default master server 1 (admin: Willis)"},
+ {CF_CLIENT | CF_SERVER, "sv_masterextra2", "dpmaster.tchr.no", "dpmaster.tchr.no - default master server 2 (admin: tChr)"},
+ {CF_CLIENT | CF_SERVER, "sv_masterextra3", "dpm.dpmaster.org:27777", "dpm.dpmaster.org - default master server 3 (admin: gazby/soylent_cow)"},
{0, NULL, NULL, NULL}
};
masterquerytime = host.realtime;
masterquerycount = 0;
masterreplycount = 0;
- if( resetcache ) {
+ if (resetcache)
+ {
serverquerycount = 0;
serverreplycount = 0;
serverlist_cachecount = 0;
serverlist_viewcount = 0;
serverlist_maxcachecount = 0;
serverlist_cache = (serverlist_entry_t *)Mem_Realloc(netconn_mempool, (void *)serverlist_cache, sizeof(serverlist_entry_t) * serverlist_maxcachecount);
- } else {
+ }
+ else
+ {
// refresh all entries
int n;
- for( n = 0 ; n < serverlist_cachecount ; n++ ) {
- serverlist_entry_t *entry = &serverlist_cache[ n ];
+ for (n = 0; n < serverlist_cachecount; ++n)
+ {
+ serverlist_entry_t *entry = &serverlist_cache[n];
entry->query = SQS_REFRESHING;
entry->querycounter = 0;
}
static int clientport = -1;
static int clientport2 = -1;
-static int hostport = -1;
-void NetConn_UpdateSockets(void)
-{
- int i, j;
- // TODO add logic to automatically close sockets if needed
- LHNET_DefaultDSCP(net_tos_dscp.integer);
-
- if (cls.state != ca_dedicated)
+// Call on disconnect, during startup, or if cl_port/cl_netport is changed
+static void NetConn_CL_UpdateSockets_Callback(cvar_t *var)
+{
+ if(cls.state != ca_dedicated)
{
- if (clientport2 != cl_netport.integer)
+ if (clientport2 != var->integer)
{
- clientport2 = cl_netport.integer;
+ clientport2 = var->integer;
if (cls.state == ca_connected)
Con_Print("Changing \"cl_port\" will not take effect until you reconnect.\n");
}
+
if (cls.state == ca_disconnected && clientport != clientport2)
{
clientport = clientport2;
if (cl_numsockets == 0)
NetConn_OpenClientPorts();
}
+}
+
+static int hostport = -1;
- if (hostport != sv_netport.integer)
+// Call when port/sv_netport is changed
+static void NetConn_sv_netport_Callback(cvar_t *var)
+{
+ if (hostport != var->integer)
{
- hostport = sv_netport.integer;
+ hostport = var->integer;
if (sv.active)
Con_Print("Changing \"port\" will not take effect until \"map\" command is executed.\n");
}
+}
+
+void NetConn_UpdateSockets(void)
+{
+ int i, j;
+
+ // TODO add logic to automatically close sockets if needed
+ LHNET_DefaultDSCP(net_tos_dscp.integer);
for (j = 0;j < MAX_RCONS;j++)
{
#ifdef CONFIG_MENU
M_Update_Return_Reason("");
#endif
- // if we're connecting to a remote server, shut down any local server
- if (LHNETADDRESS_GetAddressType(peeraddress) != LHNETADDRESSTYPE_LOOP && sv.active)
- {
- SV_LockThreadMutex();
- SV_Shutdown ();
- SV_UnlockThreadMutex();
- }
+ // Disconnect from the current server or stop demo playback
if(cls.state == ca_connected || cls.demoplayback)
CL_Disconnect();
// allocate a net connection to keep track of things
serverlist_entry_t *entry = NULL;
// search the cache for this server and update it
- for (n = 0;n < serverlist_cachecount;n++) {
- entry = &serverlist_cache[ n ];
+ for (n = 0; n < serverlist_cachecount; ++n)
+ {
+ entry = &serverlist_cache[n];
if (!strcmp(addressstring, entry->info.cname))
break;
}
}
// returns true, if it's sensible to continue the processing
-static qbool NetConn_ClientParsePacket_ServerList_PrepareQuery( int protocol, const char *ipstring, qbool isfavorite ) {
+static qbool NetConn_ClientParsePacket_ServerList_PrepareQuery(int protocol, const char *ipstring, qbool isfavorite)
+{
int n;
serverlist_entry_t *entry;
- // ignore the rest of the message if the serverlist is full
- if( serverlist_cachecount == SERVERLIST_TOTALSIZE )
+ // ignore the rest of the message if the serverlist is full
+ if (serverlist_cachecount == SERVERLIST_TOTALSIZE)
return false;
- // also ignore it if we have already queried it (other master server response)
- for( n = 0 ; n < serverlist_cachecount ; n++ )
- if( !strcmp( ipstring, serverlist_cache[ n ].info.cname ) )
+ // also ignore it if we have already queried it (other master server response)
+ for (n = 0; n < serverlist_cachecount; ++n)
+ if (!strcmp(ipstring, serverlist_cache[n].info.cname))
break;
- if( n < serverlist_cachecount ) {
- // the entry has already been queried once or
+ if (n < serverlist_cachecount)
+ {
+ // the entry has already been queried once
return true;
}
entry = &serverlist_cache[n];
memset(entry, 0, sizeof(*entry));
- entry->protocol = protocol;
- // store the data the engine cares about (address and ping)
- strlcpy (entry->info.cname, ipstring, sizeof(entry->info.cname));
+ entry->protocol = protocol;
+ // store the data the engine cares about (address and ping)
+ strlcpy(entry->info.cname, ipstring, sizeof(entry->info.cname));
entry->info.isfavorite = isfavorite;
-
+
// no, then reset the ping right away
entry->info.ping = -1;
// we also want to increase the serverlist_cachecount then
serverlist_cachecount++;
serverquerycount++;
- entry->query = SQS_QUERYING;
+ entry->query = SQS_QUERYING;
return true;
}
if (serverlist_consoleoutput && developer_networking.integer)
Con_Printf("Requesting info from DarkPlaces server %s\n", ipstring);
-
- if( !NetConn_ClientParsePacket_ServerList_PrepareQuery( PROTOCOL_DARKPLACES7, ipstring, false ) ) {
- break;
- }
+ if (!NetConn_ClientParsePacket_ServerList_PrepareQuery(PROTOCOL_DARKPLACES7, ipstring, false))
+ break;
}
// begin or resume serverlist queries
double timeouttime;
static double querycounter = 0;
- if(!net_slist_pause.integer && serverlist_paused)
+ if (!net_slist_pause.integer && serverlist_paused)
ServerList_RebuildViewList();
serverlist_paused = net_slist_pause.integer != 0;
maxqueries = bound(0, maxqueries, net_slist_queriesperframe.integer);
querycounter -= maxqueries;
- if( maxqueries == 0 ) {
+ if (maxqueries == 0)
return;
- }
- // scan serverlist and issue queries as needed
+ // scan serverlist and issue queries as needed
serverlist_querysleep = true;
- timeouttime = host.realtime - net_slist_timeout.value;
- for( index = 0, queries = 0 ; index < serverlist_cachecount && queries < maxqueries ; index++ )
+ timeouttime = host.realtime - net_slist_timeout.value;
+ for (index = 0, queries = 0; index < serverlist_cachecount && queries < maxqueries; ++index)
{
- serverlist_entry_t *entry = &serverlist_cache[ index ];
- if( entry->query != SQS_QUERYING && entry->query != SQS_REFRESHING )
- {
+ serverlist_entry_t *entry = &serverlist_cache[index];
+ if (entry->query != SQS_QUERYING && entry->query != SQS_REFRESHING)
continue;
- }
- serverlist_querysleep = false;
- if( entry->querycounter != 0 && entry->querytime > timeouttime )
- {
+ serverlist_querysleep = false;
+ if (entry->querycounter != 0 && entry->querytime > timeouttime)
continue;
- }
- if( entry->querycounter != (unsigned) net_slist_maxtries.integer )
+ if (entry->querycounter != (unsigned)net_slist_maxtries.integer)
{
- lhnetaddress_t address;
+ lhnetaddress_t address;
int socket;
LHNETADDRESS_FromString(&address, entry->info.cname, 0);
- if (entry->protocol == PROTOCOL_QUAKEWORLD)
+ if (entry->protocol == PROTOCOL_QUAKEWORLD)
{
- for (socket = 0; socket < cl_numsockets ; socket++)
+ for (socket = 0; socket < cl_numsockets; ++socket)
NetConn_WriteString(cl_sockets[socket], "\377\377\377\377status\n", &address);
}
else
{
- for (socket = 0; socket < cl_numsockets ; socket++)
+ for (socket = 0; socket < cl_numsockets; ++socket)
NetConn_WriteString(cl_sockets[socket], "\377\377\377\377getstatus", &address);
}
- // update the entry fields
+ // update the entry fields
entry->querytime = host.realtime;
entry->querycounter++;
else
{
// have we tried to refresh this server?
- if( entry->query == SQS_REFRESHING ) {
+ if (entry->query == SQS_REFRESHING)
+ {
// yes, so update the reply count (since its not responding anymore)
serverreplycount--;
- if(!serverlist_paused)
+ if (!serverlist_paused)
ServerList_ViewList_Remove(entry);
}
entry->query = SQS_TIMEDOUT;
NetConn_QueryQueueFrame();
#endif
if (cls.netcon && host.realtime > cls.netcon->timeout && !sv.active)
- {
- Con_Print("Connection timed out\n");
- CL_Disconnect();
- SV_LockThreadMutex();
- SV_Shutdown ();
- SV_UnlockThreadMutex();
- }
+ CL_DisconnectEx(true, "Connection timed out");
}
static void NetConn_BuildChallengeString(char *buffer, int bufferlength)
if(l)
{
client_t *host_client_save = host_client;
- Cmd_ExecuteString(&cmd_server, s, src_local, true);
+ Cmd_ExecuteString(cmd_local, s, src_local, true);
host_client = host_client_save;
// in case it is a command that changes host_client (like restart)
}
#ifdef CONFIG_MENU
void Net_Refresh_f(cmd_state_t *cmd)
{
- if (m_state != m_slist) {
+ if (m_state != m_slist)
+ {
Con_Print("Sending new requests to master servers\n");
ServerList_QueryList(false, true, false, true);
Con_Print("Listening for replies...\n");
- } else
+ }
+ else
ServerList_QueryList(false, true, false, false);
}
ServerList_ResetMasks();
serverlist_sortbyfield = SLIF_PING;
serverlist_sortflags = 0;
- if (m_state != m_slist) {
+ if (m_state != m_slist)
+ {
Con_Print("Sending requests to master servers\n");
ServerList_QueryList(true, true, false, true);
Con_Print("Listening for replies...\n");
- } else
+ }
+ else
ServerList_QueryList(true, true, false, false);
}
ServerList_ResetMasks();
serverlist_sortbyfield = SLIF_PING;
serverlist_sortflags = 0;
- if (m_state != m_slist) {
+ if (m_state != m_slist)
+ {
Con_Print("Sending requests to master servers\n");
ServerList_QueryList(true, false, true, true);
serverlist_consoleoutput = true;
Con_Print("Listening for replies...\n");
- } else
+ }
+ else
ServerList_QueryList(true, false, true, false);
}
#endif
Cvar_RegisterCallback(&net_slist_favorites, NetConn_UpdateFavorites_c);
#endif
Cvar_RegisterVariable(&net_slist_pause);
- if(LHNET_DefaultDSCP(-1) >= 0) // register cvar only if supported
- Cvar_RegisterVariable(&net_tos_dscp);
+#ifdef IP_TOS // register cvar only if supported
+ Cvar_RegisterVariable(&net_tos_dscp);
+#endif
Cvar_RegisterVariable(&net_messagetimeout);
Cvar_RegisterVariable(&net_connecttimeout);
Cvar_RegisterVariable(&net_connectfloodblockingtimeout);
Cvar_RegisterVariable(&net_fakelag);
Cvar_RegisterVariable(&net_fakeloss_send);
Cvar_RegisterVariable(&net_fakeloss_receive);
- Cvar_RegisterAlias(&net_fakelag, "cl_netlocalping");
- Cvar_RegisterAlias(&net_fakeloss_send, "cl_netpacketloss_send");
- Cvar_RegisterAlias(&net_fakeloss_receive, "cl_netpacketloss_receive");
+ Cvar_RegisterVirtual(&net_fakelag, "cl_netlocalping");
+ Cvar_RegisterVirtual(&net_fakeloss_send, "cl_netpacketloss_send");
+ Cvar_RegisterVirtual(&net_fakeloss_receive, "cl_netpacketloss_receive");
Cvar_RegisterVariable(&hostname);
Cvar_RegisterVariable(&developer_networking);
Cvar_RegisterVariable(&cl_netport);
+ Cvar_RegisterCallback(&cl_netport, NetConn_CL_UpdateSockets_Callback);
Cvar_RegisterVariable(&sv_netport);
+ Cvar_RegisterCallback(&sv_netport, NetConn_sv_netport_Callback);
Cvar_RegisterVariable(&net_address);
Cvar_RegisterVariable(&net_address_ipv6);
Cvar_RegisterVariable(&sv_public);
projects / xonotic / darkplaces.git / blobdiff