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.46 by root, Sun Jun 10 04:44:21 2007 UTC vs.
Revision 1.49 by root, Sun Jul 1 05:00:20 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;
… …
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 50 // check about once per second, spread evenly over all clients
52 if (!((pticks + fd) & 7)) 51 // do this only when player is active
52 if (!((pticks + fd) & 7) && pl && pl->active)
53 { 53 {
54 // check time of last ack, and, if too old, kill connection 54 // check time of last ack, and, if too old, kill connection
55 struct tcp_info tcpi; 55 struct tcp_info tcpi;
56 socklen_t len = sizeof (tcpi); 56 socklen_t len = sizeof (tcpi);
57 57
… …
84 */ 84 */
85 85
86 // write a nop to the socket at least every IDLE_NOP seconds. 86 // write a nop to the socket at least every IDLE_NOP seconds.
87 if (!outputbuffer.len) 87 if (!outputbuffer.len)
88 { 88 {
89 if (last_send + IDLE_PING <= NOW) 89 if (last_send + IDLE_PING <= NOW && pl && pl->active)
90 { 90 {
91 // this is a bit ugly, but map1/map1a seem to be the only 91 // this is a bit ugly, but map1/map1a seem to be the only
92 // nop'able commands and they are quite small. 92 // nop'able commands and they are quite small.
93 packet sl (mapmode == Map1Cmd ? "map1" : "map1a"); 93 packet sl (mapmode == Map1Cmd ? "map1" : "map1a");
94 send_packet (sl); 94 send_packet (sl);
… …
510 va_end (ap); 510 va_end (ap);
511 511
512 send_packet (sl); 512 send_packet (sl);
513} 513}
514 514
515void 515// returns true when the message needs special (read: perl) treatment
516client::send_drawinfo (const char *msg, int flags) 516static bool
517{ 517msg_is_special (const char *msg)
518 send_packet_printf ("drawinfo %d %s", flags, msg); 518{
519 return msg [strcspn (msg, "<[&\n")];
519} 520}
520 521
521void 522void
522client::send_msg (int color, const char *type, const char *msg) 523client::send_msg (int color, const char *type, const char *msg)
523{ 524{
525 if (msg_is_special (msg))
526 cfperl_send_msg (this, color, type, msg);
524 if (can_msg) 527 else if (can_msg)
525 send_packet_printf ("msg %d %s %s", color, type, msg); 528 send_packet_printf ("msg %d %s %s", color, type, msg);
526 else if (color < 0) 529 else if (color < 0)
527 return; // client cannot handle this 530 return; // client cannot handle this
528 else if (strchr (msg, '<') || strchr (msg, '&'))
529 {
530 //TODO: should escape/modify to old syntax
531 send_packet_printf ("drawinfo %d %s", color, msg);
532 }
533 else 531 else
534 send_packet_printf ("drawinfo %d %s", color, msg); 532 send_packet_printf ("drawinfo %d %s", color, msg);
533}
534
535void
536client::send_drawinfo (const char *msg, int flags)
537{
538 send_msg (flags, "log", msg);
535} 539}
536 540
537/*********************************************************************** 541/***********************************************************************
538 * 542 *
539 * packet functions/utilities 543 * packet functions/utilities

Diff Legend

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