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.1 by elmex, Sun Aug 13 17:16:06 2006 UTC vs.
Revision 1.34 by pippijn, Thu Mar 1 12:28:17 2007 UTC

1
2/* 1/*
3 * static char *rcsid_sockets_c = 2 * CrossFire, A Multiplayer game for X-windows
4 * "$Id: lowlevel.C,v 1.1 2006/08/13 17:16:06 elmex Exp $"; 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 1992 Frank Tore Johansen
6 *
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or
10 * (at your option) any later version.
11 *
12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details.
16 *
17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 *
21 * The author can be reached via e-mail to mark@pyramid.com
5 */ 22 */
6 23
7/*
8 CrossFire, A Multiplayer game for X-windows
9
10 Copyright (C) 1992 Frank Tore Johansen
11
12 This program is free software; you can redistribute it and/or modify
13 it under the terms of the GNU General Public License as published by
14 the Free Software Foundation; either version 2 of the License, or
15 (at your option) any later version.
16
17 This program is distributed in the hope that it will be useful,
18 but WITHOUT ANY WARRANTY; without even the implied warranty of
19 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 GNU General Public License for more details.
21
22 You should have received a copy of the GNU General Public License
23 along with this program; if not, write to the Free Software
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25
26 The author can be reached via e-mail to mark@pyramid.com
27*/
28
29/** 24/**
30 * \file 25 * \file
31 * Low-level socket-related functions. 26 * Low-level socket-related functions.
32 * 27 *
33 * \date 2003-12-02 28 * \date 2003-12-02
39 */ 34 */
40 35
41using namespace std; 36using namespace std;
42 37
43#include <global.h> 38#include <global.h>
44#include <newclient.h>
45#include <sproto.h> 39#include <sproto.h>
40#include <cstdarg>
46 41
47#ifdef __linux__ 42#ifdef __linux__
48# include <sys/types.h> 43# include <sys/types.h>
49# include <sys/socket.h> 44# include <sys/socket.h>
50# include <netinet/in.h> 45# include <netinet/in.h>
51# define TCP_HZ 1000 // sorry...
52# include <netinet/tcp.h> 46# include <netinet/tcp.h>
53#endif 47#endif
54 48
55// 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
56// easily die in 20 seconds... 50// easily die in 20 seconds...
57#define SOCKET_TIMEOUT1 10 51#define SOCKET_TIMEOUT1 10 * 1000
58#define SOCKET_TIMEOUT2 20 52#define SOCKET_TIMEOUT2 20 * 1000
59 53
60void Socket_Flush (NewSocket *ns) 54void
55client::flush ()
61{ 56{
57 if (destroyed ())
58 return;
59
62#ifdef __linux__ 60#ifdef __linux__
63 // check time of last ack, and, if too old, kill connection 61 // check time of last ack, and, if too old, kill connection
64 struct tcp_info tcpi; 62 struct tcp_info tcpi;
65 socklen_t len = sizeof (tcpi); 63 socklen_t len = sizeof (tcpi);
66 64
67 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))
68 { 66 {
69 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;
70 68
71 if (tcpi.tcpi_unacked 69 rtt = tcpi.tcpi_rtt;
70 rttvar = tcpi.tcpi_rttvar;
71
72 && 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
73 && 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
74 { 74 {
75 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,
76 (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);
77 ns->status = Ns_Dead; 77 destroy ();
78 } 78 }
79 } 79 }
80
81 int val;
82 val = 0; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val));
83 val = 1; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val));
84#endif 80#endif
85}
86 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
87/*********************************************************************** 178/*****************************************************************************
88 * 179 * Start of command dispatch area.
89 * SockList functions/utilities 180 * The commands here are protocol commands.
90 *
91 **********************************************************************/ 181 ****************************************************************************/
92 182
93void SockList_Init(SockList *sl) 183// SocketCommand, PlayingCommand, should not exist with those ugly casts
94{ 184#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb),
95 sl->len=0; 185#define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER |
96 sl->buf=NULL;
97}
98 186
99void SockList_AddChar(SockList *sl, char c) 187/**
100{ 188 * Dispatch table for the server.
101 sl->buf[sl->len]=c;
102 sl->len++;
103}
104
105void SockList_AddShort(SockList *sl, uint16 data)
106{
107 sl->buf[sl->len++]= (data>>8)&0xff;
108 sl->buf[sl->len++] = data & 0xff;
109}
110
111
112void SockList_AddInt(SockList *sl, uint32 data)
113{
114 sl->buf[sl->len++]= (data>>24)&0xff;
115 sl->buf[sl->len++]= (data>>16)&0xff;
116 sl->buf[sl->len++]= (data>>8)&0xff;
117 sl->buf[sl->len++] = data & 0xff;
118}
119
120void SockList_AddInt64(SockList *sl, uint64 data)
121{
122 sl->buf[sl->len++]= ( char )( (data>>56)&0xff );
123 sl->buf[sl->len++]= ( char )( (data>>48)&0xff );
124 sl->buf[sl->len++]= ( char )( (data>>40)&0xff );
125 sl->buf[sl->len++]= ( char )( (data>>32)&0xff );
126
127 sl->buf[sl->len++]= ( char )( (data>>24)&0xff );
128 sl->buf[sl->len++]= ( char )( (data>>16)&0xff );
129 sl->buf[sl->len++]= ( char )( (data>>8)&0xff );
130 sl->buf[sl->len++] =( char )( data & 0xff );
131}
132
133/* Basically does the reverse of SockList_AddInt, but on
134 * strings instead. Same for the GetShort, but for 16 bits.
135 */ 189 */
136int GetInt_String(unsigned char *data) 190static struct packet_type packets[] = {
137{ 191 {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 },
138 return ((data[0]<<24) + (data[1]<<16) + (data[2]<<8) + data[3]); 192 {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 },
139}
140 193
141short GetShort_String(unsigned char *data) { 194 {"examine", PC(ExamineCmd) PF_PLAYING },
142 return ((data[0]<<8)+data[1]); 195 {"apply", PC(ApplyCmd) PF_PLAYING },
143} 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+ */
144 203
145/****************************************************************************** 204 {"reply", SC(ReplyCmd) 0 },
146 * 205 {"exti", SC(ExtiCmd) 0 }, /* CF+ */
147 * Start of read routines. 206 {"addme", SC(AddMeCmd) 0 },
148 * 207 {"askface", SC(SendFaceCmd) 0 }, /* Added: phil */
149 ******************************************************************************/ 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};
150 217
151/** 218bool
152 * This reads from fd and puts the data in sl. We return true if we think 219client::may_execute (const packet_type *pkt) const
153 * we have a full packet, 0 if we have a partial packet. The only processing
154 * we do is remove the intial size value. len (As passed) is the size of the
155 * buffer allocated in the socklist. We make the assumption the buffer is
156 * at least 2 bytes long.
157 */
158
159int SockList_ReadPacket(int fd, SockList *sl, int len)
160{ 220{
161 int stat,toread; 221 return (!(pkt->flags & PF_PLAYER) || pl)
222 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING);
223}
162 224
163 /* Sanity check - shouldn't happen */ 225// HACK: some commands currently should be executed
164 if (sl->len < 0) { 226// even when the player is frozen. this hack detects
165 abort(); 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)
166 } 240 {
167 /* We already have a partial packet */ 241 data += 6;
168 if (sl->len<2) { 242 len -= 6;
169#ifdef WIN32 /* ***WIN32 SockList_ReadPacket: change read() to recv() */
170
171 stat=recv(fd, sl->buf + sl->len, 2-sl->len,0);
172
173#else
174 do {
175 stat=read(fd, sl->buf + sl->len, 2-sl->len);
176 } while ((stat==-1) && (errno==EINTR));
177#endif
178 if (stat<0) {
179 /* In non blocking mode, EAGAIN is set when there is no
180 * data available.
181 */
182#ifdef WIN32 /* ***WIN32 SockList_ReadPacket: error handling for win32 */
183 if ((stat==-1) && WSAGetLastError() !=WSAEWOULDBLOCK) {
184 if(WSAGetLastError() == WSAECONNRESET)
185 LOG(llevDebug,"Connection closed by client\n");
186 else
187 {
188 LOG(llevDebug,"ReadPacket got error %d, returning 0\n",WSAGetLastError());
189 }
190 return -1; /* kick this user! */
191 } 243 }
192#else 244
193 if (errno != EAGAIN && errno !=EWOULDBLOCK) { 245 if (len > 4 && !strncmp (data, "say " , 4))
194 LOG(llevDebug, "ReadPacket got error %s, returning 0\n", strerror_local(errno)); 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);
195 } 263 }
196#endif 264 else
197 return 0; /*Error */ 265 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED, pkt->name);
198 } 266}
199 if (stat==0) return -1; 267
200 sl->len += stat; 268bool
201#ifdef CS_LOGSTATS 269client::handle_packet ()
202 cst_tot.ibytes += stat; 270{
203 cst_lst.ibytes += stat; 271 int pkt_len = next_packet ();
204#endif 272
205 if (stat<2) return 0; /* Still don't have a full packet */ 273 if (!pkt_len)
274 return false;
275 else if (pkt_len < 0)
206 } 276 {
207 /* Figure out how much more data we need to read. Add 2 from the 277 LOG (llevError, "read error on player %s\n",
208 * end of this - size header information is not included. 278 pl && pl->ob ? &pl->ob->name : "[anonymous]");
209 */ 279 destroy ();
210 toread = 2+(sl->buf[0] << 8) + sl->buf[1] - sl->len; 280 return false;
211 if ((toread + sl->len) >= len) {
212 LOG(llevError,"SockList_ReadPacket: Want to read more bytes than will fit in buffer (%d>=%d).\n",
213 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
224 /* return error so the socket is closed */
225 return -1;
226 }
227 do {
228#ifdef WIN32 /* ***win32 SockList_ReadPacket: change read() to recv() */
229 stat = recv(fd, sl->buf+ sl->len, toread, 0);
230#else
231 do {
232 stat = read(fd, sl->buf+ sl->len, toread);
233 } while ((stat<0) && (errno==EINTR));
234#endif
235 if (stat<0) {
236
237#ifdef WIN32 /* ***win32 SockList_ReadPacket: change error handling for win32 */
238 if ((stat==-1) && WSAGetLastError() !=WSAEWOULDBLOCK) {
239 if(WSAGetLastError() == WSAECONNRESET)
240 LOG(llevDebug,"Connection closed by client\n");
241 else
242 {
243 LOG(llevDebug,"ReadPacket got error %d, returning 0\n",WSAGetLastError());
244 }
245 return -1; /* kick this user! */
246 } 281 }
247#else 282
248 if (errno != EAGAIN && errno !=EWOULDBLOCK) { 283 inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */
249 LOG(llevDebug, "ReadPacket got error %s, returning 0\n", strerror_local(errno)); 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);
250 } 297 }
251#endif 298 else
252 return 0; /*Error */ 299 {
253 } 300 data = (char *)inbuf + 2; // better read garbage than segfault
254 if (stat==0) return -1; 301 datalen = 0;
255 sl->len += stat; 302 }
256#ifdef CS_LOGSTATS 303
257 cst_tot.ibytes += stat; 304 for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt)
258 cst_lst.ibytes += stat; 305 if (!strcmp ((char *)inbuf + 2, pkt->name))
259#endif 306 {
260 toread -= stat; 307 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen))
261 if (toread==0) return 1; 308 queue_command (pkt, data, datalen);
262 if (toread < 0) { 309 else
263 LOG(llevError,"SockList_ReadPacket: Read more bytes than desired.\n"); 310 execute (pkt, data, datalen);
264 return 1; 311
265 } 312 goto next_packet;
266 } while (toread>0); 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);
267 return 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)
352 {
353 // input buffer full
354 socket_ev.poll (socket_ev.poll () & ~PE_R);
355 return;
356 }
357
358 amount = read (fd, inbuf + inbuf_len, amount);
359
360 if (!amount)
361 {
362 destroy ();
363 return;
364 }
365 else if (amount < 0)
366 {
367 if (errno != EAGAIN && errno != EINTR)
368 {
369 LOG (llevError, "read error: %s\n", strerror (errno));
370 destroy ();
371 return;
372 }
373
374 // should not be here, normally
375 }
376 else
377 {
378 inbuf_len += amount;
379
380 cst_tot.ibytes += amount;
381 cst_lst.ibytes += amount;
382
383 cmd_ev.start ();
384 }
385 }
386}
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 ();
268} 396}
269 397
270/******************************************************************************* 398/*******************************************************************************
271 * 399 *
272 * Start of write related routines. 400 * Start of write related routines.
277 * Adds data to a socket buffer for whatever reason. 405 * Adds data to a socket buffer for whatever reason.
278 * 406 *
279 * 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
280 * data, and len is the number of bytes to add. 408 * data, and len is the number of bytes to add.
281 */ 409 */
282 410void
283static void add_to_buffer(NewSocket *ns, char *buf, int len) 411client::send (void *buf_, int len)
284{ 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
285 int avail, end; 425 int avail, end;
286 426
287 if ((len+ns->outputbuffer.len)>SOCKETBUFSIZE) {
288 LOG(llevDebug,"Socket on fd %d has overrun internal buffer - marking as dead\n",
289 ns->fd);
290 ns->status = Ns_Dead;
291 return;
292 }
293
294 /* 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
295 * currently in use is actually data + end -1 428 * currently in use is actually data + end -1
296 */ 429 */
297
298 end=ns->outputbuffer.start + ns->outputbuffer.len; 430 end = outputbuffer.start + outputbuffer.len;
299 /* The buffer is already in a wrapped state, so adjust end */ 431 /* The buffer is already in a wrapped state, so adjust end */
300 if (end>=SOCKETBUFSIZE) end-=SOCKETBUFSIZE; 432 if (end >= SOCKETBUFSIZE)
433 end -= SOCKETBUFSIZE;
434
301 avail=SOCKETBUFSIZE - end; 435 avail = SOCKETBUFSIZE - end;
302 436
303 /* We can all fit it behind the current data without wrapping */ 437 /* We can all fit it behind the current data without wrapping */
304 if (avail >=len ) { 438 if (avail >= len)
305 memcpy(ns->outputbuffer.data + end, buf, len); 439 memcpy (outputbuffer.data + end, buf, len);
440 else
306 } 441 {
307 else {
308 memcpy(ns->outputbuffer.data + end, buf, avail); 442 memcpy (outputbuffer.data + end, buf, avail);
309 memcpy(ns->outputbuffer.data, buf+avail, len-avail); 443 memcpy (outputbuffer.data, buf + avail, len - avail);
310 }
311 ns->outputbuffer.len += len;
312#if 0
313 LOG(llevDebug,"Added %d to output buffer, total length now %d, start=%d\n", len,
314 ns->outputbuffer.len, ns->outputbuffer.start);
315#endif
316}
317
318/**
319 * Writes data to socket.
320 *
321 * When the socket is clear to write, and we have backlogged data, this
322 * is called to write it out.
323 */
324void write_socket_buffer(NewSocket *ns)
325{
326 int amt, max;
327
328 if (ns->outputbuffer.len==0) {
329 LOG(llevDebug,"write_socket_buffer called when there is no data, fd=%d\n",
330 ns->fd);
331 return;
332 }
333
334 do {
335 max = SOCKETBUFSIZE - ns->outputbuffer.start;
336 if (ns->outputbuffer.len<max) max = ns->outputbuffer.len;
337
338#ifdef WIN32 /* ***win32 write_socket_buffer: change write() to send() */
339 amt=send(ns->fd, ns->outputbuffer.data + ns->outputbuffer.start, max,0);
340#else
341 do {
342 amt=write(ns->fd, ns->outputbuffer.data + ns->outputbuffer.start, max);
343 } while ((amt<0) && (errno==EINTR));
344#endif
345
346 if (amt < 0) { /* We got an error */
347
348#ifdef WIN32 /* ***win32 write_socket_buffer: change error handling */
349 if (amt == -1 && WSAGetLastError() !=WSAEWOULDBLOCK) {
350 LOG(llevError,"New socket write failed (wsb) (%d).\n", WSAGetLastError());
351#else
352 if (errno !=EWOULDBLOCK) {
353 LOG(llevError,"New socket write failed (wsb) (%d: %s).\n",
354 errno, strerror_local(errno));
355#endif
356 ns->status=Ns_Dead;
357 return;
358 } 444 }
359 else { /* EWOULDBLOCK */
360 /* can't write it, so store it away. */
361 ns->can_write=0;
362 return;
363 }
364 }
365 ns->outputbuffer.start += amt;
366 /* wrap back to start of buffer */
367 if (ns->outputbuffer.start==SOCKETBUFSIZE) ns->outputbuffer.start=0;
368 ns->outputbuffer.len -= amt;
369#ifdef CS_LOGSTATS
370 cst_tot.obytes += amt;
371 cst_lst.obytes += amt;
372 #endif
373 } while (ns->outputbuffer.len>0);
374}
375 445
376/** 446 outputbuffer.len += len;
377 * This writes data to the socket. - It is very low level -
378 * all we try and do is write out the data to the socket
379 * provided (ns). buf is the data to write, len is the number
380 * of bytes to write. IT doesn't return anything - rather, it
381 * updates the ns structure if we get an error.
382 */
383void Write_To_Socket(NewSocket *ns, char *buf, int len)
384{
385 int amt=0;
386 char *pos=buf;
387
388 if (ns->status == Ns_Dead || !buf) {
389 LOG(llevDebug,"Write_To_Socket called with dead socket\n");
390 return;
391 }
392
393#ifndef __GNU__ /* This caused problems on Hurd */
394 if (!ns->can_write) {
395 add_to_buffer(ns, buf, len);
396 return;
397 }
398#endif
399 /* If we manage to write more than we wanted, take it as a bonus */
400 while (len>0) {
401
402#ifdef WIN32 /* ***win32 Write_To_Socket: change write() to send() */
403 amt=send(ns->fd, pos, len,0);
404#else
405 do {
406 amt=write(ns->fd, pos, len);
407 } while ((amt<0) && (errno==EINTR));
408#endif
409
410 if (amt < 0) { /* We got an error */
411#ifdef WIN32 /* ***win32 Write_To_Socket: change error handling */
412 if (amt == -1 && WSAGetLastError() !=WSAEWOULDBLOCK) {
413 LOG(llevError,"New socket write failed WTS (%d).\n",WSAGetLastError());
414#else
415 if (errno !=EWOULDBLOCK) {
416 LOG(llevError,"New socket write failed WTS (%d: %s).\n", /* ---WIN32 */
417 errno, strerror_local(errno));
418#endif
419 ns->status=Ns_Dead;
420 return;
421 }
422 else { /* EWOULDBLOCK */
423 /* can't write it, so store it away. */
424 add_to_buffer(ns, pos, len);
425 ns->can_write=0;
426 return;
427 }
428 }
429 /* amt gets set to 0 above in blocking code, so we do this as
430 * an else if to make sure we don't reprocess it.
431 */
432 else if (amt==0) {
433 LOG(llevError,"Write_To_Socket: No data written out.\n");
434 }
435 len -= amt;
436 pos += amt;
437#ifdef CS_LOGSTATS
438 cst_tot.obytes += amt;
439 cst_lst.obytes += amt;
440 #endif
441 }
442} 447}
443
444 448
445/** 449/**
446 * 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
447 * shortcut function. 451 * shortcut function.
448 */ 452 */
449void cs_write_string(NewSocket *ns, const char *buf, int len) 453void
454client::send_packet (packet &sl)
450{ 455{
451 SockList sl; 456 if (destroyed ())
457 return;
452 458
453 sl.len = len;
454 sl.buf = (unsigned char*)buf;
455 Send_With_Handling(ns, &sl);
456}
457
458
459/**
460 * Calls Write_To_Socket to send data to the client.
461 *
462 * The only difference in this function is that we take a SockList
463 *, and we prepend the length information.
464 */
465void Send_With_Handling(NewSocket *ns,SockList *msg)
466{
467 unsigned char sbuf[4];
468
469 if (ns->status == Ns_Dead || !msg)
470 return;
471
472 if (msg->len >= MAXSOCKBUF) { 459 if (sl.length () >= MAXSOCKBUF)
460 {
473 LOG(llevError,"Trying to send a buffer beyond properly size, len =%d\n", 461 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());
474 msg->len);
475 /* 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
476 * it easier to debug. 463 * it easier to debug.
477 */ 464 */
478 abort(); 465 abort ();
479 } 466 }
480 sbuf[0] = ((uint32)(msg->len) >> 8) & 0xFF;
481 sbuf[1] = ((uint32)(msg->len)) & 0xFF;
482 if (ns->status != Ns_Old)
483 Write_To_Socket(ns, (char *) sbuf, 2);
484 Write_To_Socket(ns, (char*)msg->buf, msg->len);
485}
486 467
487/** 468 if (!sl.length ())
488 * Takes a string of data, and writes it out to the socket. A very handy 469 return;
489 * 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/***********************************************************************
490 */ 508 *
491void Write_String_To_Socket(NewSocket *ns, char *buf, int len) 509 * packet functions/utilities
492{ 510 *
493 SockList sl; 511 **********************************************************************/
494 512
495 sl.len = len; 513packet::packet (const char *name)
496 sl.buf = (unsigned char*) buf; 514{
497 Send_With_Handling(ns, &sl); 515 reset ();
498}
499 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}
500 567
501/****************************************************************************** 568/******************************************************************************
502 * 569 *
503 * statistics logging functions. 570 * statistics logging functions.
504 * 571 *
505 ******************************************************************************/ 572 ******************************************************************************/
506 573
507#ifdef CS_LOGSTATS 574#ifdef CS_LOGSTATS
575
508/* cst_tot is for the life of the server, cst_last is for the last series of 576/* cst_tot is for the life of the server, cst_last is for the last series of
509 * stats 577 * stats
510 */ 578 */
511CS_Stats cst_tot, cst_lst; 579CS_Stats cst_tot, cst_lst;
512 580
513/** 581/**
514 * Writes out the gathered stats. We clear cst_lst. 582 * Writes out the gathered stats. We clear cst_lst.
515 */ 583 */
584void
516void write_cs_stats(void) 585write_cs_stats (void)
517{ 586{
518 time_t now=time(NULL); 587 time_t now = time (NULL);
519 588
520 /* If no connections recently, don't both to log anything */ 589 /* If no connections recently, don't both to log anything */
521 if (cst_lst.ibytes==0 && cst_lst.obytes==0) return; 590 if (cst_lst.ibytes == 0 && cst_lst.obytes == 0)
591 return;
522 592
523 /* CSSTAT is put in so scripts can easily find the line */ 593 /* CSSTAT is put in so scripts can easily find the line */
524 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",
525 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,
526 now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, 596 now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start);
527 cst_lst.max_conn, now - cst_lst.time_start);
528 cst_lst.ibytes=0; 597 cst_lst.ibytes = 0;
529 cst_lst.obytes=0; 598 cst_lst.obytes = 0;
530 cst_lst.max_conn=socket_info.nconns;
531 cst_lst.time_start=now; 599 cst_lst.time_start = now;
532} 600}
533#endif 601#endif
602

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines