r6907@Kushana: nickm | 2006-07-25 19:03:43 -0400

 Realign circuit structs to avoid wasted space.

svn:r6905

diff --git a/src/or/or.h b/src/or/or.h
index 2f49e8c1f84c5ff7d88692ba2b5146dc157bfd72..8ce5d8692d69e63150981a9a1b07b567d1c60f0d 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1077,10 +1077,10 @@ typedef struct circuit_t {
   char n_conn_id_digest[DIGEST_LEN];
   /** The circuit_id used in the next (forward) hop of this circuit. */
   uint16_t n_circ_id;
-  /** The IPv4 address of the OR that is next in this circuit. */
-  uint32_t n_addr;
   /** The port for the OR that is next in this circuit. */
   uint16_t n_port;
+  /** The IPv4 address of the OR that is next in this circuit. */
+  uint32_t n_addr;
   /** How many relay data cells can we package (read from edge streams)
    * on this circuit before we receive a circuit-level sendme cell asking
    * for more? */
@@ -1122,9 +1122,6 @@ typedef struct origin_circuit_t {
 
   /** Linked list of AP streams associated with this circuit. */
   connection_t *p_streams;
-  /** The next stream_id that will be tried when we're attempting to
-   * construct a new AP stream originating at this circuit. */
-  uint16_t next_stream_id;
   /** Build state for this circuit. It includes the intended path
    * length, the chosen exit router, rendezvous information, etc.
    */
@@ -1155,6 +1152,10 @@ typedef struct origin_circuit_t {
    */
   char rend_query[REND_SERVICE_ID_LEN+1];
 
+  /** The next stream_id that will be tried when we're attempting to
+   * construct a new AP stream originating at this circuit. */
+  uint16_t next_stream_id;
+
 } origin_circuit_t;
 
 typedef struct or_circuit_t {