--- deliantra/server/socket/lowlevel.C	2006/08/13 17:16:06	1.1
+++ deliantra/server/socket/lowlevel.C	2006/08/29 08:01:38	1.3
@@ -1,7 +1,7 @@
 
 /*
  * static char *rcsid_sockets_c =
- *    "$Id: lowlevel.C,v 1.1 2006/08/13 17:16:06 elmex Exp $";
+ *    "$Id: lowlevel.C,v 1.3 2006/08/29 08:01:38 root Exp $";
  */
 
 /*
@@ -72,7 +72,7 @@
           && SOCKET_TIMEOUT1 * TCP_HZ < diff && diff < 0x80000000UL // ack delayed for 20s
           && SOCKET_TIMEOUT2 * TCP_HZ < tcpi.tcpi_last_data_sent)   // no data sent for 10s
         {
-	  LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", ns->fd,
+          LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", ns->fd,
                (unsigned)tcpi.tcpi_last_ack_recv, (unsigned)tcpi.tcpi_last_data_sent, (unsigned)tcpi.tcpi_unacked);
           ns->status = Ns_Dead;
         }
@@ -96,19 +96,6 @@
     sl->buf=NULL;
 }
 
-void SockList_AddChar(SockList *sl, char c)
-{
-    sl->buf[sl->len]=c;
-    sl->len++;
-}
-
-void SockList_AddShort(SockList *sl, uint16 data)
-{
-    sl->buf[sl->len++]= (data>>8)&0xff;
-    sl->buf[sl->len++] = data & 0xff;
-}
-
-
 void SockList_AddInt(SockList *sl, uint32 data)
 {
     sl->buf[sl->len++]= (data>>24)&0xff;
@@ -162,107 +149,107 @@
 
     /* Sanity check - shouldn't happen */
     if (sl->len < 0) {
-	abort();
+        abort();
     }
     /* 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);
+        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.
-	     */
+        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! */
-	    }
+        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_local(errno));
-	    }
-#endif
-	    return 0;	/*Error */
-	}
-	if (stat==0) return -1;
-	sl->len += stat;
+        if (errno != EAGAIN && errno !=EWOULDBLOCK) {
+                LOG(llevDebug, "ReadPacket got error %s, returning 0\n", strerror_local(errno));
+            }
+#endif
+            return 0;	/*Error */
+        }
+        if (stat==0) return -1;
+        sl->len += stat;
 #ifdef CS_LOGSTATS
-	cst_tot.ibytes += stat;
-	cst_lst.ibytes += stat;
+        cst_tot.ibytes += stat;
+        cst_lst.ibytes += stat;
 #endif
-	if (stat<2) return 0;	/* Still don't have a full packet */
+        if (stat<2) return 0;	/* Still don't have a full packet */
     }
     /* Figure out how much more data we need to read.  Add 2 from the
      * end of this - size header information is not included.
      */
     toread = 2+(sl->buf[0] << 8) + sl->buf[1] - sl->len;
     if ((toread + sl->len) >= len) {
-	LOG(llevError,"SockList_ReadPacket: Want to read more bytes than will fit in buffer (%d>=%d).\n",
-	     toread + sl->len, len);
-	/* Quick hack in case for 'oldsocketmode' input.  If we are
-	 * closing the socket anyways, then reading this extra 100 bytes
-	 * shouldn't hurt.
-	 */
+        LOG(llevError,"SockList_ReadPacket: Want to read more bytes than will fit in buffer (%d>=%d).\n",
+             toread + sl->len, len);
+        /* Quick hack in case for 'oldsocketmode' input.  If we are
+         * 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);
+        recv(fd, sl->buf+2, 100, 0);
 #else
-	read(fd, sl->buf+2, 100);
+        read(fd, sl->buf+2, 100);
 #endif /* end win32 */
 
-	/* return error so the socket is closed */
-	return -1;
+        /* 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);
+        stat = recv(fd, sl->buf+ sl->len, toread, 0);
 #else
-	do {
-	    stat = read(fd, sl->buf+ sl->len, toread);
-	} while ((stat<0) && (errno==EINTR));
+        do {
+            stat = read(fd, sl->buf+ sl->len, toread);
+        } while ((stat<0) && (errno==EINTR));
 #endif
-	if (stat<0) {
+        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! */
-	    }
+        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_local(errno));
-	    }
-#endif
-	    return 0;	/*Error */
-	}
-	if (stat==0) return -1;
-	sl->len += stat;
+        if (errno != EAGAIN && errno !=EWOULDBLOCK) {
+                LOG(llevDebug, "ReadPacket got error %s, returning 0\n", strerror_local(errno));
+            }
+#endif
+            return 0;	/*Error */
+        }
+        if (stat==0) return -1;
+        sl->len += stat;
 #ifdef CS_LOGSTATS
-	cst_tot.ibytes += stat;
-	cst_lst.ibytes += stat;
+        cst_tot.ibytes += stat;
+        cst_lst.ibytes += stat;
 #endif
-	toread -= stat;
-	if (toread==0) return 1;
-	if (toread < 0) {
-	    LOG(llevError,"SockList_ReadPacket: Read more bytes than desired.\n");
-	    return 1;
-	}
+        toread -= stat;
+        if (toread==0) return 1;
+        if (toread < 0) {
+            LOG(llevError,"SockList_ReadPacket: Read more bytes than desired.\n");
+            return 1;
+        }
     } while (toread>0);
     return 0;
 }
