X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=netconn.h;h=f158e359eff47f0fe04f4878e636bb096000d175;hp=e66b71d17fe19534991ab3682302c484744872c7;hb=ef8b2c81a2d25c92dde622e451787cb1e0dca142;hpb=31bc6f42205f75d58be52a0059c95cdbe90679af diff --git a/netconn.h b/netconn.h index e66b71d1..f158e359 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,19 +126,69 @@ 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 + + // 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; @@ -147,15 +198,13 @@ 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 #define SERVERLIST_ANDMASKCOUNT 5 #define SERVERLIST_ORMASKCOUNT 5 -typedef enum +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 @@ -171,7 +220,7 @@ typedef enum } 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]; @@ -191,6 +240,10 @@ typedef struct 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 @@ -215,7 +268,7 @@ typedef enum SQS_TIMEDOUT } serverlist_query_state; -typedef struct +typedef struct serverlist_entry_s { // used to determine whether this entry should be included into the final view serverlist_query_state query; @@ -223,6 +276,8 @@ typedef struct 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; @@ -231,7 +286,7 @@ typedef struct char line2[128]; } serverlist_entry_t; -typedef struct +typedef struct serverlist_mask_s { qboolean active; serverlist_maskop_t tests[SLIF_COUNT]; @@ -251,27 +306,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; @@ -282,15 +326,17 @@ 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); -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); @@ -298,24 +344,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); void NetConn_QueryQueueFrame(void); -int NetConn_SendToAll(sizebuf_t *data, double blocktime); 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