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.15 by root, Thu Dec 14 21:46:34 2006 UTC vs.
Revision 1.38 by root, Sun Jan 14 21:20:51 2007 UTC

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

Diff Legend

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