Changeset 405

Timestamp:

08/12/06 06:08:07 (2 years ago)

Author:

pennmush

Message:

PennMUSH 1.7.7p3 Archival

Files:

• 1.7.7/CHANGES (modified) (1 diff)
• 1.7.7/Patchlevel (modified) (1 diff)
• 1.7.7/game/txt/hlp/penncmd.hlp (modified) (2 diffs)
• 1.7.7/game/txt/hlp/pennvers.hlp (modified) (3 diffs)
• 1.7.7/hdrs/access.h (modified) (2 diffs)
• 1.7.7/hdrs/extchat.h (modified) (1 diff)
• 1.7.7/hdrs/version.h (modified) (1 diff)
• 1.7.7/src/access.c (modified) (4 diffs)
• 1.7.7/src/cmds.c (modified) (1 diff)
• 1.7.7/src/command.c (modified) (1 diff)
• 1.7.7/src/db.c (modified) (2 diffs)
• 1.7.7/src/extchat.c (modified) (2 diffs)
• 1.7.7/src/wiz.c (modified) (2 diffs)

1.7.7/CHANGES

@@ -18 +18 @@
-
-==========================================================================
+
+Version 1.7.7 patchlevel 3                      December 25, 2002
+
+Commands:
+  * @sitelock/check <host> tells you which rule, if any, would match.
+Fixes:
+  * The objdata hashtable routines had a serious bug that could
+    cause crashes.
+
-
-Version 1.7.7 patchlevel 2                      December 22, 2002

1.7.7/Patchlevel

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

1.7.7/game/txt/hlp/penncmd.hlp

@@ -2676 +2676 @@
-  @sitelock <host-pattern> = <options>[,<name>]
-  @sitelock[/<ban|register>] <host-pattern>
+  @sitelock/check <host>
-  @sitelock/remove <string>
-
@@ -2684 +2685 @@
-  @sitelock without arguments lists all sites in access.cnf.
-  Rules are processed in the order listed, and the first matching
-
+
+
-
-  @sitelock/name adds a name to the list of banned player names.

1.7.7/game/txt/hlp/pennvers.hlp

@@ -1 +1 @@
-& changes
-2
+3
-This is a list of changes in this patchlevel which are probably of
-interest to players. More information about new commands and functions
@@ -12 +12 @@
-be read in 'help patchlevels'.
-
+Version 1.7.7 patchlevel 3                      December 25, 2002
+
+Commands:
+  * @sitelock/check <host> tells you which rule, if any, would match.
+Fixes:
+  * The objdata hashtable routines had a serious bug that could
+    cause crashes.
+
+
+& 1.7.7p2
-Version 1.7.7 patchlevel 2                      December 22, 2002
-
@@ -5875 +5885 @@
-type 'help <version>p<patchlevel>'. For example, 'help 1.7.2p3'
-
-
+, 3
-1.7.6: 0, 1, 2, 3
-1.7.5: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12

1.7.7/hdrs/access.h

@@ -1 +1 @@
-#ifndef __ACCESS_H
-#define __ACCESS_H
+
+/* A linked list data structure to hold the access info */
+struct access {
+  char host[BUFFER_LEN];
+  char comment[BUFFER_LEN];
+  dbref who;
+  int can;
+  int cant;
+  struct access *next;
+};
+
-
-/* These flags are can/can't - a site may or may not be allowed to do them */
@@ -34 +45 @@
-void write_access_file(void);
-int site_can_access(const char *hname, int flag, dbref who);
+struct access *site_check_access(const char *hname, dbref who, int *rulenum);
+int format_access(struct access *ap, int rulenum,
+          dbref who
+          __attribute__ ((__unused__)), char *buff, char **bp);
-int add_access_sitelock(dbref player, const char *host, dbref who, int can,
-            int cant);

1.7.7/hdrs/extchat.h

