nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.7'

Browse Source
This commit is contained in:
Nick Mathewson 2015-12-08 08:45:09 -05:00
commit 1321608786
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug16056 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (relay, IPv6):
- When displaying an IPv6 exit policy, include the mask bits correctly
even when the number is greater than 31. Fixes bug 16056; bugfix on
0.2.4.7-alpha. Patch from "gturner".

6
src/or/policies.c
View File

@ -1530,9 +1530,9 @@ policy_write_item(char *buf, size_t buflen, addr_policy_t *policy,
if (result < 0) if (result < 0)
return -1; return -1;
written += strlen(buf); written += strlen(buf);
/* If the maskbits is 32 we don't need to give it. If the mask is 0, /* If the maskbits is 32 (IPv4) or 128 (IPv6) we don't need to give it. If
* we already wrote "*". */ the mask is 0, we already wrote "*". */
if (policy->maskbits < 32 && policy->maskbits > 0) { if (policy->maskbits < (is_ip6?128:32) && policy->maskbits > 0) {
if (tor_snprintf(buf+written, buflen-written, "/%d", policy->maskbits)<0) if (tor_snprintf(buf+written, buflen-written, "/%d", policy->maskbits)<0)
return -1; return -1;
written += strlen(buf+written); written += strlen(buf+written);