aboutsummaryrefslogtreecommitdiff
path: root/forward.c
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2006-06-11 04:22:11 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2006-06-11 04:22:11 +0000
commit838911cc424dcc0c03db1e9b256965976068c1a1 (patch)
tree91f58a1f1f5bb6ad18a44dfbdef711de5d63d7a4 /forward.c
parentA few more updates: (diff)
downloadopenvpn-838911cc424dcc0c03db1e9b256965976068c1a1.tar.xz
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
Diffstat (limited to '')
-rw-r--r--forward.c13
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 ();