aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-02-03 13:56:19 -0500
committerNick Mathewson <nickm@torproject.org>2014-02-03 13:56:19 -0500
commit5991f9a15646d53b838562fd1424b6a8fd9ef614 (patch)
tree800e54ebf294ffa564f05e09b75d605ee13a55e3 /src/or/or.h
parent00ec6e6af0775cd693e12e56eb6df3cbefe57daa (diff)
downloadtor-5991f9a15646d53b838562fd1424b6a8fd9ef614.tar
tor-5991f9a15646d53b838562fd1424b6a8fd9ef614.tar.gz
TransProxyType replaces TransTPROXY option
I'm making this change now since ipfw will want its own option too, and proliferating options here isn't sensible. (See #10582 and #10267)
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 40fc567f5..b63b1ffcb 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3498,8 +3498,10 @@ 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? */
+ const char *TransProxyType; /**< What kind of transparent proxy
+ * implementation are we using? */
+ /** Parsed value of TransProxyType. */
+ enum { TPT_DEFAULT, TPT_TPROXY } TransProxyType_parsed;
config_line_t *NATDPort_lines; /**< Ports to listen on for transparent natd
* connections. */
config_line_t *ControlPort_lines; /**< Ports to listen on for control