Nick Mathewson
03e4b5a9d7
Merge remote-tracking branch 'linus/bug6757'
2012-10-04 10:31:25 -04:00
Nick Mathewson
d9847165e0
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-10-04 10:05:55 -04:00
Roger Dingledine
10b43f4c46
pass the reason from the truncated cell to the controller
...
(rather than just always declaring that the reason is
END_CIRC_REASON_OR_CONN_CLOSED)
resolves bug 7039.
2012-10-03 23:56:34 -04:00
Roger Dingledine
e50fa0d6cb
Refuse extra create cells with reason "resource limit"
...
In the past we had used reason "internal", which is more vague than
it needs to be. Resolves bug 7037.
2012-10-03 20:17:37 -04:00
Roger Dingledine
b1971d89c8
properly free the return values of rate_limit_log()
...
resolves bug 7022.
2012-10-03 13:15:27 -04:00
Roger Dingledine
05f6f8f26d
actually use the rate-limiting string
...
previously we just allocated the string and then freed it.
2012-10-03 13:03:09 -04:00
Roger Dingledine
65e85dba1b
reformat; no actual changes
2012-10-02 21:03:01 -04:00
Roger Dingledine
0ca47825a7
and make the last commit compile
2012-10-02 20:50:57 -04:00
Nick Mathewson
78e8eb5f2d
Fix compilation error left over from 1cbf45bed1. (Bug 7021)
2012-10-02 20:48:30 -04:00
Roger Dingledine
57b13ad5cc
more consistently use [gs]et_uint8
2012-10-02 20:39:58 -04:00
Nick Mathewson
a80d8e09d3
The --version option should imply --quiet.
...
Patch from 'maker'.
2012-10-01 11:01:18 -04:00
Nick Mathewson
f128baf36c
Add missing declaration so 6876 compiles
2012-09-28 12:03:37 -04:00
Nick Mathewson
5f494a363a
Merge remote-tracking branch 'linus/enh6876_2'
2012-09-28 11:57:36 -04:00
Nick Mathewson
95d9f7e9cc
Merge remote-tracking branch 'rransom/warn-about-hses-without-guards'
2012-09-25 12:39:00 -04:00
Roger Dingledine
dc014c9747
Merge branch 'maint-0.2.3'
2012-09-22 09:31:09 -04:00
Roger Dingledine
c88a4c51b4
add faravahar as our ninth v3 dir auth
2012-09-22 09:10:37 -04:00
Nick Mathewson
9d4c53534d
Remove the testing_since* fields
...
They weren't actually used since 7a35dad00
2012-09-21 22:05:09 -04:00
Nick Mathewson
b7fdb3a927
add changes file and whitespace fixes for bug 4020
2012-09-21 19:48:38 -04:00
Tom Fitzhenry
655782f302
Reinstate address in warning message when binding non-locally
...
bug4020
Signed-off-by: Tom Fitzhenry <tom@tom-fitzhenry.me.uk>
2012-09-21 19:44:49 -04:00
Linus Nordberg
613079fbc4
Don't leak msg when parse_virtual_addr_network() fails.
2012-09-20 17:15:15 +02:00
Linus Nordberg
1cbf45bed1
Make option OutboundBindAddress accept IPv6 addresses too.
...
Implements ticket 6786.
2012-09-20 17:09:25 +02:00
Linus Nordberg
ce553d4982
Have node_get_pref_orport() return an IPv6 OR port when UseBridges is set.
...
We used to never return an IPv6 address unless ClientUseIPv6 was
set. We should allow clients running with bridges use IPv6 OR ports
even without setting ClientUseIPv6. Configuring an IPv6 address in a
Bridge line should imply that.
Fixes th second part of #6757 .
2012-09-19 17:18:06 +02:00
Linus Nordberg
9c5ba489d3
Set (and reset) node_t.ipv6_preferred for bridges based on Bridge lines.
...
We used to set it only when ClientPreferIPv6ORPort was set which seems
wrong.
Fixes one part of #6757 .
2012-09-19 17:12:22 +02:00
Robert Ransom
38609f1354
Fix comment typo
2012-09-18 16:50:54 -04:00
Robert Ransom
130e899fbb
Warn if HSes are configured on a client with UseEntryGuards disabled
2012-09-18 16:50:00 -04:00
Robert Ransom
d1c4cf2f5a
Correct comment explaining why tor2web mode should disable entry guards
2012-09-18 16:38:01 -04:00
Mike Perry
acda1735fd
Disable Guard usage for Tor2webMode.
...
Tor2webMode is fingerprintable by hidden services through repeated
usage of the same three guard nodes for its rend and intro points.
2012-09-18 16:21:35 -04:00
Nick Mathewson
704fd8bb02
Bump bug 6866 log messages back up to notice for 0.2.4
2012-09-18 16:21:24 -04:00
Nick Mathewson
920c76a2fc
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-18 16:20:01 -04:00
Nick Mathewson
aca325eb0c
Whitespace fixes
2012-09-18 16:16:17 -04:00
Linus Nordberg
a989dbc3dc
Print the correct address family in log printout.
...
Look at the address family of the preferred OR port rather than the
node.ipv6_preferred flag since the logic has changed with new
ClientUseIPv6 config option.
Fixes ticket 6884.
2012-09-18 14:41:14 +02:00
Mike Perry
4bfed4378d
Bug 6866: Convert pathbias asserts into log messages.
...
Asserts were hit by Tor2Web mode.
2012-09-17 18:25:28 -07:00
Nick Mathewson
5dfec9f833
Merge remote-tracking branch 'linus/bug6880'
2012-09-17 16:05:09 -04:00
Linus Nordberg
bee1e46bd1
Don't do reachability testing over IPv6 unless AuthDirPublishIPv6 is set.
...
This affects both directory authorities and bridge authoritites.
2012-09-17 22:01:58 +02:00
Robert Ransom
62babcaf0a
Implement and use crypto_pk_eq_keys
2012-09-17 11:02:53 -04:00
Nick Mathewson
32d9cea289
Merge remote-tracking branch 'public/bug6853'
2012-09-17 10:50:48 -04:00
Nick Mathewson
96d2a21683
Avoid sign-extending when computing rend auth type.
...
Right-shifting negative values has implementation-defined behavior.
On all the platforms we work on right now, the behavior is to
sign-extend the input. That isn't what we wanted in
auth_type_val = (descriptor_cookie_tmp[16] >> 4) + 1;
Fix for 6861; bugfix on 0.2.1.5-alpha; reported pseudonymously.
The broken behavior didn't actually hurt anything, I think, since the
only way to get sign-extension to happen would be to have the top bit
of descriptor_cookie_tmp[16] set, which would make the value of
descriptor_cookie_tmp[16] >> 4 somewhere between 0b11111111 and
0b11111000 (that is, between -1 and -8). So auth_type_val would be
between -7 and 0. And the immediate next line does:
if (auth_type_val < 1 || auth_type_val > 2) {
So the incorrectly computed auth_type_val would be rejected as
invalid, just as a correctly computed auth_type_val would be.
Still, this stuff shouldn't sit around the codebase.
2012-09-17 10:28:14 -04:00
Nick Mathewson
414adb237b
Parse votes with >31 flags correctly
...
We were doing (1<<p) to generate a flag at position p, but we should
have been doing (U64_LITERAL(1)<<p).
Fixes bug 6861; bugfix on 0.2.0.3-alpha; reported pseudonymously.
2012-09-17 10:24:52 -04:00
Nick Mathewson
c2c6d12a81
Move functions for seeing if we know enough nodes into nodelist
2012-09-14 10:20:01 -04:00
Nick Mathewson
725d3a32bd
Remove router_get_by_{nickname,hexdigest} entirely
2012-09-14 10:20:00 -04:00
Nick Mathewson
5161a52c66
Remove the old disabled router_get_by_nickname implementation
2012-09-14 10:20:00 -04:00
Nick Mathewson
ba21ebc6d8
Move many of the node_ functions from routerlist to nodelist
2012-09-14 10:20:00 -04:00
Nick Mathewson
d995dc8bac
Split the routerset code out of routerlist.c
2012-09-14 10:20:00 -04:00
Nick Mathewson
286e95f0a5
Merge branch 'bug6833'
2012-09-14 10:10:23 -04:00
Nick Mathewson
68caa834f4
document why we only allow 64 flags in votes
2012-09-14 10:10:16 -04:00
Nick Mathewson
e4ce8cd969
Fix compilation with older gccs
...
They don't like to have #preprocessor directives inside macro arguments.
Fixes #6842 ; fix on 0.2.4.2-alpha.
Found by grarpamp.
2012-09-14 10:06:00 -04:00
Nick Mathewson
7d11952bf4
Split the or_state_t portions of config.c into their own file
2012-09-13 12:20:26 -04:00
Nick Mathewson
2eb2536c0a
Remove all remaining spurious or_options_t invocations in confparse.c
2012-09-13 12:20:25 -04:00
Nick Mathewson
7627b2c187
Split the generic config_fmt_t code into a new confparse.c file
...
This helps us split up one of our larger files, and sets the stage
for refactoring the configuration backend a little
2012-09-13 12:20:25 -04:00
Nick Mathewson
c8b98ba41c
Reject votes (not consensuses) with >64 known-flags
...
Our flag voting code needs to handle unrecognized flags, so it stores
them in a 64-bit bitfield. But we never actually checked for too many
flags, so we were potentially doing stuff like U64_LITERAL(1)<<flagnum
with flagnum >= 64. That's undefined behavior.
Fix for bug 6833; bugfix on 0.2.0.1-alpha.
2012-09-13 11:45:05 -04:00
