Changeset 443

Timestamp:

08/13/06 00:26:28 (2 years ago)

Author:

pennmush

Message:

PennMUSH 1.7.7p22 Archival

Files:

• 1.7.7/CHANGES.177 (modified) (1 diff)
• 1.7.7/COPYRITE (modified) (1 diff)
• 1.7.7/Configure (modified) (6 diffs)
• 1.7.7/Patchlevel (modified) (1 diff)
• 1.7.7/config_h.SH (modified) (2 diffs)
• 1.7.7/game/txt/hlp/pennv177.hlp (modified) (2 diffs)
• 1.7.7/game/txt/hlp/pennvOLD.hlp (modified) (1 diff)
• 1.7.7/hdrs/copyrite.h (modified) (1 diff)
• 1.7.7/hdrs/externs.h (modified) (1 diff)
• 1.7.7/hdrs/mysocket.h (modified) (1 diff)
• 1.7.7/hdrs/version.h (modified) (1 diff)
• 1.7.7/src/bsd.c (modified) (3 diffs)
• 1.7.7/src/look.c (modified) (1 diff)
• 1.7.7/src/move.c (modified) (1 diff)
• 1.7.7/src/mysocket.c (modified) (2 diffs)
• 1.7.7/src/predicat.c (modified) (1 diff)
• 1.7.7/src/set.c (modified) (5 diffs)

1.7.7/CHANGES.177

@@ -18 +18 @@
-
-==========================================================================
+
+Version 1.7.7 patchlevel 22                     September 30, 2003
+
+Minor Changes:
+  * When possible, sockets are now set SO_KEEPALIVE and TCP_KEEPIDLE.
+    This may help prevent disconnections of idle players behind
+    poorly designed NAT routers and the like, and make the use of
+    the IDLE command unnecessary. Patch by Philip Mak.
+  * Better failure messages for 'get blah's blah', especially when
+    the container or contained object is ambiguous. Suggested by
+    Philip Mak. 
+Fixes:
+  * Attempting to unset attribute flags actually set them.
+    Report by Ambrosia@M*U*S*H. [SW]
+  * Remove a warning in set.c. Report by Nymeria@M*U*S*H
+
-
-Version 1.7.7 patchlevel 21                     September 23, 2003

1.7.7/COPYRITE

@@ -42 +42 @@
- *   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
+ * Although not necessary given the above copyright, the TinyMUSH 2.0
+ * developers, Joseph Traub and Glenn Crocker, confirmed in email to
+ * Alan Schwartz in 2002 that they were willing to have any of their
+ * code present in PennMUSH redistributed under the Artistic License.
+ *
- * The portions derived from TinyMUSH 2.2 are used under the Artistic
-
-
+
+
+
+
+
+
+
+
+
- *
- * The Artistic License

1.7.7/Configure

