--- deliantra/server/socket/lowlevel.C	2006/12/14 01:21:58	1.14
+++ deliantra/server/socket/lowlevel.C	2006/12/14 01:59:10	1.15
@@ -88,10 +88,15 @@
 
 packet &packet::operator <<(const data   &v)
 {
-  if (v.len)
+  if (room () < v.len)
+    reset ();
+  else
     {
-      memcpy (buf + len, v.ptr, v.len);
-      len += v.len;
+      if (v.len)
+        {
+          memcpy (cur, v.ptr, v.len);
+          cur += v.len;
+        }
     }
 
   return *this;
@@ -117,12 +122,17 @@
 void
 packet::printf (const char *format, ...)
 {
+  int size = room ();
+
   va_list ap;
   va_start (ap, format);
+  int len = vsnprintf ((char *)cur, size, format, ap);
+  va_end (ap);
 
-  len += vsnprintf ((char *)buf + len, MAXSOCKBUF, format, ap);
+  if (len >= size)
+    return reset ();
 
-  va_end (ap);
+  cur += len;
 }
 
 /******************************************************************************
@@ -301,31 +311,32 @@
  * updates the ns structure if we get an  error.
  */
 void
-Write_To_Socket (NewSocket * ns, char *buf, int len)
+NewSocket::send (void *buf_, int len)
 {
-  int amt = 0;
+  char *buf = (char *)buf_;
   char *pos = buf;
+  int amt = 0;
 
-  if (ns->status == Ns_Dead || !buf)
+  if (status == Ns_Dead || !buf)
     {
       LOG (llevDebug, "Write_To_Socket called with dead socket\n");
       return;
     }
 
 #ifndef __GNU__                 /* This caused problems on Hurd */
-  if (!ns->can_write)
+  if (!can_write)
     {
-      add_to_buffer (ns, buf, len);
+      add_to_buffer (this, buf, len);
       return;
     }
 #endif
+
   /* If we manage to write more than we wanted, take it as a bonus */
   while (len > 0)
     {
-
       do
         {
-          amt = write (ns->fd, pos, len);
+          amt = write (fd, pos, len);
         }
       while ((amt < 0) && (errno == EINTR));
 
@@ -335,14 +346,14 @@
             {
               LOG (llevError, "New socket write failed WTS (%d: %s).\n",        /* ---WIN32 */
                    errno, strerror (errno));
-              ns->status = Ns_Dead;
+              status = Ns_Dead;
               return;
             }
           else
             {                   /* EWOULDBLOCK */
               /* can't write it, so store it away. */
-              add_to_buffer (ns, pos, len);
-              ns->can_write = 0;
+              add_to_buffer (this, pos, len);
+              can_write = 0;
               return;
             }
         }
@@ -350,9 +361,8 @@
        * an else if to make sure we don't reprocess it.
        */
       else if (amt == 0)
-        {
-          LOG (llevError, "Write_To_Socket: No data written out.\n");
-        }
+        LOG (llevError, "Write_To_Socket: No data written out.\n");
+
       len -= amt;
       pos += amt;
 #ifdef CS_LOGSTATS
@@ -402,19 +412,22 @@
   if (ns->status == Ns_Dead || !msg)
     return;
 
-  if (msg->len >= MAXSOCKBUF)
+  if (msg->length () >= MAXSOCKBUF)
     {
-      LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", msg->len);
+      LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", msg->length ());
       /* Almost certainly we've overflowed a buffer, so quite now to make
        * it easier to debug.
        */
       abort ();
     }
-  sbuf[0] = ((uint32) (msg->len) >> 8) & 0xFF;
-  sbuf[1] = ((uint32) (msg->len)) & 0xFF;
+
+  sbuf[0] = ((uint32) (msg->length ()) >> 8);
+  sbuf[1] = ((uint32) (msg->length ())     );
+
   if (ns->status != Ns_Old)
-    Write_To_Socket (ns, (char *) sbuf, 2);
-  Write_To_Socket (ns, (char *) msg->buf, msg->len);
+    ns->send (sbuf, 2);
+
+  ns->send (msg->buf, msg->length ());
 }
 
 /******************************************************************************