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.66 by root, Fri Sep 19 01:39:45 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.
… …
293 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);
294next_packet: 294next_packet:
295 skip_packet (pkt_len); 295 skip_packet (pkt_len);
296 296
297 // input buffer has space again 297 // input buffer has space again
298 socket_ev.poll (socket_ev.poll () | PE_R); 298 socket_ev.poll (socket_ev.poll () | EV_READ);
299 299
300 return true; 300 return true;
301} 301}
302 302
303// callback called when socket is either readable or writable 303// callback called when socket is either readable or writable
304void 304void
305client::socket_cb (iow &w, int got) 305client::socket_cb (iow &w, int revents)
306{ 306{
307 //TODO remove when we have better socket cleanup logic 307 //TODO remove when we have better socket cleanup logic
308 if (destroyed ()) 308 if (destroyed ())
309 { 309 {
310 socket_ev.poll (0); 310 socket_ev.poll (0);
311 return; 311 return;
312 } 312 }
313 313
314 if (got & PE_W) 314 if (revents & EV_WRITE)
315 { 315 {
316 write_outputbuffer (); 316 write_outputbuffer ();
317 317
318 if (!outputbuffer.len) 318 if (!outputbuffer.len)
319 socket_ev.poll (socket_ev.poll () & ~PE_W); 319 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
320 } 320 }
321 321
322 if (got & PE_R) 322 if (revents & EV_READ)
323 { 323 {
324 //TODO: rate-limit tcp connection in better ways, important 324 //TODO: rate-limit tcp connection in better ways, important
325 325
326 int amount = sizeof (inbuf) - inbuf_len; 326 int amount = sizeof (inbuf) - inbuf_len;
327 327
328 if (!amount) 328 if (!amount)
329 { 329 {
330 // input buffer full 330 // input buffer full
331 socket_ev.poll (socket_ev.poll () & ~PE_R); 331 socket_ev.poll (socket_ev.poll () & ~EV_READ);
332 return; 332 return;
333 } 333 }
334 334
335 amount = read (fd, inbuf + inbuf_len, amount); 335 amount = read (fd, inbuf + inbuf_len, amount);
336 336
… …
474 va_end (ap); 474 va_end (ap);
475 475
476 send_packet (sl); 476 send_packet (sl);
477} 477}
478 478
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 479void
487client::send_msg (int color, const char *type, const char *msg) 480client::send_msg (int color, const char *type, const char *msg)
488{ 481{
489 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)
490 { 483 {
… …
492 return; 485 return;
493 } 486 }
494 487
495 int len = strlen (msg); 488 int len = strlen (msg);
496 489
490 if (!(color & NDI_VERBATIM)
491 && (msg_is_special (msg)
497 if (msg_is_special (msg) || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)) 492 || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)))
498 cfperl_send_msg (this, color, type, msg); 493 cfperl_send_msg (this, color, type, msg);
499 else if (can_msg) 494 else if (can_msg)
500 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);
501 else if (color < 0) 496 else if (color < 0)
502 return; // client cannot handle this 497 return; // client cannot handle this

Diff Legend

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