aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* Completely refactor how FILENAME_PRIVATE worksNick Mathewson2013-07-10
| | | | | | | | | | | | | | | | | | | | We previously used FILENAME_PRIVATE identifiers mostly for identifiers exposed only to the unit tests... but also for identifiers exposed to the benchmarker, and sometimes for identifiers exposed to a similar module, and occasionally for no really good reason at all. Now, we use FILENAME_PRIVATE identifiers for identifiers shared by Tor and the unit tests. They should be defined static when we aren't building the unit test, and globally visible otherwise. (The STATIC macro will keep us honest here.) For identifiers used only by the unit tests and never by Tor at all, on the other hand, we wrap them in #ifdef TOR_UNIT_TESTS. This is not the motivating use case for the split test/non-test build system; it's just a test example to see how it works, and to take a chance to clean up the code a little.
* Start work on fancy compiler tricks to expose extra stuff to our testsNick Mathewson2013-07-10
| | | | | | | | | | | | | | This is mainly a matter of automake trickery: we build each static library in two versions now: one with the TOR_UNIT_TESTS macro defined, and one without. When TOR_UNIT_TESTS is defined, we can enable mocking and expose more functions. When it's not defined, we can lock the binary down more. The alternatives would be to have alternate build modes: a "testing configuration" for building the libraries with test support, and a "production configuration" for building them without. I don't favor that approach, since I think it would mean more people runnning binaries build for testing, or more people not running unit tests.
* Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-07-08
|\
| * Merge branch 'bug9200' into maint-0.2.4Nick Mathewson2013-07-08
| |\
| | * Add a comment and a check for why flag indices will be <= 63Nick Mathewson2013-07-08
| | |
| | * FIx undefined behavior in dirvote.cNick Mathewson2013-07-03
| | | | | | | | | | | | | | | | | | | | | | | | Fix a bug in the voting algorithm that could yield incorrect results when a non-naming authority declared too many flags. Fixes bug 9200; bugfix on 0.2.0.3-alpha. Found by coverity scan.
* | | Merge remote-tracking branch 'karsten/geoip-manual-update-jul2013'Nick Mathewson2013-07-08
|\ \ \
| * | | Add 2 new manual A1 substitutions.Karsten Loesing2013-07-08
| | | |
* | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-07-08
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2013-07-08
| |\ \ | | |/ | |/|
| | * Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson2013-07-08
| | |\
| | | * Update to the July 2013 GeoIP database.Karsten Loesing2013-07-08
| | | |
* | | | Merge remote-tracking branch 'linus/bug8530'Nick Mathewson2013-06-29
|\ \ \ \
| * | | | Invoke binaries in $PATH rather than by absolute path.Linus Nordberg2013-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That security measure costs more than it gives. So, keep your PATH sane and we can run this script on more than one system.
| * | | | Use CHUTNEY_PATH to find Chutney.Linus Nordberg2013-06-14
| | | | |
| * | | | Add make target test-network running traffic tests in a Chutney network.Linus Nordberg2013-06-13
| | | | | | | | | | | | | | | | | | | | This implements ticket #8530.
* | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-29
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Give a warning when bufferevents are enabled.Nick Mathewson2013-06-29
| | | | | | | | | | | | | | | | | | | | Ticket 9147.
* | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-24
|\| | | |
| * | | | Fix bug 9122: don't allow newdefaultoptions to be NULLNick Mathewson2013-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (This caused a crash that was reported as bug 9122, but the underlying behavior has been wrong for a while.) Fix on 0.2.3.9-alpha.
* | | | | Fix #5584 - raise awareness of safer logging - warn about potentially unsafe ↵Marek Majkowski2013-06-24
| | | | | | | | | | | | | | | | | | | | config options
* | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-18
|\| | | |
| * | | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2013-06-18
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fix some problems with the bug9002 fix.Nick Mathewson2013-06-18
| | | | | | | | | | | | | | | | | | | | Fixes bug 9090; bug not in any released Tor.
* | | | | Check more return values in the unit testsNick Mathewson2013-06-18
| | | | |
* | | | | Attempt to un-confuse coverity about (false) double-free in bench_onion_ntor.Nick Mathewson2013-06-18
| | | | |
* | | | | Fix a couple of resource leaks in test_config.cNick Mathewson2013-06-18
| | | | | | | | | | | | | | | | | | | | Spotted by Coverity Scan. Not in any released Tor.
* | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-18
|\| | | |
| * | | | Tweak bug9063_redux patch: {n_p}_chan_cells, not {n,p}_conn_cellsNick Mathewson2013-06-18
| | | | |
| * | | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2013-06-18
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/config.c src/or/relay.c
| | * | | Merge branch 'bug9063_redux_023_squashed' into maint-0.2.3Nick Mathewson2013-06-18
| | |\ \ \
| | | * | | Implement a real OOM-killer for too-long circuit queues.Nick Mathewson2013-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements "algorithm 1" from my discussion of bug #9072: on OOM, find the circuits with the longest queues, and kill them. It's also a fix for #9063 -- without the side-effects of bug #9072. The memory bounds aren't perfect here, and you need to be sure to allow some slack for the rest of Tor's usage. This isn't a perfect fix; the rest of the solutions I describe on codeable.
| | * | | | Limit hidden service descriptors to at most 10 guard nodes.Nick Mathewson2013-06-16
| | |/ / / | | | | | | | | | | | | | | | | | | | | Fixes bug 9002; bugfix on 0.1.1.11-alpha (which introduced guard nodes), or on 0.0.6pre1 (which introduced hidden services).
* | | | | Merge remote-tracking branch 'public/bug9082'Nick Mathewson2013-06-17
|\ \ \ \ \
| * | | | | Fix bug 9082: avoid leak when freeing destroy cell queuesNick Mathewson2013-06-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In my #7912 fix, there wasn't any code to remove entries from the (channel, circuit ID)->circuit map corresponding to queued but un-sent DESTROYs. Spotted by skruffy. Fixes bug 9082; bug not in any released Tor.
* | | | | | Merge branch 'bug9072-024' into bug9072-025Andrea Shepard2013-06-15
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'bug9072-023' into bug9072-024Andrea Shepard2013-06-15
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Disable middle relay queue overfill detection code due to possible guard ↵Andrea Shepard2013-06-15
| | | | | | | | | | | | | | | | | | | | | | | | discovery attack
| | * | | | Increase the limit so leaky pipe might workNick Mathewson2013-06-14
| | | | | |
| | * | | | Don't queue more cells as a middle relay than the spec allows to be in flightAndrea Shepard2013-06-13
| | | | | |
| * | | | | Increase the limit so leaky pipe might workNick Mathewson2013-06-14
| | | | | |
| * | | | | Don't queue more cells as a middle relay than the spec allows to be in flightAndrea Shepard2013-06-13
| | | | | |
* | | | | | Instead of testing for __GNUC__, use CHECK_SCANF, like CHECK_PRINTF.dana koch2013-06-14
| | | | | | | | | | | | | | | | | | | | | | | | This lets us have the possibility of fine-tuning the check in the tor_sscanf test cases at a later date.
* | | | | | Merge branch 'circuit_queue_cap-0.2.5-squashed'Nick Mathewson2013-06-14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/relay.c
| * | | | | | Fix signed/unsigned comparison warningNick Mathewson2013-06-14
| | | | | | |
| * | | | | | Increase the limit so leaky pipe might workNick Mathewson2013-06-14
| | | | | | |
| * | | | | | Don't queue more cells as a middle relay than the spec allows to be in flightAndrea Shepard2013-06-13
| | | | | | |
* | | | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-13
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Define SEEK_SET for platforms that lack it.Nick Mathewson2013-06-13
| | | | | | |
| * | | | | | If we write the annotation but not the microdescriptor, rewind.Nick Mathewson2013-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes bug 9047 (and some parts of 9031, 8922, 8883 that weren't fixed in 8822). Bugfix on 0.2.2.6-alpha.