Changeset 507

Timestamp:

08/16/06 02:43:55 (2 years ago)

Author:

pennmush

Message:

PennMUSH 1.8.0p12 Archival

Files:

• 1.8.0/CHANGES.180 (modified) (1 diff)
• 1.8.0/COPYRITE (modified) (2 diffs)
• 1.8.0/Configure (modified) (5 diffs)
• 1.8.0/FAQ (modified) (1 diff)
• 1.8.0/Makefile.SH (modified) (1 diff)
• 1.8.0/Patchlevel (modified) (1 diff)
• 1.8.0/README (modified) (3 diffs)
• 1.8.0/game/mushcnf.dst (modified) (1 diff)
• 1.8.0/game/txt/hlp/penncmd.hlp (modified) (1 diff)
• 1.8.0/game/txt/hlp/penncode.hlp (modified) (3 diffs)
• 1.8.0/game/txt/hlp/penntop.hlp (modified) (1 diff)
• 1.8.0/game/txt/hlp/pennv180.hlp (modified) (2 diffs)
• 1.8.0/game/txt/hlp/pennvOLD.hlp (modified) (1 diff)
• 1.8.0/hdrs/conf.h (modified) (1 diff)
• 1.8.0/hdrs/copyrite.h (modified) (2 diffs)
• 1.8.0/hdrs/version.h (modified) (1 diff)
• 1.8.0/src/conf.c (modified) (2 diffs)
• 1.8.0/src/destroy.c (modified) (1 diff)
• 1.8.0/src/fundb.c (modified) (2 diffs)
• 1.8.0/src/game.c (modified) (6 diffs)
• 1.8.0/src/match.c (modified) (1 diff)
• 1.8.0/src/mysocket.c (modified) (4 diffs)

1.8.0/CHANGES.180

@@ -13 +13 @@
-
-==========================================================================
+
+Version 1.8.0 patchlevel 12                     March 25, 2006
+
+Minor changes:
+  * New config option keepalive_timeout for setting the socket-level
+    are-you-there ping interval used to help work around broken routers. [SW]
+  * Changing the SO_KEEPALIVE interval works on more OSes, including OS X. [SW]
+  * Passwords are masked when commands that require them are logged
+    in command.log. Suggested by Sumta. [SW]
+Fixes
+  * Added help entry for @debugforwardlist. Suggested by d'Ark@M*U*S*H.
+  * Help fixes by Talvo@M*U*S*H.
+  * When objects are nuked, their creation time is reset to 0. 
+    This prevents garbage objects from maintaining the same objid.
+    Suggested by Cooee@PDX
+  * When doing english-style matching, plain numbers ('3') were
+    treated as adjectives (like '3rd') and shouldn't have been.
+    Fixed. Reported by Stinky@M*U*S*H.
+
-
-Version 1.8.0 patchlevel 11                     February 25, 2006

1.8.0/COPYRITE

@@ -2 +2 @@
-
-/*
-October 2002
+March 2006
- *
- * I. Copyrights
- *
- * PennMUSH 1.x
-2, Alan Schwartz, T. Alexander Popiel, Shawn Wagner
-Contact email for Alan Schwartz: <dunemush@pennmush.org>. 
+6, T. Alexander Popiel <talek@pennmush.org> and 
+Shawn Wagner <raevnos@pennmush.org>.
- * 
- * Some code used in this server may have been derived from the
@@ -171 +171 @@
- * Past and present PennMUSH development team members:
- *  T. Alexander Popiel, Ralph Melton, Thorvald Natvig, Luuk de Waard,
-
+, Alan "Javelin" Schwartz
- * Past and present PennMUSH porters:
- *  Nick Gammon, Sylvia, Dan Williams, Ervin Hearn III

1.8.0/Configure

@@ -21 +21 @@
-# $Id: Head.U 1.3 Mon, 10 Nov 2003 14:51:32 -0600 dunemush $
-#
-Jan 13 22:05:44
+Mar 24 14:42:00
-
-cat >/tmp/c1$$ <<EOF
@@ -632 +632 @@
-
-Usually it's in /bin/sh.  How did you even get this far?
-Javelin) at dunemush
+PennMUSH developers) at pennmush-developers
-we'll try to straighten this all out.
-EOM
@@ -1192 +1192 @@
-distinct possibility that your kit is damaged, by typing 'y'es.  If you
-do, don't blame me if something goes wrong.  I advise you to type 'n'o
-dunemush
+pennmush-developers
-
-EOM
@@ -1286 +1286 @@
-Configure and run it again.  If you can't run Configure for some reason,
-you'll have to generate a config.sh file by hand.  Whatever problems you
-dunemush
+pennmush-developers
-
-This installation script affects things in two ways:
@@ -1594 +1594 @@
-    dflt=''
-    : Half the following guesses are probably wrong... If you have better
-dunemush
+pennmush-developers
-    : The metaconfig authors would also appreciate a copy...
-    $test -f /irix && osname=irix

1.8.0/FAQ

@@ -37 +37 @@
-advanced to 1.7.0.
-
-
-
+
+
+
-
-1. How do I ask for help with a problem?
-
-
+
+
+
-When asking for help, please be as specific as you can about the
-problem. Include at least the following:

1.8.0/Makefile.SH

@@ -40 +40 @@
-# the Configure script. If it doesn't work, you might try starting
-# from the Makefile.old that's included instead, and reporting
-
-
+
-#
-# If you want to profile the code, add -pg -a -DPROFILING to CCFLAGS

1.8.0/Patchlevel

@@ -1 +1 @@
-Do not edit this file. It is maintained by the official PennMUSH patches.
-1
+2

1.8.0/README

@@ -77 +77 @@
-and Thorvald Natvig joined as a new member.  Many thanks go to Ralph
-who contributed much time, code, and good cheer to PennMUSH.
-
-
-
+
+
+
+
+
+
+
+
+
-
-A MUSH manual should be available at ftp.digex.net, ftp.math.okstate.edu,
@@ -88 +94 @@
-probably want Javelin's Guide for PennMUSH Gods, which should be
-available where you got this code, or, in hypertext, as
-
+
+
-
-      Enjoy!
@@ -125 +132 @@
-   response and is ideal for unusual bugs. A web-based submission
-   form is at http://www.pennmush.org/jitterbug/pennmush
-
-3. dunemush@pennmush.org is Javelin's email address.
-   This is a good place for small suggestions, common-seeming bugs,
-   etc. -- stuff you wouldn't want to bother all the developers with.
-   You will receive a quick response.
-
-When reporting a problem, please always include the following

1.8.0/game/mushcnf.dst

@@ -210 +210 @@
-unconnected_idle_timeout 5m
-
+# Many common home network routers will drop a connection if there's
+# been no activity for a few minutes; they tend to assume the web is
+# the internet, and don't deal well with persistant connections like
+# mushes use. This option will make the server automatically send a
+# 'Are you still there?' query every few minutes to keep the
+# connection active.
+# NOTE: This doesn't work on all OSes, but does on the most popular
+# ones for mush hosting such as linux.
+keepalive_timeout 5m
+
-# Should there be a limit on the number of logins the MUSH
-# can accept? If your operating system has a limited number of

1.8.0/game/txt/hlp/penncmd.hlp

@@ -1331 +1331 @@
-
-See also: @filter, @prefix, AUDIBLE, PUPPET
+& @DEBUGFORWARDLIST
+  @debugforwardlist <object> [=<list of dbrefs>]
+
+  When an object is set DEBUG, its @debugforwardlist attribute is checked,
+  and if present, the debug output is forwarded to all the dbrefs in
+  the @debugforwardlist.
+
+  The @debugforwardlist must be a space-seperated list of dbrefs.
+  In order to forward to an object, you must either control it,
+  have the pemit_all power, or, if it has a @lock/forward set,  pass
+  its @lock/forward.  (If you want to allow all objects you own to
+  forward to you, regardless of whether or not they control you, use
+  @lock/forward me=$me)
+
+See also: DEBUG
-& @unfollow
-  @unfollow <object> = <message>

1.8.0/game/txt/hlp/penncode.hlp

@@ -2 +2 @@
-& contact
-PennMUSH is developed by a team of developers whose names are
-It is maintained by Javelin, aka
-Alan Schwartz.  Suggestions, comments, and bug reports are 
+ Suggestions, comments, and bug reports are
+
-
-Report bugs at:               pennmush-bugs@pennmush.org
-Comments/suggestions to:      pennmush-developers@pennmush.org
-Reach Javelin at:             dunemush@pennmush.org
-
-For information about downloading PennMUSH, see 'help download'.
@@ -14 +13 @@
-& download
-The latest version of this MUSH code is available at
-.
+
-pennmush-1.7.6p0.tar.Z, depending on the version number. You
-will also find files of translations of server messages into various
@@ -50 +49 @@
-& copyrite
-& license
-October 2002
+March 2006
-
-I. Copyrights
-
-PennMUSH 1.x
-2, Alan Schwartz, T. Alexander Popiel, Shawn Wagner
-
+6, T. Alexander Popiel <talek@pennmush.org>
+
-
-Some code used in this server may have been derived from the

1.8.0/game/txt/hlp/penntop.hlp

@@ -17 +17 @@
-  On many MUSHes, list local commands with:       +help
-
-
-in the game, or send mail to dunemush@pennmush.org, who maintain
-
-
-
+ in the
+game, or send mail to pennmush-bugs@pennmush.org, which is the addres
+
+probably have no relation 
+
-& newbie
-
+
-  If you are new to MUSHing, the help files may seem confusing. Most of
-  them are written in a specific style, however, and once you understand

1.8.0/game/txt/hlp/pennv180.hlp

@@ -1 @@
-1
+2
-& changes
-This is a list of changes in this patchlevel which are probably of
@@ -12 +12 @@
-be read in 'help patchlevels'.
-
+Version 1.8.0 patchlevel 12                     March 25, 2006
+
+Minor changes:
+  * New config option keepalive_timeout for setting the socket-level
+    are-you-there ping interval used to help work around broken routers. [SW]
+  * Changing the SO_KEEPALIVE interval works on more OSes, including OS X. [SW]
+  * Passwords are masked when commands that require them are logged
+    in command.log. Suggested by Sumta. [SW]
+Fixes
+  * Added help entry for @debugforwardlist. Suggested by d'Ark@M*U*S*H.
+  * Help fixes by Talvo@M*U*S*H.
+  * When objects are nuked, their creation time is reset to 0. 
+    This prevents garbage objects from maintaining the same objid.
+    Suggested by Cooee@PDX
+  * When doing english-style matching, plain numbers ('3') were
+    treated as adjectives (like '3rd') and shouldn't have been.
+    Fixed. Reported by Stinky@M*U*S*H.
+
+
+& 1.8.0p11
-Version 1.8.0 patchlevel 11                     February 25, 2006
-

1.8.0/game/txt/hlp/pennvOLD.hlp

@@ -4418 +4418 @@
-type 'help <version>p<patchlevel>'. For example, 'help 1.7.2p3'
-
-
+, 12
-1.7.7: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
-       19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,

1.8.0/hdrs/conf.h

@@ -114 +114 @@
-  int idle_timeout; /**< Maximum idle time allowed, in minutes */
-  int unconnected_idle_timeout; /**< Maximum idle time for connections without dbrefs, in minutes */
+  int keepalive_timeout; /**< Number of seconds between TCP keepalive pings */
-  int dump_interval;    /**< Interval between database dumps, in seconds */
-  char dump_message[256]; /**< Message shown at start of nonforking dump */

