Robert Ransom
9648f034c0
Update documentation comment for rend_client_reextend_intro_circuit
...
One of its callers assumes a non-zero result indicates a permanent failure
(i.e. the current attempt to connect to this HS either has failed or is
doomed). The other caller only requires that this function's result
never equal -2.
Bug reported by Sebastian Hahn.
2011-10-10 05:33:53 -07:00
Robert Ransom
274b25de12
Don't launch a useless circuit in rend_client_reextend_intro_circuit
...
Fixes bug 4212. Bug reported by katmagic and found by Sebastian.
2011-10-10 03:05:19 -07:00
Nick Mathewson
19f1d3e331
Merge remote-tracking branch 'origin/maint-0.2.2'
...
This merge is here to take a commit (feature 3951) that we already
have in master, so use "merge -s ours"
2011-10-07 16:49:59 -04:00
Nick Mathewson
f37d24c550
Note ticket and source version for feature3951 in changes file
2011-10-07 16:47:43 -04:00
Nick Mathewson
ca597efb22
Merge remote-tracking branch 'karsten/feature3951' into maint-0.2.2
2011-10-07 16:46:50 -04:00
Nick Mathewson
1ec22eac4b
Merge remote-tracking branch 'public/bug2003_nm'
2011-10-07 16:43:45 -04:00
Nick Mathewson
8b0ee60fe7
reinstate a notice for the non-loopback socksport case
...
Thanks to prop171, it's no longer a crazy thing to do, but you should
make sure that you really meant it!
2011-10-07 16:34:21 -04:00
Nick Mathewson
b49fcc6cf2
Merge remote-tracking branch 'rransom-tor/bug4018'
2011-10-07 16:32:04 -04:00
Nick Mathewson
e8ed465776
Merge remote-tracking branch 'public/bug2430'
2011-10-07 16:28:32 -04:00
Nick Mathewson
ed39621a9d
Merge remote-tracking branch 'asn2/bug3656'
...
Conflicts:
src/common/util.c
src/common/util.h
src/or/config.h
src/or/main.c
src/test/test_util.c
2011-10-07 16:05:13 -04:00
Nick Mathewson
98e5c63eb2
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-10-07 12:20:08 -04:00
warms0x
6d027a3823
Avoid running DNS self-tests if we're operating as a bridge
2011-10-07 12:18:26 -04:00
George Kadianakis
1174bb95ce
Revive our beautiful unit tests.
...
They broke when the PT_PROTO_INFANT proxy state was added.
2011-10-07 15:44:58 +02:00
George Kadianakis
3be9d76fa2
Make it compile on Windows™.
2011-10-07 15:44:44 +02:00
George Kadianakis
105cc42e96
Support multiple transports in a single transport line.
...
Support multiple comma-separated transpotrs in a single
{Client,Server}TransportPlugin line.
2011-10-07 14:13:41 +02:00
Nick Mathewson
246afc1b1b
Make internal error check for unrecognized digest algorithm more robust
...
Fixes Coverity CID 479.
2011-10-06 14:13:09 -04:00
Nick Mathewson
2412e0e402
Check return of init_keys() ip_address_changed: fix Coverity CID 484
2011-10-06 14:13:09 -04:00
Karsten Loesing
9dfb884522
Turn on directory request statistics by default.
...
Change the default values for collecting directory request statistics and
inlcuding them in extra-info descriptors to 1.
Don't break if we are configured to collect directory request or entry
statistics and don't have a GeoIP database. Instead, print out a notice
and skip initializing the affected statistics code.
This is the cherry-picked 499661524b
2011-10-05 08:03:31 +02:00
Nick Mathewson
2725a88d5e
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-10-03 15:19:00 -04:00
Nick Mathewson
05f672c8c2
Fix compilation of 3335 and 3825 fixes
...
In master, they ran into problems with the edge_conn/entry_conn split.
2011-10-03 15:13:38 -04:00
Nick Mathewson
4aa4bce474
Merge remote-tracking branch 'rransom-tor/bug3335-v2'
...
Conflicts:
src/or/connection_edge.c
src/or/rendclient.c
2011-10-03 15:06:07 -04:00
Nick Mathewson
a7f93b509c
Add changes file for bug 4094
2011-10-03 12:58:07 -04:00
Fabian Keil
13f0d22df0
Rephrase the log messages emitted if the TestSocks check is positive
...
Previously Tor would always claim to have been given a hostname
by the client, while actually only verifying that the client
is using SOCKS4A or SOCKS5 with hostnames. Both protocol versions
allow IP addresses, too, in which case the log messages were wrong.
Fixes #4094 .
2011-10-03 12:56:46 -04:00
Robert Ransom
c5226bfe1c
Remove an HS's last_hid_serv_requests entries when a conn. attempt ends
2011-10-02 16:19:36 -07:00
Robert Ransom
bcfc383dc9
Record the HS's address in last_hid_serv_request keys
2011-10-02 16:19:35 -07:00
Robert Ransom
e07307214e
Fix comment typo
2011-10-02 16:19:23 -07:00
Robert Ransom
fbea8c8ef1
Detect and remove unreachable intro points
2011-10-02 12:49:35 -07:00
Robert Ransom
34a6b8b7e5
Clear the timed_out flag when an HS connection attempt ends
2011-10-02 12:49:35 -07:00
Robert Ransom
eaed37d14c
Record intro point timeouts in rend_intro_point_t
2011-10-02 12:49:34 -07:00
Robert Ransom
6803c1c371
Refetch an HS's desc if we don't have a usable one
...
Previously, we wouldn't refetch an HS's descriptor unless we didn't
have one at all. That was equivalent to refetching iff we didn't have
a usable one, but the next commit will make us keep some non-usable HS
descriptors around in our cache.
Code bugfix on the release that introduced the v2 HS directory system,
because rend_client_refetch_v2_renddesc's documentation comment should
have described what it actually did, not what its behaviour happened
to be equivalent to; no behaviour change in this commit.
2011-10-02 12:42:19 -07:00
Sebastian Hahn
103c861dfe
Looks like Windows version 6.2 will be Windows 8
...
Thanks to funkstar for the report
2011-10-01 14:50:44 +02:00
Roger Dingledine
1fac96f4c6
bump to 0.2.3.5-alpha
2011-09-28 18:25:16 -04:00
Roger Dingledine
cff4e6765b
give 0.2.3.5-alpha a blurb
2011-09-28 18:25:09 -04:00
Roger Dingledine
0e4f5e7cb1
fix default for TokenBucketRefillInterval in man page
2011-09-28 18:23:17 -04:00
Roger Dingledine
25f786f7ec
fold in recent changes entries
2011-09-28 15:41:29 -04:00
Roger Dingledine
f6db0f128c
refill our token buckets 10 times/sec, not 100
...
refilling often is good, but refilling often has unclear side effects
on a) cpu load, and b) making sure every cell, ever, is sent out one at
a time
2011-09-28 15:38:36 -04:00
Roger Dingledine
36829539d6
Merge branch 'maint-0.2.2'
2011-09-28 15:38:02 -04:00
Roger Dingledine
ff8aba7053
bridges should use create_fast cells for their own circuits
...
fixes bug 4124, as noticed in bug 4115
2011-09-28 15:35:27 -04:00
Roger Dingledine
4e88a3bc3e
Merge branch 'maint-0.2.2'
2011-09-28 15:13:05 -04:00
Roger Dingledine
458cc9d351
start preparing the 0.2.3.5-alpha changelog
2011-09-28 15:12:16 -04:00
Roger Dingledine
0b5d2646d5
bug 4115: make bridges use begindir for their dir fetches
...
removes another avenue for enumerating bridges.
2011-09-28 14:50:43 -04:00
Nick Mathewson
6201b8b361
Make sure the microdesc cache is loaded before setting a v3 md consensus
...
Otherwise, we can wind up munging our reference counts if we set it in
the middle of loading the nodes. This happens because
nodelist_set_consensus() and microdesc_reload_cache() are both in the
business of adjusting microdescriptors' references.
2011-09-28 14:19:39 -04:00
Nick Mathewson
4a10845075
Add some debugging code to microdesc.[ch]
2011-09-28 14:13:49 -04:00
Nick Mathewson
a4b7525c3c
Fix a crash bug in tor_assert(md->held_by_node)
...
The fix is to turn held_by_node into a reference count.
Fixes bug 4118; bugfix on 0.2.3.1-alpha.
2011-09-28 13:40:21 -04:00
Roger Dingledine
e98c9a1bf6
if we have enough usable guards, just pick one
...
we don't need to check whether we don't have enough guards right after
concluding that we do have enough.
slight efficiency fix suggested by an anonymous fellow on irc.
2011-09-27 17:35:31 -04:00
Roger Dingledine
88516f65c9
Merge branch 'maint-0.2.2'
2011-09-24 22:47:53 -04:00
Roger Dingledine
1c2e4d1336
trivial whitespace changes, take two
2011-09-24 22:46:21 -04:00
Nick Mathewson
c42a1886cc
Trivial whitespace fixes
2011-09-24 22:15:59 -04:00
Nick Mathewson
ccceefe136
Add a changes file for Tom Lowenthal's patch for #4063
2011-09-24 22:15:13 -04:00
Tom Lowenthal
5835acc6f9
Ticket #4063 - change circuit build timeout log entries from NOTICE to INFO
2011-09-24 22:12:40 -04:00
