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

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.52 by root, Sat Jul 28 00:15:18 2007 UTC vs.
Revision 1.61 by root, Fri Oct 5 23:03:49 2007 UTC

… …
31# include <sys/socket.h> 31# include <sys/socket.h>
32# include <netinet/in.h> 32# include <netinet/in.h>
33# include <netinet/tcp.h> 33# include <netinet/tcp.h>
34#endif 34#endif
35 35
36// disconnect a socket after this many seconds without an ack
37#define SOCKET_TIMEOUT 8.
38
39// force a packet when idle for more than this many seconds, 36// force a packet when idle for more than this many seconds,
40// forcing an ack regularly. 37// forcing an ack regularly.
41#define IDLE_PING 2. 38#define IDLE_PING 2.
42 39
43void 40void
44client::flush () 41client::flush ()
45{ 42{
46 if (destroyed ()) 43 if (destroyed ())
47 return; 44 return;
48
49#if HAVE_TCP_INFO
50 // check about once per second, spread evenly over all clients
51 // do this only when player is active
52 if (!((pticks + fd) & 7) && pl && pl->active)
53 {
54 // check time of last ack, and, if too old, kill connection
55 socklen_t len = sizeof (tcpi);
56
57 if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))
58 {
59 if (tcpi.tcpi_snd_mss)
60 mss = tcpi.tcpi_snd_mss;
61
62 //fprintf (stderr, "uack %d sst %d cwnd %d mss %d pmtu %d\n",
63 // tcpi.tcpi_unacked, tcpi.tcpi_snd_ssthresh, tcpi.tcpi_snd_cwnd, tcpi.tcpi_advmss, tcpi.tcpi_pmtu);
64
65 if (tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000))
66 {
67 send_msg (NDI_RED, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)");
68 write_outputbuffer ();
69
70 LOG (llevDebug, "connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd,
71 (unsigned)tcpi.tcpi_last_ack_recv, (unsigned)tcpi.tcpi_last_data_sent, (unsigned)tcpi.tcpi_unacked);
72 destroy ();
73 }
74 }
75 }
76#endif
77 45
78 /** 46 /**
79 * Writes data to socket. 47 * Writes data to socket.
80 * 48 *
81 * When the socket is clear to write, and we have backlogged data, this 49 * When the socket is clear to write, and we have backlogged data, this
… …
164 if (inbuf_len >= 2 + pkt_len) 132 if (inbuf_len >= 2 + pkt_len)
165 return 2 + pkt_len; 133 return 2 + pkt_len;
166 134
167 if (inbuf_len == sizeof (inbuf)) 135 if (inbuf_len == sizeof (inbuf))
168 { 136 {
169 send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED); 137 send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED | NDI_REPLY);
170 destroy (); 138 destroy ();
171 return -1; 139 return -1;
172 } 140 }
173 } 141 }
174 142
… …
248 { 216 {
249 data += 6; 217 data += 6;
250 len -= 6; 218 len -= 6;
251 } 219 }
252 220
253 if (len > 4 && !strncmp (data, "say " , 4)) 221 if (len > 4 && data [3] == ' ' && !strncmp (data, "say " , 4)) return true;
254 return true; 222 if (len > 5 && data [4] == ' ' && !strncmp (data, "chat " , 5)) return true;
255 if (len > 5 && !strncmp (data, "chat ", 5)) 223 if (len > 6 && data [5] == ' ' && !strncmp (data, "shout ", 6)) return true;
256 return true; 224
225 if (len == 7 && !strcmp (data, "suicide")) return true;
257 226
258 return false; 227 return false;
259} 228}
260 229
261void 230void
… …
268 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl); 237 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
269 else 238 else
270 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); 239 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
271 } 240 }
272 else 241 else
273 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED, pkt->name); 242 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name);
274} 243}
275 244
276bool 245bool
277client::handle_packet () 246client::handle_packet ()
278{ 247{
… …
319 288
320 goto next_packet; 289 goto next_packet;
321 } 290 }
322 291
323 // If we get here, we didn't find a valid command. 292 // If we get here, we didn't find a valid command.
324 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED, (char *)inbuf + 2); 293 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2);
325next_packet: 294next_packet:
326 skip_packet (pkt_len); 295 skip_packet (pkt_len);
327 296
328 // input buffer has space again 297 // input buffer has space again
329 socket_ev.poll (socket_ev.poll () | PE_R); 298 socket_ev.poll (socket_ev.poll () | PE_R);
… …
383 } 352 }
384 else 353 else
385 { 354 {
386 inbuf_len += amount; 355 inbuf_len += amount;
387 356
388 cmd_ev.start ();
389 }
390 }
391}
392
393// called whenever we have additional commands to process
394void
395client::cmd_cb (iw &w)
396{
397 if (handle_packet ()) 357 if (handle_packet ())
398 w.start (); 358 {
399 else 359 while (handle_packet ())
400 flush (); 360 ;
361
362 flush ();
363 }
364 }
365 }
401} 366}
402 367
403/******************************************************************************* 368/*******************************************************************************
404 * 369 *
405 * Start of write related routines. 370 * Start of write related routines.
… …
461client::send_packet (packet &sl) 426client::send_packet (packet &sl)
462{ 427{
463 if (destroyed ()) 428 if (destroyed ())
464 return; 429 return;
465 430
466 if (sl.length () >= MAXSOCKBUF) 431 if (sl.length () > MAXSOCKBUF)
467 { 432 {
468 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ()); 433 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());
469 /* Almost certainly we've overflowed a buffer, so quit now to make 434 /* Almost certainly we've overflowed a buffer, so quit now to make
470 * it easier to debug. 435 * it easier to debug.
471 */ 436 */
… …
519} 484}
520 485
521void 486void
522client::send_msg (int color, const char *type, const char *msg) 487client::send_msg (int color, const char *type, const char *msg)
523{ 488{
524 if (msg_is_special (msg)) 489 if (!msg || !type) // it can happen (for example, missing attack messages cause this)
490 {
491 LOG (logBacktrace | llevError, "send_msg(%d,%p,%p) called with NULL msg or type.\n", color, type, msg);
492 return;
493 }
494
495 int len = strlen (msg);
496
497 if (msg_is_special (msg) || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128))
525 cfperl_send_msg (this, color, type, msg); 498 cfperl_send_msg (this, color, type, msg);
526 else if (can_msg) 499 else if (can_msg)
527 send_packet_printf ("msg %d %s %s", color, type, msg); 500 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
528 else if (color < 0) 501 else if (color < 0)
529 return; // client cannot handle this 502 return; // client cannot handle this
530 else 503 else
531 send_packet_printf ("drawinfo %d %s", color, msg); 504 send_packet_printf ("drawinfo %d %s", color & NDI_COLOR_MASK, msg);
532} 505}
533 506
534void 507void
535client::send_drawinfo (const char *msg, int flags) 508client::send_drawinfo (const char *msg, int flags)
536{ 509{

Diff Legend

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