summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-08-04 05:10:49 +0000
committerRoger Dingledine <arma@torproject.org>2004-08-04 05:10:49 +0000
commitb51a444dd27ecb94a8c14a8a3e915f2114ff8d31 (patch)
treeaf9a28b016af7f156c8eae6cc39e56c74070e63c
parent75684a48d53df1a82081ee2455509c05ee3d0d7e (diff)
downloadtor-b51a444dd27ecb94a8c14a8a3e915f2114ff8d31.tar.gz
tor-b51a444dd27ecb94a8c14a8a3e915f2114ff8d31.zip
commit some odds and ends, so my tree is clean
svn:r2137
-rw-r--r--src/or/circuitbuild.c1
-rw-r--r--src/or/or.h2
-rw-r--r--src/or/router.c2
3 files changed, 4 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 40c57e01b0..9eefc67689 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -389,6 +389,7 @@ int circuit_send_next_onion_skin(circuit_t *circ) {
if(!has_completed_circuit) {
has_completed_circuit=1;
log_fn(LOG_NOTICE,"Tor has successfully opened a circuit. Looks like it's working.");
+// XXX008 put a count of known routers here
}
circuit_rep_hist_note_result(circ);
circuit_has_opened(circ); /* do other actions as necessary */
diff --git a/src/or/or.h b/src/or/or.h
index 34290e4542..167b6d86a3 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -869,6 +869,8 @@ typedef struct {
int NumCpus; /**< How many CPUs should we try to use? */
int RunTesting; /**< If true, create testing circuits to measure how well the
* other ORs are running. */
+ struct config_line_t *TrustedDirs; /**< List of fingerprints of keys that are
+ allowed to sign directories. */
struct config_line_t *RendConfigLines; /**< List of configuration lines
* for rendezvous services. */
char *ContactInfo; /** Contact info to be published in the directory */
diff --git a/src/or/router.c b/src/or/router.c
index 937370ca14..fb53c8a002 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -124,7 +124,7 @@ void rotate_onion_key(void)
log_fn(LOG_WARN, "Couldn't rotate onion key.");
}
-/** The last calculated bandwidth usage for our node. */
+/** The latest calculated bandwidth usage for our node. */
static int advertised_bw = 0;
/** Tuck <b>bw</b> away so we can produce it when somebody
* calls router_get_advertised_bandwidth() below.