Added a query queue (test commit so Willis can test it).

[xonotic/darkplaces.git] / netconn.h

diff --git a/netconn.h b/netconn.h
index 7d35b38352a254b9b8fb88a254194ddd2ef89b11..62dd2a0f1540b7fee664bdc65aa36fcb3ff79635 100755 (executable)
--- a/netconn.h
+++ b/netconn.h
@@ -116,9 +116,6 @@ typedef struct netconn_s
 
        lhnetsocket_t *mysocket;
        lhnetaddress_t peeraddress;
-       
-       // requested rate in bytes per second
-       int rate;
 
        // this is mostly identical to qsocket_t from quake
 
@@ -153,23 +150,104 @@ extern cvar_t developer_networking;
 extern char playername[];
 extern int playercolor;
 
-#define HOSTCACHESIZE  128
+#define SERVERLIST_TOTALSIZE           2048
+#define SERVERLIST_VIEWLISTSIZE                128
+#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
 {
+       // address for connecting
+       char cname[128];
        // 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_PENDING,
+       SQS_QUERYING,
+       SQS_QUERIED
+} serverlist_query_state;
+
+typedef struct
+{
+       // used to determine whether this entry should be included into the final view
+       serverlist_query_state query;
        // used to calculate ping when update comes in
        double querytime;
-       // address for connecting
-       char cname[128];
-       // description (seen by user)
+
+       serverlist_info_t info;
+
+       // legacy stuff
        char line1[128];
        char line2[128];
-} hostcache_t;
+} serverlist_entry_t;
+
+typedef struct
+{
+       qboolean                        active;
+       serverlist_maskop_t  tests[SLIF_COUNT];
+       serverlist_info_t info;
+} serverlist_mask_t;
 
-extern int hostCacheCount;
-extern hostcache_t hostcache[HOSTCACHESIZE];
+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
@@ -200,8 +278,7 @@ extern int serverreplycount;
 
 extern sizebuf_t net_message;
 
-extern cvar_t cl_netlocalping_min;
-extern cvar_t cl_netlocalping_max;
+extern cvar_t cl_netlocalping;
 
 int NetConn_SendReliableMessage(netconn_t *conn, sizebuf_t *data);
 //void NetConn_SendMessageNext(netconn_t *conn);
@@ -227,9 +304,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