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.14 by root, Thu Dec 14 04:30:33 2006 UTC vs.
Revision 1.21 by root, Sat Dec 16 03:21:08 2006 UTC

… …
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 2 //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
63 * at least reasonablye easy to find.
64 * There are really 2 commands - those which are sent/received
65 * before player joins, and those happen after the player has joined.
66 * As such, we have function types that might be called, so
67 * we end up having 2 tables.
68 */
69
70typedef void (*func_uint8_int_ns) (char *, int, client_socket *);
71
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 54void
137RequestInfo (char *buf, int len, client_socket * ns) 55client::reset_state ()
138{ 56{
139 char *params = NULL, *cp; 57 if (!pl)
58 return;
140 59
141 /* No match */ 60 pl->run_on = 0;
142 char bigbuf[MAX_BUF]; 61 pl->fire_on = 0;
143 int slen; 62}
144 63
145 /* Set up replyinfo before we modify any of the buffers - this is used 64void
146 * if we don't find a match. 65client::queue_command (packet_type *handler, char *data, int datalen)
147 */ 66{
148 strcpy (bigbuf, "replyinfo "); 67 tstamp stamp = now ();
149 slen = strlen (bigbuf);
150 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
151 68
152 /* find the first space, make it null, and update the 69 if (cmd_queue.size () >= MAX_QUEUE_DEPTH)
153 * params pointer.
154 */
155 for (cp = buf; *cp != '\0'; cp++)
156 if (*cp == ' ')
157 { 70 {
158 *cp = '\0'; 71 //TODO: just disconnect here?
159 params = cp + 1; 72 reset_state ();
160 break; 73 send_packet_printf ("drawinfo %d command queue overflow, ignoring.", NDI_RED);
161 } 74 }
162 75 else if (!cmd_queue.empty () && cmd_queue.front ().stamp + MAX_QUEUE_BACKLOG < stamp)
163 if (!strcmp (buf, "image_info")) 76 {
164 send_image_info (ns, params); 77 reset_state ();
165 else if (!strcmp (buf, "image_sums")) 78 send_packet_printf ("drawinfo %d too many commands in queue, ignoring.", NDI_RED);
166 send_image_sums (ns, params); 79 }
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 80 else
172 ns->send_packet (bigbuf, len); 81 cmd_queue.push_back (command (
82 stamp, handler, (char *)salloc (datalen, data), datalen
83 ));
173} 84}
174 85
175/** 86bool
176 * Handle client input. 87client::handle_command ()
177 *
178 * HandleClient is actually not named really well - we only get here once
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
185void
186HandleClient (client_socket *ns, player *pl)
187{ 88{
188 /* Loop through this - maybe we have several complete packets here. */
189 // limit to a few commands only, though, as to not monopolise the server
190 for (int repeat = 16; repeat--;)
191 {
192 /* If it is a player, and they don't have any speed left, we
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) 89 if (pl && pl->state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0)
196 return; 90 return false;
197 91
198 int pkt_len = ns->read_packet (); 92 if (cmd_queue.empty ())
93 return false;
199 94
200 if (pkt_len < 0) 95 command &cmd = cmd_queue.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 96
211 /* First, break out beginning word. There are at least 97 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ())
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 }
224 else
225 {
226 data = (char *)ns->inbuf + 2; // better read garbage than segfault
227 datalen = 0;
228 }
229
230 ns->inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */
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 } 98 {
278} 99 reset_state ();
279 100 send_packet_printf ("drawinfo %d ignoring delayed command.", NDI_RED);
280
281/*****************************************************************************
282 *
283 * Low level socket looping - select calls and watchdog udp packet
284 * sending.
285 *
286 ******************************************************************************/
287
288#ifdef WATCHDOG
289
290/**
291 * Tell watchdog that we are still alive
292 *
293 * I put the function here since we should hopefully already be getting
294 * all the needed include files for socket support
295 */
296
297void
298watchdog (void)
299{
300 static int fd = -1;
301 static struct sockaddr_in insock;
302
303 if (fd == -1)
304 { 101 }
305 struct protoent *protoent; 102 else
103 execute (cmd.handler, cmd.data, cmd.datalen);
306 104
307 if ((protoent = getprotobyname ("udp")) == NULL || (fd = socket (PF_INET, SOCK_DGRAM, protoent->p_proto)) == -1) 105 sfree (cmd.data, cmd.datalen);
308 { 106 cmd_queue.pop_front ();
309 return; 107
310 } 108 return true;
311 insock.sin_family = AF_INET;
312 insock.sin_port = htons ((unsigned short) 13325);
313 insock.sin_addr.s_addr = inet_addr ("127.0.0.1");
314 }
315 sendto (fd, (void *) &fd, 1, 0, (struct sockaddr *) &insock, sizeof (insock));
316} 109}
317#endif
318 110
319void 111void
320flush_sockets (void) 112flush_sockets (void)
321{ 113{
322 player *pl; 114 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
323
324 for (pl = first_player; pl != NULL; pl = pl->next)
325 if (pl->socket->status != Ns_Dead) 115 if ((*i)->status != Ns_Dead)
326 Socket_Flush (pl->socket); 116 (*i)->flush ();
327} 117}
328 118
329/** 119/**
330 * This checks the sockets for input, does the right thing. 120 * This checks the sockets for input, does the right thing.
331 * 121 *
… …
334 * 124 *
335 */ 125 */
336void 126void
337doeric_server (void) 127doeric_server (void)
338{ 128{
339 int i, pollret;
340 fd_set tmp_read, tmp_write;
341 struct sockaddr_in addr;
342 socklen_t addrlen = sizeof (struct sockaddr);
343 player *pl, *next;
344 int maxfd = 0;
345
346#ifdef CS_LOGSTATS 129#ifdef CS_LOGSTATS
347 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) 130 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME)
348 write_cs_stats (); 131 write_cs_stats ();
349#endif 132#endif
350 133
351 /* Go through the players. Let the loop set the next pl value, 134 /* Go through the players. Let the loop set the next pl value,
352 * since we may remove some 135 * since we may remove some
353 */ 136 */
354 //TODO: must be handled cleanly elsewhere 137 //TODO: must be handled cleanly elsewhere
355 for (pl = first_player; pl; ) 138 for (player *pl = first_player; pl; )
356 { 139 {
357 player *npl = pl->next; 140 player *npl = pl->next;
358 141
359 //TODO: must be handled cleanly elsewhere 142 //TODO: must be handled cleanly elsewhere
360 if (pl->socket->status == Ns_Dead) 143 if (!pl->socket || pl->socket->status == Ns_Dead)
361 { 144 {
362 save_player (pl->ob, 0); 145 save_player (pl->ob, 0);
363 146
364 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) 147 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
365 { 148 {
… …
372 } 155 }
373 156
374 pl = npl; 157 pl = npl;
375 } 158 }
376 159
377 FD_ZERO (&tmp_read);
378 FD_ZERO (&tmp_write);
379
380 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ) 160 for (sockvec::iterator i = clients.begin (); i != clients.end (); )
381 { 161 {
382 client_socket *s = *i; 162 client *s = *i;
383 163
384 if (s->status == Ns_Dead) 164 if (s->status == Ns_Dead)
385 { 165 {
386 client_sockets.erase (i); 166 clients.erase (i);
387 delete s; 167 delete s;
388 } 168 }
389 else 169 else
390 {
391 if (s->fd > maxfd) maxfd = s->fd;
392
393 FD_SET (s->fd, &tmp_read);
394
395 if (s->outputbuffer.len)
396 FD_SET (s->fd, &tmp_write);
397
398 ++i; 170 ++i;
399 }
400 }
401
402 struct timeval timeout;
403
404 timeout.tv_sec = 0;
405 timeout.tv_usec = 0;
406
407 pollret = select (maxfd + 1,
408 &tmp_read, &tmp_write, 0,
409 &timeout);
410
411 if (pollret == -1)
412 {
413 LOG (llevError, "select failed: %s\n", strerror (errno));
414 return;
415 } 171 }
416 172
417 /* We need to do some of the processing below regardless */ 173 /* We need to do some of the processing below regardless */
418 174
419 /* Check for any input on the sockets */ 175 /* Check for any input on the sockets */
420 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ++i) 176 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
421 { 177 {
422 client_socket *s = *i; 178 client *s = *i;
423 player *pl = s->pl; 179 player *pl = s->pl;
424 180
425 //TODO: writing should be independent of tick 181 s->handle_packet ();
426 if (FD_ISSET (s->fd, &tmp_write)) 182 s->handle_command ();
427 {
428 s->can_write = 1;
429 write_socket_buffer (s);
430 }
431
432 //TODO: disassociate handleclient from socket readin
433 if (s->inbuf_len || FD_ISSET (s->fd, &tmp_read))
434 HandleClient (s, pl);
435 183
436 //TODO: should not be done here, either 184 //TODO: should not be done here, either
437 if (s->status != Ns_Dead && pl) 185 if (s->status != Ns_Dead && pl)
438 { 186 {
439 /* Update the players stats once per tick. More efficient than 187 /* Update the players stats once per tick. More efficient than
440 * sending them whenever they change, and probably just as useful 188 * sending them whenever they change, and probably just as useful
441 */ 189 */
442 esrv_update_stats (pl); 190 esrv_update_stats (pl);
191
443 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob)) 192 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob))
444 { 193 {
445 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob); 194 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
446 if (pl->last_weight != WEIGHT (pl->ob)) 195 if (pl->last_weight != WEIGHT (pl->ob))
447 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n", 196 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
448 (unsigned long) pl->last_weight, WEIGHT (pl->ob)); 197 (unsigned long) pl->last_weight, WEIGHT (pl->ob));
449 } 198 }
450 199
451 /* draw_client_map does sanity checking that map is
452 * valid, so don't do it here.
453 */
454 draw_client_map (pl->ob); 200 draw_client_map (pl->ob);
201
455 if (s->update_look) 202 if (s->update_look)
456 esrv_draw_look (pl->ob); 203 esrv_draw_look (pl->ob);
457 } 204 }
458 } 205 }
459} 206}

Diff Legend

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