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

Comparing deliantra/server/socket/init.C (file contents):
Revision 1.47 by root, Sat Jun 9 22:54:03 2007 UTC vs.
Revision 1.62 by root, Mon Oct 12 14:00:59 2009 UTC

 /*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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
+ * Deliantra is free software: you can redistribute it and/or modify it under
- * under the terms of the GNU General Public License as published by the Free
+ * the terms of the Affero GNU General Public License as published by the
- * Software Foundation; either version 2 of the License, or (at your option)
+ * Free Software Foundation, either version 3 of the License, or (at your
- * any later version.
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but
+ * This program is distributed in the hope that it will be useful,
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along
+ * You should have received a copy of the Affero GNU General Public License
- * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * and the GNU General Public License along with this program. If not, see
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * <http://www.gnu.org/licenses/>.
  *
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 /**
  * \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)
 {
   refcnt_inc (); // the socket is an external reference
   mss = 1500 - 52; // 1500 typical ethernet frame, 66 typical tcp header overhead
+  socket_timeout = 16.;
   {
     struct linger linger_opt;
     linger_opt.l_onoff  = 0;
       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));
     if (!getsockopt (fd, IPPROTO_TCP, TCP_MAXSEG, &val, &sl) && sl == sizeof (val))
       mss = val;
 #endif
   }
-  {
-    int bufsize = 65535;          /*Supposed absolute upper limit */
-    int oldbufsize;
-    int buflen = sizeof (int);
-    if (fcntl (fd, F_SETFL, O_NONBLOCK) == -1)
+  if (fcntl (fd, F_SETFL, O_NONBLOCK) == -1)
-      LOG (llevError, "InitConnection:  Error on fcntl.\n");
+    LOG (llevError, "InitConnection:  Error on fcntl.\n");
-    if (getsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen) == -1)
-      oldbufsize = 0;
-    if (oldbufsize < bufsize)
-      if (setsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &bufsize, sizeof (&bufsize)))
-        LOG (llevError, "InitConnection: setsockopt unable to set output buf size to %d\n", bufsize);
-    buflen = sizeof (oldbufsize);
-    getsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen);
-  }
   state = ST_SETUP;
-  mapmode = Map0Cmd;
+  mapmode = Map1aCmd;
-  darkness = 1;
   mapx = 11;
   mapy = 11;
   itemcmd = 1;              /* Default is version item1 command */
   max_rate = 100000 / (1000000 / MAX_TIME); // ~1mbit is assumed per default
   /* 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.set (fd, EV_READ);
+  socket_ev.prio (2); // one higher than the ticker priority
-  socket_ev.fd (fd);
+  socket_ev.start ();
-  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);
 }
       close (fd);
     }
   state = ST_DEAD;
-  socket_ev.suspend ();
+  socket_ev.stop ();
-  cmd_ev.suspend ();
   refcnt_dec (); // socket no longer open
 }
 void
     last_resist[i] = -1;
   last_weapon_sp = -1;
   last_level = -1;
   last_stats.exp = -1;
-  last_weight = (uint32) - 1;
   last_flags = 0;
-  last_weight = 0;
+  last_weight = -1;
   last_weight_limit = 0;
   last_path_attuned = 0;
   last_path_repelled = 0;
   last_path_denied = 0;
   last_speed = 0;
   static living zero_living;
   last_stats = zero_living;
 }
-/*******************************************************************************
- *
- * 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)
 {
   client *ns = new client (dup (fd), peername);
   ns->instantiate (); // effectively a nop right now

Diff Legend

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

Comparing deliantra/server/socket/init.C (file contents): Revision 1.47 by root, Sat Jun 9 22:54:03 2007 UTC vs. Revision 1.62 by root, Mon Oct 12 14:00:59 2009 UTC

Diff Legend

Comparing deliantra/server/socket/init.C (file contents):
Revision 1.47 by root, Sat Jun 9 22:54:03 2007 UTC vs.
Revision 1.62 by root, Mon Oct 12 14:00:59 2009 UTC