aboutsummaryrefslogtreecommitdiff
path: root/src/core/or/or.h
diff options
context:
space:
mode:
authorMike Perry <mikeperry-git@torproject.org>2018-09-18 00:17:14 +0000
committerMike Perry <mikeperry-git@torproject.org>2018-09-18 00:17:14 +0000
commit8a83c4b61397a5923257746f5b06418f8aef9959 (patch)
tree072676829b51d4e6857e54803e1ff2d9961bb418 /src/core/or/or.h
parentaebc98d58c12065b2fc831f4cb8d3c715f1ed592 (diff)
parentad10cafd9f0157e6aaa6f1f68ab7d3ef9b8b1b2e (diff)
downloadtor-8a83c4b61397a5923257746f5b06418f8aef9959.tar.gz
tor-8a83c4b61397a5923257746f5b06418f8aef9959.zip
Merge branch 'bug23512-v4-033' into bug23512-v4-master
Diffstat (limited to 'src/core/or/or.h')
-rw-r--r--src/core/or/or.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/core/or/or.h b/src/core/or/or.h
index eae0270124..4d8b6d7871 100644
--- a/src/core/or/or.h
+++ b/src/core/or/or.h
@@ -477,6 +477,18 @@ typedef enum {
CELL_DIRECTION_OUT=2, /**< The cell is moving away from the origin. */
} cell_direction_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;
+
/** Initial value for both sides of a circuit transmission window when the
* circuit is initialized. Measured in cells. */
#define CIRCWINDOW_START 1000