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.25 by root, Sun Dec 17 19:14:00 2006 UTC

1
2/*
3 * static char *rcsid_sockets_c =
4 * "$Id: lowlevel.C,v 1.1 2006/08/13 17:16:06 elmex Exp $";
5 */
6
7/* 1/*
8 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
9 3
10 Copyright (C) 1992 Frank Tore Johansen 4 Copyright (C) 1992 Frank Tore Johansen
11 5
39 */ 33 */
40 34
41using namespace std; 35using namespace std;
42 36
43#include <global.h> 37#include <global.h>
44#include <newclient.h>
45#include <sproto.h> 38#include <sproto.h>
39#include <cstdarg>
46 40
47#ifdef __linux__ 41#ifdef __linux__
48# include <sys/types.h> 42# include <sys/types.h>
49# include <sys/socket.h> 43# include <sys/socket.h>
50# include <netinet/in.h> 44# include <netinet/in.h>
51# define TCP_HZ 1000 // sorry... 45# 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
58#define SOCKET_TIMEOUT2 20 52#define SOCKET_TIMEOUT2 20
59 53
60void Socket_Flush (NewSocket *ns) 54void
55client::flush ()
61{ 56{
62#ifdef __linux__ 57#ifdef __linux__
63 // check time of last ack, and, if too old, kill connection 58 // check time of last ack, and, if too old, kill connection
64 struct tcp_info tcpi; 59 struct tcp_info tcpi;
65 socklen_t len = sizeof (tcpi); 60 socklen_t len = sizeof (tcpi);
66 61
67 if (!getsockopt (ns->fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi)) 62 if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))
68 { 63 {
69 unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent; 64 unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent;
70 65
71 if (tcpi.tcpi_unacked 66 rtt = tcpi.tcpi_rtt;
67 rttvar = tcpi.tcpi_rttvar;
68
72 && SOCKET_TIMEOUT1 * TCP_HZ < diff && diff < 0x80000000UL // ack delayed for 20s 69 if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 * TCP_HZ < diff && diff < 0x80000000UL // ack delayed for 20s
73 && SOCKET_TIMEOUT2 * TCP_HZ < tcpi.tcpi_last_data_sent) // no data sent for 10s 70 && SOCKET_TIMEOUT2 * TCP_HZ < tcpi.tcpi_last_data_sent) // no data sent for 10s
74 { 71 {
75 LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", ns->fd, 72 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); 73 (unsigned) tcpi.tcpi_last_ack_recv, (unsigned) tcpi.tcpi_last_data_sent, (unsigned) tcpi.tcpi_unacked);
77 ns->status = Ns_Dead; 74 destroy ();
78 } 75 }
79 } 76 }
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 77#endif
85}
86 78
79 /**
80 * Writes data to socket.
81 *
82 * When the socket is clear to write, and we have backlogged data, this
83 * is called to write it out.
84 */
85
86 if (!outputbuffer.len || socket_ev.poll () & PE_W)
87 return;
88
89 write_outputbuffer ();
90}
91
92void
93client::write_outputbuffer ()
94{
95 while (outputbuffer.len)
96 {
97 int res = write (fd, outputbuffer.data + outputbuffer.start,
98 min (outputbuffer.len, SOCKETBUFSIZE - outputbuffer.start));
99
100 if (res > 0)
101 {
102 outputbuffer.start += res;
103 /* wrap back to start of buffer */
104 if (outputbuffer.start == SOCKETBUFSIZE)
105 outputbuffer.start = 0;
106
107 outputbuffer.len -= res;
108#ifdef CS_LOGSTATS
109 cst_tot.obytes += res;
110 cst_lst.obytes += res;
111#endif
112 }
113 else if (res == 0)
114 {
115 LOG (llevError, "socket write failed, connection closed.\n");
116 destroy ();
117 return;
118 }
119 else if (errno == EINTR)
120 {
121 // just retry
122 }
123 else if (errno == EAGAIN)
124 {
125 // delay till ready
126 socket_ev.poll (socket_ev.poll () | PE_W);
127 socket_ev.start ();
128 return;
129 }
130 else
131 {
132 LOG (llevError, "socket write failed: %s\n", strerror (errno));
133 destroy ();
134 return;
135 }
136 }
137
138 socket_ev.poll (socket_ev.poll () & ~PE_W);
139}
140
141/******************************************************************************
142 *
143 * Start of read routines.
144 *
145 ******************************************************************************/
146
147int
148client::next_packet ()
149{
150 if (inbuf_len >= 2)
151 {
152 int pkt_len = (inbuf [0] << 8) | inbuf [1];
153
154 if (inbuf_len >= 2 + pkt_len)
155 return 2 + pkt_len;
156
157 if (inbuf_len == sizeof (inbuf))
158 {
159 send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED);
160 destroy ();
161 return -1;
162 }
163 }
164
165 return 0;
166}
167
168void
169client::skip_packet (int len)
170{
171 inbuf_len -= len;
172 memmove (inbuf, inbuf + len, inbuf_len);
173}
174
87/*********************************************************************** 175/*****************************************************************************
88 * 176 * Start of command dispatch area.
89 * SockList functions/utilities 177 * The commands here are protocol commands.
90 *
91 **********************************************************************/ 178 ****************************************************************************/
92 179
93void SockList_Init(SockList *sl) 180// SocketCommand, PlayingCommand, should not exist with those ugly casts
94{ 181#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb),
95 sl->len=0; 182#define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER |
96 sl->buf=NULL;
97}
98 183
99void SockList_AddChar(SockList *sl, char c) 184/**
100{ 185 * 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 */ 186 */
136int GetInt_String(unsigned char *data) 187static struct packet_type packets[] = {
137{ 188 {"ncom", PC(NewPlayerCmd) PF_PLAYING },
138 return ((data[0]<<24) + (data[1]<<16) + (data[2]<<8) + data[3]); 189 {"command", PC(PlayerCmd) PF_PLAYING },
139}
140 190
141short GetShort_String(unsigned char *data) { 191 {"examine", PC(ExamineCmd) PF_PLAYING },
142 return ((data[0]<<8)+data[1]); 192 {"apply", PC(ApplyCmd) PF_PLAYING },
143} 193 {"reply", PC(ReplyCmd) PF_IMMEDIATE },
194 {"lookat", PC(LookAt) PF_PLAYING },
195 {"lock", PC(LockItem) PF_PLAYING },
196 {"mark", PC(MarkItem) PF_PLAYING },
197 {"move", PC(MoveCmd) PF_PLAYING },
198 {"exti", PC(ExtCmd) PF_IMMEDIATE }, /* CF+ */
199 {"ext", PC(ExtCmd) 0 }, /* CF+ */
200 {"mapredraw", PC(MapRedrawCmd) PF_IMMEDIATE }, /* Added: phil */
201 {"mapinfo", PC(MapInfoCmd) 0 }, /* CF+ */
144 202
145/****************************************************************************** 203 {"addme", SC(AddMeCmd) PF_IMMEDIATE },
146 * 204 {"askface", SC(SendFaceCmd) PF_IMMEDIATE }, /* Added: phil */
147 * Start of read routines. 205 {"requestinfo", SC(RequestInfo) PF_IMMEDIATE },
148 * 206 {"setfacemode", SC(SetFaceMode) PF_IMMEDIATE },
149 ******************************************************************************/ 207 {"setsound", SC(SetSound) PF_IMMEDIATE },
208 {"setup", SC(SetUp) PF_IMMEDIATE },
209 {"version", SC(VersionCmd) PF_IMMEDIATE },
210 {"toggleextendedinfos", SC(ToggleExtendedInfos) PF_IMMEDIATE }, /*Added: tchize */
211 {"toggleextendedtext", SC(ToggleExtendedText) PF_IMMEDIATE }, /*Added: tchize */
212 {"asksmooth", SC(AskSmooth) PF_IMMEDIATE }, /*Added: tchize (smoothing technologies) */
213};
150 214
151/** 215bool
152 * This reads from fd and puts the data in sl. We return true if we think 216client::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{ 217{
161 int stat,toread; 218 return (!(pkt->flags & PF_PLAYER) || pl)
219 && (!(pkt->flags & PF_PLAYING) || (pl && pl->state == ST_PLAYING));
220}
162 221
163 /* Sanity check - shouldn't happen */ 222void
164 if (sl->len < 0) { 223client::execute (const packet_type *pkt, char *data, int datalen)
165 abort(); 224{
225 if (may_execute (pkt))
166 } 226 {
167 /* We already have a partial packet */ 227 //TODO: only one format
168 if (sl->len<2) { 228 if (pkt->flags & PF_PLAYER)
169#ifdef WIN32 /* ***WIN32 SockList_ReadPacket: change read() to recv() */ 229 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
170 230 else
171 stat=recv(fd, sl->buf + sl->len, 2-sl->len,0); 231 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
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 } 232 }
192#else 233 else
193 if (errno != EAGAIN && errno !=EWOULDBLOCK) { 234 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED, pkt->name);
194 LOG(llevDebug, "ReadPacket got error %s, returning 0\n", strerror_local(errno)); 235}
236
237bool
238client::handle_packet ()
239{
240 int pkt_len = next_packet ();
241
242 if (!pkt_len)
243 return false;
244 else if (pkt_len < 0)
245 {
246 LOG (llevError, "read error on player %s\n",
247 pl && pl->ob ? &pl->ob->name : "[anonymous]");
248 destroy ();
249 return false;
195 } 250 }
196#endif 251
197 return 0; /*Error */ 252 inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */
198 } 253
199 if (stat==0) return -1; 254 /* First, break out beginning word. There are at least
200 sl->len += stat; 255 * a few commands that do not have any paremeters. If
201#ifdef CS_LOGSTATS 256 * we get such a command, don't worry about trying
202 cst_tot.ibytes += stat; 257 * to break it up.
203 cst_lst.ibytes += stat;
204#endif
205 if (stat<2) 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 */ 258 */
210 toread = 2+(sl->buf[0] << 8) + sl->buf[1] - sl->len; 259 int datalen;
211 if ((toread + sl->len) >= len) { 260 char *data = strchr ((char *)inbuf + 2, ' ');
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 261
224 /* return error so the socket is closed */ 262 if (data)
225 return -1;
226 } 263 {
227 do { 264 *data++ = 0;
228#ifdef WIN32 /* ***win32 SockList_ReadPacket: change read() to recv() */ 265 datalen = pkt_len - (data - (char *)inbuf);
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 } 266 }
247#else 267 else
248 if (errno != EAGAIN && errno !=EWOULDBLOCK) { 268 {
249 LOG(llevDebug, "ReadPacket got error %s, returning 0\n", strerror_local(errno)); 269 data = (char *)inbuf + 2; // better read garbage than segfault
270 datalen = 0;
250 } 271 }
251#endif 272
252 return 0; /*Error */ 273 for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt)
253 } 274 if (!strcmp ((char *)inbuf + 2, pkt->name))
254 if (stat==0) return -1; 275 {
255 sl->len += stat; 276 if (pkt->flags & PF_IMMEDIATE)
256#ifdef CS_LOGSTATS 277 execute (pkt, data, datalen);
257 cst_tot.ibytes += stat; 278 else
258 cst_lst.ibytes += stat; 279 queue_command (pkt, data, datalen);
259#endif 280
260 toread -= stat; 281 goto next_packet;
261 if (toread==0) return 1; 282 }
262 if (toread < 0) { 283
263 LOG(llevError,"SockList_ReadPacket: Read more bytes than desired.\n"); 284 /* If we get here, we didn't find a valid command. Logging
264 return 1; 285 * this might be questionable, because a broken client/malicious
265 } 286 * user could certainly send a whole bunch of invalid commands.
266 } while (toread>0); 287 */
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 (status == Ns_Dead)
304 {
305 socket_ev.poll (0);
267 return 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)
324 {
325 // input buffer full
326 socket_ev.poll (socket_ev.poll () & ~PE_R);
327 return;
328 }
329
330 amount = read (fd, inbuf + inbuf_len, amount);
331
332 if (!amount)
333 {
334 destroy ();
335 return;
336 }
337 else if (amount < 0)
338 {
339 if (errno != EAGAIN && errno != EINTR)
340 {
341 LOG (llevError, "read error: %s\n", strerror (errno));
342 destroy ();
343 return;
344 }
345
346 // should not be here, normally
347 }
348 else
349 {
350 inbuf_len += amount;
351
352 cst_tot.ibytes += amount;
353 cst_lst.ibytes += amount;
354
355 cmd_ev.start ();
356 }
357 }
358}
359
360// called whenever we have additional commands to process
361void
362client::cmd_cb (iw &w)
363{
364 if (handle_packet () || handle_command ())
365 w.start ();
366 else
367 flush ();
268} 368}
269 369
270/******************************************************************************* 370/*******************************************************************************
271 * 371 *
272 * Start of write related routines. 372 * Start of write related routines.
277 * Adds data to a socket buffer for whatever reason. 377 * Adds data to a socket buffer for whatever reason.
278 * 378 *
279 * 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
280 * data, and len is the number of bytes to add. 380 * data, and len is the number of bytes to add.
281 */ 381 */
282 382void
283static void add_to_buffer(NewSocket *ns, char *buf, int len) 383client::send (void *buf_, int len)
284{ 384{
385 char *buf = (char *)buf_;
386 char *pos = buf;
387 int amt = 0;
388
389 if (status == Ns_Dead || !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
285 int avail, end; 399 int avail, end;
286 400
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 401 /* data + end is where we start putting the new data. The last byte
295 * currently in use is actually data + end -1 402 * currently in use is actually data + end -1
296 */ 403 */
297
298 end=ns->outputbuffer.start + ns->outputbuffer.len; 404 end = outputbuffer.start + outputbuffer.len;
299 /* The buffer is already in a wrapped state, so adjust end */ 405 /* The buffer is already in a wrapped state, so adjust end */
300 if (end>=SOCKETBUFSIZE) end-=SOCKETBUFSIZE; 406 if (end >= SOCKETBUFSIZE)
407 end -= SOCKETBUFSIZE;
408
301 avail=SOCKETBUFSIZE - end; 409 avail = SOCKETBUFSIZE - end;
302 410
303 /* We can all fit it behind the current data without wrapping */ 411 /* We can all fit it behind the current data without wrapping */
304 if (avail >=len ) { 412 if (avail >= len)
305 memcpy(ns->outputbuffer.data + end, buf, len); 413 memcpy (outputbuffer.data + end, buf, len);
414 else
306 } 415 {
307 else {
308 memcpy(ns->outputbuffer.data + end, buf, avail); 416 memcpy (outputbuffer.data + end, buf, avail);
309 memcpy(ns->outputbuffer.data, buf+avail, len-avail); 417 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 } 418 }
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 419
376/** 420 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} 421}
443
444 422
445/** 423/**
446 * 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
447 * shortcut function. 425 * shortcut function.
448 */ 426 */
449void cs_write_string(NewSocket *ns, const char *buf, int len) 427void
428client::send_packet (packet &sl)
450{ 429{
451 SockList sl;
452
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) 430 if (status == Ns_Dead)
470 return; 431 return;
471 432
472 if (msg->len >= MAXSOCKBUF) { 433 if (sl.length () >= MAXSOCKBUF)
434 {
473 LOG(llevError,"Trying to send a buffer beyond properly size, len =%d\n", 435 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 436 /* Almost certainly we've overflowed a buffer, so quit now to make
476 * it easier to debug. 437 * it easier to debug.
477 */ 438 */
478 abort(); 439 abort ();
479 } 440 }
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 441
487/** 442 if (!sl.length ())
488 * Takes a string of data, and writes it out to the socket. A very handy 443 return;
489 * 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/***********************************************************************
490 */ 482 *
491void Write_String_To_Socket(NewSocket *ns, char *buf, int len) 483 * packet functions/utilities
492{ 484 *
493 SockList sl; 485 **********************************************************************/
494 486
495 sl.len = len; 487packet &packet::operator <<(const data &v)
496 sl.buf = (unsigned char*) buf; 488{
497 Send_With_Handling(ns, &sl); 489 if (room () < v.len)
498} 490 reset ();
491 else
492 {
493 if (v.len)
494 {
495 memcpy (cur, v.ptr, v.len);
496 cur += v.len;
497 }
498 }
499 499
500 return *this;
501}
502
503packet &packet::operator <<(const data8 &v)
504{
505 unsigned int len = min (v.len, 0x00FF);
506 return *this << uint8 (len) << data (v.ptr, len);
507}
508
509packet &packet::operator <<(const data16 &v)
510{
511 unsigned int len = min (v.len, 0xFFFF);
512 return *this << uint16 (len) << data (v.ptr, len);
513}
514
515packet &packet::operator <<(const char *v)
516{
517 return *this << data (v, strlen (v ? v : 0));
518}
519
520void
521packet::vprintf (const char *format, va_list ap)
522{
523 int size = room ();
524
525 int len = vsnprintf ((char *)cur, size, format, ap);
526
527 if (len >= size)
528 return reset ();
529
530 cur += len;
531}
500 532
501/****************************************************************************** 533/******************************************************************************
502 * 534 *
503 * statistics logging functions. 535 * statistics logging functions.
504 * 536 *
505 ******************************************************************************/ 537 ******************************************************************************/
506 538
507#ifdef CS_LOGSTATS 539#ifdef CS_LOGSTATS
540
508/* cst_tot is for the life of the server, cst_last is for the last series of 541/* cst_tot is for the life of the server, cst_last is for the last series of
509 * stats 542 * stats
510 */ 543 */
511CS_Stats cst_tot, cst_lst; 544CS_Stats cst_tot, cst_lst;
512 545
513/** 546/**
514 * Writes out the gathered stats. We clear cst_lst. 547 * Writes out the gathered stats. We clear cst_lst.
515 */ 548 */
549void
516void write_cs_stats(void) 550write_cs_stats (void)
517{ 551{
518 time_t now=time(NULL); 552 time_t now = time (NULL);
519 553
520 /* If no connections recently, don't both to log anything */ 554 /* If no connections recently, don't both to log anything */
521 if (cst_lst.ibytes==0 && cst_lst.obytes==0) return; 555 if (cst_lst.ibytes == 0 && cst_lst.obytes == 0)
556 return;
522 557
523 /* CSSTAT is put in so scripts can easily find the line */ 558 /* 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", 559 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, 560 ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn,
526 now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, 561 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; 562 cst_lst.ibytes = 0;
529 cst_lst.obytes=0; 563 cst_lst.obytes = 0;
530 cst_lst.max_conn=socket_info.nconns;
531 cst_lst.time_start=now; 564 cst_lst.time_start = now;
532} 565}
533#endif 566#endif
567

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines