aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* Fix whitespace errors, all of them mine.Nick Mathewson2014-03-05
|
* Rename PredictedCircsRelevanceTime->PredictedPortsRelevanceTimeNick Mathewson2014-03-05
| | | | All circuits are predictive; it's the ports that are expiring here.
* Merge branch 'ticket9176_squashed'Nick Mathewson2014-03-05
|\ | | | | | | | | Conflicts: doc/tor.1.txt
| * Fix wide lines.Nick Mathewson2014-03-05
| |
| * Lower the maximum for PrecictedCircsRelevanceTime to one hourNick Mathewson2014-03-05
| |
| * Fixed spacing.unixninja922014-03-05
| |
| * Added max value to PredictedCircsRelevanceTime.unixninja922014-03-05
| |
| * PredictedCircsRelevanceTime: limit how long we predict a port will be usedunixninja922014-03-05
| | | | | | | | | | | | | | | | By default, after you've made a connection to port XYZ, we assume you might still want to have an exit ready to connect to XYZ for one hour. This patch lets you lower that interval. Implements ticket 91
* | Merge remote-tracking branch 'arma/ticket5528'Nick Mathewson2014-03-05
|\ \ | | | | | | | | | | | | | | | Conflicts: src/or/router.c src/test/test_dir.c
| * | stop setting, or using, router->addressRoger Dingledine2013-02-09
| | | | | | | | | | | | resolves ticket 5528.
| * | use me->addr when adding our address to our exit policyRoger Dingledine2013-02-09
| | | | | | | | | | | | (rather than me->address)
| * | use router->addr for log messages and controller eventsRoger Dingledine2013-02-09
| | | | | | | | | | | | (rather than router->address)
| * | stop passing "address" around the directory_initiate_command* funcsRoger Dingledine2013-02-09
| | | | | | | | | | | | since it was always just the string version of "addr" anyway
| * | Stop checking if ri->address is an IPRoger Dingledine2013-02-09
| | | | | | | | | | | | | | | | | | | | | since router_parse_entry_from_string() already checks whether !tor_inet_aton(router->address, &in) (And no need to print address, since router_describe does that.)
* | | Merge remote-tracking branch 'public/bug8788'Nick Mathewson2014-03-05
|\ \ \
| * | | eventdns.c: survive broken resolv.conf filesNick Mathewson2014-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you had a resolv.conf file with a nameserver line containing no nameserver IP, we would crash. That's not terrible, but it's not desirable. Fixes bug 8788; bugfix on 0.1.1.23. Libevent already has this fix.
* | | | Include v3 in documented 'protocols' in rend_service_descriptor_tNick Mathewson2014-03-04
| | | | | | | | | | | | | | | | | | | | | | | | Also make it unsigned and document that it's for INTRODUCE cell versions. Fixes 9099; bugfix on 0.2.1.5-alpha, which introduced the v3 protocol.
* | | | Merge branch 'bug10169_025_v2'Nick Mathewson2014-03-04
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/test/test.c
| * \ \ \ Merge remote-tracking branch 'public/bug10169_024' into bug10169_025_v2Nick Mathewson2014-03-04
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/common/compat_libevent.h src/or/relay.c
| | * \ \ \ Merge remote-tracking branch 'public/bug10169_023' into bug10169_024Nick Mathewson2014-03-04
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/relay.c
| | | * | | | Monotonize the OOM-killer data timersNick Mathewson2014-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a couple of places, to implement the OOM-circuit-killer defense against sniper attacks, we have counters to remember the age of cells or data chunks. These timers were based on wall clock time, which can move backwards, thus giving roll-over results for our age calculation. This commit creates a low-budget monotonic time, based on ratcheting gettimeofday(), so that even in the event of a time rollback, we don't do anything _really_ stupid. A future version of Tor should update this function to do something even less stupid here, like employ clock_gettime() or its kin.
| | | * | | | On OOM, also log N circuits remainingNick Mathewson2014-02-12
| | | | | | |
| * | | | | | More unit tests for OOM handling.Nick Mathewson2014-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gets us up to no interesting untested new or changed lines for the 10169 code.
| * | | | | | Initial unit tests for OOM handlingNick Mathewson2014-02-12
| | | | | | |
| * | | | | | Refactor OOM-handling functions for more testabilityNick Mathewson2014-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch splits out some of the functions in OOM handling so that it's easier to check them without involving the rest of Tor or requiring that the circuits be "wired up".
| * | | | | | Add tests for buffer time tracking.Nick Mathewson2014-02-12
| | | | | | |
| * | | | | | Several tests for buffer allocationNick Mathewson2014-02-12
| | | | | | |
| * | | | | | Start writing tests for 10169.Nick Mathewson2014-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we cover more chunk allocation functions.
| * | | | | | Debugging code inbuffers.c for debugging chunk allocation.Nick Mathewson2014-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently on; will disable later in this branch.
| * | | | | | Merge remote-tracking branch 'public/bug10169_024' into bug10169_025_v2Nick Mathewson2014-02-12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/circuitlist.c
| | * | | | | Merge remote-tracking branch 'public/bug10169_023' into bug10169_024Nick Mathewson2014-02-12
| | |\| | | |
| | | * | | | Actually release buffer freelists when handling OOM conditions.Nick Mathewson2014-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise freeing buffers won't help for a little while.
| | | * | | | Fix bugs in bug10169 bugfix memory trackingNick Mathewson2014-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The chunk_grow() and chunk_copy() functions weren't adjusting the memory totals properly. Bugfix not on any released Tor version.
| | * | | | | Merge remote-tracking branch 'public/bug10169_023' into bug10169_024Nick Mathewson2014-01-03
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/tor.1.txt src/or/config.c src/or/or.h The conflicts were all pretty trivial.
| | | * | | | Drop the MaxMemInQueues lower limit down to 256 MB.Nick Mathewson2013-11-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on #9686, gmorehose reports that the 500 MB lower limit is too high for raspberry pi users.
| | | * | | | Rename MaxMemInCellQueues to MaxMemInQueuesNick Mathewson2013-11-20
| | | | | | |
| | | * | | | doxygen comments for 10169 codeNick Mathewson2013-11-20
| | | | | | |
| | | * | | | Count freed buffer bytes from buffers when oom-killing circuits.Nick Mathewson2013-11-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, aggressively clear the buffers to try to make their bytes go away fast rather than waiting for the close-marked-connection code to get 'em.
| | | * | | | Have the OOM handler also count the age the data in a stream bufferNick Mathewson2013-11-15
| | | | | | |
* | | | | | | ATTR_NORETURN is needed on lost_owning_controller nowNick Mathewson2014-03-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fixes some "hey, that function could have __attribute__((noreturn))" warnings introduced by f96400d9. Bug not in any released version of Tor.
* | | | | | | Fix compilation warnings in tor_addr_make_null patchNick Mathewson2014-03-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was one "missing prototype" warning because the test function wasn't static, and one "unused parameter" warning about the "data" parameter. Also, I added a couple of tests to make sure that the "make_null" addresses really were the addresses we expected, by formatting them as strings.
* | | | | | | add test for tor_addr_make_nullKevin Murray2014-03-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kevin Murray <spam@kdmurray.id.au>
* | | | | | | trivial whitespace fixesRoger Dingledine2014-03-03
| | | | | | |
* | | | | | | whitespace fixNick Mathewson2014-02-28
| | | | | | |
* | | | | | | Merge branch 'bug10884_squashed'Nick Mathewson2014-02-28
|\ \ \ \ \ \ \
| * | | | | | | Unit tests for test_routerkeys_write_fingerprintNick Mathewson2014-02-28
| | | | | | | |
| * | | | | | | Unit tests for pk fingerprint functionsNick Mathewson2014-02-28
| | | | | | | |
| * | | | | | | Tighten router_write_fingerprint implNick Mathewson2014-02-28
| | | | | | | |
| * | | | | | | Write hashed bridge fingerprint to logs and to disk.Karsten Loesing2014-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements #10884.
* | | | | | | | Merge remote-tracking branch 'karsten/task-5824'Nick Mathewson2014-02-28
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |