Ticket #6304: 0001-Make-the-default-CircuitBuildTimeout-match-the-man-p.patch

File 0001-Make-the-default-CircuitBuildTimeout-match-the-man-p.patch, 1.5 KB (added by rransom, 7 years ago)
  • new file changes/fix-default-non-adaptive-cbt

    From 416b8c24459788aad1db194ebced7c8d7b1599bf Mon Sep 17 00:00:00 2001
    From: Robert Ransom <rransom.8774@gmail.com>
    Date: Tue, 10 Jul 2012 03:00:10 +0000
    Subject: [PATCH] Make the default CircuitBuildTimeout match the man page
     again
    
    Bugfix on commit 6eba08e22f2b0ab91433d6b641eab45a65a4495d.
    ---
     changes/fix-default-non-adaptive-cbt |    5 +++++
     src/or/config.c                      |    2 +-
     2 files changed, 6 insertions(+), 1 deletion(-)
     create mode 100644 changes/fix-default-non-adaptive-cbt
    
    diff --git a/changes/fix-default-non-adaptive-cbt b/changes/fix-default-non-adaptive-cbt
    new file mode 100644
    index 0000000..7babbd5
    - +  
     1  o Major bugfixes:
     2
     3    - Set the default value of the CircuitBuildTimeout option to 60
     4      seconds, as specified in the man page.  Bugfix on 0.2.2.2-alpha.
     5
  • src/or/config.c

    diff --git a/src/or/config.c b/src/or/config.c
    index 782a6e9..c10a7f5 100644
    a b static config_var_t _option_vars[] = { 
    213213  V(BridgeRelay,                 BOOL,     "0"),
    214214  V(CellStatistics,              BOOL,     "0"),
    215215  V(LearnCircuitBuildTimeout,    BOOL,     "1"),
    216   V(CircuitBuildTimeout,         INTERVAL, "0"),
     216  V(CircuitBuildTimeout,         INTERVAL, "1 minute"),
    217217  V(CircuitIdleTimeout,          INTERVAL, "1 hour"),
    218218  V(CircuitStreamTimeout,        INTERVAL, "0"),
    219219  V(CircuitPriorityHalflife,     DOUBLE,  "-100.0"), /*negative:'Use default'*/