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.14 by root, Thu Dec 21 06:12:36 2006 UTC vs.
Revision 1.22 by root, Tue Dec 26 05:44:14 2006 UTC

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

Diff Legend

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