--- deliantra/server/socket/lowlevel.C	2006/12/11 19:46:47	1.8
+++ deliantra/server/socket/lowlevel.C	2006/12/13 18:08:02	1.9
@@ -74,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
 }
 
@@ -87,34 +85,24 @@
  *
  **********************************************************************/
 
-void
-SockList_Init (SockList * sl)
+SockList &SockList::operator <<(const data8  &v)
 {
-  sl->len = 0;
-  sl->buf = NULL;
-}
+  *this << uint8 (v.len);
 
-void
-SockList_AddInt (SockList * sl, uint32 data)
-{
-  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;
+  memcpy (buf + len, v.data, v.len);
+  len += v.len;
+
+  return *this;
 }
 
-void
-SockList_AddInt64 (SockList * sl, uint64 data)
+SockList &SockList::operator <<(const data16 &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);
+  *this << uint16 (v.len);
+
+  memcpy (buf + len, v.data, v.len);
+  len += v.len;
+
+  return *this;
 }
 
 /* Basically does the reverse of SockList_AddInt, but on
@@ -511,3 +499,4 @@
   cst_lst.time_start = now;
 }
 #endif
+