@@ -285,10 +272,10 @@
     int avail, end;
 
     if ((len+ns->outputbuffer.len)>SOCKETBUFSIZE) {
-	LOG(llevDebug,"Socket on fd %d has overrun internal buffer - marking as dead\n",
-	    ns->fd);
-	ns->status = Ns_Dead;
-	return;
+        LOG(llevDebug,"Socket on fd %d has overrun internal buffer - marking as dead\n",
+            ns->fd);
+        ns->status = Ns_Dead;
+        return;
     }
 
     /* data + end is where we start putting the new data.  The last byte
@@ -302,16 +289,16 @@
 
     /* 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);
+        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);
+        ns->outputbuffer.len, ns->outputbuffer.start);
 #endif
 }
 
@@ -326,49 +313,49 @@
     int amt, max;
 
     if (ns->outputbuffer.len==0) {
-	LOG(llevDebug,"write_socket_buffer called when there is no data, fd=%d\n",
-	    ns->fd);
-	return;
+        LOG(llevDebug,"write_socket_buffer called when there is no data, fd=%d\n",
+            ns->fd);
+        return;
     }
 
     do {
-	max = SOCKETBUFSIZE - ns->outputbuffer.start;
-	if (ns->outputbuffer.len<max) max = ns->outputbuffer.len;
+        max = SOCKETBUFSIZE - ns->outputbuffer.start;
+        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);
+        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));
+        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 */
+        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());
+        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_local(errno));
-#endif
-		ns->status=Ns_Dead;
-		return;
-	    }
-	    else { /* EWOULDBLOCK */
-		/* can't write it, so store it away. */
-		ns->can_write=0;
-		return;
-	    }
-	}
-	ns->outputbuffer.start += amt;
-	/* wrap back to start of buffer */
-	if (ns->outputbuffer.start==SOCKETBUFSIZE) ns->outputbuffer.start=0;
-	ns->outputbuffer.len -= amt;
+        if (errno !=EWOULDBLOCK) {
+                LOG(llevError,"New socket write failed (wsb) (%d: %s).\n",
+                    errno, strerror_local(errno));
+#endif
+                ns->status=Ns_Dead;
+                return;
+            }
+            else { /* EWOULDBLOCK */
+                /* can't write it, so store it away. */
+                ns->can_write=0;
+                return;
+            }
+        }
+        ns->outputbuffer.start += amt;
+        /* wrap back to start of buffer */
+        if (ns->outputbuffer.start==SOCKETBUFSIZE) ns->outputbuffer.start=0;
+        ns->outputbuffer.len -= amt;
 #ifdef CS_LOGSTATS
-	cst_tot.obytes += amt;
-	cst_lst.obytes += amt;
+        cst_tot.obytes += amt;
+        cst_lst.obytes += amt;
  #endif
     } while (ns->outputbuffer.len>0);
 }
@@ -386,57 +373,57 @@
     char *pos=buf;
 
     if (ns->status == Ns_Dead || !buf) {
-	LOG(llevDebug,"Write_To_Socket called with dead socket\n");
-	return;
+        LOG(llevDebug,"Write_To_Socket called with dead socket\n");
+        return;
     }
  
 #ifndef __GNU__ /* This caused problems on Hurd */
     if (!ns->can_write) {
-	add_to_buffer(ns, buf, len);
-	return;
+        add_to_buffer(ns, buf, len);
+        return;
     }
 #endif
     /* If we manage to write more than we wanted, take it as a bonus */
     while (len>0) {
 
 #ifdef WIN32 /* ***win32 Write_To_Socket: change write() to send() */
-	    amt=send(ns->fd, pos, len,0);
+            amt=send(ns->fd, pos, len,0);
 #else
-	do {
-	    amt=write(ns->fd, pos, len);
-	} while ((amt<0) && (errno==EINTR));
+        do {
+            amt=write(ns->fd, pos, len);
+        } while ((amt<0) && (errno==EINTR));
 #endif
 
-	if (amt < 0) { /* We got an error */
+        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());
+        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_local(errno));
-#endif
-		ns->status=Ns_Dead;
-		return;
-	    }
-	    else { /* EWOULDBLOCK */
-		/* can't write it, so store it away. */
-		add_to_buffer(ns, pos, len);
-		ns->can_write=0;
-		return;
-	    }
-	}
-	/* amt gets set to 0 above in blocking code, so we do this as
-	 * 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");
-	}
-	len -= amt;
-	pos += amt;
+        if (errno !=EWOULDBLOCK) {
+                LOG(llevError,"New socket write failed WTS (%d: %s).\n", /* ---WIN32 */
+                    errno, strerror_local(errno));
+#endif
+                ns->status=Ns_Dead;
+                return;
+            }
+            else { /* EWOULDBLOCK */
+                /* can't write it, so store it away. */
+                add_to_buffer(ns, pos, len);
+                ns->can_write=0;
+                return;
+            }
+        }
+        /* amt gets set to 0 above in blocking code, so we do this as
+         * 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");
+        }
+        len -= amt;
+        pos += amt;
 #ifdef CS_LOGSTATS
-	cst_tot.obytes += amt;
-	cst_lst.obytes += amt;
+        cst_tot.obytes += amt;
+        cst_lst.obytes += amt;
  #endif
     }
 }
@@ -467,20 +454,20 @@
     unsigned char sbuf[4];
 
     if (ns->status == Ns_Dead || !msg)
-	return;
+        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();
+        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 *) sbuf, 2);
     Write_To_Socket(ns, (char*)msg->buf, msg->len);
 }
 
@@ -522,9 +509,9 @@
 
     /* CSSTAT is put in so scripts can easily find the line */
     LOG(llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n",
-	ctime(&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn,
-	now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes,
-	cst_lst.max_conn, now - cst_lst.time_start);
+        ctime(&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn,
+        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;