aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge maint-0.2.2 for the bug1090-part1-squashed branchNick Mathewson2011-04-27
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved conflicts in: doc/tor.1.txt src/or/circuitbuild.c src/or/circuituse.c src/or/connection_edge.c src/or/connection_edge.h src/or/directory.c src/or/rendclient.c src/or/routerlist.c src/or/routerlist.h These were mostly releated to the routerinfo_t->node_t conversion.
| * Merge remote-tracking branch 'arma/bug1090-part1-squashed' into ↵Nick Mathewson2011-04-27
| |\ | | | | | | | | | bug1090-part1-squashed
| | * explain an argument in a function commentRoger Dingledine2011-04-27
| | |
| * | Merge branch 'bug1090-manpage-squashed' into bug1090-part1-squashedNick Mathewson2011-04-27
| |\ \
| | * | Revise the manpage to contain the actual intended *Nodes behaviorNick Mathewson2011-04-27
| | | | | | | | | | | | | | | | | | | | This is a squashed version of my former desired_nodes_behavior branch that we used to specify the intended results wrt bug 1090.
| * | | Add a big changelog entry for bug 1090 fixesNick Mathewson2011-04-27
| | |/ | |/|
| * | Instead of checking whether we have unremoved intro points, check for usable ↵Nick Mathewson2011-04-27
| | | | | | | | | | | | ones
| * | better user-facing warnings for unexpected last hopsRoger Dingledine2011-04-27
| | | | | | | | | | | | | | | these still aren't perfect, but we won't know how to correct them until we start experiencing surprised users.
| * | warn if we launch too many circuits for a given streamRoger Dingledine2011-04-27
| | |
| * | revert most of ef81649d2fcRoger Dingledine2011-04-27
| | | | | | | | | | | | | | | | | | | | | | | | Now we believe it to be the case that we never build a circuit for our stream that has an unsuitable exit, so we'll never need to use such a circuit. The risk is that we have some code that builds the circuit, but now we refuse to use it, meaning we just build a bazillion circuits and ignore them all.
| * | Add a circuit_purpose_to_string() function, and use itNick Mathewson2011-04-27
| | | | | | | | | | | | | | | We had a circuit_purpose_to_controller_string() function, but it was pretty coarse-grained and didn't try to be human-readable.
| * | Fix a check-spaces complaintSebastian Hahn2011-04-26
| | |
| * | Explain the "using anyway" log message betterSebastian Hahn2011-04-26
| | | | | | | | | | | | | | | Also add a request to report any cases where we are not honoring StrictNodes to the developers: These should now all be bugs.
| * | Fix a log msgSebastian Hahn2011-04-26
| | |
| * | Check transition of circuit purpose from INTRO->GENERAL if nodes are constrainedNick Mathewson2011-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This looked at first like another fun way around our node selection logic: if we had introduction circuits, and we wound up building too many, we would turn extras into general-purpose circuits. But when we did so, we wouldn't necessarily check whether the general-purpose circuits conformed to our node constraints. For example, the last node could totally be in ExcludedExitNodes and we wouldn't have cared... ...except that the circuit should already be internal, so it won't get user streams attached to it, so the transition should generally be allowed. Add an assert to make sure we're right about this, and have it not check whether ExitNodes is set, since that's irrelevant to internal circuits.
| * | When cannibalizing a circuit, make sure it has no ExcludeNodes on itNick Mathewson2011-04-26
| | | | | | | | | | | | | | | This could happen if StrictNodes was 0 and we were forced to pick an excluded node as the last hop of the circuit.
| * | When there is a transition in permitted nodes, apply it to trackexithosts mapNick Mathewson2011-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | IOW, if we were using TrackExitHosts, and we added an excluded node or removed a node from exitnodes, we wouldn't actually remove the mapping that points us at the new node. Also, note with an XXX022 comment a place that I think we are looking at the wrong string.
| * | Simplify calls to routerset_equalNick Mathewson2011-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | The routerset_equal function explicitly handles NULL inputs, so there's no need to check inputs for NULL before calling it. Also fix a bug in routerset_equal where a non-NULL routerset with no entries didn't get counted as equal to a NULL routerset. This was untriggerable, I think, but potentially annoying down the road.
| * | If we have chosen an exit that shares a family with all bridges, fail the ↵Nick Mathewson2011-04-26
| | | | | | | | | | | | | | | | | | | | | circuit We could probably do something smarter here, but the situation is unusual enough that it's okay to just fail the circuit.
| * | Do not try to download descriptors for bridges in ExcludeNodes.Nick Mathewson2011-04-26
| | |
| * | Correct the behavior of .exit with ExcludeNodes, StrictNodes, etc.Nick Mathewson2011-04-26
| | | | | | | | | | | | | | | | | | | | | ExcludeExitNodes foo now means that foo.exit doesn't work. If StrictNodes is set, then ExcludeNodes foo also overrides foo.exit. foo.exit , however, still works even if foo is not listed in ExitNodes.
| * | Note another place that we need to fix a 1090 issue.Nick Mathewson2011-04-26
| | |
| * | Do not automatically ignore Fast/Stable for exits when ExitNodes is setNick Mathewson2011-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This once maybe made sense when ExitNodes meant "Here are 3 exits; use them all", but now it more typically means "Here are 3 countries; exit from there." Using non-Fast/Stable exits created a potential partitioning opportunity and an annoying stability problem. (Don't worry about the case where all of our ExitNodes are non-Fast or non-Stable: we handle that later in the function by retrying with need_capacity and need_uptime set to 0.)
| * | Note a slightly less likely way to violate ExcludeNodesNick Mathewson2011-04-26
| | |
| * | Note that circuit purpose changing can violate ExcludeNodesNick Mathewson2011-04-26
| | |
| * | If we're excluded, and StrictNodes is set, do not do self-tests.Nick Mathewson2011-04-26
| | |
| * | Add an XXX022-1090 to note consider_exit_fmily b0rkennessNick Mathewson2011-04-26
| | |
| * | three more cases where maybe we want to excludeRoger Dingledine2011-04-26
| | |
| * | make formal a constraint that's been true a while nowRoger Dingledine2011-04-26
| | |
| * | refuse moria1.exit if moria1 is excludedRoger Dingledine2011-04-26
| | | | | | | | | | | | add a note reminding us to do this for foo.moria1.exit if we decide to.
| * | note another case where strictnodes is considered for exitsRoger Dingledine2011-04-26
| | |
| * | If ExitNodes and Exclude{Exit}Nodes overlap, obey Exclude{Exit}Nodes.Roger Dingledine2011-04-26
| | | | | | | | | | | | Also, ExitNodes are always strict.
| * | the new entrynodes behavior is always strictRoger Dingledine2011-04-26
| | |
| * | don't exit enclave to excluded relaysRoger Dingledine2011-04-26
| | |
| * | slight tweak on circuit_conforms_to_optionsRoger Dingledine2011-04-26
| | | | | | | | | | | | | | | | | | this function really needs to get a total rewrite (or die) For now, use #if 0 to disable it.
| * | handle excludenodes for dir fetch/postRoger Dingledine2011-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we're picking a random directory node, never pick an excluded one. But if we've chosen a specific one (or all), allow it unless strictnodes is set (in which case warn so the user knows it's their fault). When warning that we won't connect to a strictly excluded node, log what it was we were trying to do at that node. When ExcludeNodes is set but StrictNodes is not set, we only use non-excluded nodes if we can, but fall back to using excluded nodes if none of those nodes is usable.
| * | If EntryNodes and ExcludeNodes overlap, obey ExcludeNodes.Roger Dingledine2011-04-26
| | |
| * | refuse excluded hidserv nodes if strictnodesRoger Dingledine2011-04-26
| |/ | | | | | | | | Make hidden services more flaky for people who set both ExcludeNodes and StrictNodes. Not recommended, especially for hidden service operators.
* | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-04-26
|\| | | | | | | | | Conflicts: src/or/main.h
| * Expose a new process_signal(uintptr_t), not signal_callback()Nick Mathewson2011-04-26
| | | | | | | | | | | | This is a tweak to the bug2917 fix. Basically, if we want to simulate a signal arriving in the controller, we shouldn't have to pretend that we're Libevent, or depend on how Tor sets up its Libevent callbacks.
| * Merge remote-tracking branch 'sebastian/bug2917' into maint-0.2.2Nick Mathewson2011-04-26
| |\
| | * Make SIGNAL DUMP work on FreeBSDSebastian Hahn2011-04-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | While doing so, get rid of the now unnecessary function control_signal_act(). Fixes bug 2917, reported by Robert Ransom. Bugfix on commit 9b4aa8d2abbce71398e58188209a1b1d04885b96. This patch is loosely based on a patch by Robert (Changelog entry).
* | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-04-26
|\| |
| * | Merge remote-tracking branch 'public/bug2332' into maint-0.2.2Nick Mathewson2011-04-26
| |\ \
| | * | Make eventdns server functions const void* to match libeventNick Mathewson2011-01-10
| | | | | | | | | | | | | | | | partial fix for bug 2332
* | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-04-26
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/or/rephist.c
| * | | Downgrade notice to info when downloading a cert.Nick Mathewson2011-04-26
| | | |
| * | | fix some comments before they create conflictsRoger Dingledine2011-04-26
| | | |
* | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-04-26
|\| | |
| * | | Fix compilation in last patchNick Mathewson2011-04-26
| | | |