@@ -367 +367 @@
-i_niin=''
-i_sysin=''
+i_nitcp=''
-i_setjmp=''
-i_stddef=''
@@ -440 +441 @@
-sizetype=''
-so=''
+d_keepalive=''
+d_keepidle=''
-sharpbang=''
-shsharp=''
@@ -4521 +4524 @@
-eval $inlibc
-
+socketlib=''
+sockethdr=''
+: see whether socket exists
+echo " "
+$echo $n "Hmm... $c" >&4
+if set socket val -f d_socket; eval $csym; $val; then
+    echo "Looks like you have Berkeley networking support." >&4
+    d_socket="$define"
+    if set setsockopt val -f; eval $csym; $val; then
+        d_oldsock="$undef"
+    else
+        echo "...but it uses the old 4.1c interface, rather than 4.2" >&4
+        d_oldsock="$define"
+    fi
+else
+    if $contains socklib libc.list >/dev/null 2>&1; then
+        echo "Looks like you have Berkeley networking support." >&4
+        d_socket="$define"
+        : we will have to assume that it supports the 4.2 BSD interface
+        d_oldsock="$undef"
+    else
+        echo "You don't have Berkeley networking in libc$_a..." >&4
+        if test -f /usr/lib/libnet$_a; then
+            ( (nm $nm_opt /usr/lib/libnet$_a | eval $nm_extract) ||  \
+            ar t /usr/lib/libnet$_a) 2>/dev/null >> libc.list
+            if $contains socket libc.list >/dev/null 2>&1; then
+            echo "...but the Wollongong group seems to have hacked it in." >&4
+                socketlib="-lnet"
+                sockethdr="-I/usr/netinclude"
+                d_socket="$define"
+                if $contains setsockopt libc.list >/dev/null 2>&1; then
+                    d_oldsock="$undef"
+                else
+                    echo "...using the old 4.1c interface, rather than 4.2" >&4
+                    d_oldsock="$define"
+                fi
+            else
+                echo "or even in libnet$_a, which is peculiar." >&4
+                d_socket="$undef"
+                d_oldsock="$undef"
+            fi
+        else
+            echo "or anywhere else I see." >&4
+            d_socket="$undef"
+            d_oldsock="$undef"
+        fi
+    fi
+fi
+
+: see if socketpair exists
+set socketpair d_sockpair
+eval $inlibc
+
+: see if this is a netinet/tcp.h system
+set netinet/tcp.h i_nitcp
+eval $inhdr
+
+: see if setsockopt with SO_KEEPALIVE works as advertised
+echo " "
+case "$d_oldsock" in
+"$undef")
+        echo "OK, let's see if SO_KEEPALIVE works as advertised..." >&4
+        $cat > socket.c <<EOP
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#$i_nitcp I_NETINET_TCP
+#ifdef I_NETINET_TCP
+#include <netinet/tcp.h>
+#endif
+#include <netdb.h>
+
+main()
+{
+    int s = socket(AF_INET, SOCK_STREAM, 0);
+    int val = 1;
+    if (s == -1)
+        exit(1);
+    if (-1 == setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val)))
+        exit(2);
+#ifdef I_NETINET_TCP
+    val = 1;
+    if (-1 == setsockopt(s, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)))
+        exit(3);
+#endif
+    exit(0);
+}
+EOP
+        if $cc $ccflags $sockethdr socket.c -o socket $libs \
+            $socketlib >/dev/null 2>&1; then
+            ./socket >/dev/null 2>&1
+            case $? in
+            0) echo "Yes, it does!"
+                val="$define"
+                val2="$i_nitcp"
+            ;;
+            1) $cat <<EOM
+(Something went wrong -- Assuming SO_KEEPALIVE is broken)
+EOM
+                val="$undef"
+                val2="$undef"
+            ;;
+            2) echo "No, it doesn't.  Don't trust your manuals!!"
+                val="$undef"
+                val2="$undef"
+            ;;
+            3) echo "It does, but TCP_KEEPIDLE doesn't."
+                val="$define"
+                val2="$undef"
+            ;;
+            esac
+        else
+            cat <<EOM
+(I can't compile the test program -- Assuming SO_KEEPALIVE is broken)
+EOM
+            val="$undef"
+            val2="$undef"
+        fi
+    ;;
+*) cat <<EOM
+As you have an old socket interface, you can't have heard of SO_KEEPALIVE.
+EOM
+    val="$undef"
+    val2="$undef";;
+esac
+set d_keepalive
+eval $setvar
+val="$val2"
+set d_keepidle
+eval $setvar
+$rm -f socket socket.c
+
-echo " "
-: see if we have sigaction
@@ -4964 +5099 @@
-set d_snprintf
-eval $setvar
-
-socketlib=''
-sockethdr=''
-: see whether socket exists
-echo " "
-$echo $n "Hmm... $c" >&4
-if set socket val -f d_socket; eval $csym; $val; then
-    echo "Looks like you have Berkeley networking support." >&4
-    d_socket="$define"
-    if set setsockopt val -f; eval $csym; $val; then
-        d_oldsock="$undef"
-    else
-        echo "...but it uses the old 4.1c interface, rather than 4.2" >&4
-        d_oldsock="$define"
-    fi
-else
-    if $contains socklib libc.list >/dev/null 2>&1; then
-        echo "Looks like you have Berkeley networking support." >&4
-        d_socket="$define"
-        : we will have to assume that it supports the 4.2 BSD interface
-        d_oldsock="$undef"
-    else
-        echo "You don't have Berkeley networking in libc$_a..." >&4
-        if test -f /usr/lib/libnet$_a; then
-            ( (nm $nm_opt /usr/lib/libnet$_a | eval $nm_extract) ||  \
-            ar t /usr/lib/libnet$_a) 2>/dev/null >> libc.list
-            if $contains socket libc.list >/dev/null 2>&1; then
-            echo "...but the Wollongong group seems to have hacked it in." >&4
-                socketlib="-lnet"
-                sockethdr="-I/usr/netinclude"
-                d_socket="$define"
-                if $contains setsockopt libc.list >/dev/null 2>&1; then
-                    d_oldsock="$undef"
-                else
-                    echo "...using the old 4.1c interface, rather than 4.2" >&4
-                    d_oldsock="$define"
-                fi
-            else
-                echo "or even in libnet$_a, which is peculiar." >&4
-                d_socket="$undef"
-                d_oldsock="$undef"
-            fi
-        else
-            echo "or anywhere else I see." >&4
-            d_socket="$undef"
-            d_oldsock="$undef"
-        fi
-    fi
-fi
-
-: see if socketpair exists
-set socketpair d_sockpair
-eval $inlibc
-
-: see if we have socklen_t.
@@ -6792 +6874 @@
-d_ipv6='$d_ipv6'
-d_itimer='$d_itimer'
+d_keepalive='$d_keepalive'
+d_keepidle='$d_keepidle'
-d_keepsig='$d_keepsig'
-d_lrand48='$d_lrand48'
@@ -6884 +6968 @@
-i_netdb='$i_netdb'
-i_niin='$i_niin'
+i_nitcp='$i_nitcp'
-i_setjmp='$i_setjmp'
-i_sgtty='$i_sgtty'

