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.60 by root, Mon Oct 1 01:09:10 2007 UTC vs.
Revision 1.71 by root, Mon Oct 12 14:00:59 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 7 * Deliantra is free software: you can redistribute it and/or modify it under
8 * it under the terms of the GNU General Public License as published by 8 * the terms of the Affero GNU General Public License as published by the
9 * the Free Software Foundation, either version 3 of the License, or 9 * Free Software Foundation, either version 3 of the License, or (at your
10 * (at your option) any later version. 10 * option) any later version.
11 * 11 *
12 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License 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 17 * You should have received a copy of the Affero GNU General Public License
18 * along with this program. If not, see <http://www.gnu.org/licenses/>. 18 * and the GNU General Public License along with this program. If not, see
19 * <http://www.gnu.org/licenses/>.
19 * 20 *
20 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 */ 22 */
22 23
23using namespace std; 24using namespace std;
24 25
25#include <global.h> 26#include <global.h>
… …
62 } 63 }
63 else 64 else
64 return; 65 return;
65 } 66 }
66 67
67 if (socket_ev.poll () & PE_W) 68 if (socket_ev.poll () & EV_WRITE)
68 return; 69 return;
69 70
70 last_send = NOW; 71 last_send = NOW;
71 write_outputbuffer (); 72 write_outputbuffer ();
72} 73}
… …
99 // just retry 100 // just retry
100 } 101 }
101 else if (errno == EAGAIN) 102 else if (errno == EAGAIN)
102 { 103 {
103 // delay till ready 104 // delay till ready
104 socket_ev.poll (socket_ev.poll () | PE_W); 105 socket_ev.poll (socket_ev.poll () | EV_WRITE);
105 socket_ev.start (); 106 socket_ev.start ();
106 return; 107 return;
107 } 108 }
108 else 109 else
109 { 110 {
… …
111 destroy (); 112 destroy ();
112 return; 113 return;
113 } 114 }
114 } 115 }
115 116
116 socket_ev.poll (socket_ev.poll () & ~PE_W); 117 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
117} 118}
118 119
119/****************************************************************************** 120/******************************************************************************
120 * 121 *
121 * Start of read routines. 122 * Start of read routines.
… …
180 {"reply", SC(ReplyCmd) 0 }, 181 {"reply", SC(ReplyCmd) 0 },
181 {"exti", SC(ExtiCmd) 0 }, // CF+ 182 {"exti", SC(ExtiCmd) 0 }, // CF+
182 {"addme", SC(AddMeCmd) 0 }, 183 {"addme", SC(AddMeCmd) 0 },
183 {"askface", SC(AskFaceCmd) 0 }, 184 {"askface", SC(AskFaceCmd) 0 },
184 {"requestinfo", SC(RequestInfo) 0 }, 185 {"requestinfo", SC(RequestInfo) 0 },
185 {"setfacemode", SC(SetFaceMode) 0 },
186 {"setsound", SC(SetSound) 0 }, 186 {"setsound", SC(SetSound) 0 },
187 {"setup", SC(SetUp) 0 }, 187 {"setup", SC(SetUp) 0 },
188 {"version", SC(VersionCmd) 0 }, 188 {"version", SC(VersionCmd) 0 },
189 {"toggleextendedinfos", SC(ToggleExtendedInfos) 0 }, /*Added: tchize */
190 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */ 189 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */
191 {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */
192}; 190};
193 191
194bool 192bool
195client::may_execute (const packet_type *pkt) const 193client::may_execute (const packet_type *pkt) const
196{ 194{
… …
216 { 214 {
217 data += 6; 215 data += 6;
218 len -= 6; 216 len -= 6;
219 } 217 }
220 218
221 if (len > 4 && !strncmp (data, "say " , 4)) 219 if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true;
222 return true; 220 if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true;
223 if (len > 5 && !strncmp (data, "chat ", 5)) 221 if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) return true;
224 return true; 222 if (len > 8 && data [ 7] == ' ' && !strncmp (data, "suicide " , 8)) return true;
223 if (len > 18 && data [17] == ' ' && !strncmp (data, "accept-invitation ", 18)) return true;
224
225 if (len == 7 && !strcmp (data, "suicide")) return true;
225 226
226 return false; 227 return false;
227} 228}
228 229
229void 230void
… …
292 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2); 293 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2);
293next_packet: 294next_packet:
294 skip_packet (pkt_len); 295 skip_packet (pkt_len);
295 296
296 // input buffer has space again 297 // input buffer has space again
297 socket_ev.poll (socket_ev.poll () | PE_R); 298 socket_ev.poll (socket_ev.poll () | EV_READ);
298 299
299 return true; 300 return true;
300} 301}
301 302
302// callback called when socket is either readable or writable 303// callback called when socket is either readable or writable
303void 304void
304client::socket_cb (iow &w, int got) 305client::socket_cb (iow &w, int revents)
305{ 306{
306 //TODO remove when we have better socket cleanup logic 307 //TODO remove when we have better socket cleanup logic
307 if (destroyed ()) 308 if (destroyed ())
308 { 309 {
309 socket_ev.poll (0); 310 socket_ev.poll (0);
310 return; 311 return;
311 } 312 }
312 313
313 if (got & PE_W) 314 if (revents & EV_WRITE)
314 { 315 {
315 write_outputbuffer (); 316 write_outputbuffer ();
316 317
317 if (!outputbuffer.len) 318 if (!outputbuffer.len)
318 socket_ev.poll (socket_ev.poll () & ~PE_W); 319 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
319 } 320 }
320 321
321 if (got & PE_R) 322 if (revents & EV_READ)
322 { 323 {
323 //TODO: rate-limit tcp connection in better ways, important 324 //TODO: rate-limit tcp connection in better ways, important
324 325
325 int amount = sizeof (inbuf) - inbuf_len; 326 int amount = sizeof (inbuf) - inbuf_len;
326 327
327 if (!amount) 328 if (!amount)
328 { 329 {
329 // input buffer full 330 // input buffer full
330 socket_ev.poll (socket_ev.poll () & ~PE_R); 331 socket_ev.poll (socket_ev.poll () & ~EV_READ);
331 return; 332 return;
332 } 333 }
333 334
334 amount = read (fd, inbuf + inbuf_len, amount); 335 amount = read (fd, inbuf + inbuf_len, amount);
335 336
… …
473 va_end (ap); 474 va_end (ap);
474 475
475 send_packet (sl); 476 send_packet (sl);
476} 477}
477 478
478// returns true when the message needs special (read: perl) treatment
479static bool
480msg_is_special (const char *msg)
481{
482 return msg [strcspn (msg, "<[&\n")];
483}
484
485void 479void
486client::send_msg (int color, const char *type, const char *msg) 480client::send_msg (int color, const char *type, const char *msg)
487{ 481{
488 if (!msg || !type) // it can happen (for example, missing attack messages cause this) 482 if (!msg || !type) // it can happen (for example, missing attack messages cause this)
489 { 483 {
… …
491 return; 485 return;
492 } 486 }
493 487
494 int len = strlen (msg); 488 int len = strlen (msg);
495 489
490 if (!(color & NDI_VERBATIM)
491 && (msg_is_special (msg)
496 if (msg_is_special (msg) || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)) 492 || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)))
497 cfperl_send_msg (this, color, type, msg); 493 cfperl_send_msg (this, color, type, msg);
498 else if (can_msg) 494 else
499 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg); 495 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
500 else if (color < 0)
501 return; // client cannot handle this
502 else
503 send_packet_printf ("drawinfo %d %s", color & NDI_COLOR_MASK, msg);
504} 496}
505 497
506void 498void
507client::send_drawinfo (const char *msg, int flags) 499client::send_drawinfo (const char *msg, int flags)
508{ 500{

Diff Legend

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