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.29 by root, Thu Dec 21 23:37:06 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{
56 if (destroyed ())
57 return;
58
62#ifdef __linux__ 59#ifdef __linux__
63 // check time of last ack, and, if too old, kill connection 60 // check time of last ack, and, if too old, kill connection
64 struct tcp_info tcpi; 61 struct tcp_info tcpi;
65 socklen_t len = sizeof (tcpi); 62 socklen_t len = sizeof (tcpi);
66 63
67 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))
68 { 65 {
69 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;
70 67
71 if (tcpi.tcpi_unacked 68 rtt = tcpi.tcpi_rtt;
69 rttvar = tcpi.tcpi_rttvar;
70
72 && 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
73 && 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
74 { 73 {
75 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,
76 (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);
77 ns->status = Ns_Dead; 76 destroy ();
78 } 77 }
79 } 78 }
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 79#endif
85}
86 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
87/*********************************************************************** 177/*****************************************************************************
88 * 178 * Start of command dispatch area.
89 * SockList functions/utilities 179 * The commands here are protocol commands.
90 *
91 **********************************************************************/ 180 ****************************************************************************/
92 181
93void SockList_Init(SockList *sl) 182// SocketCommand, PlayingCommand, should not exist with those ugly casts
94{ 183#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb),
95 sl->len=0; 184#define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER |
96 sl->buf=NULL;
97}
98 185
99void SockList_AddInt(SockList *sl, uint32 data) 186/**
100{ 187 * 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 */ 188 */
123int GetInt_String(unsigned char *data) 189static struct packet_type packets[] = {
124{ 190 {"ncom", PC(NewPlayerCmd) PF_PLAYING },
125 return ((data[0]<<24) + (data[1]<<16) + (data[2]<<8) + data[3]); 191 {"command", PC(PlayerCmd) PF_PLAYING },
126}
127 192
128short GetShort_String(unsigned char *data) { 193 {"examine", PC(ExamineCmd) PF_PLAYING },
129 return ((data[0]<<8)+data[1]); 194 {"apply", PC(ApplyCmd) PF_PLAYING },
130} 195 {"lookat", PC(LookAt) PF_PLAYING },
196 {"lock", PC(LockItem) PF_PLAYING },
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+ */
131 202
132/****************************************************************************** 203 {"reply", SC(ReplyCmd) 0 },
133 * 204 {"exti", SC(ExtiCmd) 0 }, /* CF+ */
134 * Start of read routines. 205 {"addme", SC(AddMeCmd) 0 },
135 * 206 {"askface", SC(SendFaceCmd) 0 }, /* Added: phil */
136 ******************************************************************************/ 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};
137 216
138/** 217bool
139 * This reads from fd and puts the data in sl. We return true if we think 218client::may_execute (const packet_type *pkt) const
140 * we have a full packet, 0 if we have a partial packet. The only processing 219{
141 * we do is remove the intial size value. len (As passed) is the size of the 220 return (!(pkt->flags & PF_PLAYER) || pl)
142 * buffer allocated in the socklist. We make the assumption the buffer is 221 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING);
143 * at least 2 bytes long. 222}
223
224void
225client::execute (const packet_type *pkt, char *data, int datalen)
226{
227 if (may_execute (pkt))
228 {
229 //TODO: only one format
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);
234 }
235 else
236 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED, pkt->name);
237}
238
239bool
240client::handle_packet ()
241{
242 int pkt_len = next_packet ();
243
244 if (!pkt_len)
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.
144 */ 260 */
145 261 int datalen;
146int SockList_ReadPacket(int fd, SockList *sl, int len) 262 char *data = strchr ((char *)inbuf + 2, ' ');
147{
148 int stat,toread;
149 263
150 /* Sanity check - shouldn't happen */ 264 if (data)
151 if (sl->len < 0) { 265 {
152 abort(); 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))
277 {
278 if (pkt->flags & PF_PLAYER)
279 queue_command (pkt, data, datalen);
280 else
281 execute (pkt, data, datalen);
282
283 goto next_packet;
153 } 284 }
154 /* We already have a partial packet */
155 if (sl->len<2) {
156#ifdef WIN32 /* ***WIN32 SockList_ReadPacket: change read() to recv() */
157 285
158 stat=recv(fd, sl->buf + sl->len, 2-sl->len,0); 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);
159 290
160#else 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)
161 do { 323 {
162 stat=read(fd, sl->buf + sl->len, 2-sl->len); 324 // input buffer full
163 } while ((stat==-1) && (errno==EINTR)); 325 socket_ev.poll (socket_ev.poll () & ~PE_R);
164#endif 326 return;
165 if (stat<0) { 327 }
166 /* In non blocking mode, EAGAIN is set when there is no 328
167 * data available. 329 amount = read (fd, inbuf + inbuf_len, amount);
168 */ 330
169#ifdef WIN32 /* ***WIN32 SockList_ReadPacket: error handling for win32 */ 331 if (!amount)
170 if ((stat==-1) && WSAGetLastError() !=WSAEWOULDBLOCK) { 332 {
171 if(WSAGetLastError() == WSAECONNRESET) 333 destroy ();
172 LOG(llevDebug,"Connection closed by client\n"); 334 return;
173 else 335 }
336 else if (amount < 0)
337 {
338 if (errno != EAGAIN && errno != EINTR)
174 { 339 {
175 LOG(llevDebug,"ReadPacket got error %d, returning 0\n",WSAGetLastError()); 340 LOG (llevError, "read error: %s\n", strerror (errno));
176 } 341 destroy ();
177 return -1; /* kick this user! */ 342 return;
178 } 343 }
179#else 344
180 if (errno != EAGAIN && errno !=EWOULDBLOCK) { 345 // should not be here, normally
181 LOG(llevDebug, "ReadPacket got error %s, returning 0\n", strerror_local(errno));
182 } 346 }
183#endif 347 else
184 return 0; /*Error */
185 } 348 {
186 if (stat==0) return -1; 349 inbuf_len += amount;
187 sl->len += stat; 350
188#ifdef CS_LOGSTATS
189 cst_tot.ibytes += stat; 351 cst_tot.ibytes += amount;
190 cst_lst.ibytes += stat; 352 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 353
211 /* return error so the socket is closed */ 354 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 } 355 }
234#else 356 }
235 if (errno != EAGAIN && errno !=EWOULDBLOCK) { 357}
236 LOG(llevDebug, "ReadPacket got error %s, returning 0\n", strerror_local(errno)); 358
237 } 359// called whenever we have additional commands to process
238#endif 360void
239 return 0; /*Error */ 361client::cmd_cb (iw &w)
240 } 362{
241 if (stat==0) return -1; 363 if (handle_packet ())
242 sl->len += stat; 364 w.start ();
243#ifdef CS_LOGSTATS 365 else
244 cst_tot.ibytes += stat; 366 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} 367}
256 368
257/******************************************************************************* 369/*******************************************************************************
258 * 370 *
259 * Start of write related routines. 371 * Start of write related routines.
… …
264 * Adds data to a socket buffer for whatever reason. 376 * Adds data to a socket buffer for whatever reason.
265 * 377 *
266 * 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
267 * data, and len is the number of bytes to add. 379 * data, and len is the number of bytes to add.
268 */ 380 */
269 381void
270static void add_to_buffer(NewSocket *ns, char *buf, int len) 382client::send (void *buf_, int len)
271{ 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
272 int avail, end; 398 int avail, end;
273 399
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 400 /* data + end is where we start putting the new data. The last byte
282 * currently in use is actually data + end -1 401 * currently in use is actually data + end -1
283 */ 402 */
284
285 end=ns->outputbuffer.start + ns->outputbuffer.len; 403 end = outputbuffer.start + outputbuffer.len;
286 /* The buffer is already in a wrapped state, so adjust end */ 404 /* The buffer is already in a wrapped state, so adjust end */
287 if (end>=SOCKETBUFSIZE) end-=SOCKETBUFSIZE; 405 if (end >= SOCKETBUFSIZE)
406 end -= SOCKETBUFSIZE;
407
288 avail=SOCKETBUFSIZE - end; 408 avail = SOCKETBUFSIZE - end;
289 409
290 /* We can all fit it behind the current data without wrapping */ 410 /* We can all fit it behind the current data without wrapping */
291 if (avail >=len ) { 411 if (avail >= len)
292 memcpy(ns->outputbuffer.data + end, buf, len); 412 memcpy (outputbuffer.data + end, buf, len);
413 else
293 } 414 {
294 else {
295 memcpy(ns->outputbuffer.data + end, buf, avail); 415 memcpy (outputbuffer.data + end, buf, avail);
296 memcpy(ns->outputbuffer.data, buf+avail, len-avail); 416 memcpy (outputbuffer.data, buf + avail, len - avail);
297 } 417 }
418
298 ns->outputbuffer.len += len; 419 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} 420}
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 421
432/** 422/**
433 * 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
434 * shortcut function. 424 * shortcut function.
435 */ 425 */
436void cs_write_string(NewSocket *ns, const char *buf, int len) 426void
427client::send_packet (packet &sl)
437{ 428{
438 SockList sl; 429 if (destroyed ())
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)
457 return; 430 return;
458 431
459 if (msg->len >= MAXSOCKBUF) { 432 if (sl.length () >= MAXSOCKBUF)
433 {
460 LOG(llevError,"Trying to send a buffer beyond properly size, len =%d\n", 434 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 435 /* Almost certainly we've overflowed a buffer, so quit now to make
463 * it easier to debug. 436 * it easier to debug.
464 */ 437 */
465 abort(); 438 abort ();
466 } 439 }
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 440
474/** 441 if (!sl.length ())
475 * Takes a string of data, and writes it out to the socket. A very handy 442 return;
476 * 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/***********************************************************************
477 */ 481 *
478void Write_String_To_Socket(NewSocket *ns, char *buf, int len) 482 * packet functions/utilities
479{ 483 *
480 SockList sl; 484 **********************************************************************/
481 485
482 sl.len = len; 486packet::packet (const char *name)
483 sl.buf = (unsigned char*) buf; 487{
484 Send_With_Handling(ns, &sl); 488 reset ();
485}
486 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}
487 540
488/****************************************************************************** 541/******************************************************************************
489 * 542 *
490 * statistics logging functions. 543 * statistics logging functions.
491 * 544 *
492 ******************************************************************************/ 545 ******************************************************************************/
493 546
494#ifdef CS_LOGSTATS 547#ifdef CS_LOGSTATS
548
495/* cst_tot is for the life of the server, cst_last is for the last series of 549/* cst_tot is for the life of the server, cst_last is for the last series of
496 * stats 550 * stats
497 */ 551 */
498CS_Stats cst_tot, cst_lst; 552CS_Stats cst_tot, cst_lst;
499 553
500/** 554/**
501 * Writes out the gathered stats. We clear cst_lst. 555 * Writes out the gathered stats. We clear cst_lst.
502 */ 556 */
557void
503void write_cs_stats(void) 558write_cs_stats (void)
504{ 559{
505 time_t now=time(NULL); 560 time_t now = time (NULL);
506 561
507 /* If no connections recently, don't both to log anything */ 562 /* If no connections recently, don't both to log anything */
508 if (cst_lst.ibytes==0 && cst_lst.obytes==0) return; 563 if (cst_lst.ibytes == 0 && cst_lst.obytes == 0)
564 return;
509 565
510 /* CSSTAT is put in so scripts can easily find the line */ 566 /* 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", 567 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, 568 ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn,
513 now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, 569 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; 570 cst_lst.ibytes = 0;
516 cst_lst.obytes=0; 571 cst_lst.obytes = 0;
517 cst_lst.max_conn=socket_info.nconns;
518 cst_lst.time_start=now; 572 cst_lst.time_start = now;
519} 573}
520#endif 574#endif
575

Diff Legend

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