Nick Mathewson
ea7f4be6d2
Merge remote branch 'sebastian/relay_early_rend' into maint-0.2.2
2010-10-21 10:49:44 -04:00
Nick Mathewson
0ac9a3df6c
Fix a logic error in 98aee84. Found by boboper
2010-10-20 14:40:09 -04:00
Nick Mathewson
2849a95691
Add a ! to directory_caches_dir_info() to fix a logic error
...
We want to fetch directory info more aggressively if we need it to
refuseunknownexits. Thus, we'll want it if our exit policy is _NOT_
reject *.
2010-10-20 13:49:38 -04:00
Nick Mathewson
98aee8472f
Fix a read of a freed pointer while in set_current_consensus
...
Found by rransom while working on issue #988 . Bugfix on
0.2.2.17-alpha. Fixes bug 2097.
2010-10-20 13:10:20 -04:00
Sebastian Hahn
d3b67cba3c
Send relay_early cells in rend circs
...
There are no relay left that run version 0.2.1.3 through 0.2.1.18, so
changing this behaviour should be safe now.
2010-10-18 07:46:51 +02:00
Robert Ransom
1b8c8059c7
Correct a bogus comment.
...
Whether or not OpenSSL reference-counts SSL_CTX objects is irrelevant;
what matters is that Tor reference-counts its wrapper objects for
SSL_CTXs.
2010-10-04 13:53:54 -04:00
Robert Ransom
c70d9d77ab
Correct a couple of log messages in tortls.c
2010-10-04 13:53:48 -04:00
Robert Ransom
068185eca2
Fix several comments in tortls.c
2010-10-04 13:47:57 -04:00
Nick Mathewson
69b4138c00
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2010-10-04 12:32:35 -04:00
Karsten Loesing
bad609ae6b
Update to the October 1 2010 Maxmind GeoLite Country database.
2010-10-04 11:45:53 +02:00
Roger Dingledine
734ba2f937
fix comment
2010-10-01 14:11:08 -04:00
Roger Dingledine
6cb5383e56
log when we guess our ip address, not just when we fail
2010-10-01 13:32:38 -04:00
Roger Dingledine
6e00877fa3
bump to 0.2.2.17-alpha-dev
2010-10-01 04:59:11 -04:00
Roger Dingledine
a3f488a887
bump to 0.2.2.17-alpha
2010-09-30 17:49:11 -04:00
Sebastian Hahn
0702429cf7
Note an XXX about potential overflow
2010-09-30 06:24:01 +02:00
Sebastian Hahn
73def430e3
Use an upper and lower bound for bridge weights
...
When picking bridges (or other nodes without a consensus entry (and
thus no bandwidth weights)) we shouldn't just trust the node's
descriptor. So far we believed anything between 0 and 10MB/s, where 0
would mean that a node doesn't get any use from use unless it is our
only one, and 10MB/s would be a quite siginficant weight. To make this
situation better, we now believe weights in the range from 20kB/s to
100kB/s. This should allow new bridges to get use more quickly, and
means that it will be harder for bridges to see almost all our traffic.
2010-09-30 06:17:54 +02:00
Sebastian Hahn
45c51e3238
Fix check-spaces
2010-09-30 06:17:32 +02:00
Roger Dingledine
d17fcad3ae
Merge commit 'mikeperry/bug1772' into maint-0.2.2
2010-09-30 00:00:06 -04:00
Mike Perry
7eedd0f6bc
Nominaly lower the minimum timeout value to 1500.
...
This won't change any behavior, since it will still be rounded back
up to 2seconds, but should reduce the chances of some extra warns.
2010-09-29 20:58:09 -07:00
Roger Dingledine
3cbe463e96
Merge branch 'bug1772' into maint-0.2.2
2010-09-29 23:52:18 -04:00
Roger Dingledine
f2aa8f08cb
fix two casts
2010-09-29 23:51:25 -04:00
Mike Perry
c8f731fabb
Comment network liveness and change detection behavior.
2010-09-29 19:35:40 -07:00
Roger Dingledine
ceb3d4d578
no measurement circs if not enough build times
...
In the first 100 circuits, our timeout_ms and close_ms
are the same. So we shouldn't transition circuits to purpose
CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT, since they will just timeout again
next time we check.
2010-09-29 18:05:10 -04:00
Roger Dingledine
7f10707c42
refactor and recomment; no actual changes
2010-09-29 18:01:22 -04:00
Roger Dingledine
48cd096276
Merge commit 'mikeperry/bug1739' into maint-0.2.2
2010-09-29 17:17:59 -04:00
Roger Dingledine
474e4d2722
Merge commit 'mikeperry/bug1740' into maint-0.2.2
2010-09-29 17:05:38 -04:00
Mike Perry
4324bb1b21
Cap the circuit build timeout to the max time we've seen.
...
Also, cap the measurement timeout to 2X the max we've seen.
2010-09-29 11:49:43 -07:00
Mike Perry
11910cf5b3
Do away with the complexity of the network liveness detection.
...
We really should ignore any timeouts that have *no* network activity for their
entire measured lifetime, now that we have the 95th percentile measurement
changes. Usually this is up to a minute, even on fast connections.
2010-09-29 11:49:43 -07:00
Mike Perry
0744a175af
Fix state checks on liveness handling.
...
If we really want all this complexity for these stages here, we need to handle
it better for people with large timeouts. It should probably go away, though.
2010-09-29 11:49:43 -07:00
Mike Perry
9a77743b7b
Fix non-live condition checks.
...
Rechecking the timeout condition was foolish, because it is checked on the
same codepath. It was also wrong, because we didn't round.
Also, the liveness check itself should be <, and not <=, because we only have
1 second resolution.
2010-09-29 11:49:31 -07:00
Mike Perry
c5b5643965
Send control port events for timeouts.
...
We now differentiate between timeouts and cutoffs by the REASON string and
the PURPOSE string.
2010-09-29 11:46:36 -07:00
Mike Perry
5aa4564ab9
Only count timeout data for 3 hop circuits.
...
Use 4/3 of this timeout value for 4 hop circuits, and use half of it for
canabalized circuits.
2010-09-29 11:41:27 -07:00
Roger Dingledine
a58610a87e
even more comment
2010-09-28 23:50:56 -04:00
Roger Dingledine
512433346f
improve code comments, based on comments from nick
2010-09-28 23:27:00 -04:00
Roger Dingledine
9997676802
handle ugly edge case in retrying entrynodes
...
Specifically, a circ attempt that we'd launched while the network was
down could timeout after we've marked our entrynodes up, marking them
back down again. The fix is to annotate as bad the OR conns that were
around before we did the retry, so if a circuit that's attached to them
times out we don't do anything about it.
2010-09-28 22:32:38 -04:00
Roger Dingledine
7de1caa33f
Actually notice when our last entrynode goes down
...
Otherwise we'd never set have_minimum_dir_info to false, so the
"optimistic retry" would never trigger.
2010-09-28 21:59:31 -04:00
Roger Dingledine
bb22360bad
optimistically retry EntryNodes on socks request
...
We used to mark all our known bridges up when they're all down and we
get a new socks request. Now do that when we've set EntryNodes too.
2010-09-28 19:10:23 -04:00
Roger Dingledine
8bac188572
remove a redundant assert
2010-09-28 19:10:22 -04:00
Roger Dingledine
127f37ad29
refactor; no actual changes
2010-09-28 19:10:22 -04:00
Roger Dingledine
09a715bb72
Merge branch 'maint-0.2.1' into maint-0.2.2
2010-09-28 18:37:55 -04:00
Roger Dingledine
339993b409
actually retry bridges when your network goes away
2010-09-28 18:36:15 -04:00
Roger Dingledine
a467bf5fbb
a dir-spec entry for refuseunknownexits
...
plus quiet a log line
2010-09-27 18:32:09 -04:00
Roger Dingledine
9d7f0badb5
changelog entry for bug1751
2010-09-27 17:44:00 -04:00
Nick Mathewson
614eeb378b
Merge remote branch 'sebastian/bug1964' into maint-0.2.2
2010-09-27 17:26:32 -04:00
Sebastian Hahn
c951830002
Fix a bridge segfault
...
When we enabled support to change statistic options without restarting
Tor we forgot to initialize geoip_countries. Fix that.
2010-09-27 23:19:25 +02:00
Nick Mathewson
c97072ef34
Merge branch 'bug1751_enabling' into maint-0.2.2
2010-09-27 17:08:03 -04:00
Nick Mathewson
6c5b9ba625
Change bug1751 enabling code based on comments from arma
2010-09-27 17:07:22 -04:00
Nick Mathewson
e385961542
Merge remote branch 'public/bug1954' into maint-0.2.2
2010-09-27 15:39:40 -04:00
Nick Mathewson
24a45f54d2
Merge branch 'bug1805' into maint-0.2.2
2010-09-27 12:25:32 -04:00
Nick Mathewson
9c8fb75edf
Clean up some bug1805 comments based on arma's feedback
2010-09-27 12:23:49 -04:00
