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

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.74 by root, Fri Apr 11 21:09:52 2008 UTC vs.
Revision 1.91 by root, Tue Oct 20 05:57:08 2009 UTC

  *
  * 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;
 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 [1] = state [0] * 69069U; if (state [0] <   8U) state [0] +=   8U;
   state [2] = state [1] * 69069U; if (state [0] <  16U) state [0] +=  16U;
   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)
         }
     }
   result[resultlen] = '\0';
 }
-/**
+/******************************************************************************/
- * Taking a string as an argument, mutate it into a string that looks like a list.
- * a 'list' for the purposes here, is a string of items, seperated by commas, except
- * for the last entry, which has an 'and' before it, and a full stop (period) after it.
- * This function will also strip all trailing non alphanumeric characters.
- * It does not insert an oxford comma.
- */
-void
-make_list_like (char *input)
-{
-  char *p, tmp[MAX_BUF];
-  int i;
-  if (!input || strlen (input) > MAX_BUF - 5)
+/* Checks a player-provided string which will become the msg property of
-    return;
+ * an object for dangerous input.
-  /* bad stuff would happen if we continued here, the -5 is to make space for ' and ' */
+ */
+bool
+msg_is_safe (const char *msg)
+{
+  bool safe = true;
-  strncpy (tmp, input, MAX_BUF - 5);
+  /* Trying to cheat by getting data into the object */
-  /*trim all trailing commas, spaces etc. */
+  if (!strncmp (msg, "endmsg", sizeof ("endmsg") - 1)
-  for (i = strlen (tmp); !isalnum (tmp[i]) && i >= 0; i--)
+      || strstr (msg, "\nendmsg"))
-    tmp[i] = '\0';
+    safe = false;
-  strcat (tmp, ".");
+  /* Trying to make the object talk, and potentially access arbitrary code */
+  if (object::msg_has_dialogue (msg))
+    safe = false;
-  p = strrchr (tmp, ',');
-  if (p)
-    {
-      *p = '\0';
-      strcpy (input, tmp);
-      p++;
-      strcat (input, " and");
-      strcat (input, p);
-    }
-  else
-    strcpy (input, tmp);
-  return;
+  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);
 }
 #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;
 }
     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, 0, start_routine, arg))
+  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.74 by root, Fri Apr 11 21:09:52 2008 UTC vs. Revision 1.91 by root, Tue Oct 20 05:57:08 2009 UTC

Diff Legend

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.74 by root, Fri Apr 11 21:09:52 2008 UTC vs.
Revision 1.91 by root, Tue Oct 20 05:57:08 2009 UTC