[ViewVC] Diff of: cvs/deliantra/server/socket/lowlevel.C

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

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  *
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 1992 Frank Tore Johansen
  *
  * This program is free software; you can redistribute it and/or modify
 static struct packet_type packets[] = {
   {"ncom",        PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 },
   {"command",     PC(PlayerCmd)    PF_PLAYING | PF_COMMAND0 },
   {"examine",     PC(ExamineCmd)   PF_PLAYING },
+  {"ex",          PC(ExCmd)        PF_PLAYING },
   {"apply",       PC(ApplyCmd)     PF_PLAYING },
   {"lookat",      PC(LookAt)       PF_PLAYING },
   {"lock",        PC(LockItem)     PF_PLAYING },
   {"mark",        PC(MarkItem)     PF_PLAYING },
   {"move",        PC(MoveCmd)      PF_PLAYING },
-  {"ext",         PC(ExtCmd)       0 },            /* CF+ */
+  {"ext",         PC(ExtCmd)       0 }, // CF+
-  {"mapredraw",   PC(MapRedrawCmd) 0 },       /* Added: phil */
+  {"mapredraw",   PC(MapRedrawCmd) 0 },
-  {"mapinfo",     PC(MapInfoCmd)   0 },   /* CF+ */
+  {"mapinfo",     PC(MapInfoCmd)   0 }, // CF+
   {"reply",       SC(ReplyCmd)     0 },
-  {"exti",        SC(ExtiCmd)      0 }, /* CF+ */
+  {"exti",        SC(ExtiCmd)      0 }, // CF+
   {"addme",       SC(AddMeCmd)     0 },
-  {"askface",     SC(SendFaceCmd)  0 },     /* Added: phil */
+  {"askface",     SC(AskFaceCmd)   0 },
   {"requestinfo", SC(RequestInfo)  0 },
   {"setfacemode", SC(SetFaceMode)  0 },
   {"setsound",    SC(SetSound)     0 },
   {"setup",       SC(SetUp)        0 },
   {"version",     SC(VersionCmd)   0 },
     return;
   if (len + outputbuffer.len > SOCKETBUFSIZE)
     {
       LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd);
-      destroy ();
+      // shutdown the socket, this is safer than destroying it immediately
+      // as lots of code in the callchain might still access the map etc.
+      shutdown (fd, SHUT_RDWR);
       return;
     }
   int avail, end;
   va_end (ap);
   send_packet (sl);
 }
+void
+client::send_drawinfo (const char *msg, int flags)
+{
+  send_packet_printf ("drawinfo %d %s", flags, msg);
+}
+void
+client::send_msg (int color, const char *type, const char *msg)
+{
+  if (can_msg)
+    send_packet_printf ("msg %d %s %s", color, type, msg);
+  else if (color < 0)
+    return; // client cannot handle this
+  else if (strchr (msg, '<') || strchr (msg, '&'))
+    {
+      //TODO: should escape/modify to old syntax
+      send_packet_printf ("drawinfo %d %s", color, msg);
+    }
+  else
+    send_packet_printf ("drawinfo %d %s", color, msg);
+}
 /***********************************************************************
  *
  * packet functions/utilities
  *
  **********************************************************************/
   reset ();
   int len = strlen (name);
   memcpy (cur, name, len); cur += len;
   *cur++ = ' ';
+}
+packet &packet::operator <<(const ber32 v)
+{
+  enum { maxlen = 32 / 7 + 1};
+  uint8 buf[maxlen];
+  uint8 *p = buf + maxlen;
+  uint32 val = v.val;
+  *--p = val & 0x7F;
+  while (val > 0x7F)
+    {
+      val >>= 7;
+      *--p = (val & 0x7F) | 0x80;
+    }
+  return *this << data (p, buf + maxlen - p);
 }
 packet &packet::operator <<(const data   &v)
 {
   if (room () < v.len)

Diff Legend

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

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

Diff Legend

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