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.4 by root, Sat Dec 16 03:08:26 2006 UTC vs.
Revision 1.14 by root, Thu Dec 21 06:12:36 2006 UTC

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

Diff Legend

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