[or-cvs] r13431: Bugfix from Karsten Loesing: Retry v2 rend descriptors on in (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-02-08 16:30:07 -0500 (Fri, 08 Feb 2008)
New Revision: 13431

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/circuituse.c
Log:
 r17985 at catbus:  nickm | 2008-02-08 16:30:02 -0500
 Bugfix from Karsten Loesing: Retry v2 rend descriptors on intro point failure.



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

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-02-08 21:13:15 UTC (rev 13430)
+++ tor/trunk/ChangeLog	2008-02-08 21:30:07 UTC (rev 13431)
@@ -61,6 +61,9 @@
       script, on fedora or redhat machines. Bugfix on 0.2.0.x.
     - Do not become confused when receiving a spurious VERSIONS-like
       cell from a confused v1 client.  Bugfix on 0.2.0.x.
+    - Re-fetch v2 (as well as v0) rend descriptors when all intro points for
+      a hidden service have failed.  Patch from Karsten Loesing.  Bugfix on
+      0.2.0.x.
 
   o Code simplifications and refactoring:
     - Remove some needless generality from cpuworker code, for improved

Modified: tor/trunk/src/or/circuituse.c
===================================================================
--- tor/trunk/src/or/circuituse.c	2008-02-08 21:13:15 UTC (rev 13430)
+++ tor/trunk/src/or/circuituse.c	2008-02-08 21:30:07 UTC (rev 13431)
@@ -1027,6 +1027,7 @@
                  "No intro points for '%s': refetching service descriptor.",
                  safe_str(conn->rend_query));
         rend_client_refetch_renddesc(conn->rend_query);
+        rend_client_refetch_v2_renddesc(conn->rend_query);
         conn->_base.state = AP_CONN_STATE_RENDDESC_WAIT;
         return 0;
       }