aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorYawning Angel <yawning@schwanenlied.me>2015-09-01 16:30:48 +0000
committerNick Mathewson <nickm@torproject.org>2015-09-08 14:02:08 -0400
commit54510d4d1a66d2dd9a618699bd2e51bf4ade4dea (patch)
tree65cc4e1666368fffa57b4b1d0e8df14b0b81611c /src/or/or.h
parenta16115d9cb8c2e88da8a59c212155e2fd0e16aa3 (diff)
downloadtor-54510d4d1a66d2dd9a618699bd2e51bf4ade4dea.tar.gz
tor-54510d4d1a66d2dd9a618699bd2e51bf4ade4dea.zip
Add `KeepAliveIsolateSOCKSAuth` as a SOCKSPort option.
This controls the circuit dirtyness reset behavior added for Tor Browser's user experience fix (#15482). Unlike previous iterations of this patch, the tunable actually works, and is documented.
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 8c40f1ab67..6660a0dcdc 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1155,6 +1155,8 @@ typedef struct entry_port_cfg_t {
/** When both no-auth and user/pass are advertised by a SOCKS client, select
* no-auth. */
unsigned int socks_prefer_no_auth : 1;
+ /** When ISO_SOCKSAUTH is in use, Keep-Alive circuits indefinitely. */
+ unsigned int socks_iso_keep_alive : 1;
/* Client port types only: */
unsigned int ipv4_traffic : 1;
@@ -2877,6 +2879,11 @@ typedef struct circuit_t {
* circuits entered certain states. This usage probably won't
* interfere with this field's primary purpose, but we should
* document it more thoroughly to make sure of that.
+ *
+ * XXX027 The SocksPort option KeepaliveIsolateSOCKSAuth will artificially
+ * adjust this value forward each time a suitable stream is attached to an
+ * already constructed circuit, potentially keeping the circuit alive
+ * indefinitely.
*/
time_t timestamp_dirty;