diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-10-30 18:31:30 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-10-30 18:31:30 +0000 |
| commit | 57f7c852f809b9332fc7a52058a24713b1385c14 (patch) | |
| tree | bb4ecf69033a0a2552442999fc1db087a28ea8b8 /src/or/or.h | |
| parent | c0c2001a5b8fd3907c7ba93eccbd536786f57594 (diff) | |
| download | tor-57f7c852f809b9332fc7a52058a24713b1385c14.tar.gz tor-57f7c852f809b9332fc7a52058a24713b1385c14.zip | |
r16282@catbus: nickm | 2007-10-30 14:28:58 -0400
Implement lots of proposal 105. None of it is enabled yet.
svn:r12285
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index de2c742682..20766ac3c4 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -651,6 +651,8 @@ typedef enum { #define CELL_DESTROY 4 #define CELL_CREATE_FAST 5 #define CELL_CREATED_FAST 6 +#define CELL_VERSIONS 7 +#define CELL_NETINFO 8 /** How long to test reachability before complaining to the user. */ #define TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT (20*60) @@ -868,9 +870,14 @@ typedef struct or_connection_t { * recent, we can rate limit it further. */ time_t client_used; + uint32_t real_addr; /**DOCDOC */ + circ_id_type_t circ_id_type:2; /**< When we send CREATE cells along this * connection, which half of the space should * we use? */ + unsigned int is_canonical; /**< DOCDOC */ + uint8_t link_proto; /**< What protocol version are we using? 0 for + * "none negotiated yet." */ uint16_t next_circ_id; /**< Which circ_id do we try to use next on * this connection? This is always in the * range 0..1<<15-1. */ |