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.69 by root, Sun Dec 28 06:59:27 2008 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
8 * 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
9 * the Free Software Foundation, either version 3 of the License, or 9 * the Free Software Foundation, either version 3 of the License, or
… …
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{
… …
293 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2); 290 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2);
294next_packet: 291next_packet:
295 skip_packet (pkt_len); 292 skip_packet (pkt_len);
296 293
297 // input buffer has space again 294 // input buffer has space again
298 socket_ev.poll (socket_ev.poll () | PE_R); 295 socket_ev.poll (socket_ev.poll () | EV_READ);
299 296
300 return true; 297 return true;
301} 298}
302 299
303// callback called when socket is either readable or writable 300// callback called when socket is either readable or writable
304void 301void
305client::socket_cb (iow &w, int got) 302client::socket_cb (iow &w, int revents)
306{ 303{
307 //TODO remove when we have better socket cleanup logic 304 //TODO remove when we have better socket cleanup logic
308 if (destroyed ()) 305 if (destroyed ())
309 { 306 {
310 socket_ev.poll (0); 307 socket_ev.poll (0);
311 return; 308 return;
312 } 309 }
313 310
314 if (got & PE_W) 311 if (revents & EV_WRITE)
315 { 312 {
316 write_outputbuffer (); 313 write_outputbuffer ();
317 314
318 if (!outputbuffer.len) 315 if (!outputbuffer.len)
319 socket_ev.poll (socket_ev.poll () & ~PE_W); 316 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
320 } 317 }
321 318
322 if (got & PE_R) 319 if (revents & EV_READ)
323 { 320 {
324 //TODO: rate-limit tcp connection in better ways, important 321 //TODO: rate-limit tcp connection in better ways, important
325 322
326 int amount = sizeof (inbuf) - inbuf_len; 323 int amount = sizeof (inbuf) - inbuf_len;
327 324
328 if (!amount) 325 if (!amount)
329 { 326 {
330 // input buffer full 327 // input buffer full
331 socket_ev.poll (socket_ev.poll () & ~PE_R); 328 socket_ev.poll (socket_ev.poll () & ~EV_READ);
332 return; 329 return;
333 } 330 }
334 331
335 amount = read (fd, inbuf + inbuf_len, amount); 332 amount = read (fd, inbuf + inbuf_len, amount);
336 333
… …
474 va_end (ap); 471 va_end (ap);
475 472
476 send_packet (sl); 473 send_packet (sl);
477} 474}
478 475
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 476void
487client::send_msg (int color, const char *type, const char *msg) 477client::send_msg (int color, const char *type, const char *msg)
488{ 478{
489 if (!msg || !type) // it can happen (for example, missing attack messages cause this) 479 if (!msg || !type) // it can happen (for example, missing attack messages cause this)
490 { 480 {
… …
492 return; 482 return;
493 } 483 }
494 484
495 int len = strlen (msg); 485 int len = strlen (msg);
496 486
487 if (!(color & NDI_VERBATIM)
488 && (msg_is_special (msg)
497 if (msg_is_special (msg) || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)) 489 || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)))
498 cfperl_send_msg (this, color, type, msg); 490 cfperl_send_msg (this, color, type, msg);
499 else if (can_msg) 491 else
500 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg); 492 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} 493}
506 494
507void 495void
508client::send_drawinfo (const char *msg, int flags) 496client::send_drawinfo (const char *msg, int flags)
509{ 497{

Diff Legend

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