diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-09-28 11:57:36 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-09-28 11:57:36 -0400 |
| commit | 5f494a363a725951af884882a472ff4ab2b0a6db (patch) | |
| tree | 0c97d1149f5464c8e5cdd11b4d1c69f1124825be /src/or/or.h | |
| parent | 95d9f7e9cce96d684a1f0279aa82c68d0b6182be (diff) | |
| parent | 1cbf45bed1451997e0815bedca8e816d87e081ce (diff) | |
| download | tor-5f494a363a725951af884882a472ff4ab2b0a6db.tar.gz tor-5f494a363a725951af884882a472ff4ab2b0a6db.zip | |
Merge remote-tracking branch 'linus/enh6876_2'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index 2e2c9f813a..f4e1c5eae0 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3025,7 +3025,11 @@ typedef struct { /** Addresses to bind for listening for control connections. */ config_line_t *ControlListenAddress; /** Local address to bind outbound sockets */ - char *OutboundBindAddress; + config_line_t *OutboundBindAddress; + /** IPv4 address derived from OutboundBindAddress. */ + tor_addr_t _OutboundBindAddressIPv4; + /** IPv6 address derived from OutboundBindAddress. */ + tor_addr_t _OutboundBindAddressIPv6; /** Directory server only: which versions of * Tor should we tell users to run? */ config_line_t *RecommendedVersions; |