nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Realign circuit structs to avoid wasted space.


svn:r6905
This commit is contained in:
Nick Mathewson 2006-07-26 19:07:23 +00:00
parent e61d28dfb8
commit 18771e851f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/or/or.h
View File

@ -1077,10 +1077,10 @@ typedef struct circuit_t {
char n_conn_id_digest[DIGEST_LEN]; char n_conn_id_digest[DIGEST_LEN];
/** The circuit_id used in the next (forward) hop of this circuit. */ /** The circuit_id used in the next (forward) hop of this circuit. */
uint16_t n_circ_id; 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. */ /** The port for the OR that is next in this circuit. */
uint16_t n_port; 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) /** How many relay data cells can we package (read from edge streams)
* on this circuit before we receive a circuit-level sendme cell asking * on this circuit before we receive a circuit-level sendme cell asking
* for more? */ * for more? */
@ -1122,9 +1122,6 @@ typedef struct origin_circuit_t {
/** Linked list of AP streams associated with this circuit. */ /** Linked list of AP streams associated with this circuit. */
connection_t *p_streams; 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 /** Build state for this circuit. It includes the intended path
* length, the chosen exit router, rendezvous information, etc. * 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]; 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; } origin_circuit_t;
typedef struct or_circuit_t { typedef struct or_circuit_t {