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.39 by root, Mon Apr 23 19:10:17 2007 UTC vs.
Revision 1.91 by root, Thu Nov 8 02:50:14 2012 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 1992 Frank Tore Johansen
6 * 5 *
7 * This program 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 2 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, write to the Free Software 17 * and the GNU General Public License along with this program. If not, see
19 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 18 * <http://www.gnu.org/licenses/>.
20 * 19 *
21 * The author can be reached via e-mail to mark@pyramid.com 20 * The authors can be reached via e-mail to <support@deliantra.net>
22 */
23
24/**
25 * \file
26 * Low-level socket-related functions.
27 *
28 * \date 2003-12-02
29 *
30 * Contains some base functions that both the client and server
31 * can use. As such, depending what we are being compiled for will
32 * determine what we can include. the client is designed have
33 * CFCLIENT defined as part of its compile flags.
34 */ 21 */
35 22
36using namespace std; 23using namespace std;
37 24
38#include <global.h> 25#include <global.h>
39#include <sproto.h> 26#include <sproto.h>
40#include <cstdarg> 27#include <cstdarg>
41 28
42#ifdef __linux__ 29#if HAVE_TCP_INFO
43# include <sys/types.h> 30# include <sys/types.h>
44# include <sys/socket.h> 31# include <sys/socket.h>
45# include <netinet/in.h> 32# include <netinet/in.h>
46# include <netinet/tcp.h> 33# include <netinet/tcp.h>
47#endif 34#endif
48 35
49// use a really low timeout, as it doesn't cost any bandwidth, and you can 36// force a packet when idle for more than this many seconds,
50// easily die in 20 seconds... 37// forcing an ack regularly.
51#define SOCKET_TIMEOUT1 10 * 1000 38#define IDLE_PING 2.
52#define SOCKET_TIMEOUT2 20 * 1000
53 39
54void 40void
55client::flush () 41client::flush ()
56{ 42{
57 if (destroyed ()) 43 if (destroyed ())
58 return; 44 return;
59
60#ifdef __linux__
61 // check time of last ack, and, if too old, kill connection
62 struct tcp_info tcpi;
63 socklen_t len = sizeof (tcpi);
64
65 if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))
66 {
67 unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent;
68
69 rtt = tcpi.tcpi_rtt;
70 rttvar = tcpi.tcpi_rttvar;
71
72 if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 < diff && diff < 0x80000000UL // ack delayed for 20s
73 && SOCKET_TIMEOUT2 < tcpi.tcpi_last_data_sent) // no data sent for 10s
74 {
75 LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd,
76 (unsigned) tcpi.tcpi_last_ack_recv, (unsigned) tcpi.tcpi_last_data_sent, (unsigned) tcpi.tcpi_unacked);
77 destroy ();
78 }
79 }
80#endif
81 45
82 /** 46 /**
83 * Writes data to socket. 47 * Writes data to socket.
84 * 48 *
85 * When the socket is clear to write, and we have backlogged data, this 49 * When the socket is clear to write, and we have backlogged data, this
86 * is called to write it out. 50 * is called to write it out.
87 */ 51 */
88 52
89 if (!outputbuffer.len || socket_ev.poll () & PE_W) 53 // write a nop to the socket at least every IDLE_PING seconds.
54 if (!outputbuffer.len)
55 {
56 if (last_send + IDLE_PING <= NOW && pl && pl->active)
57 {
58 // this is a bit ugly, but map1a seems to be the only
59 // nop'able command and it is quite small.
60 packet sl ("map1a");
61 send_packet (sl);
62 }
63 else
64 return;
65 }
66
67 if (socket_ev.poll () & EV_WRITE)
90 return; 68 return;
91 69
70 last_send = NOW;
92 write_outputbuffer (); 71 write_outputbuffer ();
93} 72}
94 73
95void 74void
96client::write_outputbuffer () 75client::write_outputbuffer ()
… …
106 /* wrap back to start of buffer */ 85 /* wrap back to start of buffer */
107 if (outputbuffer.start == SOCKETBUFSIZE) 86 if (outputbuffer.start == SOCKETBUFSIZE)
108 outputbuffer.start = 0; 87 outputbuffer.start = 0;
109 88
110 outputbuffer.len -= res; 89 outputbuffer.len -= res;
111#ifdef CS_LOGSTATS
112 cst_tot.obytes += res;
113 cst_lst.obytes += res;
114#endif
115 } 90 }
116 else if (res == 0) 91 else if (res == 0)
117 { 92 {
118 LOG (llevError, "socket write failed, connection closed.\n"); 93 LOG (llevError, "socket write failed, connection closed.\n");
119 destroy (); 94 destroy ();
… …
124 // just retry 99 // just retry
125 } 100 }
126 else if (errno == EAGAIN) 101 else if (errno == EAGAIN)
127 { 102 {
128 // delay till ready 103 // delay till ready
129 socket_ev.poll (socket_ev.poll () | PE_W); 104 socket_ev.poll (socket_ev.poll () | EV_WRITE);
130 socket_ev.start (); 105 socket_ev.start ();
131 return; 106 return;
132 } 107 }
133 else 108 else
134 { 109 {
… …
136 destroy (); 111 destroy ();
137 return; 112 return;
138 } 113 }
139 } 114 }
140 115
141 socket_ev.poll (socket_ev.poll () & ~PE_W); 116 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
142} 117}
143 118
144/****************************************************************************** 119/******************************************************************************
145 * 120 *
146 * Start of read routines. 121 * Start of read routines.
… …
157 if (inbuf_len >= 2 + pkt_len) 132 if (inbuf_len >= 2 + pkt_len)
158 return 2 + pkt_len; 133 return 2 + pkt_len;
159 134
160 if (inbuf_len == sizeof (inbuf)) 135 if (inbuf_len == sizeof (inbuf))
161 { 136 {
162 send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED); 137 send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED | NDI_REPLY);
163 destroy (); 138 destroy ();
164 return -1; 139 return -1;
165 } 140 }
166 } 141 }
167 142
… …
181 ****************************************************************************/ 156 ****************************************************************************/
182 157
183// SocketCommand, PlayingCommand, should not exist with those ugly casts 158// SocketCommand, PlayingCommand, should not exist with those ugly casts
184#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb), 159#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb),
185#define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER | 160#define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER |
161
162static void
163NopCmd (char *, int, client *)
164{
165 // do nothing
166}
186 167
187/** 168/**
188 * Dispatch table for the server. 169 * Dispatch table for the server.
189 */ 170 */
190static struct packet_type packets[] = { 171static struct packet_type packets[] = {
… …
196 {"apply", PC(ApplyCmd) PF_PLAYING }, 177 {"apply", PC(ApplyCmd) PF_PLAYING },
197 {"lookat", PC(LookAt) PF_PLAYING }, 178 {"lookat", PC(LookAt) PF_PLAYING },
198 {"lock", PC(LockItem) PF_PLAYING }, 179 {"lock", PC(LockItem) PF_PLAYING },
199 {"mark", PC(MarkItem) PF_PLAYING }, 180 {"mark", PC(MarkItem) PF_PLAYING },
200 {"move", PC(MoveCmd) PF_PLAYING }, 181 {"move", PC(MoveCmd) PF_PLAYING },
201 {"ext", PC(ExtCmd) 0 }, // CF+ 182 {"ext", PC(ExtCmd) 0 }, // CF+/Deliantra
202 {"mapredraw", PC(MapRedrawCmd) 0 }, 183 {"mapredraw", PC(MapRedrawCmd) 0 },
203 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+ 184 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+/Deliantra
204 185
205 {"reply", SC(ReplyCmd) 0 }, 186 {"reply", SC(ReplyCmd) 0 },
206 {"exti", SC(ExtiCmd) 0 }, // CF+ 187 {"exti", SC(ExtiCmd) 0 }, // CF+/Deliantra
207 {"addme", SC(AddMeCmd) 0 }, 188 {"addme", SC(AddMeCmd) 0 },
208 {"askface", SC(AskFaceCmd) 0 }, 189 {"askface", SC(AskFaceCmd) 0 },
209 {"requestinfo", SC(RequestInfo) 0 }, 190 {"requestinfo", SC(RequestInfo) 0 },
210 {"setfacemode", SC(SetFaceMode) 0 },
211 {"setsound", SC(SetSound) 0 }, 191 {"setsound", SC(SetSound) 0 },
212 {"setup", SC(SetUp) 0 }, 192 {"setup", SC(SetUp) 0 },
213 {"version", SC(VersionCmd) 0 }, 193 {"version", SC(VersionCmd) 0 },
214 {"toggleextendedinfos", SC(ToggleExtendedInfos) 0 }, /*Added: tchize */ 194
215 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */ 195 {"toggleextendedtext", SC(NopCmd) 0 }, // deliantra: disabled
216 {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */
217}; 196};
218 197
219bool 198bool
220client::may_execute (const packet_type *pkt) const 199client::may_execute (const packet_type *pkt) const
221{ 200{
222 return (!(pkt->flags & PF_PLAYER) || pl) 201 return (!(pkt->flags & PF_PLAYER) || pl)
223 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING); 202 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING);
224} 203}
225 204
226// HACK: some commands currently should be executed 205// HACK: some commands currently should be executed
227// even when the player is frozen. this hack detects 206// even when the player is frozen. this hack detects
228// those commands. it should be folded into may_execute, 207// those commands. it should be folded into may_execute,
229// but kept seperate to emphasise the hack aspect, i.e. 208// but kept seperate to emphasise the hack aspect, i.e.
230// do it better, then remove. 209// do it better, then remove.
231static bool 210static bool
… …
241 { 220 {
242 data += 6; 221 data += 6;
243 len -= 6; 222 len -= 6;
244 } 223 }
245 224
246 if (len > 4 && !strncmp (data, "say " , 4)) 225 if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true;
247 return true; 226 if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true;
248 if (len > 5 && !strncmp (data, "chat ", 5)) 227 if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) return true;
249 return true; 228 if (len > 8 && data [ 7] == ' ' && !strncmp (data, "suicide " , 8)) return true;
229 if (len > 18 && data [17] == ' ' && !strncmp (data, "accept-invitation ", 18)) return true;
230
231 if (len == 7 && !strcmp (data, "suicide")) return true;
250 232
251 return false; 233 return false;
252} 234}
253 235
254void 236void
… …
256{ 238{
257 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen)) 239 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen))
258 { 240 {
259 //TODO: only one format 241 //TODO: only one format
260 if (pkt->flags & PF_PLAYER) 242 if (pkt->flags & PF_PLAYER)
243 {
261 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl); 244 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
245 pl->need_updated_stats ();
246 }
262 else 247 else
263 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); 248 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
264 } 249 }
265 else 250 else
266 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED, pkt->name); 251 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name);
267} 252}
268 253
269bool 254bool
270client::handle_packet () 255client::handle_packet ()
271{ 256{
… …
279 pl && pl->ob ? &pl->ob->name : "[anonymous]"); 264 pl && pl->ob ? &pl->ob->name : "[anonymous]");
280 destroy (); 265 destroy ();
281 return false; 266 return false;
282 } 267 }
283 268
269 uint8_t save_byte = inbuf [pkt_len]; // rather ugly
284 inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ 270 inbuf [pkt_len] = 0; /* temporarily terminate buffer - useful for string data */
285 271
286 /* First, break out beginning word. There are at least 272 /* First, break out beginning word. There are at least
287 * a few commands that do not have any paremeters. If 273 * a few commands that do not have any paremeters. If
288 * we get such a command, don't worry about trying 274 * we get such a command, don't worry about trying
289 * to break it up. 275 * to break it up.
… …
300 { 286 {
301 data = (char *)inbuf + 2; // better read garbage than segfault 287 data = (char *)inbuf + 2; // better read garbage than segfault
302 datalen = 0; 288 datalen = 0;
303 } 289 }
304 290
305 for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt) 291 for (packet_type *pkt = packets; pkt < packets + array_length (packets); ++pkt)
306 if (!strcmp ((char *)inbuf + 2, pkt->name)) 292 if (!strcmp ((char *)inbuf + 2, pkt->name))
307 { 293 {
308 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen)) 294 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen))
309 queue_command (pkt, data, datalen); 295 queue_command (pkt, data, datalen);
310 else 296 else
… …
312 298
313 goto next_packet; 299 goto next_packet;
314 } 300 }
315 301
316 // If we get here, we didn't find a valid command. 302 // If we get here, we didn't find a valid command.
317 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED, (char *)inbuf + 2); 303 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2);
304
318next_packet: 305next_packet:
306 inbuf [pkt_len] = save_byte; // rather ugly
319 skip_packet (pkt_len); 307 skip_packet (pkt_len);
320 308
321 // input buffer has space again 309 // input buffer has space again
322 socket_ev.poll (socket_ev.poll () | PE_R); 310 socket_ev.poll (socket_ev.poll () | EV_READ);
323 311
324 return true; 312 return true;
325} 313}
326 314
315void
316client::inbuf_handle ()
317{
318 if (!handle_packet ())
319 return;
320
321 while (handle_packet ())
322 ;
323
324 flush ();
325}
326
327// callback called when socket is either readable or writable 327// callback called when socket is either readable or writable
328void 328void
329client::socket_cb (iow &w, int got) 329client::socket_cb (iow &w, int revents)
330{ 330{
331 //TODO remove when we have better socket cleanup logic 331 //TODO remove when we have better socket cleanup logic
332 if (destroyed ()) 332 if (destroyed ())
333 { 333 {
334 socket_ev.poll (0); 334 socket_ev.poll (0);
335 return; 335 return;
336 } 336 }
337 337
338 if (got & PE_W) 338 if (revents & EV_WRITE)
339 { 339 {
340 write_outputbuffer (); 340 write_outputbuffer ();
341 341
342 if (!outputbuffer.len) 342 if (!outputbuffer.len)
343 socket_ev.poll (socket_ev.poll () & ~PE_W); 343 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
344 }
345
346 if (got & PE_R)
347 { 344 }
348 //TODO: rate-limit tcp connection in better ways, important
349 345
346 if (revents & EV_READ)
347 {
348 int amount;
349 uint8 *rbuf;
350
351 if (ws_version)
352 {
353 if (ws_inbuf_len + 2048 > ws_inbuf_alloc)
354 ws_inbuf = (uint8 *)realloc (ws_inbuf, ws_inbuf_alloc += 4096);
355
356 rbuf = ws_inbuf + ws_inbuf_len;
357 amount = ws_inbuf_alloc - ws_inbuf_len;
358 }
359 else
360 {
361 rbuf = inbuf + inbuf_len;
350 int amount = sizeof (inbuf) - inbuf_len; 362 amount = sizeof (inbuf) - inbuf_len;
363 }
351 364
352 if (!amount) 365 if (!amount)
353 { 366 {
354 // input buffer full 367 // input buffer full
355 socket_ev.poll (socket_ev.poll () & ~PE_R); 368 LOG (llevError, "input buffer overflow.");
369 destroy ();
356 return; 370 return;
357 } 371 }
358 372
359 amount = read (fd, inbuf + inbuf_len, amount); 373 amount = read (fd, rbuf, amount);
360 374
361 if (!amount) 375 if (!amount)
362 { 376 {
363 destroy (); 377 destroy ();
364 return; 378 return;
… …
372 return; 386 return;
373 } 387 }
374 388
375 // should not be here, normally 389 // should not be here, normally
376 } 390 }
391
392 if (ws_version)
393 {
394 ws_inbuf_len += amount;
395
396 while (ws_inbuf_len)
397 {
398 if (ws_inbuf_len < 2 + 4) // 6 is minimum length: op, len, mask
399 break;
400
401 int d = 2;
402 int fin = ws_inbuf [0] & 0x80;
403 int op = ws_inbuf [0] & 0x0f;
404 int len = ws_inbuf [1] & 0x7f;
405
406 if (len == 126)
407 {
408 len = (ws_inbuf [2] << 8) | ws_inbuf [3];
409 d += 2;
410 }
411 else if (len == 127)
412 {
413 if (ws_inbuf_len < 2 + 8)
414 return;
415
416 // we don't do extra long frames, if a browser wants to send >2**32 bytes,
417 // there are bigger issues to fix.
418 len = (ws_inbuf [8] << 8) | ws_inbuf [9];
419 d += 8;
420 }
421
422 // we only continue if we have a complete frame
423 if (ws_inbuf_len < d + 4 + len)
424 return;
425
426 switch (op)
427 {
428 case 0: op = ws_inbuf_type; break; // continuation
429 case 1: ws_inbuf_type = 1; break; // utf-8
430 case 2: ws_inbuf_type = 2; break; // binary
431 }
432
433 if (len > sizeof (inbuf) - inbuf_len)
434 {
435 // input buffer full
436 LOG (llevError, "input buffer overflow (ws).");
437 destroy ();
438 return;
439 }
440
441 uint8 *buf = inbuf + inbuf_len + 2;
442
443 for (int i = 0; i < len; ++i)
444 buf [i] = ws_inbuf [d + 4 + i] ^ ws_inbuf [d + (i & 3)];
445
446 // remove frame
447 ws_inbuf_len -= d + 4 + len;
448 memmove (ws_inbuf, ws_inbuf + d + 4 + len, ws_inbuf_len);
449
450 switch (op)
451 {
452 case 1: // utf-8
453 // utf-8 encoded frames cannot have full length (MAXSOCKBUF) in all cases
454 // but we assume that these extra-long packets will be rare.
455 {
456 uint8 *a = buf;
457 uint8 *b = a;
458 uint8 *c = a + len;
459
460 for (; a < c; ++a, ++b)
461 {
462 *b = *a;
463
464 if (*a >= 0x80)
465 *b = (a [0] & 0x1f) << 6 | (a [1] & 0x3f), ++a;
466 }
467
468 len -= a - b;
469 }
470 /* FALLTHROUGH */
471 case 2: // binary
472 inbuf_len += len;
473
474 if (fin)
475 {
476 inbuf [0] = inbuf_len >> 8;
477 inbuf [1] = inbuf_len;
478
479 inbuf_len += 2;
480
481 inbuf_handle ();
482 }
483 break;
484
485 case 9: // ping
486 {
487 // send pong - we assume ping messages are <64k
488 // as we can't handle >10k at the moment anyway.
489 uint8 hdr [] = { 0x8a, 126, len >> 8, len };
490 send (hdr, sizeof (hdr));
491 send (inbuf + inbuf_len, len);
492 }
493 break;
494
495 case 10: // pong
496 break;
497
498 case 8: // close
499 default:
500 destroy ();
501 return;
502 }
503 }
504 }
377 else 505 else
378 { 506 {
379 inbuf_len += amount; 507 inbuf_len += amount;
380 508 inbuf_handle ();
381 cst_tot.ibytes += amount;
382 cst_lst.ibytes += amount;
383
384 cmd_ev.start ();
385 } 509 }
386 } 510 }
387}
388
389// called whenever we have additional commands to process
390void
391client::cmd_cb (iw &w)
392{
393 if (handle_packet ())
394 w.start ();
395 else
396 flush ();
397} 511}
398 512
399/******************************************************************************* 513/*******************************************************************************
400 * 514 *
401 * Start of write related routines. 515 * Start of write related routines.
… …
457client::send_packet (packet &sl) 571client::send_packet (packet &sl)
458{ 572{
459 if (destroyed ()) 573 if (destroyed ())
460 return; 574 return;
461 575
462 if (sl.length () >= MAXSOCKBUF) 576 if (sl.length () > MAXSOCKBUF)
463 { 577 {
464 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ()); 578 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());
465 /* Almost certainly we've overflowed a buffer, so quit now to make 579 /* Almost certainly we've overflowed a buffer, so quit now to make
466 * it easier to debug. 580 * it easier to debug.
467 */ 581 */
… …
469 } 583 }
470 584
471 if (!sl.length ()) 585 if (!sl.length ())
472 return; 586 return;
473 587
588 if (ws_version == 8)
589 {
590 static uint8 buf [MAXSOCKBUF * 2 + 4];
591
592 uint8 *b = buf + 4;
593 for (uint8 *a = sl.buf_ + sl.hdrlen; a < sl.cur; ++a)
594 {
595 if (*a < 0x80)
596 *b++ = *a;
597 else
598 {
599 *b++ = 0xc0 | ((*a >> 6) & 0x1f);
600 *b++ = 0x80 | ( *a & 0x3f);
601 }
602 }
603
604 assert (b - buf < sizeof (buf));
605
606 int len = b - (buf + 4);
607
608 if (len < 126)
609 {
610 buf [2] = 0x81;
611 buf [3] = len;
612
613 send (buf + 2, len + 2);
614 }
615 else
616 {
617 buf [0] = 0x81;
618 buf [1] = 126;
619 buf [2] = len >> 8;
620 buf [3] = len;
621
622 send (buf, len + 4);
623 }
624 }
625 else if (ws_version == 13)
626 {
627 int len = sl.length ();
628
629 if (len < 126)
630 {
631 uint8 hdr [] = { 0x82, len };
632 send (hdr, sizeof (hdr));
633 }
634 else
635 {
636 uint8 hdr [] = { 0x82, 126, len >> 8, len };
637 send (hdr, sizeof (hdr));
638 }
639
640 send (sl.buf_ + sl.hdrlen, len);
641 }
642 else
643 {
474 assert (sl.hdrlen == 2); 644 assert (sl.hdrlen == 2);
475 645
476 sl.buf_ [0] = sl.length () >> 8; 646 sl.buf_ [0] = sl.length () >> 8;
477 sl.buf_ [1] = sl.length () ; 647 sl.buf_ [1] = sl.length () ;
478 648
479 send (sl.buf_, sl.length () + sl.hdrlen); 649 send (sl.buf_, sl.length () + sl.hdrlen);
650 }
480} 651}
481 652
482void 653void
483client::send_packet (const char *buf, int len) 654client::send_packet (const char *buf, int len)
484{ 655{
… …
506 677
507 send_packet (sl); 678 send_packet (sl);
508} 679}
509 680
510void 681void
682client::send_msg (int color, const char *type, const char *msg)
683{
684 if (!msg || !type) // it can happen (for example, missing attack messages cause this)
685 {
686 LOG (logBacktrace | llevError, "send_msg(%d,%p,%p) called with NULL msg or type.\n", color, type, msg);
687 return;
688 }
689
690 int len = strlen (msg);
691
692 if (!(color & NDI_VERBATIM)
693 && (msg_is_special (msg)
694 || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)))
695 cfperl_send_msg (this, color, type, msg);
696 else
697 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
698}
699
700void
511client::send_drawinfo (const char *msg, int flags) 701client::send_drawinfo (const char *msg, int flags)
512{ 702{
513 send_packet_printf ("drawinfo %d %s", flags, msg); 703 send_msg (flags, "log", msg);
514} 704}
515 705
516/*********************************************************************** 706/***********************************************************************
517 * 707 *
518 * packet functions/utilities 708 * packet functions/utilities
… …
528 *cur++ = ' '; 718 *cur++ = ' ';
529} 719}
530 720
531packet &packet::operator <<(const ber32 v) 721packet &packet::operator <<(const ber32 v)
532{ 722{
533 enum { maxlen = 32 / 7 + 1}; 723 enum { maxlen = 32 / 7 + 1 };
534 uint8 buf[maxlen]; 724 uint8 buf[maxlen];
535 uint8 *p = buf + maxlen; 725 uint8 *p = buf + maxlen;
536 uint32 val = v.val; 726 uint32 val = v.val;
537 727
538 *--p = val & 0x7F; 728 *--p = val & 0x7F;
… …
590 return reset (); 780 return reset ();
591 781
592 cur += len; 782 cur += len;
593} 783}
594 784
595/******************************************************************************
596 *
597 * statistics logging functions.
598 *
599 ******************************************************************************/
600
601#ifdef CS_LOGSTATS
602
603/* cst_tot is for the life of the server, cst_last is for the last series of
604 * stats
605 */
606CS_Stats cst_tot, cst_lst;
607
608/**
609 * Writes out the gathered stats. We clear cst_lst.
610 */
611void
612write_cs_stats (void)
613{
614 time_t now = time (NULL);
615
616 /* If no connections recently, don't both to log anything */
617 if (cst_lst.ibytes == 0 && cst_lst.obytes == 0)
618 return;
619
620 /* CSSTAT is put in so scripts can easily find the line */
621 LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n",
622 ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn,
623 now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start);
624 cst_lst.ibytes = 0;
625 cst_lst.obytes = 0;
626 cst_lst.time_start = now;
627}
628#endif
629

Diff Legend

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