[or-cvs] r6907 at Kushana: nickm | 2006-07-25 19:03:43 -0400 Realign ci (r6905 in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2006-07-26 15:07:23 -0400 (Wed, 26 Jul 2006)
New Revision: 6905

Modified:
   tor/trunk/
   tor/trunk/src/or/or.h
Log:
 r6907 at Kushana:  nickm | 2006-07-25 19:03:43 -0400
 Realign circuit structs to avoid wasted space.



Property changes on: tor/trunk
___________________________________________________________________
Name: svk:merge
   - c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/oo-connections:6903
   + c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/oo-connections:6907

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2006-07-26 19:05:41 UTC (rev 6904)
+++ tor/trunk/src/or/or.h	2006-07-26 19:07:23 UTC (rev 6905)
@@ -1077,10 +1077,10 @@
   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 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;
-  /** The port for the OR that is next in this circuit. */
-  uint16_t n_port;
   /** 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 @@
 
   /** 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 @@
    */
   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 {