Nick Mathewson
2163e420b2
Merge remote-tracking branch 'public/bug3560'
2011-07-18 17:57:06 -04:00
Nick Mathewson
99348ce831
Bump version to 0.2.3.2-alpha-dev
2011-07-18 17:56:47 -04:00
Nick Mathewson
218e84b634
Remember optimistically sent data until we have gotten a CONNECTED
...
Since we can retry failed streams under some circumstances, we need
to be ready to send data queued on them.
2011-07-18 15:43:16 -04:00
Nick Mathewson
34a52534bb
Add a generic_buffer_t to use the best buffer type we have on hand
...
Also add a quick function to copy all the data in a buffer. (This
one could be done much better, but let's see if it matters.)
2011-07-18 15:36:20 -04:00
Nick Mathewson
1e441df2d0
Only use optimistic data with exits that support it
...
This adds a little code complexity: we need to remember for each
node whether it supports the right feature, and then check for each
connection whether it's exiting at such a node. We store this in a
flag in the edge_connection_t, and set that flag at link time.
2011-07-18 13:56:22 -04:00
Roger Dingledine
bceb136840
finish the changelog
2011-07-18 13:39:01 -04:00
Roger Dingledine
8cdec1e156
bump to 0.2.3.2-alpha
2011-07-18 13:20:54 -04:00
Roger Dingledine
25ad13ed9c
start folding in the 0.2.3.2-alpha changelog entries
2011-07-18 13:18:46 -04:00
Nick Mathewson
ba5d758104
Initial optimistic_client fixes
...
- Conform to make check-spaces
- Build without warnings from passing size_t to %d
- Use connection_get_inbuf_len(), not buf_datalen (otherwise bufferevents
won't work).
- Don't log that we're using this feature at warn.
2011-07-18 13:00:48 -04:00
Ian Goldberg
326d5c156d
Implement the client side of optimistic data (proposal 174)
2011-07-18 12:56:45 -04:00
Nick Mathewson
bb105ef1f6
Enhance findMergedChanges to allow looking at non-release targets
2011-07-18 12:43:39 -04:00
Nick Mathewson
be5aa47b55
Remove changes files already merged in 0.2.2.30-rc
2011-07-18 12:43:16 -04:00
Roger Dingledine
976027210b
forward-port the 0.2.2.30-rc changelog
2011-07-18 12:16:11 -04:00
George Kadianakis
cfb473ed34
Changed a printf() to a log_debug().
2011-07-18 17:08:55 +02:00
George Kadianakis
69271b2a38
Reuse get_string_from_pipe() in log_from_pipe().
2011-07-18 17:06:16 +02:00
George Kadianakis
51cdd30c01
Let's be smarter while parsing {Client,Server}TransportPlugin lines.
2011-07-18 16:42:31 +02:00
George Kadianakis
14c5a24fe7
Replaced ST_* enum prefix for stream status with IO_STREAM_*.
2011-07-18 02:35:29 +02:00
George Kadianakis
a8f21f91cf
Updated #includes etc. to use transports.[ch].
2011-07-18 02:33:31 +02:00
George Kadianakis
d8c04c7ea5
Renamed pluggable_transports.[ch] to transports.[ch].
2011-07-18 02:19:38 +02:00
Nick Mathewson
975150a13e
Better messages when we're stalled because of microdescriptors
...
It's a little confusing for me to say "only X/Y descriptors" when
I have microdescriptors enabled. So, let's fix that.
2011-07-15 19:38:27 -04:00
Nick Mathewson
b8943461c0
Fix bug in upload/download of hsdesc with microdescs
...
Previously we were using router_get_by_id(foo) to test "do we have a
descriptor that will let us make an anonymous circuit to foo". But
that isn't right for microdescs: we should have been using node_t.
Fixes bug 3601; bugfix on 0.2.3.1-alpha.
2011-07-15 18:55:12 -04:00
Nick Mathewson
8157dcbdf8
Merge remote-tracking branch 'sebastian/compile_warning'
2011-07-15 17:54:49 -04:00
Nick Mathewson
2b660f9781
Fix a wide line. "Tradition!"
2011-07-15 17:53:13 -04:00
Sebastian Hahn
2d0b56a505
Fix a compile warning on OS X 10.6
2011-07-15 23:12:43 +02:00
Nick Mathewson
6aef89bda4
Remove compare_addr_to_node_policy
...
Instead, use compare_tor_addr_to_node_policy everywhere.
One advantage of this is that compare_tor_addr_to_node_policy can
better distinguish 0.0.0.0 from "unknown", which caused a nasty bug
with microdesc users.
2011-07-15 13:04:12 -04:00
Nick Mathewson
f40df02f3e
Treat null address as "unknown", not "rejected" in md policy
...
Previously, we had an issue where we'd treat an unknown address as
0, which turned into "0.0.0.0", which looked like a rejected
address. This meant in practice that as soon as we started doing
comparisons of unknown uint32 addresses to short policies, we'd get
'rejected' right away. Because of the circumstances under which
this would be called, it would only happen when we had local DNS
cached entries and we were looking to launch new circuits.
2011-07-15 13:04:06 -04:00
Nick Mathewson
3380dc9cc0
Remove compare_addr_to_addr_policy
...
Nothing used it but the unit tests; everything else knows to use
compare_tor_addr_to_addr_policy instead.
2011-07-15 12:31:09 -04:00
Nick Mathewson
44cfa53873
Make WIN32_WINNT defines conditional
...
Requested by Gisle Vanem on tor-dev. I'm not quite sure this is the
right solution, but it's probably harmless.
2011-07-15 10:03:59 -04:00
Nick Mathewson
852b131281
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/control.c
2011-07-14 17:22:23 -04:00
Nick Mathewson
866a2828bd
Merge branch 'bug3577' into maint-0.2.2
2011-07-14 17:20:01 -04:00
Nick Mathewson
2e34416c6d
Improve error msg on failed getinfo fingerprint
2011-07-14 17:19:52 -04:00
Nick Mathewson
642cff5bca
Only download microdesc consensus from caches that support it
...
Bugfix on 0.2.3.1-alpha; found by arma; never got a bug number.
2011-07-14 14:19:18 -04:00
Nick Mathewson
d67b304b20
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-07-14 09:51:58 -04:00
Sebastian Hahn
5580fbb0c4
Update HACKING with some more release instructions
2011-07-14 09:51:24 -04:00
George Kadianakis
86b20e0d8a
Reverting the accounting thing introduced in 5492de76
till I think how it should be done properly.
2011-07-14 04:24:10 +02:00
George Kadianakis
684aca7faf
Changed a couple of 180 spec stuff according to #3578 .
...
* Restored "proxy" in external ServerTransportPlugin lines.
* Changed the extended OR port and ORPort env. vars to addr:port.
2011-07-14 01:03:35 +02:00
George Kadianakis
ce419a78c5
Add some unit tests.
2011-07-13 19:06:14 +02:00
George Kadianakis
5492de76dd
Put some last missing pieces together.
...
* Add some utility transport functions in circuitbuild.[ch] so that we
can use them from pt.c.
* Make the accounting system consider traffic coming from proxies.
* Make sure that we only fetch bridge descriptors when all the
transports are configured.
2011-07-13 19:06:07 +02:00
George Kadianakis
9ba2d0e439
Create the pluggable_transports.[ch] source files responsible for talking the 180 talk.
2011-07-13 19:00:28 +02:00
George Kadianakis
810a7a5fa0
Make some utility functions.
...
* Create a function that will get input from a stream, so that we can
communicate with the managed proxy.
* Hackish change to tor_spawn_background() so that we can specify an
environ for our spawn.
2011-07-13 18:59:52 +02:00
George Kadianakis
73a1e98cb9
Add support for managed {Client,Server}TransportPlugin parsing.
2011-07-13 18:58:11 +02:00
Nick Mathewson
5000e59b5f
Change GETINFO fingerprint to look at server_mode, not my_descriptor
...
It's possible for us to be a server and have a fingerprint without
having yet generated a descriptor.
Fixes bug 3577; bugfix on 0.2.0.1-alpha
2011-07-13 12:45:18 -04:00
Nick Mathewson
e8bfe89365
Resolve a warning from the bug1666 branch
2011-07-13 12:13:12 -04:00
Nick Mathewson
1aab5b6b39
Merge remote-tracking branch 'public/bug1666'
...
Conflicts:
doc/spec/socks-extensions.txt
src/or/buffers.c
src/or/config.c
src/or/connection_edge.c
2011-07-13 12:12:16 -04:00
Nick Mathewson
9a6642f6f5
Avoid warning in broken_state_count_compare
2011-07-12 11:23:55 -04:00
Nick Mathewson
16c5a62a66
Add more error checks to socks parsing code
...
Suggested by Linus to avoid uninitialized reads or infinite loops if
it turns out our code is buggier than we had thought.
2011-07-12 10:51:31 -04:00
Nick Mathewson
597da4989e
Merge branch 'bug2798'
2011-07-11 17:04:21 -04:00
Nick Mathewson
d82384658d
Tweaks to bug2798 based on comments by arma
2011-07-11 17:02:03 -04:00
Nick Mathewson
b49e561f01
Turn on microdescriptors for clients
2011-07-11 16:54:43 -04:00
Nick Mathewson
b55e31aeb4
Merge remote-tracking branch 'rransom-tor/bug3427'
2011-07-11 16:32:58 -04:00