[tor-commits] [tor/master] Reject multicast rendezvous point addresses

[nickm at torproject.org]

commit b0ca80c23fede62feefb7ad5e5c8bdf7a732c4c4
Author: teor (Tim Wilson-Brown) <teor2345 at gmail.com>
Date:   Tue Feb 2 13:32:54 2016 +1100

    Reject multicast rendezvous point addresses
    
    Unless ExtendAllowPrivateAddresses is 1.
---
 src/or/circuitbuild.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 6a3c164..2e91f94 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;
   }