41dfc4c19c
Make bufferevents work with TokenBucketRefillInterval
2011-09-22 15:07:34 -04:00
40288e1e66
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-09-20 10:25:56 -04:00
1ba90ab655
Fix a potentially useless integer overflow check.
...
GCC 4.2 and maybe other compilers optimize away unsigned integer
overflow checks of the form (foo + bar < foo), for all bar.
Fix one such check in `src/common/OpenBSD_malloc_Linux.c'.
2011-09-20 09:52:44 -04:00
a41f1fc612
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
configure.in
src/or/circuitbuild.c
2011-09-09 12:58:12 -04:00
cfa9ee5fe7
Fix double-closing a stdio stream
...
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-01 14:15:54 +01:00
6a3e4a89a2
Tweaks on last process-launch patches
2011-08-31 22:14:38 -04:00
5b8a20ed44
Make a version of tor_read_all_handle() for non-Windows platforms
...
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-09-01 01:43:44 +01:00
a7c07605d0
Add a missing include to util.c to get waitpid() on Linux
2011-08-31 00:36:43 -04:00
0ac4b0f99d
Check for lround with autoconf; fall back to rint.
2011-08-30 22:22:15 -04:00
03760f6c6f
Fix a compilation issue on older FreeBSDs
2011-08-30 20:45:49 -04:00
2778cdd671
Rename tor_join_cmdline to tor_join_win_cmdline; tweak doxygen
2011-08-30 16:00:08 -04:00
4f585b9ee2
Merge remote-tracking branch 'sjmurdoch/bug2046'
2011-08-30 15:51:45 -04:00
d1dd9991cd
Document limitation of log_from_handle with partial reads
2011-08-30 15:02:28 +01:00
da34360952
Factor out and re-write code for splitting lines from a handle
...
Now handles non-printable characters and will not output a spurious
new-line if given a partial line.
2011-08-30 14:55:51 +01:00
bc97f41080
Refactor out command line formatting
...
Now correctly handles whitespace, quotes and backslashes. Passes all unit tests.
2011-08-29 14:37:38 +01:00
93792b5aa6
Add a sanity check
2011-08-29 00:36:41 +01:00
f1ff65dfad
Replace two magic tristates with #define'd names
...
- process_handle_t.status
- return value of tor_get_exit_code()
2011-08-29 00:30:18 +01:00
3f0a197aad
Make signature of tor_spawn_background more conventional
...
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-28 23:35:02 +01:00
f186e16241
Add write watermarks to filtered bufferevents.
2011-08-24 17:31:37 -04:00
59d0f750c9
Apply rate-limiting to the lowest bufferevent in the stack.
...
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-24 17:31:32 -04:00
1da5081ae0
Appease "make check-spaces"
2011-08-24 21:34:13 +01:00
50b48c3ea7
Improve comments and fix one bug
2011-08-24 21:33:53 +01:00
476807211c
We don't need to find our own path, just tell Windows to search
2011-08-24 20:50:58 +01:00
ede9cd4f99
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-08-24 13:53:17 -04:00
5939c09d35
lround() missing in MSVC
...
lround() is missing in MS Visual-C's <math.h>. Not available anywhere.
Here is an easy patch.
2011-08-24 13:52:44 -04:00
2efafdfe14
Fix compilation errors under *nix
2011-08-23 01:09:24 +01:00
1ad986335a
Tidy up subprocess code
...
- Better error handling
- Write description of functions
- Don't assume non-negative process return values
2011-08-22 19:43:38 +01:00
f46f6aabb4
Fix some compiler warnings
2011-08-22 18:13:58 +01:00
6443a756df
Merge branch 'bug1983-port-tor-fw-helper-to-windows' into bug2046
...
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-22 17:53:17 +01:00
d3653063d3
Automatically use filtering bufferevents with IOCP.
2011-08-18 15:16:05 -04:00
cc5b6d6cee
Merge remote branch 'origin/master' into bug2046
2011-08-18 18:42:02 +01:00
7d015c886a
Complete logging of output from port forwarding helper
2011-08-18 18:41:23 +01:00
52e36feda1
Call evthread_use_windows_threads when running with IOCP on windows
2011-08-17 14:44:16 -04:00
6a06f45b04
Actually pick a random port when "auto" is specified
...
ddc65e2b33
2011-08-17 10:41:36 -04:00
f137ae896e
Don't warn on http connection to my orport
...
Also remove a few other related warnings that could occur during the ssl
handshake. We do this because the relay operator can't do anything about
them, and they aren't their fault.
2011-08-11 20:37:51 +02:00
b76f46c6d8
Merge branch 'bug1692-squashed'
2011-08-10 15:04:36 -04:00
e42a74e563
Add smartlist_[v]asprintf_add
...
I should have added this before implementing #2411 .
2011-08-10 15:03:24 -04:00
bed79c47f4
Get rid of an unused parameter warning on win
2011-08-09 11:03:17 +02:00
0a5338e03c
Sockets are unsigned on windows
...
this gets rid of a warning about signed/unsigned comparison
2011-08-09 11:03:16 +02:00
e802199cb3
Initial patch to build Tor with msvc and nmake
...
We'll still need to tweak it so that it looks for includes and
libraries somewhere more sensible than "where we happened to find
them on Erinn's system"; so that tests and tools get built too;
so that it's a bit documented; and so that we actually try running
the output.
Work done with Erinn Clark.
2011-08-01 12:36:59 -04:00
5bf9890b3b
Test case for reading the partial output of a background process
2011-07-25 04:08:08 +01:00
99baa7e45c
Fix compilation on non-Windows platforms
2011-07-23 23:49:30 +01:00
c5796a8fb2
If hProcess is NULL, read_all_handle returns if it would block
2011-07-23 21:35:50 +01:00
2d5059e08e
Use PeekNamedPipe to avoid blocking ReadFile when there is nothing to read
2011-07-22 21:12:00 +01:00
55a1cb53d6
Add code to read all from a handle, but this block forever
...
See http://stackoverflow.com/questions/3722409/windows-child-process-with-redirected-input-and-output
for a potential solution
2011-07-22 15:57:56 +01:00
fec902dd60
Add Windows version of tor_spawn_background and ancillary functions
2011-07-21 19:26:19 +01:00
35c89be02b
Generalize process spawning so its test compiles (but fails) in Windows
...
- pid, stdout/stderr_pipe now encapsulated in process_handle
- read_all replaced by tor_read_all_from_process_stdin/stderr
- waitpid replaced by tor_get_exit_code
Untested on *nix
2011-07-21 16:34:48 +01:00
1d7beea2ab
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-07-20 13:17:59 -04:00
718252b253
Check return value in fmt_addr
...
Previously, if tor_addr_to_str() returned NULL, we would reuse the
last value returned by fmt_addr(). (This could happen if we were
erroneously asked to format an AF_UNSPEC address.) Now instead we
return "???".
2011-07-20 13:17:48 -04:00
94f85f216a
Turn streq_opt into a generic strcmp_opt.
2011-07-19 02:36:11 -04:00
Nick Mathewson
Mansour Moufid
Steven Murdoch
Sebastian Hahn
Gisle Vanem
Robert Ransom