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

Diff Legend

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