[or-cvs] r8884: Fix 0.1.1.x branch to not warn when an OR gives it a new cir (in tor/branches/tor-0_1_1-patches: . src/or)

nickm at seul.org nickm at seul.org
Tue Oct 31 23:33:31 UTC 2006


Author: nickm
Date: 2006-10-31 18:33:29 -0500 (Tue, 31 Oct 2006)
New Revision: 8884

Modified:
   tor/branches/tor-0_1_1-patches/ChangeLog
   tor/branches/tor-0_1_1-patches/src/or/circuitlist.c
Log:
Fix 0.1.1.x branch to not warn when an OR gives it a new circuit end reason. (Bug 351)

Modified: tor/branches/tor-0_1_1-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_1-patches/ChangeLog	2006-10-31 21:34:24 UTC (rev 8883)
+++ tor/branches/tor-0_1_1-patches/ChangeLog	2006-10-31 23:33:29 UTC (rev 8884)
@@ -25,6 +25,8 @@
       certain commands from a v0 controller on platforms that do not
       handle printf("%s",NULL) gracefully.
     - Avoid infinite loop on unexpected controller input.
+    - Don't log spurious warnings when we see a circuit close reason we
+      don't recognize; it's probably just from a newer version of Tor.
 
 
 Changes in version 0.1.1.24 - 2006-09-29

Modified: tor/branches/tor-0_1_1-patches/src/or/circuitlist.c
===================================================================
--- tor/branches/tor-0_1_1-patches/src/or/circuitlist.c	2006-10-31 21:34:24 UTC (rev 8883)
+++ tor/branches/tor-0_1_1-patches/src/or/circuitlist.c	2006-10-31 23:33:29 UTC (rev 8884)
@@ -680,7 +680,7 @@
     reason = END_CIRC_REASON_NONE;
   }
   if (reason < _END_CIRC_REASON_MIN || reason > _END_CIRC_REASON_MAX) {
-    log_warn(LD_BUG, "Reason %d out of range at %s:%d", reason, file, line);
+    log_info(LD_BUG, "Reason %d out of range at %s:%d", reason, file, line);
     reason = END_CIRC_REASON_NONE;
   }
 



More information about the tor-commits mailing list