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
Bug 5809
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
Nick Mathewson
582f2187a7
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-13 10:08:51 -04:00
Robert Ransom
0a6480cdd0
Avoid undefined behaviour when parsing HS protocol versions
...
Fixes bug 6827; bugfix on c58675ca72
(when the v2 HS desc parser was implemented).
Found by asn.
2012-09-13 07:48:21 -04:00
Nick Mathewson
a73dec16c5
Merge branch 'bug6815'
2012-09-12 16:28:59 -04:00
Nick Mathewson
19136f6f11
Fix a wide line
2012-09-12 16:28:46 -04:00
Nick Mathewson
35e19b9498
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-12 11:11:16 -04:00
Nick Mathewson
1f5a7917f5
Merge remote-tracking branch 'public/bug6341_a_v2' into maint-0.2.3
2012-09-12 11:10:59 -04:00
Nick Mathewson
5cbeb60805
Fix directory self-testing logic
...
When I removed version_supports_begindir, I accidentally removed the
mechanism we had been using to make a directory cache self-test its
directory port. This caused bug 6815, which caused 6814 (both in
0.2.4.2-alpha).
To fix this bug, I'm replacing the "anonymized_connection" argument to
directory_initiate_command_* with an enumeration to say how indirectly
to connect to a directory server. (I don't want to reinstate the
"version_supports_begindir" argument as "begindir_ok" or anything --
these functions already take too many arguments.)
For safety, I made sure that passing 0 and 1 for 'indirection' gives
the same result as you would have gotten before -- just in case I
missed any 0s or 1s.
2012-09-12 10:26:59 -04:00
Nick Mathewson
75c9ccd4f8
Merge remote-tracking branch 'public/bug6538'
...
Conflicts:
configure.ac
2012-09-11 17:51:36 -04:00
Nick Mathewson
f8a665c87d
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-11 13:21:20 -04:00
Nick Mathewson
5833861f62
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
...
Conflicts:
src/test/test_util.c
2012-09-11 13:20:15 -04:00
Nick Mathewson
973c18bf0e
Fix assertion failure in tor_timegm.
...
Fixes bug 6811.
2012-09-11 13:13:07 -04:00
Roger Dingledine
d85b563dbb
Merge branch 'maint-0.2.3'
2012-09-10 18:25:57 -04:00
Nick Mathewson
bf71866da0
Merge branch 'remove_old_ver_checks'
2012-09-10 15:37:13 -04:00
Nick Mathewson
4319f99828
Merge remote-tracking branch 'public/ticket6789'
2012-09-10 15:31:04 -04:00
Nick Mathewson
8731a4e148
Avoid segfault when reading state file from ancient tor
...
If s_values is null in rep_hist_load_bwhist_state_section, we would
call smartlist_len() on it, and die.
Fixes bug 6801.
2012-09-10 10:35:18 -04:00
Nick Mathewson
cb8f64cdc8
Fix tab introduced in f43946829c
2012-09-10 10:22:40 -04:00
Nick Mathewson
0ab7716b9e
Merge remote-tracking branch 'linus/bug6797'
2012-09-10 10:19:57 -04:00
Nick Mathewson
20e0e7d9d1
Rename _UseFilteringSSLBufferevents to lose its _. Bug 3155
2012-09-10 10:09:19 -04:00
meejah
f43946829c
Hide options beginning with "___" from GETINFO config/names
2012-09-10 09:51:31 -04:00
meejah
65838f4883
rename _UsingTestNetworkDefaults to start with triple-underscore
2012-09-10 09:50:24 -04:00
Roger Dingledine
e1e34ee4e4
raise bandwidthrate/bandwidthburst to a new "infinite"
...
addresses bug 6605.
2012-09-10 03:03:06 -04:00
Linus Nordberg
93ee62297f
Don't follow the NULL pointer.
...
If dirvote_create_microdescriptor() returns NULL, don't use md.
Found by "f. tp.".
Fixes bug 6797.
2012-09-10 00:43:48 +02:00
Roger Dingledine
f6639d5676
finish backing out 5492de76
2012-09-09 16:51:34 -04:00
Roger Dingledine
67abdcd8d9
minor logging improvement
2012-09-09 15:54:59 -04:00
Nick Mathewson
e8b09c0d51
Remove one more check for an insanely old version
2012-09-07 23:23:49 -04:00
Nick Mathewson
7988596f66
Remove version_supports checks for versions before 0.2.2.
2012-09-07 23:21:18 -04:00
Nick Mathewson
26cee96911
Dirservers no longer accept tors released before December 2011.
...
Implements ticket 6789.
2012-09-07 11:15:23 -04:00
Nick Mathewson
3fe2161d28
Merge remote-tracking branch 'asn/bug6788'
2012-09-07 10:51:38 -04:00
George Kadianakis
14f4a5da45
Remove redundant declaration of find_transport_name_by_bridge_addrport().
2012-09-07 17:44:53 +03:00
Roger Dingledine
9446efc0df
a debugging log line that just helped me
2012-09-07 03:04:15 -04:00
Nick Mathewson
f4cf279eb5
Rename extend_info_alloc() --> _new()
...
Based on a patch from Linus, regenerated so as to not conflict with
Linus's 5535/6363 patches.
2012-09-06 11:38:32 -04:00
Linus Nordberg
09c84b50e7
Rename packed_cell_alloc() --> _new().
2012-09-06 11:37:00 -04:00
Linus Nordberg
3327a0a61c
Rename config_alloc() --> _new().
2012-09-06 11:37:00 -04:00
Nick Mathewson
1ca9e2685f
Merge branch 'quiet_lib_versions_squashed'
2012-09-06 11:32:09 -04:00
Nick Mathewson
e3a130a7eb
Don't log about Libevent/OpenSSL initialization when all's well
...
OTOH, log the Libevent and OpenSSL versions on the first line when
we're starting Tor.
2012-09-06 11:31:22 -04:00
Nick Mathewson
ad1e8b45df
Merge branch 'bug6778'
2012-09-06 11:05:16 -04:00
Nick Mathewson
30fe9080e7
Fix a dependency: micro-revision.i influences tor_main.o, not tor_main.c
2012-09-06 11:00:32 -04:00
Nick Mathewson
e9684405ac
Merge remote-tracking branch 'asn/bug4567_rebased'
2012-09-06 10:12:28 -04:00
Nick Mathewson
deee0b67c3
Merge remote-tracking branch 'asn/bug6765'
2012-09-06 10:12:11 -04:00
Nick Mathewson
91fed2c703
Fix a build-warning when building out-of-tree
...
We were trying to incorporate all headers in common_sha1.i, not just
the src/common ones.
This is part of bug 6778; fix on 0.2.4.1-alpha
2012-09-06 09:56:48 -04:00
Roger Dingledine
00120544a4
fix punctuation in logs
2012-09-06 01:35:05 -04:00
Nick Mathewson
5d679caa32
Fix warning when implicitly casting strlen(microdesc) to int
...
Harmless unless we somehow generate a microdesc of more than INT_MAX
bytes.
2012-09-05 20:49:25 -04:00
George Kadianakis
8284c2bcba
Use tor_malloc_zero() in var_cell_new().
...
This is just a precaution; we seem to be using var_cell_t.payload and
var_cell_t.payload_len correctly at the moment.
2012-09-06 01:22:32 +03:00
Roger Dingledine
b00b8272da
make AuthDirHasIPv6Connectivity match the man page
...
we can turn it into an autobool later if we have some way for it
to make a decision.
(patch possibly got lost when nickm merged #6770 ; or maybe nickm meant
for it to be this way. i'm not sure.)
2012-09-05 18:17:41 -04:00
Nick Mathewson
f8c1ab7bbf
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-05 16:25:13 -04:00
Linus Nordberg
0770e4ccdb
Whitespace fixes.
2012-09-05 19:40:15 +02:00
Nick Mathewson
9d9ca264ec
Avoid segfault if EntryGuardPathBias precedes EntryGuard
...
Fix for bug 6774; bugfix on 0.2.3.17-beta.
2012-09-05 13:27:54 -04:00
George Kadianakis
4edc57caa5
Figure out ORPort and DirPort even when 'auto' is used.
...
Use router_get_advertised_{dir,or}_port() functions instead of
get_primary_{dir,or}_port().
2012-09-05 20:17:25 +03:00
Nick Mathewson
116c8409ba
Merge remote-tracking branch 'linus/bug6770_3'
...
Conflicts:
doc/tor.1.txt
src/or/config.c
2012-09-05 11:35:26 -04:00
George Kadianakis
44fe717524
General tweaks and fixes for Nick's comments.
...
* Add changes/ files.
* Edit the tor-fw-helper manpage.
* Fix check-spaces.
* Add prototype for get_list_of_ports_to_forward().
* Fix tor_parse_long() TCP port range.
* Improve doc. of tor_check_port_forwarding().
* Check for overflows in tor_check_port_forwarding().
* Demote successful port forwarding to LOG_INFO.
Conflicts:
src/common/address.c
src/or/circuitbuild.c
2012-09-05 18:23:28 +03:00
George Kadianakis
443260ffd8
Tweak code and pump the tor-fw-helper version.
...
Conflicts:
src/or/circuitbuild.h
2012-09-05 18:09:45 +03:00
George Kadianakis
da16c425ef
Start passing ports to tor_check_port_forwarding().
...
Conflicts:
src/or/transports.c
2012-09-05 18:08:18 +03:00
George Kadianakis
cd05f35d2c
Refactor tor to support the new tor-fw-helper protocol.
...
Add handle_fw_helper_output(), a function responsible for parsing the
output of tor-fw-helper. Refactor tor_check_port_forwarding() and
run_scheduled_events() accordingly too.
We now issue warnings when we get control output from tor-fw-helper,
and we log the verbose output of tor-fw-helper in LOG_INFO.
Conflicts:
src/common/util.c
2012-09-05 18:04:34 +03:00
George Kadianakis
64b2a64310
Use get_lines_from_handle() in configure_proxy().
2012-09-05 18:02:27 +03:00
Linus Nordberg
f7c97cd40b
Remove AuthDirPublishIPv6 and let AuthDirHasIPv6Connectivity fill its function.
...
See #4771 for rationale.
Note that this patch does not take suggested changes in #4470 into
account and keeps treating AuthDirHasIPv6Connectivity as an
AUTOBOOL. Thus, bug fixes for that are included here as well.
This is a fix on master, unreleased as of now.
2012-09-05 13:35:39 +02:00
Linus Nordberg
0e53742a85
Make AuthDirHasIPv6Connectivity a BOOL.
...
This is a fix of unreleased tor. It solves ticket #6770 .
2012-09-05 12:47:01 +02:00
Roger Dingledine
67065c3c06
minor typos i found while constructing the changelog
2012-09-05 04:46:27 -04:00
Nick Mathewson
4d87919ba6
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-04 18:34:39 -04:00
Nick Mathewson
acfd487e7d
Merge remote-tracking branch 'arma/bug6743' into maint-0.2.3
2012-09-04 18:33:56 -04:00
Nick Mathewson
d7a646edcf
Merge branch 'bug5535_only_rebased'
2012-09-04 18:24:20 -04:00