diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-16 23:03:41 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-16 23:03:41 -0400 |
| commit | 973661394abc393e3dfd5b82de86659ecadc72a4 (patch) | |
| tree | 01656cbb45711c0c8800786c386d65c1f1e24c01 /src/or/or.h | |
| parent | 211b8cc31846e2d2ba75f19ab9f319f18cb70cfb (diff) | |
| parent | f9719b078141fb1a4a0eee281031c73cffde7c30 (diff) | |
| download | tor-973661394abc393e3dfd5b82de86659ecadc72a4.tar.gz tor-973661394abc393e3dfd5b82de86659ecadc72a4.zip | |
Merge branch '10267_plus_10896_rebased_twice'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index 19a1c99a9b..4ca7ecc605 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3473,7 +3473,12 @@ typedef struct { const char *TransProxyType; /**< What kind of transparent proxy * implementation are we using? */ /** Parsed value of TransProxyType. */ - enum { TPT_DEFAULT, TPT_TPROXY } TransProxyType_parsed; + enum { + TPT_DEFAULT, + TPT_PF_DIVERT, + TPT_IPFW, + 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 |