1.8.0/hdrs/copyrite.h

@@ -2 +2 @@
-
-/*
-October 2002
+March 2006
- *
- * I. Copyrights
- *
- * PennMUSH 1.x
-2, Alan Schwartz, T. Alexander Popiel, Shawn Wagner
-Contact email for Alan Schwartz: <dunemush@pennmush.org>. 
+6, T. Alexander Popiel <talek@pennmush.org>
+and Shawn Wagner <raevnos@pennmush.org>
- * 
- * Some code used in this server may have been derived from the
@@ -171 +171 @@
- * Past and present PennMUSH development team members:
- *  T. Alexander Popiel, Ralph Melton, Thorvald Natvig, Luuk de Waard,
-
+, Alan "Javelin" Schwartz
- * Past and present PennMUSH porters:
- *  Nick Gammon, Sylvia, Dan Williams, Ervin Hearn III

1.8.0/hdrs/version.h

@@ -1 +1 @@
-#define VERSION "1.8.0"
-1
-2
-1
+2
+3
+2

1.8.0/src/conf.c

@@ -292 +292 @@
-  {"unconnected_idle_timeout", cf_time, &options.unconnected_idle_timeout,
-   100000, 0, "limits"}
+  ,
+  {"keepalive_timeout", cf_time, &options.keepalive_timeout, 10000, 0, "limits"}
-  ,
-  {"whisper_loudness", cf_int, &options.whisper_loudness, 100, 0, "limits"}
@@ -1030 +1032 @@
-  options.idle_timeout = 0;
-  options.unconnected_idle_timeout = 300;
+  options.keepalive_timeout = 300;
-  options.dump_interval = 3601;
-  strcpy(options.dump_message,

1.8.0/src/destroy.c

@@ -728 +728 @@
-  Exits(thing) = NOTHING;
-  Home(thing) = NOTHING;
+  CreTime(thing) = 0;       /* Prevents it from matching objids */
-
-  clear_objdata(thing);

