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.9 by root, Wed Dec 13 18:08:02 2006 UTC vs.
Revision 1.32 by pippijn, Sat Jan 20 13:47:17 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 41
41#ifdef __linux__ 42#ifdef __linux__
42# include <sys/types.h> 43# include <sys/types.h>
43# include <sys/socket.h> 44# include <sys/socket.h>
44# include <netinet/in.h> 45# include <netinet/in.h>
45# define TCP_HZ 1000 // sorry...
46# include <netinet/tcp.h> 46# include <netinet/tcp.h>
47#endif 47#endif
48 48
49// 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
50// easily die in 20 seconds... 50// easily die in 20 seconds...
51#define SOCKET_TIMEOUT1 10 51#define SOCKET_TIMEOUT1 10 * 1000
52#define SOCKET_TIMEOUT2 20 52#define SOCKET_TIMEOUT2 20 * 1000
53 53
54void 54void
55Socket_Flush (NewSocket * ns) 55client::flush ()
56{ 56{
57 if (destroyed ())
58 return;
59
57#ifdef __linux__ 60#ifdef __linux__
58 // check time of last ack, and, if too old, kill connection 61 // check time of last ack, and, if too old, kill connection
59 struct tcp_info tcpi; 62 struct tcp_info tcpi;
60 socklen_t len = sizeof (tcpi); 63 socklen_t len = sizeof (tcpi);
61 64
62 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))
63 { 66 {
64 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;
65 68
69 rtt = tcpi.tcpi_rtt;
70 rttvar = tcpi.tcpi_rttvar;
71
66 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
67 && 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
68 { 74 {
69 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,
70 (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);
71 ns->status = Ns_Dead; 77 destroy ();
72 } 78 }
73 } 79 }
74
75 int val;
76
77 val = 0; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val));
78 val = 1; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val));
79#endif 80#endif
80}
81 81
82 /**
83 * Writes data to socket.
84 *
85 * When the socket is clear to write, and we have backlogged data, this
86 * is called to write it out.
87 */
88
89 if (!outputbuffer.len || socket_ev.poll () & PE_W)
90 return;
91
92 write_outputbuffer ();
93}
94
95void
96client::write_outputbuffer ()
97{
98 while (outputbuffer.len)
99 {
100 int res = write (fd, outputbuffer.data + outputbuffer.start,
101 min (outputbuffer.len, SOCKETBUFSIZE - outputbuffer.start));
102
103 if (res > 0)
104 {
105 outputbuffer.start += res;
106 /* wrap back to start of buffer */
107 if (outputbuffer.start == SOCKETBUFSIZE)
108 outputbuffer.start = 0;
109
110 outputbuffer.len -= res;
111#ifdef CS_LOGSTATS
112 cst_tot.obytes += res;
113 cst_lst.obytes += res;
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 }
140
141 socket_ev.poll (socket_ev.poll () & ~PE_W);
142}
143
82/*********************************************************************** 144/******************************************************************************
83 * 145 *
84 * SockList functions/utilities 146 * Start of read routines.
85 * 147 *
86 **********************************************************************/ 148 ******************************************************************************/
87 149
88SockList &SockList::operator <<(const data8 &v)
89{
90 *this << uint8 (v.len);
91
92 memcpy (buf + len, v.data, v.len);
93 len += v.len;
94
95 return *this;
96}
97
98SockList &SockList::operator <<(const data16 &v)
99{
100 *this << uint16 (v.len);
101
102 memcpy (buf + len, v.data, v.len);
103 len += v.len;
104
105 return *this;
106}
107
108/* Basically does the reverse of SockList_AddInt, but on
109 * strings instead. Same for the GetShort, but for 16 bits.
110 */
111int 150int
112GetInt_String (unsigned char *data) 151client::next_packet ()
113{ 152{
114 return ((data[0] << 24) + (data[1] << 16) + (data[2] << 8) + data[3]); 153 if (inbuf_len >= 2)
115} 154 {
155 int pkt_len = (inbuf [0] << 8) | inbuf [1];
116 156
117short 157 if (inbuf_len >= 2 + pkt_len)
118GetShort_String (unsigned char *data) 158 return 2 + pkt_len;
119{
120 return ((data[0] << 8) + data[1]);
121}
122 159
160 if (inbuf_len == sizeof (inbuf))
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
123/****************************************************************************** 178/*****************************************************************************
124 * 179 * Start of command dispatch area.
125 * Start of read routines. 180 * The commands here are protocol commands.
126 *
127 ******************************************************************************/ 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 |
128 186
129/** 187/**
130 * This reads from fd and puts the data in sl. We return true if we think 188 * Dispatch table for the server.
131 * we have a full packet, 0 if we have a partial packet. The only processing
132 * we do is remove the intial size value. len (As passed) is the size of the
133 * buffer allocated in the socklist. We make the assumption the buffer is
134 * at least 2 bytes long.
135 */ 189 */
190static struct packet_type packets[] = {
191 {"ncom", PC(NewPlayerCmd) PF_PLAYING },
192 {"command", PC(PlayerCmd) PF_PLAYING },
136 193
137int 194 {"examine", PC(ExamineCmd) PF_PLAYING },
138SockList_ReadPacket (int fd, SockList * sl, int len) 195 {"apply", PC(ApplyCmd) PF_PLAYING },
139{ 196 {"lookat", PC(LookAt) PF_PLAYING },
140 int stat, toread; 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+ */
141 203
142 /* Sanity check - shouldn't happen */ 204 {"reply", SC(ReplyCmd) 0 },
143 if (sl->len < 0) 205 {"exti", SC(ExtiCmd) 0 }, /* CF+ */
144 { 206 {"addme", SC(AddMeCmd) 0 },
145 abort (); 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
225void
226client::execute (const packet_type *pkt, char *data, int datalen)
227{
228 if (may_execute (pkt))
146 } 229 {
147 /* We already have a partial packet */ 230 //TODO: only one format
148 if (sl->len < 2) 231 if (pkt->flags & PF_PLAYER)
232 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
233 else
234 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
149 { 235 }
150 do 236 else
237 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED, pkt->name);
238}
239
240bool
241client::handle_packet ()
242{
243 int pkt_len = next_packet ();
244
245 if (!pkt_len)
246 return false;
247 else if (pkt_len < 0)
248 {
249 LOG (llevError, "read error on player %s\n",
250 pl && pl->ob ? &pl->ob->name : "[anonymous]");
251 destroy ();
252 return false;
253 }
254
255 inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */
256
257 /* First, break out beginning word. There are at least
258 * a few commands that do not have any paremeters. If
259 * we get such a command, don't worry about trying
260 * to break it up.
261 */
262 int datalen;
263 char *data = strchr ((char *)inbuf + 2, ' ');
264
265 if (data)
266 {
267 *data++ = 0;
268 datalen = pkt_len - (data - (char *)inbuf);
269 }
270 else
271 {
272 data = (char *)inbuf + 2; // better read garbage than segfault
273 datalen = 0;
274 }
275
276 for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt)
277 if (!strcmp ((char *)inbuf + 2, pkt->name))
151 { 278 {
152 stat = read (fd, sl->buf + sl->len, 2 - sl->len); 279 if (pkt->flags & PF_PLAYER)
280 queue_command (pkt, data, datalen);
281 else
282 execute (pkt, data, datalen);
283
284 goto next_packet;
285 }
286
287 // If we get here, we didn't find a valid command.
288 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED, (char *)inbuf + 2);
289next_packet:
290 skip_packet (pkt_len);
291
292 // input buffer has space again
293 socket_ev.poll (socket_ev.poll () | PE_R);
294
295 return true;
296}
297
298// callback called when socket is either readable or writable
299void
300client::socket_cb (iow &w, int got)
301{
302 //TODO remove when we have better socket cleanup logic
303 if (destroyed ())
304 {
305 socket_ev.poll (0);
306 return;
307 }
308
309 if (got & PE_W)
310 {
311 write_outputbuffer ();
312
313 if (!outputbuffer.len)
314 socket_ev.poll (socket_ev.poll () & ~PE_W);
315 }
316
317 if (got & PE_R)
318 {
319 //TODO: rate-limit tcp connection in better ways, important
320
321 int amount = sizeof (inbuf) - inbuf_len;
322
323 if (!amount)
153 } 324 {
154 while ((stat == -1) && (errno == EINTR)); 325 // input buffer full
155 326 socket_ev.poll (socket_ev.poll () & ~PE_R);
156 if (stat < 0) 327 return;
157 { 328 }
158 /* In non blocking mode, EAGAIN is set when there is no 329
159 * data available. 330 amount = read (fd, inbuf + inbuf_len, amount);
160 */ 331
332 if (!amount)
333 {
334 destroy ();
335 return;
336 }
337 else if (amount < 0)
338 {
161 if (errno != EAGAIN && errno != EWOULDBLOCK) 339 if (errno != EAGAIN && errno != EINTR)
162 { 340 {
163 LOG (llevDebug, "ReadPacket got error %s, returning 0\n", strerror (errno)); 341 LOG (llevError, "read error: %s\n", strerror (errno));
342 destroy ();
343 return;
164 } 344 }
165 return 0; /*Error */
166 }
167 if (stat == 0)
168 return -1;
169 sl->len += stat;
170#ifdef CS_LOGSTATS
171 cst_tot.ibytes += stat;
172 cst_lst.ibytes += stat;
173#endif
174 if (stat < 2)
175 return 0; /* Still don't have a full packet */
176 }
177 /* Figure out how much more data we need to read. Add 2 from the
178 * end of this - size header information is not included.
179 */
180 toread = 2 + (sl->buf[0] << 8) + sl->buf[1] - sl->len;
181 if ((toread + sl->len) >= len)
182 {
183 LOG (llevError, "SockList_ReadPacket: Want to read more bytes than will fit in buffer (%d>=%d).\n", toread + sl->len, len);
184 /* Quick hack in case for 'oldsocketmode' input. If we are
185 * closing the socket anyways, then reading this extra 100 bytes
186 * shouldn't hurt.
187 */
188 read (fd, sl->buf + 2, 100);
189 345
190 /* return error so the socket is closed */ 346 // should not be here, normally
191 return -1;
192 }
193 do
194 {
195 do
196 { 347 }
197 stat = read (fd, sl->buf + sl->len, toread); 348 else
198 } 349 {
199 while ((stat < 0) && (errno == EINTR)); 350 inbuf_len += amount;
200 if (stat < 0) 351
352 cst_tot.ibytes += amount;
353 cst_lst.ibytes += amount;
354
355 cmd_ev.start ();
201 { 356 }
202
203 if (errno != EAGAIN && errno != EWOULDBLOCK)
204 {
205 LOG (llevDebug, "ReadPacket got error %s, returning 0\n", strerror (errno));
206 }
207 return 0; /*Error */
208 }
209 if (stat == 0)
210 return -1;
211 sl->len += stat;
212#ifdef CS_LOGSTATS
213 cst_tot.ibytes += stat;
214 cst_lst.ibytes += stat;
215#endif
216 toread -= stat;
217 if (toread == 0)
218 return 1;
219 if (toread < 0)
220 {
221 LOG (llevError, "SockList_ReadPacket: Read more bytes than desired.\n");
222 return 1;
223 }
224 } 357 }
225 while (toread > 0); 358}
226 return 0; 359
360// called whenever we have additional commands to process
361void
362client::cmd_cb (iw &w)
363{
364 if (handle_packet ())
365 w.start ();
366 else
367 flush ();
227} 368}
228 369
229/******************************************************************************* 370/*******************************************************************************
230 * 371 *
231 * Start of write related routines. 372 * Start of write related routines.
… …
236 * Adds data to a socket buffer for whatever reason. 377 * Adds data to a socket buffer for whatever reason.
237 * 378 *
238 * ns is the socket we are adding the data to, buf is the start of the 379 * ns is the socket we are adding the data to, buf is the start of the
239 * data, and len is the number of bytes to add. 380 * data, and len is the number of bytes to add.
240 */ 381 */
241 382void
242static void 383client::send (void *buf_, int len)
243add_to_buffer (NewSocket * ns, char *buf, int len)
244{ 384{
385 char *buf = (char *)buf_;
386 char *pos = buf;
387 int amt = 0;
388
389 if (destroyed () || !buf)
390 return;
391
392 if (len + outputbuffer.len > SOCKETBUFSIZE)
393 {
394 LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd);
395 destroy ();
396 return;
397 }
398
245 int avail, end; 399 int avail, end;
246
247 if ((len + ns->outputbuffer.len) > SOCKETBUFSIZE)
248 {
249 LOG (llevDebug, "Socket on fd %d has overrun internal buffer - marking as dead\n", ns->fd);
250 ns->status = Ns_Dead;
251 return;
252 }
253 400
254 /* data + end is where we start putting the new data. The last byte 401 /* data + end is where we start putting the new data. The last byte
255 * currently in use is actually data + end -1 402 * currently in use is actually data + end -1
256 */ 403 */
257
258 end = ns->outputbuffer.start + ns->outputbuffer.len; 404 end = outputbuffer.start + outputbuffer.len;
259 /* The buffer is already in a wrapped state, so adjust end */ 405 /* The buffer is already in a wrapped state, so adjust end */
260 if (end >= SOCKETBUFSIZE) 406 if (end >= SOCKETBUFSIZE)
261 end -= SOCKETBUFSIZE; 407 end -= SOCKETBUFSIZE;
262 408
263 avail = SOCKETBUFSIZE - end; 409 avail = SOCKETBUFSIZE - end;
264 410
265 /* We can all fit it behind the current data without wrapping */ 411 /* We can all fit it behind the current data without wrapping */
266 if (avail >= len) 412 if (avail >= len)
267 memcpy (ns->outputbuffer.data + end, buf, len); 413 memcpy (outputbuffer.data + end, buf, len);
268 else 414 else
269 { 415 {
270 memcpy (ns->outputbuffer.data + end, buf, avail); 416 memcpy (outputbuffer.data + end, buf, avail);
271 memcpy (ns->outputbuffer.data, buf + avail, len - avail); 417 memcpy (outputbuffer.data, buf + avail, len - avail);
272 } 418 }
273 419
274 ns->outputbuffer.len += len; 420 outputbuffer.len += len;
275#if 0
276 LOG (llevDebug, "Added %d to output buffer, total length now %d, start=%d\n", len, ns->outputbuffer.len, ns->outputbuffer.start);
277#endif
278} 421}
279
280/**
281 * Writes data to socket.
282 *
283 * When the socket is clear to write, and we have backlogged data, this
284 * is called to write it out.
285 */
286void
287write_socket_buffer (NewSocket * ns)
288{
289 int amt, max;
290
291 if (ns->outputbuffer.len == 0)
292 {
293 LOG (llevDebug, "write_socket_buffer called when there is no data, fd=%d\n", ns->fd);
294 return;
295 }
296
297 do
298 {
299 max = SOCKETBUFSIZE - ns->outputbuffer.start;
300 if (ns->outputbuffer.len < max)
301 max = ns->outputbuffer.len;
302
303 do
304 {
305 amt = write (ns->fd, ns->outputbuffer.data + ns->outputbuffer.start, max);
306 }
307 while ((amt < 0) && (errno == EINTR));
308
309 if (amt < 0)
310 { /* We got an error */
311
312 if (errno != EWOULDBLOCK)
313 {
314 LOG (llevError, "New socket write failed (wsb) (%d: %s).\n", errno, strerror (errno));
315 ns->status = Ns_Dead;
316 return;
317 }
318 else
319 { /* EWOULDBLOCK */
320 /* can't write it, so store it away. */
321 ns->can_write = 0;
322 return;
323 }
324 }
325 ns->outputbuffer.start += amt;
326 /* wrap back to start of buffer */
327 if (ns->outputbuffer.start == SOCKETBUFSIZE)
328 ns->outputbuffer.start = 0;
329 ns->outputbuffer.len -= amt;
330#ifdef CS_LOGSTATS
331 cst_tot.obytes += amt;
332 cst_lst.obytes += amt;
333#endif
334 }
335 while (ns->outputbuffer.len > 0);
336}
337
338/**
339 * This writes data to the socket. - It is very low level -
340 * all we try and do is write out the data to the socket
341 * provided (ns). buf is the data to write, len is the number
342 * of bytes to write. IT doesn't return anything - rather, it
343 * updates the ns structure if we get an error.
344 */
345void
346Write_To_Socket (NewSocket * ns, char *buf, int len)
347{
348 int amt = 0;
349 char *pos = buf;
350
351 if (ns->status == Ns_Dead || !buf)
352 {
353 LOG (llevDebug, "Write_To_Socket called with dead socket\n");
354 return;
355 }
356
357#ifndef __GNU__ /* This caused problems on Hurd */
358 if (!ns->can_write)
359 {
360 add_to_buffer (ns, buf, len);
361 return;
362 }
363#endif
364 /* If we manage to write more than we wanted, take it as a bonus */
365 while (len > 0)
366 {
367
368 do
369 {
370 amt = write (ns->fd, pos, len);
371 }
372 while ((amt < 0) && (errno == EINTR));
373
374 if (amt < 0)
375 { /* We got an error */
376 if (errno != EWOULDBLOCK)
377 {
378 LOG (llevError, "New socket write failed WTS (%d: %s).\n", /* ---WIN32 */
379 errno, strerror (errno));
380 ns->status = Ns_Dead;
381 return;
382 }
383 else
384 { /* EWOULDBLOCK */
385 /* can't write it, so store it away. */
386 add_to_buffer (ns, pos, len);
387 ns->can_write = 0;
388 return;
389 }
390 }
391 /* amt gets set to 0 above in blocking code, so we do this as
392 * an else if to make sure we don't reprocess it.
393 */
394 else if (amt == 0)
395 {
396 LOG (llevError, "Write_To_Socket: No data written out.\n");
397 }
398 len -= amt;
399 pos += amt;
400#ifdef CS_LOGSTATS
401 cst_tot.obytes += amt;
402 cst_lst.obytes += amt;
403#endif
404 }
405}
406
407 422
408/** 423/**
409 * Takes a string of data, and writes it out to the socket. A very handy 424 * Takes a string of data, and writes it out to the socket. A very handy
410 * shortcut function. 425 * shortcut function.
411 */ 426 */
412void 427void
413cs_write_string (NewSocket * ns, const char *buf, int len) 428client::send_packet (packet &sl)
414{ 429{
415 SockList sl; 430 if (destroyed ())
416
417 sl.len = len;
418 sl.buf = (unsigned char *) buf;
419 Send_With_Handling (ns, &sl);
420}
421
422
423/**
424 * Calls Write_To_Socket to send data to the client.
425 *
426 * The only difference in this function is that we take a SockList
427 *, and we prepend the length information.
428 */
429void
430Send_With_Handling (NewSocket * ns, SockList * msg)
431{
432 unsigned char sbuf[4];
433
434 if (ns->status == Ns_Dead || !msg)
435 return; 431 return;
436 432
437 if (msg->len >= MAXSOCKBUF) 433 if (sl.length () >= MAXSOCKBUF)
438 { 434 {
439 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", msg->len); 435 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());
440 /* Almost certainly we've overflowed a buffer, so quite now to make 436 /* Almost certainly we've overflowed a buffer, so quit now to make
441 * it easier to debug. 437 * it easier to debug.
442 */ 438 */
443 abort (); 439 abort ();
444 } 440 }
445 sbuf[0] = ((uint32) (msg->len) >> 8) & 0xFF;
446 sbuf[1] = ((uint32) (msg->len)) & 0xFF;
447 if (ns->status != Ns_Old)
448 Write_To_Socket (ns, (char *) sbuf, 2);
449 Write_To_Socket (ns, (char *) msg->buf, msg->len);
450}
451 441
452/** 442 if (!sl.length ())
453 * Takes a string of data, and writes it out to the socket. A very handy 443 return;
454 * shortcut function. 444
445 assert (sl.hdrlen == 2);
446
447 sl.buf_ [0] = sl.length () >> 8;
448 sl.buf_ [1] = sl.length () ;
449
450 send (sl.buf_, sl.length () + sl.hdrlen);
451}
452
453void
454client::send_packet (const char *buf, int len)
455{
456 packet sl;
457
458 sl << data (buf, len);
459 send_packet (sl);
460}
461
462void
463client::send_packet (const char *buf)
464{
465 send_packet (buf, strlen (buf));
466}
467
468void
469client::send_packet_printf (const char *format, ...)
470{
471 packet sl;
472
473 va_list ap;
474 va_start (ap, format);
475 sl.vprintf (format, ap);
476 va_end (ap);
477
478 send_packet (sl);
479}
480
481/***********************************************************************
455 */ 482 *
456void 483 * packet functions/utilities
457Write_String_To_Socket (NewSocket * ns, char *buf, int len) 484 *
458{ 485 **********************************************************************/
459 SockList sl;
460 486
461 sl.len = len; 487packet::packet (const char *name)
462 sl.buf = (unsigned char *) buf; 488{
463 Send_With_Handling (ns, &sl); 489 reset ();
464}
465 490
491 int len = strlen (name);
492 memcpy (cur, name, len); cur += len;
493 *cur++ = ' ';
494}
495
496packet &packet::operator <<(const data &v)
497{
498 if (room () < v.len)
499 reset ();
500 else
501 {
502 if (v.len)
503 {
504 memcpy (cur, v.ptr, v.len);
505 cur += v.len;
506 }
507 }
508
509 return *this;
510}
511
512packet &packet::operator <<(const data8 &v)
513{
514 unsigned int len = min (v.len, 0x00FF);
515 return *this << uint8 (len) << data (v.ptr, len);
516}
517
518packet &packet::operator <<(const data16 &v)
519{
520 unsigned int len = min (v.len, 0xFFFF);
521 return *this << uint16 (len) << data (v.ptr, len);
522}
523
524packet &packet::operator <<(const char *v)
525{
526 return *this << data (v, strlen (v ? v : 0));
527}
528
529void
530packet::vprintf (const char *format, va_list ap)
531{
532 int size = room ();
533
534 int len = vsnprintf ((char *)cur, size, format, ap);
535
536 if (len >= size)
537 return reset ();
538
539 cur += len;
540}
466 541
467/****************************************************************************** 542/******************************************************************************
468 * 543 *
469 * statistics logging functions. 544 * statistics logging functions.
470 * 545 *
… …
493 LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n", 568 LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n",
494 ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn, 569 ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn,
495 now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start); 570 now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start);
496 cst_lst.ibytes = 0; 571 cst_lst.ibytes = 0;
497 cst_lst.obytes = 0; 572 cst_lst.obytes = 0;
498 cst_lst.max_conn = socket_info.nconns;
499 cst_lst.time_start = now; 573 cst_lst.time_start = now;
500} 574}
501#endif 575#endif
502 576

Diff Legend

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