[tor-commits] [tor/release-0.2.9] Call get_options() once at the top of circuit_log_ancient_one_hop_circuits()

nickm at torproject.org nickm at torproject.org
Thu Nov 10 14:11:54 UTC 2016


commit 5dca9487c422f06a056711591c3f8f4344fd075f
Author: teor <teor2345 at gmail.com>
Date:   Wed Nov 9 11:15:48 2016 +1100

    Call get_options() once at the top of circuit_log_ancient_one_hop_circuits()
    
    Refactoring, no behaviour change.
---
 src/or/circuituse.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index f344703..18cd7e3 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -797,6 +797,7 @@ circuit_log_ancient_one_hop_circuits(int age)
   time_t cutoff = now - age;
   int n_found = 0;
   smartlist_t *log_these = smartlist_new();
+  const or_options_t *options = get_options();
 
   SMARTLIST_FOREACH_BEGIN(circuit_get_global_list(), circuit_t *, circ) {
     const origin_circuit_t *ocirc;
@@ -839,7 +840,7 @@ circuit_log_ancient_one_hop_circuits(int age)
 
       tor_asprintf(&dirty, "Dirty since %s (%ld seconds vs %ld-second cutoff)",
                    dirty_since, (long)(now - circ->timestamp_dirty),
-                   (long) get_options()->MaxCircuitDirtiness);
+                   (long) options->MaxCircuitDirtiness);
     } else {
       dirty = tor_strdup("Not marked dirty");
     }





More information about the tor-commits mailing list