1.8.0/src/fundb.c

@@ -1332 +1332 @@
-  dbref it = match_thing(executor, args[0]);
-
-
+ && !IsGarbage(it)
-    safe_str(show_time(CreTime(it), 0), buff, bp);
-  else
@@ -1342 +1342 @@
-{
-  dbref it = match_thing(executor, args[0]);
-
+ || IsGarbage(it)
-    safe_str(T(e_notvis), buff, bp);
-  else if (!Can_Examine(executor, it) || IsPlayer(it))

1.8.0/src/game.c

@@ -68 +68 @@
-#include "help.h"
-#include "dbio.h"
+#include "pcre.h"
-
-#ifdef hpux
@@ -97 +98 @@
-
-extern void initialize_mt(void);
-
+
-extern void conf_default_set(void);
-static int dump_database_internal(void);
@@ -967 +968 @@
-         } while(0)
-
+/** Attempt to tell if the command is a @password or @newpassword, so
+  * that the password isn't logged by Suspect or log_commands
+  * \param cmd The command to check
+  * \return A sanitized version of the command suitable for logging.
+  */
+static char *
+passwd_filter(const char *cmd)
+{
+  static int initialized = 0;
+  static pcre *pass_ptn, *newpass_ptn;
+  static char buff[BUFFER_LEN];
+  char *bp = buff;
+  int ovec[20];
+  size_t cmdlen;
+  int matched;
+
+  if (!initialized) {
+    const char *errptr;
+    int eo;
+
+    pass_ptn = pcre_compile("^(@pass.*?)\\s([^=]*)=(.*)",
+                PCRE_CASELESS, &errptr, &eo, tables);
+    if (!pass_ptn)
+      do_log(LT_ERR, GOD, GOD, "pcre_compile: %s", errptr);
+    newpass_ptn = pcre_compile("^(@(?:newp|pcreate)[^=]*)=(.*)",
+                   PCRE_CASELESS, &errptr, &eo, tables);
+    if (!newpass_ptn)
+      do_log(LT_ERR, GOD, GOD, "pcre_compile: %s", errptr);
+    initialized = 1;
+  }
+
+  cmdlen = strlen(cmd);
+
+  if ((matched = pcre_exec(pass_ptn, NULL, cmd, cmdlen, 0, 0, ovec, 20)) > 0) {
+    /* It's a password */
+    pcre_copy_substring(cmd, ovec, matched, 1, buff, BUFFER_LEN);
+    bp = buff + strlen(buff);
+    safe_chr(' ', buff, &bp);
+    safe_fill('*', ovec[5] - ovec[4], buff, &bp);
+    safe_chr('=', buff, &bp);
+    safe_fill('*', ovec[7] - ovec[6], buff, &bp);
+  } else if ((matched = pcre_exec(newpass_ptn, NULL, cmd, cmdlen, 0, 0,
+                  ovec, 20)) > 0) {
+    pcre_copy_substring(cmd, ovec, matched, 1, buff, BUFFER_LEN);
+    bp = buff + strlen(buff);
+    safe_chr('=', buff, &bp);
+    safe_fill('*', ovec[5] - ovec[4], buff, &bp);
+  } else {
+    safe_strl(cmd, cmdlen, buff, &bp);
+  }
+  *bp = '\0';
+  return buff;
+}
+
+
-/** Attempt to match and execute a command.
- * This function performs some sanity checks and then attempts to
@@ -1041 +1097 @@
-  orator = player;
-
-  log_activity(LA_CMD, player, command);
-  if (options.log_commands || Suspect(player))
-    do_log(LT_CMD, player, NOTHING, "%s", command);
-
-  if Verbose
-    (player)
-      raw_notify(Owner(player), tprintf("#%d] %s", player, command));
-
-  /* eat leading whitespace */
-  while (*command && isspace((unsigned char) *command))
@@ -1062 +1110 @@
-  if ((!command || !*command) && !from_port)
-    return;
+
+  {
+    char *msg = passwd_filter(command);
+
+    log_activity(LA_CMD, player, msg);
+    if (options.log_commands || Suspect(player))
+      do_log(LT_CMD, player, NOTHING, "%s", msg);
+    if Verbose
+      (player)
+    raw_notify(Owner(player), tprintf("#%d] %s", player, msg));
+  }
-
-  /* important home checking comes first! */
@@ -1073 +1132 @@
-    return;
-  }
+
+
-  strcpy(unp, command);
-

