X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=netconn.h;h=c12d2babe790f2f26610dc9bf110cd65489875e6;hp=26a4ce864c646a2012a0177ab9920e460fc5bab7;hb=d754dc235e18fafe7ccf6ea5f791cd4799128155;hpb=0a2edb85ad96a5fe17d5c3d694e70ab8aaf65def

diff --git a/netconn.h b/netconn.h
index 26a4ce86..c12d2bab 100755
--- a/netconn.h
+++ b/netconn.h
@@ -24,11 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "lhnet.h"
 
-#define NET_NAMELEN			128
-
-#define NET_MAXMESSAGE		65536
 #define NET_HEADERSIZE		(2 * sizeof(unsigned int))
-#define NET_DATAGRAMSIZE	(MAX_DATAGRAM + NET_HEADERSIZE)
 
 // NetHeader flags
 #define NETFLAG_LENGTH_MASK	0x0000ffff
@@ -120,9 +116,12 @@ typedef struct netconn_s
 
 	lhnetsocket_t *mysocket;
 	lhnetaddress_t peeraddress;
-
+	
 	// this is mostly identical to qsocket_t from quake
+
+	// if this time is reached, kick off peer
 	double connecttime;
+	double timeout;
 	double lastMessageTime;
 	double lastSendTime;
 
@@ -140,7 +139,7 @@ typedef struct netconn_s
 	int receiveMessageLength;
 	qbyte receiveMessage[NET_MAXMESSAGE];
 
-	char address[NET_NAMELEN];
+	char address[128];
 } netconn_t;
 
 extern netconn_t *netconn_list;
@@ -151,21 +150,96 @@ extern cvar_t developer_networking;
 extern char playername[];
 extern int playercolor;
 
-#define HOSTCACHESIZE	128
+#define SERVERLIST_TOTALSIZE			2048
+#define SERVERLIST_VIEWLISTSIZE		128
+#define SERVERLIST_ANDMASKCOUNT		5
+#define SERVERLIST_ORMASKCOUNT		5
 
+typedef enum 
+{
+	// SLMO_CONTAINS is the default for strings
+	// SLMO_GREATEREQUAL is the default for numbers (also used when OP == CONTAINS or NOTCONTAINS
+	SLMO_CONTAINS,
+	SLMO_NOTCONTAIN,
+
+	SLMO_LESSEQUAL,
+	SLMO_LESS,
+	SLMO_EQUAL,
+	SLMO_GREATER,
+	SLMO_GREATEREQUAL,
+	SLMO_NOTEQUAL
+} serverlist_maskop_t;
+
+// struct with all fields that you can search for or sort by
 typedef struct
 {
-	// ping time for sorting servers
-	double ping;
 	// address for connecting
 	char cname[128];
-	// description (seen by user)
+	// ping time for sorting servers
+	int ping;
+	// name of the game
+	char game[32];
+	// name of the mod
+	char mod[32];
+	// name of the map
+	char map[32];
+	// name of the session
+	char name[128];
+	// max client number
+	int maxplayers;
+	// number of currently connected players
+	int numplayers;
+	// protocol version
+	int protocol;
+} serverlist_info_t;
+
+typedef enum 
+{
+	SLIF_CNAME,
+	SLIF_PING,
+	SLIF_GAME,
+	SLIF_MOD,
+	SLIF_MAP,
+	SLIF_NAME,
+	SLIF_MAXPLAYERS,
+	SLIF_NUMPLAYERS,
+	SLIF_PROTOCOL,
+	SLIF_COUNT
+} serverlist_infofield_t;
+
+typedef struct
+{
+	// used to determine whether this entry should be included into the final view
+	qboolean finished; 
+	// used to calculate ping when update comes in
+	double querytime;
+
+	serverlist_info_t info;
+	
+	// legacy stuff
 	char line1[128];
 	char line2[128];
-} hostcache_t;
+} serverlist_entry_t;
 
-extern int hostCacheCount;
-extern hostcache_t hostcache[HOSTCACHESIZE];
+typedef struct
+{
+	qboolean			active;
+	serverlist_maskop_t  tests[SLIF_COUNT];
+	serverlist_info_t info;
+} serverlist_mask_t;
+
+extern serverlist_mask_t serverlist_andmasks[SERVERLIST_ANDMASKCOUNT];
+extern serverlist_mask_t serverlist_ormasks[SERVERLIST_ORMASKCOUNT];
+
+extern serverlist_infofield_t serverlist_sortbyfield;
+extern qboolean serverlist_sortdescending;
+
+extern int serverlist_viewcount;
+extern serverlist_entry_t *serverlist_viewlist[SERVERLIST_VIEWLISTSIZE];
+
+extern int serverlist_cachecount; 
+
+extern qboolean serverlist_consoleoutput;
 
 #if !defined(_WIN32 ) && !defined (__linux__) && !defined (__sun__)
 #ifndef htonl
@@ -188,8 +262,16 @@ extern unsigned short ntohs (unsigned short netshort);
 //
 //============================================================================
 
+extern double masterquerytime;
+extern int masterquerycount;
+extern int masterreplycount;
+extern int serverquerycount;
+extern int serverreplycount;
+
 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);
@@ -206,6 +288,7 @@ 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_IsLocalGame(void);
 //int NetConn_ReceivedMessage(netconn_t *conn, qbyte *data, int length);
 //int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, lhnetaddress_t *peeraddress);
 //int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, lhnetaddress_t *peeraddress);
@@ -217,5 +300,11 @@ int NetConn_SendToAll(sizebuf_t *data, double blocktime);
 void Net_Stats_f(void);
 void Net_Slist_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);
+
 #endif