diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-12-15 13:19:18 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-12-15 13:19:18 -0500 |
| commit | aa4be914f06baa92857de201a212b9fc9856bdb1 (patch) | |
| tree | 871c34479c39553c605eb5d8460aa9fc19bfe34c /src/or/or.h | |
| parent | 125e0c7022fa0bf7ac4d09e0a5a07db63bf529ea (diff) | |
| parent | 60fc2b25392796ad7c42ee16f43b9b5787ad30ad (diff) | |
| download | tor-aa4be914f06baa92857de201a212b9fc9856bdb1.tar.gz tor-aa4be914f06baa92857de201a212b9fc9856bdb1.zip | |
Merge remote-tracking branch 'teor/feature17327-v4'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index 68811e8e4d..e92a4bba39 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -5118,9 +5118,11 @@ typedef struct dir_server_t { char *description; char *nickname; char *address; /**< Hostname. */ + tor_addr_t ipv6_addr; /**< IPv6 address if present; AF_UNSPEC if not */ uint32_t addr; /**< IPv4 address. */ uint16_t dir_port; /**< Directory port. */ uint16_t or_port; /**< OR port: Used for tunneling connections. */ + uint16_t ipv6_orport; /**< OR port corresponding to ipv6_addr. */ double weight; /** Weight used when selecting this node at random */ char digest[DIGEST_LEN]; /**< Digest of identity key. */ char v3_identity_digest[DIGEST_LEN]; /**< Digest of v3 (authority only, |