aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* Merge branch 'tor-fw-squashed2'•••Conflicts: src/common/util.c Nick Mathewson2010-09-30
|\
| * Fix space and formatting issuesNick Mathewson2010-09-30
| * #if-out the fw-helper code in util.c when building on windowsNick Mathewson2010-09-30
| * Turn select() usage in tor-fw-helper into a function.Nick Mathewson2010-09-30
| * Start tor-fw-helper in the background, and log whatever it outputsSteven Murdoch2010-09-30
| * Changes to tor-fw-helper, some based on Nick's review••• * MINIUPNPC rather than the generic UPNP * Nick suggested a better abstraction model for tor-fw-helper * Fix autoconf to build with either natpmp or miniupnpc * Add AM_PROG_CC_C_O to fix automake complaint * update spec to address nickm's concern * refactor nat-pmp to match upnp state * we prefer tor_snprintf to snprintf * link properlty for tor_snprintf * rename test_commandline_options to log_commandline_options * cast this uint as an int * detect possible FD_SETSIZE errors * make note about future enhancements for natpmp * add upnp enhancement note * ChangeLog entry * doxygen and check-spaces cleanup * create tor-fw-helper.1.txt Jacob Appelbaum2010-09-30
| * First implementation of tor-fw-helper.•••tor-fw-helper is a command-line tool to wrap and abstract various firewall port-forwarding tools. This commit matches the state of Jacob's tor-fw-helper branch as of 23 September 2010. (commit msg by Nick) Jacob Appelbaum2010-09-30
* | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2010-09-30
|\ \ | |/ |/|
| * Note an XXX about potential overflowSebastian Hahn2010-09-30
| * 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. Sebastian Hahn2010-09-30
| * Fix check-spacesSebastian Hahn2010-09-30
* | Whitespace fixes on recent merges to master.Nick Mathewson2010-09-30
* | Merge branch 'maint-0.2.2'Roger Dingledine2010-09-30
|\|
| * Merge commit 'mikeperry/bug1772' into maint-0.2.2Roger Dingledine2010-09-30
| |\
| | * 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. Mike Perry2010-09-29
| * | 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
| | * 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. Roger Dingledine2010-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 branch 'maint-0.2.2'Roger Dingledine2010-09-29
|\| |
| * | Merge commit 'mikeperry/bug1739' into maint-0.2.2Roger Dingledine2010-09-29
| |\|
| | * Send control port events for timeouts.•••We now differentiate between timeouts and cutoffs by the REASON string and the PURPOSE string. 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
* | | make c612ddee compile with old libeventsRoger Dingledine2010-09-29
* | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2010-09-29
|\| |
| * | even more commentRoger Dingledine2010-09-28
| * | improve code comments, based on comments from nickRoger Dingledine2010-09-28
| * | 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. Roger Dingledine2010-09-28
| * | 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. Roger Dingledine2010-09-28
| * | 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. Roger Dingledine2010-09-28
| * | remove a redundant assertRoger Dingledine2010-09-28
| * | refactor; no actual changesRoger Dingledine2010-09-28
* | | Remove the has_old_dnsworkers flag.Nick Mathewson2010-09-28
* | | Merge branch 'maint-0.2.2'Roger Dingledine2010-09-28
|\| |
| * | Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2010-09-28
| |\ \
| | * | actually retry bridges when your network goes awayRoger Dingledine2010-09-28
* | | | Autodetect the number of CPUs when possible if NumCPUs==0•••This is needed for IOCP, since telling the IOCP backend about all your CPUs is a good idea. It'll also come in handy with asn's multithreaded crypto stuff, and for people who run servers without reading the manual. Nick Mathewson2010-09-28
* | | | Add a new option to enable/disable IOCP supportNick Mathewson2010-09-28
* | | | Merge branch 'microdesc_dl_v2'Nick Mathewson2010-09-28
|\ \ \ \
| * | | | Clean long-unlisted microdescs from the cacheNick Mathewson2010-09-27
| * | | | Download microdescriptors if you're a cache•••This commit adds some functions to see what microdescriptors we're missing, and adds fetch-microdesc/store-microdesc logic to the directory code. Nick Mathewson2010-09-27
| * | | | When updating routerdesc downloads, look specifically at the ns consensus•••This will be needed when "get_live_consensus" potentially returns a microdesc consensus. Nick Mathewson2010-09-27
| * | | | Actually parse the m lines from a microdesc consensusNick Mathewson2010-09-27
| * | | | Code to download, parse, and store microdesc consensusesNick Mathewson2010-09-27