@@ -92 +92 @@
-};
-
-get_objdata(x, "CHANNELS"
-
+((struct chanlist *)get_objdata(x, "CHANNELS")
+(void *)
-
-/* Channel type flags and macros */

1.7.7/hdrs/version.h

@@ -1 @@
-2 [12/22
-2
+3 [12/25
+3

1.7.7/src/access.c

@@ -82 +82 @@
-#include "confmagic.h"
-
-/* A linked list data structure to hold the access info */
-struct access {
-  char host[BUFFER_LEN];
-  char comment[BUFFER_LEN];
-  dbref who;
-  int can;
-  int cant;
-  struct access *next;
-};
-
-
@@ -369 +360 @@
-}
-
+/* Like above, but returns the details of the first-matching rule */
+struct access *
+site_check_access(const char *hname, dbref who, int *rulenum)
+{
+  struct access *ap;
+  char *p;
+
+  *rulenum = 0;
+  if (!hname || !*hname)
+    return 0;
+
+  if ((p = strchr(hname, '@')))
+    p++;
+
+  for (ap = access_top; ap; ap = ap->next) {
+    (*rulenum)++;
+    if (!(ap->can & ACS_SITELOCK)
+    && ((ap->can & ACS_REGEXP)
+        ? (regexp_match_case(ap->host, hname, 0)
+           || (p && regexp_match_case(ap->host, p, 0)))
+        : (quick_wild(ap->host, hname)
+           || (p && quick_wild(ap->host, p))))
+    && (ap->who == AMBIGUOUS || ap->who == who)) {
+      /* Got one */
+      return ap;
+    }
+  }
+  return NULL;
+}
+
+int
+format_access(struct access *ap, int rulenum,
+          dbref who __attribute__ ((__unused__)), char *buff, char **bp)
+{
+  if (ap) {
+    safe_format(buff, bp, T("Matched line %d: %s %s"), rulenum, ap->host,
+        (ap->can & ACS_REGEXP) ? "(regexp)" : "");
+    safe_chr('\n', buff, bp);
+    safe_format(buff, bp, T("Comment: %s"), ap->comment);
+    safe_chr('\n', buff, bp);
+    safe_str(T("Connections allowed by: "), buff, bp);
+    if (ap->cant & ACS_CONNECT)
+      safe_str(T("No one"), buff, bp);
+    else if (ap->cant & ACS_ADMIN)
+      safe_str(T("All but admin"), buff, bp);
+    else if (ap->cant & ACS_WIZARD)
+      safe_str(T("All but wizards"), buff, bp);
+    else if (ap->cant & ACS_GOD)
+      safe_str(T("All but God"), buff, bp);
+    else
+      safe_str(T("All"), buff, bp);
+    safe_chr('\n', buff, bp);
+    if (ap->cant & ACS_GUEST)
+      safe_str(T("Guest connections are NOT allowed"), buff, bp);
+    else
+      safe_str(T("Guest connections are allowed"), buff, bp);
+    safe_chr('\n', buff, bp);
+    if (ap->cant & ACS_CREATE)
+      safe_str(T("Creation is NOT allowed"), buff, bp);
+    else
+      safe_str(T("Creation is allowed"), buff, bp);
+    safe_chr('\n', buff, bp);
+    if (ap->can & ACS_REGISTER)
+      safe_str(T("Email registration is allowed"), buff, bp);
+    if (ap->can & ACS_SUSPECT)
+      safe_str(T("Players connecting are set SUSPECT"), buff, bp);
+    if (ap->can & ACS_DENY_SILENT)
+      safe_str(T("Denied connections are not logged"), buff, bp);
+  } else {
+    safe_str(T("No matching access rule"), buff, bp);
+  }
+  return 0;
+}
+
+
-/* Add an entry to the linked list after the @sitelock entry.
- * If there is no @sitelock entry, add one to the end of the list
@@ -474 +540 @@
-  acsflag *c;
-  char flaglist[BUFFER_LEN];
+  int rulenum = 0;
-  char *bp;
-
-  for (ap = access_top; ap; ap = ap->next) {
+    rulenum++;
-    if (ap->can != ACS_SITELOCK) {
-      bp = flaglist;
@@ -494 +562 @@
-      *bp = '\0';
-      notify_format(player,
-SITE: %-20s  DBREF: %-6s FLAGS:%s", ap->host
-
+%3d SITE: %-20s  DBREF: %-6s FLAGS:%s", rulenum
+ap->host, 
-      notify_format(player, " COMMENT: %s", ap->comment);
-    } else {

1.7.7/src/cmds.c

@@ -819 +819 @@
-  else if (SW_ISSET(sw, SWITCH_REMOVE))
-    do_sitelock(player, arg_left, NULL, NULL, 3);
+  else if (SW_ISSET(sw, SWITCH_CHECK))
+    do_sitelock(player, arg_left, NULL, NULL, 4);
-  else
-    do_sitelock(player, arg_left, args_right[1], args_right[2], 0);

1.7.7/src/command.c

@@ -236 +236 @@
-  {"@SHUTDOWN", "PANIC REBOOT PARANOID", cmd_shutdown, CMD_T_ANY, WIZARD,
-   0, 0},
-
+CHECK 
-   CMD_T_ANY | CMD_T_EQSPLIT | CMD_T_RS_ARGS, WIZARD, 0, 0},
-  {"@STATS", "TABLES", cmd_stats, CMD_T_ANY, 0, 0, 0},

1.7.7/src/db.c

@@ -1371 +1371 @@
-set_objdata(dbref thing, const char *keybase, void *data)
-{
+  hashdelete(tprintf("%s_#%d", keybase, thing), &htab_objdata);
-  if (data) {
-    if (hashadd(tprintf("%s_#%d", keybase, thing), data, &htab_objdata) < 0)
@@ -1378 +1379 @@
-      hashadd(keybase, (void *) &newkey, &htab_objdata_keys);
-    }
-
-
-
-
-
+
+
-}
-

1.7.7/src/extchat.c

@@ -398 +398 @@
-  tmp->chan = *ch;
-  /* If there's no channels on the list, or if the first channel is already
-user
+chan
-  /* No channels? */
-  if (!Chanlist(who)) {
@@ -415 +415 @@
-    free_chanlist(tmp);
-  } else {
-user this user
+channel this channel
-    for (;
-     p->next

1.7.7/src/wiz.c

@@ -1621 +1621 @@
-    const char *who;
-    int type;
-
+, 3 = remove, 4 = check
-{
-  FILE *fp, *fptmp;
@@ -1686 +1686 @@
-      do_log(LT_WIZ, player, NOTHING, "*** SITELOCK *** %s", site);
-      break;
+    case 4:{
+    struct access *ap;
+    char tbuf[BUFFER_LEN], *bp;
+    int rulenum;
+    if (!site || !*site) {
+      do_list_access(player);
+      return;
+    }
+    ap = site_check_access(site, AMBIGUOUS, &rulenum);
+    bp = tbuf;
+    format_access(ap, rulenum, AMBIGUOUS, tbuf, &bp);
+    *bp = '\0';
+    notify(player, tbuf);
+    break;
+      }
-    case 3:{
-    int n;