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.7 by root, Sun Nov 26 19:48:50 2006 UTC vs.
Revision 1.29 by root, Thu Dec 21 23:37:06 2006 UTC

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

Diff Legend

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