--- deliantra/server/include/client.h 2007/03/12 23:45:10 1.34 +++ deliantra/server/include/client.h 2007/04/25 18:47:50 1.49 @@ -34,12 +34,12 @@ struct MapCell { - UUID player; // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient - int count; /* This is really darkness in the map1 command */ + tag_t player; // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient + int count; /* This is really darkness in the map1 command */ faceidx faces[MAP_LAYERS]; - uint16 smooth[MAP_LAYERS]; - unsigned char stat_hp; // health of something in this space, or 0 + unsigned char stat_hp; // health of something in this space, or 0 unsigned char flags; + uint8_t smooth[MAP_LAYERS]; }; #define MAX_CLIENT_X MAP_CLIENT_X @@ -68,17 +68,7 @@ * instead of having a bunch of different fields that needed to * get toggled. */ -enum MapMode { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 }; - -/* The following is the setup for a ring buffer for storing output - * data that the OS can't handle right away. - */ -struct Buffer -{ - char data[SOCKETBUFSIZE]; - int start; - int len; -}; +enum { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 }; // states the socket can be in enum { @@ -87,7 +77,6 @@ ST_PLAYING, // logged in an playing ST_CUSTOM, // waiting for custom reply - ST_CHANGE_CLASS, ST_GET_PARTY_PASSWORD, }; @@ -167,7 +156,15 @@ statsinfo stats; int ACC (RO, active); - Buffer outputbuffer; + /* The following is the setup for a ring buffer for storing output + * data that the OS can't handle right away. + */ + struct + { + char data[SOCKETBUFSIZE]; + int start; + int len; + } outputbuffer; char *ACC (RW, host); /* Which host it is connected from (ip address) */ uint8 ACC (RW, state); /* Input state of the player (name, password, etc */ @@ -185,20 +182,24 @@ sint16 ACC (RW, last_resist[NROFATTACKS]);/* last resist values sent to client */ sint64 ACC (RW, last_skill_exp[NUM_SKILLS]);/* shadow register. if != exp. obj update client */ + bool ACC (RW, force_face0); // client workaround for buggy checksum calculation in gcfclient + bool ACC (RW, force_bad_checksum); // client workaround for buggy checksum calculation in gcfclient + bool ACC (RW, force_image_newmap); // client workaround for client not redrawing map on image upload + bool ACC (RW, enable_bg_scrub); // client workaround, gcfclient becomes unusable if you send it images + bool ACC (RW, afk); /* player is afk */ bool ACC (RW, facecache); /* If true, client is caching images */ bool ACC (RW, sent_scroll); bool ACC (RW, sound); /* does the client want sound */ bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */ - bool ACC (RW, plugincmd); /* CF+ extend the protocol through a plug-in */ - bool ACC (RW, mapinfocmd); /* CF+ return map info and send map change info */ - bool ACC (RW, extcmd); /* CF+ call into extensions/plugins */ - bool ACC (RW, extmap); /* CF+ extend map comamnd with extra data */ - bool ACC (RW, buggy_mapscroll); /* CF+ client crashes on large mapscrolls */ - bool ACC (RW, force_face0); /* CF+ client workaround for buggy checksum calculation in gcfclient */ - bool ACC (RW, force_bad_checksum); /* CF+ client workaround for buggy checksum calculation in gcfclient */ + bool ACC (RW, plugincmd); // extend the protocol through a plug-in */ + bool ACC (RW, mapinfocmd); // return map info and send map change info + bool ACC (RW, extcmd); // call into extensions/plugins + bool ACC (RW, extmap); // extend map comamnd with extra data + bool ACC (RW, buggy_mapscroll); // client crashes on large mapscrolls bool ACC (RW, darkness); /* True if client wants darkness information */ bool ACC (RW, image2); /* Client wants image2/face2 commands */ + bool ACC (RW, fxix); // client implements fx and ix (face|image extended) commands bool ACC (RW, update_look); /* If true, we need to send the look window */ bool ACC (RW, has_readable_type); /* If true client accept additional text information */ /* used to arrange text in books, scrolls, or scripted dialogs */ @@ -207,23 +208,39 @@ /* Below are flags for extedend infos to pass to client * with S->C mapextended command */ bool ACC (RW, EMI_smooth); /* Send smooth in extendmapinfos */ + bool ACC (RW, smoothing); // trt-style smoothing + bool ACC (RW, can_msg); // trt-style text messages + bool ACC (RW, force_newmap); // force a newmap before next map update uint32 ACC (RW, supported_readables); /* each bit is a readable supported by client */ uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */ - enum MapMode mapmode; /* Type of map commands the client wants. */ uint16 ACC (RW, look_position); /* start of drawing of look window */ + uint16 ACC (RW, mss); // likely tcp maximum segment size + uint8 ACC (RW, mapmode); /* Type of map commands the client wants. */ uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */ uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */ maptile *ACC (RW, current_map); // CF+ last/current player map region *ACC (RW, current_region); // CF+ last/current player region int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position - char ACC (RW, version)[64]; // CF+ client name/version + shstr ACC (RW, version); // CF+ client name/version uint8 ACC (RW, faceset); // CF+ selected faceset player_ptr ACC (RO, pl); - int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */ + int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */ + + int ACC (RW, rate_avail); // current rate balance + int ACC (RW, max_rate); // max. # of bytes to send per tick + faceidx ACC (RW, scrub_idx); // which face to send next + int ACC (RW, bg_scrub); // how many ticks till the next background face send + + faceidx partial_face; + uint32 partial_face_ofs; // if != 0, need to send remaining bytes of partial_face + std::vector > askface; // which faces have been requested by the client + + std::vector > fxface; // which faces to send using fx + MTH void flush_fx (); // send fx if required void do_destroy (); void gather_callbacks (AV *&callbacks, event_type event) const; @@ -237,11 +254,23 @@ // large structures at the end please struct Map lastmap; std::bitset anims_sent; - uint8 ACC (RW, faces_sent[MAX_FACES]); // This is a bitmap on sent face status + std::bitset faces_sent; + // if we get an incomplete packet, this is used to hold the data. // we add 2 byte for the header, one for the trailing 0 byte uint8 inbuf[MAXSOCKBUF + 2 + 1]; + enum { MSG_BUF_SIZE = 80, MSG_BUF_COUNT = 10 }; + struct msg_buf + { + tick_t expire; + int len; + int count; + char msg[MSG_BUF_SIZE]; + } msgbuf[MSG_BUF_COUNT]; + + MTH bool msg_suppressed (const char *msg); + bool may_execute (const packet_type *pkt) const; void execute (const packet_type *pkt, char *data, int datalen); @@ -258,6 +287,7 @@ MTH void flush (); MTH void write_outputbuffer (); + MTH int outputbuffer_len () const { return outputbuffer.len; } void send (void *buf_, int len); void send_packet (const char *buf); @@ -265,11 +295,20 @@ void send_packet_printf (const char *format, ...); void send_packet (packet &sl); + void send_drawinfo (const char *msg, int flags = NDI_BLACK); + MTH void send_face (faceidx facenum); + MTH void send_image (faceidx facenum); + MTH void send_faces (object *ob); + MTH void send_animation (short anim_num); + MTH void send_msg (int color, const char *type, const char *msg); + // called when something under the player changes MTH void floorbox_update () { update_look = 1; } // called when the player has been moved MTH void floorbox_reset () { look_position = 0; floorbox_update (); } + MTH void tick (); // called every server tick to do housekeeping etc. + MTH static client *create (int fd, const char *peername); protected: @@ -282,12 +321,6 @@ ((__sockPtr)->has_readable_type) && \ ((__sockPtr)->supported_readables & (1<<(__type))) ) -/* Bitmask for the faces_sent[] array - what - * portion of the face have we sent? - */ -#define NS_FACESENT_FACE 0x1 -#define NS_FACESENT_SMOOTH 0x2 - /* Constants in the form EMI_ is for extended map infos. * Even if the client select the additionnal infos it wants * on the map, there may exist cases where this whole info