diff options
| author | Andrea Shepard <andrea@torproject.org> | 2012-09-26 11:51:39 -0700 |
|---|---|---|
| committer | Andrea Shepard <andrea@torproject.org> | 2012-10-10 00:43:18 -0700 |
| commit | 8004448635d63fa829d2a836214c42c1609c3f01 (patch) | |
| tree | b3bde2dd719f6cb57c15eca91c976767f41af672 /src/or/or.h | |
| parent | c3ebd0340cca67dc4dd44bd18849100ebba39051 (diff) | |
| download | tor-8004448635d63fa829d2a836214c42c1609c3f01.tar.gz tor-8004448635d63fa829d2a836214c42c1609c3f01.zip | |
Handle n_mux/p_mux properly in circuitmux.c
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index 3555a08c71..a0fcf8f490 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2650,7 +2650,7 @@ typedef struct circuit_t { * Circuit mux associated with n_chan to which this circuit is attached; * NULL if we have no n_chan. */ - circuitmux_t *mux; + circuitmux_t *n_mux; /** Queue of cells waiting to be transmitted on n_chan */ cell_queue_t n_chan_cells; @@ -2916,6 +2916,11 @@ typedef struct or_circuit_t { cell_queue_t p_chan_cells; /** The channel that is previous in this circuit. */ channel_t *p_chan; + /** + * Circuit mux associated with p_chan to which this circuit is attached; + * NULL if we have no p_chan. + */ + circuitmux_t *p_mux; /** Linked list of Exit streams associated with this circuit. */ edge_connection_t *n_streams; /** Linked list of Exit streams associated with this circuit that are |