summaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-11-08 16:51:30 -0500
committerNick Mathewson <nickm@torproject.org>2011-11-30 11:55:44 -0500
commit11d5a9f63d85adda25d1227befcebf249107a1bd (patch)
tree65d5ef90fbfe27b421be49053574ddb5e26ee51e /src/or/or.h
parent5f0a8dcd2cfcbafc3deb3a6717808b607a459dac (diff)
downloadtor-11d5a9f63d85adda25d1227befcebf249107a1bd.tar.gz
tor-11d5a9f63d85adda25d1227befcebf249107a1bd.zip
Initial support for simplest use of prop186 or-address lines
This lets a routerinfo_t have a single IPv6 or-address, and adds support for formatting and parsing those lines.
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index c2db88aab6..2adaa2239c 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1722,6 +1722,13 @@ typedef struct {
uint16_t or_port; /**< Port for TLS connections. */
uint16_t dir_port; /**< Port for HTTP directory connections. */
+ /* DOCDOC */
+ /* XXXXX187 Actually these should probably be part of a list of addresses,
+ * not just a special case. Use abstractions to access these; don't do it
+ * directly. */
+ tor_addr_t ipv6_addr;
+ uint16_t ipv6_orport;
+
crypto_pk_env_t *onion_pkey; /**< Public RSA key for onions. */
crypto_pk_env_t *identity_pkey; /**< Public RSA key for signing. */