ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/loop.C
(Generate patch)

Comparing deliantra/server/socket/loop.C (file contents):
Revision 1.16 by root, Thu Dec 14 22:45:41 2006 UTC vs.
Revision 1.29 by root, Tue Dec 19 04:58:05 2006 UTC

… …
26 * Main client/server loops. 26 * Main client/server loops.
27 * 27 *
28 * \date 2003-12-02 28 * \date 2003-12-02
29 * 29 *
30 * loop.c mainly deals with initialization and higher level socket 30 * loop.c mainly deals with initialization and higher level socket
31 * maintenance (checking for lost connections and if data has arrived.) 31 * maintanance (checking for lost connections and if data has arrived.)
32 * The reading of data is handled in ericserver.c
33 */ 32 */
34 33
35 34
36#include <global.h> 35#include <global.h>
37#include <sproto.h> 36#include <sproto.h>
… …
45 44
46#include <unistd.h> 45#include <unistd.h>
47#include <arpa/inet.h> 46#include <arpa/inet.h>
48 47
49#include <loader.h> 48#include <loader.h>
50#include <newserver.h>
51 49
52/***************************************************************************** 50#define MAX_QUEUE_DEPTH 500 //TODO
53 * Start of command dispatch area. 51#define MAX_QUEUE_BACKLOG 5. //TODO
54 * The commands here are protocol commands.
55 ****************************************************************************/
56 52
57/* Either keep this near the start or end of the file so it is
58 * at least reasonablye easy to find.
59 * There are really 2 commands - those which are sent/received
60 * before player joins, and those happen after the player has joined.
61 * As such, we have function types that might be called, so
62 * we end up having 2 tables.
63 */
64
65typedef void (*func_uint8_int_ns) (char *, int, client_socket *);
66
67struct NsCmdMapping
68{
69 const char *cmdname;
70 func_uint8_int_ns cmdproc;
71 uint8 flag;
72};
73
74typedef void (*func_uint8_int_pl) (char *, int, player *);
75struct PlCmdMapping
76{
77 const char *cmdname;
78 func_uint8_int_pl cmdproc;
79 uint8 flag;
80};
81
82/**
83 * Dispatch table for the server.
84 *
85 * CmdMapping is the dispatch table for the server, used in HandleClient,
86 * which gets called when the client has input. All commands called here
87 * use the same parameter form (char* data, int len, int clientnum.
88 * We do implicit casts, because the data that is being passed is
89 * unsigned (pretty much needs to be for binary data), however, most
90 * of these treat it only as strings, so it makes things easier
91 * to cast it here instead of a bunch of times in the function itself.
92 * flag is 1 if the player must be in the playing state to issue the
93 * command, 0 if they can issue it at any time.
94 */
95static struct PlCmdMapping plcommands[] = {
96 {"examine", ExamineCmd, 1},
97 {"apply", ApplyCmd, 1},
98 {"move", MoveCmd, 1},
99 {"reply", ReplyCmd, 0},
100 {"command", PlayerCmd, 1},
101 {"ncom", (func_uint8_int_pl) NewPlayerCmd, 1},
102 {"lookat", LookAt, 1},
103 {"lock", (func_uint8_int_pl) LockItem, 1},
104 {"mark", (func_uint8_int_pl) MarkItem, 1},
105 {"mapredraw", MapRedrawCmd, 0}, /* Added: phil */
106 {"mapinfo", MapInfoCmd, 2}, /* CF+ */
107 {"ext", ExtCmd, 2}, /* CF+ */
108 { 0 } /* terminator */
109};
110
111/** Face-related commands */
112static struct NsCmdMapping nscommands[] = {
113 {"addme", AddMeCmd, 2},
114 {"askface", SendFaceCmd}, /* Added: phil */
115 {"requestinfo", RequestInfo},
116 {"setfacemode", SetFaceMode, 2},
117 {"setsound", SetSound, 2},
118 {"setup", SetUp, 2},
119 {"version", VersionCmd, 2},
120 {"toggleextendedinfos", ToggleExtendedInfos, 2}, /*Added: tchize */
121 {"toggleextendedtext", ToggleExtendedText, 2}, /*Added: tchize */
122 {"asksmooth", AskSmooth}, /*Added: tchize (smoothing technologies) */
123 { 0 } /* terminator (I, II & III) */
124};
125
126/**
127 * RequestInfo is sort of a meta command. There is some specific
128 * request of information, but we call other functions to provide
129 * that information.
130 */
131void 53void
132RequestInfo (char *buf, int len, client_socket * ns) 54client::reset_state ()
133{ 55{
134 char *params = NULL, *cp; 56 if (!pl)
57 return;
135 58
136 /* No match */ 59 pl->run_on = 0;
137 char bigbuf[MAX_BUF]; 60 pl->fire_on = 0;
138 int slen; 61}
139 62
140 /* Set up replyinfo before we modify any of the buffers - this is used 63void
141 * if we don't find a match. 64client::queue_command (packet_type *handler, char *data, int datalen)
142 */ 65{
143 strcpy (bigbuf, "replyinfo "); 66 tstamp stamp = now ();
144 slen = strlen (bigbuf);
145 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
146 67
147 /* find the first space, make it null, and update the 68 if (cmd_queue.size () >= MAX_QUEUE_DEPTH)
148 * params pointer.
149 */
150 for (cp = buf; *cp != '\0'; cp++)
151 if (*cp == ' ')
152 { 69 {
153 *cp = '\0'; 70 //TODO: just disconnect here?
154 params = cp + 1; 71 reset_state ();
155 break; 72 send_packet_printf ("drawinfo %d command queue overflow, ignoring.", NDI_RED);
156 } 73 }
157
158 if (!strcmp (buf, "image_info"))
159 send_image_info (ns, params);
160 else if (!strcmp (buf, "image_sums"))
161 send_image_sums (ns, params);
162 else if (!strcmp (buf, "skill_info"))
163 send_skill_info (ns, params);
164 else if (!strcmp (buf, "spell_paths"))
165 send_spell_paths (ns, params);
166 else 74 else
167 ns->send_packet (bigbuf, len); 75 {
168} 76 cmd_queue.push_back (command ());
169 77 command &cmd = cmd_queue.back ();
170/** 78 cmd.stamp = stamp;
171 * Handle client input. 79 cmd.handler = handler;
172 * 80 cmd.data = salloc<char> (datalen + 1, data);
173 * HandleClient is actually not named really well - we only get here once 81 cmd.datalen = datalen;
174 * there is input, so we don't do exception or other stuff here.
175 * sock is the output socket information. pl is the player associated
176 * with this socket, null if no player (one of the init_sockets for just
177 * starting a connection)
178 */
179
180void
181HandleClient (client_socket *ns, player *pl)
182{
183 /* Loop through this - maybe we have several complete packets here. */
184 // limit to a few commands only, though, as to not monopolise the server
185 for (int repeat = 16; repeat--;)
186 { 82 }
187 /* If it is a player, and they don't have any speed left, we 83}
188 * return, and will read in the data when they do have time. 84
189 */ 85bool
86client::handle_command ()
87{
88 bool skipping = false;
89
90 while (!cmd_queue.empty ()
190 if (pl && pl->state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0) 91 && !(pl && pl->state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0))
191 return; 92 {
93 command &cmd = cmd_queue.front ();
192 94
193 int pkt_len = ns->read_packet (); 95 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ())
194
195 if (pkt_len < 0)
196 {
197 LOG (llevError, "read error on player %s\n", &pl->ob->name);
198 /* Caller will take care of cleaning this up */
199 ns->status = Ns_Dead;
200 return;
201 } 96 {
202 else if (pkt_len == 0) 97 if (!skipping)
203 /* Still dont have a full packet */
204 return;
205
206 /* First, break out beginning word. There are at least
207 * a few commands that do not have any paremeters. If
208 * we get such a command, don't worry about trying
209 * to break it up.
210 */
211 int datalen;
212 char *data = strchr ((char *)ns->inbuf + 2, ' ');
213
214 if (data)
215 { 98 {
216 *data++ = 0; 99 skipping = true;
217 datalen = pkt_len - (data - (char *)ns->inbuf); 100 reset_state ();
101 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);
102 }
103
104 cmd_queue.pop_front ();
218 } 105 }
219 else 106 else
220 { 107 {
221 data = (char *)ns->inbuf + 2; // better read garbage than segfault 108 execute (cmd.handler, cmd.data, cmd.datalen);
222 datalen = 0; 109 cmd_queue.pop_front ();
223 }
224
225 ns->inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */
226
227 for (int i = 0; nscommands[i].cmdname; i++)
228 {
229 if (!strcmp ((char *)ns->inbuf + 2, nscommands[i].cmdname))
230 {
231 nscommands[i].cmdproc (data, datalen, ns);
232 ns->skip_packet (pkt_len);
233 //D// not doing this causes random memory corruption
234 if (nscommands[i].flag & 2)
235 goto next_packet;
236 return; 110 return true;
237 }
238 }
239
240 /* Player must be in the playing state or the flag on the
241 * the command must be zero for the user to use the command -
242 * otherwise, a player cam save, be in the play_again state, and
243 * the map they were on gets swapped out, yet things that try to look
244 * at the map causes a crash. If the command is valid, but
245 * one they can't use, we still swallow it up.
246 */
247 if (pl)
248 for (int i = 0; plcommands[i].cmdname; i++)
249 {
250 if (!strcmp ((char *)ns->inbuf + 2, plcommands[i].cmdname))
251 {
252 if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1))
253 plcommands[i].cmdproc ((char *) data, datalen, pl);
254
255 ns->skip_packet (pkt_len);
256 //D// not doing this causes random memory corruption
257 if (plcommands[i].flag & 2)
258 goto next_packet;
259
260 return;
261 }
262 } 111 }
263
264 /* If we get here, we didn't find a valid command. Logging
265 * this might be questionable, because a broken client/malicious
266 * user could certainly send a whole bunch of invalid commands.
267 */
268 LOG (llevDebug, "Bad command from client (%s)\n", ns->inbuf + 2);
269 ns->skip_packet (pkt_len);
270 next_packet:
271 ;
272 } 112 }
113
114 return false;
273} 115}
274 116
275void 117void
276flush_sockets (void) 118flush_sockets (void)
277{ 119{
278 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ++i) 120 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
279 if ((*i)->status != Ns_Dead) 121 if ((*i)->status != Ns_Dead)
280 (*i)->flush (); 122 (*i)->flush ();
281} 123}
282 124
283/** 125/**
… …
288 * 130 *
289 */ 131 */
290void 132void
291doeric_server (void) 133doeric_server (void)
292{ 134{
293 int i, pollret;
294 fd_set tmp_read;
295 struct sockaddr_in addr;
296 socklen_t addrlen = sizeof (struct sockaddr);
297 player *pl, *next;
298 int maxfd = 0;
299
300#ifdef CS_LOGSTATS 135#ifdef CS_LOGSTATS
301 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) 136 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME)
302 write_cs_stats (); 137 write_cs_stats ();
303#endif 138#endif
304 139
305 /* Go through the players. Let the loop set the next pl value, 140 /* Go through the players. Let the loop set the next pl value,
306 * since we may remove some 141 * since we may remove some
307 */ 142 */
308 //TODO: must be handled cleanly elsewhere 143 //TODO: must be handled cleanly elsewhere
309 for (pl = first_player; pl; ) 144 for (player *pl = first_player; pl; )
310 { 145 {
311 player *npl = pl->next; 146 player *npl = pl->next;
312 147
313 //TODO: must be handled cleanly elsewhere 148 //TODO: must be handled cleanly elsewhere
314 if (pl->socket->status == Ns_Dead) 149 if (!pl->socket || pl->socket->status == Ns_Dead)
315 { 150 {
316 save_player (pl->ob, 0); 151 save_player (pl->ob, 0);
317 152
318 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) 153 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
319 { 154 {
… …
326 } 161 }
327 162
328 pl = npl; 163 pl = npl;
329 } 164 }
330 165
331 FD_ZERO (&tmp_read);
332
333 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ) 166 for (sockvec::iterator i = clients.begin (); i != clients.end (); )
334 { 167 {
335 client_socket *s = *i; 168 client *s = *i;
336 169
337 if (s->status == Ns_Dead) 170 if (s->status == Ns_Dead)
338 { 171 {
339 client_sockets.erase (i); 172 clients.erase (i);
340 delete s; 173 delete s;
341 } 174 }
342 else 175 else
343 {
344 if (s->fd > maxfd) maxfd = s->fd;
345
346 FD_SET (s->fd, &tmp_read);
347
348 ++i; 176 ++i;
349 }
350 }
351
352 struct timeval timeout;
353
354 timeout.tv_sec = 0;
355 timeout.tv_usec = 0;
356
357 pollret = select (maxfd + 1,
358 &tmp_read, 0, 0,
359 &timeout);
360
361 if (pollret == -1)
362 {
363 LOG (llevError, "select failed: %s\n", strerror (errno));
364 return;
365 } 177 }
366 178
367 /* We need to do some of the processing below regardless */ 179 /* We need to do some of the processing below regardless */
368 180
369 /* Check for any input on the sockets */ 181 /* Check for any input on the sockets */
370 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ++i) 182 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
371 { 183 {
372 client_socket *s = *i; 184 client *s = *i;
373 player *pl = s->pl; 185 player *pl = s->pl;
374
375 //TODO: disassociate handleclient from socket readin
376 if (s->inbuf_len || FD_ISSET (s->fd, &tmp_read))
377 HandleClient (s, pl);
378 186
379 //TODO: should not be done here, either 187 //TODO: should not be done here, either
380 if (s->status != Ns_Dead && pl) 188 if (s->status != Ns_Dead && pl)
381 { 189 {
382 /* Update the players stats once per tick. More efficient than 190 /* Update the players stats once per tick. More efficient than
383 * sending them whenever they change, and probably just as useful 191 * sending them whenever they change, and probably just as useful
384 */ 192 */
385 esrv_update_stats (pl); 193 esrv_update_stats (pl);
194
386 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob)) 195 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob))
387 { 196 {
388 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob); 197 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
389 if (pl->last_weight != WEIGHT (pl->ob)) 198 if (pl->last_weight != WEIGHT (pl->ob))
390 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n", 199 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
391 (unsigned long) pl->last_weight, WEIGHT (pl->ob)); 200 (unsigned long) pl->last_weight, WEIGHT (pl->ob));
392 } 201 }
393 202
394 /* draw_client_map does sanity checking that map is
395 * valid, so don't do it here.
396 */
397 draw_client_map (pl->ob); 203 draw_client_map (pl->ob);
204
398 if (s->update_look) 205 if (s->update_look)
399 esrv_draw_look (pl->ob); 206 esrv_draw_look (pl->ob);
400 } 207 }
401 } 208 }
402} 209}

Diff Legend

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