From 58f801fadf56dcd72c922a6934b166b7651d14d1 Mon Sep 17 00:00:00 2001 From: Robert Ransom Date: Fri, 24 Jun 2011 11:28:15 -0700 Subject: [PATCH 1/2] Store cpath_build_state_t flags in one-bit bitfields, not ints --- src/or/or.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 7daf195265..31f9e5be4e 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2192,15 +2192,15 @@ typedef struct { /** How to extend to the planned exit node. */ extend_info_t *chosen_exit; /** Whether every node in the circ must have adequate uptime. */ - int need_uptime; + unsigned int need_uptime : 1; /** Whether every node in the circ must have adequate capacity. */ - int need_capacity; + unsigned int need_capacity : 1; /** Whether the last hop was picked with exiting in mind. */ - int is_internal; + unsigned int is_internal : 1; /** Did we pick this as a one-hop tunnel (not safe for other conns)? * These are for encrypted connections that exit to this router, not * for arbitrary exits from the circuit. */ - int onehop_tunnel; + unsigned int onehop_tunnel : 1; /** The crypt_path_t to append after rendezvous: used for rendezvous. */ crypt_path_t *pending_final_cpath; /** How many times has building a circuit for this task failed? */ From 76d0d62bd9ad91c54817f2599305575d9a551f08 Mon Sep 17 00:00:00 2001 From: Robert Ransom Date: Fri, 24 Jun 2011 11:28:52 -0700 Subject: [PATCH 2/2] Correct terminology in comment --- src/or/or.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 31f9e5be4e..d44e863d3c 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2197,8 +2197,8 @@ typedef struct { unsigned int need_capacity : 1; /** Whether the last hop was picked with exiting in mind. */ unsigned int is_internal : 1; - /** Did we pick this as a one-hop tunnel (not safe for other conns)? - * These are for encrypted connections that exit to this router, not + /** Did we pick this as a one-hop tunnel (not safe for other streams)? + * These are for encrypted dir conns that exit to this router, not * for arbitrary exits from the circuit. */ unsigned int onehop_tunnel : 1; /** The crypt_path_t to append after rendezvous: used for rendezvous. */