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.62 by root, Thu Nov 8 19:43:30 2007 UTC vs.
Revision 1.72 by root, Tue Oct 13 18:20:08 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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 <support@deliantra.net> 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 */ 22 */
22 23
23using namespace std; 24using namespace std;
… …
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 && data [3] == ' ' && !strncmp (data, "say " , 4)) return true; 219 if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true;
222 if (len > 5 && data [4] == ' ' && !strncmp (data, "chat " , 5)) return true; 220 if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true;
223 if (len > 6 && data [5] == ' ' && !strncmp (data, "shout ", 6)) return true; 221 if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) 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 224
225 if (len == 7 && !strcmp (data, "suicide")) return true; 225 if (len == 7 && !strcmp (data, "suicide")) return true;
226 226
227 return false; 227 return false;
228} 228}
… …
255 pl && pl->ob ? &pl->ob->name : "[anonymous]"); 255 pl && pl->ob ? &pl->ob->name : "[anonymous]");
256 destroy (); 256 destroy ();
257 return false; 257 return false;
258 } 258 }
259 259
260 uint8_t save_byte = inbuf [pkt_len]; // rather ugly
260 inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ 261 inbuf [pkt_len] = 0; /* temporarily terminate buffer - useful for string data */
261 262
262 /* First, break out beginning word. There are at least 263 /* First, break out beginning word. There are at least
263 * a few commands that do not have any paremeters. If 264 * a few commands that do not have any paremeters. If
264 * we get such a command, don't worry about trying 265 * we get such a command, don't worry about trying
265 * to break it up. 266 * to break it up.
… …
289 goto next_packet; 290 goto next_packet;
290 } 291 }
291 292
292 // If we get here, we didn't find a valid command. 293 // If we get here, we didn't find a valid command.
293 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2); 294 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2);
295
294next_packet: 296next_packet:
297 inbuf [pkt_len] = save_byte; // rather ugly
295 skip_packet (pkt_len); 298 skip_packet (pkt_len);
296 299
297 // input buffer has space again 300 // input buffer has space again
298 socket_ev.poll (socket_ev.poll () | PE_R); 301 socket_ev.poll (socket_ev.poll () | EV_READ);
299 302
300 return true; 303 return true;
301} 304}
302 305
303// callback called when socket is either readable or writable 306// callback called when socket is either readable or writable
304void 307void
305client::socket_cb (iow &w, int got) 308client::socket_cb (iow &w, int revents)
306{ 309{
307 //TODO remove when we have better socket cleanup logic 310 //TODO remove when we have better socket cleanup logic
308 if (destroyed ()) 311 if (destroyed ())
309 { 312 {
310 socket_ev.poll (0); 313 socket_ev.poll (0);
311 return; 314 return;
312 } 315 }
313 316
314 if (got & PE_W) 317 if (revents & EV_WRITE)
315 { 318 {
316 write_outputbuffer (); 319 write_outputbuffer ();
317 320
318 if (!outputbuffer.len) 321 if (!outputbuffer.len)
319 socket_ev.poll (socket_ev.poll () & ~PE_W); 322 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
320 } 323 }
321 324
322 if (got & PE_R) 325 if (revents & EV_READ)
323 { 326 {
324 //TODO: rate-limit tcp connection in better ways, important 327 //TODO: rate-limit tcp connection in better ways, important
325 328
326 int amount = sizeof (inbuf) - inbuf_len; 329 int amount = sizeof (inbuf) - inbuf_len;
327 330
328 if (!amount) 331 if (!amount)
329 { 332 {
330 // input buffer full 333 // input buffer full
331 socket_ev.poll (socket_ev.poll () & ~PE_R); 334 socket_ev.poll (socket_ev.poll () & ~EV_READ);
332 return; 335 return;
333 } 336 }
334 337
335 amount = read (fd, inbuf + inbuf_len, amount); 338 amount = read (fd, inbuf + inbuf_len, amount);
336 339
… …
474 va_end (ap); 477 va_end (ap);
475 478
476 send_packet (sl); 479 send_packet (sl);
477} 480}
478 481
479// returns true when the message needs special (read: perl) treatment
480static bool
481msg_is_special (const char *msg)
482{
483 return msg [strcspn (msg, "<[&\n")];
484}
485
486void 482void
487client::send_msg (int color, const char *type, const char *msg) 483client::send_msg (int color, const char *type, const char *msg)
488{ 484{
489 if (!msg || !type) // it can happen (for example, missing attack messages cause this) 485 if (!msg || !type) // it can happen (for example, missing attack messages cause this)
490 { 486 {
… …
492 return; 488 return;
493 } 489 }
494 490
495 int len = strlen (msg); 491 int len = strlen (msg);
496 492
493 if (!(color & NDI_VERBATIM)
494 && (msg_is_special (msg)
497 if (msg_is_special (msg) || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)) 495 || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)))
498 cfperl_send_msg (this, color, type, msg); 496 cfperl_send_msg (this, color, type, msg);
499 else if (can_msg) 497 else
500 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg); 498 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
501 else if (color < 0)
502 return; // client cannot handle this
503 else
504 send_packet_printf ("drawinfo %d %s", color & NDI_COLOR_MASK, msg);
505} 499}
506 500
507void 501void
508client::send_drawinfo (const char *msg, int flags) 502client::send_drawinfo (const char *msg, int flags)
509{ 503{

Diff Legend

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