#include "quakedef.h"
#include "lhnet.h"
-#define MASTER_PORT 27950
+#define QWMASTER_PORT 27000
+#define DPMASTER_PORT 27950
-cvar_t sv_public = {0, "sv_public", "0"};
-static cvar_t sv_heartbeatperiod = {CVAR_SAVE, "sv_heartbeatperiod", "180"};
+// note this defaults on for dedicated servers, off for listen servers
+cvar_t sv_public = {0, "sv_public", "0", "advertises this server on the master server (so that players can find it in the server browser)"};
+static cvar_t sv_heartbeatperiod = {CVAR_SAVE, "sv_heartbeatperiod", "120", "how often to send heartbeat in seconds (only used if sv_public is 1)"};
-// 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", "69.59.212.88"}, // ghdigital.com
- {0, "sv_masterextra2", "66.169.205.13"}, // dpmaster.deathmask.net
- {0, NULL, NULL}
+ {CVAR_SAVE, "sv_master1", "", "user-chosen master server 1"},
+ {CVAR_SAVE, "sv_master2", "", "user-chosen master server 2"},
+ {CVAR_SAVE, "sv_master3", "", "user-chosen master server 3"},
+ {CVAR_SAVE, "sv_master4", "", "user-chosen master server 4"},
+ {0, "sv_masterextra1", "ghdigital.com", "default master server 1 (admin: LordHavoc)"}, // admin: LordHavoc
+ {0, "sv_masterextra2", "dpmaster.deathmask.net", "default master server 2 (admin: Willis)"}, // admin: Willis
+ {0, "sv_masterextra3", "12.166.196.192", "default master server 3 (admin: Venim)"}, // admin: Venim
+ {0, "sv_masterextra4", "excalibur.nvg.ntnu.no", "default master server 4 (admin: tChr)"}, // admin: tChr
+ {0, NULL, NULL, NULL}
+};
+
+static cvar_t sv_qwmasters [] =
+{
+ {CVAR_SAVE, "sv_qwmaster1", "", "user-chosen qwmaster server 1"},
+ {CVAR_SAVE, "sv_qwmaster2", "", "user-chosen qwmaster server 2"},
+ {CVAR_SAVE, "sv_qwmaster3", "", "user-chosen qwmaster server 3"},
+ {CVAR_SAVE, "sv_qwmaster4", "", "user-chosen qwmaster server 4"},
+ {0, "sv_qwmasterextra1", "satan.idsoftware.com", "default qwmaster server 1 (admin: idSoftware)"},
+ {0, "sv_qwmasterextra2", "192.246.40.37:27000", "id Limbo (admin: id Software)"},
+ {0, "sv_qwmasterextra3", "192.246.40.37:27002", "id CTF (admin: id Software)"},
+ {0, "sv_qwmasterextra4", "192.246.40.37:27003", "id TeamFortress (admin: id Software)"},
+ {0, "sv_qwmasterextra5", "192.246.40.37:27004", "id Miscilaneous (admin: id Software)"},
+ {0, "sv_qwmasterextra6", "192.246.40.37:27006", "id Deathmatch Only (admin: id Software)"},
+ {0, "sv_qwmasterextra7", "150.254.66.120:27000", "Poland's master server. (admin: unknown)"},
+ {0, "sv_qwmasterextra8", "62.112.145.129:27000", "Ocrana master server. (admin: unknown)"},
+ {0, "sv_qwmasterextra9", "master.edome.net", "edome master server. (admin: unknown)"},
+ {0, "sv_qwmasterextra10", "qwmaster.barrysworld.com", "barrysworld master server. (admin: unknown)"},
+ {0, "sv_qwmasterextra11", "qwmaster.ocrana.de:27000", "Ocrana2 master server. (admin: unknown)"},
+ {0, "sv_qwmasterextra12", "213.221.174.165:27000", "unknown1 master server. (admin: unknown)"},
+ {0, "sv_qwmasterextra13", "195.74.0.8", "unknown2 master server. (admin: unknown)"},
+ {0, "sv_qwmasterextra14", "192.246.40.37", "unknown3 master server. (admin: unknown)"},
+ {0, "sv_qwmasterextra15", "192.246.40.37:27006", "unknown4 master server. (admin: unknown)"},
+ {0, "sv_qwmasterextra16", "204.182.161.2", "unknown5 master server. (admin: unknown)"},
+ {0, NULL, NULL, NULL}
};
static double nextheartbeattime = 0;
sizebuf_t net_message;
+static unsigned char net_message_buf[NET_MAXMESSAGE];
-cvar_t net_messagetimeout = {0, "net_messagetimeout","300"};
-cvar_t net_messagerejointimeout = {0, "net_messagerejointimeout","10"};
-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 net_messagetimeout = {0, "net_messagetimeout","300", "drops players who have not sent any packets for this many seconds"};
+cvar_t net_messagerejointimeout = {0, "net_messagerejointimeout","10", "give a player this much time in seconds to rejoin and continue playing (not losing frags and such)"};
+cvar_t net_connecttimeout = {0, "net_connecttimeout","10", "after requesting a connection, the client must reply within this many seconds or be dropped (cuts down on connect floods)"};
+cvar_t hostname = {CVAR_SAVE, "hostname", "UNNAMED", "server message to show in server browser"};
+cvar_t developer_networking = {0, "developer_networking", "0", "prints all received and sent packets (recommended only for debugging)"};
-cvar_t cl_netlocalping = {0, "cl_netlocalping","0"};
-static cvar_t cl_netpacketloss = {0, "cl_netpacketloss","0"};
+cvar_t cl_netlocalping = {0, "cl_netlocalping","0", "lags local loopback connection by this much ping time (useful to play more fairly on your own server with people with higher pings)"};
+static cvar_t cl_netpacketloss = {0, "cl_netpacketloss","0", "drops this percentage of packets (incoming and outgoing), useful for testing network protocol robustness (effects failing to start, sounds failing to play, etc)"};
+static cvar_t net_slist_queriespersecond = {0, "net_slist_queriespersecond", "20", "how many server information requests to send per second"};
+static cvar_t net_slist_queriesperframe = {0, "net_slist_queriesperframe", "4", "maximum number of server information requests to send each rendered frame (guards against low framerates causing problems)"};
+static cvar_t net_slist_timeout = {0, "net_slist_timeout", "4", "how long to listen for a server information response before giving up"};
+static cvar_t net_slist_maxtries = {0, "net_slist_maxtries", "3", "how many times to ask the same server for information (more times gives better ping reports but takes longer)"};
+static cvar_t gameversion = {0, "gameversion", "0", "version of game data (mod-specific), when client and server gameversion mismatch in the server browser the server is shown as incompatible"};
/* statistic counters */
static int packetsSent = 0;
int serverquerycount = 0;
int serverreplycount = 0;
-static qbyte sendbuffer[NET_HEADERSIZE+NET_MAXMESSAGE];
-static qbyte readbuffer[NET_HEADERSIZE+NET_MAXMESSAGE];
+// this is only false if there are still servers left to query
+static qboolean serverlist_querysleep = true;
+// this is pushed a second or two ahead of realtime whenever a master server
+// reply is received, to avoid issuing queries while master replies are still
+// flooding in (which would make a mess of the ping times)
+static double serverlist_querywaittime = 0;
+
+static unsigned char sendbuffer[NET_HEADERSIZE+NET_MAXMESSAGE];
+static unsigned char readbuffer[NET_HEADERSIZE+NET_MAXMESSAGE];
int cl_numsockets;
lhnetsocket_t *cl_sockets[16];
netconn_t *netconn_list = NULL;
mempool_t *netconn_mempool = NULL;
-cvar_t cl_netport = {0, "cl_port", "0"};
-cvar_t sv_netport = {0, "port", "26000"};
-cvar_t net_address = {0, "net_address", "0.0.0.0"};
-//cvar_t net_netaddress_ipv6 = {0, "net_address_ipv6", "[0:0:0:0:0:0:0:0]"};
+cvar_t cl_netport = {0, "cl_port", "0", "forces client to use chosen port number if not 0"};
+cvar_t sv_netport = {0, "port", "26000", "server port for players to connect to"};
+cvar_t net_address = {0, "net_address", "0.0.0.0", "network address to open ports on"};
+//cvar_t net_netaddress_ipv6 = {0, "net_address_ipv6", "[0:0:0:0:0:0:0:0]", "network address to open ipv6 ports on"};
-// HostCache interface
-hostcache_mask_t hostcache_andmasks[HOSTCACHE_ANDMASKCOUNT];
-hostcache_mask_t hostcache_ormasks[HOSTCACHE_ORMASKCOUNT];
+// ServerList interface
+serverlist_mask_t serverlist_andmasks[SERVERLIST_ANDMASKCOUNT];
+serverlist_mask_t serverlist_ormasks[SERVERLIST_ORMASKCOUNT];
-hostcache_infofield_t hostcache_sortbyfield;
-qboolean hostcache_sortdescending;
+serverlist_infofield_t serverlist_sortbyfield;
+qboolean serverlist_sortdescending;
-int hostcache_viewcount = 0;
-hostcache_t *hostcache_viewset[HOSTCACHE_VIEWCACHESIZE];
+int serverlist_viewcount = 0;
+serverlist_entry_t *serverlist_viewlist[SERVERLIST_VIEWLISTSIZE];
-int hostcache_cachecount;
-hostcache_t hostcache_cache[HOSTCACHE_TOTALSIZE];
+int serverlist_cachecount;
+serverlist_entry_t serverlist_cache[SERVERLIST_TOTALSIZE];
-qboolean hostcache_consoleoutput;
+qboolean serverlist_consoleoutput;
// helper function to insert a value into the viewset
// spare entries will be removed
-static void _HostCache_ViewSet_InsertBefore( int index, hostcache_t *entry )
+static void _ServerList_ViewList_Helper_InsertBefore( int index, serverlist_entry_t *entry )
{
int i;
- if( ++hostcache_viewcount > HOSTCACHE_VIEWCACHESIZE )
- hostcache_viewcount = HOSTCACHE_VIEWCACHESIZE;
- for( i = hostcache_viewcount - 1; i > index; i-- )
- hostcache_viewset[i] = hostcache_viewset[i - 1];
- hostcache_viewset[index] = entry;
+ if( serverlist_viewcount < SERVERLIST_VIEWLISTSIZE ) {
+ i = serverlist_viewcount++;
+ } else {
+ i = SERVERLIST_VIEWLISTSIZE - 1;
+ }
+
+ for( ; i > index ; i-- )
+ serverlist_viewlist[ i ] = serverlist_viewlist[ i - 1 ];
+
+ serverlist_viewlist[index] = entry;
}
-// we suppose hostcache_viewcount to be valid, ie > 0
-static void _HostCache_ViewSet_Remove( int index )
+// we suppose serverlist_viewcount to be valid, ie > 0
+static void _ServerList_ViewList_Helper_Remove( int index )
{
- for( --hostcache_viewcount; index < hostcache_viewcount; index++ )
- hostcache_viewset[index] = hostcache_viewset[index + 1];
+ serverlist_viewcount--;
+ for( ; index < serverlist_viewcount ; index++ )
+ serverlist_viewlist[index] = serverlist_viewlist[index + 1];
}
// returns true if A should be inserted before B
-static qboolean _HostCache_SortTest( hostcache_t *A, hostcache_t *B )
+static qboolean _ServerList_Entry_Compare( serverlist_entry_t *A, serverlist_entry_t *B )
{
- int result = 0; // > 0 if for numbers A > B and for text if A < B
-
- if( hostcache_sortbyfield == HCIF_PING )
- result = A->info.ping - B->info.ping;
- else if( hostcache_sortbyfield == HCIF_MAXPLAYERS )
- result = A->info.maxplayers - B->info.maxplayers;
- else if( hostcache_sortbyfield == HCIF_NUMPLAYERS )
- result = A->info.numplayers - B->info.numplayers;
- else if( hostcache_sortbyfield == HCIF_PROTOCOL )
- result = A->info.protocol - B->info.protocol;
- else if( hostcache_sortbyfield == HCIF_CNAME )
- result = strcmp( B->info.cname, A->info.cname );
- else if( hostcache_sortbyfield == HCIF_GAME )
- result = strcmp( B->info.game, A->info.game );
- else if( hostcache_sortbyfield == HCIF_MAP )
- result = strcmp( B->info.map, A->info.map );
- else if( hostcache_sortbyfield == HCIF_MOD )
- result = strcmp( B->info.mod, A->info.mod );
- else if( hostcache_sortbyfield == HCIF_NAME )
- result = strcmp( B->info.name, A->info.name );
-
- if( hostcache_sortdescending )
+ int result = 0; // > 0 if for numbers A > B and for text if A < B
+
+ switch( serverlist_sortbyfield ) {
+ case SLIF_PING:
+ result = A->info.ping - B->info.ping;
+ break;
+ case SLIF_MAXPLAYERS:
+ result = A->info.maxplayers - B->info.maxplayers;
+ break;
+ case SLIF_NUMPLAYERS:
+ result = A->info.numplayers - B->info.numplayers;
+ break;
+ case SLIF_PROTOCOL:
+ result = A->info.protocol - B->info.protocol;
+ break;
+ case SLIF_CNAME:
+ result = strcmp( B->info.cname, A->info.cname );
+ break;
+ case SLIF_GAME:
+ result = strcmp( B->info.game, A->info.game );
+ break;
+ case SLIF_MAP:
+ result = strcmp( B->info.map, A->info.map );
+ break;
+ case SLIF_MOD:
+ result = strcmp( B->info.mod, A->info.mod );
+ break;
+ case SLIF_NAME:
+ result = strcmp( B->info.name, A->info.name );
+ break;
+ default:
+ Con_DPrint( "_ServerList_Entry_Compare: Bad serverlist_sortbyfield!\n" );
+ break;
+ }
+
+ if( serverlist_sortdescending )
return result > 0;
return result < 0;
}
-static qboolean _hc_testint( int A, hostcache_maskop_t op, int B )
+static qboolean _ServerList_CompareInt( int A, serverlist_maskop_t op, int B )
{
- if( op == HCMO_LESS )
- return A < B;
- else if( op == HCMO_LESSEQUAL )
- return A <= B;
- else if( op == HCMO_EQUAL )
- return A == B;
- else if( op == HCMO_GREATER )
- return A > B;
- else if( op == HCMO_NOTEQUAL )
- return A != B;
- else // HCMO_GREATEREQUAL
- return A >= B;
+ // This should actually be done with some intermediate and end-of-function return
+ switch( op ) {
+ case SLMO_LESS:
+ return A < B;
+ case SLMO_LESSEQUAL:
+ return A <= B;
+ case SLMO_EQUAL:
+ return A == B;
+ case SLMO_GREATER:
+ return A > B;
+ case SLMO_NOTEQUAL:
+ return A != B;
+ case SLMO_GREATEREQUAL:
+ case SLMO_CONTAINS:
+ case SLMO_NOTCONTAIN:
+ return A >= B;
+ default:
+ Con_DPrint( "_ServerList_CompareInt: Bad op!\n" );
+ return false;
+ }
}
-static qboolean _hc_teststr( const char *A, hostcache_maskop_t op, const char *B )
+static qboolean _ServerList_CompareStr( const char *A, serverlist_maskop_t op, const char *B )
{
- if( op == HCMO_CONTAINS ) // A info B mask
- return *B && !!strstr( A, B ); // we want a real bool
- else if( op == HCMO_NOTCONTAIN )
- return !*B || !strstr( A, B );
- else if( op == HCMO_LESS )
- return strcmp( A, B ) < 0;
- else if( op == HCMO_LESSEQUAL )
- return strcmp( A, B ) <= 0;
- else if( op == HCMO_EQUAL )
- return strcmp( A, B ) == 0;
- else if( op == HCMO_GREATER )
- return strcmp( A, B ) > 0;
- else if( op == HCMO_NOTEQUAL )
- return strcmp( A, B ) != 0;
- else // HCMO_GREATEREQUAL
- return strcmp( A, B ) >= 0;
+ int i;
+ char bufferA[ 256 ], bufferB[ 256 ]; // should be more than enough
+ for (i = 0;i < (int)sizeof(bufferA)-1 && A[i];i++)
+ bufferA[i] = (A[i] >= 'A' && A[i] <= 'Z') ? (A[i] + 'a' - 'A') : A[i];
+ bufferA[i] = 0;
+ for (i = 0;i < (int)sizeof(bufferB)-1 && B[i];i++)
+ bufferB[i] = (B[i] >= 'A' && B[i] <= 'Z') ? (B[i] + 'a' - 'A') : B[i];
+ bufferB[i] = 0;
+
+ // Same here, also using an intermediate & final return would be more appropriate
+ // A info B mask
+ switch( op ) {
+ case SLMO_CONTAINS:
+ return *bufferB && !!strstr( bufferA, bufferB ); // we want a real bool
+ case SLMO_NOTCONTAIN:
+ return !*bufferB || !strstr( bufferA, bufferB );
+ case SLMO_LESS:
+ return strcmp( bufferA, bufferB ) < 0;
+ case SLMO_LESSEQUAL:
+ return strcmp( bufferA, bufferB ) <= 0;
+ case SLMO_EQUAL:
+ return strcmp( bufferA, bufferB ) == 0;
+ case SLMO_GREATER:
+ return strcmp( bufferA, bufferB ) > 0;
+ case SLMO_NOTEQUAL:
+ return strcmp( bufferA, bufferB ) != 0;
+ case SLMO_GREATEREQUAL:
+ return strcmp( bufferA, bufferB ) >= 0;
+ default:
+ Con_DPrint( "_ServerList_CompareStr: Bad op!\n" );
+ return false;
+ }
}
-static qboolean _HostCache_TestMask( hostcache_mask_t *mask, hostcache_info_t *info )
+static qboolean _ServerList_Entry_Mask( serverlist_mask_t *mask, serverlist_info_t *info )
{
- if( !_hc_testint( info->ping, mask->tests[HCIF_PING], mask->info.ping ) )
+ if( !_ServerList_CompareInt( info->ping, mask->tests[SLIF_PING], mask->info.ping ) )
return false;
- if( !_hc_testint( info->maxplayers, mask->tests[HCIF_MAXPLAYERS], mask->info.maxplayers ) )
+ if( !_ServerList_CompareInt( info->maxplayers, mask->tests[SLIF_MAXPLAYERS], mask->info.maxplayers ) )
return false;
- if( !_hc_testint( info->numplayers, mask->tests[HCIF_NUMPLAYERS], mask->info.numplayers ) )
+ if( !_ServerList_CompareInt( info->numplayers, mask->tests[SLIF_NUMPLAYERS], mask->info.numplayers ) )
return false;
- if( !_hc_testint( info->protocol, mask->tests[HCIF_PROTOCOL], mask->info.protocol ))
+ if( !_ServerList_CompareInt( info->protocol, mask->tests[SLIF_PROTOCOL], mask->info.protocol ))
return false;
if( *mask->info.cname
- && !_hc_teststr( info->cname, mask->tests[HCIF_CNAME], mask->info.cname ) )
+ && !_ServerList_CompareStr( info->cname, mask->tests[SLIF_CNAME], mask->info.cname ) )
return false;
if( *mask->info.game
- && !_hc_teststr( info->game, mask->tests[HCIF_GAME], mask->info.game ) )
+ && !_ServerList_CompareStr( info->game, mask->tests[SLIF_GAME], mask->info.game ) )
return false;
if( *mask->info.mod
- && !_hc_teststr( info->mod, mask->tests[HCIF_MOD], mask->info.mod ) )
+ && !_ServerList_CompareStr( info->mod, mask->tests[SLIF_MOD], mask->info.mod ) )
return false;
if( *mask->info.map
- && !_hc_teststr( info->map, mask->tests[HCIF_MAP], mask->info.map ) )
+ && !_ServerList_CompareStr( info->map, mask->tests[SLIF_MAP], mask->info.map ) )
return false;
if( *mask->info.name
- && !_hc_teststr( info->name, mask->tests[HCIF_NAME], mask->info.name ) )
+ && !_ServerList_CompareStr( info->name, mask->tests[SLIF_NAME], mask->info.name ) )
return false;
return true;
}
-static void _HostCache_Insert( hostcache_t *entry )
+static void ServerList_ViewList_Insert( serverlist_entry_t *entry )
{
int start, end, mid;
- if( hostcache_viewcount == HOSTCACHE_VIEWCACHESIZE )
+
+ // reject incompatible servers
+ if (entry->info.gameversion != gameversion.integer)
return;
- // now check whether it passes through the masks mask
- for( start = 0 ; hostcache_andmasks[start].active && start < HOSTCACHE_ANDMASKCOUNT ; start++ )
- if( !_HostCache_TestMask( &hostcache_andmasks[start], &entry->info ) )
+
+ // FIXME: change this to be more readable (...)
+ // now check whether it passes through the masks
+ for( start = 0 ; serverlist_andmasks[start].active && start < SERVERLIST_ANDMASKCOUNT ; start++ )
+ if( !_ServerList_Entry_Mask( &serverlist_andmasks[start], &entry->info ) )
return;
- for( start = 0 ; hostcache_ormasks[start].active && start < HOSTCACHE_ORMASKCOUNT ; start++ )
- if( _HostCache_TestMask( &hostcache_ormasks[start], &entry->info ) )
+ for( start = 0 ; serverlist_ormasks[start].active && start < SERVERLIST_ORMASKCOUNT ; start++ )
+ if( _ServerList_Entry_Mask( &serverlist_ormasks[start], &entry->info ) )
break;
- if( start == HOSTCACHE_ORMASKCOUNT || (start > 0 && !hostcache_ormasks[start].active) )
+ if( start == SERVERLIST_ORMASKCOUNT || (start > 0 && !serverlist_ormasks[start].active) )
return;
- if( !hostcache_viewcount ) {
- _HostCache_ViewSet_InsertBefore( 0, entry );
+ if( !serverlist_viewcount ) {
+ _ServerList_ViewList_Helper_InsertBefore( 0, entry );
return;
}
// ok, insert it, we just need to find out where exactly:
// two special cases
// check whether to insert it as new first item
- if( _HostCache_SortTest( entry, hostcache_viewset[0] ) ) {
- _HostCache_ViewSet_InsertBefore( 0, entry );
+ if( _ServerList_Entry_Compare( entry, serverlist_viewlist[0] ) ) {
+ _ServerList_ViewList_Helper_InsertBefore( 0, entry );
return;
} // check whether to insert it as new last item
- else if( !_HostCache_SortTest( entry, hostcache_viewset[hostcache_viewcount - 1] ) ) {
- _HostCache_ViewSet_InsertBefore( hostcache_viewcount, entry );
+ else if( !_ServerList_Entry_Compare( entry, serverlist_viewlist[serverlist_viewcount - 1] ) ) {
+ _ServerList_ViewList_Helper_InsertBefore( serverlist_viewcount, entry );
return;
}
start = 0;
- end = hostcache_viewcount - 1;
+ end = serverlist_viewcount - 1;
while( end > start + 1 )
{
mid = (start + end) / 2;
// test the item that lies in the middle between start and end
- if( _HostCache_SortTest( entry, hostcache_viewset[mid] ) )
+ if( _ServerList_Entry_Compare( entry, serverlist_viewlist[mid] ) )
// the item has to be in the upper half
end = mid;
- else
+ else
// the item has to be in the lower half
start = mid;
}
- _HostCache_ViewSet_InsertBefore( start + 1, entry );
+ _ServerList_ViewList_Helper_InsertBefore( start + 1, entry );
}
-static void _HostCache_Remove( hostcache_t *entry )
+static void ServerList_ViewList_Remove( serverlist_entry_t *entry )
{
int i;
- for( i = 0; i < hostcache_viewcount; i++ )
+ for( i = 0; i < serverlist_viewcount; i++ )
{
- if (hostcache_viewset[i] == entry)
+ if (serverlist_viewlist[i] == entry)
{
- _HostCache_ViewSet_Remove(i);
+ _ServerList_ViewList_Helper_Remove(i);
break;
}
}
}
-void HostCache_RebuildViewSet(void)
+void ServerList_RebuildViewList(void)
{
int i;
-
- hostcache_viewcount = 0;
- for( i = 0 ; i < hostcache_cachecount ; i++ )
- if( hostcache_cache[i].finished )
- _HostCache_Insert( &hostcache_cache[i] );
+
+ serverlist_viewcount = 0;
+ for( i = 0 ; i < serverlist_cachecount ; i++ )
+ if( serverlist_cache[i].query == SQS_QUERIED )
+ ServerList_ViewList_Insert( &serverlist_cache[i] );
}
-void HostCache_ResetMasks(void)
+void ServerList_ResetMasks(void)
{
- memset( &hostcache_andmasks, 0, sizeof( hostcache_andmasks ) );
- memset( &hostcache_ormasks, 0, sizeof( hostcache_ormasks ) );
+ memset( &serverlist_andmasks, 0, sizeof( serverlist_andmasks ) );
+ memset( &serverlist_ormasks, 0, sizeof( serverlist_ormasks ) );
}
-#if 1
-static void _HostCache_Test(void)
+#if 0
+static void _ServerList_Test(void)
{
int i;
for( i = 0 ; i < 1024 ; i++ ) {
- memset( &hostcache_cache[hostcache_cachecount], 0, sizeof( hostcache_t ) );
- hostcache_cache[hostcache_cachecount].info.ping = rand() % 450 + 250;
- snprintf( hostcache_cache[hostcache_cachecount].info.name, 128, "Black's HostCache Test %i", i );
- hostcache_cache[hostcache_cachecount].finished = true;
- sprintf( hostcache_cache[hostcache_cachecount].line1, "%i %s", hostcache_cache[hostcache_cachecount].info.ping, hostcache_cache[hostcache_cachecount].info.name );
- _HostCache_Insert( &hostcache_cache[hostcache_cachecount] );
- hostcache_cachecount++;
+ memset( &serverlist_cache[serverlist_cachecount], 0, sizeof( serverlist_entry_t ) );
+ serverlist_cache[serverlist_cachecount].info.ping = 1000 + 1024 - i;
+ dpsnprintf( serverlist_cache[serverlist_cachecount].info.name, sizeof(serverlist_cache[serverlist_cachecount].info.name), "Black's ServerList Test %i", i );
+ serverlist_cache[serverlist_cachecount].finished = true;
+ sprintf( serverlist_cache[serverlist_cachecount].line1, "%i %s", serverlist_cache[serverlist_cachecount].info.ping, serverlist_cache[serverlist_cachecount].info.name );
+ ServerList_ViewList_Insert( &serverlist_cache[serverlist_cachecount] );
+ serverlist_cachecount++;
}
}
#endif
-void HostCache_QueryList(void)
+void ServerList_QueryList(qboolean querydp, qboolean queryqw)
{
- masterquerytime = realtime;
+ //masterquerytime = realtime;
+ masterquerytime = Sys_DoubleTime();
masterquerycount = 0;
masterreplycount = 0;
serverquerycount = 0;
serverreplycount = 0;
- hostcache_cachecount = 0;
- hostcache_viewcount = 0;
- hostcache_consoleoutput = false;
- NetConn_QueryMasters();
-
- _HostCache_Test();
+ serverlist_cachecount = 0;
+ serverlist_viewcount = 0;
+ serverlist_consoleoutput = false;
+
+ //_ServerList_Test();
+
+ NetConn_QueryMasters(querydp, queryqw);
}
// rest
{
LHNETADDRESS_ToString(peeraddress, addressstring2, sizeof(addressstring2), true);
Con_Printf("LHNET_Read(%p (%s), %p, %i, %p) = %i from %s:\n", mysocket, addressstring, data, maxlength, peeraddress, length, addressstring2);
- Com_HexDumpToConsole(data, length);
+ Com_HexDumpToConsole((unsigned char *)data, length);
}
else
Con_Printf("LHNET_Read(%p (%s), %p, %i, %p) = %i\n", mysocket, addressstring, data, maxlength, peeraddress, length);
LHNETADDRESS_ToString(LHNET_AddressFromSocket(mysocket), addressstring, sizeof(addressstring), true);
LHNETADDRESS_ToString(peeraddress, addressstring2, sizeof(addressstring2), true);
Con_Printf("LHNET_Write(%p (%s), %p, %i, %p (%s)) = %i%s\n", mysocket, addressstring, data, length, peeraddress, addressstring2, length, ret == length ? "" : " (ERROR)");
- Com_HexDumpToConsole(data, length);
+ Com_HexDumpToConsole((unsigned char *)data, length);
}
return ret;
}
int NetConn_WriteString(lhnetsocket_t *mysocket, const char *string, const lhnetaddress_t *peeraddress)
{
// note this does not include the trailing NULL because we add that in the parser
- return NetConn_Write(mysocket, string, strlen(string), peeraddress);
+ return NetConn_Write(mysocket, string, (int)strlen(string), peeraddress);
}
-int NetConn_SendReliableMessage(netconn_t *conn, sizebuf_t *data)
+int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data, protocolversion_t protocol)
{
- unsigned int packetLen;
- unsigned int dataLen;
- unsigned int eom;
- unsigned int *header;
-
-//#ifdef DEBUG
- if (data->cursize == 0)
- Sys_Error("Datagram_SendMessage: zero length message\n");
-
- if (data->cursize > (int)sizeof(conn->sendMessage))
- Sys_Error("Datagram_SendMessage: message too big (%u > %u)\n", data->cursize, sizeof(conn->sendMessage));
-
- if (conn->canSend == false)
- Sys_Error("SendMessage: called with canSend == false\n");
-//#endif
-
- memcpy(conn->sendMessage, data->data, data->cursize);
- conn->sendMessageLength = data->cursize;
-
- if (conn->sendMessageLength <= MAX_PACKETFRAGMENT)
- {
- dataLen = conn->sendMessageLength;
- eom = NETFLAG_EOM;
- }
- else
+ if (protocol == PROTOCOL_QUAKEWORLD)
{
- dataLen = MAX_PACKETFRAGMENT;
- eom = 0;
- }
-
- packetLen = NET_HEADERSIZE + dataLen;
-
- header = (void *)sendbuffer;
- header[0] = BigLong(packetLen | (NETFLAG_DATA | eom));
- header[1] = BigLong(conn->sendSequence);
- memcpy(sendbuffer + NET_HEADERSIZE, conn->sendMessage, dataLen);
-
- conn->sendSequence++;
- conn->canSend = false;
-
- if (NetConn_Write(conn->mysocket, (void *)&sendbuffer, packetLen, &conn->peeraddress) != (int)packetLen)
- return -1;
-
- conn->lastSendTime = realtime;
- packetsSent++;
- reliableMessagesSent++;
- return 1;
-}
-
-static void NetConn_SendMessageNext(netconn_t *conn)
-{
- unsigned int packetLen;
- unsigned int dataLen;
- unsigned int eom;
- unsigned int *header;
-
- if (conn->sendMessageLength && !conn->canSend && conn->sendNext)
- {
- if (conn->sendMessageLength <= MAX_PACKETFRAGMENT)
+ int packetLen;
+ qboolean sendreliable;
+
+ // note that it is ok to send empty messages to the qw server,
+ // otherwise it won't respond to us at all
+
+ sendreliable = false;
+ // if the remote side dropped the last reliable message, resend it
+ if (conn->qw.incoming_acknowledged > conn->qw.last_reliable_sequence && conn->qw.incoming_reliable_acknowledged != conn->qw.reliable_sequence)
+ sendreliable = true;
+ // if the reliable transmit buffer is empty, copy the current message out
+ if (!conn->sendMessageLength && conn->message.cursize)
{
- dataLen = conn->sendMessageLength;
- eom = NETFLAG_EOM;
+ memcpy (conn->sendMessage, conn->message.data, conn->message.cursize);
+ conn->sendMessageLength = conn->message.cursize;
+ SZ_Clear(&conn->message); // clear the message buffer
+ conn->qw.reliable_sequence ^= 1;
+ sendreliable = true;
}
- else
+ // outgoing unreliable packet number, and outgoing reliable packet number (0 or 1)
+ *((int *)(sendbuffer + 0)) = LittleLong((unsigned int)conn->qw.outgoing_sequence | ((unsigned int)sendreliable<<31));
+ // last received unreliable packet number, and last received reliable packet number (0 or 1)
+ *((int *)(sendbuffer + 4)) = LittleLong((unsigned int)conn->qw.incoming_sequence | ((unsigned int)conn->qw.incoming_reliable_sequence<<31));
+ packetLen = 8;
+ conn->qw.outgoing_sequence++;
+ // client sends qport in every packet
+ if (conn == cls.netcon)
{
- dataLen = MAX_PACKETFRAGMENT;
- eom = 0;
+ *((short *)(sendbuffer + 8)) = LittleShort(cls.qw_qport);
+ packetLen += 2;
+ }
+ if (packetLen + (sendreliable ? conn->sendMessageLength : 0) > 1400)
+ {
+ Con_Printf ("NetConn_SendUnreliableMessage: reliable message too big %u\n", data->cursize);
+ return -1;
+ }
+ // add the reliable message if there is one
+ if (sendreliable)
+ {
+ memcpy(sendbuffer + packetLen, conn->sendMessage, conn->sendMessageLength);
+ packetLen += conn->sendMessageLength;
+ conn->qw.last_reliable_sequence = conn->qw.outgoing_sequence;
+ }
+ // add the unreliable message if possible
+ if (packetLen + data->cursize <= 1400)
+ {
+ memcpy(sendbuffer + packetLen, data->data, data->cursize);
+ packetLen += data->cursize;
}
- packetLen = NET_HEADERSIZE + dataLen;
-
- header = (void *)sendbuffer;
- header[0] = BigLong(packetLen | (NETFLAG_DATA | eom));
- header[1] = BigLong(conn->sendSequence);
- memcpy(sendbuffer + NET_HEADERSIZE, conn->sendMessage, dataLen);
-
- conn->sendSequence++;
- conn->sendNext = false;
+ NetConn_Write(conn->mysocket, (void *)&sendbuffer, packetLen, &conn->peeraddress);
- if (NetConn_Write(conn->mysocket, (void *)&sendbuffer, packetLen, &conn->peeraddress) != (int)packetLen)
- return;
-
- conn->lastSendTime = realtime;
packetsSent++;
- }
-}
+ unreliableMessagesSent++;
-static void NetConn_ReSendMessage(netconn_t *conn)
-{
- unsigned int packetLen;
- unsigned int dataLen;
- unsigned int eom;
- unsigned int *header;
+ // delay later packets to obey rate limit
+ conn->qw.cleartime = max(conn->qw.cleartime, realtime) + packetLen * conn->qw.rate;
- if (conn->sendMessageLength && !conn->canSend && (realtime - conn->lastSendTime) > 1.0)
+ return 0;
+ }
+ else
{
- if (conn->sendMessageLength <= MAX_PACKETFRAGMENT)
+ unsigned int packetLen;
+ unsigned int dataLen;
+ unsigned int eom;
+ unsigned int *header;
+
+ // if a reliable message fragment has been lost, send it again
+ if (conn->sendMessageLength && (realtime - conn->lastSendTime) > 1.0)
{
- dataLen = conn->sendMessageLength;
- eom = NETFLAG_EOM;
+ if (conn->sendMessageLength <= MAX_PACKETFRAGMENT)
+ {
+ dataLen = conn->sendMessageLength;
+ eom = NETFLAG_EOM;
+ }
+ else
+ {
+ dataLen = MAX_PACKETFRAGMENT;
+ eom = 0;
+ }
+
+ packetLen = NET_HEADERSIZE + dataLen;
+
+ header = (unsigned int *)sendbuffer;
+ header[0] = BigLong(packetLen | (NETFLAG_DATA | eom));
+ header[1] = BigLong(conn->nq.sendSequence - 1);
+ memcpy(sendbuffer + NET_HEADERSIZE, conn->sendMessage, dataLen);
+
+ if (NetConn_Write(conn->mysocket, (void *)&sendbuffer, packetLen, &conn->peeraddress) == (int)packetLen)
+ {
+ conn->lastSendTime = realtime;
+ packetsReSent++;
+ }
}
- else
+
+ // if we have a new reliable message to send, do so
+ if (!conn->sendMessageLength && conn->message.cursize)
{
- dataLen = MAX_PACKETFRAGMENT;
- eom = 0;
- }
+ if (conn->message.cursize > (int)sizeof(conn->sendMessage))
+ {
+ Con_Printf("NetConn_SendUnreliableMessage: reliable message too big (%u > %u)\n", conn->message.cursize, sizeof(conn->sendMessage));
+ conn->message.overflowed = true;
+ return -1;
+ }
- packetLen = NET_HEADERSIZE + dataLen;
+ if (developer_networking.integer && conn == cls.netcon)
+ {
+ Con_Print("client sending reliable message to server:\n");
+ SZ_HexDumpToConsole(&conn->message);
+ }
- header = (void *)sendbuffer;
- header[0] = BigLong(packetLen | (NETFLAG_DATA | eom));
- header[1] = BigLong(conn->sendSequence - 1);
- memcpy(sendbuffer + NET_HEADERSIZE, conn->sendMessage, dataLen);
+ memcpy(conn->sendMessage, conn->message.data, conn->message.cursize);
+ conn->sendMessageLength = conn->message.cursize;
+ SZ_Clear(&conn->message);
- conn->sendNext = false;
+ if (conn->sendMessageLength <= MAX_PACKETFRAGMENT)
+ {
+ dataLen = conn->sendMessageLength;
+ eom = NETFLAG_EOM;
+ }
+ else
+ {
+ dataLen = MAX_PACKETFRAGMENT;
+ eom = 0;
+ }
- if (NetConn_Write(conn->mysocket, (void *)&sendbuffer, packetLen, &conn->peeraddress) != (int)packetLen)
- return;
+ packetLen = NET_HEADERSIZE + dataLen;
- conn->lastSendTime = realtime;
- packetsReSent++;
- }
-}
+ header = (unsigned int *)sendbuffer;
+ header[0] = BigLong(packetLen | (NETFLAG_DATA | eom));
+ header[1] = BigLong(conn->nq.sendSequence);
+ memcpy(sendbuffer + NET_HEADERSIZE, conn->sendMessage, dataLen);
-qboolean NetConn_CanSendMessage(netconn_t *conn)
-{
- return conn->canSend;
-}
+ conn->nq.sendSequence++;
-int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data)
-{
- int packetLen;
- int *header;
+ NetConn_Write(conn->mysocket, (void *)&sendbuffer, packetLen, &conn->peeraddress);
- packetLen = NET_HEADERSIZE + data->cursize;
+ conn->lastSendTime = realtime;
+ packetsSent++;
+ reliableMessagesSent++;
+ }
-//#ifdef DEBUG
- if (data->cursize == 0)
- Sys_Error("Datagram_SendUnreliableMessage: zero length message\n");
+ // if we have an unreliable message to send, do so
+ if (data->cursize)
+ {
+ packetLen = NET_HEADERSIZE + data->cursize;
- if (packetLen > (int)sizeof(sendbuffer))
- Sys_Error("Datagram_SendUnreliableMessage: message too big %u\n", data->cursize);
-//#endif
+ if (packetLen > (int)sizeof(sendbuffer))
+ {
+ Con_Printf("NetConn_SendUnreliableMessage: message too big %u\n", data->cursize);
+ return -1;
+ }
- header = (void *)sendbuffer;
- header[0] = BigLong(packetLen | NETFLAG_UNRELIABLE);
- header[1] = BigLong(conn->unreliableSendSequence);
- memcpy(sendbuffer + NET_HEADERSIZE, data->data, data->cursize);
+ header = (unsigned int *)sendbuffer;
+ header[0] = BigLong(packetLen | NETFLAG_UNRELIABLE);
+ header[1] = BigLong(conn->nq.unreliableSendSequence);
+ memcpy(sendbuffer + NET_HEADERSIZE, data->data, data->cursize);
- conn->unreliableSendSequence++;
+ conn->nq.unreliableSendSequence++;
- if (NetConn_Write(conn->mysocket, (void *)&sendbuffer, packetLen, &conn->peeraddress) != (int)packetLen)
- return -1;
+ NetConn_Write(conn->mysocket, (void *)&sendbuffer, packetLen, &conn->peeraddress);
- packetsSent++;
- unreliableMessagesSent++;
- return 1;
+ packetsSent++;
+ unreliableMessagesSent++;
+ }
+ return 0;
+ }
}
void NetConn_CloseClientPorts(void)
{
lhnetaddress_t address;
lhnetsocket_t *s;
+ int port;
char addressstring2[1024];
- if (LHNETADDRESS_FromString(&address, addressstring, defaultport))
+
+ for (port = defaultport; port <= defaultport + 100; port++)
{
- if ((s = LHNET_OpenSocket_Connectionless(&address)))
+ if (LHNETADDRESS_FromString(&address, addressstring, port))
{
- sv_sockets[sv_numsockets++] = s;
- LHNETADDRESS_ToString(LHNET_AddressFromSocket(s), addressstring2, sizeof(addressstring2), true);
- Con_Printf("Server listening on address %s\n", addressstring2);
+ if ((s = LHNET_OpenSocket_Connectionless(&address)))
+ {
+ sv_sockets[sv_numsockets++] = s;
+ LHNETADDRESS_ToString(LHNET_AddressFromSocket(s), addressstring2, sizeof(addressstring2), true);
+ Con_Printf("Server listening on address %s\n", addressstring2);
+ break;
+ }
+ else
+ {
+ LHNETADDRESS_ToString(&address, addressstring2, sizeof(addressstring2), true);
+ Con_Printf("Server failed to open socket on address %s\n", addressstring2);
+ }
}
else
{
- LHNETADDRESS_ToString(&address, addressstring2, sizeof(addressstring2), true);
- Con_Printf("Server failed to open socket on address %s\n", addressstring2);
+ Con_Printf("Server unable to parse address %s\n", addressstring);
+ // if it cant parse one address, it wont be able to parse another for sure
+ break;
}
}
- else
- Con_Printf("Server unable to parse address %s\n", addressstring);
}
void NetConn_OpenServerPorts(int opennetports)
{
int port;
NetConn_CloseServerPorts();
+ NetConn_UpdateSockets();
port = bound(0, sv_netport.integer, 65535);
if (port == 0)
port = 26000;
//NetConn_OpenServerPort(net_address_ipv6.string, port);
}
if (sv_numsockets == 0)
- Host_Error("NetConn_OpenServerPorts: unable to open any ports!\n");
+ Host_Error("NetConn_OpenServerPorts: unable to open any ports!");
}
lhnetsocket_t *NetConn_ChooseClientSocketForAddress(lhnetaddress_t *address)
netconn_t *NetConn_Open(lhnetsocket_t *mysocket, lhnetaddress_t *peeraddress)
{
netconn_t *conn;
- conn = Mem_Alloc(netconn_mempool, sizeof(*conn));
+ conn = (netconn_t *)Mem_Alloc(netconn_mempool, sizeof(*conn));
conn->mysocket = mysocket;
conn->peeraddress = *peeraddress;
- conn->canSend = true;
conn->lastMessageTime = realtime;
+ conn->message.data = conn->messagedata;
+ conn->message.maxsize = sizeof(conn->messagedata);
+ conn->message.cursize = 0;
// LordHavoc: (inspired by ProQuake) use a short connect timeout to
// reduce effectiveness of connection request floods
conn->timeout = realtime + net_connecttimeout.value;
static int clientport = -1;
static int clientport2 = -1;
static int hostport = -1;
-static void NetConn_UpdateServerStuff(void)
+void NetConn_UpdateSockets(void)
{
if (cls.state != ca_dedicated)
{
}
}
-int NetConn_ReceivedMessage(netconn_t *conn, qbyte *data, int length)
+static int NetConn_ReceivedMessage(netconn_t *conn, unsigned char *data, int length, protocolversion_t protocol)
{
- unsigned int count;
- unsigned int flags;
- unsigned int sequence;
+ if (length < 8)
+ return 0;
+
+ if (protocol == PROTOCOL_QUAKEWORLD)
+ {
+ int sequence, sequence_ack;
+ int reliable_ack, reliable_message;
+ int count;
+ int qport;
+
+ sequence = LittleLong(*((int *)(data + 0)));
+ sequence_ack = LittleLong(*((int *)(data + 4)));
+ data += 8;
+ length -= 8;
+
+ if (conn != cls.netcon)
+ {
+ // server only
+ if (length < 2)
+ return 0;
+ // TODO: use qport to identify that this client really is who they say they are? (and elsewhere in the code to identify the connection without a port match?)
+ qport = LittleShort(*((int *)(data + 8)));
+ data += 2;
+ length -= 2;
+ }
- if (length >= 8)
+ packetsReceived++;
+ reliable_message = (sequence >> 31) & 1;
+ reliable_ack = (sequence_ack >> 31) & 1;
+ sequence &= ~(1<<31);
+ sequence_ack &= ~(1<<31);
+ if (sequence <= conn->qw.incoming_sequence)
+ {
+ Con_DPrint("Got a stale datagram\n");
+ return 0;
+ }
+ count = sequence - (conn->qw.incoming_sequence + 1);
+ if (count > 0)
+ {
+ droppedDatagrams += count;
+ Con_DPrintf("Dropped %u datagram(s)\n", count);
+ }
+ if (reliable_ack == conn->qw.reliable_sequence)
+ {
+ // received, now we will be able to send another reliable message
+ conn->sendMessageLength = 0;
+ reliableMessagesReceived++;
+ }
+ conn->qw.incoming_sequence = sequence;
+ conn->qw.incoming_acknowledged = sequence_ack;
+ conn->qw.incoming_reliable_acknowledged = reliable_ack;
+ if (reliable_message)
+ conn->qw.incoming_reliable_sequence ^= 1;
+ conn->lastMessageTime = realtime;
+ conn->timeout = realtime + net_messagetimeout.value;
+ unreliableMessagesReceived++;
+ SZ_Clear(&net_message);
+ SZ_Write(&net_message, data, length);
+ MSG_BeginReading();
+ return 2;
+ }
+ else
{
- length = BigLong(((int *)data)[0]);
- flags = length & ~NETFLAG_LENGTH_MASK;
- length &= NETFLAG_LENGTH_MASK;
+ unsigned int count;
+ unsigned int flags;
+ unsigned int sequence;
+ int qlength;
+
+ qlength = (unsigned int)BigLong(((int *)data)[0]);
+ flags = qlength & ~NETFLAG_LENGTH_MASK;
+ qlength &= NETFLAG_LENGTH_MASK;
// control packets were already handled
- if (!(flags & NETFLAG_CTL))
+ if (!(flags & NETFLAG_CTL) && qlength == length)
{
sequence = BigLong(((int *)data)[1]);
packetsReceived++;
length -= 8;
if (flags & NETFLAG_UNRELIABLE)
{
- if (sequence >= conn->unreliableReceiveSequence)
+ if (sequence >= conn->nq.unreliableReceiveSequence)
{
- if (sequence > conn->unreliableReceiveSequence)
+ if (sequence > conn->nq.unreliableReceiveSequence)
{
- count = sequence - conn->unreliableReceiveSequence;
+ count = sequence - conn->nq.unreliableReceiveSequence;
droppedDatagrams += count;
Con_DPrintf("Dropped %u datagram(s)\n", count);
}
- conn->unreliableReceiveSequence = sequence + 1;
+ conn->nq.unreliableReceiveSequence = sequence + 1;
conn->lastMessageTime = realtime;
conn->timeout = realtime + net_messagetimeout.value;
unreliableMessagesReceived++;
}
else if (flags & NETFLAG_ACK)
{
- if (sequence == (conn->sendSequence - 1))
+ if (sequence == (conn->nq.sendSequence - 1))
{
- if (sequence == conn->ackSequence)
+ if (sequence == conn->nq.ackSequence)
{
- conn->ackSequence++;
- if (conn->ackSequence != conn->sendSequence)
+ conn->nq.ackSequence++;
+ if (conn->nq.ackSequence != conn->nq.sendSequence)
Con_DPrint("ack sequencing error\n");
conn->lastMessageTime = realtime;
conn->timeout = realtime + net_messagetimeout.value;
- conn->sendMessageLength -= MAX_PACKETFRAGMENT;
- if (conn->sendMessageLength > 0)
+ if (conn->sendMessageLength > MAX_PACKETFRAGMENT)
{
+ unsigned int packetLen;
+ unsigned int dataLen;
+ unsigned int eom;
+ unsigned int *header;
+
+ conn->sendMessageLength -= MAX_PACKETFRAGMENT;
memcpy(conn->sendMessage, conn->sendMessage+MAX_PACKETFRAGMENT, conn->sendMessageLength);
- conn->sendNext = true;
- NetConn_SendMessageNext(conn);
+
+ if (conn->sendMessageLength <= MAX_PACKETFRAGMENT)
+ {
+ dataLen = conn->sendMessageLength;
+ eom = NETFLAG_EOM;
+ }
+ else
+ {
+ dataLen = MAX_PACKETFRAGMENT;
+ eom = 0;
+ }
+
+ packetLen = NET_HEADERSIZE + dataLen;
+
+ header = (unsigned int *)sendbuffer;
+ header[0] = BigLong(packetLen | (NETFLAG_DATA | eom));
+ header[1] = BigLong(conn->nq.sendSequence);
+ memcpy(sendbuffer + NET_HEADERSIZE, conn->sendMessage, dataLen);
+
+ conn->nq.sendSequence++;
+
+ if (NetConn_Write(conn->mysocket, (void *)&sendbuffer, packetLen, &conn->peeraddress) == (int)packetLen)
+ {
+ conn->lastSendTime = realtime;
+ packetsSent++;
+ }
}
else
- {
conn->sendMessageLength = 0;
- conn->canSend = true;
- }
}
else
Con_DPrint("Duplicate ACK received\n");
unsigned int temppacket[2];
temppacket[0] = BigLong(8 | NETFLAG_ACK);
temppacket[1] = BigLong(sequence);
- NetConn_Write(conn->mysocket, (qbyte *)temppacket, 8, &conn->peeraddress);
- if (sequence == conn->receiveSequence)
+ NetConn_Write(conn->mysocket, (unsigned char *)temppacket, 8, &conn->peeraddress);
+ if (sequence == conn->nq.receiveSequence)
{
conn->lastMessageTime = realtime;
conn->timeout = realtime + net_messagetimeout.value;
- conn->receiveSequence++;
- memcpy(conn->receiveMessage + conn->receiveMessageLength, data, length);
- conn->receiveMessageLength += length;
+ conn->nq.receiveSequence++;
+ if( conn->receiveMessageLength + length <= (int)sizeof( conn->receiveMessage ) ) {
+ memcpy(conn->receiveMessage + conn->receiveMessageLength, data, length);
+ conn->receiveMessageLength += length;
+ } else {
+ Con_Printf( "Reliable message (seq: %i) too big for message buffer!\n"
+ "Dropping the message!\n", sequence );
+ conn->receiveMessageLength = 0;
+ return 1;
+ }
if (flags & NETFLAG_EOM)
{
reliableMessagesReceived++;
return 0;
}
-void NetConn_ConnectionEstablished(lhnetsocket_t *mysocket, lhnetaddress_t *peeraddress)
+void NetConn_ConnectionEstablished(lhnetsocket_t *mysocket, lhnetaddress_t *peeraddress, protocolversion_t initialprotocol)
{
cls.connect_trying = false;
M_Update_Return_Reason("");
// the connection request succeeded, stop current connection and set up a new connection
CL_Disconnect();
+ // if we're connecting to a remote server, shut down any local server
+ if (LHNETADDRESS_GetAddressType(peeraddress) != LHNETADDRESSTYPE_LOOP && sv.active)
+ Host_ShutdownServer ();
+ // allocate a net connection to keep track of things
cls.netcon = NetConn_Open(mysocket, peeraddress);
Con_Printf("Connection accepted to %s\n", cls.netcon->address);
key_dest = key_game;
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();
+ cls.protocol = initialprotocol;
+ if (cls.protocol == PROTOCOL_QUAKEWORLD)
+ Cmd_ForwardStringToServer("new");
}
int NetConn_IsLocalGame(void)
return false;
}
-int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, lhnetaddress_t *peeraddress)
+static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *data, int length, lhnetaddress_t *peeraddress)
{
+ qboolean fromserver;
int ret, c, control;
- lhnetaddress_t svaddress;
const char *s;
char *string, addressstring2[128], cname[128], ipstring[32];
char stringbuf[16384];
+ // quakeworld ingame packet
+ fromserver = cls.netcon && mysocket == cls.netcon->mysocket && !LHNETADDRESS_Compare(&cls.netcon->peeraddress, peeraddress);
+
if (length >= 5 && data[0] == 255 && data[1] == 255 && data[2] == 255 && data[3] == 255)
{
// received a command string - strip off the packaging and put it
stringbuf[length] = 0;
string = stringbuf;
- if (developer.integer)
+ LHNETADDRESS_ToString(peeraddress, addressstring2, sizeof(addressstring2), true);
+
+ if (developer_networking.integer)
{
- LHNETADDRESS_ToString(peeraddress, addressstring2, sizeof(addressstring2), true);
Con_Printf("NetConn_ClientParsePacket: %s sent us a command:\n", addressstring2);
Com_HexDumpToConsole(data, length);
}
if (length > 10 && !memcmp(string, "challenge ", 10) && cls.connect_trying)
{
- LHNETADDRESS_ToString(peeraddress, addressstring2, sizeof(addressstring2), true);
+ // darkplaces or quake3
+ char protocolnames[1400];
+ Protocol_Names(protocolnames, sizeof(protocolnames));
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);
+ NetConn_WriteString(mysocket, va("\377\377\377\377connect\\protocol\\darkplaces 3\\protocols\\%s\\challenge\\%s", protocolnames, string + 10), peeraddress);
return true;
}
+ if (length > 1 && string[0] == 'c' && (string[1] == '-' || (string[1] >= '0' && string[1] <= '9')))
+ {
+ // quakeworld
+ LHNETADDRESS_ToString(peeraddress, addressstring2, sizeof(addressstring2), true);
+ Con_Printf("\"%s\" received, sending QuakeWorld connect request back to %s\n", string, addressstring2);
+ M_Update_Return_Reason("Got QuakeWorld challenge response");
+ cls.qw_qport = qport.integer;
+ NetConn_WriteString(mysocket, va("\377\377\377\377connect 28 %i %i \"%s\"\n", cls.qw_qport, atoi(string + 1), cls.userinfo), peeraddress);
+ }
if (length == 6 && !memcmp(string, "accept", 6) && cls.connect_trying)
{
+ // darkplaces or quake3
M_Update_Return_Reason("Accepted");
- NetConn_ConnectionEstablished(mysocket, peeraddress);
+ NetConn_ConnectionEstablished(mysocket, peeraddress, PROTOCOL_DARKPLACES3);
+ return true;
+ }
+ if (length > 1 && string[0] == 'j' && cls.connect_trying)
+ {
+ // quakeworld
+ M_Update_Return_Reason("QuakeWorld Accepted");
+ NetConn_ConnectionEstablished(mysocket, peeraddress, PROTOCOL_QUAKEWORLD);
return true;
}
if (length > 7 && !memcmp(string, "reject ", 7) && cls.connect_trying)
}
if (length >= 13 && !memcmp(string, "infoResponse\x0A", 13))
{
- hostcache_info_t *info;
- int i, n;
+ serverlist_info_t *info;
+ int n;
double pingtime;
-
+
string += 13;
- // hostcache only uses text addresses
+ // serverlist only uses text addresses
LHNETADDRESS_ToString(peeraddress, cname, sizeof(cname), true);
// search the cache for this server and update it
- for( n = 0; n < hostcache_cachecount; n++ )
- if( !strcmp( cname, hostcache_cache[n].info.cname ) )
+ for( n = 0; n < serverlist_cachecount; n++ )
+ if( !strcmp( cname, serverlist_cache[n].info.cname ) )
break;
- if( n == hostcache_cachecount )
- return true;
+ if( n == serverlist_cachecount ) {
+ // LAN search doesnt require an answer from the master server so we wont
+ // know the ping nor will it be initialized already...
+
+ // find a slot
+ if( serverlist_cachecount == SERVERLIST_TOTALSIZE )
+ return true;
+
+ memset(&serverlist_cache[serverlist_cachecount], 0, sizeof(serverlist_cache[serverlist_cachecount]));
+ // store the data the engine cares about (address and ping)
+ strlcpy (serverlist_cache[serverlist_cachecount].info.cname, cname, sizeof (serverlist_cache[serverlist_cachecount].info.cname));
+ serverlist_cache[serverlist_cachecount].info.ping = 100000;
+ //serverlist_cache[serverlist_cachecount].querytime = realtime;
+ serverlist_cache[serverlist_cachecount].querytime = Sys_DoubleTime();
+ // if not in the slist menu we should print the server to console
+ if (serverlist_consoleoutput) {
+ Con_Printf("querying %s\n", ipstring);
+ }
+
+ ++serverlist_cachecount;
+ }
- info = &hostcache_cache[n].info;
+ info = &serverlist_cache[n].info;
if ((s = SearchInfostring(string, "gamename" )) != NULL) strlcpy(info->game, s, sizeof (info->game));else info->game[0] = 0;
if ((s = SearchInfostring(string, "modname" )) != NULL) strlcpy(info->mod , s, sizeof (info->mod ));else info->mod[0] = 0;
if ((s = SearchInfostring(string, "mapname" )) != NULL) strlcpy(info->map , s, sizeof (info->map ));else info->map[0] = 0;
if ((s = SearchInfostring(string, "protocol" )) != NULL) info->protocol = atoi(s);else info->protocol = -1;
if ((s = SearchInfostring(string, "clients" )) != NULL) info->numplayers = atoi(s);else info->numplayers = 0;
if ((s = SearchInfostring(string, "sv_maxclients")) != NULL) info->maxplayers = atoi(s);else info->maxplayers = 0;
+ if ((s = SearchInfostring(string, "gameversion" )) != NULL) info->gameversion = atoi(s);else info->gameversion = 0;
if (info->ping == 100000)
serverreplycount++;
- pingtime = (int)((realtime - hostcache_cache[n].querytime) * 1000.0);
+ pingtime = (int)((Sys_DoubleTime() - serverlist_cache[n].querytime) * 1000.0 + 0.5);
pingtime = bound(0, pingtime, 9999);
// update the ping
info->ping = pingtime;
// legacy/old stuff move it to the menu ASAP
// build description strings for the things users care about
- snprintf(hostcache_cache[n].line1, sizeof(hostcache_cache[n].line1), "%5d%c%3u/%3u %-65.65s", (int)pingtime, info->protocol != NET_PROTOCOL_VERSION ? '*' : ' ', info->numplayers, info->maxplayers, info->name);
- snprintf(hostcache_cache[n].line2, sizeof(hostcache_cache[n].line2), "%-21.21s %-19.19s %-17.17s %-20.20s", info->cname, info->game, info->mod, info->map);
- // if ping is especially high, display it as such
- if (pingtime >= 300)
- {
- // orange numbers (lower block)
- for (i = 0;i < 5;i++)
- if (hostcache_cache[n].line1[i] != ' ')
- hostcache_cache[n].line1[i] += 128;
+ dpsnprintf(serverlist_cache[n].line1, sizeof(serverlist_cache[n].line1), "^%c%5d^7 ^%c%3u^7/%3u %-65.65s", pingtime >= 300 ? '1' : (pingtime >= 200 ? '3' : '7'), (int)pingtime, ((info->numplayers > 0 && info->numplayers < info->maxplayers) ? (info->numplayers >= 4 ? '7' : '3') : '1'), info->numplayers, info->maxplayers, info->name);
+ dpsnprintf(serverlist_cache[n].line2, sizeof(serverlist_cache[n].line2), "^5%-21.21s %-19.19s ^%c%-17.17s^5 %-20.20s", info->cname, info->game, (info->gameversion != gameversion.integer) ? '1' : '5', info->mod, info->map);
+ if( serverlist_cache[n].query == SQS_QUERIED ) {
+ ServerList_ViewList_Remove( &serverlist_cache[n] );
}
- else if (pingtime >= 200)
- {
- // yellow numbers (in upper block)
- for (i = 0;i < 5;i++)
- if (hostcache_cache[n].line1[i] != ' ')
- hostcache_cache[n].line1[i] -= 30;
- }
- // if not in the slist menu we should print the server to console
- if( hostcache_consoleoutput )
- Con_Printf("%s\n%s\n", hostcache_cache[n].line1, hostcache_cache[n].line2);
+ // if not in the slist menu we should print the server to console (if wanted)
+ else if( serverlist_consoleoutput )
+ Con_Printf("%s\n%s\n", serverlist_cache[n].line1, serverlist_cache[n].line2);
// and finally, update the view set
- if( hostcache_cache[n].finished )
- _HostCache_Remove( &hostcache_cache[n] );
- _HostCache_Insert( &hostcache_cache[n] );
- hostcache_cache[n].finished = true;
+ ServerList_ViewList_Insert( &serverlist_cache[n] );
+ serverlist_cache[n].query = SQS_QUERIED;
return true;
}
- if (!strncmp(string, "getserversResponse\\", 19) && hostcache_cachecount < HOSTCACHE_TOTALSIZE)
+ if (!strncmp(string, "getserversResponse\\", 19) && serverlist_cachecount < SERVERLIST_TOTALSIZE)
{
// Extract the IP addresses
data += 18;
length -= 18;
masterreplycount++;
- if (hostcache_consoleoutput)
- Con_Print("received server list...\n");
+ if (serverlist_consoleoutput)
+ Con_Print("received DarkPlaces server list...\n");
while (length >= 7 && data[0] == '\\' && (data[1] != 0xFF || data[2] != 0xFF || data[3] != 0xFF || data[4] != 0xFF) && data[5] * 256 + data[6] != 0)
{
- serverquerycount++;
-
- snprintf (ipstring, sizeof (ipstring), "%u.%u.%u.%u:%u", data[1], data[2], data[3], data[4], (data[5] << 8) | data[6]);
- if (developer.integer)
- Con_Printf("Requesting info from server %s\n", ipstring);
- // ignore the rest of the message if the hostcache is full
- if( hostcache_cachecount == HOSTCACHE_TOTALSIZE )
- break;
+ int n;
- LHNETADDRESS_FromString(&svaddress, ipstring, 0);
- NetConn_WriteString(mysocket, "\377\377\377\377getinfo", &svaddress);
+ dpsnprintf (ipstring, sizeof (ipstring), "%u.%u.%u.%u:%u", data[1], data[2], data[3], data[4], data[5] * 256 + data[6]);
+ if (serverlist_consoleoutput && developer_networking.integer)
+ Con_Printf("Requesting info from DarkPlaces server %s\n", ipstring);
+ // ignore the rest of the message if the serverlist is full
+ if( serverlist_cachecount == SERVERLIST_TOTALSIZE )
+ break;
+ // 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 )
+ {
+ serverquerycount++;
- memset(&hostcache_cache[hostcache_cachecount], 0, sizeof(hostcache_cache[hostcache_cachecount]));
- // store the data the engine cares about (address and ping)
- strlcpy (hostcache_cache[hostcache_cachecount].info.cname, ipstring, sizeof (hostcache_cache[hostcache_cachecount].info.cname));
- hostcache_cache[hostcache_cachecount].info.ping = 100000;
- hostcache_cache[hostcache_cachecount].querytime = realtime;
- // if not in the slist menu we should print the server to console
- if (hostcache_consoleoutput)
- Con_Printf("querying %s\n", ipstring);
+ memset(&serverlist_cache[serverlist_cachecount], 0, sizeof(serverlist_cache[serverlist_cachecount]));
+ serverlist_cache[serverlist_cachecount].protocol = PROTOCOL_DARKPLACES7;
+ // store the data the engine cares about (address and ping)
+ strlcpy (serverlist_cache[serverlist_cachecount].info.cname, ipstring, sizeof (serverlist_cache[serverlist_cachecount].info.cname));
+ serverlist_cache[serverlist_cachecount].info.ping = 100000;
+ serverlist_cache[serverlist_cachecount].query = SQS_QUERYING;
- ++hostcache_cachecount;
+ ++serverlist_cachecount;
+ }
// move on to next address in packet
data += 7;
length -= 7;
}
+ // begin or resume serverlist queries
+ serverlist_querysleep = false;
+ serverlist_querywaittime = realtime + 3;
+ return true;
+ }
+ if (!memcmp(string, "d\n", 2) && serverlist_cachecount < SERVERLIST_TOTALSIZE)
+ {
+ // Extract the IP addresses
+ data += 2;
+ length -= 2;
+ masterreplycount++;
+ if (serverlist_consoleoutput)
+ Con_Print("received QuakeWorld server list...\n");
+ while (length >= 6 && (data[0] != 0xFF || data[1] != 0xFF || data[2] != 0xFF || data[3] != 0xFF) && data[4] * 256 + data[5] != 0)
+ {
+ int n;
+
+ dpsnprintf (ipstring, sizeof (ipstring), "%u.%u.%u.%u:%u", data[0], data[1], data[2], data[3], data[4] * 256 + data[5]);
+ if (serverlist_consoleoutput && developer_networking.integer)
+ Con_Printf("Requesting info from QuakeWorld server %s\n", ipstring);
+ // ignore the rest of the message if the serverlist is full
+ if( serverlist_cachecount == SERVERLIST_TOTALSIZE )
+ break;
+ // 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 )
+ {
+ serverquerycount++;
+
+ memset(&serverlist_cache[serverlist_cachecount], 0, sizeof(serverlist_cache[serverlist_cachecount]));
+ serverlist_cache[serverlist_cachecount].protocol = PROTOCOL_QUAKEWORLD;
+ // store the data the engine cares about (address and ping)
+ strlcpy (serverlist_cache[serverlist_cachecount].info.cname, ipstring, sizeof (serverlist_cache[serverlist_cachecount].info.cname));
+ serverlist_cache[serverlist_cachecount].info.ping = 100000;
+ serverlist_cache[serverlist_cachecount].query = SQS_QUERYING;
+
+ ++serverlist_cachecount;
+ }
+
+ // move on to next address in packet
+ data += 6;
+ length -= 6;
+ }
+ // begin or resume serverlist queries
+ serverlist_querysleep = false;
+ serverlist_querywaittime = realtime + 3;
return true;
}
/*
if (!strncmp(string, "ack", 3))
return true;
*/
+ // QuakeWorld compatibility
+ if (length >= 1 && string[0] == 'j' && cls.connect_trying)
+ {
+ // accept message
+ M_Update_Return_Reason("Accepted");
+ NetConn_ConnectionEstablished(mysocket, peeraddress, PROTOCOL_QUAKEWORLD);
+ return true;
+ }
+ if (length > 1 && string[0] == 'c' && string[1] >= '0' && string[1] <= '9' && cls.connect_trying)
+ {
+ // challenge message
+ LHNETADDRESS_ToString(peeraddress, addressstring2, sizeof(addressstring2), true);
+ Con_Printf("challenge %s received, sending connect request back to %s\n", string + 1, addressstring2);
+ M_Update_Return_Reason("Got challenge response");
+ cls.qw_qport = qport.integer;
+ InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "*ip", addressstring2);
+ InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "name", cl_name.string);
+ InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "topcolor", va("%i", (cl_color.integer >> 4) & 15));
+ InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "bottomcolor", va("%i", (cl_color.integer) & 15));
+ InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "rate", va("%i", cl_rate.integer));
+ InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "msg", "1");
+ InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "*ver", engineversion);
+ NetConn_WriteString(mysocket, va("\377\377\377\377connect %i %i %i \"%s\"\n", 28, cls.qw_qport, atoi(string + 1), cls.userinfo), peeraddress);
+ return true;
+ }
+ if (length > 2 && !memcmp(string, "n\\", 2))
+ {
+ serverlist_info_t *info;
+ int n;
+ double pingtime;
+
+ // qw server status
+ if (serverlist_consoleoutput && developer_networking.integer >= 2)
+ Con_Printf("QW server status from server at %s:\n%s\n", addressstring2, string + 1);
+
+ string += 1;
+ // serverlist only uses text addresses
+ LHNETADDRESS_ToString(peeraddress, cname, sizeof(cname), true);
+ // search the cache for this server and update it
+ for( n = 0; n < serverlist_cachecount; n++ )
+ if( !strcmp( cname, serverlist_cache[n].info.cname ) )
+ break;
+ if( n == serverlist_cachecount ) {
+ // LAN search doesnt require an answer from the master server so we wont
+ // know the ping nor will it be initialized already...
+
+ // find a slot
+ if( serverlist_cachecount == SERVERLIST_TOTALSIZE )
+ return true;
+
+ memset(&serverlist_cache[serverlist_cachecount], 0, sizeof(serverlist_cache[serverlist_cachecount]));
+ // store the data the engine cares about (address and ping)
+ strlcpy (serverlist_cache[serverlist_cachecount].info.cname, cname, sizeof (serverlist_cache[serverlist_cachecount].info.cname));
+ serverlist_cache[serverlist_cachecount].info.ping = 100000;
+ //serverlist_cache[serverlist_cachecount].querytime = realtime;
+ serverlist_cache[serverlist_cachecount].querytime = Sys_DoubleTime();
+ // if not in the slist menu we should print the server to console
+ if (serverlist_consoleoutput) {
+ Con_Printf("querying %s\n", ipstring);
+ }
+
+ ++serverlist_cachecount;
+ }
+
+ info = &serverlist_cache[n].info;
+ strlcpy(info->game, "QuakeWorld", sizeof(info->game));;
+ if ((s = SearchInfostring(string, "*gamedir" )) != NULL) strlcpy(info->mod , s, sizeof (info->mod ));else info->mod[0] = 0;
+ if ((s = SearchInfostring(string, "map" )) != NULL) strlcpy(info->map , s, sizeof (info->map ));else info->map[0] = 0;
+ if ((s = SearchInfostring(string, "hostname" )) != NULL) strlcpy(info->name, s, sizeof (info->name));else info->name[0] = 0;
+ info->protocol = 0;
+ info->numplayers = 0; // updated below
+ if ((s = SearchInfostring(string, "maxclients" )) != NULL) info->maxplayers = atoi(s);else info->maxplayers = 0;
+ if ((s = SearchInfostring(string, "gameversion" )) != NULL) info->gameversion = atoi(s);else info->gameversion = 0;
+
+ // count active players on server
+ // (we could gather more info, but we're just after the number)
+ s = strchr(string, '\n');
+ if (s)
+ {
+ s++;
+ while (s < string + length)
+ {
+ for (;s < string + length && *s != '\n';s++)
+ ;
+ if (s >= string + length)
+ break;
+ info->numplayers++;
+ s++;
+ }
+ }
+
+ if (info->ping == 100000)
+ serverreplycount++;
+
+ pingtime = (int)((Sys_DoubleTime() - serverlist_cache[n].querytime) * 1000.0 + 0.5);
+ pingtime = bound(0, pingtime, 9999);
+ // update the ping
+ info->ping = pingtime;
+
+ // legacy/old stuff move it to the menu ASAP
+
+ // build description strings for the things users care about
+ dpsnprintf(serverlist_cache[n].line1, sizeof(serverlist_cache[n].line1), "^%c%5d^7 ^%c%3u^7/%3u %-65.65s", pingtime >= 300 ? '1' : (pingtime >= 200 ? '3' : '7'), (int)pingtime, ((info->numplayers > 0 && info->numplayers < info->maxplayers) ? (info->numplayers >= 4 ? '7' : '3') : '1'), info->numplayers, info->maxplayers, info->name);
+ dpsnprintf(serverlist_cache[n].line2, sizeof(serverlist_cache[n].line2), "^4%-21.21s %-19.19s ^%c%-17.17s^4 %-20.20s", info->cname, info->game, (info->gameversion != gameversion.integer) ? '1' : '4', info->mod, info->map);
+ if( serverlist_cache[n].query == SQS_QUERIED ) {
+ ServerList_ViewList_Remove( &serverlist_cache[n] );
+ }
+ // if not in the slist menu we should print the server to console (if wanted)
+ else if( serverlist_consoleoutput )
+ Con_Printf("%s\n%s\n", serverlist_cache[n].line1, serverlist_cache[n].line2);
+ // and finally, update the view set
+ ServerList_ViewList_Insert( &serverlist_cache[n] );
+ serverlist_cache[n].query = SQS_QUERIED;
+
+ return true;
+ }
+ if (string[0] == 'n')
+ {
+ // qw print command
+ Con_Printf("QW print command from server at %s:\n%s\n", addressstring2, string + 1);
+ }
// we may not have liked the packet, but it was a command packet, so
// we're done processing this packet now
return true;
}
+ // quakeworld ingame packet
+ if (fromserver && cls.protocol == PROTOCOL_QUAKEWORLD && length >= 8 && (ret = NetConn_ReceivedMessage(cls.netcon, data, length, cls.protocol)) == 2)
+ {
+ ret = 0;
+ CL_ParseServerMessage();
+ return ret;
+ }
// netquake control packets, supported for compatibility only
if (length >= 5 && (control = BigLong(*((int *)data))) && (control & (~NETFLAG_LENGTH_MASK)) == (int)NETFLAG_CTL && (control & NETFLAG_LENGTH_MASK) == length)
{
LHNETADDRESS_SetPort(&clientportaddress, port);
}
M_Update_Return_Reason("Accepted");
- NetConn_ConnectionEstablished(mysocket, &clientportaddress);
+ NetConn_ConnectionEstablished(mysocket, &clientportaddress, PROTOCOL_QUAKE);
}
break;
case CCREP_REJECT:
if (developer.integer)
Con_Printf("Datagram_ParseConnectionless: received CCREP_REJECT from %s.\n", addressstring2);
cls.connect_trying = false;
- M_Update_Return_Reason(data);
+ M_Update_Return_Reason((char *)data);
break;
#if 0
case CCREP_SERVER_INFO:
// LordHavoc: because the UDP driver reports 0.0.0.0:26000 as the address
// string we just ignore it and keep the real address
MSG_ReadString();
- // hostcache only uses text addresses
+ // serverlist only uses text addresses
cname = UDP_AddrToString(readaddr);
// search the cache for this server
for (n = 0; n < hostCacheCount; n++)
- if (!strcmp(cname, hostcache[n].cname))
+ if (!strcmp(cname, serverlist[n].cname))
break;
// add it
- if (n == hostCacheCount && hostCacheCount < HOSTCACHESIZE)
+ if (n == hostCacheCount && hostCacheCount < SERVERLISTSIZE)
{
hostCacheCount++;
- memset(&hostcache[n], 0, sizeof(hostcache[n]));
- strlcpy (hostcache[n].name, MSG_ReadString(), sizeof (hostcache[n].name));
- strlcpy (hostcache[n].map, MSG_ReadString(), sizeof (hostcache[n].map));
- hostcache[n].users = MSG_ReadByte();
- hostcache[n].maxusers = MSG_ReadByte();
+ memset(&serverlist[n], 0, sizeof(serverlist[n]));
+ strlcpy (serverlist[n].name, MSG_ReadString(), sizeof (serverlist[n].name));
+ strlcpy (serverlist[n].map, MSG_ReadString(), sizeof (serverlist[n].map));
+ serverlist[n].users = MSG_ReadByte();
+ serverlist[n].maxusers = MSG_ReadByte();
c = MSG_ReadByte();
if (c != NET_PROTOCOL_VERSION)
{
- strlcpy (hostcache[n].cname, hostcache[n].name, sizeof (hostcache[n].cname));
- strcpy(hostcache[n].name, "*");
- strlcat (hostcache[n].name, hostcache[n].cname, sizeof(hostcache[n].name));
+ strlcpy (serverlist[n].cname, serverlist[n].name, sizeof (serverlist[n].cname));
+ strcpy(serverlist[n].name, "*");
+ strlcat (serverlist[n].name, serverlist[n].cname, sizeof(serverlist[n].name));
}
- strlcpy (hostcache[n].cname, cname, sizeof (hostcache[n].cname));
+ strlcpy (serverlist[n].cname, cname, sizeof (serverlist[n].cname));
}
}
break;
return true;
}
ret = 0;
- if (length >= (int)NET_HEADERSIZE && cls.netcon && mysocket == cls.netcon->mysocket && !LHNETADDRESS_Compare(&cls.netcon->peeraddress, peeraddress) && (ret = NetConn_ReceivedMessage(cls.netcon, data, length)) == 2)
+ if (fromserver && length >= (int)NET_HEADERSIZE && (ret = NetConn_ReceivedMessage(cls.netcon, data, length, cls.protocol)) == 2)
CL_ParseServerMessage();
return ret;
}
+void NetConn_QueryQueueFrame(void)
+{
+ int index;
+ int queries;
+ int maxqueries;
+ double timeouttime;
+ static double querycounter = 0;
+
+ if (serverlist_querysleep)
+ return;
+
+ // apply a cool down time after master server replies,
+ // to avoid messing up the ping times on the servers
+ if (serverlist_querywaittime > realtime)
+ return;
+
+ // each time querycounter reaches 1.0 issue a query
+ querycounter += host_realframetime * net_slist_queriespersecond.value;
+ maxqueries = (int)querycounter;
+ maxqueries = bound(0, maxqueries, net_slist_queriesperframe.integer);
+ querycounter -= maxqueries;
+
+ if( maxqueries == 0 ) {
+ return;
+ }
+
+ // scan serverlist and issue queries as needed
+ serverlist_querysleep = true;
+
+ timeouttime = 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 )
+ {
+ continue;
+ }
+
+ serverlist_querysleep = false;
+ if( entry->querycounter != 0 && entry->querytime > timeouttime )
+ {
+ continue;
+ }
+
+ if( entry->querycounter != (unsigned) net_slist_maxtries.integer )
+ {
+ lhnetaddress_t address;
+ int socket;
+
+ LHNETADDRESS_FromString(&address, entry->info.cname, 0);
+ if (entry->protocol == PROTOCOL_QUAKEWORLD)
+ {
+ 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++)
+ NetConn_WriteString(cl_sockets[socket], "\377\377\377\377getinfo", &address);
+ }
+
+ //entry->querytime = realtime;
+ entry->querytime = Sys_DoubleTime();
+ entry->querycounter++;
+
+ // if not in the slist menu we should print the server to console
+ if (serverlist_consoleoutput)
+ Con_Printf("querying %25s (%i. try)\n", entry->info.cname, entry->querycounter);
+
+ queries++;
+ }
+ else
+ {
+ entry->query = SQS_TIMEDOUT;
+ }
+ }
+}
+
void NetConn_ClientFrame(void)
{
int i, length;
lhnetaddress_t peeraddress;
- netconn_t *conn;
- NetConn_UpdateServerStuff();
+ NetConn_UpdateSockets();
if (cls.connect_trying && cls.connect_nextsendtime < realtime)
{
if (cls.connect_remainingtries == 0)
+ M_Update_Return_Reason("Connect: Waiting 10 seconds for reply");
+ cls.connect_nextsendtime = realtime + 1;
+ cls.connect_remainingtries--;
+ if (cls.connect_remainingtries <= -10)
{
cls.connect_trying = false;
M_Update_Return_Reason("Connect: Failed");
return;
}
- cls.connect_nextsendtime = realtime + 1;
- cls.connect_remainingtries--;
- // try challenge first (newer server)
+ // try challenge first (newer DP server or QW)
NetConn_WriteString(cls.connect_mysocket, "\377\377\377\377getchallenge", &cls.connect_address);
// then try netquake as a fallback (old server, or netquake)
SZ_Clear(&net_message);
for (i = 0;i < cl_numsockets;i++)
while (cl_sockets[i] && (length = NetConn_Read(cl_sockets[i], readbuffer, sizeof(readbuffer), &peeraddress)) > 0)
NetConn_ClientParsePacket(cl_sockets[i], readbuffer, length, &peeraddress);
+ NetConn_QueryQueueFrame();
if (cls.netcon && realtime > cls.netcon->timeout)
{
Con_Print("Connection timed out\n");
CL_Disconnect();
- Host_ShutdownServer (false);
+ Host_ShutdownServer ();
}
- for (conn = netconn_list;conn;conn = conn->next)
- NetConn_ReSendMessage(conn);
}
#define MAX_CHALLENGES 128
-struct
+struct challenge_s
{
lhnetaddress_t address;
double time;
buffer[i] = 0;
}
-int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, lhnetaddress_t *peeraddress)
+static qboolean NetConn_BuildStatusResponse(const char* challenge, char* out_msg, size_t out_size, qboolean fullstatus)
{
- int i, n, ret, clientnum, responselength, best;
+ unsigned int nb_clients = 0, i;
+ int length;
+
+ // How many clients are there?
+ for (i = 0;i < (unsigned int)svs.maxclients;i++)
+ if (svs.clients[i].active)
+ nb_clients++;
+
+ // TODO: we should add more information for the full status string
+ length = dpsnprintf(out_msg, out_size,
+ "\377\377\377\377%s\x0A"
+ "\\gamename\\%s\\modname\\%s\\gameversion\\%d\\sv_maxclients\\%d"
+ "\\clients\\%d\\mapname\\%s\\hostname\\%s\\protocol\\%d"
+ "%s%s"
+ "%s",
+ fullstatus ? "statusResponse" : "infoResponse",
+ gamename, com_modname, gameversion.integer, svs.maxclients,
+ nb_clients, sv.name, hostname.string, NET_PROTOCOL_VERSION,
+ challenge ? "\\challenge\\" : "", challenge ? challenge : "",
+ fullstatus ? "\n" : "");
+
+ // Make sure it fits in the buffer
+ if (length < 0)
+ return false;
+
+ if (fullstatus)
+ {
+ char *ptr;
+ int left;
+
+ ptr = out_msg + length;
+ left = (int)out_size - length;
+
+ for (i = 0;i < (unsigned int)svs.maxclients;i++)
+ {
+ client_t *cl = &svs.clients[i];
+ if (cl->active)
+ {
+ int nameind, cleanind;
+ char curchar;
+ char cleanname [sizeof(cl->name)];
+
+ // Remove all characters '"' and '\' in the player name
+ nameind = 0;
+ cleanind = 0;
+ do
+ {
+ curchar = cl->name[nameind++];
+ if (curchar != '"' && curchar != '\\')
+ {
+ cleanname[cleanind++] = curchar;
+ if (cleanind == sizeof(cleanname) - 1)
+ break;
+ }
+ } while (curchar != '\0');
+
+ length = dpsnprintf(ptr, left, "%d %d \"%s\"\n",
+ cl->frags,
+ (int)(cl->ping * 1000.0f),
+ cleanname);
+ if(length < 0)
+ return false;
+ left -= length;
+ ptr += length;
+ }
+ }
+ }
+
+ return true;
+}
+
+extern void SV_SendServerinfo (client_t *client);
+static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *data, int length, lhnetaddress_t *peeraddress)
+{
+ int i, ret, clientnum, best;
double besttime;
client_t *client;
netconn_t *conn;
- char *s, *string, response[512], addressstring2[128], stringbuf[16384];
+ char *s, *string, response[1400], addressstring2[128], stringbuf[16384];
+
+ // see if we can identify the sender as a local player
+ // (this is necessary for rcon to send a reliable reply if the client is
+ // actually on the server, not sending remotely)
+ for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
+ if (host_client->netconnection && host_client->netconnection->mysocket == mysocket && !LHNETADDRESS_Compare(&host_client->netconnection->peeraddress, peeraddress))
+ break;
+ if (i == svs.maxclients)
+ host_client = NULL;
if (sv.active)
{
for (clientnum = 0, client = svs.clients;clientnum < svs.maxclients;clientnum++, client++)
if (client->netconnection && LHNETADDRESS_Compare(peeraddress, &client->netconnection->peeraddress) == 0)
break;
- if (clientnum < svs.maxclients)
+ if (clientnum < svs.maxclients && realtime - client->connecttime < net_messagerejointimeout.value)
+ {
+ // client is still trying to connect,
+ // so we send a duplicate reply
+ if (developer.integer)
+ Con_Printf("Datagram_ParseConnectionless: sending duplicate accept to %s.\n", addressstring2);
+ NetConn_WriteString(mysocket, "\377\377\377\377accept", peeraddress);
+ }
+#if 0
+ else if (clientnum < svs.maxclients)
{
- // duplicate connection request
- if (realtime - client->connecttime < 2.0)
- {
- // client is still trying to connect,
- // so we send a duplicate reply
- if (developer.integer)
- Con_Printf("Datagram_ParseConnectionless: sending duplicate accept to %s.\n", addressstring2);
- NetConn_WriteString(mysocket, "\377\377\377\377accept", peeraddress);
- }
- // only kick if old connection seems dead
if (realtime - client->netconnection->lastMessageTime >= net_messagerejointimeout.value)
{
- // kick off connection and await retry
- client->deadsocket = true;
+ // client crashed and is coming back, keep their stuff intact
+ SV_SendServerinfo(client);
+ //host_client = client;
+ //SV_DropClient (true);
}
+ // else ignore them
}
+#endif
else
{
// this is a new client, find a slot
Con_Printf("Datagram_ParseConnectionless: sending \"accept\" to %s.\n", conn->address);
NetConn_WriteString(mysocket, "\377\377\377\377accept", peeraddress);
// now set up the client
+ SV_VM_Begin();
SV_ConnectClient(clientnum, conn);
+ SV_VM_End();
NetConn_Heartbeat(1);
}
}
if (length >= 7 && !memcmp(string, "getinfo", 7))
{
const char *challenge = NULL;
+
// If there was a challenge in the getinfo message
if (length > 8 && string[7] == ' ')
challenge = string + 8;
- for (i = 0, n = 0;i < svs.maxclients;i++)
- if (svs.clients[i].active)
- n++;
- responselength = snprintf(response, sizeof(response), "\377\377\377\377infoResponse\x0A"
- "\\gamename\\%s\\modname\\%s\\sv_maxclients\\%d"
- "\\clients\\%d\\mapname\\%s\\hostname\\%s\\protocol\\%d%s%s",
- gamename, com_modname, svs.maxclients, n,
- sv.name, hostname.string, NET_PROTOCOL_VERSION, challenge ? "\\challenge\\" : "", challenge ? challenge : "");
- // does it fit in the buffer?
- if (responselength < (int)sizeof(response))
+
+ if (NetConn_BuildStatusResponse(challenge, response, sizeof(response), false))
{
if (developer.integer)
Con_Printf("Sending reply to master %s - %s\n", addressstring2, response);
}
return true;
}
+ if (length >= 9 && !memcmp(string, "getstatus", 9))
+ {
+ const char *challenge = NULL;
+
+ // If there was a challenge in the getinfo message
+ if (length > 10 && string[9] == ' ')
+ challenge = string + 10;
+
+ if (NetConn_BuildStatusResponse(challenge, response, sizeof(response), true))
+ {
+ if (developer.integer)
+ Con_Printf("Sending reply to client %s - %s\n", addressstring2, response);
+ NetConn_WriteString(mysocket, response, peeraddress);
+ }
+ return true;
+ }
+ if (length >= 5 && !memcmp(string, "rcon ", 5))
+ {
+ int i;
+ char *s = string + 5;
+ char password[64];
+ for (i = 0;*s > ' ';s++)
+ if (i < (int)sizeof(password) - 1)
+ password[i++] = *s;
+ password[i] = 0;
+ if (password[0] > ' ' && !strcmp(rcon_password.string, password))
+ {
+ // looks like a legitimate rcon command with the correct password
+ Con_Printf("server received rcon command from %s:\n%s\n", host_client ? host_client->name : addressstring2, s);
+ rcon_redirect = true;
+ rcon_redirect_bufferpos = 0;
+ Cmd_ExecuteString(s, src_command);
+ rcon_redirect_buffer[rcon_redirect_bufferpos] = 0;
+ rcon_redirect = false;
+ // print resulting text to client
+ // if client is playing, send a reliable reply instead of
+ // a command packet
+ if (host_client)
+ {
+ // if the netconnection is loop, then this is the
+ // local player on a listen mode server, and it would
+ // result in duplicate printing to the console
+ // (not that the local player should be using rcon
+ // when they have the console)
+ if (host_client->netconnection && LHNETADDRESS_GetAddressType(&host_client->netconnection->peeraddress) != LHNETADDRESSTYPE_LOOP)
+ SV_ClientPrintf("%s", rcon_redirect_buffer);
+ }
+ else
+ {
+ // qw print command
+ dpsnprintf(response, sizeof(response), "\377\377\377\377n%s", rcon_redirect_buffer);
+ NetConn_WriteString(mysocket, response, peeraddress);
+ }
+ }
+ return true;
+ }
/*
if (!strncmp(string, "ping", 4))
{
NetConn_Write(mysocket, net_message.data, net_message.cursize, peeraddress);
SZ_Clear(&net_message);
}
+#if 0
else if (realtime - client->netconnection->lastMessageTime >= net_messagerejointimeout.value)
{
+ SV_SendServerinfo(client);
// the old client hasn't sent us anything
// in quite a while, so kick off and let
// the retry take care of it...
- client->deadsocket = true;
+ //host_client = client;
+ //SV_DropClient (true);
}
+#endif
}
else
{
NetConn_Write(mysocket, net_message.data, net_message.cursize, peeraddress);
SZ_Clear(&net_message);
// now set up the client struct
+ SV_VM_Begin();
SV_ConnectClient(clientnum, conn);
+ SV_VM_End();
NetConn_Heartbeat(1);
}
else
MSG_WriteByte(&net_message, playerNumber);
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)client->edict->fields.server->frags);
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));
}
}
#endif
- for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
+ if (host_client)
{
- if (host_client->netconnection && host_client->netconnection->mysocket == mysocket && !LHNETADDRESS_Compare(&host_client->netconnection->peeraddress, peeraddress))
+ if ((ret = NetConn_ReceivedMessage(host_client->netconnection, data, length, sv.protocol)) == 2)
{
- if ((ret = NetConn_ReceivedMessage(host_client->netconnection, data, length)) == 2)
- SV_ReadClientMessage();
+ SV_VM_Begin();
+ SV_ReadClientMessage();
+ SV_VM_End();
return ret;
}
}
{
int i, length;
lhnetaddress_t peeraddress;
- netconn_t *conn;
- NetConn_UpdateServerStuff();
+ NetConn_UpdateSockets();
for (i = 0;i < sv_numsockets;i++)
while (sv_sockets[i] && (length = NetConn_Read(sv_sockets[i], readbuffer, sizeof(readbuffer), &peeraddress)) > 0)
NetConn_ServerParsePacket(sv_sockets[i], readbuffer, length, &peeraddress);
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_VM_Begin();
SV_DropClient(false);
+ SV_VM_End();
}
}
- for (conn = netconn_list;conn;conn = conn->next)
- NetConn_ReSendMessage(conn);
}
-void NetConn_QueryMasters(void)
+void NetConn_QueryMasters(qboolean querydp, qboolean queryqw)
{
int i;
int masternum;
lhnetaddress_t masteraddress;
+ lhnetaddress_t broadcastaddress;
char request[256];
- if (hostcache_cachecount >= HOSTCACHE_TOTALSIZE)
+ if (serverlist_cachecount >= SERVERLIST_TOTALSIZE)
return;
- for (i = 0;i < cl_numsockets;i++)
+ // 26000 is the default quake server port, servers on other ports will not
+ // be found
+ // note this is IPv4-only, I doubt there are IPv6-only LANs out there
+ LHNETADDRESS_FromString(&broadcastaddress, "255.255.255.255", 26000);
+
+ if (querydp)
{
- if (cl_sockets[i])
+ for (i = 0;i < cl_numsockets;i++)
{
-#if 0
- // search LAN
-#if 1
- UDP_Broadcast(UDP_controlSock, "\377\377\377\377getinfo", 11);
-#else
- SZ_Clear(&net_message);
- // save space for the header, filled in later
- MSG_WriteLong(&net_message, 0);
- MSG_WriteByte(&net_message, CCREQ_SERVER_INFO);
- MSG_WriteString(&net_message, "QUAKE");
- MSG_WriteByte(&net_message, NET_PROTOCOL_VERSION);
- *((int *)net_message.data) = BigLong(NETFLAG_CTL | (net_message.cursize & NETFLAG_LENGTH_MASK));
- UDP_Broadcast(UDP_controlSock, net_message.data, net_message.cursize);
- SZ_Clear(&net_message);
-#endif
-#endif
-
- // build the getservers
- snprintf(request, sizeof(request), "\377\377\377\377getservers %s %u empty full\x0A", gamename, NET_PROTOCOL_VERSION);
+ if (cl_sockets[i])
+ {
+ // search LAN for Quake servers
+ SZ_Clear(&net_message);
+ // save space for the header, filled in later
+ MSG_WriteLong(&net_message, 0);
+ MSG_WriteByte(&net_message, CCREQ_SERVER_INFO);
+ MSG_WriteString(&net_message, "QUAKE");
+ MSG_WriteByte(&net_message, NET_PROTOCOL_VERSION);
+ *((int *)net_message.data) = BigLong(NETFLAG_CTL | (net_message.cursize & NETFLAG_LENGTH_MASK));
+ NetConn_Write(cl_sockets[i], net_message.data, net_message.cursize, &broadcastaddress);
+ SZ_Clear(&net_message);
+
+ // search LAN for DarkPlaces servers
+ NetConn_WriteString(cl_sockets[i], "\377\377\377\377getinfo", &broadcastaddress);
+
+ // build the getservers message to send to the dpmaster master servers
+ dpsnprintf(request, sizeof(request), "\377\377\377\377getservers %s %u empty full\x0A", gamename, NET_PROTOCOL_VERSION);
+
+ // search internet
+ for (masternum = 0;sv_masters[masternum].name;masternum++)
+ {
+ if (sv_masters[masternum].string && LHNETADDRESS_FromString(&masteraddress, sv_masters[masternum].string, DPMASTER_PORT) && LHNETADDRESS_GetAddressType(&masteraddress) == LHNETADDRESS_GetAddressType(LHNET_AddressFromSocket(cl_sockets[i])))
+ {
+ masterquerycount++;
+ NetConn_WriteString(cl_sockets[i], request, &masteraddress);
+ }
+ }
+ }
+ }
+ }
- // search internet
- for (masternum = 0;sv_masters[masternum].name;masternum++)
+ // only query QuakeWorld servers when the user wants to
+ if (queryqw)
+ {
+ for (i = 0;i < cl_numsockets;i++)
+ {
+ if (cl_sockets[i])
{
- if (sv_masters[masternum].string && LHNETADDRESS_FromString(&masteraddress, sv_masters[masternum].string, MASTER_PORT) && LHNETADDRESS_GetAddressType(&masteraddress) == LHNETADDRESS_GetAddressType(LHNET_AddressFromSocket(cl_sockets[i])))
+ // build the getservers message to send to the qwmaster master servers
+ // note this has no -1 prefix, and the trailing nul byte is sent
+ dpsnprintf(request, sizeof(request), "c\n");
+
+ // search internet
+ for (masternum = 0;sv_qwmasters[masternum].name;masternum++)
{
- masterquerycount++;
- NetConn_WriteString(cl_sockets[i], request, &masteraddress);
+ if (sv_qwmasters[masternum].string && LHNETADDRESS_FromString(&masteraddress, sv_qwmasters[masternum].string, QWMASTER_PORT) && LHNETADDRESS_GetAddressType(&masteraddress) == LHNETADDRESS_GetAddressType(LHNET_AddressFromSocket(cl_sockets[i])))
+ {
+ masterquerycount++;
+ NetConn_Write(cl_sockets[i], request, 7, &masteraddress);
+ }
}
}
}
{
nextheartbeattime = realtime + sv_heartbeatperiod.value;
for (masternum = 0;sv_masters[masternum].name;masternum++)
- if (sv_masters[masternum].string && LHNETADDRESS_FromString(&masteraddress, sv_masters[masternum].string, MASTER_PORT) && (mysocket = NetConn_ChooseServerSocketForAddress(&masteraddress)))
+ if (sv_masters[masternum].string && LHNETADDRESS_FromString(&masteraddress, sv_masters[masternum].string, DPMASTER_PORT) && (mysocket = NetConn_ChooseServerSocketForAddress(&masteraddress)))
NetConn_WriteString(mysocket, "\377\377\377\377heartbeat DarkPlaces\x0A", &masteraddress);
}
}
-int NetConn_SendToAll(sizebuf_t *data, double blocktime)
-{
- int i, count = 0;
- qbyte sent[MAX_SCOREBOARD];
-
- memset(sent, 0, sizeof(sent));
-
- // simultaneously wait for the first CanSendMessage and send the message,
- // then wait for a second CanSendMessage (verifying it was received), or
- // the client drops and is no longer counted
- // the loop aborts when either it runs out of clients to send to, or a
- // timeout expires
- blocktime += Sys_DoubleTime();
- do
- {
- count = 0;
- NetConn_ClientFrame();
- NetConn_ServerFrame();
- for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
- {
- if (host_client->netconnection)
- {
- if (NetConn_CanSendMessage(host_client->netconnection))
- {
- if (!sent[i])
- NetConn_SendReliableMessage(host_client->netconnection, data);
- sent[i] = true;
- }
- if (!NetConn_CanSendMessage(host_client->netconnection))
- count++;
- }
- }
- }
- while (count && Sys_DoubleTime() < blocktime);
- return count;
-}
-
static void Net_Heartbeat_f(void)
{
if (sv.active)
void PrintStats(netconn_t *conn)
{
- Con_Printf("address=%21s canSend=%u sendSeq=%6u recvSeq=%6u\n", conn->address, conn->canSend, conn->sendSequence, conn->receiveSequence);
+ if ((cls.state == ca_connected && cls.protocol == PROTOCOL_QUAKEWORLD) || (sv.active && sv.protocol == PROTOCOL_QUAKEWORLD))
+ Con_Printf("address=%21s canSend=%u sendSeq=%6u recvSeq=%6u\n", conn->address, !conn->sendMessageLength, conn->qw.outgoing_sequence, conn->qw.incoming_sequence);
+ else
+ Con_Printf("address=%21s canSend=%u sendSeq=%6u recvSeq=%6u\n", conn->address, !conn->sendMessageLength, conn->nq.sendSequence, conn->nq.receiveSequence);
}
void Net_Stats_f(void)
void Net_Slist_f(void)
{
- HostCache_ResetMasks();
- hostcache_sortbyfield = HCIF_PING;
- hostcache_sortdescending = false;
+ ServerList_ResetMasks();
+ serverlist_sortbyfield = SLIF_PING;
+ serverlist_sortdescending = false;
+ if (m_state != m_slist) {
+ Con_Print("Sending requests to master servers\n");
+ ServerList_QueryList(true, false);
+ serverlist_consoleoutput = true;
+ Con_Print("Listening for replies...\n");
+ } else
+ ServerList_QueryList(true, false);
+}
+
+void Net_SlistQW_f(void)
+{
+ ServerList_ResetMasks();
+ serverlist_sortbyfield = SLIF_PING;
+ serverlist_sortdescending = false;
if (m_state != m_slist) {
Con_Print("Sending requests to master servers\n");
- HostCache_QueryList();
- hostcache_consoleoutput = true;
+ ServerList_QueryList(false, true);
+ serverlist_consoleoutput = true;
Con_Print("Listening for replies...\n");
} else
- HostCache_QueryList();
+ ServerList_QueryList(false, true);
}
void NetConn_Init(void)
{
int i;
lhnetaddress_t tempaddress;
- netconn_mempool = Mem_AllocPool("Networking", 0, NULL);
- Cmd_AddCommand("net_stats", Net_Stats_f);
- Cmd_AddCommand("net_slist", Net_Slist_f);
- Cmd_AddCommand("heartbeat", Net_Heartbeat_f);
+ netconn_mempool = Mem_AllocPool("network connections", 0, NULL);
+ Cmd_AddCommand("net_stats", Net_Stats_f, "print network statistics");
+ Cmd_AddCommand("net_slist", Net_Slist_f, "query dp master servers and print all server information");
+ Cmd_AddCommand("net_slistqw", Net_SlistQW_f, "query qw master servers and print all server information");
+ Cmd_AddCommand("heartbeat", Net_Heartbeat_f, "send a heartbeat to the master server (updates your server information)");
+ Cvar_RegisterVariable(&net_slist_queriespersecond);
+ Cvar_RegisterVariable(&net_slist_queriesperframe);
+ Cvar_RegisterVariable(&net_slist_timeout);
+ Cvar_RegisterVariable(&net_slist_maxtries);
Cvar_RegisterVariable(&net_messagetimeout);
Cvar_RegisterVariable(&net_messagerejointimeout);
Cvar_RegisterVariable(&net_connecttimeout);
Cvar_RegisterVariable(&sv_heartbeatperiod);
for (i = 0;sv_masters[i].name;i++)
Cvar_RegisterVariable(&sv_masters[i]);
+ Cvar_RegisterVariable(&gameversion);
// COMMANDLINEOPTION: Server: -ip <ipaddress> 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)
{
}
cl_numsockets = 0;
sv_numsockets = 0;
- SZ_Alloc(&net_message, NET_MAXMESSAGE, "net_message");
+ net_message.data = net_message_buf;
+ net_message.maxsize = sizeof(net_message_buf);
+ net_message.cursize = 0;
LHNET_Init();
}
projects / xonotic / darkplaces.git / blobdiff