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.18 by root, Thu Dec 14 05:09:32 2006 UTC vs.
Revision 1.35 by root, Wed Mar 14 00:04:59 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines