X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=netconn.h;h=85841309edd47ca70a0bcc6efdfc7f550f99dd3f;hb=50804f7075a727286ca58efcf890861afe314ee8;hp=9586fdcd65ba0abc54d8a328d7202f2963b46e6e;hpb=8da4459b59336acc54dd028e44177756cbfa48cd;p=xonotic%2Fdarkplaces.git diff --git a/netconn.h b/netconn.h index 9586fdcd..85841309 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 @@ -130,20 +126,29 @@ typedef struct netconn_s 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 + sizebuf_t message; + unsigned char messagedata[NET_MAXMESSAGE]; + + // reliable message that is currently sending + // (for building fragments) unsigned int ackSequence; unsigned int sendSequence; unsigned int unreliableSendSequence; int sendMessageLength; - qbyte sendMessage[NET_MAXMESSAGE]; + unsigned char sendMessage[NET_MAXMESSAGE]; + // reliable message that is currently being received + // (for putting together fragments) unsigned int receiveSequence; unsigned int unreliableReceiveSequence; int receiveMessageLength; - qbyte receiveMessage[NET_MAXMESSAGE]; + unsigned char receiveMessage[NET_MAXMESSAGE]; - char address[NET_NAMELEN]; + char address[128]; } netconn_t; extern netconn_t *netconn_list; @@ -154,23 +159,108 @@ extern cvar_t developer_networking; extern char playername[]; extern int playercolor; -#define HOSTCACHESIZE 128 +#define SERVERLIST_TOTALSIZE 2048 +#define SERVERLIST_VIEWLISTSIZE SERVERLIST_TOTALSIZE +#define SERVERLIST_ANDMASKCOUNT 5 +#define SERVERLIST_ORMASKCOUNT 5 -typedef struct +typedef enum serverlist_maskop_e +{ + // 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 serverlist_info_s { - // 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 enum +{ + SQS_NONE = 0, + SQS_QUERYING, + SQS_QUERIED, + SQS_TIMEDOUT +} serverlist_query_state; + +typedef struct serverlist_entry_s +{ + // used to determine whether this entry should be included into the final view + serverlist_query_state query; + // used to count the number of times the host has tried to query this server already + unsigned querycounter; + // 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; + +typedef struct serverlist_mask_s +{ + 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 hostCacheCount; -extern hostcache_t hostcache[HOSTCACHESIZE]; +extern int serverlist_viewcount; +extern serverlist_entry_t *serverlist_viewlist[SERVERLIST_VIEWLISTSIZE]; -#if !defined(_WIN32 ) && !defined (__linux__) && !defined (__sun__) +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 @@ -191,17 +281,22 @@ 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; -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); +extern cvar_t cl_netlocalping; + int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data); 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); @@ -210,16 +305,19 @@ 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); void NetConn_ClientFrame(void); void NetConn_ServerFrame(void); void NetConn_QueryMasters(void); void NetConn_Heartbeat(int priority); -int NetConn_SendToAll(sizebuf_t *data, double blocktime); +void NetConn_QueryQueueFrame(void); 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