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.74 by root, Wed Nov 11 04:45:23 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,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 1992,2007 Frank Tore Johansen
6 * 5 *
7 * Deliantra is free software: you can redistribute it and/or modify 6 * 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 7 * 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 8 * Free Software Foundation, either version 3 of the License, or (at your
10 * (at your option) any later version. 9 * option) any later version.
11 * 10 *
12 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details. 14 * GNU General Public License for more details.
16 * 15 *
17 * You should have received a copy of the GNU General Public License 16 * 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/>. 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>.
19 * 19 *
20 * The authors can be reached via e-mail to <support@deliantra.net> 20 * The authors can be reached via e-mail to <support@deliantra.net>
21 */ 21 */
22 22
23using namespace std; 23using namespace std;
… …
62 } 62 }
63 else 63 else
64 return; 64 return;
65 } 65 }
66 66
67 if (socket_ev.poll () & PE_W) 67 if (socket_ev.poll () & EV_WRITE)
68 return; 68 return;
69 69
70 last_send = NOW; 70 last_send = NOW;
71 write_outputbuffer (); 71 write_outputbuffer ();
72} 72}
… …
99 // just retry 99 // just retry
100 } 100 }
101 else if (errno == EAGAIN) 101 else if (errno == EAGAIN)
102 { 102 {
103 // delay till ready 103 // delay till ready
104 socket_ev.poll (socket_ev.poll () | PE_W); 104 socket_ev.poll (socket_ev.poll () | EV_WRITE);
105 socket_ev.start (); 105 socket_ev.start ();
106 return; 106 return;
107 } 107 }
108 else 108 else
109 { 109 {
… …
111 destroy (); 111 destroy ();
112 return; 112 return;
113 } 113 }
114 } 114 }
115 115
116 socket_ev.poll (socket_ev.poll () & ~PE_W); 116 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
117} 117}
118 118
119/****************************************************************************** 119/******************************************************************************
120 * 120 *
121 * Start of read routines. 121 * Start of read routines.
… …
180 {"reply", SC(ReplyCmd) 0 }, 180 {"reply", SC(ReplyCmd) 0 },
181 {"exti", SC(ExtiCmd) 0 }, // CF+ 181 {"exti", SC(ExtiCmd) 0 }, // CF+
182 {"addme", SC(AddMeCmd) 0 }, 182 {"addme", SC(AddMeCmd) 0 },
183 {"askface", SC(AskFaceCmd) 0 }, 183 {"askface", SC(AskFaceCmd) 0 },
184 {"requestinfo", SC(RequestInfo) 0 }, 184 {"requestinfo", SC(RequestInfo) 0 },
185 {"setfacemode", SC(SetFaceMode) 0 },
186 {"setsound", SC(SetSound) 0 }, 185 {"setsound", SC(SetSound) 0 },
187 {"setup", SC(SetUp) 0 }, 186 {"setup", SC(SetUp) 0 },
188 {"version", SC(VersionCmd) 0 }, 187 {"version", SC(VersionCmd) 0 },
189 {"toggleextendedinfos", SC(ToggleExtendedInfos) 0 }, /*Added: tchize */
190 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */ 188 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */
191 {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */
192}; 189};
193 190
194bool 191bool
195client::may_execute (const packet_type *pkt) const 192client::may_execute (const packet_type *pkt) const
196{ 193{
… …
216 { 213 {
217 data += 6; 214 data += 6;
218 len -= 6; 215 len -= 6;
219 } 216 }
220 217
221 if (len > 4 && data [3] == ' ' && !strncmp (data, "say " , 4)) return true; 218 if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true;
222 if (len > 5 && data [4] == ' ' && !strncmp (data, "chat " , 5)) return true; 219 if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true;
223 if (len > 6 && data [5] == ' ' && !strncmp (data, "shout ", 6)) return true; 220 if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) return true;
221 if (len > 8 && data [ 7] == ' ' && !strncmp (data, "suicide " , 8)) return true;
222 if (len > 18 && data [17] == ' ' && !strncmp (data, "accept-invitation ", 18)) return true;
224 223
225 if (len == 7 && !strcmp (data, "suicide")) return true; 224 if (len == 7 && !strcmp (data, "suicide")) return true;
226 225
227 return false; 226 return false;
228} 227}
… …
232{ 231{
233 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen)) 232 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen))
234 { 233 {
235 //TODO: only one format 234 //TODO: only one format
236 if (pkt->flags & PF_PLAYER) 235 if (pkt->flags & PF_PLAYER)
236 {
237 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl); 237 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
238 pl->need_updated_stats ();
239 }
238 else 240 else
239 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); 241 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
240 } 242 }
241 else 243 else
242 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name); 244 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name);
… …
255 pl && pl->ob ? &pl->ob->name : "[anonymous]"); 257 pl && pl->ob ? &pl->ob->name : "[anonymous]");
256 destroy (); 258 destroy ();
257 return false; 259 return false;
258 } 260 }
259 261
262 uint8_t save_byte = inbuf [pkt_len]; // rather ugly
260 inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ 263 inbuf [pkt_len] = 0; /* temporarily terminate buffer - useful for string data */
261 264
262 /* First, break out beginning word. There are at least 265 /* First, break out beginning word. There are at least
263 * a few commands that do not have any paremeters. If 266 * a few commands that do not have any paremeters. If
264 * we get such a command, don't worry about trying 267 * we get such a command, don't worry about trying
265 * to break it up. 268 * to break it up.
… …
289 goto next_packet; 292 goto next_packet;
290 } 293 }
291 294
292 // If we get here, we didn't find a valid command. 295 // 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); 296 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2);
297
294next_packet: 298next_packet:
299 inbuf [pkt_len] = save_byte; // rather ugly
295 skip_packet (pkt_len); 300 skip_packet (pkt_len);
296 301
297 // input buffer has space again 302 // input buffer has space again
298 socket_ev.poll (socket_ev.poll () | PE_R); 303 socket_ev.poll (socket_ev.poll () | EV_READ);
299 304
300 return true; 305 return true;
301} 306}
302 307
303// callback called when socket is either readable or writable 308// callback called when socket is either readable or writable
304void 309void
305client::socket_cb (iow &w, int got) 310client::socket_cb (iow &w, int revents)
306{ 311{
307 //TODO remove when we have better socket cleanup logic 312 //TODO remove when we have better socket cleanup logic
308 if (destroyed ()) 313 if (destroyed ())
309 { 314 {
310 socket_ev.poll (0); 315 socket_ev.poll (0);
311 return; 316 return;
312 } 317 }
313 318
314 if (got & PE_W) 319 if (revents & EV_WRITE)
315 { 320 {
316 write_outputbuffer (); 321 write_outputbuffer ();
317 322
318 if (!outputbuffer.len) 323 if (!outputbuffer.len)
319 socket_ev.poll (socket_ev.poll () & ~PE_W); 324 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
320 } 325 }
321 326
322 if (got & PE_R) 327 if (revents & EV_READ)
323 { 328 {
324 //TODO: rate-limit tcp connection in better ways, important 329 //TODO: rate-limit tcp connection in better ways, important
325 330
326 int amount = sizeof (inbuf) - inbuf_len; 331 int amount = sizeof (inbuf) - inbuf_len;
327 332
328 if (!amount) 333 if (!amount)
329 { 334 {
330 // input buffer full 335 // input buffer full
331 socket_ev.poll (socket_ev.poll () & ~PE_R); 336 socket_ev.poll (socket_ev.poll () & ~EV_READ);
332 return; 337 return;
333 } 338 }
334 339
335 amount = read (fd, inbuf + inbuf_len, amount); 340 amount = read (fd, inbuf + inbuf_len, amount);
336 341
… …
474 va_end (ap); 479 va_end (ap);
475 480
476 send_packet (sl); 481 send_packet (sl);
477} 482}
478 483
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 484void
487client::send_msg (int color, const char *type, const char *msg) 485client::send_msg (int color, const char *type, const char *msg)
488{ 486{
489 if (!msg || !type) // it can happen (for example, missing attack messages cause this) 487 if (!msg || !type) // it can happen (for example, missing attack messages cause this)
490 { 488 {
… …
492 return; 490 return;
493 } 491 }
494 492
495 int len = strlen (msg); 493 int len = strlen (msg);
496 494
495 if (!(color & NDI_VERBATIM)
496 && (msg_is_special (msg)
497 if (msg_is_special (msg) || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)) 497 || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)))
498 cfperl_send_msg (this, color, type, msg); 498 cfperl_send_msg (this, color, type, msg);
499 else if (can_msg) 499 else
500 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg); 500 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} 501}
506 502
507void 503void
508client::send_drawinfo (const char *msg, int flags) 504client::send_drawinfo (const char *msg, int flags)
509{ 505{

Diff Legend

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