[or-cvs] r9359: set or_conn->tls_error to 0 on non-error to avoid looking at (in tor/trunk: . doc src/or)

nickm at seul.org nickm at seul.org
Mon Jan 15 22:11:23 UTC 2007


Author: nickm
Date: 2007-01-15 17:11:21 -0500 (Mon, 15 Jan 2007)
New Revision: 9359

Modified:
   tor/trunk/
   tor/trunk/doc/TODO
   tor/trunk/src/or/connection.c
Log:
 r11975 at Kushana:  nickm | 2007-01-15 17:11:15 -0500
 set or_conn->tls_error to 0 on non-error to avoid looking at stale errors.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r11975] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/doc/TODO
===================================================================
--- tor/trunk/doc/TODO	2007-01-15 21:44:59 UTC (rev 9358)
+++ tor/trunk/doc/TODO	2007-01-15 22:11:21 UTC (rev 9359)
@@ -507,3 +507,8 @@
 
   - add a page for localizing all tor's components.
 
+  - It would be neat if we had a single place that described _all_ the
+    tor-related tools you can use, and what they give you, and how well they
+    work.  Right now, we don't give a lot of guidance wrt
+    torbutton/foxproxy/privoxy/polipo in any consistent place.
+

Modified: tor/trunk/src/or/connection.c
===================================================================
--- tor/trunk/src/or/connection.c	2007-01-15 21:44:59 UTC (rev 9358)
+++ tor/trunk/src/or/connection.c	2007-01-15 22:11:21 UTC (rev 9359)
@@ -1462,6 +1462,8 @@
     result = read_to_buf_tls(or_conn->tls, at_most, conn->inbuf);
     if (TOR_TLS_IS_ERROR(result) || result == TOR_TLS_CLOSE)
       or_conn->tls_error = result;
+    else
+      or_conn->tls_error = 0;
 
     switch (result) {
       case TOR_TLS_CLOSE:



More information about the tor-commits mailing list