r7369@Kushana: nickm | 2006-08-14 02:03:10 -0400

 Shortening fields is only one part of making structs shorter. You must also consider alignment padding. Whee.

svn:r7045

diff --git a/src/or/or.h b/src/or/or.h
index cb21a3c0bd3a60f48a8bce2c7b02224c0dd8f33d..94f2a6b2cf6b53932bc53a672c5746b76a734de0 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -710,10 +710,6 @@ typedef struct edge_connection_t {
                        * circuit? */
   int deliver_window; /**< How many more relay cells can end at me? */
 
-  /** Number of times we've reassigned this application connection to
-   * a new circuit. We keep track because the timeout is longer if we've
-   * already retried several times. */
-  uint8_t num_socks_retries;
 
   /** Nickname of planned exit node -- used with .exit support. */
   char *chosen_exit_name;
@@ -735,6 +731,12 @@ typedef struct edge_connection_t {
 
   char rend_query[REND_SERVICE_ID_LEN+1]; /**< What rendezvous service are we
                                            * querying for? (AP only) */
+
+  /** Number of times we've reassigned this application connection to
+   * a new circuit. We keep track because the timeout is longer if we've
+   * already retried several times. */
+  uint8_t num_socks_retries;
+
 } edge_connection_t;
 
 /** Subtype of connection_t for an "directory connection" -- that is, an HTTP