fix some prototype warnings

[xonotic/darkplaces.git] / net.h

diff --git a/net.h b/net.h
index b41cadce9fc363ff982869960625476ce4b34a49..e4be15b86a833a722d1df6d1eb7afcbc3ea94c60 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
 
 */
 // net.h -- quake's interface to the networking layer
 

+#ifndef NET_H
+#define NET_H
+

 struct qsockaddr
 {
        short sa_family;
 struct qsockaddr
 {
        short sa_family;


@@ -126,7 +129,7 @@ typedef struct qsocket_s
        qboolean                disconnected;
        qboolean                canSend;
        qboolean                sendNext;
        qboolean                disconnected;
        qboolean                canSend;
        qboolean                sendNext;

-       
+

        int                             driver;
        int                             landriver;
        int                             socket;
        int                             driver;
        int                             landriver;
        int                             socket;


@@ -136,21 +139,19 @@ typedef struct qsocket_s
        unsigned int    sendSequence;
        unsigned int    unreliableSendSequence;
        int                             sendMessageLength;
        unsigned int    sendSequence;
        unsigned int    unreliableSendSequence;
        int                             sendMessageLength;

-       byte                    sendMessage [NET_MAXMESSAGE];
+       qbyte                   sendMessage [NET_MAXMESSAGE];

 
        unsigned int    receiveSequence;
        unsigned int    unreliableReceiveSequence;
        int                             receiveMessageLength;
 
        unsigned int    receiveSequence;
        unsigned int    unreliableReceiveSequence;
        int                             receiveMessageLength;

-       byte                    receiveMessage [NET_MAXMESSAGE];
+       qbyte                   receiveMessage [NET_MAXMESSAGE];

 
        struct qsockaddr        addr;
        char                            address[NET_NAMELEN];
 
        struct qsockaddr        addr;
        char                            address[NET_NAMELEN];

-

 } qsocket_t;
 
 extern qsocket_t       *net_activeSockets;
 } qsocket_t;
 
 extern qsocket_t       *net_activeSockets;

-extern qsocket_t       *net_freeSockets;
-extern int                     net_numsockets;
+extern mempool_t *net_mempool;

 
 typedef struct
 {
 
 typedef struct
 {


@@ -164,15 +165,17 @@ typedef struct
        int             (*CloseSocket) (int socket);
        int             (*Connect) (int socket, struct qsockaddr *addr);
        int             (*CheckNewConnections) (void);
        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);
-       char *          (*AddrToString) (struct qsockaddr *addr);
-       int             (*StringToAddr) (char *string, struct qsockaddr *addr);
+       int             (*Recv) (qbyte *buf, int len, struct qsockaddr *addr);
+       int                     (*Send) (qbyte *buf, int len, struct qsockaddr *addr);
+       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) (const struct qsockaddr *addr);
+       int             (*StringToAddr) (const char *string, struct qsockaddr *addr);

        int             (*GetSocketAddr) (int socket, struct qsockaddr *addr);
        int             (*GetSocketAddr) (int socket, struct qsockaddr *addr);

-       int             (*GetNameFromAddr) (struct qsockaddr *addr, char *name);
-       int             (*GetAddrFromName) (char *name, struct qsockaddr *addr);
-       int                     (*AddrCompare) (struct qsockaddr *addr1, struct qsockaddr *addr2);
+       int             (*GetNameFromAddr) (const struct qsockaddr *addr, char *name);
+       int             (*GetAddrFromName) (const char *name, struct qsockaddr *addr);
+       int                     (*AddrCompare) (const struct qsockaddr *addr1, const struct qsockaddr *addr2);

        int                     (*GetSocketPort) (struct qsockaddr *addr);
        int                     (*SetSocketPort) (struct qsockaddr *addr, int port);
 } net_landriver_t;
        int                     (*GetSocketPort) (struct qsockaddr *addr);
        int                     (*SetSocketPort) (struct qsockaddr *addr, int port);
 } net_landriver_t;


@@ -188,6 +191,7 @@ typedef struct
        int                     (*Init) (void);
        void            (*Listen) (qboolean state);
        void            (*SearchForHosts) (qboolean xmit);
        int                     (*Init) (void);
        void            (*Listen) (qboolean state);
        void            (*SearchForHosts) (qboolean xmit);

+       qboolean        (*SearchForInetHosts) (char *master);

        qsocket_t       *(*Connect) (char *host);
        qsocket_t       *(*CheckNewConnections) (void);
        int                     (*QGetMessage) (qsocket_t *sock);
        qsocket_t       *(*Connect) (char *host);
        qsocket_t       *(*CheckNewConnections) (void);
        int                     (*QGetMessage) (qsocket_t *sock);


@@ -197,6 +201,7 @@ typedef struct
        qboolean        (*CanSendUnreliableMessage) (qsocket_t *sock);
        void            (*Close) (qsocket_t *sock);
        void            (*Shutdown) (void);
        qboolean        (*CanSendUnreliableMessage) (qsocket_t *sock);
        void            (*Close) (qsocket_t *sock);
        void            (*Shutdown) (void);

+       void            (*Heartbeat) (char *host);

        int                     controlSock;
 } net_driver_t;
 
        int                     controlSock;
 } net_driver_t;
 


@@ -272,6 +277,9 @@ struct qsocket_s    *NET_CheckNewConnections (void);
 struct qsocket_s       *NET_Connect (char *host);
 // called by client to connect to a host.  Returns -1 if not able to
 
 struct qsocket_s       *NET_Connect (char *host);
 // called by client to connect to a host.  Returns -1 if not able to
 

+void           NET_Heartbeat (void);
+// Send an heartbeat to the master server(s)
+

 qboolean NET_CanSendMessage (qsocket_t *sock);
 // Returns true or false if the given qsocket can currently accept a
 // message to be transmitted.
 qboolean NET_CanSendMessage (qsocket_t *sock);
 // Returns true or false if the given qsocket can currently accept a
 // message to be transmitted.


@@ -316,18 +324,19 @@ typedef struct _PollProcedure
 
 void SchedulePollProcedure(PollProcedure *pp, double timeOffset);
 
 
 void SchedulePollProcedure(PollProcedure *pp, double timeOffset);
 

-extern qboolean        serialAvailable;

 extern qboolean        ipxAvailable;
 extern qboolean        tcpipAvailable;
 extern char            my_ipx_address[NET_NAMELEN];
 extern char            my_tcpip_address[NET_NAMELEN];
 extern qboolean        ipxAvailable;
 extern qboolean        tcpipAvailable;
 extern char            my_ipx_address[NET_NAMELEN];
 extern char            my_tcpip_address[NET_NAMELEN];

-extern void (*GetComPortConfig) (int portNumber, int *port, int *irq, int *baud, qboolean *useModem);
-extern void (*SetComPortConfig) (int portNumber, int port, int irq, int baud, qboolean useModem);
-extern void (*GetModemConfig) (int portNumber, char *dialType, char *clear, char *init, char *hangup);
-extern void (*SetModemConfig) (int portNumber, char *dialType, char *clear, char *init, char *hangup);

 
 extern qboolean        slistInProgress;
 extern qboolean        slistSilent;
 extern qboolean        slistLocal;
 
 
 extern qboolean        slistInProgress;
 extern qboolean        slistSilent;
 extern qboolean        slistLocal;
 

+extern cvar_t hostname;
+

 void NET_Slist_f (void);
 void NET_Slist_f (void);

+void NET_InetSlist_f (void);
+
+#endif
+