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.11 by root, Thu Dec 14 00:01:37 2006 UTC vs.
Revision 1.18 by root, Fri Dec 15 04:21:29 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> 50#include <newserver.h>
56 51
57/***************************************************************************** 52/*****************************************************************************
… …
65 * before player joins, and those happen after the player has joined. 60 * before player joins, and those happen after the player has joined.
66 * As such, we have function types that might be called, so 61 * As such, we have function types that might be called, so
67 * we end up having 2 tables. 62 * we end up having 2 tables.
68 */ 63 */
69 64
70typedef void (*func_uint8_int_ns) (char *, int, NewSocket *); 65enum {
66 PF_PLAYER = 0x01, // must have valid player
67 PF_IMMEDIATE = 0x02, // TODO: hack, can be executed immediately
68 PF_PLAYING = 0x04, // must be in playing state
69};
71 70
72struct NsCmdMapping 71struct pkt_type
73{ 72{
74 const char *cmdname; 73 const char *name;
75 func_uint8_int_ns cmdproc; 74 void *cb;
76 uint8 flag; 75 int flags;
76
77 bool may_execute (client_socket *ns)
78 {
79 return (!(flags & PF_PLAYER) || ns->pl)
80 && (!(flags & PF_PLAYING) || (ns->pl && ns->pl->state == ST_PLAYING));
81 }
82
83 void execute (client_socket *ns, char *data, int datalen)
84 {
85 //TODO: only one format
86 if (flags & PF_PLAYER)
87 ((void (*)(char *, int, player * ))cb)((char *)data, datalen, ns->pl);
88 else
89 ((void (*)(char *, int, client_socket *))cb)((char *)data, datalen, ns);
90 }
77}; 91};
78 92
79typedef void (*func_uint8_int_pl) (char *, int, player *); 93// SocketCommand, PlayingCommand, should not exist with those ugly casts
80struct PlCmdMapping 94#define SC(cb) (void *)static_cast<void (*)(char *, int, client_socket *)>(cb),
81{ 95#define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER |
82 const char *cmdname;
83 func_uint8_int_pl cmdproc;
84 uint8 flag;
85};
86 96
87/** 97/**
88 * Dispatch table for the server. 98 * Dispatch table for the server.
89 * 99 */
90 * CmdMapping is the dispatch table for the server, used in HandleClient, 100static struct pkt_type packets[] = {
91 * which gets called when the client has input. All commands called here 101 {"ncom", PC(NewPlayerCmd) PF_PLAYING },
92 * use the same parameter form (char* data, int len, int clientnum. 102 {"command", PC(PlayerCmd) PF_PLAYING },
93 * We do implicit casts, because the data that is being passed is 103
94 * unsigned (pretty much needs to be for binary data), however, most 104 {"examine", PC(ExamineCmd) PF_PLAYING | PF_IMMEDIATE },
95 * of these treat it only as strings, so it makes things easier 105 {"apply", PC(ApplyCmd) PF_PLAYING | PF_IMMEDIATE },
96 * to cast it here instead of a bunch of times in the function itself. 106 {"reply", PC(ReplyCmd) PF_IMMEDIATE },
97 * flag is 1 if the player must be in the playing state to issue the 107 {"lookat", PC(LookAt) PF_PLAYING | PF_IMMEDIATE },
98 * command, 0 if they can issue it at any time. 108 {"lock", PC(LockItem) PF_PLAYING | PF_IMMEDIATE },
99 */ 109 {"mark", PC(MarkItem) PF_PLAYING | PF_IMMEDIATE },
100static struct PlCmdMapping plcommands[] = { 110 {"move", PC(MoveCmd) PF_PLAYING | PF_IMMEDIATE },
101 {"examine", ExamineCmd, 1}, 111 {"ext", PC(ExtCmd) PF_IMMEDIATE }, /* CF+ */
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 */ 112 {"mapredraw", PC(MapRedrawCmd) PF_IMMEDIATE }, /* Added: phil */
111 {"mapinfo", MapInfoCmd, 2}, /* CF+ */ 113 {"mapinfo", PC(MapInfoCmd) PF_IMMEDIATE }, /* CF+ */
112 {"ext", ExtCmd, 2}, /* CF+ */ 114
113 { 0 } /* terminator */ 115 {"addme", SC(AddMeCmd) PF_IMMEDIATE },
116 {"askface", SC(SendFaceCmd) 0 }, /* Added: phil */
117 {"requestinfo", SC(RequestInfo) 0 },
118 {"setfacemode", SC(SetFaceMode) PF_IMMEDIATE },
119 {"setsound", SC(SetSound) PF_IMMEDIATE },
120 {"setup", SC(SetUp) PF_IMMEDIATE },
121 {"version", SC(VersionCmd) PF_IMMEDIATE },
122 {"toggleextendedinfos", SC(ToggleExtendedInfos) PF_IMMEDIATE }, /*Added: tchize */
123 {"toggleextendedtext", SC(ToggleExtendedText) PF_IMMEDIATE }, /*Added: tchize */
124 {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */
114}; 125};
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, NewSocket * 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 Write_String_To_Socket (ns, bigbuf, len);
173}
174 126
175/** 127/**
176 * Handle client input. 128 * Handle client input.
177 * 129 *
178 * HandleClient is actually not named really well - we only get here once 130 * HandleClient is actually not named really well - we only get here once
… …
181 * with this socket, null if no player (one of the init_sockets for just 133 * with this socket, null if no player (one of the init_sockets for just
182 * starting a connection) 134 * starting a connection)
183 */ 135 */
184 136
185void 137void
186HandleClient (NewSocket *ns, player *pl) 138HandleClient (client_socket *ns, player *pl)
187{ 139{
188 /* Loop through this - maybe we have several complete packets here. */ 140 /* Loop through this - maybe we have several complete packets here. */
189 // limit to a few commands only, though, as to not monopolise the server 141 // limit to a few commands only, though, as to not monopolise the server
190 for (int repeat = 16; repeat--;) 142 for (int repeat = 16; repeat--;)
191 { 143 {
… …
227 datalen = 0; 179 datalen = 0;
228 } 180 }
229 181
230 ns->inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ 182 ns->inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */
231 183
232 for (int i = 0; nscommands[i].cmdname; i++) 184 for (pkt_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt)
233 {
234 if (!strcmp ((char *)ns->inbuf + 2, nscommands[i].cmdname)) 185 if (!strcmp ((char *)ns->inbuf + 2, pkt->name))
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 { 186 {
255 if (!strcmp ((char *)ns->inbuf + 2, plcommands[i].cmdname)) 187 if (pkt->may_execute (ns))
256 { 188 {
257 if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1)) 189 pkt->execute (ns, data, datalen);
258 plcommands[i].cmdproc ((char *) data, datalen, pl);
259
260 ns->skip_packet (pkt_len); 190 ns->skip_packet (pkt_len);
261 //D// not doing this causes random memory corruption 191 //D//TODO not doing this causes random memory corruption
262 if (plcommands[i].flag & 2) 192 if (pkt->flags & PF_IMMEDIATE)
263 goto next_packet; 193 goto next_packet;
264
265 return; 194 return;
266 } 195 }
267 } 196 }
268 197
269 printf ("BP34n");//D
270 /* If we get here, we didn't find a valid command. Logging 198 /* If we get here, we didn't find a valid command. Logging
271 * this might be questionable, because a broken client/malicious 199 * this might be questionable, because a broken client/malicious
272 * user could certainly send a whole bunch of invalid commands. 200 * user could certainly send a whole bunch of invalid commands.
273 */ 201 */
274 LOG (llevDebug, "Bad command from client (%s)\n", ns->inbuf + 2); 202 LOG (llevDebug, "Bad command from client (%s)\n", ns->inbuf + 2);
… …
276 next_packet: 204 next_packet:
277 ; 205 ;
278 } 206 }
279} 207}
280 208
281
282/*****************************************************************************
283 *
284 * Low level socket looping - select calls and watchdog udp packet
285 * sending.
286 *
287 ******************************************************************************/
288
289#ifdef WATCHDOG
290
291/**
292 * Tell watchdog that we are still alive
293 *
294 * I put the function here since we should hopefully already be getting
295 * all the needed include files for socket support
296 */
297
298void
299watchdog (void)
300{
301 static int fd = -1;
302 static struct sockaddr_in insock;
303
304 if (fd == -1)
305 {
306 struct protoent *protoent;
307
308 if ((protoent = getprotobyname ("udp")) == NULL || (fd = socket (PF_INET, SOCK_DGRAM, protoent->p_proto)) == -1)
309 {
310 return;
311 }
312 insock.sin_family = AF_INET;
313 insock.sin_port = htons ((unsigned short) 13325);
314 insock.sin_addr.s_addr = inet_addr ("127.0.0.1");
315 }
316 sendto (fd, (void *) &fd, 1, 0, (struct sockaddr *) &insock, sizeof (insock));
317}
318#endif
319
320void 209void
321flush_sockets (void) 210flush_sockets (void)
322{ 211{
323 player *pl; 212 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ++i)
324
325 for (pl = first_player; pl != NULL; pl = pl->next)
326 if (pl->socket.status != Ns_Dead) 213 if ((*i)->status != Ns_Dead)
327 Socket_Flush (&pl->socket); 214 (*i)->flush ();
328} 215}
329 216
330/** 217/**
331 * This checks the sockets for input, does the right thing. 218 * This checks the sockets for input, does the right thing.
332 * 219 *
… …
336 */ 223 */
337void 224void
338doeric_server (void) 225doeric_server (void)
339{ 226{
340 int i, pollret; 227 int i, pollret;
341 fd_set tmp_read, tmp_write; 228 fd_set tmp_read;
342 struct sockaddr_in addr; 229 struct sockaddr_in addr;
343 socklen_t addrlen = sizeof (struct sockaddr); 230 socklen_t addrlen = sizeof (struct sockaddr);
344 player *pl, *next; 231 player *pl, *next;
232 int maxfd = 0;
345 233
346#ifdef CS_LOGSTATS 234#ifdef CS_LOGSTATS
347 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) 235 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME)
348 write_cs_stats (); 236 write_cs_stats ();
349#endif 237#endif
350 238
351 FD_ZERO (&tmp_read);
352 FD_ZERO (&tmp_write);
353
354 for (i = 0; i < socket_info.allocated_sockets; i++)
355 {
356 if (init_sockets[i].status == Ns_Dead)
357 {
358 free_newsocket (&init_sockets[i]);
359 init_sockets[i].status = Ns_Avail;
360 socket_info.nconns--;
361 }
362 else if (init_sockets[i].status != Ns_Avail)
363 {
364 FD_SET (init_sockets[i].fd, &tmp_read);
365 FD_SET (init_sockets[i].fd, &tmp_write);
366 }
367 }
368
369 /* Go through the players. Let the loop set the next pl value, 239 /* Go through the players. Let the loop set the next pl value,
370 * since we may remove some 240 * since we may remove some
371 */ 241 */
242 //TODO: must be handled cleanly elsewhere
372 for (pl = first_player; pl != NULL;) 243 for (pl = first_player; pl; )
373 { 244 {
245 player *npl = pl->next;
246
247 //TODO: must be handled cleanly elsewhere
374 if (pl->socket.status == Ns_Dead) 248 if (pl->socket->status == Ns_Dead)
375 { 249 {
376 player *npl = pl->next;
377
378 save_player (pl->ob, 0); 250 save_player (pl->ob, 0);
379 251
380 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) 252 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
381 { 253 {
382 terminate_all_pets (pl->ob); 254 terminate_all_pets (pl->ob);
383 pl->ob->remove (); 255 pl->ob->remove ();
384 } 256 }
385 257
386 leave (pl, 1); 258 leave (pl, 1);
387 final_free_player (pl); 259 final_free_player (pl);
260 }
261
388 pl = npl; 262 pl = npl;
263 }
264
265 FD_ZERO (&tmp_read);
266
267 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); )
268 {
269 client_socket *s = *i;
270
271 if (s->status == Ns_Dead)
272 {
273 client_sockets.erase (i);
274 delete s;
389 } 275 }
390 else 276 else
391 { 277 {
278 if (s->fd > maxfd) maxfd = s->fd;
279
392 FD_SET ((uint32) pl->socket.fd, &tmp_read); 280 FD_SET (s->fd, &tmp_read);
393 FD_SET ((uint32) pl->socket.fd, &tmp_write);
394 pl = pl->next;
395 }
396 }
397 281
398 /* Reset timeout each time, since some OS's will change the values on 282 ++i;
399 * the return from select. 283 }
400 */ 284 }
285
286 struct timeval timeout;
287
401 socket_info.timeout.tv_sec = 0; 288 timeout.tv_sec = 0;
402 socket_info.timeout.tv_usec = 0; 289 timeout.tv_usec = 0;
403 290
404 pollret = select (socket_info.max_filedescriptor, 291 pollret = select (maxfd + 1,
405 &tmp_read, &tmp_write, 0, 292 &tmp_read, 0, 0,
406 &socket_info.timeout); 293 &timeout);
407 294
408 if (pollret == -1) 295 if (pollret == -1)
409 { 296 {
410 LOG (llevError, "select failed: %s\n", strerror (errno)); 297 LOG (llevError, "select failed: %s\n", strerror (errno));
411 return; 298 return;
412 } 299 }
413 300
414 /* We need to do some of the processing below regardless */ 301 /* We need to do some of the processing below regardless */
415 302
416/* if (!pollret) return;*/
417
418 /* Following adds a new connection */
419 if (pollret && FD_ISSET (init_sockets[0].fd, &tmp_read))
420 {
421 int newsocknum = 0;
422
423#ifdef ESRV_DEBUG
424 LOG (llevDebug, "doeric_server: New Connection\n");
425#endif
426 /* If this is the case, all sockets currently in used */
427 if (socket_info.allocated_sockets <= socket_info.nconns)
428 {
429 init_sockets = (NewSocket *) realloc (init_sockets, sizeof (NewSocket) * (socket_info.nconns + 1));
430 if (!init_sockets)
431 fatal (OUT_OF_MEMORY);
432 newsocknum = socket_info.allocated_sockets;
433 socket_info.allocated_sockets++;
434 init_sockets[newsocknum].faces_sent_len = nrofpixmaps;
435 init_sockets[newsocknum].faces_sent = (uint8 *) malloc (nrofpixmaps * sizeof (*init_sockets[newsocknum].faces_sent));
436 if (!init_sockets[newsocknum].faces_sent)
437 fatal (OUT_OF_MEMORY);
438 init_sockets[newsocknum].status = Ns_Avail;
439 }
440 else
441 {
442 int j;
443
444 for (j = 1; j < socket_info.allocated_sockets; j++)
445 if (init_sockets[j].status == Ns_Avail)
446 {
447 newsocknum = j;
448 break;
449 }
450 }
451
452 init_sockets[newsocknum].fd = accept (init_sockets[0].fd, (struct sockaddr *) &addr, &addrlen);
453
454 if (init_sockets[newsocknum].fd == -1)
455 LOG (llevError, "accept failed: %s\n", strerror (errno));
456 else
457 {
458 char buf[MAX_BUF];
459 long ip;
460 NewSocket *ns;
461
462 ns = &init_sockets[newsocknum];
463
464 ip = ntohl (addr.sin_addr.s_addr);
465 sprintf (buf, "%ld.%ld.%ld.%ld", (ip >> 24) & 255, (ip >> 16) & 255, (ip >> 8) & 255, ip & 255);
466
467 if (checkbanned (NULL, buf))
468 {
469 LOG (llevInfo, "Banned host tried to connect: [%s]\n", buf);
470 close (init_sockets[newsocknum].fd);
471 init_sockets[newsocknum].fd = -1;
472 }
473 else
474 {
475 InitConnection (ns, buf);
476 socket_info.nconns++;
477 }
478 }
479 }
480
481 /* Check for any input on the sockets */ 303 /* Check for any input on the sockets */
482 if (pollret) 304 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ++i)
483 for (i = 1; i < socket_info.allocated_sockets; i++)
484 { 305 {
485 if (init_sockets[i].status == Ns_Avail) 306 client_socket *s = *i;
486 continue; 307 player *pl = s->pl;
487 308
488 //TODO: disassociate handleclient from socket readin 309 //TODO: disassociate handleclient from socket readin
489 if (init_sockets[i].inbuf_len || FD_ISSET (init_sockets[i].fd, &tmp_read)) 310 if (s->inbuf_len || FD_ISSET (s->fd, &tmp_read))
490 HandleClient (&init_sockets[i], NULL);
491
492 if (FD_ISSET (init_sockets[i].fd, &tmp_write))
493 init_sockets[i].can_write = 1;
494 }
495
496 /* This does roughly the same thing, but for the players now */
497 for (pl = first_player; pl != NULL; pl = next)
498 {
499
500 next = pl->next;
501 if (pl->socket.status == Ns_Dead)
502 continue;
503
504 if (FD_ISSET (pl->socket.fd, &tmp_write))
505 {
506 if (!pl->socket.can_write)
507 {
508#if 0
509 LOG (llevDebug, "Player %s socket now write enabled\n", pl->ob->name);
510#endif
511 pl->socket.can_write = 1;
512 write_socket_buffer (&pl->socket);
513 }
514
515 /* if we get an error on the write_socket buffer, no reason to
516 * continue on this socket.
517 */
518 if (pl->socket.status == Ns_Dead)
519 continue;
520 }
521 else
522 pl->socket.can_write = 0;
523
524 HandleClient (&pl->socket, pl); 311 HandleClient (s, pl);
525 /* If the player has left the game, then the socket status 312
526 * will be set to this be the leave function. We don't 313 //TODO: should not be done here, either
527 * need to call leave again, as it has already been called
528 * once.
529 */
530 if (pl->socket.status == Ns_Dead) 314 if (s->status != Ns_Dead && pl)
531 {
532 save_player (pl->ob, 0);
533
534 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
535 {
536 terminate_all_pets (pl->ob);
537 pl->ob->remove ();
538 }
539
540 leave (pl, 1);
541 final_free_player (pl);
542 }
543 else
544 { 315 {
545 /* Update the players stats once per tick. More efficient than 316 /* Update the players stats once per tick. More efficient than
546 * sending them whenever they change, and probably just as useful 317 * sending them whenever they change, and probably just as useful
547 */ 318 */
548 esrv_update_stats (pl); 319 esrv_update_stats (pl);
… …
556 327
557 /* draw_client_map does sanity checking that map is 328 /* draw_client_map does sanity checking that map is
558 * valid, so don't do it here. 329 * valid, so don't do it here.
559 */ 330 */
560 draw_client_map (pl->ob); 331 draw_client_map (pl->ob);
561 if (pl->socket.update_look) 332 if (s->update_look)
562 esrv_draw_look (pl->ob); 333 esrv_draw_look (pl->ob);
563 } 334 }
564 } 335 }
565} 336}
566 337

Diff Legend

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