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.11 by root, Wed Dec 13 21:27:09 2006 UTC vs.
Revision 1.25 by root, Sun Dec 17 19:14:00 2006 UTC

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

Diff Legend

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