1.7.7/Patchlevel

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

1.7.7/config_h.SH

@@ -787 +787 @@
-#$i_netdb I_NETDB       /**/
-
+/* I_NETINET_TCP:
+ *  This symbol, if defined, indicates to the C program that it should
+ *  include <netinet/tcp.h>.
+ */
+#$i_nitcp I_NETINET_TCP /**/
+
-/* I_SETJMP:
- *  This symbol, if defined, indicates to the C program that it can
@@ -824 +830 @@
-#$d_openssl HAS_OPENSSL /**/
-
+/* CAN_KEEPALIVE:
+ *  This symbol if defined indicates to the C program that the SO_KEEPALIVE
+ *  option of setsockopt() will work as advertised in the manual.
+ */
+/* CAN_KEEPIDLE:
+ *  This symbol if defined indicates to the C program that the TCP_KEEPIDLE
+ *  option of setsockopt() will work as advertised in the manual.
+ */
+#$d_keepalive CAN_KEEPALIVE     /**/
+
+#$d_keepidle CAN_KEEPIDLE       /**/
+
-#endif
-!GROK!THIS!

1.7.7/game/txt/hlp/pennv177.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.7.7 patchlevel 22                     September 30, 2003
+
+Minor Changes:
+  * When possible, sockets are now set SO_KEEPALIVE and TCP_KEEPIDLE.
+    This may help prevent disconnections of idle players behind
+    poorly designed NAT routers and the like, and make the use of
+    the IDLE command unnecessary. Patch by Philip Mak.
+  * Better failure messages for 'get blah's blah', especially when
+    the container or contained object is ambiguous. Suggested by
+    Philip Mak. 
+Fixes:
+  * Attempting to unset attribute flags actually set them.
+    Report by Ambrosia@M*U*S*H. [SW]
+  * Remove a warning in set.c. Report by Nymeria@M*U*S*H
+
+
+& 1.7.7p21
-Version 1.7.7 patchlevel 21                     September 23, 2003
-

