r16301@catbus: nickm | 2007-10-31 16:43:49 -0400

 A couple of small tweaks to karsten's latest patch, and note an issue with using a bitmap to represent a single int.


svn:r12300

1 files changed, 8 insertions, 6 deletions

diff --git a/src/or/or.h b/src/or/or.h
index f4513d37b3..512f90c32e 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1763,12 +1763,6 @@ typedef struct origin_circuit_t {
    */
   crypt_path_t *cpath;
 
-  /** Stores the rendezvous descriptor version if purpose is S_* to
-   * distinguish introduction and rendezvous points belonging to the same
-   * rendezvous service ID, but different descriptor versions.
-   */
-  uint8_t rend_desc_version;
-
   /** The rend_pk_digest field holds a hash of location-hidden service's
    * PK if purpose is S_ESTABLISH_INTRO or S_RENDEZVOUSING.
    */
@@ -1786,6 +1780,14 @@ typedef struct origin_circuit_t {
    */
   char rend_query[REND_SERVICE_ID_LEN+1];
 
+  /** Stores the rendezvous descriptor version if purpose is S_*. Used to
+   * distinguish introduction and rendezvous points belonging to the same
+   * rendezvous service ID, but different descriptor versions.
+   * XXXX020 I believe this is a bitmap, but the doc doesn't say so. If so,
+   *  why?  A circuit can't be using two different rendezvous decriptors. -NM
+   */
+  uint8_t rend_desc_version;
+
   /* The intro key replaces the hidden service's public key if purpose is
    * S_ESTABLISH_INTRO or S_INTRO, provided that no unversioned rendezvous
    * descriptor is used. */