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.48 by root, Sun Jun 24 04:09:29 2007 UTC vs.
Revision 1.54 by root, Sun Jul 29 02:24:34 2007 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (©) 1992,2007 Frank Tore Johansen 5 * Copyright (©) 1992,2007 Frank Tore Johansen
6 * 6 *
7 * Crossfire TRT is free software; you can redistribute it and/or modify it 7 * Crossfire TRT is free software: you can redistribute it and/or modify
8 * under the terms of the GNU General Public License as published by the Free 8 * it under the terms of the GNU General Public License as published by
9 * Software Foundation; either version 2 of the License, or (at your option) 9 * the Free Software Foundation, either version 3 of the License, or
10 * any later version. 10 * (at your option) any later version.
11 * 11 *
12 * This program is distributed in the hope that it will be useful, but 12 * This program is distributed in the hope that it will be useful,
13 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * for more details. 15 * GNU General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU General Public License along 17 * You should have received a copy of the GNU General Public License
18 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 * 19 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 20 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22 */ 21 */
23 22
24using namespace std; 23using namespace std;
… …
46{ 45{
47 if (destroyed ()) 46 if (destroyed ())
48 return; 47 return;
49 48
50#if HAVE_TCP_INFO 49#if HAVE_TCP_INFO
51 // check about once per second, spread evenly over all clients
52 // do this only when player is active
53 if (!((pticks + fd) & 7) && pl && pl->active)
54 {
55 // check time of last ack, and, if too old, kill connection 50 // check time of last ack, and, if too old, kill connection
56 struct tcp_info tcpi;
57 socklen_t len = sizeof (tcpi); 51 socklen_t len = sizeof (tcpi);
58 52
59 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))
60 { 54 {
61 if (tcpi.tcpi_snd_mss) 55 if (tcpi.tcpi_snd_mss)
62 mss = tcpi.tcpi_snd_mss; 56 mss = tcpi.tcpi_snd_mss;
63 57
64 rtt = tcpi.tcpi_rtt; 58#if 0
65 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
66 69
70 // do this only when player is active
71 if (pl && pl->active
67 if (tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000)) 72 && tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000))
68 { 73 {
69 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)");
70 write_outputbuffer (); 75 write_outputbuffer ();
71 76
72 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,
73 (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);
74 destroy (); 79 destroy ();
75 }
76 } 80 }
77 } 81 }
78#endif 82#endif
79 83
80 /** 84 /**
… …
166 if (inbuf_len >= 2 + pkt_len) 170 if (inbuf_len >= 2 + pkt_len)
167 return 2 + pkt_len; 171 return 2 + pkt_len;
168 172
169 if (inbuf_len == sizeof (inbuf)) 173 if (inbuf_len == sizeof (inbuf))
170 { 174 {
171 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);
172 destroy (); 176 destroy ();
173 return -1; 177 return -1;
174 } 178 }
175 } 179 }
176 180
… …
270 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl); 274 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
271 else 275 else
272 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); 276 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
273 } 277 }
274 else 278 else
275 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);
276} 280}
277 281
278bool 282bool
279client::handle_packet () 283client::handle_packet ()
280{ 284{
… …
321 325
322 goto next_packet; 326 goto next_packet;
323 } 327 }
324 328
325 // If we get here, we didn't find a valid command. 329 // If we get here, we didn't find a valid command.
326 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);
327next_packet: 331next_packet:
328 skip_packet (pkt_len); 332 skip_packet (pkt_len);
329 333
330 // input buffer has space again 334 // input buffer has space again
331 socket_ev.poll (socket_ev.poll () | PE_R); 335 socket_ev.poll (socket_ev.poll () | PE_R);
… …
524client::send_msg (int color, const char *type, const char *msg) 528client::send_msg (int color, const char *type, const char *msg)
525{ 529{
526 if (msg_is_special (msg)) 530 if (msg_is_special (msg))
527 cfperl_send_msg (this, color, type, msg); 531 cfperl_send_msg (this, color, type, msg);
528 else if (can_msg) 532 else if (can_msg)
529 send_packet_printf ("msg %d %s %s", color, type, msg); 533 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
530 else if (color < 0) 534 else if (color < 0)
531 return; // client cannot handle this 535 return; // client cannot handle this
532 else 536 else
533 send_packet_printf ("drawinfo %d %s", color, msg); 537 send_packet_printf ("drawinfo %d %s", color & NDI_COLOR_MASK, msg);
534} 538}
535 539
536void 540void
537client::send_drawinfo (const char *msg, int flags) 541client::send_drawinfo (const char *msg, int flags)
538{ 542{

Diff Legend

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