--- deliantra/server/socket/lowlevel.C	2006/12/14 01:21:58	1.14
+++ deliantra/server/socket/lowlevel.C	2006/12/14 20:39:54	1.19
@@ -53,7 +53,7 @@
 #define SOCKET_TIMEOUT2 20
 
 void
-Socket_Flush (NewSocket * ns)
+Socket_Flush (client_socket * ns)
 {
 #ifdef __linux__
   // check time of last ack, and, if too old, kill connection
@@ -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;
 }
 
 /******************************************************************************
@@ -132,7 +142,7 @@
  ******************************************************************************/
 
 int
-NewSocket::read_packet ()
+client_socket::read_packet ()
 {
   for (;;)
     {
@@ -178,7 +188,7 @@
 }
 
 void
-NewSocket::skip_packet (int len)
+client_socket::skip_packet (int len)
 {
   inbuf_len -= len;
   memmove (inbuf, inbuf + len, inbuf_len);
@@ -198,7 +208,7 @@
  */
 
 static void
-add_to_buffer (NewSocket *ns, char *buf, int len)
+add_to_buffer (client_socket *ns, char *buf, int len)
 {
   int avail, end;
 
@@ -242,7 +252,7 @@
  * is called to write it out.
  */
 void
-write_socket_buffer (NewSocket * ns)
+write_socket_buffer (client_socket * ns)
 {
   int amt, max;
 
@@ -301,31 +311,32 @@
  * updates the ns structure if we get an  error.
  */
 void
-Write_To_Socket (NewSocket * ns, char *buf, int len)
+client_socket::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
@@ -362,19 +372,45 @@
     }
 }
 
+void
+client_socket::socket_cb (iow &w, int got)
+{
+  //printf ("iow got %x\n", got);
+  w.stop ();
+}
+
 /**
  * Takes a string of data, and writes it out to the socket. A very handy
  * shortcut function.
  */
-
 void
-NewSocket::send_packet (packet &sl)
+client_socket::send_packet (packet &sl)
 {
-  Send_With_Handling (this, &sl);
+  if (status == Ns_Dead)
+    return;
+
+  if (sl.length () >= MAXSOCKBUF)
+    {
+      LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());
+      /* Almost certainly we've overflowed a buffer, so quit now to make
+       * it easier to debug.
+       */
+      abort ();
+    }
+
+  if (!sl.length ())
+    return;
+
+  assert (sl.hdrlen == 2);
+
+  sl.buf_ [0] = sl.length () >> 8;
+  sl.buf_ [1] = sl.length ()     ;
+
+  send (sl.buf_, sl.length () + sl.hdrlen);
 }
 
 void
-NewSocket::send_packet (const char *buf, int len)
+client_socket::send_packet (const char *buf, int len)
 {
   packet sl;
 
@@ -383,40 +419,11 @@
 }
 
 void
-NewSocket::send_packet (const char *buf)
+client_socket::send_packet (const char *buf)
 {
   send_packet (buf, strlen (buf));
 }
 
-/**
- * Calls Write_To_Socket to send data to the client.
- *
- * The only difference in this function is that we take a packet
- *, and we prepend the length information.
- */
-void
-Send_With_Handling (NewSocket *ns, packet *msg)
-{
-  unsigned char sbuf[4];
-
-  if (ns->status == Ns_Dead || !msg)
-    return;
-
-  if (msg->len >= MAXSOCKBUF)
-    {
-      LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", msg->len);
-      /* 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;
-  if (ns->status != Ns_Old)
-    Write_To_Socket (ns, (char *) sbuf, 2);
-  Write_To_Socket (ns, (char *) msg->buf, msg->len);
-}
-
 /******************************************************************************
  *
  * statistics logging functions.
@@ -448,7 +455,6 @@
        now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start);
   cst_lst.ibytes = 0;
   cst_lst.obytes = 0;
-  cst_lst.max_conn = socket_info.nconns;
   cst_lst.time_start = now;
 }
 #endif