aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-02-02 15:48:27 -0500
committerNick Mathewson <nickm@torproject.org>2014-02-02 15:48:27 -0500
commitcac5949697ba1686fd3c5f3b17960273815a6a93 (patch)
tree2e8f2994ae0853076d54ed71f9dee2171861f451 /src/or/or.h
parent4fe253ef40a96dbfb978752e9d2833e8b491ca28 (diff)
parent25f0eb4512a57e305ed0bff00eb276812a7c8de6 (diff)
downloadtor-cac5949697ba1686fd3c5f3b17960273815a6a93.tar
tor-cac5949697ba1686fd3c5f3b17960273815a6a93.tar.gz
Merge branch 'feature_10582'
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 7df6c37f7..55f286208 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3553,6 +3553,8 @@ typedef struct {
config_line_t *SocksPort_lines;
/** Ports to listen on for transparent pf/netfilter connections. */
config_line_t *TransPort_lines;
+ int TransTPROXY; /** < Boolean: are we going to listen for all destinations
+ * on the TransPort_lines are required for TPROXY? */
config_line_t *NATDPort_lines; /**< Ports to listen on for transparent natd
* connections. */
config_line_t *ControlPort_lines; /**< Ports to listen on for control