[ViewVC] Diff of: cvs/deliantra/server/socket/init.C

Comparing deliantra/server/socket/init.C (file contents):
Revision 1.43 by root, Mon Apr 2 18:55:22 2007 UTC vs.
Revision 1.52 by root, Mon Oct 1 01:09:10 2007 UTC

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
- * Copyright (C) 2001 Mark Wedel
+ * Copyright (©) 2001,2007 Mark Wedel
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * This program is free software; you can redistribute it and/or modify
+ * 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
+ * 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
+ * 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 this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * The author can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 /**
  * \file
  * Socket general functions
 #include <unistd.h>
 #include <arpa/inet.h>
 #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;
 /**
  * Initializes a connection. Really, it just sets up the data structure,
  * socket setup is handled elsewhere.  We do send a version to the
  * client.
  */
 client::client (int fd, const char *peername)
 : fd (fd), host (strdup (peername)),
-  socket_ev (this, &client::socket_cb),
+  socket_ev (this, &client::socket_cb)
-  cmd_ev    (this, &client::cmd_cb),
-  cc_inv (this), cc_other (this)
 {
   refcnt_inc (); // the socket is an external reference
   mss = 1500 - 52; // 1500 typical ethernet frame, 66 typical tcp header overhead
   {
     struct linger linger_opt;
-    linger_opt.l_onoff = 0;
+    linger_opt.l_onoff  = 0;
     linger_opt.l_linger = 0;
     if (setsockopt (fd, SOL_SOCKET, SO_LINGER, &linger_opt, sizeof (struct linger)))
       LOG (llevError, "SO_LINGER: %s\n", strerror (errno));
   }
   {
     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)))
       LOG (llevError, "IP_TOS: %s\n", strerror (errno));
       LOG (llevError, "TCP_NODELAY: %s\n", strerror (errno));
 #endif
     // set some very aggressive keepalive parameters
 #ifdef TCP_KEEPIDLE
-    val = 10;
+    val = 1;
     if (setsockopt (fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof (val)))
       LOG (llevError, "TCP_KEEPIDLE: %s\n", strerror (errno));
 #endif
 #ifdef TCP_KEEPCNT
-    val = 5;
+    val = 3;
     if (setsockopt (fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof (val)))
       LOG (llevError, "TCP_KEEPCNT: %s\n", strerror (errno));
 #endif
 #ifdef TCP_KEEPINTVL
   /* Do this so we don't send a face command for the client for
    * this face.  Face 0 is sent to the client to say clear
    * 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 ();
 client::~client ()
 {
   clients.erase (this);
+  mapinfo_queue_clear ();
   free (stats.range);
   free (stats.title);
   free (host);
 }
     }
   state = ST_DEAD;
   socket_ev.suspend ();
-  cmd_ev.suspend ();
   refcnt_dec (); // socket no longer open
 }
 void
   last_weight_limit = 0;
   last_path_attuned = 0;
   last_path_repelled = 0;
   last_path_denied = 0;
   last_speed = 0;
-  flags = 0;
+  last_flags = 0;
   static living zero_living;
   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)
 {

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/socket/init.C (file contents): Revision 1.43 by root, Mon Apr 2 18:55:22 2007 UTC vs. Revision 1.52 by root, Mon Oct 1 01:09:10 2007 UTC

Diff Legend

Comparing deliantra/server/socket/init.C (file contents):
Revision 1.43 by root, Mon Apr 2 18:55:22 2007 UTC vs.
Revision 1.52 by root, Mon Oct 1 01:09:10 2007 UTC