improved pr_fields command to list how many entities are using each entity field...

[xonotic/darkplaces.git] / net.h

diff --git a/net.h b/net.h
index 105df0f534949571730751b6d1fcbf0a2e4618d2..126dbe03834dcf251f6f1b6a96dc6438246fa203 100644 (file)
--- a/net.h
+++ b/net.h
@@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // net.h -- quake's interface to the networking layer
 
+#ifndef NET_H
+#define NET_H
+
 struct qsockaddr
 {
        short sa_family;
@@ -126,7 +129,7 @@ typedef struct qsocket_s
        qboolean                disconnected;
        qboolean                canSend;
        qboolean                sendNext;
-       
+
        int                             driver;
        int                             landriver;
        int                             socket;
@@ -136,12 +139,12 @@ typedef struct qsocket_s
        unsigned int    sendSequence;
        unsigned int    unreliableSendSequence;
        int                             sendMessageLength;
-       byte                    sendMessage [NET_MAXMESSAGE];
+       qbyte                   sendMessage [NET_MAXMESSAGE];
 
        unsigned int    receiveSequence;
        unsigned int    unreliableReceiveSequence;
        int                             receiveMessageLength;
-       byte                    receiveMessage [NET_MAXMESSAGE];
+       qbyte                   receiveMessage [NET_MAXMESSAGE];
 
        struct qsockaddr        addr;
        char                            address[NET_NAMELEN];
@@ -149,8 +152,7 @@ typedef struct qsocket_s
 } qsocket_t;
 
 extern qsocket_t       *net_activeSockets;
-extern qsocket_t       *net_freeSockets;
-extern int                     net_numsockets;
+extern mempool_t *net_mempool;
 
 typedef struct
 {
@@ -164,9 +166,9 @@ typedef struct
        int             (*CloseSocket) (int socket);
        int             (*Connect) (int socket, struct qsockaddr *addr);
        int             (*CheckNewConnections) (void);
-       int             (*Read) (int socket, byte *buf, int len, struct qsockaddr *addr);
-       int             (*Write) (int socket, byte *buf, int len, struct qsockaddr *addr);
-       int             (*Broadcast) (int socket, byte *buf, int len);
+       int             (*Read) (int socket, qbyte *buf, int len, struct qsockaddr *addr);
+       int             (*Write) (int socket, qbyte *buf, int len, struct qsockaddr *addr);
+       int             (*Broadcast) (int socket, qbyte *buf, int len);
        char *          (*AddrToString) (struct qsockaddr *addr);
        int             (*StringToAddr) (char *string, struct qsockaddr *addr);
        int             (*GetSocketAddr) (int socket, struct qsockaddr *addr);
@@ -328,3 +330,6 @@ extern      qboolean        slistLocal;
 extern cvar_t hostname;
 
 void NET_Slist_f (void);
+
+#endif
+