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.17 by root, Fri Dec 15 03:53:44 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, client_socket *); 65enum {
71 66 PF_PLAYER = 0x01, // must have valid player
72struct NsCmdMapping 67 PF_IMMEDIATE = 0x02, // TODO: hack, can be executed immediately
73{ 68 PF_PLAYING = 0x04, // must be in playing state
74 const char *cmdname;
75 func_uint8_int_ns cmdproc;
76 uint8 flag;
77}; 69};
78 70
79typedef void (*func_uint8_int_pl) (char *, int, player *); 71struct pkt_type
80struct PlCmdMapping
81{ 72{
82 const char *cmdname; 73 const char *name;
83 func_uint8_int_pl cmdproc; 74 void *cb;
84 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 }
85}; 91};
86 92
93// SocketCommand, PlayingCommand, should not exist with those ugly casts
94#define SC(cb) (void *)static_cast<void (*)(char *, int, client_socket *)>(cb),
95#define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER |
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+ */
113 { 0 } /* terminator */
114};
115 114
116/** Face-related commands */ 115 {"addme", SC(AddMeCmd) PF_IMMEDIATE },
117static struct NsCmdMapping nscommands[] = {
118 {"addme", AddMeCmd, 2},
119 {"askface", SendFaceCmd}, /* Added: phil */ 116 {"askface", SC(SendFaceCmd) 0 }, /* Added: phil */
120 {"requestinfo", RequestInfo}, 117 {"requestinfo", SC(RequestInfo) 0 },
121 {"setfacemode", SetFaceMode, 2}, 118 {"setfacemode", SC(SetFaceMode) PF_IMMEDIATE },
122 {"setsound", SetSound, 2}, 119 {"setsound", SC(SetSound) PF_IMMEDIATE },
123 {"setup", SetUp, 2}, 120 {"setup", SC(SetUp) PF_IMMEDIATE },
124 {"version", VersionCmd, 2}, 121 {"version", SC(VersionCmd) PF_IMMEDIATE },
125 {"toggleextendedinfos", ToggleExtendedInfos, 2}, /*Added: tchize */ 122 {"toggleextendedinfos", SC(ToggleExtendedInfos) PF_IMMEDIATE }, /*Added: tchize */
126 {"toggleextendedtext", ToggleExtendedText, 2}, /*Added: tchize */ 123 {"toggleextendedtext", SC(ToggleExtendedText) PF_IMMEDIATE }, /*Added: tchize */
127 {"asksmooth", AskSmooth}, /*Added: tchize (smoothing technologies) */ 124 {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */
128 { 0 } /* terminator (I, II & III) */
129}; 125};
130 126
131/** 127/**
132 * RequestInfo is sort of a meta command. There is some specific 128 * RequestInfo is sort of a meta command. There is some specific
133 * request of information, but we call other functions to provide 129 * request of information, but we call other functions to provide
… …
227 datalen = 0; 223 datalen = 0;
228 } 224 }
229 225
230 ns->inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ 226 ns->inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */
231 227
232 for (int i = 0; nscommands[i].cmdname; i++) 228 for (pkt_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt)
233 {
234 if (!strcmp ((char *)ns->inbuf + 2, nscommands[i].cmdname)) 229 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 { 230 {
255 if (!strcmp ((char *)ns->inbuf + 2, plcommands[i].cmdname)) 231 if (pkt->may_execute (ns))
256 { 232 {
257 if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1)) 233 pkt->execute (ns, data, datalen);
258 plcommands[i].cmdproc ((char *) data, datalen, pl);
259
260 ns->skip_packet (pkt_len); 234 ns->skip_packet (pkt_len);
261 //D// not doing this causes random memory corruption 235 //D//TODO not doing this causes random memory corruption
262 if (plcommands[i].flag & 2) 236 if (pkt->flags & PF_IMMEDIATE)
263 goto next_packet; 237 goto next_packet;
264
265 return; 238 return;
266 } 239 }
267 } 240 }
268 241
269 /* If we get here, we didn't find a valid command. Logging 242 /* If we get here, we didn't find a valid command. Logging
… …
275 next_packet: 248 next_packet:
276 ; 249 ;
277 } 250 }
278} 251}
279 252
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 {
305 struct protoent *protoent;
306
307 if ((protoent = getprotobyname ("udp")) == NULL || (fd = socket (PF_INET, SOCK_DGRAM, protoent->p_proto)) == -1)
308 {
309 return;
310 }
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}
317#endif
318
319void 253void
320flush_sockets (void) 254flush_sockets (void)
321{ 255{
322 player *pl; 256 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ++i)
323
324 for (pl = first_player; pl != NULL; pl = pl->next)
325 if (pl->socket->status != Ns_Dead) 257 if ((*i)->status != Ns_Dead)
326 Socket_Flush (pl->socket); 258 (*i)->flush ();
327} 259}
328 260
329/** 261/**
330 * This checks the sockets for input, does the right thing. 262 * This checks the sockets for input, does the right thing.
331 * 263 *
… …
335 */ 267 */
336void 268void
337doeric_server (void) 269doeric_server (void)
338{ 270{
339 int i, pollret; 271 int i, pollret;
340 fd_set tmp_read, tmp_write; 272 fd_set tmp_read;
341 struct sockaddr_in addr; 273 struct sockaddr_in addr;
342 socklen_t addrlen = sizeof (struct sockaddr); 274 socklen_t addrlen = sizeof (struct sockaddr);
343 player *pl, *next; 275 player *pl, *next;
344 int maxfd = 0; 276 int maxfd = 0;
345 277
… …
373 305
374 pl = npl; 306 pl = npl;
375 } 307 }
376 308
377 FD_ZERO (&tmp_read); 309 FD_ZERO (&tmp_read);
378 FD_ZERO (&tmp_write);
379 310
380 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ) 311 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); )
381 { 312 {
382 client_socket *s = *i; 313 client_socket *s = *i;
383 314
… …
390 { 321 {
391 if (s->fd > maxfd) maxfd = s->fd; 322 if (s->fd > maxfd) maxfd = s->fd;
392 323
393 FD_SET (s->fd, &tmp_read); 324 FD_SET (s->fd, &tmp_read);
394 325
395 if (s->outputbuffer.len)
396 FD_SET (s->fd, &tmp_write);
397
398 ++i; 326 ++i;
399 } 327 }
400 } 328 }
401 329
402 struct timeval timeout; 330 struct timeval timeout;
403 331
404 timeout.tv_sec = 0; 332 timeout.tv_sec = 0;
405 timeout.tv_usec = 0; 333 timeout.tv_usec = 0;
406 334
407 pollret = select (maxfd + 1, 335 pollret = select (maxfd + 1,
408 &tmp_read, &tmp_write, 0, 336 &tmp_read, 0, 0,
409 &timeout); 337 &timeout);
410 338
411 if (pollret == -1) 339 if (pollret == -1)
412 { 340 {
413 LOG (llevError, "select failed: %s\n", strerror (errno)); 341 LOG (llevError, "select failed: %s\n", strerror (errno));
… …
419 /* Check for any input on the sockets */ 347 /* Check for any input on the sockets */
420 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ++i) 348 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ++i)
421 { 349 {
422 client_socket *s = *i; 350 client_socket *s = *i;
423 player *pl = s->pl; 351 player *pl = s->pl;
424
425 //TODO: writing should be independent of tick
426 if (FD_ISSET (s->fd, &tmp_write))
427 {
428 s->can_write = 1;
429 write_socket_buffer (s);
430 }
431 352
432 //TODO: disassociate handleclient from socket readin 353 //TODO: disassociate handleclient from socket readin
433 if (s->inbuf_len || FD_ISSET (s->fd, &tmp_read)) 354 if (s->inbuf_len || FD_ISSET (s->fd, &tmp_read))
434 HandleClient (s, pl); 355 HandleClient (s, pl);
435 356

Diff Legend

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