increased server browser viewlist limit (was 128) to match the serverlist limit ...

[xonotic/darkplaces.git] / netconn.h

diff --git a/netconn.h b/netconn.h
index d958db4ddca1ca34a71fdf929b122e340e882f53..fd39833e8ee504746da668d58db4ac30dd62d79d 100755 (executable)
--- a/netconn.h
+++ b/netconn.h
@@ -116,7 +116,7 @@ typedef struct netconn_s
 
        lhnetsocket_t *mysocket;
        lhnetaddress_t peeraddress;
-       
+
        // this is mostly identical to qsocket_t from quake
 
        // if this time is reached, kick off peer
@@ -151,11 +151,11 @@ extern char playername[];
 extern int playercolor;
 
 #define SERVERLIST_TOTALSIZE           2048
-#define SERVERLIST_VIEWLISTSIZE                128
+#define SERVERLIST_VIEWLISTSIZE                SERVERLIST_TOTALSIZE
 #define SERVERLIST_ANDMASKCOUNT                5
 #define SERVERLIST_ORMASKCOUNT         5
 
-typedef enum 
+typedef enum
 {
        // SLMO_CONTAINS is the default for strings
        // SLMO_GREATEREQUAL is the default for numbers (also used when OP == CONTAINS or NOTCONTAINS
@@ -193,7 +193,7 @@ typedef struct
        int protocol;
 } serverlist_info_t;
 
-typedef enum 
+typedef enum
 {
        SLIF_CNAME,
        SLIF_PING,
@@ -207,15 +207,25 @@ typedef enum
        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
-       qboolean finished; 
+       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];
@@ -237,7 +247,7 @@ extern qboolean serverlist_sortdescending;
 extern int serverlist_viewcount;
 extern serverlist_entry_t *serverlist_viewlist[SERVERLIST_VIEWLISTSIZE];
 
-extern int serverlist_cachecount; 
+extern int serverlist_cachecount;
 
 extern qboolean serverlist_consoleoutput;
 
@@ -296,6 +306,7 @@ 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);