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.28 by root, Thu Dec 21 06:12:37 2006 UTC vs.
Revision 1.87 by root, Tue Nov 6 03:45:17 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) 1992 Frank Tore Johansen 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 5 *
6 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
7 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
8 the Free Software Foundation; either version 2 of the License, or 8 * Free Software Foundation, either version 3 of the License, or (at your
9 (at your option) any later version. 9 * option) any later version.
10 10 *
11 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,
12 but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 GNU General Public License for more details. 14 * GNU General Public License for more details.
15 15 *
16 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
17 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
18 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 18 * <http://www.gnu.org/licenses/>.
19
20 The author can be reached via e-mail to mark@pyramid.com
21*/
22
23/**
24 * \file
25 * Low-level socket-related functions.
26 * 19 *
27 * \date 2003-12-02 20 * The authors can be reached via e-mail to <support@deliantra.net>
28 *
29 * Contains some base functions that both the client and server
30 * can use. As such, depending what we are being compiled for will
31 * determine what we can include. the client is designed have
32 * CFCLIENT defined as part of its compile flags.
33 */ 21 */
34 22
35using namespace std; 23using namespace std;
36 24
37#include <global.h> 25#include <global.h>
38#include <sproto.h> 26#include <sproto.h>
39#include <cstdarg> 27#include <cstdarg>
40 28
41#ifdef __linux__ 29#if HAVE_TCP_INFO
42# include <sys/types.h> 30# include <sys/types.h>
43# include <sys/socket.h> 31# include <sys/socket.h>
44# include <netinet/in.h> 32# include <netinet/in.h>
45# include <netinet/tcp.h> 33# include <netinet/tcp.h>
46#endif 34#endif
47 35
48// 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,
49// easily die in 20 seconds... 37// forcing an ack regularly.
50#define SOCKET_TIMEOUT1 10 * 1000 38#define IDLE_PING 2.
51#define SOCKET_TIMEOUT2 20 * 1000
52 39
53void 40void
54client::flush () 41client::flush ()
55{ 42{
56#ifdef __linux__ 43 if (destroyed ())
57 // check time of last ack, and, if too old, kill connection 44 return;
58 struct tcp_info tcpi;
59 socklen_t len = sizeof (tcpi);
60
61 if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))
62 {
63 unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent;
64
65 rtt = tcpi.tcpi_rtt;
66 rttvar = tcpi.tcpi_rttvar;
67
68 if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 < diff && diff < 0x80000000UL // ack delayed for 20s
69 && SOCKET_TIMEOUT2 < tcpi.tcpi_last_data_sent) // no data sent for 10s
70 {
71 LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd,
72 (unsigned) tcpi.tcpi_last_ack_recv, (unsigned) tcpi.tcpi_last_data_sent, (unsigned) tcpi.tcpi_unacked);
73 destroy ();
74 }
75 }
76#endif
77 45
78 /** 46 /**
79 * Writes data to socket. 47 * Writes data to socket.
80 * 48 *
81 * 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
82 * is called to write it out. 50 * is called to write it out.
83 */ 51 */
84 52
85 if (!outputbuffer.len || socket_ev.poll () & PE_W) 53 // write a nop to the socket at least every IDLE_NOP 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)
86 return; 68 return;
87 69
70 last_send = NOW;
88 write_outputbuffer (); 71 write_outputbuffer ();
89} 72}
90 73
91void 74void
92client::write_outputbuffer () 75client::write_outputbuffer ()
… …
102 /* wrap back to start of buffer */ 85 /* wrap back to start of buffer */
103 if (outputbuffer.start == SOCKETBUFSIZE) 86 if (outputbuffer.start == SOCKETBUFSIZE)
104 outputbuffer.start = 0; 87 outputbuffer.start = 0;
105 88
106 outputbuffer.len -= res; 89 outputbuffer.len -= res;
107#ifdef CS_LOGSTATS
108 cst_tot.obytes += res;
109 cst_lst.obytes += res;
110#endif
111 } 90 }
112 else if (res == 0) 91 else if (res == 0)
113 { 92 {
114 LOG (llevError, "socket write failed, connection closed.\n"); 93 LOG (llevError, "socket write failed, connection closed.\n");
115 destroy (); 94 destroy ();
… …
120 // just retry 99 // just retry
121 } 100 }
122 else if (errno == EAGAIN) 101 else if (errno == EAGAIN)
123 { 102 {
124 // delay till ready 103 // delay till ready
125 socket_ev.poll (socket_ev.poll () | PE_W); 104 socket_ev.poll (socket_ev.poll () | EV_WRITE);
126 socket_ev.start (); 105 socket_ev.start ();
127 return; 106 return;
128 } 107 }
129 else 108 else
130 { 109 {
… …
132 destroy (); 111 destroy ();
133 return; 112 return;
134 } 113 }
135 } 114 }
136 115
137 socket_ev.poll (socket_ev.poll () & ~PE_W); 116 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
138} 117}
139 118
140/****************************************************************************** 119/******************************************************************************
141 * 120 *
142 * Start of read routines. 121 * Start of read routines.
… …
153 if (inbuf_len >= 2 + pkt_len) 132 if (inbuf_len >= 2 + pkt_len)
154 return 2 + pkt_len; 133 return 2 + pkt_len;
155 134
156 if (inbuf_len == sizeof (inbuf)) 135 if (inbuf_len == sizeof (inbuf))
157 { 136 {
158 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);
159 destroy (); 138 destroy ();
160 return -1; 139 return -1;
161 } 140 }
162 } 141 }
163 142
… …
178 157
179// SocketCommand, PlayingCommand, should not exist with those ugly casts 158// SocketCommand, PlayingCommand, should not exist with those ugly casts
180#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb), 159#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb),
181#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 |
182 161
162static void
163NopCmd (char *, int, client *)
164{
165 // do nothing
166}
167
183/** 168/**
184 * Dispatch table for the server. 169 * Dispatch table for the server.
185 */ 170 */
186static struct packet_type packets[] = { 171static struct packet_type packets[] = {
187 {"ncom", PC(NewPlayerCmd) PF_PLAYING }, 172 {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 },
188 {"command", PC(PlayerCmd) PF_PLAYING }, 173 {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 },
189 174
190 {"examine", PC(ExamineCmd) PF_PLAYING }, 175 {"examine", PC(ExamineCmd) PF_PLAYING },
176 {"ex", PC(ExCmd) PF_PLAYING },
191 {"apply", PC(ApplyCmd) PF_PLAYING }, 177 {"apply", PC(ApplyCmd) PF_PLAYING },
192 {"lookat", PC(LookAt) PF_PLAYING }, 178 {"lookat", PC(LookAt) PF_PLAYING },
193 {"lock", PC(LockItem) PF_PLAYING }, 179 {"lock", PC(LockItem) PF_PLAYING },
194 {"mark", PC(MarkItem) PF_PLAYING }, 180 {"mark", PC(MarkItem) PF_PLAYING },
195 {"move", PC(MoveCmd) PF_PLAYING }, 181 {"move", PC(MoveCmd) PF_PLAYING },
196 {"ext", PC(ExtCmd) 0 }, /* CF+ */ 182 {"ext", PC(ExtCmd) 0 }, // CF+/Deliantra
197 {"mapredraw", PC(MapRedrawCmd) 0 }, /* Added: phil */ 183 {"mapredraw", PC(MapRedrawCmd) 0 },
198 {"mapinfo", PC(MapInfoCmd) 0 }, /* CF+ */ 184 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+/Deliantra
199 185
200 {"reply", SC(ReplyCmd) 0 }, 186 {"reply", SC(ReplyCmd) 0 },
201 {"exti", SC(ExtiCmd) 0 }, /* CF+ */ 187 {"exti", SC(ExtiCmd) 0 }, // CF+/Deliantra
202 {"addme", SC(AddMeCmd) 0 }, 188 {"addme", SC(AddMeCmd) 0 },
203 {"askface", SC(SendFaceCmd) 0 }, /* Added: phil */ 189 {"askface", SC(AskFaceCmd) 0 },
204 {"requestinfo", SC(RequestInfo) 0 }, 190 {"requestinfo", SC(RequestInfo) 0 },
205 {"setfacemode", SC(SetFaceMode) 0 },
206 {"setsound", SC(SetSound) 0 }, 191 {"setsound", SC(SetSound) 0 },
207 {"setup", SC(SetUp) 0 }, 192 {"setup", SC(SetUp) 0 },
208 {"version", SC(VersionCmd) 0 }, 193 {"version", SC(VersionCmd) 0 },
209 {"toggleextendedinfos", SC(ToggleExtendedInfos) 0 }, /*Added: tchize */ 194
210 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */ 195 {"toggleextendedtext", SC(NopCmd) 0 }, // deliantra: disabled
211 {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */
212}; 196};
213 197
214bool 198bool
215client::may_execute (const packet_type *pkt) const 199client::may_execute (const packet_type *pkt) const
216{ 200{
217 return (!(pkt->flags & PF_PLAYER) || pl) 201 return (!(pkt->flags & PF_PLAYER) || pl)
218 && (!(pkt->flags & PF_PLAYING) || (pl && pl->state == ST_PLAYING)); 202 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING);
203}
204
205// HACK: some commands currently should be executed
206// even when the player is frozen. this hack detects
207// those commands. it should be folded into may_execute,
208// but kept seperate to emphasise the hack aspect, i.e.
209// do it better, then remove.
210static bool
211always_immediate (const client *ns, const packet_type *pkt, const char *data, int len)
212{
213 if (!(pkt->flags & (PF_COMMAND0 | PF_COMMAND6)))
214 return false;
215
216 if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map)
217 return false;
218
219 if (pkt->flags & PF_COMMAND6)
220 {
221 data += 6;
222 len -= 6;
223 }
224
225 if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true;
226 if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true;
227 if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) 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;
232
233 return false;
219} 234}
220 235
221void 236void
222client::execute (const packet_type *pkt, char *data, int datalen) 237client::execute (const packet_type *pkt, char *data, int datalen)
223{ 238{
224 if (may_execute (pkt)) 239 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen))
225 { 240 {
226 //TODO: only one format 241 //TODO: only one format
227 if (pkt->flags & PF_PLAYER) 242 if (pkt->flags & PF_PLAYER)
243 {
228 ((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 }
229 else 247 else
230 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); 248 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
231 } 249 }
232 else 250 else
233 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);
234} 252}
235 253
236bool 254bool
237client::handle_packet () 255client::handle_packet ()
238{ 256{
… …
246 pl && pl->ob ? &pl->ob->name : "[anonymous]"); 264 pl && pl->ob ? &pl->ob->name : "[anonymous]");
247 destroy (); 265 destroy ();
248 return false; 266 return false;
249 } 267 }
250 268
269 uint8_t save_byte = inbuf [pkt_len]; // rather ugly
251 inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ 270 inbuf [pkt_len] = 0; /* temporarily terminate buffer - useful for string data */
252 271
253 /* First, break out beginning word. There are at least 272 /* First, break out beginning word. There are at least
254 * a few commands that do not have any paremeters. If 273 * a few commands that do not have any paremeters. If
255 * we get such a command, don't worry about trying 274 * we get such a command, don't worry about trying
256 * to break it up. 275 * to break it up.
… …
267 { 286 {
268 data = (char *)inbuf + 2; // better read garbage than segfault 287 data = (char *)inbuf + 2; // better read garbage than segfault
269 datalen = 0; 288 datalen = 0;
270 } 289 }
271 290
272 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)
273 if (!strcmp ((char *)inbuf + 2, pkt->name)) 292 if (!strcmp ((char *)inbuf + 2, pkt->name))
274 { 293 {
275 if (pkt->flags & PF_PLAYER) 294 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen))
276 queue_command (pkt, data, datalen); 295 queue_command (pkt, data, datalen);
277 else 296 else
278 execute (pkt, data, datalen); 297 execute (pkt, data, datalen);
279 298
280 goto next_packet; 299 goto next_packet;
281 } 300 }
282 301
283 // If we get here, we didn't find a valid command. 302 // If we get here, we didn't find a valid command.
284 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
285next_packet: 305next_packet:
306 inbuf [pkt_len] = save_byte; // rather ugly
286 skip_packet (pkt_len); 307 skip_packet (pkt_len);
287 308
288 // input buffer has space again 309 // input buffer has space again
289 socket_ev.poll (socket_ev.poll () | PE_R); 310 socket_ev.poll (socket_ev.poll () | EV_READ);
290 311
291 return true; 312 return true;
292} 313}
293 314
315void
316client::inbuf_handle ()
317{
318 if (!handle_packet ())
319 return;
320
321 while (handle_packet ())
322 ;
323
324 flush ();
325}
326
294// callback called when socket is either readable or writable 327// callback called when socket is either readable or writable
295void 328void
296client::socket_cb (iow &w, int got) 329client::socket_cb (iow &w, int revents)
297{ 330{
298 //TODO remove when we have better socket cleanup logic 331 //TODO remove when we have better socket cleanup logic
299 if (destroyed) 332 if (destroyed ())
300 { 333 {
301 socket_ev.poll (0); 334 socket_ev.poll (0);
302 return; 335 return;
303 } 336 }
304 337
305 if (got & PE_W) 338 if (revents & EV_WRITE)
306 { 339 {
307 write_outputbuffer (); 340 write_outputbuffer ();
308 341
309 if (!outputbuffer.len) 342 if (!outputbuffer.len)
310 socket_ev.poll (socket_ev.poll () & ~PE_W); 343 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
311 } 344 }
312 345
313 if (got & PE_R) 346 if (revents & EV_READ)
314 { 347 {
315 //TODO: rate-limit tcp connection in better ways, important 348 //TODO: rate-limit tcp connection in better ways, important
316 349
317 int amount = sizeof (inbuf) - inbuf_len; 350 int amount = sizeof (inbuf) - inbuf_len;
318 351
319 if (!amount) 352 if (!amount)
320 { 353 {
321 // input buffer full 354 // input buffer full
322 socket_ev.poll (socket_ev.poll () & ~PE_R); 355 LOG (llevError, "input buffer overflow.");
356 destroy ();
323 return; 357 return;
324 } 358 }
325 359
360 if (ws_version)
361 {
362 if (ws_inbuf_len + 4096 > ws_inbuf_alloc)
363 ws_inbuf = (uint8 *)realloc (ws_inbuf, ws_inbuf_alloc += 4096);
364
365 int len = read (fd, ws_inbuf + ws_inbuf_len, ws_inbuf_alloc - ws_inbuf_len);
366
367 if (len > 0)
368 {
369 ws_inbuf_len += len;
370
371 if (ws_inbuf_len < 2 + 4) // 6 is minimum length: op, len, mask
372 return;
373
374 int d = 2;
375 int o = ws_inbuf [0] & 15;
376 int l = ws_inbuf [1] & 127;
377
378 if (l == 126)
379 {
380 l = (ws_inbuf [2] << 8) | ws_inbuf [3];
381 d += 2;
382 }
383 else if (l == 127)
384 {
385 if (ws_inbuf_len < 2 + 8)
386 return;
387
388 // we don't do extra long frames, if a browser wants to send >2**32 bytes,
389 // there are bigger issues to fix.
390 l = (ws_inbuf [6] << 24)
391 | (ws_inbuf [7] << 16)
392 | (ws_inbuf [8] << 8)
393 | ws_inbuf [9];
394 d += 8;
395 }
396
397 // we only continue if we have a complete frame
398 if (ws_inbuf_len < d + 4 + l)
399 return;
400
401 switch (o)
402 {
403 case 0: o = ws_inbuf_type; break; // continuation
404 case 1: ws_inbuf_type = 1; break; // utf-8
405 case 2: ws_inbuf_type = 2; break; // binary
406 }
407
408 if (l > amount)
409 {
410 // input buffer full
411 LOG (llevError, "input buffer overflow (ws).");
412 destroy ();
413 return;
414 }
415
416 for (int i = 0; i < l; ++i)
417 inbuf [inbuf_len + i] = ws_inbuf [d + 4 + i] ^ ws_inbuf [d + (i & 3)];
418
419 // remove frame
420 ws_inbuf_len -= d + 4 + l;
421 memmove (ws_inbuf, ws_inbuf + d + 4 + l, ws_inbuf_len);
422
423 switch (o)
424 {
425 case 1: // utf-8
426 //TODO
427 break;
428 case 2: // binary
429 break;
430
431 case 9: // ping
432 {
433 // send pong - we assume ping messages are <64k
434 // as we can't handle >10k at the moment anyway.
435 uint8 hdr [] = { 0x8a, 126, l >> 8, l };
436 send (hdr, sizeof (hdr));
437 send (inbuf + inbuf_len, l);
438 }
439 return;
440
441 case 10: // pong
442 return;
443
444 case 8: // close
445 default:
446 destroy ();
447 return;
448 }
449
450 amount = l;
451 }
452 else
453 amount = -1;
454 }
455 else
326 amount = read (fd, inbuf + inbuf_len, amount); 456 amount = read (fd, inbuf + inbuf_len, amount);
327 457
328 if (!amount) 458 if (!amount)
329 { 459 {
330 destroy (); 460 destroy ();
331 return; 461 return;
… …
342 // should not be here, normally 472 // should not be here, normally
343 } 473 }
344 else 474 else
345 { 475 {
346 inbuf_len += amount; 476 inbuf_len += amount;
347 477 inbuf_handle ();
348 cst_tot.ibytes += amount;
349 cst_lst.ibytes += amount;
350
351 cmd_ev.start ();
352 } 478 }
353 } 479 }
354}
355
356// called whenever we have additional commands to process
357void
358client::cmd_cb (iw &w)
359{
360 if (handle_packet ())
361 w.start ();
362 else
363 flush ();
364} 480}
365 481
366/******************************************************************************* 482/*******************************************************************************
367 * 483 *
368 * Start of write related routines. 484 * Start of write related routines.
… …
377 */ 493 */
378void 494void
379client::send (void *buf_, int len) 495client::send (void *buf_, int len)
380{ 496{
381 char *buf = (char *)buf_; 497 char *buf = (char *)buf_;
382 char *pos = buf;
383 int amt = 0;
384 498
385 if (destroyed || !buf) 499 if (destroyed () || !buf)
386 return; 500 return;
387 501
388 if ((len + outputbuffer.len) > SOCKETBUFSIZE) 502 if (len + outputbuffer.len > SOCKETBUFSIZE)
389 { 503 {
390 LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd); 504 LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd);
391 destroy (); 505 // shutdown the socket, this is safer than destroying it immediately
506 // as lots of code in the callchain might still access the map etc.
507 shutdown (fd, SHUT_RDWR);
392 return; 508 return;
393 } 509 }
394 510
395 int avail, end; 511 int avail, end;
396 512
… …
421 * shortcut function. 537 * shortcut function.
422 */ 538 */
423void 539void
424client::send_packet (packet &sl) 540client::send_packet (packet &sl)
425{ 541{
426 if (destroyed) 542 if (destroyed ())
427 return; 543 return;
428 544
429 if (sl.length () >= MAXSOCKBUF) 545 if (sl.length () > MAXSOCKBUF)
430 { 546 {
431 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ()); 547 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());
432 /* Almost certainly we've overflowed a buffer, so quit now to make 548 /* Almost certainly we've overflowed a buffer, so quit now to make
433 * it easier to debug. 549 * it easier to debug.
434 */ 550 */
… …
436 } 552 }
437 553
438 if (!sl.length ()) 554 if (!sl.length ())
439 return; 555 return;
440 556
557 if (ws_version == 8)
558 {
559 uint8 hdr [4] = { 0x81, 126, sl.length () >> 8, sl.length () };
560 // TODO: utf-8 encoding
561 send (hdr, 4);
562 send (sl.buf_ + sl.hdrlen, sl.cur - sl.buf_ - sl.hdrlen);
563 }
564 else if (ws_version == 13)
565 {
566 uint8 hdr [4] = { 0x82, 126, sl.length () >> 8, sl.length () };
567 send (hdr, 4);
568 send (sl.buf_ + sl.hdrlen, sl.cur - sl.buf_ - sl.hdrlen);
569 }
570 else
571 {
441 assert (sl.hdrlen == 2); 572 assert (sl.hdrlen == 2);
442 573
443 sl.buf_ [0] = sl.length () >> 8; 574 sl.buf_ [0] = sl.length () >> 8;
444 sl.buf_ [1] = sl.length () ; 575 sl.buf_ [1] = sl.length () ;
445 576
446 send (sl.buf_, sl.length () + sl.hdrlen); 577 send (sl.buf_, sl.length () + sl.hdrlen);
578 }
447} 579}
448 580
449void 581void
450client::send_packet (const char *buf, int len) 582client::send_packet (const char *buf, int len)
451{ 583{
… …
472 va_end (ap); 604 va_end (ap);
473 605
474 send_packet (sl); 606 send_packet (sl);
475} 607}
476 608
609void
610client::send_msg (int color, const char *type, const char *msg)
611{
612 if (!msg || !type) // it can happen (for example, missing attack messages cause this)
613 {
614 LOG (logBacktrace | llevError, "send_msg(%d,%p,%p) called with NULL msg or type.\n", color, type, msg);
615 return;
616 }
617
618 int len = strlen (msg);
619
620 if (!(color & NDI_VERBATIM)
621 && (msg_is_special (msg)
622 || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)))
623 cfperl_send_msg (this, color, type, msg);
624 else
625 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
626}
627
628void
629client::send_drawinfo (const char *msg, int flags)
630{
631 send_msg (flags, "log", msg);
632}
633
477/*********************************************************************** 634/***********************************************************************
478 * 635 *
479 * packet functions/utilities 636 * packet functions/utilities
480 * 637 *
481 **********************************************************************/ 638 **********************************************************************/
… …
487 int len = strlen (name); 644 int len = strlen (name);
488 memcpy (cur, name, len); cur += len; 645 memcpy (cur, name, len); cur += len;
489 *cur++ = ' '; 646 *cur++ = ' ';
490} 647}
491 648
649packet &packet::operator <<(const ber32 v)
650{
651 enum { maxlen = 32 / 7 + 1 };
652 uint8 buf[maxlen];
653 uint8 *p = buf + maxlen;
654 uint32 val = v.val;
655
656 *--p = val & 0x7F;
657
658 while (val > 0x7F)
659 {
660 val >>= 7;
661 *--p = (val & 0x7F) | 0x80;
662 }
663
664 return *this << data (p, buf + maxlen - p);
665}
666
492packet &packet::operator <<(const data &v) 667packet &packet::operator <<(const data &v)
493{ 668{
494 if (room () < v.len) 669 if (room () < v.len)
495 reset (); 670 reset ();
496 else 671 else
… …
533 return reset (); 708 return reset ();
534 709
535 cur += len; 710 cur += len;
536} 711}
537 712
538/******************************************************************************
539 *
540 * statistics logging functions.
541 *
542 ******************************************************************************/
543
544#ifdef CS_LOGSTATS
545
546/* cst_tot is for the life of the server, cst_last is for the last series of
547 * stats
548 */
549CS_Stats cst_tot, cst_lst;
550
551/**
552 * Writes out the gathered stats. We clear cst_lst.
553 */
554void
555write_cs_stats (void)
556{
557 time_t now = time (NULL);
558
559 /* If no connections recently, don't both to log anything */
560 if (cst_lst.ibytes == 0 && cst_lst.obytes == 0)
561 return;
562
563 /* CSSTAT is put in so scripts can easily find the line */
564 LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n",
565 ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn,
566 now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start);
567 cst_lst.ibytes = 0;
568 cst_lst.obytes = 0;
569 cst_lst.time_start = now;
570}
571#endif
572

Diff Legend

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