[or-cvs] r9525: Wow. Remember when I wrote that script to tell me about macr (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-02-08 02:24:15 -0500 (Thu, 08 Feb 2007)
New Revision: 9525

Modified:
   tor/trunk/
   tor/trunk/src/or/circuitbuild.c
   tor/trunk/src/or/connection_or.c
   tor/trunk/src/or/control.c
Log:
 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.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r11702] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/circuitbuild.c
===================================================================
--- tor/trunk/src/or/circuitbuild.c	2007-02-08 07:24:12 UTC (rev 9524)
+++ tor/trunk/src/or/circuitbuild.c	2007-02-08 07:24:15 UTC (rev 9525)
@@ -1973,9 +1973,6 @@
 #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.

Modified: tor/trunk/src/or/connection_or.c
===================================================================
--- tor/trunk/src/or/connection_or.c	2007-02-08 07:24:12 UTC (rev 9524)
+++ tor/trunk/src/or/connection_or.c	2007-02-08 07:24:15 UTC (rev 9525)
@@ -14,11 +14,6 @@
 
 #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);

Modified: tor/trunk/src/or/control.c
===================================================================
--- tor/trunk/src/or/control.c	2007-02-08 07:24:12 UTC (rev 9524)
+++ tor/trunk/src/or/control.c	2007-02-08 07:24:15 UTC (rev 9525)
@@ -59,7 +59,7 @@
 #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