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.34 by pippijn, Thu Mar 1 12:28:17 2007 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) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 1992 Frank Tore Johansen 5 * Copyright (C) 1992 Frank Tore Johansen
6 * 6 *
7 * 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
190static struct packet_type packets[] = { 190static struct packet_type packets[] = {
191 {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 }, 191 {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 },
192 {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 }, 192 {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 },
193 193
194 {"examine", PC(ExamineCmd) PF_PLAYING }, 194 {"examine", PC(ExamineCmd) PF_PLAYING },
195 {"ex", PC(ExCmd) PF_PLAYING },
195 {"apply", PC(ApplyCmd) PF_PLAYING }, 196 {"apply", PC(ApplyCmd) PF_PLAYING },
196 {"lookat", PC(LookAt) PF_PLAYING }, 197 {"lookat", PC(LookAt) PF_PLAYING },
197 {"lock", PC(LockItem) PF_PLAYING }, 198 {"lock", PC(LockItem) PF_PLAYING },
198 {"mark", PC(MarkItem) PF_PLAYING }, 199 {"mark", PC(MarkItem) PF_PLAYING },
199 {"move", PC(MoveCmd) PF_PLAYING }, 200 {"move", PC(MoveCmd) PF_PLAYING },
200 {"ext", PC(ExtCmd) 0 }, /* CF+ */ 201 {"ext", PC(ExtCmd) 0 }, // CF+
201 {"mapredraw", PC(MapRedrawCmd) 0 }, /* Added: phil */ 202 {"mapredraw", PC(MapRedrawCmd) 0 },
202 {"mapinfo", PC(MapInfoCmd) 0 }, /* CF+ */ 203 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+
203 204
204 {"reply", SC(ReplyCmd) 0 }, 205 {"reply", SC(ReplyCmd) 0 },
205 {"exti", SC(ExtiCmd) 0 }, /* CF+ */ 206 {"exti", SC(ExtiCmd) 0 }, // CF+
206 {"addme", SC(AddMeCmd) 0 }, 207 {"addme", SC(AddMeCmd) 0 },
207 {"askface", SC(SendFaceCmd) 0 }, /* Added: phil */ 208 {"askface", SC(AskFaceCmd) 0 },
208 {"requestinfo", SC(RequestInfo) 0 }, 209 {"requestinfo", SC(RequestInfo) 0 },
209 {"setfacemode", SC(SetFaceMode) 0 }, 210 {"setfacemode", SC(SetFaceMode) 0 },
210 {"setsound", SC(SetSound) 0 }, 211 {"setsound", SC(SetSound) 0 },
211 {"setup", SC(SetUp) 0 }, 212 {"setup", SC(SetUp) 0 },
212 {"version", SC(VersionCmd) 0 }, 213 {"version", SC(VersionCmd) 0 },
416 return; 417 return;
417 418
418 if (len + outputbuffer.len > SOCKETBUFSIZE) 419 if (len + outputbuffer.len > SOCKETBUFSIZE)
419 { 420 {
420 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);
421 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);
422 return; 425 return;
423 } 426 }
424 427
425 int avail, end; 428 int avail, end;
426 429
502 va_end (ap); 505 va_end (ap);
503 506
504 send_packet (sl); 507 send_packet (sl);
505} 508}
506 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
507/*********************************************************************** 532/***********************************************************************
508 * 533 *
509 * packet functions/utilities 534 * packet functions/utilities
510 * 535 *
511 **********************************************************************/ 536 **********************************************************************/
515 reset (); 540 reset ();
516 541
517 int len = strlen (name); 542 int len = strlen (name);
518 memcpy (cur, name, len); cur += len; 543 memcpy (cur, name, len); cur += len;
519 *cur++ = ' '; 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);
520} 563}
521 564
522packet &packet::operator <<(const data &v) 565packet &packet::operator <<(const data &v)
523{ 566{
524 if (room () < v.len) 567 if (room () < v.len)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines