X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=netconn.h;h=f8e9f7a459031b78188819a900b41801144c9474;hp=7120c531f87d98f186085e4d3d789ab664c1c136;hb=9ba01c31e0bebb3ada7724316d63a393053102d3;hpb=a51a70c2254b27a68e5fe74cc5985b02dc36e1e9

diff --git a/netconn.h b/netconn.h
index 7120c531..f8e9f7a4 100755
--- a/netconn.h
+++ b/netconn.h
@@ -22,7 +22,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef NET_H
 #define NET_H
 
+#include <stdarg.h>
+#include "qtypes.h"
+#include "crypto.h"
 #include "lhnet.h"
+#include "common.h"
+struct cmd_state_s;
 
 #define NET_HEADERSIZE		(2 * sizeof(unsigned int))
 
@@ -182,7 +187,7 @@ typedef struct netconn_s
 	struct netconn_qw_s
 	{
 		// QW protocol
-		qboolean	fatal_error;
+		qbool	fatal_error;
 
 		float		last_received;		// for timeouts
 
@@ -199,11 +204,11 @@ typedef struct netconn_s
 	// sequencing variables
 		unsigned int		incoming_sequence;
 		unsigned int		incoming_acknowledged;
-		qboolean		incoming_reliable_acknowledged;	///< single bit
+		qbool		incoming_reliable_acknowledged;	///< single bit
 
-		qboolean		incoming_reliable_sequence;		///< single bit, maintained local
+		qbool		incoming_reliable_sequence;		///< single bit, maintained local
 
-		qboolean		reliable_sequence;			///< single bit
+		qbool		reliable_sequence;			///< single bit
 		unsigned int		last_reliable_sequence;		///< sequence number of last send
 	}
 	qw;
@@ -239,10 +244,10 @@ typedef struct netconn_s
 } netconn_t;
 
 extern netconn_t *netconn_list;
-extern mempool_t *netconn_mempool;
+extern struct mempool_s *netconn_mempool;
 
-extern cvar_t hostname;
-extern cvar_t developer_networking;
+extern struct cvar_s hostname;
+extern struct cvar_s developer_networking;
 
 #ifdef CONFIG_MENU
 #define SERVERLIST_VIEWLISTSIZE		SERVERLIST_TOTALSIZE
@@ -303,7 +308,7 @@ typedef struct serverlist_info_s
 	// categorized sorting
 	int category;
 	/// favorite server flag
-	qboolean isfavorite;
+	qbool isfavorite;
 } serverlist_info_t;
 
 typedef enum
@@ -363,7 +368,7 @@ typedef struct serverlist_entry_s
 
 typedef struct serverlist_mask_s
 {
-	qboolean			active;
+	qbool			active;
 	serverlist_maskop_t  tests[SLIF_COUNT];
 	serverlist_info_t info;
 } serverlist_mask_t;
@@ -387,7 +392,7 @@ extern int serverlist_cachecount;
 extern serverlist_entry_t *serverlist_cache;
 extern const serverlist_entry_t *serverlist_callbackentry;
 
-extern qboolean serverlist_consoleoutput;
+extern qbool serverlist_consoleoutput;
 
 void ServerList_GetPlayerStatistics(int *numplayerspointer, int *maxplayerspointer);
 #endif
@@ -419,25 +424,26 @@ extern sizebuf_t sv_message;
 extern char cl_readstring[MAX_INPUTLINE];
 extern char sv_readstring[MAX_INPUTLINE];
 
-extern cvar_t sv_public;
+extern struct cvar_s sv_public;
 
-extern cvar_t net_fakelag;
+extern struct cvar_s net_fakelag;
 
-extern cvar_t cl_netport;
-extern cvar_t sv_netport;
-extern cvar_t net_address;
-extern cvar_t net_address_ipv6;
-extern cvar_t net_usesizelimit;
-extern cvar_t net_burstreserve;
+extern struct cvar_s cl_netport;
+extern struct cvar_s sv_netport;
+extern struct cvar_s net_address;
+extern struct cvar_s net_address_ipv6;
+extern struct cvar_s net_usesizelimit;
+extern struct cvar_s net_burstreserve;
 
-qboolean NetConn_CanSend(netconn_t *conn);
-int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data, protocolversion_t protocol, int rate, int burstsize, qboolean quakesignon_suppressreliables);
-qboolean NetConn_HaveClientPorts(void);
-qboolean NetConn_HaveServerPorts(void);
+qbool NetConn_CanSend(netconn_t *conn);
+int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data, protocolversion_t protocol, int rate, int burstsize, qbool quakesignon_suppressreliables);
+qbool NetConn_HaveClientPorts(void);
+qbool NetConn_HaveServerPorts(void);
 void NetConn_CloseClientPorts(void);
 void NetConn_OpenClientPorts(void);
 void NetConn_CloseServerPorts(void);
 void NetConn_OpenServerPorts(int opennetports);
+void NetConn_UpdateSockets_Client(void);
 void NetConn_UpdateSockets(void);
 lhnetsocket_t *NetConn_ChooseClientSocketForAddress(lhnetaddress_t *address);
 lhnetsocket_t *NetConn_ChooseServerSocketForAddress(lhnetaddress_t *address);
@@ -445,7 +451,7 @@ void NetConn_Init(void);
 void NetConn_Shutdown(void);
 netconn_t *NetConn_Open(lhnetsocket_t *mysocket, lhnetaddress_t *peeraddress);
 void NetConn_Close(netconn_t *conn);
-void NetConn_Listen(qboolean state);
+void NetConn_Listen(qbool state);
 int NetConn_Read(lhnetsocket_t *mysocket, void *data, int maxlength, lhnetaddress_t *peeraddress);
 int NetConn_Write(lhnetsocket_t *mysocket, const void *data, int length, const lhnetaddress_t *peeraddress);
 int NetConn_WriteString(lhnetsocket_t *mysocket, const char *string, const lhnetaddress_t *peeraddress);
@@ -454,23 +460,23 @@ void NetConn_ClientFrame(void);
 void NetConn_ServerFrame(void);
 void NetConn_SleepMicroseconds(int microseconds);
 void NetConn_Heartbeat(int priority);
-void Net_Stats_f(cmd_state_t *cmd);
+void Net_Stats_f(struct cmd_state_s *cmd);
 
 #ifdef CONFIG_MENU
-void NetConn_QueryMasters(qboolean querydp, qboolean queryqw);
+void NetConn_QueryMasters(qbool querydp, qbool queryqw);
 void NetConn_QueryQueueFrame(void);
-void Net_Slist_f(cmd_state_t *cmd);
-void Net_SlistQW_f(cmd_state_t *cmd);
-void Net_Refresh_f(cmd_state_t *cmd);
+void Net_Slist_f(struct cmd_state_s *cmd);
+void Net_SlistQW_f(struct cmd_state_s *cmd);
+void Net_Refresh_f(struct cmd_state_s *cmd);
 
 /// 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(qboolean resetcache, qboolean querydp, qboolean queryqw, qboolean consoleoutput);
+void ServerList_QueryList(qbool resetcache, qbool querydp, qbool queryqw, qbool consoleoutput);
 
 /// called whenever net_slist_favorites changes
-void NetConn_UpdateFavorites(void);
+void NetConn_UpdateFavorites_c(struct cvar_s *var);
 #endif
 
 #define MAX_CHALLENGES 128