X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=netconn.h;h=fd39833e8ee504746da668d58db4ac30dd62d79d;hp=2e9d92341c1e6acd8c06122ec59c8db407adfebf;hb=dd85919901e74ddf23e2ab07e1d64280800367d3;hpb=a0338ffd578afdaf693aee96bc6f948afb5b1844

diff --git a/netconn.h b/netconn.h
index 2e9d9234..fd39833e 100755
--- a/netconn.h
+++ b/netconn.h
@@ -24,11 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "lhnet.h"
 
-#define NET_NAMELEN			128
-
-#define NET_MAXMESSAGE		65536
 #define NET_HEADERSIZE		(2 * sizeof(unsigned int))
-#define NET_DATAGRAMSIZE	(MAX_DATAGRAM + NET_HEADERSIZE)
 
 // NetHeader flags
 #define NETFLAG_LENGTH_MASK	0x0000ffff
@@ -143,7 +139,7 @@ typedef struct netconn_s
 	int receiveMessageLength;
 	qbyte receiveMessage[NET_MAXMESSAGE];
 
-	char address[NET_NAMELEN];
+	char address[128];
 } netconn_t;
 
 extern netconn_t *netconn_list;
@@ -154,21 +150,106 @@ extern cvar_t developer_networking;
 extern char playername[];
 extern int playercolor;
 
-#define HOSTCACHESIZE	128
+#define SERVERLIST_TOTALSIZE		2048
+#define SERVERLIST_VIEWLISTSIZE		SERVERLIST_TOTALSIZE
+#define SERVERLIST_ANDMASKCOUNT		5
+#define SERVERLIST_ORMASKCOUNT		5
 
+typedef enum
+{
+	// SLMO_CONTAINS is the default for strings
+	// SLMO_GREATEREQUAL is the default for numbers (also used when OP == CONTAINS or NOTCONTAINS
+	SLMO_CONTAINS,
+	SLMO_NOTCONTAIN,
+
+	SLMO_LESSEQUAL,
+	SLMO_LESS,
+	SLMO_EQUAL,
+	SLMO_GREATER,
+	SLMO_GREATEREQUAL,
+	SLMO_NOTEQUAL
+} serverlist_maskop_t;
+
+// struct with all fields that you can search for or sort by
 typedef struct
 {
-	// ping time for sorting servers
-	double ping;
 	// address for connecting
 	char cname[128];
-	// description (seen by user)
+	// ping time for sorting servers
+	int ping;
+	// name of the game
+	char game[32];
+	// name of the mod
+	char mod[32];
+	// name of the map
+	char map[32];
+	// name of the session
+	char name[128];
+	// max client number
+	int maxplayers;
+	// number of currently connected players
+	int numplayers;
+	// protocol version
+	int protocol;
+} serverlist_info_t;
+
+typedef enum
+{
+	SLIF_CNAME,
+	SLIF_PING,
+	SLIF_GAME,
+	SLIF_MOD,
+	SLIF_MAP,
+	SLIF_NAME,
+	SLIF_MAXPLAYERS,
+	SLIF_NUMPLAYERS,
+	SLIF_PROTOCOL,
+	SLIF_COUNT
+} serverlist_infofield_t;
+
+typedef enum
+{
+	SQS_NONE = 0,
+	SQS_QUERYING,
+	SQS_QUERIED,
+	SQS_TIMEDOUT
+} serverlist_query_state;
+
+typedef struct
+{
+	// used to determine whether this entry should be included into the final view
+	serverlist_query_state query;
+	// used to count the number of times the host has tried to query this server already
+	unsigned querycounter;
+	// used to calculate ping when update comes in
+	double querytime;
+
+	serverlist_info_t info;
+
+	// legacy stuff
 	char line1[128];
 	char line2[128];
-} hostcache_t;
+} serverlist_entry_t;
 
-extern int hostCacheCount;
-extern hostcache_t hostcache[HOSTCACHESIZE];
+typedef struct
+{
+	qboolean			active;
+	serverlist_maskop_t  tests[SLIF_COUNT];
+	serverlist_info_t info;
+} serverlist_mask_t;
+
+extern serverlist_mask_t serverlist_andmasks[SERVERLIST_ANDMASKCOUNT];
+extern serverlist_mask_t serverlist_ormasks[SERVERLIST_ORMASKCOUNT];
+
+extern serverlist_infofield_t serverlist_sortbyfield;
+extern qboolean serverlist_sortdescending;
+
+extern int serverlist_viewcount;
+extern serverlist_entry_t *serverlist_viewlist[SERVERLIST_VIEWLISTSIZE];
+
+extern int serverlist_cachecount;
+
+extern qboolean serverlist_consoleoutput;
 
 #if !defined(_WIN32 ) && !defined (__linux__) && !defined (__sun__)
 #ifndef htonl
@@ -191,9 +272,16 @@ extern unsigned short ntohs (unsigned short netshort);
 //
 //============================================================================
 
-extern cvar_t sv_maxplayers;
+extern double masterquerytime;
+extern int masterquerycount;
+extern int masterreplycount;
+extern int serverquerycount;
+extern int serverreplycount;
+
 extern sizebuf_t net_message;
 
+extern cvar_t cl_netlocalping;
+
 int NetConn_SendReliableMessage(netconn_t *conn, sizebuf_t *data);
 //void NetConn_SendMessageNext(netconn_t *conn);
 //void NetConn_ReSendMessage(netconn_t *conn);
@@ -218,9 +306,16 @@ void NetConn_ClientFrame(void);
 void NetConn_ServerFrame(void);
 void NetConn_QueryMasters(void);
 void NetConn_Heartbeat(int priority);
+void NetConn_QueryQueueFrame(void);
 int NetConn_SendToAll(sizebuf_t *data, double blocktime);
 void Net_Stats_f(void);
 void Net_Slist_f(void);
 
+// ServerList interface (public)
+// manually refresh the view set, do this after having changed the mask or any other flag
+void ServerList_RebuildViewList(void);
+void ServerList_ResetMasks(void);
+void ServerList_QueryList(void);
+
 #endif