1.7.7/game/txt/hlp/pennvOLD.hlp

@@ -4419 +4419 @@
-
-1.7.7: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
-
+, 22
-1.7.6: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
-1.7.5: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12

1.7.7/hdrs/copyrite.h

@@ -42 +42 @@
- *   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
+ * Although not necessary given the above copyright, the TinyMUSH 2.0
+ * developers, Joseph Traub and Glenn Crocker, confirmed in email to
+ * Alan Schwartz in 2002 that they were willing to have any of their
+ * code present in PennMUSH redistributed under the Artistic License.
+ *
- * The portions derived from TinyMUSH 2.2 are used under the Artistic
-
-
+
+
+
+
+
+
+
+
+
- *
- * The Artistic License

1.7.7/hdrs/externs.h

@@ -273 +273 @@
-extern int ok_player_name(const char *name, dbref player);
-extern int ok_password(const char *password);
-ive(dbref player, const char 
+or(dbref player, const char *
-extern void page_return(dbref player, dbref target, const char *type,
-            const char *message, const char *def);

1.7.7/hdrs/mysocket.h

@@ -70 +70 @@
-             socklen_t myilen, Port_t port, int *timeout);
-void make_nonblocking(int s);
+void set_keepalive(int s);
-int connect_nonb
-  (int sockfd, const struct sockaddr *saptr, socklen_t salen, int *nsec);

1.7.7/hdrs/version.h

@@ -1 @@
-1 [09/23
-1
-1
+2 [09/30
+2
+2

1.7.7/src/bsd.c

@@ -134 +134 @@
-#endif
-#endif
+
-
-/* BSD 4.2 and maybe some others need these defined */
@@ -1321 +1322 @@
-  do_log(LT_CONN, 0, 0, T("[%d/%s/%s] Connection opened."), newsock, tbuf1,
-     tbuf2);
+  set_keepalive(newsock);
-  return initializesock(newsock, tbuf1, tbuf2, use_ssl);
-}
@@ -2098 +2100 @@
-    do_log(LT_CONN, 0, 0, T("[%d/%s/%s] Connection opened."), fd,
-       bp ? bp : "", buf);
+    set_keepalive(fd);
-    (void) initializesock(fd, bp ? bp : buf, buf, (atoi(bp2) == SSLPORT));
-  }

1.7.7/src/look.c

@@ -610 +610 @@
-    /* look at a thing in location */
-    if ((thing = match_result(player, name, NOTYPE, MAT_NEARBY)) == NOTHING) {
-
-
+
+
+
+
-    notify(player, T("I don't see that here."));
+    return;
+      } else if (box == AMBIGUOUS) {
+    notify_format(player, T("I can't tell which %s."), boxname);
+    return;
+      }
+      thing = match_result(box, name, NOTYPE, MAT_POSSESSION);
+      if (thing == NOTHING) {
+    notify(player, T("I don't see that here."));
+    return;
+      } else if (thing == AMBIGUOUS) {
+    notify_format(player, T("I can't tell which %s."), name);
-    return;
-      }

1.7.7/src/move.c

@@ -525 +525 @@
-  if (match_result(player, what, TYPE_THING, match_flags) == NOTHING) {
-    if (POSSESSIVE_GET) {
+      dbref box;
+      const char *boxname = what;
-      /* take care of possessive get (stealing) */
-thing = parse_match_possessive(player, 
-!GoodObject(thing)
+box = parse_match_possessor(player, &
+box == NOTHING
-    notify(player, T("I don't see that here."));
+    return;
+      } else if (box == AMBIGUOUS) {
+    notify_format(player, T("I can't tell which %s."), boxname);
+    return;
+      }
+      thing = match_result(box, what, NOTYPE, MAT_POSSESSION);
+      if (thing == NOTHING) {
+    notify(player, T("I don't see that here."));
+    return;
+      } else if (thing == AMBIGUOUS) {
+    notify_format(player, T("I can't tell which %s."), what);
-    return;
-      }

1.7.7/src/mysocket.c

@@ -32 +32 @@
-#include <sys/in.h>
-#endif
+#endif
+
+#ifdef I_NETINET_TCP
+#include <netinet/tcp.h>
-#endif
-
@@ -357 +361 @@
-#endif              /* !macintosh */
-}
+
+
+
+/* Enable TCP keepalive on the given socket if we can */
+void
+set_keepalive(int s)
+{
+#ifdef CAN_KEEPALIVE
+  int keepalive = 1;
+#ifdef CAN_KEEPIDLE
+  int keepidle = 900;
+#endif
+
+  /* enable TCP keepalive */
+  if (setsockopt(s, SOL_SOCKET, SO_KEEPALIVE,
+         (void *) &keepalive, sizeof(keepalive)) == -1)
+    fprintf(stderr, "[%d] could not set SO_KEEPALIVE: errno %d", s, errno);
+#ifdef CAN_KEEPIDLE
+  if (setsockopt(s, IPPROTO_TCP, TCP_KEEPIDLE,
+         (void *) &keepidle, sizeof(keepidle)) == -1)
+    fprintf(stderr, "[%d] could not set TCP_KEEPALIVE: errno %d", s, errno);
+#endif
+#endif
+  return;
+}
+
+
-
-/** Connect a socket, possibly making it nonblocking first.

1.7.7/src/predicat.c

@@ -840 +840 @@
-}
-
-
+ for the possessor
- * This function parses strings of the form "Sam's bag" and attempts
-
-
+
+
+
+
- * \param player the enactor/looker.
-
-
+pointer to a 
+ or AMBIGUOUS
- */
-dbref
-ive(dbref player, const char 
-
-har *box;   
+or(dbref player, const char *
+
+onst char *box;
-  char *obj;            /* name of object */
-
-
-
-
-
+
+
-
-  /* check to see if we have an 's sequence */
-name
+box
-    return NOTHING;
-  *obj++ = '\0';        /* terminate */
-  if ((*obj == '\0') || ((*obj != 's') && (*obj != 'S')))
-    return NOTHING;
-
-  /* skip over the 's' and whitespace */
-  do {
-    obj++;
-  } while (isspace((unsigned char) *obj));
+  *str = obj;
-
-  /* we already have a terminating null, so we're okay to just do matches */
-
-
-
-
-
-
+
-}
-

1.7.7/src/set.c

@@ -459 +459 @@
-struct af_args {
-  int f;        /**< flag bits */
-
+
+
-};
-
@@ -474 +475 @@
-   */
-  if (!(Can_Write_Attr(player, thing, AL_ATTR(atr)) ||
-(*af->flag == NOT_TOKEN)
+af->clear
-     Can_Write_Attr_Ignore_Safe(player, thing, AL_ATTR(atr))))) {
-    notify_format(player, T("You cannot change that flag on %s/%s"),
@@ -481 +482 @@
-  }
-
-*af->flag == NOT_TOKEN
+af->clear
-    AL_FLAGS(atr) &= ~af->f;
-    if (!AreQuiet(player, thing))
-      notify_format(player, T("%s/%s - %s reset."), Name(thing), AL_NAME(atr),
-(af->flag + 1)
+af->flag
-  } else {
-    AL_FLAGS(atr) |= af->f;
@@ -531 +532 @@
-    return;
-  }
+
+  af.clear = 0;
+
-  /* move past NOT token if there is one */
-
-
+
+
+
-
-  if ((af.f = string_to_atrflag(player, p)) < 0) {
@@ -542 +547 @@
-  if (!atr_iter_get(player, thing, atrname, 0, af_helper, &af))
-    notify(player, T("No attribute found to change."));
-
+(Malloc_t) 
-}
-