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 62dd2a0f1540b7fee664bdc65aa36fcb3ff79635..1597f892e34c8005210226a5803681e80988303c 100755 (executable)
--- a/netconn.h
+++ b/netconn.h
@@ -132,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;
@@ -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 serverlist_maskop_e
 {
        // SLMO_CONTAINS is the default for strings
        // SLMO_GREATEREQUAL is the default for numbers (also used when OP == CONTAINS or NOTCONTAINS
@@ -171,7 +171,7 @@ typedef enum
 } serverlist_maskop_t;
 
 // struct with all fields that you can search for or sort by
-typedef struct
+typedef struct serverlist_info_s
 {
        // address for connecting
        char cname[128];
@@ -210,15 +210,17 @@ typedef enum
 typedef enum
 {
        SQS_NONE = 0,
-       SQS_PENDING,
        SQS_QUERYING,
-       SQS_QUERIED
+       SQS_QUERIED,
+       SQS_TIMEDOUT
 } serverlist_query_state;
 
-typedef struct
+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;
 
@@ -229,7 +231,7 @@ typedef struct
        char line2[128];
 } serverlist_entry_t;
 
-typedef struct
+typedef struct serverlist_mask_s
 {
        qboolean                        active;
        serverlist_maskop_t  tests[SLIF_COUNT];
@@ -249,7 +251,7 @@ extern int serverlist_cachecount;
 
 extern qboolean serverlist_consoleoutput;
 
-#if !defined(_WIN32 ) && !defined (__linux__) && !defined (__sun__)
+#if !defined(_WIN32) && !defined(__linux__) && !defined(SUNOS)
 #ifndef htonl
 extern unsigned long htonl (unsigned long hostlong);
 #endif
@@ -297,9 +299,9 @@ 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);