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

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.33 by root, Sun Feb 4 21:02:54 2007 UTC vs.
Revision 1.36 by root, Wed Mar 14 15:44:47 2007 UTC

   {"mapinfo",     PC(MapInfoCmd)   0 },   /* CF+ */
   {"reply",       SC(ReplyCmd)     0 },
   {"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 },
  */
 void
 client::send (void *buf_, int len)
 {
   char *buf = (char *)buf_;
-  char *pos = buf;
-  int amt = 0;
   if (destroyed () || !buf)
     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);
+}
 /***********************************************************************
  *
  * packet functions/utilities
  *
  **********************************************************************/

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