diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-10-08 12:10:47 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-10-08 12:10:47 -0400 |
| commit | 0c3c47565da970839b3701f60fd310ba059ed8af (patch) | |
| tree | f6e678dd6f423a4dbc3b5fa11200f1094e982149 | |
| parent | 0bec65277abed5567458e94c05c2b94f1b84e460 (diff) | |
| parent | a5f6cb908c32dcf8c7efbde2702b70ccd36e82f0 (diff) | |
| download | tor-0c3c47565da970839b3701f60fd310ba059ed8af.tar tor-0c3c47565da970839b3701f60fd310ba059ed8af.tar.gz | |
Merge remote-tracking branch 'public/bug9596' into maint-0.2.4
| -rw-r--r-- | changes/bug9596 | 4 | ||||
| -rw-r--r-- | src/or/policies.h | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/changes/bug9596 b/changes/bug9596 new file mode 100644 index 000000000..b3d138ecd --- /dev/null +++ b/changes/bug9596 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Correctly log long IPv6 exit policy, instead of truncating them + or reporting an error. Fixes bug 9596; bugfix on 0.2.4.7-alpha. + diff --git a/src/or/policies.h b/src/or/policies.h index c0e7a9efc..facbbb6b5 100644 --- a/src/or/policies.h +++ b/src/or/policies.h @@ -12,10 +12,11 @@ #ifndef TOR_POLICIES_H #define TOR_POLICIES_H -/* (length of "accept 255.255.255.255/255.255.255.255:65535-65535\n" plus a - * NUL.) +/* (length of + * "accept6 [ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]/128:65535-65535\n" + * plus a terminating NUL, rounded up to a nice number.) */ -#define POLICY_BUF_LEN 52 +#define POLICY_BUF_LEN 72 int firewall_is_fascist_or(void); int fascist_firewall_allows_address_or(const tor_addr_t *addr, uint16_t port); |