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.51 by root, Sat Jul 28 00:15:03 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 socklen_t len = sizeof (tcpi); 51 socklen_t len = sizeof (tcpi);
56 52
57 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))
58 { 54 {
59 if (tcpi.tcpi_snd_mss) 55 if (tcpi.tcpi_snd_mss)
60 mss = tcpi.tcpi_snd_mss; 56 mss = tcpi.tcpi_snd_mss;
61 57
62 fprintf (stderr, "uack %d sst %d cwnd %d mss %d pmtu %d\n", 58#if 0
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,
63 tcpi.tcpi_unacked, tcpi.tcpi_snd_ssthresh, tcpi.tcpi_snd_cwnd, tcpi.tcpi_advmss, tcpi.tcpi_pmtu); 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
64 69
70 // do this only when player is active
71 if (pl && pl->active
65 if (tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000)) 72 && tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000))
66 { 73 {
67 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)");
68 write_outputbuffer (); 75 write_outputbuffer ();
69 76
70 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,
71 (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);
72 destroy (); 79 destroy ();
73 }
74 } 80 }
75 } 81 }
76#endif 82#endif
77 83
78 /** 84 /**
… …
164 if (inbuf_len >= 2 + pkt_len) 170 if (inbuf_len >= 2 + pkt_len)
165 return 2 + pkt_len; 171 return 2 + pkt_len;
166 172
167 if (inbuf_len == sizeof (inbuf)) 173 if (inbuf_len == sizeof (inbuf))
168 { 174 {
169 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);
170 destroy (); 176 destroy ();
171 return -1; 177 return -1;
172 } 178 }
173 } 179 }
174 180
… …
268 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl); 274 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
269 else 275 else
270 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); 276 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
271 } 277 }
272 else 278 else
273 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);
274} 280}
275 281
276bool 282bool
277client::handle_packet () 283client::handle_packet ()
278{ 284{
… …
319 325
320 goto next_packet; 326 goto next_packet;
321 } 327 }
322 328
323 // If we get here, we didn't find a valid command. 329 // 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); 330 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2);
325next_packet: 331next_packet:
326 skip_packet (pkt_len); 332 skip_packet (pkt_len);
327 333
328 // input buffer has space again 334 // input buffer has space again
329 socket_ev.poll (socket_ev.poll () | PE_R); 335 socket_ev.poll (socket_ev.poll () | PE_R);
… …
461client::send_packet (packet &sl) 467client::send_packet (packet &sl)
462{ 468{
463 if (destroyed ()) 469 if (destroyed ())
464 return; 470 return;
465 471
466 if (sl.length () >= MAXSOCKBUF) 472 if (sl.length () > MAXSOCKBUF)
467 { 473 {
468 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 ());
469 /* 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
470 * it easier to debug. 476 * it easier to debug.
471 */ 477 */
… …
522client::send_msg (int color, const char *type, const char *msg) 528client::send_msg (int color, const char *type, const char *msg)
523{ 529{
524 if (msg_is_special (msg)) 530 if (msg_is_special (msg))
525 cfperl_send_msg (this, color, type, msg); 531 cfperl_send_msg (this, color, type, msg);
526 else if (can_msg) 532 else if (can_msg)
527 send_packet_printf ("msg %d %s %s", color, type, msg); 533 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
528 else if (color < 0) 534 else if (color < 0)
529 return; // client cannot handle this 535 return; // client cannot handle this
530 else 536 else
531 send_packet_printf ("drawinfo %d %s", color, msg); 537 send_packet_printf ("drawinfo %d %s", color & NDI_COLOR_MASK, msg);
532} 538}
533 539
534void 540void
535client::send_drawinfo (const char *msg, int flags) 541client::send_drawinfo (const char *msg, int flags)
536{ 542{

Diff Legend

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