X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=netconn.h;h=63df664494c0f3833439d997001e283f3cbc8cba;hp=17f57221769cd16adb06b3934ffab9017da0963e;hb=432fdce0e6f63debeb5310db1606dfe659946b11;hpb=c7a61a0b84fc4c3302dfc991d888bc14dac2390f diff --git a/netconn.h b/netconn.h index 17f57221..63df6644 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 @@ -116,7 +117,7 @@ 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 @@ -125,19 +126,79 @@ 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; + + // 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; + + // bandwidth estimator + double cleartime; // if realtime > nc->cleartime, free to go + + // this tracks packet loss and packet sizes on the most recent packets + // used by shownetgraph feature +#define NETGRAPH_PACKETS 100 +#define NETGRAPH_NOPACKET 0 +#define NETGRAPH_LOSTPACKET -1 +#define NETGRAPH_CHOKEDPACKET -2 + int incoming_packetcounter; + int incoming_reliablesize[NETGRAPH_PACKETS]; + int incoming_unreliablesize[NETGRAPH_PACKETS]; + int incoming_acksize[NETGRAPH_PACKETS]; + int outgoing_packetcounter; + int outgoing_reliablesize[NETGRAPH_PACKETS]; + int outgoing_unreliablesize[NETGRAPH_PACKETS]; + int outgoing_acksize[NETGRAPH_PACKETS]; char address[128]; } netconn_t; @@ -147,23 +208,29 @@ extern mempool_t *netconn_mempool; extern cvar_t hostname; extern cvar_t developer_networking; -extern char playername[]; -extern int playercolor; -#define HOSTCACHE_TOTALSIZE 2048 -#define HOSTCACHE_VIEWCACHESIZE 128 +#define SERVERLIST_TOTALSIZE 2048 +#define SERVERLIST_VIEWLISTSIZE SERVERLIST_TOTALSIZE +#define SERVERLIST_ANDMASKCOUNT 5 +#define SERVERLIST_ORMASKCOUNT 5 -typedef enum +typedef enum serverlist_maskop_e { - HCMO_GREATEREQUAL, - HCMO_GREATER, - HCMO_EQUAL, - HCMO_LESSEQUAL, - HCMO_LESS, -} hostcache_maskop_t; + // 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 +typedef struct serverlist_info_s { // address for connecting char cname[128]; @@ -179,72 +246,81 @@ typedef struct char name[128]; // max client number int maxplayers; - // number of currently connected players + // number of currently connected players (including bots) int numplayers; + // number of currently connected players that are bots + int numbots; + // number of currently connected players that are not bots + int numhumans; // protocol version int protocol; -} hostcache_info_t; + // game data version + // (an integer that is used for filtering incompatible servers, + // not filterable by QC) + int gameversion; +} serverlist_info_t; -typedef enum +typedef enum +{ + SLIF_CNAME, + SLIF_PING, + SLIF_GAME, + SLIF_MOD, + SLIF_MAP, + SLIF_NAME, + SLIF_MAXPLAYERS, + SLIF_NUMPLAYERS, + SLIF_PROTOCOL, + SLIF_NUMBOTS, + SLIF_NUMHUMANS, + SLIF_COUNT +} serverlist_infofield_t; + +typedef enum { - HCIF_CNAME, - HCIF_PING, - HCIF_GAME, - HCIF_MOD, - HCIF_MAP, - HCIF_NAME, - HCIF_MAXPLAYERS, - HCIF_NUMPLAYERS, - HCIF_PROTOCOL, - HCIF_COUNT -} hostcache_infofield_t; - -typedef struct + 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 - qboolean finished; + 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; - hostcache_info_t info; - // legacy stuff char line1[128]; char line2[128]; -} hostcache_t; +} serverlist_entry_t; -typedef struct +typedef struct serverlist_mask_s { - hostcache_maskop_t pingtest; - hostcache_maskop_t maxplayerstest; - hostcache_maskop_t numplayerstest; - hostcache_maskop_t protocoltest; - hostcache_info_t info; -} hostcache_mask_t; + qboolean active; + serverlist_maskop_t tests[SLIF_COUNT]; + serverlist_info_t info; +} serverlist_mask_t; -extern hostcache_mask_t hostcache_currentmask; -extern hostcache_infofield_t hostcache_sortbyfield; -extern qboolean hostcache_sortdescending; +extern serverlist_mask_t serverlist_andmasks[SERVERLIST_ANDMASKCOUNT]; +extern serverlist_mask_t serverlist_ormasks[SERVERLIST_ORMASKCOUNT]; -extern int hostcache_viewcount; -extern hostcache_t *hostcache_viewset[HOSTCACHE_VIEWCACHESIZE]; +extern serverlist_infofield_t serverlist_sortbyfield; +extern qboolean serverlist_sortdescending; -extern qboolean hostcache_consoleoutput; +extern int serverlist_viewcount; +extern serverlist_entry_t *serverlist_viewlist[SERVERLIST_VIEWLISTSIZE]; -#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 int serverlist_cachecount; + +extern qboolean serverlist_consoleoutput; //============================================================================ // @@ -252,6 +328,10 @@ extern unsigned short ntohs (unsigned short netshort); // //============================================================================ +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; @@ -260,17 +340,24 @@ extern int serverreplycount; extern sizebuf_t net_message; +extern cvar_t sv_public; + 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; + +qboolean NetConn_CanSend(netconn_t *conn); +int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data, protocolversion_t protocol, int rate, qboolean quakesignon_suppressreliables); +qboolean NetConn_HaveClientPorts(void); +qboolean NetConn_HaveServerPorts(void); 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); @@ -278,23 +365,25 @@ 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_SleepMicroseconds(int microseconds); +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); -// Hostcache interface +// ServerList interface (public) // manually refresh the view set, do this after having changed the mask or any other flag -void HostCache_RebuildViewSet(void); -void HostCache_ResetMask(void); -void HostCache_QueryList(void); +void ServerList_RebuildViewList(void); +void ServerList_ResetMasks(void); +void ServerList_QueryList(qboolean querydp, qboolean queryqw); #endif