Nick Mathewson
372262b458
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-08-25 18:55:28 -04:00
Sebastian Hahn
cc33ac362b
Mention that HiddenServiceDir must exist
2011-08-25 22:26:54 +02:00
Roger Dingledine
870c55b6fd
manually forward-port 2871dd8bef
2011-08-25 15:51:24 -04:00
Nick Mathewson
b161674d5d
Merge branch 'bufev_ratelim_and_wm'
2011-08-24 17:57:55 -04:00
Nick Mathewson
dfcd3d9ce0
Set write low-watermarks on all bufferevents.
...
If we don't do this, then we never invoke the bufferevent write
callbacks until all the bufferevent's data is flushed.
2011-08-24 17:31:37 -04:00
Nick Mathewson
f186e16241
Add write watermarks to filtered bufferevents.
2011-08-24 17:31:37 -04:00
Nick Mathewson
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
Steven Murdoch
1da5081ae0
Appease "make check-spaces"
2011-08-24 21:34:13 +01:00
Steven Murdoch
50b48c3ea7
Improve comments and fix one bug
2011-08-24 21:33:53 +01:00
Steven Murdoch
476807211c
We don't need to find our own path, just tell Windows to search
2011-08-24 20:50:58 +01:00
Steven Murdoch
6304e088d0
Find test-child.exe by looking in same directory as test.exe
2011-08-24 19:56:38 +01:00
Nick Mathewson
ede9cd4f99
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-08-24 13:53:17 -04:00
Gisle Vanem
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
Steven Murdoch
2efafdfe14
Fix compilation errors under *nix
2011-08-23 01:09:24 +01:00
Steven Murdoch
50504fc4cb
Fix test cases to handle MSYS style paths (/c/foo rather than c:/foo)
...
Also fix test case to expect 1 on successfully spawning a subprocess
2011-08-22 20:05:11 +01:00
Steven Murdoch
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
Steven Murdoch
f46f6aabb4
Fix some compiler warnings
2011-08-22 18:13:58 +01:00
Steven Murdoch
a78ffd9e45
Revert change to libminiupnpc search path
...
This was supposed to fix an oddity with library searching in autoconf
but it didn't actually fix anything.
2011-08-22 17:55:40 +01:00
Steven Murdoch
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
Steven Murdoch
850d8c9eb8
Correct reference to libiphlpapi from libiphlapi
2011-08-22 17:38:43 +01:00
Steven Murdoch
c5e74fc60d
Appease "make check spaces"
2011-08-22 16:31:30 +01:00
Nick Mathewson
dd6a9a923d
Disable run-time changes to DisableIOCP: They do not work
2011-08-19 17:07:54 -04:00
Nick Mathewson
269c0b4633
Only link ws2_32 and iphlapi on windows.
...
This is a tweak for the tor-fw-helper port to windows.
2011-08-19 13:20:15 -04:00
Steven Murdoch
2ad336f999
Link and build tor-fw-helper on Windows
...
- Update configure script to test for libminiupnpc along with the
libws2_32 and libiphlpapi libraries required by libminiupnpc
- When building tor-fw-helper, link in libiphlpapi
- Link in libminiupnpc statically becasue I could not get the DLL
to link properly
- Call WSAStartup before doing network operations
- Fix up a compiler warning about uninitialized backend_state
N.B. The changes to configure.in and Makefile.am will break on non-
Windows platforms.
2011-08-19 15:22:13 +01:00
Nick Mathewson
df96aed14f
Remove warning about a loop parsing evbuffer socks
...
This behavior is normal when we want more data than the evbuffer
actually has for us. We'll ask for (say) 7 bytes, get only 5
(because that's all there is), try to parse the 5 bytes, and get
told "no, I want 7". One option would be to bail out early whenever
want_length is > buflen, but sometimes we use an over-large
want_length. So instead, let's just remove the warning here: it's
not a bug after all.
2011-08-18 16:15:03 -04:00
Nick Mathewson
263d68aa82
Appease "make check-spaces"
2011-08-18 15:17:37 -04:00
Nick Mathewson
d3653063d3
Automatically use filtering bufferevents with IOCP.
2011-08-18 15:16:05 -04:00
Steven Murdoch
cc5b6d6cee
Merge remote branch 'origin/master' into bug2046
2011-08-18 18:42:02 +01:00
Steven Murdoch
7d015c886a
Complete logging of output from port forwarding helper
2011-08-18 18:41:23 +01:00
Nick Mathewson
52e36feda1
Call evthread_use_windows_threads when running with IOCP on windows
2011-08-17 14:44:16 -04:00
Nick Mathewson
d2cd67c83f
Use evbuffer_copyout() in inspect_evbuffer().
2011-08-17 13:09:05 -04:00
Nick Mathewson
8932919366
Bufferevents now requires Libevent 2.0.13-stable.
...
(Earlier Libevent versions have bufferevent bugs that affect us, and
are missing some APIs that it would be handy to use.)
2011-08-17 12:53:50 -04:00
Nick Mathewson
06be6105e4
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/config.c
2011-08-17 12:00:44 -04:00
Nick Mathewson
d79d648edc
Don't write ControlPorts to disk till after we setuid and make datadir
...
Fix for bug 3747; bugfix on 0.2.2.26-beta.
2011-08-17 11:22:16 -04:00
Nick Mathewson
14552a12b3
Merge branch 'bug3743'
2011-08-17 10:46:28 -04:00
Nick Mathewson
6650dc932a
Remove a needless config_find_option
2011-08-17 10:46:22 -04:00
Sebastian Hahn
6a06f45b04
Actually pick a random port when "auto" is specified
...
ddc65e2b33
had broken this
2011-08-17 10:41:36 -04:00
Kamran Riaz Khan
e6e804848c
Don't compare LINELIST_S and OBSOLETE config options.
2011-08-16 06:28:38 +05:00
George Kadianakis
db4cde3810
Improve the code a tad.
...
* Use strcmpstart() instead of strcmp(x,y,strlen(y)).
* Warn the user if the managed proxy failed to launch.
* Improve function documentation.
* Use smartlist_len() instead of n_unconfigured_proxies.
* Split managed_proxy_destroy() to managed_proxy_destroy()
and managed_proxy_destroy_with_transports().
* Constification.
2011-08-15 17:26:03 +02:00
Nick Mathewson
2dc40b9c49
Merge remote-tracking branch 'asn/bug3728'
2011-08-15 11:06:50 -04:00
Nick Mathewson
aeb27526f8
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-08-15 10:54:55 -04:00
Robert Ransom
03f6ee8c5f
Remove extra quotation marks around the result of esc_for_log
2011-08-15 10:54:19 -04:00
Nick Mathewson
0ddc8de0b6
Oops; _actually_ enable microdesc-by-default for clients
...
It turns out that it wasn't enough to set the configuration to
"auto", since the correct behavior for "auto" had been disabled in
microdesc.c. :p
(Hasn't been in a release yet, so doesn't need a changes entry.)
2011-08-15 10:52:23 -04:00
George Kadianakis
ec8d0a6d83
Free global_rate_limit in connection_free_all().
2011-08-13 20:37:13 +02:00
George Kadianakis
a5fd07d178
Move connection_free_all() to the bottom of connection.c to enjoy maximum visibility.
2011-08-13 20:29:22 +02:00
George Kadianakis
ea3e9416c6
Spawn multiple protocols using a single managed proxy.
...
If multiple torrc transport lines have the same argv, tor instructs a
single managed proxy to launch multiple protocols.
2011-08-12 21:33:05 +02:00
Nick Mathewson
70216cb096
Merge remote-tracking branch 'sebastian/bug3700'
2011-08-11 14:42:15 -04:00
Sebastian Hahn
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
Nick Mathewson
8c643b51bf
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-08-11 11:53:03 -04:00
Sebastian Hahn
cd44145c5b
Merge branch 'bug3643'
2011-08-11 07:56:38 +02:00