aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorRobert Ransom <rransom.8774@gmail.com>2012-09-11 13:00:05 -0700
committerNick Mathewson <nickm@torproject.org>2012-10-19 02:56:25 -0400
commitd3bfdd6108d084c77f60b16319f6ef24ac447373 (patch)
tree060607817555c9c740826bbf81d7b156ac780f28 /src/or
parenta0e9dc9f55a452d78d9d16b4a2fc7d57dafa0409 (diff)
downloadtor-d3bfdd6108d084c77f60b16319f6ef24ac447373.tar
tor-d3bfdd6108d084c77f60b16319f6ef24ac447373.tar.gz
Don't serve or accept v2 HS descs over a DirPort
(changes file tweaked by nickm)
Diffstat (limited to 'src/or')
-rw-r--r--src/or/directory.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/directory.c b/src/or/directory.c
index f1510b970..f235bf3b4 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -3178,6 +3178,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
}
if (options->HidServDirectoryV2 &&
+ connection_dir_is_encrypted(conn) &&
!strcmpstart(url,"/tor/rendezvous2/")) {
/* Handle v2 rendezvous descriptor fetch request. */
const char *descp;
@@ -3364,6 +3365,7 @@ directory_handle_command_post(dir_connection_t *conn, const char *headers,
/* Handle v2 rendezvous service publish request. */
if (options->HidServDirectoryV2 &&
+ connection_dir_is_encrypted(conn) &&
!strcmpstart(url,"/tor/rendezvous2/publish")) {
switch (rend_cache_store_v2_desc_as_dir(body)) {
case -2: