eliminated qbyte type, now uses unsigned char throughout the engine for this purpose

[xonotic/darkplaces.git] / netconn.h

diff --git a/netconn.h b/netconn.h
index a2ab98f003fe44b7d3a93d35deaec1c8391ac5c3..1597f892e34c8005210226a5803681e80988303c 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
 
@@ -135,12 +132,12 @@ typedef struct netconn_s
        unsigned int sendSequence;
        unsigned int unreliableSendSequence;
        int sendMessageLength;
-       qbyte sendMessage[NET_MAXMESSAGE];
+       unsigned char sendMessage[NET_MAXMESSAGE];
 
        unsigned int receiveSequence;
        unsigned int unreliableReceiveSequence;
        int receiveMessageLength;
-       qbyte receiveMessage[NET_MAXMESSAGE];
+       unsigned char receiveMessage[NET_MAXMESSAGE];
 
        char address[128];
 } netconn_t;
@@ -153,25 +150,108 @@ 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 struct
+typedef enum serverlist_maskop_e
 {
+       // 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 serverlist_info_s
+{
+       // 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_QUERYING,
+       SQS_QUERIED,
+       SQS_TIMEDOUT
+} serverlist_query_state;
+
+typedef struct serverlist_entry_s
+{
+       // 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;
-       // 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 serverlist_mask_s
+{
+       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 int hostCacheCount;
-extern hostcache_t hostcache[HOSTCACHESIZE];
+extern serverlist_infofield_t serverlist_sortbyfield;
+extern qboolean serverlist_sortdescending;
 
-#if !defined(_WIN32 ) && !defined (__linux__) && !defined (__sun__)
+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(SUNOS)
 #ifndef htonl
 extern unsigned long htonl (unsigned long hostlong);
 #endif
@@ -200,8 +280,7 @@ extern int serverreplycount;
 
 extern sizebuf_t net_message;
 
-extern cvar_t cl_fakelocalping_min;
-extern cvar_t cl_fakelocalping_max;
+extern cvar_t cl_netlocalping;
 
 int NetConn_SendReliableMessage(netconn_t *conn, sizebuf_t *data);
 //void NetConn_SendMessageNext(netconn_t *conn);
@@ -220,16 +299,23 @@ netconn_t *NetConn_Open(lhnetsocket_t *mysocket, lhnetaddress_t *peeraddress);
 void NetConn_Close(netconn_t *conn);
 void NetConn_Listen(qboolean state);
 int NetConn_IsLocalGame(void);
-//int NetConn_ReceivedMessage(netconn_t *conn, qbyte *data, int length);
-//int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, lhnetaddress_t *peeraddress);
-//int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, lhnetaddress_t *peeraddress);
+//int NetConn_ReceivedMessage(netconn_t *conn, unsigned char *data, int length);
+//int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *data, int length, lhnetaddress_t *peeraddress);
+//int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *data, int length, lhnetaddress_t *peeraddress);
 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