diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-10-08 12:11:37 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-10-08 12:11:37 -0400 |
| commit | 5e0404265fd0e1f297b4b587419870fcd58a9d7c (patch) | |
| tree | b3111fc02e7562d4edf8fe3b301832ee5dca7e91 | |
| parent | 63234b183963054b01f71fa8e318add0a640cea8 (diff) | |
| parent | 0c3c47565da970839b3701f60fd310ba059ed8af (diff) | |
| download | tor-5e0404265fd0e1f297b4b587419870fcd58a9d7c.tar.gz tor-5e0404265fd0e1f297b4b587419870fcd58a9d7c.zip | |
Merge remote-tracking branch 'origin/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 0000000000..b3d138ecdc --- /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 c0e7a9efce..facbbb6b5a 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); |