--- deliantra/server/socket/init.C	2007/05/28 21:22:26	1.46
+++ deliantra/server/socket/init.C	2007/10/01 01:09:10	1.52
@@ -1,23 +1,22 @@
 /*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  * 
  * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
  * Copyright (©) 2001,2007 Mark Wedel
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Crossfire TRT is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
+ * Crossfire TRT is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  * 
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along
- * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
@@ -48,6 +47,12 @@
 
 #include <algorithm>
 
+// use relatively small values, as we do not expect to receive much,
+// and we do userspace write buffering
+// 8kb limits throughput to roughly 66kb/s
+#define SOCKET_RCVBUF  8192
+#define SOCKET_SNDBUF 16384
+
 sockvec clients;
 
 /**
@@ -57,8 +62,7 @@
  */
 client::client (int fd, const char *peername)
 : fd (fd), host (strdup (peername)),
-  socket_ev (this, &client::socket_cb),
-  cmd_ev    (this, &client::cmd_cb)
+  socket_ev (this, &client::socket_cb)
 {
   refcnt_inc (); // the socket is an external reference
 
@@ -77,6 +81,18 @@
   {
     int val;
 
+#ifdef SO_RCVBUF
+    val = SOCKET_RCVBUF;
+    if (setsockopt (fd, SOL_SOCKET, SO_RCVBUF, &val, sizeof (val)))
+      LOG (llevError, "SO_RCVBUF: %s\n", strerror (errno));
+#endif
+
+#ifdef SO_SNDBUF
+    val = SOCKET_SNDBUF;
+    if (setsockopt (fd, SOL_SOCKET, SO_SNDBUF, &val, sizeof (val)))
+      LOG (llevError, "SO_SNDBUF: %s\n", strerror (errno));
+#endif
+
 #ifdef IP_TOS
     val = IPTOS_LOWDELAY;
     if (setsockopt (fd, IPPROTO_IP, IP_TOS, &val, sizeof (val)))
@@ -148,13 +164,12 @@
    * face information.
    */
   faces_sent[0] = true;
+  fx_want [FT_FACE] = true; // all clients must support image faces
 
-  socket_ev.prio (PE_PRIO_NORMAL);
+  socket_ev.prio (PE_PRIO_HIGH);
   socket_ev.fd (fd);
   socket_ev.poll (PE_R);
 
-  cmd_ev.prio (PE_PRIO_NORMAL);
-
   // initialisation done, kick it!
   send_packet_printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO);
   flush ();
@@ -168,6 +183,7 @@
 {
   clients.erase (this);
 
+  mapinfo_queue_clear ();
   free (stats.range);
   free (stats.title);
   free (host);
@@ -192,7 +208,6 @@
   state = ST_DEAD;
 
   socket_ev.suspend ();
-  cmd_ev.suspend ();
 
   refcnt_dec (); // socket no longer open
 }
@@ -228,30 +243,6 @@
   last_stats = zero_living;
 }
 
-/** This sets up the socket and reads all the image information into memory. */
-void
-init_ericserver (void)
-{
-  cst_tot.time_start = time (NULL);
-  cst_lst.time_start = time (NULL);
-
-  LOG (llevDebug, "Initialize new client/server data\n");
-}
-
-/*******************************************************************************
- *
- * Start of functions dealing with freeing of the data.
- *
- ******************************************************************************/
-
-/** Free's all the memory that ericserver allocates. */
-void
-free_all_newserver (void)
-{
-  LOG (llevDebug, "Freeing all new client/server information.\n");
-  free_socket_images ();
-}
-
 client *
 client::create (int fd, const char *peername)
 {