X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=net.h;h=55800b04815241b718934519301672e8a7db49bf;hb=04826446c325116c03990a9faf04d6439816a6e2;hp=9684aa68dbcb579e75d91896066cec017822d5a3;hpb=c4ee1bbcc6b2f917465f07269ad09942bbf40849;p=xonotic%2Fdarkplaces.git

diff --git a/net.h b/net.h
index 9684aa68..55800b04 100644
--- 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;
@@ -145,13 +148,9 @@ typedef struct qsocket_s
 
 	struct qsockaddr	addr;
 	char				address[NET_NAMELEN];
-
 } qsocket_t;
 
 extern qsocket_t	*net_activeSockets;
-// LordHavoc: sockets are dynamically allocated now
-//extern qsocket_t	*net_freeSockets;
-//extern int			net_numsockets;
 extern mempool_t *net_mempool;
 
 typedef struct
@@ -166,14 +165,16 @@ typedef struct
 	int 		(*CloseSocket) (int socket);
 	int 		(*Connect) (int socket, struct qsockaddr *addr);
 	int 		(*CheckNewConnections) (void);
+	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) (struct qsockaddr *addr);
-	int 		(*StringToAddr) (char *string, struct qsockaddr *addr);
+	int 		(*StringToAddr) (const char *string, 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 		(*GetAddrFromName) (const char *name, struct qsockaddr *addr);
 	int			(*AddrCompare) (struct qsockaddr *addr1, struct qsockaddr *addr2);
 	int			(*GetSocketPort) (struct qsockaddr *addr);
 	int			(*SetSocketPort) (struct qsockaddr *addr, int port);
@@ -190,6 +191,7 @@ typedef struct
 	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);
@@ -199,6 +201,7 @@ typedef struct
 	qboolean	(*CanSendUnreliableMessage) (qsocket_t *sock);
 	void		(*Close) (qsocket_t *sock);
 	void		(*Shutdown) (void);
+	void		(*Heartbeat) (char *host);
 	int			controlSock;
 } net_driver_t;
 
@@ -274,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
 
+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.
@@ -330,3 +336,7 @@ extern	qboolean	slistLocal;
 extern cvar_t hostname;
 
 void NET_Slist_f (void);
+void NET_InetSlist_f (void);
+
+#endif
+