ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/client.h
(Generate patch)

Comparing deliantra/server/include/client.h (file contents):
Revision 1.9 by root, Tue Dec 19 04:58:04 2006 UTC vs.
Revision 1.18 by root, Sat Dec 23 06:21:02 2006 UTC

… …
24#ifndef CLIENT_H 24#ifndef CLIENT_H
25#define CLIENT_H 25#define CLIENT_H
26 26
27#include <deque> 27#include <deque>
28#include <bitset> 28#include <bitset>
29#include <tr1/unordered_set>
29 30
30// (possibly) max. number of objects "per page" in the ground container 31// (possibly) max. number of objects "per page" in the ground container
31#define NUM_LOOK_OBJECTS 50 32#define FLOORBOX_PAGESIZE 50
32 33
33struct MapCell 34struct MapCell
34{ 35{
35 UUID player; // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient 36 UUID player; // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient
36 int count; /* This is really darkness in the map1 command */ 37 int count; /* This is really darkness in the map1 command */
… …
67 * current state. we set up our on buffers for sending/receiving, so we can 68 * current state. we set up our on buffers for sending/receiving, so we can
68 * handle some higher level functions. fd is the actual file descriptor we 69 * handle some higher level functions. fd is the actual file descriptor we
69 * are using. 70 * are using.
70 */ 71 */
71 72
72enum Sock_Status { Ns_Add, Ns_Dead };
73
74/* Only one map mode can actually be used, so lets make it a switch 73/* Only one map mode can actually be used, so lets make it a switch
75 * instead of having a bunch of different fields that needed to 74 * instead of having a bunch of different fields that needed to
76 * get toggled. 75 * get toggled.
77 */ 76 */
78enum MapMode { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 }; 77enum MapMode { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 };
79 78
80/* The following is the setup for a ring buffer for storing outbut 79/* The following is the setup for a ring buffer for storing output
81 * data that the OS can't handle right away. 80 * data that the OS can't handle right away.
82 */ 81 */
83
84struct Buffer 82struct Buffer
85{ 83{
86 char data[SOCKETBUFSIZE]; 84 char data[SOCKETBUFSIZE];
87 int start; 85 int start;
88 int len; 86 int len;
87};
88
89// states the socket can be in
90enum {
91 ST_DEAD, // socket is dead
92 ST_SETUP, // initial handshake / setup / login
93 ST_PLAYING, // logged in an playing
94 ST_CUSTOM, // waiting for custom reply
95
96 ST_CONFIRM_QUIT,
97 ST_CHANGE_CLASS,
98 ST_GET_PARTY_PASSWORD,
89}; 99};
90 100
91// a handler for a specific type of packet 101// a handler for a specific type of packet
92enum { 102enum {
93 PF_PLAYER = 0x01, // must have valid player / will by synchronised 103 PF_PLAYER = 0x01, // must have valid player / will by synchronised
… …
112 { 122 {
113 sfree<char> (data, datalen + 1); 123 sfree<char> (data, datalen + 1);
114 } 124 }
115}; 125};
116 126
127struct refitem
128{
129 object_ptr op;
130};
131
132// this represents a container on the client side.
133// right now, there are only ever two of them:
134// the inventory and the floor/open container
135//TODO: unused as of yet
136struct client_container : vector< refitem, slice_allocator<refitem> >
137{
138 client *ns;
139 enum { CC_NONE, CC_INVENTORY, CC_MAPSPACE, CC_CONTAINER } type;
140
141 bool item_changed; // one of the items in here possibly changed
142
143 // for mapspace and container
144 int x, y;
145 maptile *map;
146
147 // for container
148 object *env;
149
150 client_container (client *ns)
151 : ns (ns), type (CC_NONE) { }
152
153 tag_t tag () const;
154
155 inline iterator merge_item (iterator i, object *op);
156
157 void clear ();
158 void update ();
159
160 void set_mapspace (maptile *map, int x, int y);
161 void set_container (object *env);
162};
163
117/* how many times we are allowed to give the wrong password before being kicked. */ 164/* how many times we are allowed to give the wrong password before being kicked. */
118#define MAX_PASSWORD_FAILURES 5 165#define MAX_PASSWORD_FAILURES 5
119 166
120ACC_CLASS (client) // should become player when newsocket is a baseclass of player 167ACC_CLASS (client) // should become player when newsocket is a baseclass of player
121struct client : zero_initialised, attachable_base 168struct client : zero_initialised, attachable<client>
122{ 169{
123 enum Sock_Status status;
124 int ACC (RW, fd); 170 int ACC (RW, fd);
125 unsigned int inbuf_len; // number of bytes valid in inbuf 171 unsigned int inbuf_len; // number of bytes valid in inbuf
126 uint8 *faces_sent; // This is a bitmap on sent face status 172 uint8 *faces_sent; // This is a bitmap on sent face status
127 struct statsinfo stats; 173 statsinfo stats;
128 174
175 client_container cc_inv, cc_other;
176 Buffer outputbuffer;
177
129 char *ACC (RW, host); /* Which host it is connected from (ip address) */ 178 char *ACC (RW, host); /* Which host it is connected from (ip address) */
179 uint8 ACC (RW, state); /* Input state of the player (name, password, etc */
130 uint8 ACC (RW, password_fails); /* how many times the player has failed to give the right password */ 180 uint8 ACC (RW, password_fails); /* how many times the player has failed to give the right password */
131 Buffer outputbuffer;
132 181
133 bool ACC (RW, facecache); /* If true, client is caching images */ 182 bool ACC (RW, facecache); /* If true, client is caching images */
134 bool ACC (RW, sent_scroll); 183 bool ACC (RW, sent_scroll);
135 bool ACC (RW, sound); /* does the client want sound */ 184 bool ACC (RW, sound); /* does the client want sound */
136 bool ACC (RW, exp64); /* Client wants 64 bit exp data, as well as skill data */ 185 bool ACC (RW, exp64); /* Client wants 64 bit exp data, as well as skill data */
137 bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */ 186 bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */
138 bool ACC (RW, plugincmd); /* CF+ extend the protocol through a plug-in */ 187 bool ACC (RW, plugincmd); /* CF+ extend the protocol through a plug-in */
139 bool ACC (RW, mapinfocmd); /* CF+ return map info and send map change info */ 188 bool ACC (RW, mapinfocmd); /* CF+ return map info and send map change info */
140 bool ACC (RW, extcmd); /* CF+ call into extensions/plugins */ 189 bool ACC (RW, extcmd); /* CF+ call into extensions/plugins */
141 bool ACC (RW, extmap); /* CF+ extend map comamnd with extra data */ 190 bool ACC (RW, extmap); /* CF+ extend map comamnd with extra data */
142 bool ACC (RW, buggy_mapscroll); /* CF+ client crashes on large mapscrolls */ 191 bool ACC (RW, buggy_mapscroll); /* CF+ client crashes on large mapscrolls */
143 bool ACC (RW, darkness); /* True if client wants darkness information */ 192 bool ACC (RW, darkness); /* True if client wants darkness information */
144 bool ACC (RW, image2); /* Client wants image2/face2 commands */ 193 bool ACC (RW, image2); /* Client wants image2/face2 commands */
145 bool ACC (RW, update_look); /* If true, we need to send the look window */ 194 bool ACC (RW, update_look); /* If true, we need to send the look window */
146 bool ACC (RW, has_readable_type); /* If true client accept additional text information */ 195 bool ACC (RW, has_readable_type); /* If true client accept additional text information */
147 /* used to arrange text in books, scrolls, or scripted dialogs */ 196 /* used to arrange text in books, scrolls, or scripted dialogs */
148 bool ACC (RW, monitor_spells); /* Client wishes to be informed when their spell list changes */ 197 bool ACC (RW, monitor_spells); /* Client wishes to be informed when their spell list changes */
149 bool ACC (RW, ext_mapinfos); /* If true client accept additionnal info on maps */ 198 bool ACC (RW, ext_mapinfos); /* If true client accepts additional info on maps */
150 /* Below are flags for extedend infos to pass to client 199 /* Below are flags for extedend infos to pass to client
151 * with S->C mapextended command */ 200 * with S->C mapextended command */
152 bool ACC (RW, EMI_smooth); /* Send smooth in extendmapinfos */ 201 bool ACC (RW, EMI_smooth); /* Send smooth in extendmapinfos */
153 202
154 uint32 ACC (RW, supported_readables); /* each bit is a readable supported by client */ 203 uint32 ACC (RW, supported_readables); /* each bit is a readable supported by client */
155 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */ 204 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */
156 enum MapMode mapmode; /* Type of map commands the client wants. */ 205 enum MapMode mapmode; /* Type of map commands the client wants. */
157 uint16 ACC (RW, look_position); /* start of drawing of look window */ 206 uint16 ACC (RW, look_position); /* start of drawing of look window */
… …
159 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */ 208 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */
160 uint8 ACC (RW, faceset); /* Set the client is using, default 0 */ 209 uint8 ACC (RW, faceset); /* Set the client is using, default 0 */
161 210
162 maptile *ACC (RW, current_map); // CF+ last/current player map 211 maptile *ACC (RW, current_map); // CF+ last/current player map
163 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position 212 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position
164 char ACC (RW, version)[64]; // CF+ client name/version 213 char ACC (RW, version)[64]; // CF+ client name/version
165 214
166 player *ACC (RO, pl);//TODO should not be here, preferably 215 player_ptr ACC (RO, pl);
167 216
168 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */ 217 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
169 218
170 client (int fd, const char *from_ip); 219 client (int fd, const char *from_ip);
171 ~client (); 220 ~client ();
172 void destroy (); 221 void destroy ();
222 bool destroyed () const { return state == ST_DEAD; }
173 223
174 iw cmd_ev; void cmd_cb (iw &w); 224 iw cmd_ev; void cmd_cb (iw &w);
175 iow socket_ev; void socket_cb (iow &w, int got); 225 iow socket_ev; void socket_cb (iow &w, int got);
176 226
177 std::deque< command, slice_allocator<command> > cmd_queue; 227 std::deque< command, slice_allocator<command> > cmd_queue;
178
179 // resets movement state
180 bool may_execute (const packet_type *pkt) const;
181 void execute (const packet_type *pkt, char *data, int datalen);
182
183 void queue_command (packet_type *handler, char *data, int datalen);
184 bool handle_command ();
185 void reset_state ();
186
187 bool handle_packet ();
188 int next_packet (); // returns length of packet or 0
189 void skip_packet (int len); // we have processed the packet, skip it
190
191 void flush ();
192 void write_outputbuffer ();
193 void send (void *buf_, int len);
194
195 void send_packet (const char *buf);
196 void send_packet (const char *buf, int len);
197 void send_packet_printf (const char *format, ...);
198 void send_packet (packet &sl);
199 228
200 // large structures at the end please 229 // large structures at the end please
201 struct Map lastmap; 230 struct Map lastmap;
202 std::bitset<MAXANIMNUM> anims_sent; 231 std::bitset<MAXANIMNUM> anims_sent;
203 // if we get an incomplete packet, this is used to hold the data. 232 // if we get an incomplete packet, this is used to hold the data.
204 // we add 2 byte for the header, one for the trailing 0 byte 233 // we add 2 byte for the header, one for the trailing 0 byte
205 uint8 inbuf[MAXSOCKBUF + 2 + 1]; 234 uint8 inbuf[MAXSOCKBUF + 2 + 1];
206 235
236 bool may_execute (const packet_type *pkt) const;
237 void execute (const packet_type *pkt, char *data, int datalen);
238
239 void queue_command (packet_type *handler, char *data, int datalen);
240 bool handle_command ();
241 // resets movement state
242 void reset_state ();
243
244 bool handle_packet ();
245 int next_packet (); // returns length of packet or 0
246 void skip_packet (int len); // we have processed the packet, skip it
247
248 void flush ();
249 void write_outputbuffer ();
250 void send (void *buf_, int len);
251
252 void send_packet (const char *buf);
253 void send_packet (const char *buf, int len);
254 void send_packet_printf (const char *format, ...);
255 void send_packet (packet &sl);
256
257 // called when something under the player changes
258 void floorbox_update () { update_look = 1; }
259 // called when the player has been moved
260 void floorbox_reset () { look_position = 0; floorbox_update (); }
261
262 static client *create (int fd, const char *peername);
207}; 263};
208 264
209#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\ 265#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
210 ( ((__type)>0) &&\ 266 ( ((__type)>0) &&\
211 ((__sockPtr)->has_readable_type) && \ 267 ((__sockPtr)->has_readable_type) && \

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines