X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=netconn.h;h=29670ccb6cc4a43c5f962a55b4b0bd69d5e1a0eb;hb=34e18371c4b0593a50e787ee21a96d1594a733f8;hp=883f887bf188388ea8e4534cd5eeed87e66c14a2;hpb=b9940e119f194729387b722d265db31219c85b38;p=xonotic%2Fdarkplaces.git diff --git a/netconn.h b/netconn.h index 883f887b..29670ccb 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 @@ -61,6 +62,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // CCREQ_RULE_INFO // string rule // +// CCREQ_RCON +// string password +// string command +// // // // CCREP_ACCEPT @@ -88,6 +93,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // CCREP_RULE_INFO // string rule // string value +// +// CCREP_RCON +// string reply // note: // There are two address forms used above. The short form is just a @@ -103,12 +111,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define CCREQ_SERVER_INFO 0x02 #define CCREQ_PLAYER_INFO 0x03 #define CCREQ_RULE_INFO 0x04 +#define CCREQ_RCON 0x05 // RocketGuy: ProQuake rcon support #define CCREP_ACCEPT 0x81 #define CCREP_REJECT 0x82 #define CCREP_SERVER_INFO 0x83 #define CCREP_PLAYER_INFO 0x84 #define CCREP_RULE_INFO 0x85 +#define CCREP_RCON 0x86 // RocketGuy: ProQuake rcon support typedef struct netconn_s { @@ -141,11 +151,13 @@ typedef struct netconn_s int receiveMessageLength; unsigned char receiveMessage[NET_MAXMESSAGE]; + // used by both NQ and QW protocols + unsigned int outgoing_unreliable_sequence; + struct netconn_nq_s { unsigned int ackSequence; unsigned int sendSequence; - unsigned int unreliableSendSequence; unsigned int receiveSequence; unsigned int unreliableReceiveSequence; @@ -168,10 +180,6 @@ typedef struct netconn_s 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; @@ -179,12 +187,29 @@ typedef struct netconn_s 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; @@ -193,8 +218,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 @@ -213,7 +236,9 @@ typedef enum serverlist_maskop_e SLMO_EQUAL, SLMO_GREATER, SLMO_GREATEREQUAL, - SLMO_NOTEQUAL + SLMO_NOTEQUAL, + SLMO_STARTSWITH, + SLMO_NOTSTARTSWITH } serverlist_maskop_t; // struct with all fields that you can search for or sort by @@ -231,16 +256,28 @@ typedef struct serverlist_info_s char map[32]; // name of the session char name[128]; + // qc-defined short status string + char qcstatus[128]; + // frags/ping/name list (if they fit in the packet) + char players[1400]; // 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; + // favorite server flag + qboolean isfavorite; } serverlist_info_t; typedef enum @@ -254,15 +291,28 @@ typedef enum SLIF_MAXPLAYERS, SLIF_NUMPLAYERS, SLIF_PROTOCOL, + SLIF_NUMBOTS, + SLIF_NUMHUMANS, + SLIF_FREESLOTS, + SLIF_QCSTATUS, + SLIF_PLAYERS, + SLIF_ISFAVORITE, SLIF_COUNT } serverlist_infofield_t; +typedef enum +{ + SLSF_DESCENDING = 1, + SLSF_FAVORITESFIRST = 2 +} serverlist_sortflags_t; + typedef enum { SQS_NONE = 0, SQS_QUERYING, SQS_QUERIED, - SQS_TIMEDOUT + SQS_TIMEDOUT, + SQS_REFRESHING } serverlist_query_state; typedef struct serverlist_entry_s @@ -273,7 +323,7 @@ typedef struct serverlist_entry_s unsigned querycounter; // used to calculate ping when update comes in double querytime; - // query protocol to use on this server + // query protocol to use on this server int protocol; // may be PROTOCOL_QUAKEWORLD or PROTOCOL_DARKPLACES7 serverlist_info_t info; @@ -294,7 +344,7 @@ 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_sortflags; // not using the enum, as it is a bitmask extern int serverlist_viewcount; extern serverlist_entry_t *serverlist_viewlist[SERVERLIST_VIEWLISTSIZE]; @@ -303,20 +353,7 @@ 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 +void ServerList_GetPlayerStatistics(int *numplayerspointer, int *maxplayerspointer); //============================================================================ // @@ -324,6 +361,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; @@ -332,14 +373,19 @@ extern int serverreplycount; extern sizebuf_t net_message; +extern cvar_t sv_public; + extern cvar_t cl_netlocalping; extern cvar_t cl_netport; extern cvar_t sv_netport; extern cvar_t net_address; -//extern cvar_t net_netaddress_ipv6; +extern cvar_t net_address_ipv6; -int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data, protocolversion_t protocol); +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); @@ -358,18 +404,23 @@ int NetConn_WriteString(lhnetsocket_t *mysocket, const char *string, const lhnet int NetConn_IsLocalGame(void); void NetConn_ClientFrame(void); void NetConn_ServerFrame(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); +void Net_Refresh_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); +void ServerList_QueryList(qboolean resetcache, qboolean querydp, qboolean queryqw, qboolean consoleoutput); + +// called whenever net_slist_favorites changes +void NetConn_UpdateFavorites(); #endif