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.25 by root, Sun Dec 17 19:14:00 2006 UTC vs.
Revision 1.30 by pippijn, Sat Jan 6 14:42:31 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
3 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
5 6
6 This program is free software; you can redistribute it and/or modify 7 This program is free software; you can redistribute it and/or modify
7 it under the terms of the GNU General Public License as published by 8 it under the terms of the GNU General Public License as published by
8 the Free Software Foundation; either version 2 of the License, or 9 the Free Software Foundation; either version 2 of the License, or
… …
40 41
41#ifdef __linux__ 42#ifdef __linux__
42# include <sys/types.h> 43# include <sys/types.h>
43# include <sys/socket.h> 44# include <sys/socket.h>
44# include <netinet/in.h> 45# include <netinet/in.h>
45# define TCP_HZ 1000 // sorry...
46# include <netinet/tcp.h> 46# include <netinet/tcp.h>
47#endif 47#endif
48 48
49// use a really low timeout, as it doesn't cost any bandwidth, and you can 49// use a really low timeout, as it doesn't cost any bandwidth, and you can
50// easily die in 20 seconds... 50// easily die in 20 seconds...
51#define SOCKET_TIMEOUT1 10 51#define SOCKET_TIMEOUT1 10 * 1000
52#define SOCKET_TIMEOUT2 20 52#define SOCKET_TIMEOUT2 20 * 1000
53 53
54void 54void
55client::flush () 55client::flush ()
56{ 56{
57 if (destroyed ())
58 return;
59
57#ifdef __linux__ 60#ifdef __linux__
58 // check time of last ack, and, if too old, kill connection 61 // check time of last ack, and, if too old, kill connection
59 struct tcp_info tcpi; 62 struct tcp_info tcpi;
60 socklen_t len = sizeof (tcpi); 63 socklen_t len = sizeof (tcpi);
61 64
… …
64 unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent; 67 unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent;
65 68
66 rtt = tcpi.tcpi_rtt; 69 rtt = tcpi.tcpi_rtt;
67 rttvar = tcpi.tcpi_rttvar; 70 rttvar = tcpi.tcpi_rttvar;
68 71
69 if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 * TCP_HZ < diff && diff < 0x80000000UL // ack delayed for 20s 72 if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 < diff && diff < 0x80000000UL // ack delayed for 20s
70 && SOCKET_TIMEOUT2 * TCP_HZ < tcpi.tcpi_last_data_sent) // no data sent for 10s 73 && SOCKET_TIMEOUT2 < tcpi.tcpi_last_data_sent) // no data sent for 10s
71 { 74 {
72 LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd, 75 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); 76 (unsigned) tcpi.tcpi_last_ack_recv, (unsigned) tcpi.tcpi_last_data_sent, (unsigned) tcpi.tcpi_unacked);
74 destroy (); 77 destroy ();
75 } 78 }
… …
188 {"ncom", PC(NewPlayerCmd) PF_PLAYING }, 191 {"ncom", PC(NewPlayerCmd) PF_PLAYING },
189 {"command", PC(PlayerCmd) PF_PLAYING }, 192 {"command", PC(PlayerCmd) PF_PLAYING },
190 193
191 {"examine", PC(ExamineCmd) PF_PLAYING }, 194 {"examine", PC(ExamineCmd) PF_PLAYING },
192 {"apply", PC(ApplyCmd) PF_PLAYING }, 195 {"apply", PC(ApplyCmd) PF_PLAYING },
193 {"reply", PC(ReplyCmd) PF_IMMEDIATE },
194 {"lookat", PC(LookAt) PF_PLAYING }, 196 {"lookat", PC(LookAt) PF_PLAYING },
195 {"lock", PC(LockItem) PF_PLAYING }, 197 {"lock", PC(LockItem) PF_PLAYING },
196 {"mark", PC(MarkItem) PF_PLAYING }, 198 {"mark", PC(MarkItem) PF_PLAYING },
197 {"move", PC(MoveCmd) PF_PLAYING }, 199 {"move", PC(MoveCmd) PF_PLAYING },
198 {"exti", PC(ExtCmd) PF_IMMEDIATE }, /* CF+ */
199 {"ext", PC(ExtCmd) 0 }, /* CF+ */ 200 {"ext", PC(ExtCmd) 0 }, /* CF+ */
200 {"mapredraw", PC(MapRedrawCmd) PF_IMMEDIATE }, /* Added: phil */ 201 {"mapredraw", PC(MapRedrawCmd) 0 }, /* Added: phil */
201 {"mapinfo", PC(MapInfoCmd) 0 }, /* CF+ */ 202 {"mapinfo", PC(MapInfoCmd) 0 }, /* CF+ */
202 203
204 {"reply", SC(ReplyCmd) 0 },
205 {"exti", SC(ExtiCmd) 0 }, /* CF+ */
203 {"addme", SC(AddMeCmd) PF_IMMEDIATE }, 206 {"addme", SC(AddMeCmd) 0 },
204 {"askface", SC(SendFaceCmd) PF_IMMEDIATE }, /* Added: phil */ 207 {"askface", SC(SendFaceCmd) 0 }, /* Added: phil */
205 {"requestinfo", SC(RequestInfo) PF_IMMEDIATE }, 208 {"requestinfo", SC(RequestInfo) 0 },
206 {"setfacemode", SC(SetFaceMode) PF_IMMEDIATE }, 209 {"setfacemode", SC(SetFaceMode) 0 },
207 {"setsound", SC(SetSound) PF_IMMEDIATE }, 210 {"setsound", SC(SetSound) 0 },
208 {"setup", SC(SetUp) PF_IMMEDIATE }, 211 {"setup", SC(SetUp) 0 },
209 {"version", SC(VersionCmd) PF_IMMEDIATE }, 212 {"version", SC(VersionCmd) 0 },
210 {"toggleextendedinfos", SC(ToggleExtendedInfos) PF_IMMEDIATE }, /*Added: tchize */ 213 {"toggleextendedinfos", SC(ToggleExtendedInfos) 0 }, /*Added: tchize */
211 {"toggleextendedtext", SC(ToggleExtendedText) PF_IMMEDIATE }, /*Added: tchize */ 214 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */
212 {"asksmooth", SC(AskSmooth) PF_IMMEDIATE }, /*Added: tchize (smoothing technologies) */ 215 {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */
213}; 216};
214 217
215bool 218bool
216client::may_execute (const packet_type *pkt) const 219client::may_execute (const packet_type *pkt) const
217{ 220{
218 return (!(pkt->flags & PF_PLAYER) || pl) 221 return (!(pkt->flags & PF_PLAYER) || pl)
219 && (!(pkt->flags & PF_PLAYING) || (pl && pl->state == ST_PLAYING)); 222 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING);
220} 223}
221 224
222void 225void
223client::execute (const packet_type *pkt, char *data, int datalen) 226client::execute (const packet_type *pkt, char *data, int datalen)
224{ 227{
… …
271 } 274 }
272 275
273 for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt) 276 for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt)
274 if (!strcmp ((char *)inbuf + 2, pkt->name)) 277 if (!strcmp ((char *)inbuf + 2, pkt->name))
275 { 278 {
276 if (pkt->flags & PF_IMMEDIATE) 279 if (pkt->flags & PF_PLAYER)
280 queue_command (pkt, data, datalen);
281 else
277 execute (pkt, data, datalen); 282 execute (pkt, data, datalen);
278 else
279 queue_command (pkt, data, datalen);
280 283
281 goto next_packet; 284 goto next_packet;
282 } 285 }
283 286
284 /* If we get here, we didn't find a valid command. Logging 287 // If we get here, we didn't find a valid command.
285 * this might be questionable, because a broken client/malicious
286 * user could certainly send a whole bunch of invalid commands.
287 */
288 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED, (char *)inbuf + 2); 288 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED, (char *)inbuf + 2);
289next_packet: 289next_packet:
290 skip_packet (pkt_len); 290 skip_packet (pkt_len);
291 291
292 // input buffer has space again 292 // input buffer has space again
… …
298// callback called when socket is either readable or writable 298// callback called when socket is either readable or writable
299void 299void
300client::socket_cb (iow &w, int got) 300client::socket_cb (iow &w, int got)
301{ 301{
302 //TODO remove when we have better socket cleanup logic 302 //TODO remove when we have better socket cleanup logic
303 if (status == Ns_Dead) 303 if (destroyed ())
304 { 304 {
305 socket_ev.poll (0); 305 socket_ev.poll (0);
306 return; 306 return;
307 } 307 }
308 308
… …
359 359
360// called whenever we have additional commands to process 360// called whenever we have additional commands to process
361void 361void
362client::cmd_cb (iw &w) 362client::cmd_cb (iw &w)
363{ 363{
364 if (handle_packet () || handle_command ()) 364 if (handle_packet ())
365 w.start (); 365 w.start ();
366 else 366 else
367 flush (); 367 flush ();
368} 368}
369 369
… …
384{ 384{
385 char *buf = (char *)buf_; 385 char *buf = (char *)buf_;
386 char *pos = buf; 386 char *pos = buf;
387 int amt = 0; 387 int amt = 0;
388 388
389 if (status == Ns_Dead || !buf) 389 if (destroyed () || !buf)
390 return; 390 return;
391 391
392 if ((len + outputbuffer.len) > SOCKETBUFSIZE) 392 if ((len + outputbuffer.len) > SOCKETBUFSIZE)
393 { 393 {
394 LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd); 394 LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd);
… …
425 * shortcut function. 425 * shortcut function.
426 */ 426 */
427void 427void
428client::send_packet (packet &sl) 428client::send_packet (packet &sl)
429{ 429{
430 if (status == Ns_Dead) 430 if (destroyed ())
431 return; 431 return;
432 432
433 if (sl.length () >= MAXSOCKBUF) 433 if (sl.length () >= MAXSOCKBUF)
434 { 434 {
435 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ()); 435 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());
… …
481/*********************************************************************** 481/***********************************************************************
482 * 482 *
483 * packet functions/utilities 483 * packet functions/utilities
484 * 484 *
485 **********************************************************************/ 485 **********************************************************************/
486
487packet::packet (const char *name)
488{
489 reset ();
490
491 int len = strlen (name);
492 memcpy (cur, name, len); cur += len;
493 *cur++ = ' ';
494}
486 495
487packet &packet::operator <<(const data &v) 496packet &packet::operator <<(const data &v)
488{ 497{
489 if (room () < v.len) 498 if (room () < v.len)
490 reset (); 499 reset ();

Diff Legend

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