--- deliantra/server/socket/lowlevel.C	2006/09/10 13:43:33	1.5
+++ deliantra/server/socket/lowlevel.C	2006/12/13 18:51:50	1.10
@@ -1,9 +1,3 @@
-
-/*
- * static char *rcsid_sockets_c =
- *    "$Id: lowlevel.C,v 1.5 2006/09/10 13:43:33 root Exp $";
- */
-
 /*
     CrossFire, A Multiplayer game for X-windows
 
@@ -80,10 +74,8 @@
 
   int val;
 
-  val = 0;
-  setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val));
-  val = 1;
-  setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val));
+  val = 0; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val));
+  val = 1; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val));
 #endif
 }
 
@@ -93,34 +85,36 @@
  *
  **********************************************************************/
 
-void
-SockList_Init (SockList * sl)
+SockList &SockList::operator <<(const data8  &v)
 {
-  sl->len = 0;
-  sl->buf = NULL;
+  *this << uint8 (v.len);
+
+  memcpy (buf + len, v.data, v.len);
+  len += v.len;
+
+  return *this;
 }
 
-void
-SockList_AddInt (SockList * sl, uint32 data)
+SockList &SockList::operator <<(const data16 &v)
 {
-  sl->buf[sl->len++] = (data >> 24) & 0xff;
-  sl->buf[sl->len++] = (data >> 16) & 0xff;
-  sl->buf[sl->len++] = (data >> 8) & 0xff;
-  sl->buf[sl->len++] = data & 0xff;
+  *this << uint16 (v.len);
+
+  memcpy (buf + len, v.data, v.len);
+  len += v.len;
+
+  return *this;
 }
 