1.8.0/src/match.c

@@ -452 +452 @@
-      count = -1;
-    }
-
+
+
-  *mname = ' ';
-  if (count < 0) {

1.8.0/src/mysocket.c

@@ -355 +355 @@
-
-
-
+
-/** Enable TCP keepalive on the given socket if we can.
- * \param s socket.
@@ -363 +363 @@
-set_keepalive(int s __attribute__ ((__unused__)))
-{
-CAN
+SO
-  int keepalive = 1;
-def CAN_KEEPIDLE
-900
+ defined(TCP_KEEPIDLE) || defined(TCP_KEEPALIVE)
+options.keepalive_timeout
-#endif
-
@@ -373 +373 @@
-         (void *) &keepalive, sizeof(keepalive)) == -1)
-    fprintf(stderr, "[%d] could not set SO_KEEPALIVE: errno %d", s, errno);
-
+
+
+
+
+
-  if (setsockopt(s, IPPROTO_TCP, TCP_KEEPIDLE,
-         (void *) &keepidle, sizeof(keepidle)) == -1)
+    fprintf(stderr, "[%d] could not set TCP_KEEPIDLE: errno %d", s, errno);
+#elif defined(TCP_KEEPALIVE)
+  if (setsockopt(s, IPPROTO_TCP, TCP_KEEPALIVE,
+         (void *) &keepidle, sizeof(keepidle)) == -1)
-    fprintf(stderr, "[%d] could not set TCP_KEEPALIVE: errno %d", s, errno);
-#endif
@@ -381 +389 @@
-  return;
-}
-
+
-
-