summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2011-09-07Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/dirserv.c src/or/networkstatus.c Conflicts were related to routerinfo->node shift.
2011-09-07Merge remote-tracking branch 'public/bug2649_squashed' into maint-0.2.2Nick Mathewson
2011-09-07Remove a now-needless test.Nick Mathewson
2011-09-07Merge remote-tracking branch 'public/split_entry_conn'Nick Mathewson
Conflicts: src/or/connection.c src/or/connection_edge.c src/or/connection_edge.h src/or/dnsserv.c Some of these were a little tricky, since they touched code that changed because of the prop171 fixes.
2011-09-07Die if tor_vasprintf fails in connection_printf_to_bufRobert Ransom
tor_asprintf already asserts if it fails.
2011-09-07Merge remote-tracking branch 'public/bug3851'Nick Mathewson
2011-09-06Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/connection_edge.c Conflicted on a router->node transition; fix was easy.
2011-09-06Fix assertion in addressmap_clear_excluded_trackexithostsNick Mathewson
Fixes bug 3923; bugfix on 0.2.2.25-alpha; bugfix from 'laruldan' on trac.
2011-09-02bump to 0.2.3.3-alpha-devRoger Dingledine
2011-09-02bump to 0.2.3.3-alphaRoger Dingledine
2011-09-01Handle test case where fgets() sees EOF on the last readSteven Murdoch
On some platforms, with non-blocking IO, on EOF you first get EAGAIN, and then on the second read you get zero bytes and EOF is set. However on others, the EOF flag is set as soon as the last byte is read. This patch fixes the test case in the latter scenario.
2011-09-01Merge branch 'bug3888'Nick Mathewson
2011-09-01Fix double-closing a stdio streamSteven Murdoch
After a stream reached eof, we fclose it, but then test_util_spawn_background_partial_read() reads from it again, which causes an error and thus another fclose(). Some platforms are fine with this, others (e.g. debian-sid-i386) trigger a double-free() error. The actual code used by Tor (log_from_pipe() and tor_check_port_forwarding()) handle this case correctly.
2011-09-01Explicitly set bucket_cfg to NULL after we freed itSebastian Hahn
This should fix bug 3888.
2011-08-31Tweaks on last process-launch patchesNick Mathewson
2011-09-01Make a version of tor_read_all_handle() for non-Windows platformsSteven Murdoch
Mainly used for testing reading from subprocesses. To be more generic we now pass in a pointer to a process_handle_t rather than a Windows- specific HANDLE.
2011-08-31Fix off-by-one error when allocating memory in test_util_split_lines()Steven Murdoch
Triggered "failed OVER picket-fence magic-number check (err 27)" when memory debugging using dmalloc is enabled (at 'low' or higher).
2011-08-31Add a missing include to util.c to get waitpid() on LinuxNick Mathewson
2011-08-30Rename tor_join_cmdline to tor_join_win_cmdline; tweak doxygenNick Mathewson
2011-08-30Merge remote-tracking branch 'sjmurdoch/bug2046'Nick Mathewson
2011-08-30Document limitation of log_from_handle with partial readsSteven Murdoch
2011-08-30Factor out and re-write code for splitting lines from a handleSteven Murdoch
Now handles non-printable characters and will not output a spurious new-line if given a partial line.
2011-08-29Add a bufferevent note to startup logSebastian Hahn
This should help us easily spot if a tor was built with --enable-bufferevent or not
2011-08-29Fix compilation on non-bufferevent systems after 3803 fix: oops.Nick Mathewson
2011-08-29Split out rephist parts of buckets_decrementNick Mathewson
For bufferevents, we had all of connection_buckets_decrement() stubbed out. But that's not actually right! The rephist_* parts were essential for, inter alia, recording our own bandwidth. This patch splits out the rephist parts of connection_buckets_decrement() into their own function, and makes the bufferevent code call that new function. Fixes bug 3803, and probably 3824 and 3826 too. Bugfix on 0.2.3.1-alpha.
2011-08-29Make FetchUselessDescriptors fetch all desc typesNick Mathewson
Previously, if you were set up to use microdescriptors, and you weren't a cache, you'd never fetch router descriptors (except for bridges). Now FetchUselessDescriptors causes descriptors and mirodescs to get cached. Also, FetchUselessDescriptors changes the behavior of "UseMicrodescriptors auto" to be off, since there's no point in saying "UseMicrodescriptors 1" when you have full descriptors too. Fix for bug 3851; bugfix on 0.2.3.1-alpha.
2011-08-29Refactor out command line formattingSteven Murdoch
Now correctly handles whitespace, quotes and backslashes. Passes all unit tests.
2011-08-29Add a sanity checkSteven Murdoch
2011-08-29Replace two magic tristates with #define'd namesSteven Murdoch
- process_handle_t.status - return value of tor_get_exit_code()
2011-08-28Make signature of tor_spawn_background more conventionalSteven Murdoch
Conventionally in Tor, structs are returned as pointers, so change tor_spawn_background() to return the process handle in a pointer rather than as return value.
2011-08-27Clarify the heartbeat message a bit.George Kadianakis
2011-08-26Fix a bufferevent-related bug that killed tunneled dirserv connsNick Mathewson
Because tunneled connections are implemented with buffervent_pair, writing to them can cause an immediate flush. This means that added to them and then checking to see whether their outbuf is empty is _not_ an adequate way to see whether you added anything. This caused a problem in directory server connections, since they would try spooling a little more data out, and then close the connection if there was no queued data to send. This fix should improve matters; it only closes the connection if there is no more data to spool, and all of the spooling callbacks are supposed to put the dirconn into dir_spool_none on completion. This is bug 3814; Sebastian found it; bugfix on 0.2.3.1-alpha.
2011-08-24Set write low-watermarks on all bufferevents.Nick Mathewson
If we don't do this, then we never invoke the bufferevent write callbacks until all the bufferevent's data is flushed.
2011-08-24Add write watermarks to filtered bufferevents.Nick Mathewson
2011-08-24Apply rate-limiting to the lowest bufferevent in the stack.Nick Mathewson
When we're doing filtering ssl bufferevents, we want the rate-limits to apply to the lowest level of the bufferevent stack, so that we're actually limiting bytes sent on the network. Otherwise, we'll read from the network aggressively, and only limit stuff as we process it.
2011-08-24Appease "make check-spaces"Steven Murdoch
2011-08-24Improve comments and fix one bugSteven Murdoch
2011-08-24We don't need to find our own path, just tell Windows to searchSteven Murdoch
2011-08-24Find test-child.exe by looking in same directory as test.exeSteven Murdoch
2011-08-24Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-08-24lround() missing in MSVCGisle Vanem
lround() is missing in MS Visual-C's <math.h>. Not available anywhere. Here is an easy patch.
2011-08-23Fix compilation errors under *nixSteven Murdoch
2011-08-22Fix test cases to handle MSYS style paths (/c/foo rather than c:/foo)Steven Murdoch
Also fix test case to expect 1 on successfully spawning a subprocess
2011-08-22Tidy up subprocess codeSteven Murdoch
- Better error handling - Write description of functions - Don't assume non-negative process return values
2011-08-22Fix some compiler warningsSteven Murdoch
2011-08-22Merge branch 'bug1983-port-tor-fw-helper-to-windows' into bug2046Steven Murdoch
Conflicts: configure.in src/tools/tor-fw-helper/Makefile.am src/tools/tor-fw-helper/tor-fw-helper-upnp.c src/tools/tor-fw-helper/tor-fw-helper.c
2011-08-22Correct reference to libiphlpapi from libiphlapiSteven Murdoch
2011-08-22Appease "make check spaces"Steven Murdoch
2011-08-19Disable run-time changes to DisableIOCP: They do not workNick Mathewson
2011-08-19Only link ws2_32 and iphlapi on windows.Nick Mathewson
This is a tweak for the tor-fw-helper port to windows.