Added optional minimum-number-of-bytes

parameter to --inactive directive.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1036 e7ae566f-a301-0410-adde-c780ea21d3b5

1 files changed, 6 insertions, 7 deletions

diff --git a/forward.c b/forward.c
index 5fec532..6887a3c 100644
--- a/forward.c
+++ b/forward.c
@@ -1104,6 +1104,9 @@ process_outgoing_link (struct context *c)
 		 BLEN (&c->c2.to_link),
 		 size);
 	}
+
+      /* indicate activity regarding --inactive parameter */
+      register_activity (c, size);
     }
   else
     {
@@ -1185,6 +1188,9 @@ process_outgoing_tun (struct context *c)
 		 c->c1.tuntap->actual_name,
 		 BLEN (&c->c2.to_tun),
 		 size);
+
+	  /* indicate activity regarding --inactive parameter */
+	  register_activity (c, size);
 	}
     }
   else
@@ -1198,13 +1204,6 @@ process_outgoing_tun (struct context *c)
 	   MAX_RW_SIZE_TUN (&c->c2.frame));
     }
 
-  /*
-   * Putting the --inactive timeout reset here, ensures that we will timeout
-   * if the remote goes away, even if we are trying to send data to the
-   * remote and failing.
-   */
-  register_activity (c);
-
   buf_reset (&c->c2.to_tun);
 
   perf_pop ();