aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-10-08 05:53:59 +0000
committerRoger Dingledine <arma@torproject.org>2004-10-08 05:53:59 +0000
commit1a4cb248f390db7a206ae529ae9272b00fcef043 (patch)
tree13474601828dcd50e5814cd82fe162e5378e8a37 /src/or/or.h
parent2bcd0f34f546ae9538a9b95cb5a2b17aaa4dd02f (diff)
downloadtor-1a4cb248f390db7a206ae529ae9272b00fcef043.tar
tor-1a4cb248f390db7a206ae529ae9272b00fcef043.tar.gz
interim commit for http proxy support
svn:r2431
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 5c14e4d69..e8a4355ed 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -894,7 +894,12 @@ typedef struct {
allowed to sign directories. */
struct config_line_t *RendConfigLines; /**< List of configuration lines
* for rendezvous services. */
- char *ContactInfo; /** Contact info to be published in the directory */
+ char *ContactInfo; /**< Contact info to be published in the directory */
+
+ char *HttpProxy; /**< hostname[:port] to use as http proxy, if any */
+ uint32_t HttpProxyAddr; /**< Parsed IPv4 addr for http proxy, if any */
+ uint16_t HttpProxyPort; /**< Parsed port for http proxy, if any */
+
} or_options_t;
/* XXX are these good enough defaults? */