diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-08-17 12:33:17 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-08-17 12:33:17 -0400 |
| commit | 676f71054f11727fdfa8707979d8c6fe143c9333 (patch) | |
| tree | 682020f063aad9523d69dd7bcea8126c6e46ee91 /src/or/or.h | |
| parent | a74d4182f106b1b89367cf1a640b1140d3d35d2c (diff) | |
| parent | d993b0448508d910be0c26096fe710b13e8af4e7 (diff) | |
| download | tor-676f71054f11727fdfa8707979d8c6fe143c9333.tar.gz tor-676f71054f11727fdfa8707979d8c6fe143c9333.zip | |
Merge remote-tracking branch 'public/bug6507' into maint-0.2.3
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/src/or/or.h b/src/or/or.h index d2cafb545a..908daa61c0 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3033,19 +3033,40 @@ typedef struct { int DirAllowPrivateAddresses; char *User; /**< Name of user to run Tor as. */ char *Group; /**< Name of group to run Tor as. */ - config_line_t *ORPort; /**< Ports to listen on for OR connections. */ - config_line_t *SocksPort; /**< Ports to listen on for SOCKS connections. */ + config_line_t *ORPort_lines; /**< Ports to listen on for OR connections. */ + /** Ports to listen on for SOCKS connections. */ + config_line_t *SocksPort_lines; /** Ports to listen on for transparent pf/netfilter connections. */ - config_line_t *TransPort; - config_line_t *NATDPort; /**< Ports to listen on for transparent natd + config_line_t *TransPort_lines; + config_line_t *NATDPort_lines; /**< Ports to listen on for transparent natd * connections. */ - config_line_t *ControlPort; /**< Port to listen on for control + config_line_t *ControlPort_lines; /**< Ports to listen on for control * connections. */ config_line_t *ControlSocket; /**< List of Unix Domain Sockets to listen on * for control connections. */ + int ControlSocketsGroupWritable; /**< Boolean: Are control sockets g+rw? */ - config_line_t *DirPort; /**< Port to listen on for directory connections. */ - config_line_t *DNSPort; /**< Port to listen on for DNS requests. */ + /** Ports to listen on for directory connections. */ + config_line_t *DirPort_lines; + config_line_t *DNSPort_lines; /**< Ports to listen on for DNS requests. */ + + /** @name port booleans + * + * Derived booleans: True iff there is a non-listener port on an AF_INET or + * AF_INET6 address of the given type configured in one of the _lines + * options above. + * + * @{ + */ + unsigned int ORPort_set : 1; + unsigned int SocksPort_set : 1; + unsigned int TransPort_set : 1; + unsigned int NATDPort_set : 1; + unsigned int ControlPort_set : 1; + unsigned int DirPort_set : 1; + unsigned int DNSPort_set : 1; + /**@}*/ + int AssumeReachable; /**< Whether to publish our descriptor regardless. */ int AuthoritativeDir; /**< Boolean: is this an authoritative directory? */ int V1AuthoritativeDir; /**< Boolean: is this an authoritative directory |