X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=netconn.h;h=f158e359eff47f0fe04f4878e636bb096000d175;hp=cd44ab16403eaa870a784f54b012f5f49098d2a0;hb=ef8b2c81a2d25c92dde622e451787cb1e0dca142;hpb=3e69400aac1842c4ed7f9131c1cd67cafc3d1084

diff --git a/netconn.h b/netconn.h
index cd44ab16..f158e359 100755
--- a/netconn.h
+++ b/netconn.h
@@ -37,6 +37,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
 #define NET_PROTOCOL_VERSION	3
+#define NET_EXTRESPONSE_MAX 16
 
 // This is the network info/connection protocol.  It is used to find Quake
 // servers, get info about them, and connect to them.  Once connected, the
@@ -125,8 +126,6 @@ typedef struct netconn_s
 	double lastMessageTime;
 	double lastSendTime;
 
-	qboolean canSend;
-
 	// 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
@@ -135,19 +134,62 @@ 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;
+
+	// this tracks which of the last 100 received packet sequence numbers were lost
+	int packetlostcounter;
+	unsigned char packetlost[100];
+
 	char address[128];
 } netconn_t;
 
@@ -156,8 +198,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
@@ -200,6 +240,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
@@ -232,6 +276,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;
 
@@ -260,27 +306,16 @@ extern int serverlist_cachecount;
 
 extern qboolean serverlist_consoleoutput;
 
-#if !defined(_WIN32) && !defined(__linux__) && !defined(SUNOS)
-#ifndef htonl
-extern unsigned long htonl (unsigned long hostlong);
-#endif
-#ifndef htons
-extern unsigned short htons (unsigned short hostshort);
-#endif
-#ifndef ntohl
-extern unsigned long ntohl (unsigned long netlong);
-#endif
-#ifndef ntohs
-extern unsigned short ntohs (unsigned short netshort);
-#endif
-#endif
-
 //============================================================================
 //
 // public network functions
 //
 //============================================================================
 
+extern char net_extresponse[NET_EXTRESPONSE_MAX][1400];
+extern int net_extresponse_count;
+extern int net_extresponse_last;
+
 extern double masterquerytime;
 extern int masterquerycount;
 extern int masterreplycount;
@@ -296,7 +331,7 @@ 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);
+int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data, protocolversion_t protocol);
 void NetConn_CloseClientPorts(void);
 void NetConn_OpenClientPorts(void);
 void NetConn_CloseServerPorts(void);
@@ -315,17 +350,18 @@ int NetConn_WriteString(lhnetsocket_t *mysocket, const char *string, const lhnet
 int NetConn_IsLocalGame(void);
 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);
 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