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.13 by root, Wed Dec 20 09:14:22 2006 UTC vs.
Revision 1.21 by root, Mon Dec 25 11:25:49 2006 UTC

… …
68 * 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
69 * 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
70 * are using. 70 * are using.
71 */ 71 */
72 72
73enum Sock_Status { Ns_Add, Ns_Dead };
74
75/* 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
76 * instead of having a bunch of different fields that needed to 74 * instead of having a bunch of different fields that needed to
77 * get toggled. 75 * get toggled.
78 */ 76 */
79enum MapMode { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 }; 77enum MapMode { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 };
80 78
81/* The following is the setup for a ring buffer for storing output 79/* The following is the setup for a ring buffer for storing output
82 * data that the OS can't handle right away. 80 * data that the OS can't handle right away.
83 */ 81 */
84
85struct Buffer 82struct Buffer
86{ 83{
87 char data[SOCKETBUFSIZE]; 84 char data[SOCKETBUFSIZE];
88 int start; 85 int start;
89 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,
90}; 99};
91 100
92// a handler for a specific type of packet 101// a handler for a specific type of packet
93enum { 102enum {
94 PF_PLAYER = 0x01, // must have valid player / will by synchronised 103 PF_PLAYER = 0x01, // must have valid player / will by synchronised
… …
153}; 162};
154 163
155/* 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. */
156#define MAX_PASSWORD_FAILURES 5 165#define MAX_PASSWORD_FAILURES 5
157 166
158ACC_CLASS (client) // should become player when newsocket is a baseclass of player 167INTERFACE_CLASS (client) // should become player when newsocket is a baseclass of player
159struct client : zero_initialised, attachable_base 168struct client : zero_initialised, attachable
160{ 169{
161 enum Sock_Status status;
162 int ACC (RW, fd); 170 int ACC (RW, fd);
163 unsigned int inbuf_len; // number of bytes valid in inbuf 171 unsigned int inbuf_len; // number of bytes valid in inbuf
164 uint8 *faces_sent; // This is a bitmap on sent face status 172 uint8 *faces_sent; // This is a bitmap on sent face status
165 statsinfo stats; 173 statsinfo stats;
166 174
167 client_container cc_inv, cc_other; 175 client_container cc_inv, cc_other;
176 Buffer outputbuffer;
168 177
169 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 */
170 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 */
171 Buffer outputbuffer;
172 181
182 bool ACC (RW, afk); /* player is afk */
173 bool ACC (RW, facecache); /* If true, client is caching images */ 183 bool ACC (RW, facecache); /* If true, client is caching images */
174 bool ACC (RW, sent_scroll); 184 bool ACC (RW, sent_scroll);
175 bool ACC (RW, sound); /* does the client want sound */ 185 bool ACC (RW, sound); /* does the client want sound */
176 bool ACC (RW, exp64); /* Client wants 64 bit exp data, as well as skill data */
177 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 */
178 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 */
179 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 */
180 bool ACC (RW, extcmd); /* CF+ call into extensions/plugins */ 189 bool ACC (RW, extcmd); /* CF+ call into extensions/plugins */
181 bool ACC (RW, extmap); /* CF+ extend map comamnd with extra data */ 190 bool ACC (RW, extmap); /* CF+ extend map comamnd with extra data */
… …
201 210
202 maptile *ACC (RW, current_map); // CF+ last/current player map 211 maptile *ACC (RW, current_map); // CF+ last/current player map
203 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
204 char ACC (RW, version)[64]; // CF+ client name/version 213 char ACC (RW, version)[64]; // CF+ client name/version
205 214
206 player *ACC (RO, pl);//TODO should not be here, preferably 215 player_ptr ACC (RO, pl);
207 216
208 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 */
209 218
210 client (int fd, const char *from_ip); 219 client (int fd, const char *from_ip);
211 ~client (); 220 ~client ();
212 void destroy (); 221 void do_destroy ();
222 void gather_callbacks (AV *&callbacks, event_type event) const;
213 223
214 iw cmd_ev; void cmd_cb (iw &w); 224 iw cmd_ev; void cmd_cb (iw &w);
215 iow socket_ev; void socket_cb (iow &w, int got); 225 iow socket_ev; void socket_cb (iow &w, int got);
216 226
217 std::deque< command, slice_allocator<command> > cmd_queue; 227 std::deque< command, slice_allocator<command> > cmd_queue;
218
219 // resets movement state
220 bool may_execute (const packet_type *pkt) const;
221 void execute (const packet_type *pkt, char *data, int datalen);
222
223 void queue_command (packet_type *handler, char *data, int datalen);
224 bool handle_command ();
225 void reset_state ();
226
227 bool handle_packet ();
228 int next_packet (); // returns length of packet or 0
229 void skip_packet (int len); // we have processed the packet, skip it
230
231 void flush ();
232 void write_outputbuffer ();
233 void send (void *buf_, int len);
234
235 void send_packet (const char *buf);
236 void send_packet (const char *buf, int len);
237 void send_packet_printf (const char *format, ...);
238 void send_packet (packet &sl);
239
240 // called when something under the player changes
241 void floorbox_update () { update_look = 1; }
242 // called when the player has been moved
243 void floorbox_reset () { look_position = 0; floorbox_update (); }
244 228
245 // large structures at the end please 229 // large structures at the end please
246 struct Map lastmap; 230 struct Map lastmap;
247 std::bitset<MAXANIMNUM> anims_sent; 231 std::bitset<MAXANIMNUM> anims_sent;
248 // 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.
249 // 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
250 uint8 inbuf[MAXSOCKBUF + 2 + 1]; 234 uint8 inbuf[MAXSOCKBUF + 2 + 1];
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);
251}; 263};
252 264
253#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\ 265#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
254 ( ((__type)>0) &&\ 266 ( ((__type)>0) &&\
255 ((__sockPtr)->has_readable_type) && \ 267 ((__sockPtr)->has_readable_type) && \

Diff Legend

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