aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-02-08 07:24:15 +0000
committerNick Mathewson <nickm@torproject.org>2007-02-08 07:24:15 +0000
commit85d3c2fbaf42e20c32cda469b0f6b802b1a1a449 (patch)
treecd4940641b4223e05027466cc4a4634444f1e345
parent1d67f3fcec5de8d93623713dde9b7e62e6770049 (diff)
downloadtor-85d3c2fbaf42e20c32cda469b0f6b802b1a1a449.tar
tor-85d3c2fbaf42e20c32cda469b0f6b802b1a1a449.tar.gz
r11702@catbus: nickm | 2007-02-08 02:10:19 -0500
Wow. Remember when I wrote that script to tell me about macros that were never used? Good times. svn:r9525
-rw-r--r--src/or/circuitbuild.c3
-rw-r--r--src/or/connection_or.c5
-rw-r--r--src/or/control.c2
3 files changed, 1 insertions, 9 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index f1571d5d3..521302a37 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1973,9 +1973,6 @@ control_event_guard_deferred(void)
#endif
}
-/* DOCDOC */
-#define NUM_ENTRY_PICK_TRIES 100
-
/** Add a new (preferably stable and fast) router to our
* entry_guards list. Return a pointer to the router if we succeed,
* or NULL if we can't find any more suitable entries.
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index d17191486..6f5239925 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -14,11 +14,6 @@ const char connection_or_c_id[] =
#include "or.h"
-/** How much clock skew do we tolerate when checking certificates for
- * known routers? (sec) */
-
-#define TIGHT_CERT_ALLOW_SKEW (90*60)
-
static int connection_tls_finish_handshake(or_connection_t *conn);
static int connection_or_process_cells_from_inbuf(or_connection_t *conn);
static int connection_or_empty_enough_for_dirserv_data(or_connection_t *conn);
diff --git a/src/or/control.c b/src/or/control.c
index a374944ec..2aef65f1f 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -59,7 +59,7 @@ const char control_c_id[] =
#define ERR_UNRECOGNIZED_EVENT_CODE 0x0006
#define ERR_UNAUTHORIZED 0x0007
#define ERR_REJECTED_AUTHENTICATION 0x0008
-#define ERR_RESOURCE_EXHAUSETED 0x0009
+#define ERR_RESOURCE_EXHAUSTED 0x0009
#define ERR_NO_STREAM 0x000A
#define ERR_NO_CIRC 0x000B
#define ERR_NO_ROUTER 0x000C