aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuitbuild.c
Commit message (Expand)AuthorAge
...
* | | finish a commentNick Mathewson2011-03-14
* | | Merge remote branch 'origin/maint-0.2.2'•••Resolved nontrivial conflict around rewrite_x_address_for_bridge and learned_bridge_descriptor. Now, since leanred_bridge_descriptor works on nodes, we must make sure that rewrite_node_address_for_bridge also works on nodes. Conflicts: src/or/circuitbuild.c Nick Mathewson2011-03-14
|\| |
| * | Merge remote branch 'arma/bug2510' into maint-0.2.2Nick Mathewson2011-03-14
| |\ \
| | * | support multihomed bridges (bug 2510)Roger Dingledine2011-02-08
* | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-08
|\| | |
| * | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-03-08
| |\ \ \ | | | |/ | | |/|
| | * | Avoid crash in any_pending_bridge_descriptor_fetches•••This is based on shitlei's fix for bug2629, with extra parens removed. Fixes bug 2629, bugfix on 0.2.1.2-alpha. Nick Mathewson2011-03-08
* | | | Merge remote branch 'origin/maint-0.2.2'•••There was a conflict from the node_t transition, but it was an easy fix. Conflicts: src/or/circuitbuild.c Nick Mathewson2011-02-22
|\| | |
| * | | prevent same entry and exit for insane edge caseRoger Dingledine2011-02-22
| | |/ | |/|
* | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-01-26
|\| |
| * | Merge branch 'bug2321' into maint-0.2.2Nick Mathewson2011-01-26
| |\ \
| | * | Avoid sketchy integer cast in cbt code•••When calling circuit_build_times_shuffle_and_store_array, we were passing a uint32_t as an int. arma is pretty sure that this can't actually cause a bug, because of checks elsewhere in the code, but it's best not to pass a uint32_t as an int anyway. Found by doorss; fix on 0.2.2.4-alpha. Nick Mathewson2011-01-26
* | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-01-25
|\| | |
| * | | Comment remaining CBT functions.•••Left circuit_build_times_get_bw_scale() uncommented because it is in the wrong place due to an improper bug2317 fix. It needs to be moved and renamed, as it is not a cbt parameter. Mike Perry2011-01-25
* | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-01-25
|\| | |
| * | | Fix bug #2004 by demoting a log message.•••To quote arma: "So instead of stopping your CBT from screaming, you're just going to throw it in the closet and hope you can't hear it?" Yep. The log message can happen because at 95% point on the curve, we can be way beyond the max timeout we've seen, if the curve has few points and is shallow. Also applied Nick's rule of thumb for rewriting some other notice log messages to read like how you would explain them to a raving lunatic on #tor who was shouting at you demanding what they meant. Hopefully the changes live up to that standard. Mike Perry2011-01-25
| |/ /
* | | Merge branch 'maint-0.2.2'Roger Dingledine2011-01-15
|\| |
| * | Provide constant limits for all consensus params•••This addresses Nick's concern about doing non-constant bounds checking inside networkstatus_get_param(). Sebastian Hahn2011-01-15
| * | Sanity-check consensus param values•••We need to make sure that the worst thing that a weird consensus param can do to us is to break our Tor (and only if the other Tors are reliably broken in the same way) so that the majority of directory authorities can't pull any attacks that are worse than the DoS that they can trigger by simply shutting down. One of these worse things was the cbtnummodes parameter, which could lead to heap corruption on some systems if the value was sufficiently large. This commit fixes this particular issue and also introduces sanity checking for all consensus parameters. Sebastian Hahn2011-01-15
* | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-01-03
|\| |
| * | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2•••Conflicts: src/or/routerparse.c Nick Mathewson2011-01-03
| |\|
| | * fix whitespace issuesNick Mathewson2011-01-03
* | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-01-03
|\| |
| * | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2•••Conflicts: src/common/test.h src/or/test.c Nick Mathewson2011-01-03
| |\|
| | * Bump copyright statements to 2011Nick Mathewson2011-01-03
* | | Merge branch 'maint-0.2.2'Roger Dingledine2010-12-19
|\| |
| * | Merge remote branch fix_security_bug_021 into fix_security_bug_022•••Conflicts: src/common/memarea.c src/or/or.h src/or/rendclient.c Nick Mathewson2010-12-15
| |\|
| | * Make payloads into uint8_t.•••This will avoid some signed/unsigned assignment-related bugs. Nick Mathewson2010-12-15
* | | Merge remote branch 'public/refactor_pports'Nick Mathewson2010-11-11
|\ \ \
| * | | Make the predicted ports logic a little simpler.•••Mainly, this comes from turning two lists that needed to be kept in synch into a single list of structs. This should save a little RAM, and make the code simpler. Nick Mathewson2010-10-15
* | | | Fix up comments in choose_good_entry_server. Spotted by Robert Ransom.Nick Mathewson2010-10-29
|/ / /
* | | Fold timestamp_created into highres_created•••There's no reason to keep a time_t and a struct timeval to represent the same value: highres_created.tv_sec was the same as timestamp_created. This should save a few bytes per circuit. Nick Mathewson2010-10-15
* | | Remove "is this too slow?" XXXX comments for code not appearing in profilesNick Mathewson2010-10-15
* | | Merge remote branch 'arma/bug1982_2'•••Resolved a minor conflict in: src/or/circuitbuild.c Nick Mathewson2010-10-13
|\ \ \
| * | | allow countries and IP addresses in EntryNodesRoger Dingledine2010-09-29
* | | | Switch an && to an ||, stop a *NULL.Nick Mathewson2010-10-04
* | | | More debugging code for node_t branchNick Mathewson2010-10-01
* | | | Initial conversion to use node_t throughout our codebase.•••A node_t is an abstraction over routerstatus_t, routerinfo_t, and microdesc_t. It should try to present a consistent interface to all of them. There should be a node_t for a server whenever there is * A routerinfo_t for it in the routerlist * A routerstatus_t in the current_consensus. (note that a microdesc_t alone isn't enough to make a node_t exist, since microdescriptors aren't usable on their own.) There are three ways to get a node_t right now: looking it up by ID, looking it up by nickname, and iterating over the whole list of microdescriptors. All (or nearly all) functions that are supposed to return "a router" -- especially those used in building connections and circuits -- should return a node_t, not a routerinfo_t or a routerstatus_t. A node_t should hold all the *mutable* flags about a node. This patch moves the is_foo flags from routerinfo_t into node_t. The flags in routerstatus_t remain, but they get set from the consensus and should not change. Some other highlights of this patch are: * Looking up routerinfo and routerstatus by nickname is now unified and based on the "look up a node by nickname" function. This tries to look only at the values from current consensus, and not get confused by the routerinfo_t->is_named flag, which could get set for other weird reasons. This changes the behavior of how authorities (when acting as clients) deal with nodes that have been listed by nickname. * I tried not to artificially increase the size of the diff here by moving functions around. As a result, some functions that now operate on nodes are now in the wrong file -- they should get moved to nodelist.c once this refactoring settles down. This moving should happen as part of a patch that moves functions AND NOTHING ELSE. * Some old code is now left around inside #if 0/1 blocks, and should get removed once I've verified that I don't want it sitting around to see how we used to do things. There are still some unimplemented functions: these are flagged with "UNIMPLEMENTED_NODELIST()." I'll work on filling in the implementation here, piece by piece. I wish this patch could have been smaller, but there did not seem to be any piece of it that was independent from the rest. Moving flags forces many functions that once returned routerinfo_t * to return node_t *, which forces their friends to change, and so on. Nick Mathewson2010-10-01
* | | | Try to make most routerstatus_t interfaces constNick Mathewson2010-10-01
* | | | Try to make most routerinfo_t interfaces constNick Mathewson2010-10-01
| |/ / |/| |
* | | Merge branch 'bug1772' into maint-0.2.2Roger Dingledine2010-09-29
|\ \ \
| * | | fix two castsRoger Dingledine2010-09-29
| * | | Comment network liveness and change detection behavior.Mike Perry2010-09-29
| * | | refactor and recomment; no actual changesRoger Dingledine2010-09-29
| * | | Cap the circuit build timeout to the max time we've seen.•••Also, cap the measurement timeout to 2X the max we've seen. Mike Perry2010-09-29
| * | | 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. Mike Perry2010-09-29
| * | | 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. Mike Perry2010-09-29
| * | | 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. Mike Perry2010-09-29
* | | | Merge commit 'mikeperry/bug1740' into maint-0.2.2Roger Dingledine2010-09-29
|\| | | | |/ / |/| |
| * | 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. Mike Perry2010-09-29