-void
-SockList_AddInt64 (SockList * sl, uint64 data)
+SockList &SockList::operator <<(const char *v)
 {
-  sl->buf[sl->len++] = (char) ((data >> 56) & 0xff);
-  sl->buf[sl->len++] = (char) ((data >> 48) & 0xff);
-  sl->buf[sl->len++] = (char) ((data >> 40) & 0xff);
-  sl->buf[sl->len++] = (char) ((data >> 32) & 0xff);
-
-  sl->buf[sl->len++] = (char) ((data >> 24) & 0xff);
-  sl->buf[sl->len++] = (char) ((data >> 16) & 0xff);
-  sl->buf[sl->len++] = (char) ((data >> 8) & 0xff);
-  sl->buf[sl->len++] = (char) (data & 0xff);
+  if (v)
+    {
+      int l = strlen (v);
+      memcpy (buf + len, v, l);
+      len += l;
+    }
+
+  return *this;
 }
 
 /* Basically does the reverse of SockList_AddInt, but on
@@ -165,39 +159,21 @@
   /* We already have a partial packet */
   if (sl->len < 2)
     {
-#ifdef WIN32                    /* ***WIN32 SockList_ReadPacket: change read() to recv() */
-
-      stat = recv (fd, sl->buf + sl->len, 2 - sl->len, 0);
-
-#else
       do
         {
           stat = read (fd, sl->buf + sl->len, 2 - sl->len);
         }
       while ((stat == -1) && (errno == EINTR));
-#endif
+
       if (stat < 0)
         {
           /* In non blocking mode, EAGAIN is set when there is no
            * data available.
            */
-#ifdef WIN32                    /* ***WIN32 SockList_ReadPacket: error handling for win32 */
-          if ((stat == -1) && WSAGetLastError () != WSAEWOULDBLOCK)
-            {
-              if (WSAGetLastError () == WSAECONNRESET)
-                LOG (llevDebug, "Connection closed by client\n");
-              else
-                {
-                  LOG (llevDebug, "ReadPacket got error %d, returning 0\n", WSAGetLastError ());
-                }
-              return -1;        /* kick this user! */
-            }
-#else
           if (errno != EAGAIN && errno != EWOULDBLOCK)
             {
               LOG (llevDebug, "ReadPacket got error %s, returning 0\n", strerror (errno));
             }
-#endif
           return 0;             /*Error */
         }
       if (stat == 0)
@@ -221,46 +197,25 @@
        * closing the socket anyways, then reading this extra 100 bytes
        * shouldn't hurt.
        */
-#ifdef WIN32                    /* ***win32 SockList_ReadPacket: change read() to recv() */
-      recv (fd, sl->buf + 2, 100, 0);
-#else
       read (fd, sl->buf + 2, 100);
-#endif /* end win32 */
 
       /* return error so the socket is closed */
       return -1;
     }
   do
     {
-#ifdef WIN32                    /* ***win32 SockList_ReadPacket: change read() to recv() */
-      stat = recv (fd, sl->buf + sl->len, toread, 0);
-#else
       do
         {
           stat = read (fd, sl->buf + sl->len, toread);
         }
       while ((stat < 0) && (errno == EINTR));
-#endif
       if (stat < 0)
         {
 
-#ifdef WIN32                    /* ***win32 SockList_ReadPacket: change error handling for win32 */
-          if ((stat == -1) && WSAGetLastError () != WSAEWOULDBLOCK)
-            {
-              if (WSAGetLastError () == WSAECONNRESET)
-                LOG (llevDebug, "Connection closed by client\n");
-              else
-                {
-                  LOG (llevDebug, "ReadPacket got error %d, returning 0\n", WSAGetLastError ());
-                }
-              return -1;        /* kick this user! */
-            }
-#else
           if (errno != EAGAIN && errno != EWOULDBLOCK)
             {
               LOG (llevDebug, "ReadPacket got error %s, returning 0\n", strerror (errno));
             }
-#endif
           return 0;             /*Error */
         }
       if (stat == 0)
@@ -316,18 +271,18 @@
   /* The buffer is already in a wrapped state, so adjust end */
   if (end >= SOCKETBUFSIZE)
     end -= SOCKETBUFSIZE;
+
   avail = SOCKETBUFSIZE - end;
 
   /* We can all fit it behind the current data without wrapping */
   if (avail >= len)
-    {
-      memcpy (ns->outputbuffer.data + end, buf, len);
-    }
+    memcpy (ns->outputbuffer.data + end, buf, len);
   else
     {
       memcpy (ns->outputbuffer.data + end, buf, avail);
       memcpy (ns->outputbuffer.data, buf + avail, len - avail);
     }
+
   ns->outputbuffer.len += len;
 #if 0
   LOG (llevDebug, "Added %d to output buffer, total length now %d, start=%d\n", len, ns->outputbuffer.len, ns->outputbuffer.start);
@@ -357,28 +312,18 @@
       if (ns->outputbuffer.len < max)
         max = ns->outputbuffer.len;
 
-#ifdef WIN32                    /* ***win32 write_socket_buffer: change write() to send() */
-      amt = send (ns->fd, ns->outputbuffer.data + ns->outputbuffer.start, max, 0);
-#else
       do
         {
           amt = write (ns->fd, ns->outputbuffer.data + ns->outputbuffer.start, max);
         }
       while ((amt < 0) && (errno == EINTR));
-#endif
 
       if (amt < 0)
         {                       /* We got an error */
 
-#ifdef WIN32                    /* ***win32 write_socket_buffer: change error handling */
-          if (amt == -1 && WSAGetLastError () != WSAEWOULDBLOCK)
-            {
-              LOG (llevError, "New socket write failed (wsb) (%d).\n", WSAGetLastError ());
-#else
           if (errno != EWOULDBLOCK)
             {
               LOG (llevError, "New socket write failed (wsb) (%d: %s).\n", errno, strerror (errno));
-#endif
               ns->status = Ns_Dead;
               return;
             }
@@ -432,28 +377,18 @@
   while (len > 0)
     {
 
-#ifdef WIN32                    /* ***win32 Write_To_Socket: change write() to send() */
-      amt = send (ns->fd, pos, len, 0);
-#else
       do
         {
           amt = write (ns->fd, pos, len);
         }
       while ((amt < 0) && (errno == EINTR));
-#endif
 
       if (amt < 0)
         {                       /* We got an error */
-#ifdef WIN32                    /* ***win32 Write_To_Socket: change error handling */
-          if (amt == -1 && WSAGetLastError () != WSAEWOULDBLOCK)
-            {
-              LOG (llevError, "New socket write failed WTS (%d).\n", WSAGetLastError ());
-#else
           if (errno != EWOULDBLOCK)
             {
               LOG (llevError, "New socket write failed WTS (%d: %s).\n",        /* ---WIN32 */
                    errno, strerror (errno));
-#endif
               ns->status = Ns_Dead;
               return;
             }
@@ -576,3 +511,4 @@
   cst_lst.time_start = now;
 }
 #endif
+