X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=netconn.h;h=e798cfda32dac900bc8fea330c3023593df935a8;hb=40e0441442aecf796d118da39837fba123a0dedc;hp=61d6f57c95228842180411206ba7123190a585fb;hpb=9cc276c2e36a6fc6cfafd8a0fb6df85e2f644c07;p=xonotic%2Fdarkplaces.git

diff --git a/netconn.h b/netconn.h
index 61d6f57c..e798cfda 100755
--- a/netconn.h
+++ b/netconn.h
@@ -125,9 +125,6 @@ typedef struct netconn_s
 	double lastMessageTime;
 	double lastSendTime;
 
-	qboolean canSend;
-	qboolean sendNext;
-
 	// writing buffer to send to peer as the next reliable message
 	// can be added to at any time, copied into sendMessage buffer when it is
 	// possible to send a reliable message and then cleared
@@ -136,19 +133,58 @@ typedef struct netconn_s
 
 	// reliable message that is currently sending
 	// (for building fragments)
-	unsigned int ackSequence;
-	unsigned int sendSequence;
-	unsigned int unreliableSendSequence;
 	int sendMessageLength;
 	unsigned char sendMessage[NET_MAXMESSAGE];
 
 	// reliable message that is currently being received
 	// (for putting together fragments)
-	unsigned int receiveSequence;
-	unsigned int unreliableReceiveSequence;
 	int receiveMessageLength;
 	unsigned char receiveMessage[NET_MAXMESSAGE];
 
+	struct netconn_nq_s
+	{
+		unsigned int ackSequence;
+		unsigned int sendSequence;
+		unsigned int unreliableSendSequence;
+
+		unsigned int receiveSequence;
+		unsigned int unreliableReceiveSequence;
+	}
+	nq;
+	struct netconn_qw_s
+	{
+		// QW protocol
+		qboolean	fatal_error;
+
+		float		last_received;		// for timeouts
+
+	// the statistics are cleared at each client begin, because
+	// the server connecting process gives a bogus picture of the data
+		float		frame_latency;		// rolling average
+		float		frame_rate;
+
+		int			drop_count;			// dropped packets, cleared each level
+		int			good_count;			// cleared each level
+
+		int			qport;
+
+	// bandwidth estimator
+		double		cleartime;			// if realtime > nc->cleartime, free to go
+		double		rate;				// seconds / byte
+
+	// sequencing variables
+		int			incoming_sequence;
+		int			incoming_acknowledged;
+		int			incoming_reliable_acknowledged;	// single bit
+
+		int			incoming_reliable_sequence;		// single bit, maintained local
+
+		int			outgoing_sequence;
+		int			reliable_sequence;			// single bit
+		int			last_reliable_sequence;		// sequence number of last send
+	}
+	qw;
+
 	char address[128];
 } netconn_t;
 
@@ -157,8 +193,6 @@ extern mempool_t *netconn_mempool;
 
 extern cvar_t hostname;
 extern cvar_t developer_networking;
-extern char playername[];
-extern int playercolor;
 
 #define SERVERLIST_TOTALSIZE		2048
 #define SERVERLIST_VIEWLISTSIZE		SERVERLIST_TOTALSIZE
@@ -201,6 +235,10 @@ typedef struct serverlist_info_s
 	int numplayers;
 	// protocol version
 	int protocol;
+	// game data version
+	// (an integer that is used for filtering incompatible servers,
+	//  not filterable by QC)
+	int gameversion;
 } serverlist_info_t;
 
 typedef enum
@@ -233,6 +271,8 @@ typedef struct serverlist_entry_s
 	unsigned querycounter;
 	// used to calculate ping when update comes in
 	double querytime;
+	// query protocol to use on this server
+	int protocol; // may be PROTOCOL_QUAKEWORLD or PROTOCOL_DARKPLACES7
 
 	serverlist_info_t info;
 
@@ -292,15 +332,17 @@ extern sizebuf_t net_message;
 
 extern cvar_t cl_netlocalping;
 
-int NetConn_SendReliableMessage(netconn_t *conn, sizebuf_t *data);
-//void NetConn_SendMessageNext(netconn_t *conn);
-//void NetConn_ReSendMessage(netconn_t *conn);
-qboolean NetConn_CanSendMessage(netconn_t *conn);
-int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data);
+extern cvar_t cl_netport;
+extern cvar_t sv_netport;
+extern cvar_t net_address;
+//extern cvar_t net_netaddress_ipv6;
+
+int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data, protocolversion_t protocol);
 void NetConn_CloseClientPorts(void);
 void NetConn_OpenClientPorts(void);
 void NetConn_CloseServerPorts(void);
 void NetConn_OpenServerPorts(int opennetports);
+void NetConn_UpdateSockets(void);
 lhnetsocket_t *NetConn_ChooseClientSocketForAddress(lhnetaddress_t *address);
 lhnetsocket_t *NetConn_ChooseServerSocketForAddress(lhnetaddress_t *address);
 void NetConn_Init(void);
@@ -308,24 +350,24 @@ 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);
+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);
 int NetConn_IsLocalGame(void);
-//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);
+void NetConn_QueryMasters(qboolean querydp, qboolean queryqw);
 void NetConn_Heartbeat(int priority);
 void NetConn_QueryQueueFrame(void);
-int NetConn_SendToAll(sizebuf_t *data, double blocktime);
 void Net_Stats_f(void);
 void Net_Slist_f(void);
+void Net_SlistQW_f(void);
 
 // 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(void);
+void ServerList_QueryList(qboolean querydp, qboolean queryqw);
 
 #endif