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.3 by root, Tue Aug 29 08:01:38 2006 UTC vs.
Revision 1.27 by root, Wed Dec 20 01:19:11 2006 UTC

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

Diff Legend

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