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.14 by root, Thu Dec 14 01:21:58 2006 UTC vs.
Revision 1.33 by root, Sun Feb 4 21:02:54 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 1992 Frank Tore Johansen 5 * Copyright (C) 1992 Frank Tore Johansen
5 6 *
6 This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
7 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
8 the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 2 of the License, or
9 (at your option) any later version. 10 * (at your option) any later version.
10 11 *
11 This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
12 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 GNU General Public License for more details. 15 * GNU General Public License for more details.
15 16 *
16 You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License
17 along with this program; if not, write to the Free Software 18 * along with this program; if not, write to the Free Software
18 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
19 20 *
20 The author can be reached via e-mail to mark@pyramid.com 21 * The author can be reached via e-mail to mark@pyramid.com
21*/ 22 */
22 23
23/** 24/**
24 * \file 25 * \file
25 * Low-level socket-related functions. 26 * Low-level socket-related functions.
26 * 27 *
27 * \date 2003-12-02 28 * \date 2003-12-02
… …
33 */ 34 */
34 35
35using namespace std; 36using namespace std;
36 37
37#include <global.h> 38#include <global.h>
38#include <newclient.h>
39#include <sproto.h> 39#include <sproto.h>
40#include <cstdarg> 40#include <cstdarg>
41 41
42#ifdef __linux__ 42#ifdef __linux__
43# include <sys/types.h> 43# include <sys/types.h>
44# include <sys/socket.h> 44# include <sys/socket.h>
45# include <netinet/in.h> 45# include <netinet/in.h>
46# define TCP_HZ 1000 // sorry...
47# include <netinet/tcp.h> 46# include <netinet/tcp.h>
48#endif 47#endif
49 48
50// use a really low timeout, as it doesn't cost any bandwidth, and you can 49// use a really low timeout, as it doesn't cost any bandwidth, and you can
51// easily die in 20 seconds... 50// easily die in 20 seconds...
52#define SOCKET_TIMEOUT1 10 51#define SOCKET_TIMEOUT1 10 * 1000
53#define SOCKET_TIMEOUT2 20 52#define SOCKET_TIMEOUT2 20 * 1000
54 53
55void 54void
56Socket_Flush (NewSocket * ns) 55client::flush ()
57{ 56{
57 if (destroyed ())
58 return;
59
58#ifdef __linux__ 60#ifdef __linux__
59 // check time of last ack, and, if too old, kill connection 61 // check time of last ack, and, if too old, kill connection
60 struct tcp_info tcpi; 62 struct tcp_info tcpi;
61 socklen_t len = sizeof (tcpi); 63 socklen_t len = sizeof (tcpi);
62 64
63 if (!getsockopt (ns->fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi)) 65 if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))
64 { 66 {
65 unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent; 67 unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent;
66 68
69 rtt = tcpi.tcpi_rtt;
70 rttvar = tcpi.tcpi_rttvar;
71
67 if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 * TCP_HZ < diff && diff < 0x80000000UL // ack delayed for 20s 72 if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 < diff && diff < 0x80000000UL // ack delayed for 20s
68 && SOCKET_TIMEOUT2 * TCP_HZ < tcpi.tcpi_last_data_sent) // no data sent for 10s 73 && SOCKET_TIMEOUT2 < tcpi.tcpi_last_data_sent) // no data sent for 10s
69 { 74 {
70 LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", ns->fd, 75 LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd,
71 (unsigned) tcpi.tcpi_last_ack_recv, (unsigned) tcpi.tcpi_last_data_sent, (unsigned) tcpi.tcpi_unacked); 76 (unsigned) tcpi.tcpi_last_ack_recv, (unsigned) tcpi.tcpi_last_data_sent, (unsigned) tcpi.tcpi_unacked);
72 ns->status = Ns_Dead; 77 destroy ();
73 } 78 }
74 } 79 }
75
76 int val;
77
78 val = 0; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val));
79 val = 1; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val));
80#endif 80#endif
81}
82 81
83/*********************************************************************** 82 /**
84 * 83 * Writes data to socket.
85 * packet functions/utilities 84 *
86 * 85 * When the socket is clear to write, and we have backlogged data, this
87 **********************************************************************/ 86 * is called to write it out.
87 */
88 88
89packet &packet::operator <<(const data &v) 89 if (!outputbuffer.len || socket_ev.poll () & PE_W)
90 return;
91
92 write_outputbuffer ();
93}
94
95void
96client::write_outputbuffer ()
90{ 97{
91 if (v.len) 98 while (outputbuffer.len)
92 {
93 memcpy (buf + len, v.ptr, v.len);
94 len += v.len;
95 } 99 {
100 int res = write (fd, outputbuffer.data + outputbuffer.start,
101 min (outputbuffer.len, SOCKETBUFSIZE - outputbuffer.start));
96 102
97 return *this; 103 if (res > 0)
98} 104 {
105 outputbuffer.start += res;
106 /* wrap back to start of buffer */
107 if (outputbuffer.start == SOCKETBUFSIZE)
108 outputbuffer.start = 0;
99 109
100packet &packet::operator <<(const data8 &v) 110 outputbuffer.len -= res;
101{ 111#ifdef CS_LOGSTATS
102 unsigned int len = min (v.len, 0x00FF); 112 cst_tot.obytes += res;
103 return *this << uint8 (len) << data (v.ptr, len); 113 cst_lst.obytes += res;
104} 114#endif
115 }
116 else if (res == 0)
117 {
118 LOG (llevError, "socket write failed, connection closed.\n");
119 destroy ();
120 return;
121 }
122 else if (errno == EINTR)
123 {
124 // just retry
125 }
126 else if (errno == EAGAIN)
127 {
128 // delay till ready
129 socket_ev.poll (socket_ev.poll () | PE_W);
130 socket_ev.start ();
131 return;
132 }
133 else
134 {
135 LOG (llevError, "socket write failed: %s\n", strerror (errno));
136 destroy ();
137 return;
138 }
139 }
105 140
106packet &packet::operator <<(const data16 &v) 141 socket_ev.poll (socket_ev.poll () & ~PE_W);
107{
108 unsigned int len = min (v.len, 0xFFFF);
109 return *this << uint16 (len) << data (v.ptr, len);
110}
111
112packet &packet::operator <<(const char *v)
113{
114 return *this << data (v, strlen (v ? v : 0));
115}
116
117void
118packet::printf (const char *format, ...)
119{
120 va_list ap;
121 va_start (ap, format);
122
123 len += vsnprintf ((char *)buf + len, MAXSOCKBUF, format, ap);
124
125 va_end (ap);
126} 142}
127 143
128/****************************************************************************** 144/******************************************************************************
129 * 145 *
130 * Start of read routines. 146 * Start of read routines.
131 * 147 *
132 ******************************************************************************/ 148 ******************************************************************************/
133 149
134int 150int
135NewSocket::read_packet () 151client::next_packet ()
136{ 152{
137 for (;;)
138 {
139 if (inbuf_len >= 2) 153 if (inbuf_len >= 2)
140 { 154 {
141 unsigned int pkt_len = (inbuf [0] << 8) | inbuf [1]; 155 int pkt_len = (inbuf [0] << 8) | inbuf [1];
142 156
143 if (inbuf_len >= 2 + pkt_len) 157 if (inbuf_len >= 2 + pkt_len)
144 return pkt_len + 2; 158 return 2 + pkt_len;
159
160 if (inbuf_len == sizeof (inbuf))
145 } 161 {
162 send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED);
163 destroy ();
164 return -1;
165 }
166 }
167
168 return 0;
169}
170
171void
172client::skip_packet (int len)
173{
174 inbuf_len -= len;
175 memmove (inbuf, inbuf + len, inbuf_len);
176}
177
178/*****************************************************************************
179 * Start of command dispatch area.
180 * The commands here are protocol commands.
181 ****************************************************************************/
182
183// SocketCommand, PlayingCommand, should not exist with those ugly casts
184#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 |
186
187/**
188 * Dispatch table for the server.
189 */
190static struct packet_type packets[] = {
191 {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 },
192 {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 },
193
194 {"examine", PC(ExamineCmd) PF_PLAYING },
195 {"apply", PC(ApplyCmd) PF_PLAYING },
196 {"lookat", PC(LookAt) PF_PLAYING },
197 {"lock", PC(LockItem) PF_PLAYING },
198 {"mark", PC(MarkItem) PF_PLAYING },
199 {"move", PC(MoveCmd) PF_PLAYING },
200 {"ext", PC(ExtCmd) 0 }, /* CF+ */
201 {"mapredraw", PC(MapRedrawCmd) 0 }, /* Added: phil */
202 {"mapinfo", PC(MapInfoCmd) 0 }, /* CF+ */
203
204 {"reply", SC(ReplyCmd) 0 },
205 {"exti", SC(ExtiCmd) 0 }, /* CF+ */
206 {"addme", SC(AddMeCmd) 0 },
207 {"askface", SC(SendFaceCmd) 0 }, /* Added: phil */
208 {"requestinfo", SC(RequestInfo) 0 },
209 {"setfacemode", SC(SetFaceMode) 0 },
210 {"setsound", SC(SetSound) 0 },
211 {"setup", SC(SetUp) 0 },
212 {"version", SC(VersionCmd) 0 },
213 {"toggleextendedinfos", SC(ToggleExtendedInfos) 0 }, /*Added: tchize */
214 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */
215 {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */
216};
217
218bool
219client::may_execute (const packet_type *pkt) const
220{
221 return (!(pkt->flags & PF_PLAYER) || pl)
222 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING);
223}
224
225// HACK: some commands currently should be executed
226// even when the player is frozen. this hack detects
227// those commands. it should be folded into may_execute,
228// but kept seperate to emphasise the hack aspect, i.e.
229// do it better, then remove.
230static bool
231always_immediate (const client *ns, const packet_type *pkt, const char *data, int len)
232{
233 if (!(pkt->flags & (PF_COMMAND0 | PF_COMMAND6)))
234 return false;
235
236 if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map)
237 return false;
238
239 if (pkt->flags & PF_COMMAND6)
240 {
241 data += 6;
242 len -= 6;
243 }
244
245 if (len > 4 && !strncmp (data, "say " , 4))
246 return true;
247 if (len > 5 && !strncmp (data, "chat ", 5))
248 return true;
249
250 return false;
251}
252
253void
254client::execute (const packet_type *pkt, char *data, int datalen)
255{
256 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen))
257 {
258 //TODO: only one format
259 if (pkt->flags & PF_PLAYER)
260 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
261 else
262 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
263 }
264 else
265 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED, pkt->name);
266}
267
268bool
269client::handle_packet ()
270{
271 int pkt_len = next_packet ();
272
273 if (!pkt_len)
274 return false;
275 else if (pkt_len < 0)
276 {
277 LOG (llevError, "read error on player %s\n",
278 pl && pl->ob ? &pl->ob->name : "[anonymous]");
279 destroy ();
280 return false;
281 }
282
283 inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */
284
285 /* First, break out beginning word. There are at least
286 * a few commands that do not have any paremeters. If
287 * we get such a command, don't worry about trying
288 * to break it up.
289 */
290 int datalen;
291 char *data = strchr ((char *)inbuf + 2, ' ');
292
293 if (data)
294 {
295 *data++ = 0;
296 datalen = pkt_len - (data - (char *)inbuf);
297 }
298 else
299 {
300 data = (char *)inbuf + 2; // better read garbage than segfault
301 datalen = 0;
302 }
303
304 for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt)
305 if (!strcmp ((char *)inbuf + 2, pkt->name))
306 {
307 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen))
308 queue_command (pkt, data, datalen);
309 else
310 execute (pkt, data, datalen);
311
312 goto next_packet;
313 }
314
315 // If we get here, we didn't find a valid command.
316 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED, (char *)inbuf + 2);
317next_packet:
318 skip_packet (pkt_len);
319
320 // input buffer has space again
321 socket_ev.poll (socket_ev.poll () | PE_R);
322
323 return true;
324}
325
326// callback called when socket is either readable or writable
327void
328client::socket_cb (iow &w, int got)
329{
330 //TODO remove when we have better socket cleanup logic
331 if (destroyed ())
332 {
333 socket_ev.poll (0);
334 return;
335 }
336
337 if (got & PE_W)
338 {
339 write_outputbuffer ();
340
341 if (!outputbuffer.len)
342 socket_ev.poll (socket_ev.poll () & ~PE_W);
343 }
344
345 if (got & PE_R)
346 {
347 //TODO: rate-limit tcp connection in better ways, important
146 348
147 int amount = sizeof (inbuf) - inbuf_len; 349 int amount = sizeof (inbuf) - inbuf_len;
148 350
149 if (amount <= 0) 351 if (!amount)
150 { 352 {
151 LOG (llevError, "packet too large");//TODO 353 // input buffer full
354 socket_ev.poll (socket_ev.poll () & ~PE_R);
152 return -1; 355 return;
153 } 356 }
154 357
155 amount = read (fd, inbuf + inbuf_len, amount); 358 amount = read (fd, inbuf + inbuf_len, amount);
156 359
157 if (!amount) 360 if (!amount)
158 { 361 {
159 status = Ns_Dead; 362 destroy ();
160 return -1; 363 return;
161 } 364 }
162 else if (amount < 0) 365 else if (amount < 0)
163 { 366 {
164 if (errno != EAGAIN && errno != EINTR) 367 if (errno != EAGAIN && errno != EINTR)
165 { 368 {
166 LOG (llevError, "read error: %s", strerror (errno)); 369 LOG (llevError, "read error: %s\n", strerror (errno));
370 destroy ();
167 return -1; 371 return;
168 } 372 }
169 373
170 return 0; 374 // should not be here, normally
375 }
376 else
171 } 377 {
172
173 inbuf_len += amount; 378 inbuf_len += amount;
174 379
175 cst_tot.ibytes += amount; 380 cst_tot.ibytes += amount;
176 cst_lst.ibytes += amount; 381 cst_lst.ibytes += amount;
177 }
178}
179 382
383 cmd_ev.start ();
384 }
385 }
386}
387
388// called whenever we have additional commands to process
180void 389void
181NewSocket::skip_packet (int len) 390client::cmd_cb (iw &w)
182{ 391{
183 inbuf_len -= len; 392 if (handle_packet ())
184 memmove (inbuf, inbuf + len, inbuf_len); 393 w.start ();
394 else
395 flush ();
185} 396}
186 397
187/******************************************************************************* 398/*******************************************************************************
188 * 399 *
189 * Start of write related routines. 400 * Start of write related routines.
… …
194 * Adds data to a socket buffer for whatever reason. 405 * Adds data to a socket buffer for whatever reason.
195 * 406 *
196 * ns is the socket we are adding the data to, buf is the start of the 407 * ns is the socket we are adding the data to, buf is the start of the
197 * data, and len is the number of bytes to add. 408 * data, and len is the number of bytes to add.
198 */ 409 */
199 410void
200static void 411client::send (void *buf_, int len)
201add_to_buffer (NewSocket *ns, char *buf, int len)
202{ 412{
413 char *buf = (char *)buf_;
414 char *pos = buf;
415 int amt = 0;
416
417 if (destroyed () || !buf)
418 return;
419
420 if (len + outputbuffer.len > SOCKETBUFSIZE)
421 {
422 LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd);
423 destroy ();
424 return;
425 }
426
203 int avail, end; 427 int avail, end;
204
205 if ((len + ns->outputbuffer.len) > SOCKETBUFSIZE)
206 {
207 LOG (llevDebug, "Socket on fd %d has overrun internal buffer - marking as dead\n", ns->fd);
208 ns->status = Ns_Dead;
209 return;
210 }
211 428
212 /* data + end is where we start putting the new data. The last byte 429 /* data + end is where we start putting the new data. The last byte
213 * currently in use is actually data + end -1 430 * currently in use is actually data + end -1
214 */ 431 */
215
216 end = ns->outputbuffer.start + ns->outputbuffer.len; 432 end = outputbuffer.start + outputbuffer.len;
217 /* The buffer is already in a wrapped state, so adjust end */ 433 /* The buffer is already in a wrapped state, so adjust end */
218 if (end >= SOCKETBUFSIZE) 434 if (end >= SOCKETBUFSIZE)
219 end -= SOCKETBUFSIZE; 435 end -= SOCKETBUFSIZE;
220 436
221 avail = SOCKETBUFSIZE - end; 437 avail = SOCKETBUFSIZE - end;
222 438
223 /* We can all fit it behind the current data without wrapping */ 439 /* We can all fit it behind the current data without wrapping */
224 if (avail >= len) 440 if (avail >= len)
225 memcpy (ns->outputbuffer.data + end, buf, len); 441 memcpy (outputbuffer.data + end, buf, len);
226 else 442 else
227 { 443 {
228 memcpy (ns->outputbuffer.data + end, buf, avail); 444 memcpy (outputbuffer.data + end, buf, avail);
229 memcpy (ns->outputbuffer.data, buf + avail, len - avail); 445 memcpy (outputbuffer.data, buf + avail, len - avail);
230 } 446 }
231 447
232 ns->outputbuffer.len += len; 448 outputbuffer.len += len;
233#if 0
234 LOG (llevDebug, "Added %d to output buffer, total length now %d, start=%d\n", len, ns->outputbuffer.len, ns->outputbuffer.start);
235#endif
236}
237
238/**
239 * Writes data to socket.
240 *
241 * When the socket is clear to write, and we have backlogged data, this
242 * is called to write it out.
243 */
244void
245write_socket_buffer (NewSocket * ns)
246{
247 int amt, max;
248
249 if (ns->outputbuffer.len == 0)
250 {
251 LOG (llevDebug, "write_socket_buffer called when there is no data, fd=%d\n", ns->fd);
252 return;
253 }
254
255 do
256 {
257 max = SOCKETBUFSIZE - ns->outputbuffer.start;
258 if (ns->outputbuffer.len < max)
259 max = ns->outputbuffer.len;
260
261 do
262 {
263 amt = write (ns->fd, ns->outputbuffer.data + ns->outputbuffer.start, max);
264 }
265 while ((amt < 0) && (errno == EINTR));
266
267 if (amt < 0)
268 { /* We got an error */
269
270 if (errno != EWOULDBLOCK)
271 {
272 LOG (llevError, "New socket write failed (wsb) (%d: %s).\n", errno, strerror (errno));
273 ns->status = Ns_Dead;
274 return;
275 }
276 else
277 { /* EWOULDBLOCK */
278 /* can't write it, so store it away. */
279 ns->can_write = 0;
280 return;
281 }
282 }
283 ns->outputbuffer.start += amt;
284 /* wrap back to start of buffer */
285 if (ns->outputbuffer.start == SOCKETBUFSIZE)
286 ns->outputbuffer.start = 0;
287 ns->outputbuffer.len -= amt;
288#ifdef CS_LOGSTATS
289 cst_tot.obytes += amt;
290 cst_lst.obytes += amt;
291#endif
292 }
293 while (ns->outputbuffer.len > 0);
294}
295
296/**
297 * This writes data to the socket. - It is very low level -
298 * all we try and do is write out the data to the socket
299 * provided (ns). buf is the data to write, len is the number
300 * of bytes to write. IT doesn't return anything - rather, it
301 * updates the ns structure if we get an error.
302 */
303void
304Write_To_Socket (NewSocket * ns, char *buf, int len)
305{
306 int amt = 0;
307 char *pos = buf;
308
309 if (ns->status == Ns_Dead || !buf)
310 {
311 LOG (llevDebug, "Write_To_Socket called with dead socket\n");
312 return;
313 }
314
315#ifndef __GNU__ /* This caused problems on Hurd */
316 if (!ns->can_write)
317 {
318 add_to_buffer (ns, buf, len);
319 return;
320 }
321#endif
322 /* If we manage to write more than we wanted, take it as a bonus */
323 while (len > 0)
324 {
325
326 do
327 {
328 amt = write (ns->fd, pos, len);
329 }
330 while ((amt < 0) && (errno == EINTR));
331
332 if (amt < 0)
333 { /* We got an error */
334 if (errno != EWOULDBLOCK)
335 {
336 LOG (llevError, "New socket write failed WTS (%d: %s).\n", /* ---WIN32 */
337 errno, strerror (errno));
338 ns->status = Ns_Dead;
339 return;
340 }
341 else
342 { /* EWOULDBLOCK */
343 /* can't write it, so store it away. */
344 add_to_buffer (ns, pos, len);
345 ns->can_write = 0;
346 return;
347 }
348 }
349 /* amt gets set to 0 above in blocking code, so we do this as
350 * an else if to make sure we don't reprocess it.
351 */
352 else if (amt == 0)
353 {
354 LOG (llevError, "Write_To_Socket: No data written out.\n");
355 }
356 len -= amt;
357 pos += amt;
358#ifdef CS_LOGSTATS
359 cst_tot.obytes += amt;
360 cst_lst.obytes += amt;
361#endif
362 }
363} 449}
364 450
365/** 451/**
366 * Takes a string of data, and writes it out to the socket. A very handy 452 * Takes a string of data, and writes it out to the socket. A very handy
367 * shortcut function. 453 * shortcut function.
368 */ 454 */
369
370void 455void
371NewSocket::send_packet (packet &sl) 456client::send_packet (packet &sl)
372{ 457{
373 Send_With_Handling (this, &sl); 458 if (destroyed ())
374}
375
376void
377NewSocket::send_packet (const char *buf, int len)
378{
379 packet sl;
380
381 sl << data (buf, len);
382 send_packet (sl);
383}
384
385void
386NewSocket::send_packet (const char *buf)
387{
388 send_packet (buf, strlen (buf));
389}
390
391/**
392 * Calls Write_To_Socket to send data to the client.
393 *
394 * The only difference in this function is that we take a packet
395 *, and we prepend the length information.
396 */
397void
398Send_With_Handling (NewSocket *ns, packet *msg)
399{
400 unsigned char sbuf[4];
401
402 if (ns->status == Ns_Dead || !msg)
403 return; 459 return;
404 460
405 if (msg->len >= MAXSOCKBUF) 461 if (sl.length () >= MAXSOCKBUF)
406 { 462 {
407 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", msg->len); 463 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());
408 /* Almost certainly we've overflowed a buffer, so quite now to make 464 /* Almost certainly we've overflowed a buffer, so quit now to make
409 * it easier to debug. 465 * it easier to debug.
410 */ 466 */
411 abort (); 467 abort ();
412 } 468 }
413 sbuf[0] = ((uint32) (msg->len) >> 8) & 0xFF; 469
414 sbuf[1] = ((uint32) (msg->len)) & 0xFF; 470 if (!sl.length ())
415 if (ns->status != Ns_Old) 471 return;
416 Write_To_Socket (ns, (char *) sbuf, 2); 472
417 Write_To_Socket (ns, (char *) msg->buf, msg->len); 473 assert (sl.hdrlen == 2);
474
475 sl.buf_ [0] = sl.length () >> 8;
476 sl.buf_ [1] = sl.length () ;
477
478 send (sl.buf_, sl.length () + sl.hdrlen);
479}
480
481void
482client::send_packet (const char *buf, int len)
483{
484 packet sl;
485
486 sl << data (buf, len);
487 send_packet (sl);
488}
489
490void
491client::send_packet (const char *buf)
492{
493 send_packet (buf, strlen (buf));
494}
495
496void
497client::send_packet_printf (const char *format, ...)
498{
499 packet sl;
500
501 va_list ap;
502 va_start (ap, format);
503 sl.vprintf (format, ap);
504 va_end (ap);
505
506 send_packet (sl);
507}
508
509/***********************************************************************
510 *
511 * packet functions/utilities
512 *
513 **********************************************************************/
514
515packet::packet (const char *name)
516{
517 reset ();
518
519 int len = strlen (name);
520 memcpy (cur, name, len); cur += len;
521 *cur++ = ' ';
522}
523
524packet &packet::operator <<(const data &v)
525{
526 if (room () < v.len)
527 reset ();
528 else
529 {
530 if (v.len)
531 {
532 memcpy (cur, v.ptr, v.len);
533 cur += v.len;
534 }
535 }
536
537 return *this;
538}
539
540packet &packet::operator <<(const data8 &v)
541{
542 unsigned int len = min (v.len, 0x00FF);
543 return *this << uint8 (len) << data (v.ptr, len);
544}
545
546packet &packet::operator <<(const data16 &v)
547{
548 unsigned int len = min (v.len, 0xFFFF);
549 return *this << uint16 (len) << data (v.ptr, len);
550}
551
552packet &packet::operator <<(const char *v)
553{
554 return *this << data (v, strlen (v ? v : 0));
555}
556
557void
558packet::vprintf (const char *format, va_list ap)
559{
560 int size = room ();
561
562 int len = vsnprintf ((char *)cur, size, format, ap);
563
564 if (len >= size)
565 return reset ();
566
567 cur += len;
418} 568}
419 569
420/****************************************************************************** 570/******************************************************************************
421 * 571 *
422 * statistics logging functions. 572 * statistics logging functions.
… …
446 LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n", 596 LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n",
447 ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn, 597 ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn,
448 now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start); 598 now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start);
449 cst_lst.ibytes = 0; 599 cst_lst.ibytes = 0;
450 cst_lst.obytes = 0; 600 cst_lst.obytes = 0;
451 cst_lst.max_conn = socket_info.nconns;
452 cst_lst.time_start = now; 601 cst_lst.time_start = now;
453} 602}
454#endif 603#endif
455 604

Diff Legend

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