From: teor (Tim Wilson-Brown) <teor2345@gmail.com>
Date: Tue, 2 Feb 2016 02:32:54 +0000 (+1100)
Subject: Reject multicast rendezvous point addresses
X-Git-Tag: tor-0.2.8.2-alpha~69^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b0ca80c23fede62feefb7ad5e5c8bdf7a732c4c4;p=thirdparty%2Ftor.git

Reject multicast rendezvous point addresses

Unless ExtendAllowPrivateAddresses is 1.
---

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 6a3c16497e..2e91f9440d 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -2409,7 +2409,7 @@ int extend_info_addr_is_allowed(const tor_addr_t *addr)
   tor_assert(addr);
 
   /* Check if we have a private address and if we can extend to it. */
-  if (tor_addr_is_internal(addr, 0) &&
+  if ((tor_addr_is_internal(addr, 0) || tor_addr_is_multicast(addr)) &&
       !get_options()->ExtendAllowPrivateAddresses) {
     goto disallow;
   }