patch from karsten:

Resolved problems with (re-)fetching hidden service descriptors.
Before, v0 descriptors were not fetched at all (fix on 0.2.0.18-alpha),
re-fetching of v2 descriptors did not stop when a v0 descriptor was
received (fix on 0.2.0.18-alpha), and re-fetching of v2 descriptors did
not work in all cases (fix on 0.2.0.19-alpha).


svn:r13540

1 files changed, 5 insertions, 1 deletions

diff --git a/src/or/or.h b/src/or/or.h
index 3cd7fd7d5..28c7bfdbd 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1053,6 +1053,9 @@ typedef struct dir_connection_t {
   /** The zlib object doing on-the-fly compression for spooled data. */
   tor_zlib_state_t *zlib_state;
 
+  /** What hidden service descriptor are we fetching, if any? */
+  int rend_version;
+
   /** What rendezvous service are we querying for? */
   char rend_query[REND_SERVICE_ID_LEN_BASE32+1];
 
@@ -2751,7 +2754,8 @@ connection_t *connection_get_by_type_addr_port_purpose(int type, uint32_t addr,
                                                    uint16_t port, int purpose);
 connection_t *connection_get_by_type_state(int type, int state);
 connection_t *connection_get_by_type_state_rendquery(int type, int state,
-                                                     const char *rendquery);
+                                                     const char *rendquery,
+                                                     int rendversion);
 
 #define connection_speaks_cells(conn) ((conn)->type == CONN_TYPE_OR)
 int connection_is_listener(connection_t *conn);