aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorMike Perry <mikeperry-git@torproject.org>2018-09-17 23:31:34 +0000
committerMike Perry <mikeperry-git@torproject.org>2018-09-17 23:31:34 +0000
commit72cef6102845e556cf58636e47f8d411ba19f456 (patch)
treefc6b3a4b72580eaac59f3bc0715da1cc3a0ac44d /src/or/or.h
parenta546e07600151be275e6134407c2bcb833a3dd97 (diff)
parentdd15998d289e849d8524b70f2edeb5a92ece971d (diff)
downloadtor-72cef6102845e556cf58636e47f8d411ba19f456.tar.gz
tor-72cef6102845e556cf58636e47f8d411ba19f456.zip
Merge branch 'bug23512-v4-032' into bug23512-v4-033
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 3c0c2ad613..b9abd6c136 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3027,6 +3027,18 @@ typedef struct testing_cell_stats_entry_t {
} testing_cell_stats_entry_t;
/**
+ * An enum to allow us to specify which channel in a circuit
+ * we're interested in.
+ *
+ * This is needed because our data structures and other fields
+ * for channel delivery are disassociated from the channel.
+ */
+typedef enum {
+ CIRCUIT_N_CHAN = 0,
+ CIRCUIT_P_CHAN = 1
+} circuit_channel_direction_t;
+
+/**
* A circuit is a path over the onion routing
* network. Applications can connect to one end of the circuit, and can
* create exit connections at the other end of the circuit. AP and exit