[ViewVC] Diff of: cvs/deliantra/server/common/utils.C

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.69 by root, Tue Jan 22 15:53:01 2008 UTC vs.
Revision 1.90 by root, Thu Oct 15 21:09:32 2009 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Deliantra is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify it under
- * it under the terms of the GNU General Public License as published by
+ * the terms of the Affero GNU General Public License as published by the
- * the Free Software Foundation, either version 3 of the License, or
+ * Free Software Foundation, either version 3 of the License, or (at your
- * (at your option) any later version.
+ * 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.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the Affero GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * and 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 <support@deliantra.net>
  */
 /*
 #include <sys/time.h>
 #include <time.h>
 #include <signal.h>
 #include <global.h>
-#include <funcpoint.h>
 #include <material.h>
+#include <object.h>
+#include <sys/time.h>
+#include <sys/resource.h>
 #include <glib.h>
 refcnt_base::refcnt_t refcnt_dummy;
-size_t slice_alloc;
+ssize_t slice_alloc;
-rand_gen rndm;
+rand_gen rndm, rmg_rndm;
 void
 tausworthe_random_generator::seed (uint32_t seed)
 {
-  state [0] = seed      * 69069U; if (state [0] <  2U) state [0] +=   2U;
+  state [0] = seed      * 69069U; if (state [0] <   2U) state [0] +=   2U;
-  state [1] = state [0] * 69069U; if (state [0] <  8U) state [0] +=   8U;
+  state [1] = state [0] * 69069U; if (state [0] <   8U) state [0] +=   8U;
-  state [2] = state [1] * 69069U; if (state [0] < 16U) state [0] +=  16U;
+  state [2] = state [1] * 69069U; if (state [0] <  16U) state [0] +=  16U;
-  state [3] = state [2] * 69069U; if (state [0] < 128) state [0] += 128U;
+  state [3] = state [2] * 69069U; if (state [0] < 128U) state [0] += 128U;
   for (int i = 11; --i; )
-    operator ()();
+    next ();
 }
 uint32_t
 tausworthe_random_generator::next ()
 {
   state [3] = ((state [3] & 0xFFFFFF80U) << 13U) ^ (((state [3] <<  3U) ^ state [3]) >> 12U);
   return state [0] ^ state [1] ^ state [2] ^ state [3];
 }
+template<class generator>
 uint32_t
-tausworthe_random_generator::get_range (uint32_t num)
+random_number_generator<generator>::get_range (uint32_t num)
 {
-  return (next () * (uint64_t)num) >> 32U;
+  return (this->next () * (uint64_t)num) >> 32U;
 }
 // return a number within (min .. max)
+template<class generator>
 int
-tausworthe_random_generator::get_range (int r_min, int r_max)
+random_number_generator<generator>::get_range (int r_min, int r_max)
 {
   return r_min + get_range (max (r_max - r_min + 1, 0));
 }
+template struct random_number_generator<tausworthe_random_generator>;
+template struct random_number_generator<xorshift_random_generator>;
 /*
  * The random functions here take luck into account when rolling random
  * dice or numbers.  This function has less of an impact the larger the
  * difference becomes in the random numbers.  IE, the effect is lessened
  * not the recipient (ie, the poor slob getting hit). [garbled 20010916]
  */
 int
 random_roll (int r_min, int r_max, const object *op, int goodbad)
 {
+  r_max = max (r_min, r_max);
   int base = r_max - r_min > 1 ? 20 : 50;     /* d2 and d3 are corner cases */
-  if (r_max < r_min)
-    {
-      LOG (llevError | logBacktrace, "Calling random_roll with min=%d max=%d\n", r_min, r_max);
-      return r_min;
-    }
   if (op->type == PLAYER)
     {
       int luck = op->stats.luck;
 /*
  * This is a 64 bit version of random_roll above.  This is needed
  * for exp loss calculations for players changing religions.
  */
 sint64
-random_roll64 (sint64 min, sint64 max, const object *op, int goodbad)
+random_roll64 (sint64 r_min, sint64 r_max, const object *op, int goodbad)
 {
-  sint64 omin = min;
+  sint64 omin = r_min;
-  sint64 diff = max - min + 1;
+  sint64 range = max (0, r_max - r_min + 1);
-  int base = diff > 2 ? 20 : 50;     /* d2 and d3 are corner cases */
+  int base = range > 2 ? 20 : 50;     /* d2 and d3 are corner cases */
-  if (diff < 0)
-    {
-      LOG (llevError | logBacktrace, "Calling random_roll64 with min=%" PRId64 " max=%" PRId64 "\n", min, max);
-      return (min);             /* avoids a float exception */
-    }
   /*
    * Make a call to get two 32 bit unsigned random numbers, and just to
    * a little bitshifting.
    */
   sint64 ran = (sint64) rndm.next () ^ ((sint64) rndm.next () << 31);
   if (op->type != PLAYER)
-    return ((ran % diff) + min);
+    return ((ran % range) + r_min);
   int luck = op->stats.luck;
-  if (rndm (base) < MIN (10, abs (luck)))
+  if (rndm (base) < min (10, abs (luck)))
     {
       /* we have a winner */
       ((luck > 0) ? (luck = 1) : (luck = -1));
-      diff -= luck;
+      range -= luck;
-      if (diff < 1)
+      if (range < 1)
         return (omin);          /*check again */
-      ((goodbad) ? (min += luck) : (diff));
+      ((goodbad) ? (r_min += luck) : (range));
-      return (MAX (omin, MIN (max, (ran % diff) + min)));
+      return (max (omin, min (r_max, (ran % range) + r_min)));
     }
-  return ran % diff + min;
+  return ran % range + r_min;
 }
 /*
  * Roll a number of dice (2d3, 4d6).  Uses op to determine luck,
  * If goodbad is non-zero, luck increases the roll, if zero, it decreases.
 }
 /* convert materialname to materialtype_t */
 materialtype_t *
-name_to_material (const shstr &name)
+name_to_material (const shstr_cmp name)
 {
-  for (materialtype_t *mt = materialt; mt && mt->next; mt = mt->next)
+  for (materialtype_t *mt = materialt; mt; mt = mt->next)
     if (name == mt->name)
       return mt;
   return 0;
 }
 transmute_materialname (object *op, const object *change)
 {
   materialtype_t *mt;
   int j;
-  if (op->materialname == NULL)
+  if (!op->materialname)
     return;
-  if (change->materialname != NULL && strcmp (op->materialname, change->materialname))
+  if (op->materialname != change->materialname)
     return;
   if (!op->is_armor ())
     return;
 void
 set_materialname (object *op, int difficulty, materialtype_t *nmt)
 {
   materialtype_t *mt, *lmt;
-  if (op->materialname != NULL)
+  if (!op->materialname)
     return;
-  if (nmt == NULL)
+  if (nmt)
+    lmt = nmt;
+  else
     {
-      lmt = NULL;
+      lmt = 0;
-      for (mt = materialt; mt && mt->next; mt = mt->next)
+      for (mt = materialt; mt; mt = mt->next)
         if (op->materials & mt->material && rndm (1, 100) <= mt->chance &&
             difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0))
           {
             lmt = mt;
             if (!(op->is_weapon () || op->is_armor ()))
               break;
           }
     }
-  else
-    lmt = nmt;
-  if (lmt != NULL)
+  if (lmt)
     {
       if (op->stats.dam && op->is_weapon ())
         {
           op->stats.dam += lmt->damage;
           if (op->stats.dam < 1)
     strcpy (input, tmp);
   return;
 }
+/******************************************************************************/
+/* Checks a player-provided string which will become the msg property of
+ * an object for dangerous input.
+ */
+bool
+msg_is_safe (const char *msg)
+{
+  bool safe = true;
+  /* Trying to cheat by getting data into the object */
+  if (!strncmp (msg, "endmsg", sizeof ("endmsg") - 1)
+      || strstr (msg, "\nendmsg"))
+    safe = false;
+  /* Trying to make the object talk, and potentially access arbitrary code */
+  if (object::msg_has_dialogue (msg))
+    safe = false;
+  return safe;
+}
 /////////////////////////////////////////////////////////////////////////////
 void
 fork_abort (const char *msg)
 {
   if (!fork ())
     {
+      signal (SIGINT , SIG_IGN);
+      signal (SIGTERM, SIG_IGN);
-      signal (SIGABRT, SIG_DFL);
+      signal (SIGABRT, SIG_IGN);
+      signal (SIGSEGV, SIG_DFL);
+      signal (SIGBUS , SIG_DFL);
+      signal (SIGILL , SIG_DFL);
+      signal (SIGTRAP, SIG_DFL);
       // try to put corefiles into a subdirectory, if existing, to allow
       // an administrator to reduce the I/O load.
       chdir ("cores");
+      // try to detach us from as many external dependencies as possible
+      // as coredumping can take time by closing all fd's.
+      {
+        struct rlimit lim;
+        if (getrlimit (RLIMIT_NOFILE, &lim))
+          lim.rlim_cur = 1024;
+        for (int i = 0; i < lim.rlim_cur; ++i)
+          close (i);
+      }
+      {
+        sigset_t empty;
+        sigemptyset (&empty);
+        sigprocmask (SIG_SETMASK, &empty, 0);
+      }
+      // try to coredump with SIGTRAP
+      kill (getpid (), SIGTRAP);
       abort ();
     }
   LOG (llevError, "fork abort: %s\n", msg);
 }
 void *salloc_ (int n) throw (std::bad_alloc)
 {
-#ifdef PREFER_MALLOC
-  void *ptr = malloc (n);
-#else
-  slice_alloc += n;
   void *ptr = g_slice_alloc (n);
-#endif
   if (!ptr)
     throw std::bad_alloc ();
+  slice_alloc += n;
   return ptr;
 }
 void *salloc_ (int n, void *src) throw (std::bad_alloc)
 {
   return ptr;
 }
 /******************************************************************************/
-#ifdef DEBUG_SALLOC
+#if DEBUG_SALLOC
-#define MAGIC 0xa1b2c35543deadL
+#define MAGIC 0xa1b2c35543deadLL
 void *g_slice_alloc (unsigned long size)
 {
   unsigned long *p = (unsigned long *) (g_slice_alloc)(size + sizeof (unsigned long));
   *p++ = size ^ MAGIC;
   return memset (g_slice_alloc (size), 0, size);
 }
 void g_slice_free1 (unsigned long size, void *ptr)
 {
+  //fprintf (stderr, "g_slice_free %ld %p\n", size, ptr);//D
   if (expect_true (ptr))
     {
-      //fprintf (stderr, "g_slice_free %ld %p\n", size, ptr);//D
       unsigned long *p = (unsigned long *)ptr;
       unsigned long s = *--p ^ MAGIC;
-      if ((*p ^ MAGIC) != size)
+      if (size != (unsigned long)(*p ^ MAGIC))
+        {
-        LOG (logBacktrace | llevError, "slice free size (%lx) doesn't match alloc size (%lx)\n", size, s);
+          LOG (logBacktrace | llevError, "slice free size (%lx) doesn't match alloc size (%lx)\n", size, s);
+          abort ();
+        }
       *p = MAGIC;
       (g_slice_free1)(s + sizeof (unsigned long), p);
     }
 #endif
 /******************************************************************************/
+int
-void assign (char *dst, const char *src, int maxlen)
+assign (char *dst, const char *src, int maxsize)
 {
   if (!src)
     src = "";
   int len = strlen (src);
-  if (len >= maxlen - 1)
+  if (len >= maxsize)
     {
-      if (maxlen <= 4)
+      if (maxsize <= 4)
         {
-          memset (dst, '.', maxlen - 1);
+          memset (dst, '.', maxsize - 2);
-          dst [maxlen - 1] = 0;
+          dst [maxsize - 1] = 0;
         }
       else
         {
-          memcpy (dst, src, maxlen - 4);
+          memcpy (dst, src, maxsize - 4);
-          memcpy (dst + maxlen - 4, "...", 4);
+          memcpy (dst + maxsize - 4, "...", 4);
         }
+      len = maxsize;
     }
   else
-    memcpy (dst, src, len + 1);
+    memcpy (dst, src, ++len);
-}
-const char *
+  return len;
+}
+char *
+vformat (const char *format, va_list ap)
+{
+  static dynbuf_text buf; buf.clear ();
+  buf.vprintf (format, ap);
+  return buf;
+}
+char *
 format (const char *format, ...)
 {
-  static dynbuf_text buf;
-  buf.clear ();
   va_list ap;
   va_start (ap, format);
-  buf.vprintf (format, ap);
+  char *buf = vformat (format, ap);
   va_end (ap);
   return buf;
 }
     0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
     0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
     0x2d02ef8dL
 };
+void thread::start (void *(*start_routine)(void *), void *arg)
+{
+  pthread_attr_t attr;
+  pthread_attr_init (&attr);
+  pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
+  pthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN < sizeof (long) * 4096
+                                    ? sizeof (long) * 4096 : PTHREAD_STACK_MIN);
+#ifdef PTHREAD_SCOPE_PROCESS
+  pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
+#endif
+  sigset_t fullsigset, oldsigset;
+  sigfillset (&fullsigset);
+  pthread_sigmask (SIG_SETMASK, &fullsigset, &oldsigset);
+  if (pthread_create (&id, &attr, start_routine, arg))
+    cleanup ("unable to create a new thread");
+  pthread_sigmask (SIG_SETMASK, &oldsigset, 0);
+}

Diff Legend

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

Comparing deliantra/server/common/utils.C (file contents): Revision 1.69 by root, Tue Jan 22 15:53:01 2008 UTC vs. Revision 1.90 by root, Thu Oct 15 21:09:32 2009 UTC

Diff Legend

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.69 by root, Tue Jan 22 15:53:01 2008 UTC vs.
Revision 1.90 by root, Thu Oct 15 21:09:32 2009 UTC