aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-12-07 10:23:30 -0500
committerNick Mathewson <nickm@torproject.org>2015-12-07 10:23:30 -0500
commit79fdfd52313cfb4032d70cf668da8060220a580a (patch)
tree5b500b80778d7bf9cbeb2042ec60610bf282dd51 /src/or
parentf727ebcba8f77e2863d78f1d7c0dd34eae3be699 (diff)
parent021958934f02919eabca884f935cb27a013b4ab9 (diff)
downloadtor-79fdfd52313cfb4032d70cf668da8060220a580a.tar.gz
tor-79fdfd52313cfb4032d70cf668da8060220a580a.zip
Merge remote-tracking branch 'teor/exitpolicy-multicast'
Diffstat (limited to 'src/or')
-rw-r--r--src/or/policies.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/policies.c b/src/or/policies.c
index 126ba465df..943b0c4492 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -907,7 +907,8 @@ addr_policy_append_reject_addr(smartlist_t **dest, const tor_addr_t *addr)
static int
tor_addr_is_public_for_reject(const tor_addr_t *addr)
{
- return !tor_addr_is_null(addr) && !tor_addr_is_internal(addr, 0);
+ return (!tor_addr_is_null(addr) && !tor_addr_is_internal(addr, 0)
+ && !tor_addr_is_multicast(addr));
}
/* Add "reject <b>addr</b>:*" to <b>dest</b>, creating the list as needed.