aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorMike Perry <mikeperry-git@torproject.org>2018-09-17 23:12:45 +0000
committerMike Perry <mikeperry-git@torproject.org>2018-09-17 23:12:45 +0000
commit36e81e1f59581f1dbc29ab44585a202463a99054 (patch)
treedf087eeebb2a058ee7755a115a55314496ab1bc1 /src/or/or.h
parent0971b3ce4d03929ef09838209ab87de4f9dfcf1f (diff)
parent6af352172d3dbf1571c8cb62cd0a618f4e2355d1 (diff)
downloadtor-36e81e1f59581f1dbc29ab44585a202463a99054.tar.gz
tor-36e81e1f59581f1dbc29ab44585a202463a99054.zip
Merge branch 'bug23512-v4-029' into bug23512-v4-032
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 5128fd2197..e851672752 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2999,6 +2999,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