X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=netconn.h;h=e04bdb5dbd93da4469d2f6f32a0dfb075fd42fff;hb=fc5fe8b95af8c3e314abe62dc0727e5bd2efa04a;hp=512b506d54d58f1baf48575b1b3c66967bcdd2c1;hpb=5988fa1d88c960a98cb41f5fef05de27242f5bb7;p=xonotic%2Fdarkplaces.git diff --git a/netconn.h b/netconn.h index 512b506d..e04bdb5d 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,9 +126,6 @@ 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 @@ -136,19 +134,72 @@ 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; + + // 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; @@ -157,8 +208,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 @@ -197,10 +246,20 @@ typedef struct serverlist_info_s 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; + // number of free slots + int freeslots; // 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 @@ -214,7 +273,10 @@ typedef enum SLIF_MAXPLAYERS, SLIF_NUMPLAYERS, SLIF_PROTOCOL, - SLIF_COUNT + SLIF_NUMBOTS, + SLIF_NUMHUMANS, + SLIF_COUNT, + SLIF_FREESLOTS } serverlist_infofield_t; typedef enum @@ -233,6 +295,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; @@ -261,27 +325,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; @@ -290,13 +343,19 @@ 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); @@ -309,23 +368,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, unsigned char *data, int length); -//int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *data, int length, lhnetaddress_t *peeraddress); -//int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *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); 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