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.26 by root, Tue Dec 19 04:58:05 2006 UTC vs.
Revision 1.41 by root, Fri May 18 19:46:22 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
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
… …
51#define SOCKET_TIMEOUT2 20 * 1000 52#define SOCKET_TIMEOUT2 20 * 1000
52 53
53void 54void
54client::flush () 55client::flush ()
55{ 56{
57 if (destroyed ())
58 return;
59
56#ifdef __linux__ 60#ifdef __linux__
57 // check time of last ack, and, if too old, kill connection 61 // check time of last ack, and, if too old, kill connection
58 struct tcp_info tcpi; 62 struct tcp_info tcpi;
59 socklen_t len = sizeof (tcpi); 63 socklen_t len = sizeof (tcpi);
60 64
… …
182 186
183/** 187/**
184 * Dispatch table for the server. 188 * Dispatch table for the server.
185 */ 189 */
186static struct packet_type packets[] = { 190static struct packet_type packets[] = {
187 {"ncom", PC(NewPlayerCmd) PF_PLAYING }, 191 {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 },
188 {"command", PC(PlayerCmd) PF_PLAYING }, 192 {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 },
189 193
190 {"examine", PC(ExamineCmd) PF_PLAYING }, 194 {"examine", PC(ExamineCmd) PF_PLAYING },
195 {"ex", PC(ExCmd) PF_PLAYING },
191 {"apply", PC(ApplyCmd) PF_PLAYING }, 196 {"apply", PC(ApplyCmd) PF_PLAYING },
192 {"reply", PC(ReplyCmd) 0 },
193 {"lookat", PC(LookAt) PF_PLAYING }, 197 {"lookat", PC(LookAt) PF_PLAYING },
194 {"lock", PC(LockItem) PF_PLAYING }, 198 {"lock", PC(LockItem) PF_PLAYING },
195 {"mark", PC(MarkItem) PF_PLAYING }, 199 {"mark", PC(MarkItem) PF_PLAYING },
196 {"move", PC(MoveCmd) PF_PLAYING }, 200 {"move", PC(MoveCmd) PF_PLAYING },
197 {"ext", PC(ExtCmd) 0 }, /* CF+ */ 201 {"ext", PC(ExtCmd) 0 }, // CF+
198 {"mapredraw", PC(MapRedrawCmd) 0 }, /* Added: phil */ 202 {"mapredraw", PC(MapRedrawCmd) 0 },
199 {"mapinfo", PC(MapInfoCmd) 0 }, /* CF+ */ 203 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+
200 204
205 {"reply", SC(ReplyCmd) 0 },
201 {"exti", SC(ExtiCmd) 0 }, /* CF+ */ 206 {"exti", SC(ExtiCmd) 0 }, // CF+
202 {"addme", SC(AddMeCmd) 0 }, 207 {"addme", SC(AddMeCmd) 0 },
203 {"askface", SC(SendFaceCmd) 0 }, /* Added: phil */ 208 {"askface", SC(AskFaceCmd) 0 },
204 {"requestinfo", SC(RequestInfo) 0 }, 209 {"requestinfo", SC(RequestInfo) 0 },
205 {"setfacemode", SC(SetFaceMode) 0 }, 210 {"setfacemode", SC(SetFaceMode) 0 },
206 {"setsound", SC(SetSound) 0 }, 211 {"setsound", SC(SetSound) 0 },
207 {"setup", SC(SetUp) 0 }, 212 {"setup", SC(SetUp) 0 },
208 {"version", SC(VersionCmd) 0 }, 213 {"version", SC(VersionCmd) 0 },
… …
213 218
214bool 219bool
215client::may_execute (const packet_type *pkt) const 220client::may_execute (const packet_type *pkt) const
216{ 221{
217 return (!(pkt->flags & PF_PLAYER) || pl) 222 return (!(pkt->flags & PF_PLAYER) || pl)
218 && (!(pkt->flags & PF_PLAYING) || (pl && pl->state == ST_PLAYING)); 223 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING);
224}
225
226// HACK: some commands currently should be executed
227// even when the player is frozen. this hack detects
228// those commands. it should be folded into may_execute,
229// but kept seperate to emphasise the hack aspect, i.e.
230// do it better, then remove.
231static bool
232always_immediate (const client *ns, const packet_type *pkt, const char *data, int len)
233{
234 if (!(pkt->flags & (PF_COMMAND0 | PF_COMMAND6)))
235 return false;
236
237 if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map)
238 return false;
239
240 if (pkt->flags & PF_COMMAND6)
241 {
242 data += 6;
243 len -= 6;
244 }
245
246 if (len > 4 && !strncmp (data, "say " , 4))
247 return true;
248 if (len > 5 && !strncmp (data, "chat ", 5))
249 return true;
250
251 return false;
219} 252}
220 253
221void 254void
222client::execute (const packet_type *pkt, char *data, int datalen) 255client::execute (const packet_type *pkt, char *data, int datalen)
223{ 256{
224 if (may_execute (pkt)) 257 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen))
225 { 258 {
226 //TODO: only one format 259 //TODO: only one format
227 if (pkt->flags & PF_PLAYER) 260 if (pkt->flags & PF_PLAYER)
228 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl); 261 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
229 else 262 else
… …
270 } 303 }
271 304
272 for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt) 305 for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt)
273 if (!strcmp ((char *)inbuf + 2, pkt->name)) 306 if (!strcmp ((char *)inbuf + 2, pkt->name))
274 { 307 {
275 if (pkt->flags & PF_PLAYER) 308 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen))
276 queue_command (pkt, data, datalen); 309 queue_command (pkt, data, datalen);
277 else 310 else
278 execute (pkt, data, datalen); 311 execute (pkt, data, datalen);
279 312
280 goto next_packet; 313 goto next_packet;
… …
294// callback called when socket is either readable or writable 327// callback called when socket is either readable or writable
295void 328void
296client::socket_cb (iow &w, int got) 329client::socket_cb (iow &w, int got)
297{ 330{
298 //TODO remove when we have better socket cleanup logic 331 //TODO remove when we have better socket cleanup logic
299 if (status == Ns_Dead) 332 if (destroyed ())
300 { 333 {
301 socket_ev.poll (0); 334 socket_ev.poll (0);
302 return; 335 return;
303 } 336 }
304 337
… …
377 */ 410 */
378void 411void
379client::send (void *buf_, int len) 412client::send (void *buf_, int len)
380{ 413{
381 char *buf = (char *)buf_; 414 char *buf = (char *)buf_;
382 char *pos = buf;
383 int amt = 0;
384 415
385 if (status == Ns_Dead || !buf) 416 if (destroyed () || !buf)
386 return; 417 return;
387 418
388 if ((len + outputbuffer.len) > SOCKETBUFSIZE) 419 if (len + outputbuffer.len > SOCKETBUFSIZE)
389 { 420 {
390 LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd); 421 LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd);
391 destroy (); 422 // shutdown the socket, this is safer than destroying it immediately
423 // as lots of code in the callchain might still access the map etc.
424 shutdown (fd, SHUT_RDWR);
392 return; 425 return;
393 } 426 }
394 427
395 int avail, end; 428 int avail, end;
396 429
… …
421 * shortcut function. 454 * shortcut function.
422 */ 455 */
423void 456void
424client::send_packet (packet &sl) 457client::send_packet (packet &sl)
425{ 458{
426 if (status == Ns_Dead) 459 if (destroyed ())
427 return; 460 return;
428 461
429 if (sl.length () >= MAXSOCKBUF) 462 if (sl.length () >= MAXSOCKBUF)
430 { 463 {
431 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ()); 464 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());
… …
472 va_end (ap); 505 va_end (ap);
473 506
474 send_packet (sl); 507 send_packet (sl);
475} 508}
476 509
510void
511client::send_drawinfo (const char *msg, int flags)
512{
513 send_packet_printf ("drawinfo %d %s", flags, msg);
514}
515
516void
517client::send_msg (int color, const char *type, const char *msg)
518{
519 if (can_msg)
520 send_packet_printf ("msg %d %s %s", color, type, msg);
521 else if (color < 0)
522 return; // client cannot handle this
523 else if (strchr (msg, '<') || strchr (msg, '&'))
524 {
525 //TODO: should escape/modify to old syntax
526 send_packet_printf ("drawinfo %d %s", color, msg);
527 }
528 else
529 send_packet_printf ("drawinfo %d %s", color, msg);
530}
531
477/*********************************************************************** 532/***********************************************************************
478 * 533 *
479 * packet functions/utilities 534 * packet functions/utilities
480 * 535 *
481 **********************************************************************/ 536 **********************************************************************/
537
538packet::packet (const char *name)
539{
540 reset ();
541
542 int len = strlen (name);
543 memcpy (cur, name, len); cur += len;
544 *cur++ = ' ';
545}
546
547packet &packet::operator <<(const ber32 v)
548{
549 enum { maxlen = 32 / 7 + 1};
550 uint8 buf[maxlen];
551 uint8 *p = buf + maxlen;
552 uint32 val = v.val;
553
554 *--p = val & 0x7F;
555
556 while (val > 0x7F)
557 {
558 val >>= 7;
559 *--p = (val & 0x7F) | 0x80;
560 }
561
562 return *this << data (p, buf + maxlen - p);
563}
482 564
483packet &packet::operator <<(const data &v) 565packet &packet::operator <<(const data &v)
484{ 566{
485 if (room () < v.len) 567 if (room () < v.len)
486 reset (); 568 reset ();

Diff Legend

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