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.22 by root, Fri Dec 15 19:59:20 2006 UTC vs.
Revision 1.23 by root, Sat Dec 16 03:08:26 2006 UTC

… …
69 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
70 && 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
71 { 71 {
72 LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd, 72 LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd,
73 (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);
74 status = Ns_Dead; 74 destroy ();
75 } 75 }
76 } 76 }
77#endif 77#endif
78 78
79 /** 79 /**
… …
111#endif 111#endif
112 } 112 }
113 else if (res == 0) 113 else if (res == 0)
114 { 114 {
115 LOG (llevError, "socket write failed, connection closed.\n"); 115 LOG (llevError, "socket write failed, connection closed.\n");
116 status = Ns_Dead; 116 destroy ();
117 return; 117 return;
118 } 118 }
119 else if (errno == EINTR) 119 else if (errno == EINTR)
120 { 120 {
121 // just retry 121 // just retry
… …
128 return; 128 return;
129 } 129 }
130 else 130 else
131 { 131 {
132 LOG (llevError, "socket write failed: %s\n", strerror (errno)); 132 LOG (llevError, "socket write failed: %s\n", strerror (errno));
133 status = Ns_Dead; 133 destroy ();
134 return; 134 return;
135 } 135 }
136 } 136 }
137 137
138 socket_ev.poll (socket_ev.poll () & ~PE_W); 138 socket_ev.poll (socket_ev.poll () & ~PE_W);
139} 139}
140 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
141/*********************************************************************** 175/*****************************************************************************
142 * 176 * Start of command dispatch area.
143 * packet functions/utilities 177 * The commands here are protocol commands.
144 *
145 **********************************************************************/ 178 ****************************************************************************/
146 179
147packet &packet::operator <<(const data &v) 180// SocketCommand, PlayingCommand, should not exist with those ugly casts
181#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb),
182#define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER |
183
184/**
185 * Dispatch table for the server.
186 */
187static struct packet_type packets[] = {
188 {"ncom", PC(NewPlayerCmd) PF_PLAYING },
189 {"command", PC(PlayerCmd) PF_PLAYING },
190
191 {"examine", PC(ExamineCmd) PF_PLAYING },
192 {"apply", PC(ApplyCmd) PF_PLAYING },
193 {"reply", PC(ReplyCmd) PF_IMMEDIATE },
194 {"lookat", PC(LookAt) PF_PLAYING },
195 {"lock", PC(LockItem) PF_PLAYING },
196 {"mark", PC(MarkItem) PF_PLAYING },
197 {"move", PC(MoveCmd) PF_PLAYING },
198 {"exti", PC(ExtCmd) PF_IMMEDIATE }, /* CF+ */
199 {"ext", PC(ExtCmd) 0 }, /* CF+ */
200 {"mapredraw", PC(MapRedrawCmd) PF_IMMEDIATE }, /* Added: phil */
201 {"mapinfo", PC(MapInfoCmd) 0 }, /* CF+ */
202
203 {"addme", SC(AddMeCmd) PF_IMMEDIATE },
204 {"askface", SC(SendFaceCmd) PF_IMMEDIATE }, /* Added: phil */
205 {"requestinfo", SC(RequestInfo) PF_IMMEDIATE },
206 {"setfacemode", SC(SetFaceMode) PF_IMMEDIATE },
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};
214
215bool
216client::may_execute (const packet_type *pkt) const
148{ 217{
149 if (room () < v.len) 218 return (!(pkt->flags & PF_PLAYER) || pl)
150 reset (); 219 && (!(pkt->flags & PF_PLAYING) || (pl && pl->state == ST_PLAYING));
220}
221
222void
223client::execute (const packet_type *pkt, char *data, int datalen)
224{
225 if (may_execute (pkt))
226 {
227 //TODO: only one format
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);
232 }
151 else 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;
152 { 250 }
153 if (v.len) 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))
154 { 275 {
155 memcpy (cur, v.ptr, v.len); 276 if (pkt->flags & PF_IMMEDIATE)
156 cur += v.len; 277 execute (pkt, data, datalen);
278 else
279 queue_command (pkt, data, datalen);
280
281 goto next_packet;
157 } 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)
158 } 304 {
159 305 socket_ev.poll (0);
160 return *this; 306 return;
161}
162
163packet &packet::operator <<(const data8 &v)
164{
165 unsigned int len = min (v.len, 0x00FF);
166 return *this << uint8 (len) << data (v.ptr, len);
167}
168
169packet &packet::operator <<(const data16 &v)
170{
171 unsigned int len = min (v.len, 0xFFFF);
172 return *this << uint16 (len) << data (v.ptr, len);
173}
174
175packet &packet::operator <<(const char *v)
176{
177 return *this << data (v, strlen (v ? v : 0));
178}
179
180void
181packet::printf (const char *format, ...)
182{
183 int size = room ();
184
185 va_list ap;
186 va_start (ap, format);
187 int len = vsnprintf ((char *)cur, size, format, ap);
188 va_end (ap);
189
190 if (len >= size)
191 return reset ();
192
193 cur += len;
194}
195
196/******************************************************************************
197 *
198 * Start of read routines.
199 *
200 ******************************************************************************/
201
202int
203client::read_packet ()
204{
205 for (;;)
206 { 307 }
207 if (inbuf_len >= 2)
208 {
209 unsigned int pkt_len = (inbuf [0] << 8) | inbuf [1];
210 308
211 if (inbuf_len >= 2 + pkt_len) 309 if (got & PE_W)
212 return pkt_len + 2; 310 {
213 } 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
214 320
215 int amount = sizeof (inbuf) - inbuf_len; 321 int amount = sizeof (inbuf) - inbuf_len;
216 322
217 if (amount <= 0) 323 if (!amount)
218 { 324 {
219 LOG (llevError, "packet too large");//TODO 325 // input buffer full
326 socket_ev.poll (socket_ev.poll () & ~PE_R);
220 return -1; 327 return;
221 } 328 }
222 329
223 amount = read (fd, inbuf + inbuf_len, amount); 330 amount = read (fd, inbuf + inbuf_len, amount);
224 331
225 if (!amount) 332 if (!amount)
226 { 333 {
227 status = Ns_Dead; 334 destroy ();
228 return -1; 335 return;
229 } 336 }
230 else if (amount < 0) 337 else if (amount < 0)
231 { 338 {
232 if (errno != EAGAIN && errno != EINTR) 339 if (errno != EAGAIN && errno != EINTR)
233 { 340 {
234 LOG (llevError, "read error: %s\n", strerror (errno)); 341 LOG (llevError, "read error: %s\n", strerror (errno));
342 destroy ();
235 return -1; 343 return;
236 } 344 }
237 345
238 return 0; 346 // should not be here, normally
347 }
348 else
239 } 349 {
240
241 inbuf_len += amount; 350 inbuf_len += amount;
242 351
243 cst_tot.ibytes += amount; 352 cst_tot.ibytes += amount;
244 cst_lst.ibytes += amount; 353 cst_lst.ibytes += amount;
245 }
246}
247 354
355 cmd_ev.start ();
356 }
357 }
358}
359
360// called whenever we have additional commands to process
248void 361void
249client::skip_packet (int len) 362client::cmd_cb (iw &w)
250{ 363{
251 inbuf_len -= len; 364 if (handle_packet () || handle_command ())
252 memmove (inbuf, inbuf + len, inbuf_len); 365 w.start ();
366 else
367 flush ();
253} 368}
254 369
255/******************************************************************************* 370/*******************************************************************************
256 * 371 *
257 * Start of write related routines. 372 * Start of write related routines.
… …
270 char *buf = (char *)buf_; 385 char *buf = (char *)buf_;
271 char *pos = buf; 386 char *pos = buf;
272 int amt = 0; 387 int amt = 0;
273 388
274 if (status == Ns_Dead || !buf) 389 if (status == Ns_Dead || !buf)
275 {
276 LOG (llevDebug, "Write_To_Socket called with dead socket\n");
277 return; 390 return;
278 }
279 391
280 if ((len + outputbuffer.len) > SOCKETBUFSIZE) 392 if ((len + outputbuffer.len) > SOCKETBUFSIZE)
281 { 393 {
282 LOG (llevDebug, "Socket on fd %d has overrun internal buffer - marking as dead\n", fd); 394 LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd);
283 status = Ns_Dead; 395 destroy ();
284 return; 396 return;
285 } 397 }
286 398
287 int avail, end; 399 int avail, end;
288 400
… …
306 } 418 }
307 419
308 outputbuffer.len += len; 420 outputbuffer.len += len;
309} 421}
310 422
311void
312client::socket_cb (iow &w, int got)
313{
314 write_outputbuffer ();
315
316 if (!outputbuffer.len)
317 socket_ev.poll (socket_ev.poll () & ~PE_W);
318}
319
320/** 423/**
321 * 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
322 * shortcut function. 425 * shortcut function.
323 */ 426 */
324void 427void
… …
358 461
359void 462void
360client::send_packet (const char *buf) 463client::send_packet (const char *buf)
361{ 464{
362 send_packet (buf, strlen (buf)); 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/***********************************************************************
482 *
483 * packet functions/utilities
484 *
485 **********************************************************************/
486
487packet &packet::operator <<(const data &v)
488{
489 if (room () < v.len)
490 reset ();
491 else
492 {
493 if (v.len)
494 {
495 memcpy (cur, v.ptr, v.len);
496 cur += v.len;
497 }
498 }
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;
363} 531}
364 532
365/****************************************************************************** 533/******************************************************************************
366 * 534 *
367 * statistics logging functions. 535 * statistics logging functions.

Diff Legend

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