Changeset 951

Timestamp:

06/17/07 17:44:06 (1 year ago)

Author:

shawnw

Message:

#7315: KEEPALIVE flag

Files:

• 1.8.2/branches/devel/CHANGES.182 (modified) (1 diff)
• 1.8.2/branches/devel/game/mushcnf.dst (modified) (1 diff)
• 1.8.2/branches/devel/game/txt/hlp/pennflag.hlp (modified) (2 diffs)
• 1.8.2/branches/devel/src/bsd.c (modified) (4 diffs)
• 1.8.2/branches/devel/src/flags.c (modified) (2 diffs)
• 1.8.2/branches/devel/src/utils.c (modified) (1 diff)

1.8.2/branches/devel/CHANGES.182

@@ -17 +17 @@
-Version 1.8.2 patchevel 6                       ???  ??, 2007
-
+Minor changes:
+  * KEEPALIVE flag makes the server send a telnet NOP after
+    a short period of inactivity; helps prevent timeouts from
+    NAT/router devices with a short timeout. [MUX]
+
-Fixes:
-  * Fixed assorted small memory leaks. [SW]
+  * Fixed handling of telnet NOPs sent by clients. [SW]
-
-Version 1.8.2 patchlevel 5                      June 13, 2007

1.8.2/branches/devel/game/mushcnf.dst

@@ -214 +214 @@
-# the internet, and don't deal well with persistant connections like
-# mushes use. This option will make the server automatically send a
-
+TCP-level 
-# connection active.
-
-
+
+
+
-keepalive_timeout 5m
-

1.8.2/branches/devel/game/txt/hlp/pennflag.hlp

@@ -51 +51 @@
-  d - Destroy_Ok        e - Enter_Ok            g - Gagged
-  h - Halt              i - Orphan              j - Jury_Ok             
-l - Light             m - Myopic, Mistrust    n - No_Command          
-o - On-Vacation       p - Puppet, Paranoid    r - Royalty             
-s - Suspect           t - Transparent         u - Uninspected         
-v - Verbose           w - No_Warn             x - Terse, Cloudy       
-? - Unregistered      ^ - Listen_Parent       ~ - Noaccents
-
+k - Keepalive         l - Light               m - Myopic, Mistrust
+n - No_Command        o - On-Vacation         p - Puppet, Paranoid
+r - Royalty           s - Suspect             t - Transparent
+u - Uninspected       v - Verbose             w - No_Warn
+x - Terse, Cloudy     ? - Unregistered        ^ - Listen_Parent
+~ - Noaccents         
------------------------------------------------------------------------
-Some flags may not be enabled on some MUSHes. @flag/list will show
-which are available.
-
-& ABODE
- Flag:  ABODE  (rooms)
@@ -402 +401 @@
-  When a room is set JUMP_OK, then that room can be teleported into
-  by anyone. See @teleport.
+& KEEPALIVE
+  Flag: KEEPALIVE (players)
+
+  When this flag is set on a player with a telnet-capable connection,
+  a telnet NOP (no-operation) is sent after there's been no activity
+  on the connection for a minute, to generate socket activity without
+  generating any output. In a way, it's the opposite of the IDLE
+  command. IDLE is sent by clients to keep a connection open, while
+  KEEPALIVE tells the server to send a message. Both are intended for
+  use by people going through home router/NAT appliances with short
+  inactivity timeouts.
+
+See also: IDLE, terminfo()
-& LIGHT
-  Flag:  LIGHT (all types)

1.8.2/branches/devel/src/bsd.c

@@ -2143 +2143 @@
-    fprintf(stderr, "Got IAC NOP\n");
-#endif
+    *q++;
-    break;
-  case AYT:                    /* Are you there? */
@@ -2974 +2975 @@
-    if (d->player == player) {
-      numd++;
-now - d->last_time > 6
+difftime(now, d->last_time) > 60.
-        in = d;
-    }
@@ -4413 +4414 @@
-{
-  DESC *d, *nextd;
-, idle, idle_for, unconnected_idle
-f (!INACTIVITY_LIMIT && !UNCONNECTED_LIMIT)
-
+
+nt idle, idle_for, unconnected_idle;
+
-  now = mudtime;
-  idle = INACTIVITY_LIMIT ? INACTIVITY_LIMIT : INT_MAX;
@@ -4421 +4422 @@
-  for (d = descriptor_list; d; d = nextd) {
-    nextd = d->next;
-now - d->last_time
+(int) difftime(now, d->last_time)
-    /* If they've been connected for 60 seconds without getting a telnet-option
-       back, the client probably doesn't understand them */
-
+
+
-      d->conn_flags &= ~CONN_TELNET_QUERY;
+
+    /* If they've been idle for 60 seconds and are set KEEPALIVE and using
+       a telnet-aware client, send a NOP */
+    if (d->conn_flags & CONN_TELNET && idle_for >= 60
+        && IS(d->player, TYPE_PLAYER, "KEEPALIVE")) {
+      const unsigned char nopmsg[2] = { IAC, NOP };
+      queue_newwrite(d, nopmsg, 2);
+      process_output(d);
+    }
+
-    if ((d->connected) ? (idle_for > idle) : (idle_for > unconnected_idle)) {
-

1.8.2/branches/devel/src/flags.c

@@ -141 +141 @@
-  {"GOING_TWICE", '\0', NOTYPE, GOING_TWICE, F_INTERNAL | F_DARK,
-   F_INTERNAL | F_DARK},
+  {"KEEPALIVE", 'k', TYPE_PLAYER, 0, F_ANY, F_ANY},
-  {NULL, '\0', 0, 0, 0, 0}
-};
@@ -855 +856 @@
-
-  if (n->tab == &ptab_flag) {
+    add_flag("KEEPALIVE", 'k', TYPE_PLAYER, F_ANY, F_ANY);
-    add_flag("MISTRUST", 'm', TYPE_THING | TYPE_EXIT | TYPE_ROOM, F_INHERIT,
-             F_INHERIT);

1.8.2/branches/devel/src/utils.c

@@ -161 +161 @@
-{
-  if (attrib && (AL_FLAGS(attrib) & AF_ANON)) {
-
+ 
-    chunk_delete(attrib->data);
-    mush_free(attrib, "anon_attr");