X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=netconn.h;h=bbd1b88ed1cb3de1498bc284d78f0efa5e7490de;hp=c1d1e6708a2afb1b90558d482b62f93bedf0d00d;hb=bf7fdc26371e2823650c8af6d78ef1e28513f7eb;hpb=71fa14060b3cf97a78917841da5143420ed8c3d4 diff --git a/netconn.h b/netconn.h index c1d1e670..bbd1b88e 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 @@ -129,21 +125,71 @@ 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 + sizebuf_t message; + unsigned char messagedata[NET_MAXMESSAGE]; - unsigned int ackSequence; - unsigned int sendSequence; - unsigned int unreliableSendSequence; + // reliable message that is currently sending + // (for building fragments) int sendMessageLength; - qbyte sendMessage[NET_MAXMESSAGE]; + unsigned char sendMessage[NET_MAXMESSAGE]; - unsigned int receiveSequence; - unsigned int unreliableReceiveSequence; + // reliable message that is currently being received + // (for putting together fragments) int receiveMessageLength; - qbyte receiveMessage[NET_MAXMESSAGE]; + 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 - char address[NET_NAMELEN]; + // 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; extern netconn_t *netconn_list; @@ -151,39 +197,113 @@ extern mempool_t *netconn_mempool; extern cvar_t hostname; 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; + // game data version + // (an integer that is used for filtering incompatible servers, + // not filterable by QC) + int gameversion; +} 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; + // query protocol to use on this server + int protocol; // may be PROTOCOL_QUAKEWORLD or PROTOCOL_DARKPLACES7 + + 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 serverlist_mask_s +{ + qboolean active; + serverlist_maskop_t tests[SLIF_COUNT]; + serverlist_info_t info; +} serverlist_mask_t; -#if !defined(_WIN32 ) && !defined (__linux__) && !defined (__sun__) -#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 +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; //============================================================================ // @@ -191,20 +311,27 @@ 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_fakelocalping_min; -extern cvar_t cl_fakelocalping_max; +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); @@ -212,17 +339,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, 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_QueryMasters(qboolean querydp, qboolean queryqw); 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); +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(qboolean querydp, qboolean queryqw); #endif