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.49 by root, Sun Jul 1 05:00:20 2007 UTC vs.
Revision 1.55 by root, Sun Jul 29 13:36:40 2007 UTC

… …
45{ 45{
46 if (destroyed ()) 46 if (destroyed ())
47 return; 47 return;
48 48
49#if HAVE_TCP_INFO 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 50 // check time of last ack, and, if too old, kill connection
55 struct tcp_info tcpi;
56 socklen_t len = sizeof (tcpi); 51 socklen_t len = sizeof (tcpi);
57 52
58 if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi)) 53 if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))
59 { 54 {
60 if (tcpi.tcpi_snd_mss) 55 if (tcpi.tcpi_snd_mss)
61 mss = tcpi.tcpi_snd_mss; 56 mss = tcpi.tcpi_snd_mss;
62 57
63 rtt = tcpi.tcpi_rtt; 58#if 0
64 rttvar = tcpi.tcpi_rttvar; 59 fprintf (stderr, "uack %d ack %d lost %d ret %d fack %d sst %d cwnd %d mss %d pmtu %d advmss %d EXC %d\n",
60 tcpi.tcpi_unacked,
61 tcpi.tcpi_sacked,
62 tcpi.tcpi_lost,
63 tcpi.tcpi_retrans,
64 tcpi.tcpi_fackets,
65 tcpi.tcpi_snd_ssthresh, tcpi.tcpi_snd_cwnd, tcpi.tcpi_advmss, tcpi.tcpi_pmtu, tcpi.tcpi_advmss,
66
67 tcpi.tcpi_snd_cwnd - (tcpi.tcpi_unacked - tcpi.tcpi_sacked));
68#endif
65 69
70 // do this only when player is active
71 if (pl && pl->active
66 if (tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000)) 72 && tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000))
67 { 73 {
68 send_msg (NDI_RED, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)"); 74 send_msg (NDI_RED | NDI_REPLY, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)");
69 write_outputbuffer (); 75 write_outputbuffer ();
70 76
71 LOG (llevDebug, "connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd, 77 LOG (llevDebug, "connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd,
72 (unsigned)tcpi.tcpi_last_ack_recv, (unsigned)tcpi.tcpi_last_data_sent, (unsigned)tcpi.tcpi_unacked); 78 (unsigned)tcpi.tcpi_last_ack_recv, (unsigned)tcpi.tcpi_last_data_sent, (unsigned)tcpi.tcpi_unacked);
73 destroy (); 79 destroy ();
74 }
75 } 80 }
76 } 81 }
77#endif 82#endif
78 83
79 /** 84 /**
… …
165 if (inbuf_len >= 2 + pkt_len) 170 if (inbuf_len >= 2 + pkt_len)
166 return 2 + pkt_len; 171 return 2 + pkt_len;
167 172
168 if (inbuf_len == sizeof (inbuf)) 173 if (inbuf_len == sizeof (inbuf))
169 { 174 {
170 send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED); 175 send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED | NDI_REPLY);
171 destroy (); 176 destroy ();
172 return -1; 177 return -1;
173 } 178 }
174 } 179 }
175 180
… …
269 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl); 274 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
270 else 275 else
271 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); 276 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
272 } 277 }
273 else 278 else
274 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED, pkt->name); 279 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name);
275} 280}
276 281
277bool 282bool
278client::handle_packet () 283client::handle_packet ()
279{ 284{
… …
320 325
321 goto next_packet; 326 goto next_packet;
322 } 327 }
323 328
324 // If we get here, we didn't find a valid command. 329 // If we get here, we didn't find a valid command.
325 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED, (char *)inbuf + 2); 330 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2);
326next_packet: 331next_packet:
327 skip_packet (pkt_len); 332 skip_packet (pkt_len);
328 333
329 // input buffer has space again 334 // input buffer has space again
330 socket_ev.poll (socket_ev.poll () | PE_R); 335 socket_ev.poll (socket_ev.poll () | PE_R);
… …
462client::send_packet (packet &sl) 467client::send_packet (packet &sl)
463{ 468{
464 if (destroyed ()) 469 if (destroyed ())
465 return; 470 return;
466 471
467 if (sl.length () >= MAXSOCKBUF) 472 if (sl.length () > MAXSOCKBUF)
468 { 473 {
469 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ()); 474 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());
470 /* Almost certainly we've overflowed a buffer, so quit now to make 475 /* Almost certainly we've overflowed a buffer, so quit now to make
471 * it easier to debug. 476 * it easier to debug.
472 */ 477 */
… …
523client::send_msg (int color, const char *type, const char *msg) 528client::send_msg (int color, const char *type, const char *msg)
524{ 529{
525 if (msg_is_special (msg)) 530 if (msg_is_special (msg))
526 cfperl_send_msg (this, color, type, msg); 531 cfperl_send_msg (this, color, type, msg);
527 else if (can_msg) 532 else if (can_msg)
528 send_packet_printf ("msg %d %s %s", color, type, msg); 533 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
529 else if (color < 0) 534 else if (color < 0)
530 return; // client cannot handle this 535 return; // client cannot handle this
531 else 536 else
532 send_packet_printf ("drawinfo %d %s", color, msg); 537 send_packet_printf ("drawinfo %d %s", color & NDI_COLOR_MASK, msg);
533} 538}
534 539
535void 540void
536client::send_drawinfo (const char *msg, int flags) 541client::send_drawinfo (const char *msg, int flags)
537{ 542{

Diff Legend

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