diff options
| author | Andrea Shepard <andrea@torproject.org> | 2012-09-21 14:45:32 -0700 |
|---|---|---|
| committer | Andrea Shepard <andrea@torproject.org> | 2012-10-10 00:39:11 -0700 |
| commit | c684076fc7f685d6e0cd97f426d1474749f1da8b (patch) | |
| tree | 38de821cc3bde1d578542294412ee83647cf7527 /src/or/or.h | |
| parent | bddfb9ffa85a0fe73545fb231a0847c4101758c1 (diff) | |
| download | tor-c684076fc7f685d6e0cd97f426d1474749f1da8b.tar.gz tor-c684076fc7f685d6e0cd97f426d1474749f1da8b.zip | |
Add circuitmux.c, circuitmux.h
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index 5987eefd88..87ee7bb7f4 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1016,6 +1016,10 @@ typedef enum { typedef struct channel_tls_s channel_tls_t; +/* circuitmux_t typedef; struct circuitmux_s is in circuitmux.h */ + +typedef struct circuitmux_s circuitmux_t; + /** Parsed onion routing cell. All communication between nodes * is via cells. */ typedef struct cell_t { @@ -2634,7 +2638,14 @@ typedef struct circuit_t { cell_queue_t n_chan_cells; /** The channel that is next in this circuit. */ channel_t *n_chan; - /** The circuit_id used in the next (forward) hop of this circuit. */ + + /** + * The circuit_id used in the next (forward) hop of this circuit; + * this is unique to n_chan, but this ordered pair is globally + * unique: + * + * (n_chan->global_identifier, n_circ_id) + */ circid_t n_circ_id; /** The hop to which we want to extend this circuit. Should be NULL if |