July 2011 - tor-commits - lists.torproject.org

r24911: {website} Several projects have moved from svn to git (website/trunk/getinvolved/en)
by Damian Johnson 20 Jul '11

20 Jul '11

Author: atagar Date: 2011-07-20 16:22:54 +0000 (Wed, 20 Jul 2011) New Revision: 24911 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Several projects have moved from svn to git Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2011-07-16 22:34:16 UTC (rev 24910) +++ website/trunk/getinvolved/en/volunteer.wml 2011-07-20 16:22:54 UTC (rev 24911) @@ -351,7 +351,7 @@ <a id="project-vidalia"></a> <h3><a href="<page projects/vidalia>">Vidalia</a> (<a - href="https://svn.torproject.org/vidalia/vidalia/trunk/">code</a>, <a + href="https://gitweb.torproject.org/vidalia.git">code</a>, <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> @@ -370,7 +370,7 @@ <a id="project-arm"></a> <h3><a href="http://www.atagar.com/arm/">Arm</a> (<a - href="https://svn.torproject.org/svn/arm/trunk/">code</a>, <a + href="https://gitweb.torproject.org/arm.git">code</a>, <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> @@ -388,7 +388,7 @@ <a id="project-orbot"></a> <h3><a href="https://guardianproject.info/apps/orbot/">Orbot</a> (<a - href="https://svn.torproject.org/svn/projects/android/trunk/Orbot/">code</a>, <a + href="https://gitweb.torproject.org/orbot.git">code</a>, <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> @@ -484,7 +484,7 @@ <a id="project-gettor"></a> <h3><a href="https://trac.torproject.org/projects/tor/wiki/projects/EmailAutoResponder">GetTor</a> (<a - href="https://svn.torproject.org/svn/projects/gettor/">code</a>, <a + href="https://gitweb.torproject.org/gettor.git">code</a>, <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> @@ -1194,7 +1194,7 @@ <p> The vast majority of arm's more interesting functionality lies in its - backend <a href="https://svn.torproject.org/svn/arm/trunk/src/util/">utilities</a>, so + backend <a href="https://gitweb.torproject.org/arm.git/tree/HEAD:/src/util">utilities</a>, so there should be little to no work decoupling the CLI from its backend. Instead, this project would mostly be UI hacking and experimentation, trying different interfaces to find something that's elegant and simple,

1 0

[arm/packaging] Bumping the debian changelog version
by atagar＠torproject.org 20 Jul '11

20 Jul '11

commit 5806a2139446e1fd4ffe6141f3212886cc1080a0 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 20 08:11:50 2011 -0700 Bumping the debian changelog version --- build/debian/changelog | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/build/debian/changelog b/build/debian/changelog index 11e04bd..7bd2821 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -1,3 +1,9 @@ +tor-arm (1.4.3.0-1) unstable; urgency=low + + * Upstream release 1.4.3.0. + + -- Damian Johnson <atagar(a)torproject.org> Tue, 19 Jul 2011 1:30:43 -0700 + tor-arm (1.4.2.4-1) unstable; urgency=low * Upstream release 1.4.2.4.

1 0

[arm/packaging] fix: correcting path of arm man page
by atagar＠torproject.org 20 Jul '11

20 Jul '11

commit bf76e3e6cc605eaa3bce2e53b438f6ea0e7a1d85 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 20 08:12:45 2011 -0700 fix: correcting path of arm man page --- deb-prep.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/deb-prep.sh b/deb-prep.sh index f054064..c7ae960 100755 --- a/deb-prep.sh +++ b/deb-prep.sh @@ -27,7 +27,7 @@ git archive --format=tar release | (cd ./release_deb && tar xf -) # edits the man page path for the sample armrc to reflect where it's located # on debian: # /usr/share/doc/arm/armrc.sample -> /usr/share/doc/tor-arm/armrc.sample.gz -sed -i 's/\/usr\/share\/doc\/arm\/armrc.sample/\/usr\/share\/doc\/tor-arm\/armrc.sample.gz/g' release_deb/arm.1 +sed -i 's/\/usr\/share\/doc\/arm\/armrc.sample/\/usr\/share\/doc\/tor-arm\/armrc.sample.gz/g' release_deb/src/resources/arm.1 tar czf tor-arm_${debVersion}.orig.tar.gz release_deb

1 0

[tor/master] Add changes file for optimistic client behavior
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit 0118d98b1342b5e135b5a25f2809af627b8602f9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 20 10:44:28 2011 -0400 Add changes file for optimistic client behavior --- changes/optimistic-client | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/changes/optimistic-client b/changes/optimistic-client new file mode 100644 index 0000000..88afb9a --- /dev/null +++ b/changes/optimistic-client @@ -0,0 +1,7 @@ + o Major features: + - When using an exit nodes running 0.2.3.1-alpha and later, + clients can now "optimistically" send data on a stream before + the exit node reports that the stream has opened. This can save + a round trip when starting connections with protocols where the + client speaks first. Implements proposal 181; code by Ian + Goldberg.

1 0

[arm/master] fix: writing blank torrc without GETINFO option
by atagar＠torproject.org 20 Jul '11

20 Jul '11

commit c94f7669daecea8994561e25e7f2c3ed6f44d478 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 20 07:44:23 2011 -0700 fix: writing blank torrc without GETINFO option When "GETINFO config-text" we save a blank torrc rather than providing the user with an error. This option was introduced in Tor 0.2.2.7. Caught by Runa (https://trac.torproject.org/projects/tor/ticket/3614) --- src/util/torConfig.py | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/src/util/torConfig.py b/src/util/torConfig.py index e4570ca..557dc09 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -415,6 +415,19 @@ def saveConf(destination = None, contents = None): if not contents: contents = currentConfig else: isSaveconf &= contents == currentConfig + # The "GETINFO config-text" option was introduced in Tor version 0.2.2.7. If + # we're writing custom contents then this is fine, but if we're trying to + # save the current configuration then we need to fail if it's unavailable. + # Otherwise we'd write a blank torrc as per... + # https://trac.torproject.org/projects/tor/ticket/3614 + + if contents == ['']: + # double check that "GETINFO config-text" is unavailable rather than just + # giving an empty result + + if torTools.getConn().getInfo("config-text") == None: + raise IOError("determining the torrc requires Tor version 0.2.2.7") + currentLocation = None try: currentLocation = getConfigLocation()

1 0

[tor/master] Add a generic_buffer_t to use the best buffer type we have on hand
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit 34a52534bb43b30e19267968807a540ba33abe3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 18 15:36:20 2011 -0400 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.) --- src/or/buffers.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/buffers.h | 19 ++++++++++++++ src/or/or.h | 5 ++++ 3 files changed, 94 insertions(+), 0 deletions(-) diff --git a/src/or/buffers.c b/src/or/buffers.c index 256b507..63132db 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -557,6 +557,39 @@ buf_free(buf_t *buf) tor_free(buf); } +/** Return a new copy of <b>in_chunk</b> */ +static chunk_t * +chunk_copy(const chunk_t *in_chunk) +{ + chunk_t *newch = tor_memdup(in_chunk, CHUNK_ALLOC_SIZE(in_chunk->memlen)); + newch->next = NULL; + if (in_chunk->data) { + off_t offset = in_chunk->data - in_chunk->mem; + newch->data = newch->mem + offset; + } + return newch; +} + +/** Return a new copy of <b>buf</b> */ +buf_t * +buf_copy(const buf_t *buf) +{ + chunk_t *ch; + buf_t *out = buf_new(); + out->default_chunk_size = buf->default_chunk_size; + for (ch = buf->head; ch; ch = ch->next) { + chunk_t *newch = chunk_copy(ch); + if (out->tail) { + out->tail->next = newch; + out->tail = newch; + } else { + out->head = out->tail = newch; + } + } + out->datalen = buf->datalen; + return out; +} + /** Append a new chunk with enough capacity to hold <b>capacity</b> bytes to * the tail of <b>buf</b>. If <b>capped</b>, don't allocate a chunk bigger * than MAX_CHUNK_ALLOC. */ @@ -2374,6 +2407,43 @@ write_to_evbuffer_zlib(struct evbuffer *buf, tor_zlib_state_t *state, } #endif +/** Set *<b>output</b> to contain a copy of the data in *<b>input</b> */ +int +generic_buffer_set_to_copy(generic_buffer_t **output, + const generic_buffer_t *input) +{ +#ifdef USE_BUFFEREVENTS + struct evbuffer_ptr ptr; + size_t remaining = evbuffer_get_length(input); + if (*output) { + evbuffer_drain(*output, evbuffer_get_length(*output)); + } else { + if (!(*output = evbuffer_new())) + return -1; + } + evbuffer_ptr_set((struct evbuffer*)input, &ptr, 0, EVBUFFER_PTR_SET); + while (remaining) { + struct evbuffer_iovec v[4]; + int n_used, i; + n_used = evbuffer_peek((struct evbuffer*)input, -1, &ptr, v, 4); + if (n_used < 0) + return -1; + for (i=0;i<n_used;++i) { + evbuffer_add(*output, v[i].iov_base, v[i].iov_len); + tor_assert(v[i].iov_len <= remaining); + remaining -= v[i].iov_len; + evbuffer_ptr_set((struct evbuffer*)input, + &ptr, v[i].iov_len, EVBUFFER_PTR_ADD); + } + } +#else + if (*output) + buf_free(*output); + *output = buf_copy(input); +#endif + return 0; +} + /** Log an error and exit if <b>buf</b> is corrupted. */ void diff --git a/src/or/buffers.h b/src/or/buffers.h index b0161b9..7b2a2ac 100644 --- a/src/or/buffers.h +++ b/src/or/buffers.h @@ -16,6 +16,7 @@ buf_t *buf_new(void); buf_t *buf_new_with_capacity(size_t size); void buf_free(buf_t *buf); void buf_clear(buf_t *buf); +buf_t *buf_copy(const buf_t *buf); void buf_shrink(buf_t *buf); void buf_shrink_freelists(int free_all); void buf_dump_freelist_sizes(int severity); @@ -67,6 +68,24 @@ int write_to_evbuffer_zlib(struct evbuffer *buf, tor_zlib_state_t *state, int done); #endif +#ifdef USE_BUFFEREVENTS +#define generic_buffer_new() evbuffer_new() +#define generic_buffer_len(b) evbuffer_get_length((b)) +#define generic_buffer_add(b,dat,len) evbuffer_add((b),(dat),(len)) +#define generic_buffer_get(b,buf,buflen) evbuffer_remove((b),(buf),(buflen)) +#define generic_buffer_clear(b) evbuffer_drain((b), evbuffer_get_length((b))) +#define generic_buffer_free(b) evbuffer_free((b)) +#else +#define generic_buffer_new() buf_new() +#define generic_buffer_len(b) buf_datalen((b)) +#define generic_buffer_add(b,dat,len) write_to_buf((dat),(len),(b)) +#define generic_buffer_get(b,buf,buflen) fetch_from_buf((buf),(buflen),(b)) +#define generic_buffer_clear(b) buf_clear((b)) +#define generic_buffer_free(b) buf_free((b)) +#endif +int generic_buffer_set_to_copy(generic_buffer_t **output, + const generic_buffer_t *input); + void assert_buf_ok(buf_t *buf); #ifdef BUFFERS_PRIVATE diff --git a/src/or/or.h b/src/or/or.h index f805215..c784267 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -930,6 +930,11 @@ typedef struct { typedef struct buf_t buf_t; typedef struct socks_request_t socks_request_t; +#ifdef USE_BUFFEREVENTS +#define generic_buffer_t struct evbuffer +#else +#define generic_buffer_t buf_t +#endif /* Values for connection_t.magic: used to make sure that downcasts (casts from * connection_t to foo_connection_t) are safe. */

1 0

[tor/master] Remember optimistically sent data until we have gotten a CONNECTED
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit 218e84b634d10c25a6d5d002a983ddb051278bdf Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 18 15:38:05 2011 -0400 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. --- src/or/connection.c | 7 ++++++- src/or/connection_edge.c | 9 ++++++++- src/or/or.h | 15 ++++++++++++--- src/or/relay.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 68 insertions(+), 7 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 8b9fb12..1ccd2b6 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -444,7 +444,12 @@ _connection_free(connection_t *conn) tor_free(edge_conn->chosen_exit_name); if (edge_conn->socks_request) socks_request_free(edge_conn->socks_request); - + if (edge_conn->pending_optimistic_data) { + generic_buffer_free(edge_conn->pending_optimistic_data); + } + if (edge_conn->sending_optimistic_data) { + generic_buffer_free(edge_conn->sending_optimistic_data); + } rend_data_free(edge_conn->rend_data); } if (conn->type == CONN_TYPE_CONTROL) { diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 20f8bc9..79f0db0 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -738,6 +738,12 @@ connection_ap_detach_retriable(edge_connection_t *conn, origin_circuit_t *circ, { control_event_stream_status(conn, STREAM_EVENT_FAILED_RETRIABLE, reason); conn->_base.timestamp_lastread = time(NULL); + + if (conn->pending_optimistic_data) { + generic_buffer_set_to_copy(&conn->sending_optimistic_data, + conn->pending_optimistic_data); + } + if (!get_options()->LeaveStreamsUnattached || conn->use_begindir) { /* If we're attaching streams ourself, or if this connection is * a tunneled directory connection, then just attach it. */ @@ -2429,7 +2435,8 @@ connection_ap_handshake_send_begin(edge_connection_t *ap_conn) control_event_stream_status(ap_conn, STREAM_EVENT_SENT_CONNECT, 0); /* If there's queued-up data, send it now */ - if (connection_get_inbuf_len(TO_CONN(ap_conn)) && + if ((connection_get_inbuf_len(TO_CONN(ap_conn)) || + ap_conn->sending_optimistic_data) && connection_ap_supports_optimistic_data(ap_conn)) { log_info(LD_APP, "Sending up to %ld bytes of queued-up data", connection_get_inbuf_len(TO_CONN(ap_conn))); diff --git a/src/or/or.h b/src/or/or.h index c784267..7097b5f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1237,11 +1237,20 @@ typedef struct edge_connection_t { * NATd connection */ unsigned int is_transparent_ap:1; - /** Set if this connection's target exit node allows optimistic data. - * (That is, data sent on this stream before the exit has sent a - * CONNECTED cell.)*/ + /** For AP connections only: Set if this connection's target exit node + * allows optimistic data. (That is, data sent on this stream before + * the exit has sent a CONNECTED cell.)*/ unsigned int exit_allows_optimistic_data : 1; + /** For AP connections only: buffer for data that we have sent + * optimistically, which we might need to re-send if we have to + * retry this connection. */ + generic_buffer_t *pending_optimistic_data; + /* For AP connections only: buffer for data that we previously sent + * optimistically which we are currently re-sending as we retry this + * connection. */ + generic_buffer_t *sending_optimistic_data; + /** If this is a DNSPort connection, this field holds the pending DNS * request that we're going to try to answer. */ struct evdns_server_request *dns_server_request; diff --git a/src/or/relay.c b/src/or/relay.c index df6d0a8..3fa31a3 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -944,6 +944,12 @@ connection_edge_process_relay_cell_not_open( break; } } + /* This is definitely a success, so forget about any pending data we + * had sent. */ + if (conn->pending_optimistic_data) { + generic_buffer_free(conn->pending_optimistic_data); + conn->pending_optimistic_data = NULL; + } /* handle anything that might have queued */ if (connection_edge_package_raw_inbuf(conn, 1, NULL) < 0) { @@ -1343,6 +1349,10 @@ connection_edge_package_raw_inbuf(edge_connection_t *conn, int package_partial, char payload[CELL_PAYLOAD_SIZE]; circuit_t *circ; unsigned domain = conn->cpath_layer ? LD_APP : LD_EXIT; + int sending_from_optimistic = 0; + const int sending_optimistically = + conn->_base.type == CONN_TYPE_AP && + conn->_base.state != AP_CONN_STATE_OPEN; tor_assert(conn); @@ -1375,7 +1385,18 @@ connection_edge_package_raw_inbuf(edge_connection_t *conn, int package_partial, return 0; } - amount_to_process = connection_get_inbuf_len(TO_CONN(conn)); + sending_from_optimistic = conn->sending_optimistic_data != NULL; + + if (PREDICT_UNLIKELY(sending_from_optimistic)) { + amount_to_process = generic_buffer_len(conn->sending_optimistic_data); + if (PREDICT_UNLIKELY(!amount_to_process)) { + log_warn(LD_BUG, "sending_optimistic_data was non-NULL but empty"); + amount_to_process = connection_get_inbuf_len(TO_CONN(conn)); + sending_from_optimistic = 0; + } + } else { + amount_to_process = connection_get_inbuf_len(TO_CONN(conn)); + } if (!amount_to_process) return 0; @@ -1391,11 +1412,30 @@ connection_edge_package_raw_inbuf(edge_connection_t *conn, int package_partial, stats_n_data_bytes_packaged += length; stats_n_data_cells_packaged += 1; - connection_fetch_from_buf(payload, length, TO_CONN(conn)); + if (PREDICT_UNLIKELY(sending_from_optimistic)) { + /* XXX023 We could be more efficient here by sometimes packing + * previously-sent optimistic data in the same cell with data + * from the inbuf. */ + generic_buffer_get(conn->sending_optimistic_data, payload, length); + if (!generic_buffer_len(conn->sending_optimistic_data)) { + generic_buffer_free(conn->sending_optimistic_data); + conn->sending_optimistic_data = NULL; + } + } else { + connection_fetch_from_buf(payload, length, TO_CONN(conn)); + } log_debug(domain,"(%d) Packaging %d bytes (%d waiting).", conn->_base.s, (int)length, (int)connection_get_inbuf_len(TO_CONN(conn))); + if (sending_optimistically && !sending_from_optimistic) { + /* This is new optimistic data; remember it in case we need to detach and + retry */ + if (!conn->pending_optimistic_data) + conn->pending_optimistic_data = generic_buffer_new(); + generic_buffer_add(conn->pending_optimistic_data, payload, length); + } + if (connection_edge_send_command(conn, RELAY_COMMAND_DATA, payload, length) < 0 ) /* circuit got marked for close, don't continue, don't need to mark conn */

1 0

[tor/master] Unit test for generic_buffer_set_to_copy
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit 9a7c16fb00c6ffc32ef7d6cc7fbede5258fe4390 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 20 09:34:19 2011 -0400 Unit test for generic_buffer_set_to_copy --- src/test/test.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 0 deletions(-) diff --git a/src/test/test.c b/src/test/test.c index 05f5922..e7d4ccb 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -569,6 +569,71 @@ test_socks_5_auth_before_negotiation(void *ptr) ; } +static void +test_buffer_copy(void *arg) +{ + generic_buffer_t *buf=NULL, *buf2=NULL; + const char *s; + size_t len; + char b[256]; + int i; + (void)arg; + + buf = generic_buffer_new(); + tt_assert(buf); + + /* Copy an empty buffer. */ + tt_int_op(0, ==, generic_buffer_set_to_copy(&buf2, buf)); + tt_assert(buf2); + tt_int_op(0, ==, generic_buffer_len(buf2)); + + /* Now try with a short buffer. */ + s = "And now comes an act of enormous enormance!"; + len = strlen(s); + generic_buffer_add(buf, s, len); + tt_int_op(len, ==, generic_buffer_len(buf)); + /* Add junk to buf2 so we can test replacing.*/ + generic_buffer_add(buf2, "BLARG", 5); + tt_int_op(0, ==, generic_buffer_set_to_copy(&buf2, buf)); + tt_int_op(len, ==, generic_buffer_len(buf2)); + generic_buffer_get(buf2, b, len); + test_mem_op(b, ==, s, len); + /* Now free buf2 and retry so we can test allocating */ + generic_buffer_free(buf2); + buf2 = NULL; + tt_int_op(0, ==, generic_buffer_set_to_copy(&buf2, buf)); + tt_int_op(len, ==, generic_buffer_len(buf2)); + generic_buffer_get(buf2, b, len); + test_mem_op(b, ==, s, len); + /* Clear buf for next test */ + generic_buffer_get(buf, b, len); + tt_int_op(generic_buffer_len(buf),==,0); + + /* Okay, now let's try a bigger buffer. */ + s = "Quis autem vel eum iure reprehenderit qui in ea voluptate velit " + "esse quam nihil molestiae consequatur, vel illum qui dolorem eum " + "fugiat quo voluptas nulla pariatur?"; + len = strlen(s); + for (i = 0; i < 256; ++i) { + b[0]=i; + generic_buffer_add(buf, b, 1); + generic_buffer_add(buf, s, len); + } + tt_int_op(0, ==, generic_buffer_set_to_copy(&buf2, buf)); + tt_int_op(generic_buffer_len(buf2), ==, generic_buffer_len(buf)); + for (i = 0; i < 256; ++i) { + generic_buffer_get(buf2, b, len+1); + tt_int_op((unsigned char)b[0],==,i); + test_mem_op(b+1, ==, s, len); + } + + done: + if (buf) + generic_buffer_free(buf); + if (buf2) + generic_buffer_free(buf2); +} + /** Run unit tests for buffers.c */ static void test_buffers(void) @@ -1612,6 +1677,7 @@ const struct testcase_setup_t legacy_setup = { static struct testcase_t test_array[] = { ENT(buffers), + { "buffer_copy", test_buffer_copy, 0, NULL, NULL }, ENT(onion_handshake), ENT(circuit_timeout), ENT(policies),

1 0

[tor/master] Merge branch 'optimistic-client'
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit eaa1c05397c1a6cf2f58b7c41e388311d5aa8ffb Merge: 195bcb6 9a7c16f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 20 09:50:53 2011 -0400 Merge branch 'optimistic-client' The conflicts are with the proposal 171 circuit isolation code, and they're all trivial: they're just a matter of both branches adding some unrelated code in the same places. Conflicts: src/or/circuituse.c src/or/connection.c src/or/buffers.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++ src/or/buffers.h | 19 ++++++++++++ src/or/circuituse.c | 21 ++++++++++++++ src/or/connection.c | 6 ++++ src/or/connection_edge.c | 52 +++++++++++++++++++++++++++++++++- src/or/or.h | 22 ++++++++++++++ src/or/relay.c | 44 +++++++++++++++++++++++++++- src/or/routerparse.c | 3 ++ src/test/test.c | 66 +++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 300 insertions(+), 3 deletions(-) diff --cc src/or/circuituse.c index b486044,3c8cacb..1bc518b --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@@ -1568,8 -1472,23 +1571,26 @@@ link_apconn_to_circ(edge_connection_t * apconn->cpath_layer = circ->cpath->prev; } + circ->isolation_any_streams_attached = 1; + connection_edge_update_circuit_isolation(apconn, circ, 0); ++ + /* See if we can use optimistic data on this circuit */ + if (apconn->cpath_layer->extend_info && + (exitnode = node_get_by_id( + apconn->cpath_layer->extend_info->identity_digest)) && + exitnode->rs) { + /* Okay; we know what exit node this is. */ + if (circ->_base.purpose == CIRCUIT_PURPOSE_C_GENERAL && + exitnode->rs->version_supports_optimistic_data) + apconn->exit_allows_optimistic_data = 1; + else + apconn->exit_allows_optimistic_data = 0; + log_info(LD_APP, "Looks like completed circuit to %s %s allow " + "optimistic data for connection to %s", + safe_str_client(node_describe(exitnode)), + apconn->exit_allows_optimistic_data ? "does" : "doesn't", + safe_str_client(apconn->socks_request->address)); + } } /** Return true iff <b>address</b> is matched by one of the entries in diff --cc src/or/connection.c index 59a7b80,1ccd2b6..3950f90 --- a/src/or/connection.c +++ b/src/or/connection.c @@@ -467,9 -442,14 +467,15 @@@ _connection_free(connection_t *conn if (CONN_IS_EDGE(conn)) { edge_connection_t *edge_conn = TO_EDGE_CONN(conn); tor_free(edge_conn->chosen_exit_name); + tor_free(edge_conn->original_dest_address); if (edge_conn->socks_request) socks_request_free(edge_conn->socks_request); + if (edge_conn->pending_optimistic_data) { + generic_buffer_free(edge_conn->pending_optimistic_data); + } + if (edge_conn->sending_optimistic_data) { + generic_buffer_free(edge_conn->sending_optimistic_data); + } rend_data_free(edge_conn->rend_data); } if (conn->type == CONN_TYPE_CONTROL) {

1 0

[tor/master] Initial optimistic_client fixes
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit ba5d75810493f237edbb7f4f149d61f1ca08e605 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 18 13:00:48 2011 -0400 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. --- src/or/connection_edge.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 7551c39..6f91d1a 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -165,8 +165,10 @@ connection_edge_process_inbuf(edge_connection_t *conn, int package_partial) return 0; case AP_CONN_STATE_CONNECT_WAIT: log_info(LD_EDGE, - "data from edge while in '%s' state. Sending it anyway. package_partial=%d, buflen=%d", - conn_state_to_string(conn->_base.type, conn->_base.state), package_partial, buf_datalen(TO_CONN(conn)->inbuf)); + "data from edge while in '%s' state. Sending it anyway. " + "package_partial=%d, buflen=%ld", + conn_state_to_string(conn->_base.type, conn->_base.state), + package_partial, connection_get_inbuf_len(TO_CONN(conn))); if (connection_edge_package_raw_inbuf(conn, package_partial, NULL) < 0) { /* (We already sent an end cell if possible) */ connection_mark_for_close(TO_CONN(conn)); @@ -2406,7 +2408,8 @@ connection_ap_handshake_send_begin(edge_connection_t *ap_conn) control_event_stream_status(ap_conn, STREAM_EVENT_SENT_CONNECT, 0); /* If there's queued-up data, send it now */ - log_warn(LD_APP, "Possibly sending queued-up data: %d", buf_datalen(TO_CONN(ap_conn)->inbuf)); + log_info(LD_APP, "Possibly sending queued-up data: %ld", + connection_get_inbuf_len(TO_CONN(ap_conn))); if (connection_edge_package_raw_inbuf(ap_conn, 1, NULL) < 0) { connection_mark_for_close(TO_CONN(ap_conn)); }

1 0