- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Merge branch 'bug1297a' into maint-0.2.2
by nickm＠torproject.org 30 May '11

30 May '11

commit 16cfca501ff27dd11daa9dc75ba9f5d99c48bdf5 Merge: 5f182ea 8fc02a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 30 12:25:07 2011 -0400 Merge branch 'bug1297a' into maint-0.2.2 changes/bug1297a | 16 ++++++++++++++++ src/or/circuituse.c | 11 ----------- src/or/or.h | 5 +++++ src/or/rendclient.c | 11 +++++++++++ 4 files changed, 32 insertions(+), 11 deletions(-)

1 0

[tor/maint-0.2.2] Use the normal four-hop CBT for client intro circuits
by nickm＠torproject.org 30 May '11

30 May '11

commit 8fc02a8e0ca431e4b61e54ed0aa10e7f0215c340 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun May 29 08:21:43 2011 -0700 Use the normal four-hop CBT for client intro circuits Fixes another part of bug 1297. --- changes/bug1297a | 8 ++++++++ src/or/circuituse.c | 11 ----------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/changes/bug1297a b/changes/bug1297a index 459ef65..140b94e 100644 --- a/changes/bug1297a +++ b/changes/bug1297a @@ -5,4 +5,12 @@ creation; it was supposed to be applied based on time since the circuit entered its current state. Bugfix on 0.0.6; fixes part of bug 1297. + - Use the same circuit timeout for client-side introduction + circuits as for other four-hop circuits. Previously, + client-side introduction circuits were closed after the same + timeout as single-hop directory-fetch circuits; this was + appropriate with the static circuit build timeout in 0.2.1.x and + earlier, but caused many hidden service access attempts to fail + with the adaptive CBT introduced in 0.2.2.2-alpha. Bugfix on + 0.2.2.2-alpha; fixes another part of bug 1297. diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 7289aa5..97ac560 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -288,7 +288,6 @@ circuit_expire_building(void) struct timeval general_cutoff, begindir_cutoff, fourhop_cutoff, cannibalize_cutoff, close_cutoff, extremely_old_cutoff; struct timeval now; - struct timeval introcirc_cutoff; cpath_build_state_t *build_state; tor_gettimeofday(&now); @@ -307,8 +306,6 @@ circuit_expire_building(void) SET_CUTOFF(close_cutoff, circ_times.close_ms); SET_CUTOFF(extremely_old_cutoff, circ_times.close_ms*2 + 1000); - introcirc_cutoff = begindir_cutoff; - while (next_circ) { struct timeval cutoff; victim = next_circ; @@ -325,8 +322,6 @@ circuit_expire_building(void) cutoff = fourhop_cutoff; else if (TO_ORIGIN_CIRCUIT(victim)->has_opened) cutoff = cannibalize_cutoff; - else if (victim->purpose == CIRCUIT_PURPOSE_C_INTRODUCING) - cutoff = introcirc_cutoff; else if (victim->purpose == CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT) cutoff = close_cutoff; else @@ -337,12 +332,6 @@ circuit_expire_building(void) #if 0 /* some debug logs, to help track bugs */ - if (victim->purpose == CIRCUIT_PURPOSE_C_INTRODUCING && - victim->timestamp_created <= introcirc_cutoff && - victim->timestamp_created > general_cutoff) - log_info(LD_REND|LD_CIRC, "Timing out introduction circuit which we " - "would not have done if it had been a general circuit."); - if (victim->purpose >= CIRCUIT_PURPOSE_C_INTRODUCING && victim->purpose <= CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED) { if (!victim->timestamp_dirty)

1 0

[obfsproxy/master] Revive unit tests accordingly (and also shove some unit test bugs under the rug)
by nickm＠torproject.org 30 May '11

30 May '11

commit 2153e2034f0214d023824bc2796efef036d64428 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun May 29 06:57:01 2011 +0200 Revive unit tests accordingly (and also shove some unit test bugs under the rug) --- src/test/unittest_obfs2.c | 92 +++++++++++++++++++++++++------------------- 1 files changed, 52 insertions(+), 40 deletions(-) diff --git a/src/test/unittest_obfs2.c b/src/test/unittest_obfs2.c index 052c909..9226cdf 100644 --- a/src/test/unittest_obfs2.c +++ b/src/test/unittest_obfs2.c @@ -21,6 +21,7 @@ #include "../util.h" #include "../protocol.h" #include "../protocols/obfs2.h" +#include "../network.h" /* Make sure we can successfully set up a protocol state */ static void @@ -33,18 +34,18 @@ test_proto_setup(void *data) protocol_params_t *proto_params_serv = calloc(1, sizeof(protocol_params_t)); tt_assert(proto_params_serv); - proto_params_serv->is_initiator = 1; + proto_params_serv->is_initiator = 0; proto_params_serv->shared_secret = "hahaha"; proto_params_serv->shared_secret_len = 7; protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); tt_assert(proto_params_client); - proto_params_client->is_initiator = 0; + proto_params_client->is_initiator = 1; proto_params_client->shared_secret = "hahaha"; proto_params_client->shared_secret_len = 7; - client_proto = proto_new(OBFS2_PROTOCOL,proto_params_serv); - server_proto = proto_new(OBFS2_PROTOCOL,proto_params_client); + client_proto = proto_new(OBFS2_PROTOCOL,proto_params_client); + server_proto = proto_new(OBFS2_PROTOCOL,proto_params_serv); tt_assert(client_proto); tt_assert(server_proto); @@ -74,18 +75,18 @@ test_proto_handshake(void *data) protocol_params_t *proto_params_serv = calloc(1, sizeof(protocol_params_t)); tt_assert(proto_params_serv); - proto_params_serv->is_initiator = 1; + proto_params_serv->is_initiator = 0; proto_params_serv->shared_secret = "hahaha"; proto_params_serv->shared_secret_len = 7; protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); tt_assert(proto_params_client); - proto_params_client->is_initiator = 0; + proto_params_client->is_initiator = 1; proto_params_client->shared_secret = "hahaha"; proto_params_client->shared_secret_len = 7; - client_proto = proto_new(OBFS2_PROTOCOL,proto_params_serv); - server_proto = proto_new(OBFS2_PROTOCOL,proto_params_client); + client_proto = proto_new(OBFS2_PROTOCOL,proto_params_client); + server_proto = proto_new(OBFS2_PROTOCOL,proto_params_serv); tt_assert(client_proto); tt_assert(server_proto); @@ -96,17 +97,17 @@ test_proto_handshake(void *data) obfs2_state_t *server_state = server_proto->state; /* We create a client handshake message and pass it to output_buffer */ - tt_int_op(0, <=, proto_handshake(client_proto, output_buffer)<0); + tt_int_op(0, <=, proto_handshake(client_proto, output_buffer)); /* We simulate the server receiving and processing the client's handshake message, by using proto_recv() on the output_buffer */ - tt_int_op(0, <=, proto_recv(server_proto, output_buffer, dummy_buffer) <0); + tt_assert((enum recv_ret) RECV_GOOD == proto_recv(server_proto, output_buffer, dummy_buffer)); /* Now, we create the server's handshake and pass it to output_buffer */ - tt_int_op(0, <=, proto_handshake(server_proto, output_buffer)<0); + tt_int_op(0, <=, proto_handshake(server_proto, output_buffer)); /* We simulate the client receiving and processing the server's handshake */ - tt_int_op(0, <=, proto_recv(client_proto, output_buffer, dummy_buffer) <0); + tt_assert((enum recv_ret) RECV_GOOD == proto_recv(client_proto, output_buffer, dummy_buffer)); /* The handshake is now complete. We should have: client's send_crypto == server's recv_crypto @@ -146,18 +147,18 @@ test_proto_transfer(void *data) protocol_params_t *proto_params_serv = calloc(1, sizeof(protocol_params_t)); tt_assert(proto_params_serv); - proto_params_serv->is_initiator = 1; + proto_params_serv->is_initiator = 0; proto_params_serv->shared_secret = "hahaha"; proto_params_serv->shared_secret_len = 7; protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); tt_assert(proto_params_client); - proto_params_client->is_initiator = 0; + proto_params_client->is_initiator = 1; proto_params_client->shared_secret = "hahaha"; proto_params_client->shared_secret_len = 7; - client_proto = proto_new(OBFS2_PROTOCOL,proto_params_serv); - server_proto = proto_new(OBFS2_PROTOCOL,proto_params_client); + client_proto = proto_new(OBFS2_PROTOCOL,proto_params_client); + server_proto = proto_new(OBFS2_PROTOCOL,proto_params_serv); tt_assert(client_proto); tt_assert(server_proto); @@ -168,10 +169,12 @@ test_proto_transfer(void *data) struct evbuffer_iovec v[2]; /* Handshake */ - tt_int_op(0, <=, proto_handshake(client_proto, output_buffer)<0); - tt_int_op(0, <=, proto_recv(server_proto, output_buffer, dummy_buffer) <0); - tt_int_op(0, <=, proto_handshake(server_proto, output_buffer)<0); - tt_int_op(0, <=, proto_recv(client_proto, output_buffer, dummy_buffer) <0); + tt_int_op(0, <=, proto_handshake(client_proto, output_buffer)); + tt_assert((enum recv_ret) RECV_GOOD == proto_recv(server_proto, + output_buffer, dummy_buffer)); + tt_int_op(0, <=, proto_handshake(server_proto, output_buffer)); + tt_assert((enum recv_ret) RECV_GOOD == proto_recv(client_proto, + output_buffer, dummy_buffer)); /* End of Handshake */ /* Now let's pass some data around. */ @@ -182,7 +185,8 @@ test_proto_transfer(void *data) evbuffer_add(dummy_buffer, msg1, 54); proto_send(client_proto, dummy_buffer, output_buffer); - tt_int_op(0, <=, proto_recv(server_proto, output_buffer, dummy_buffer)); + tt_assert((enum recv_ret) RECV_GOOD == proto_recv(server_proto, + output_buffer, dummy_buffer)); n = evbuffer_peek(dummy_buffer, -1, NULL, &v[0], 2); @@ -197,7 +201,8 @@ test_proto_transfer(void *data) evbuffer_add(dummy_buffer, msg2, 55); tt_int_op(0, <=, proto_send(server_proto, dummy_buffer, output_buffer)); - tt_int_op(0, <=, proto_recv(client_proto, output_buffer, dummy_buffer)); + tt_assert((enum recv_ret) RECV_GOOD == proto_recv(client_proto, + output_buffer, dummy_buffer)); n = evbuffer_peek(dummy_buffer, -1, NULL, &v[1], 2); tt_int_op(0, ==, strncmp(msg2, v[1].iov_base, 55)); @@ -242,18 +247,18 @@ test_proto_splitted_handshake(void *data) protocol_params_t *proto_params_serv = calloc(1, sizeof(protocol_params_t)); tt_assert(proto_params_serv); - proto_params_serv->is_initiator = 1; + proto_params_serv->is_initiator = 0; proto_params_serv->shared_secret = "hahaha"; proto_params_serv->shared_secret_len = 7; protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); tt_assert(proto_params_client); - proto_params_client->is_initiator = 0; + proto_params_client->is_initiator = 1; proto_params_client->shared_secret = "hahaha"; proto_params_client->shared_secret_len = 7; - client_proto = proto_new(OBFS2_PROTOCOL,proto_params_serv); - server_proto = proto_new(OBFS2_PROTOCOL,proto_params_client); + client_proto = proto_new(OBFS2_PROTOCOL,proto_params_client); + server_proto = proto_new(OBFS2_PROTOCOL,proto_params_serv); tt_assert(client_proto); tt_assert(server_proto); @@ -293,7 +298,8 @@ test_proto_splitted_handshake(void *data) evbuffer_add(output_buffer, msgclient_1, OBFUSCATE_SEED_LENGTH+8+plength1_msg1); /* Server receives handshake part 1 */ - tt_int_op(0, <=, proto_recv(server_proto, output_buffer, dummy_buffer)); + tt_assert((enum recv_ret) RECV_INCOMPLETE == proto_recv(server_proto, + output_buffer, dummy_buffer)); tt_assert(server_state->state == ST_WAIT_FOR_PADDING); @@ -305,7 +311,8 @@ test_proto_splitted_handshake(void *data) evbuffer_add(output_buffer, msgclient_2, plength1_msg2); /* Server receives handshake part 2 */ - tt_int_op(0, <=, proto_recv(server_proto, output_buffer, dummy_buffer)); + tt_assert((enum recv_ret) RECV_GOOD == proto_recv(server_proto, + output_buffer, dummy_buffer)); tt_assert(server_state->state == ST_OPEN); @@ -334,7 +341,8 @@ test_proto_splitted_handshake(void *data) evbuffer_add(output_buffer, msgserver_1, OBFUSCATE_SEED_LENGTH+8); /* Client receives handshake part 1 */ - tt_int_op(0, <=, proto_recv(client_proto, output_buffer, dummy_buffer)); + tt_assert((enum recv_ret) RECV_INCOMPLETE == proto_recv(client_proto, + output_buffer, dummy_buffer)); tt_assert(client_state->state == ST_WAIT_FOR_PADDING); @@ -346,7 +354,8 @@ test_proto_splitted_handshake(void *data) evbuffer_add(output_buffer, msgserver_2, plength2); /* Client receives handshake part 2 */ - tt_int_op(0, <=, proto_recv(client_proto, output_buffer, dummy_buffer)); + tt_assert((enum recv_ret) RECV_GOOD == proto_recv(client_proto, + output_buffer, dummy_buffer)); tt_assert(client_state->state == ST_OPEN); @@ -395,18 +404,18 @@ test_proto_wrong_handshake_magic(void *data) protocol_params_t *proto_params_serv = calloc(1, sizeof(protocol_params_t)); tt_assert(proto_params_serv); - proto_params_serv->is_initiator = 1; + proto_params_serv->is_initiator = 0; proto_params_serv->shared_secret = "hahaha"; proto_params_serv->shared_secret_len = 7; protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); tt_assert(proto_params_client); - proto_params_client->is_initiator = 0; + proto_params_client->is_initiator = 1; proto_params_client->shared_secret = "hahaha"; proto_params_client->shared_secret_len = 7; - client_proto = proto_new(OBFS2_PROTOCOL,proto_params_serv); - server_proto = proto_new(OBFS2_PROTOCOL,proto_params_client); + client_proto = proto_new(OBFS2_PROTOCOL,proto_params_client); + server_proto = proto_new(OBFS2_PROTOCOL,proto_params_serv); tt_assert(client_proto); tt_assert(server_proto); @@ -437,7 +446,8 @@ test_proto_wrong_handshake_magic(void *data) evbuffer_add(output_buffer, msg, OBFUSCATE_SEED_LENGTH+8+plength); - tt_int_op(-1, ==, proto_recv(server_proto, output_buffer, dummy_buffer)); + tt_assert((enum recv_ret) RECV_BAD == proto_recv(server_proto, + output_buffer, dummy_buffer)); tt_assert(server_state->state == ST_WAIT_FOR_KEY); @@ -474,19 +484,19 @@ test_proto_wrong_handshake_plength(void *data) protocol_params_t *proto_params_serv = calloc(1, sizeof(protocol_params_t)); tt_assert(proto_params_serv); - proto_params_serv->is_initiator = 1; + proto_params_serv->is_initiator = 0; proto_params_serv->shared_secret = "hahaha"; proto_params_serv->shared_secret_len = 7; protocol_params_t *proto_params_client = calloc(1, sizeof(protocol_params_t)); tt_assert(proto_params_client); - proto_params_client->is_initiator = 0; + proto_params_client->is_initiator = 1; proto_params_client->shared_secret = "hahaha"; proto_params_client->shared_secret_len = 7; - client_proto = proto_new(OBFS2_PROTOCOL,proto_params_serv); - server_proto = proto_new(OBFS2_PROTOCOL,proto_params_client); + client_proto = proto_new(OBFS2_PROTOCOL,proto_params_client); + server_proto = proto_new(OBFS2_PROTOCOL,proto_params_serv); tt_assert(client_proto); tt_assert(server_proto); @@ -515,7 +525,9 @@ test_proto_wrong_handshake_plength(void *data) evbuffer_add(output_buffer, msg, OBFUSCATE_SEED_LENGTH+8+plength); - tt_int_op(-1, ==, proto_recv(server_proto, output_buffer, dummy_buffer)); + + tt_assert((enum recv_ret) RECV_BAD == proto_recv(server_proto, + output_buffer, dummy_buffer)); tt_assert(server_state->state == ST_WAIT_FOR_KEY);

1 0

[obfsproxy/master] Send pending data right after init_crypto() is done.
by nickm＠torproject.org 30 May '11

30 May '11

commit f3636c411cb1e2ee9a5ffe5854d9b59259ff6b77 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun May 29 06:55:44 2011 +0200 Send pending data right after init_crypto() is done. --- src/network.c | 11 +++++++++-- src/network.h | 16 ++++++++++++++++ src/protocol.c | 2 +- src/protocol.h | 8 ++++---- src/protocols/dummy.c | 17 ++++++++++------- src/protocols/obfs2.c | 31 ++++++++++++++++++++++--------- 6 files changed, 62 insertions(+), 23 deletions(-) diff --git a/src/network.c b/src/network.c index cfdd398..f629df9 100644 --- a/src/network.c +++ b/src/network.c @@ -309,12 +309,19 @@ obfuscated_read_cb(struct bufferevent *bev, void *arg) conn_t *conn = arg; struct bufferevent *other; other = (bev == conn->input) ? conn->output : conn->input; + enum recv_ret r; dbg(("Got data on encrypted side\n")); - if (proto_recv(conn->proto, + r = proto_recv(conn->proto, bufferevent_get_input(bev), - bufferevent_get_output(other)) < 0) + bufferevent_get_output(other)); + + if (r == RECV_BAD) conn_free(conn); + else if (r == RECV_OBFS2_PENDING) + proto_send(conn->proto, + bufferevent_get_input(conn->input), + bufferevent_get_output(conn->output)); } static void diff --git a/src/network.h b/src/network.h index 619e45f..d33b377 100644 --- a/src/network.h +++ b/src/network.h @@ -20,6 +20,22 @@ struct socks_state_t; #define LSN_SIMPLE_SERVER 2 #define LSN_SOCKS_CLIENT 3 +enum recv_ret { + /* Everything went fine. */ + RECV_GOOD=0, + /* Something went bad. */ + RECV_BAD, + /* ...need...more...data... */ + RECV_INCOMPLETE, + + /* Originally needed by the obfs2 protocol but it might get other + users in the future. Maybe it should be renamed to something neutral. + It means: + "We have pending data that we have to send. You should do that by + calling proto_send() immediately." */ + RECV_OBFS2_PENDING +}; + typedef struct listener_t listener_t; struct addrinfo; diff --git a/src/protocol.c b/src/protocol.c index 8fff6a3..bcd5330 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -72,7 +72,7 @@ proto_send(struct protocol_t *proto, void *source, void *dest) { return -1; } -int +enum recv_ret proto_recv(struct protocol_t *proto, void *source, void *dest) { assert(proto); if (proto->vtable->recv) diff --git a/src/protocol.h b/src/protocol.h index e4c3e0f..4a17c73 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -61,9 +61,9 @@ typedef struct protocol_vtable { struct evbuffer *dest); /* receive data function */ - int (*recv)(void *state, - struct evbuffer *source, - struct evbuffer *dest); + enum recv_ret (*recv)(void *state, + struct evbuffer *source, + struct evbuffer *dest); } protocol_vtable; @@ -73,6 +73,6 @@ struct protocol_t *proto_new(int protocol, void proto_destroy(struct protocol_t *proto); int proto_handshake(struct protocol_t *proto, void *buf); int proto_send(struct protocol_t *proto, void *source, void *dest); -int proto_recv(struct protocol_t *proto, void *source, void *dest); +enum recv_ret proto_recv(struct protocol_t *proto, void *source, void *dest); #endif diff --git a/src/protocols/dummy.c b/src/protocols/dummy.c index 482c927..ed8d672 100644 --- a/src/protocols/dummy.c +++ b/src/protocols/dummy.c @@ -11,12 +11,12 @@ #include "dummy.h" #include "../util.h" #include "../protocol.h" - +#include "../network.h" static int dummy_send(void *nothing, - struct evbuffer *source, struct evbuffer *dest); -static int dummy_recv(void *nothing, struct evbuffer *source, - struct evbuffer *dest); + struct evbuffer *source, struct evbuffer *dest); +static enum recv_ret dummy_recv(void *nothing, struct evbuffer *source, + struct evbuffer *dest); static protocol_vtable *vtable=NULL; @@ -54,10 +54,13 @@ dummy_send(void *nothing, return evbuffer_add_buffer(dest,source); } -static int +static enum recv_ret dummy_recv(void *nothing, struct evbuffer *source, struct evbuffer *dest) { (void)nothing; - - return evbuffer_add_buffer(dest,source); + + if (evbuffer_add_buffer(dest,source)<0) + return (enum recv_ret) RECV_BAD; + else + return (enum recv_ret) RECV_GOOD; } diff --git a/src/protocols/obfs2.c b/src/protocols/obfs2.c index a8f9155..975458a 100644 --- a/src/protocols/obfs2.c +++ b/src/protocols/obfs2.c @@ -19,13 +19,14 @@ #include "obfs2.h" #include "../util.h" #include "../protocol.h" +#include "../network.h" static void obfs2_state_free(void *state); static int obfs2_send_initial_message(void *state, struct evbuffer *buf); static int obfs2_send(void *state, struct evbuffer *source, struct evbuffer *dest); -static int obfs2_recv(void *state, struct evbuffer *source, - struct evbuffer *dest); +static enum recv_ret obfs2_recv(void *state, struct evbuffer *source, + struct evbuffer *dest); static void *obfs2_state_new(protocol_params_t *params); static int obfs2_state_set_shared_secret(void *s, const char *secret, @@ -358,11 +359,12 @@ init_crypto(void *s) * * Returns x for "don't call again till you have x bytes". 0 for "all ok". -1 * for "fail, close" */ -static int +static enum recv_ret obfs2_recv(void *s, struct evbuffer *source, struct evbuffer *dest) { obfs2_state_t *state = s; + enum recv_ret r=0; if (state->state == ST_WAIT_FOR_KEY) { /* We're waiting for the first OBFUSCATE_SEED_LENGTH+8 bytes to show up @@ -371,7 +373,7 @@ obfs2_recv(void *s, struct evbuffer *source, uint32_t magic, plength; if (evbuffer_get_length(source) < OBFUSCATE_SEED_LENGTH+8) { /* data not here yet */ - return OBFUSCATE_SEED_LENGTH+8; + return (enum recv_ret) RECV_INCOMPLETE; } evbuffer_remove(source, buf, OBFUSCATE_SEED_LENGTH+8); @@ -384,7 +386,7 @@ obfs2_recv(void *s, struct evbuffer *source, /* Now we can set up all the keys from the seed */ if (init_crypto(state) < 0) - return -1; + return (enum recv_ret) RECV_BAD; /* Decrypt the next 8 bytes */ stream_crypt(state->recv_padding_crypto, buf+OBFUSCATE_SEED_LENGTH, 8); @@ -394,9 +396,9 @@ obfs2_recv(void *s, struct evbuffer *source, magic = ntohl(magic); plength = ntohl(plength); if (magic != OBFUSCATE_MAGIC_VALUE) - return -1; + return (enum recv_ret) RECV_BAD; if (plength > OBFUSCATE_MAX_PADDING) - return -1; + return (enum recv_ret) RECV_BAD; /* XXX FIXME we should now be sending any 'pending_data_to_send' but we can't send them from here, so we send them with @@ -411,13 +413,19 @@ obfs2_recv(void *s, struct evbuffer *source, dbg(("Received key, expecting %d bytes of padding\n", plength)); } + /* If we have pending data to send, we set the return code + appropriately so that we call proto_send() right after we get out of + here! */ + if (state->pending_data_to_send) + r = RECV_OBFS2_PENDING; + /* If we're still looking for padding, start pulling off bytes and discarding them. */ while (state->padding_left_to_read) { int n = state->padding_left_to_read; size_t sourcelen = evbuffer_get_length(source); if (!sourcelen) - return n; + return RECV_INCOMPLETE; if ((size_t) n > evbuffer_get_length(source)) n = evbuffer_get_length(source); evbuffer_drain(source, n); @@ -431,7 +439,12 @@ obfs2_recv(void *s, struct evbuffer *source, dbg(("Processing %d bytes data onto destination buffer\n", (int) evbuffer_get_length(source))); - return crypt_and_transmit(state->recv_crypto, source, dest); + crypt_and_transmit(state->recv_crypto, source, dest); + + if (r != RECV_OBFS2_PENDING) + r = RECV_GOOD; + + return r; } static void

1 0

[obfsproxy/master] Fixed various stuff pointed out by nickm.
by nickm＠torproject.org 30 May '11

30 May '11

commit 61a69edf357aea47c1e4f8c77c61b5bf6a53204f Author: George Kadianakis <desnacked(a)gmail.com> Date: Mon May 30 04:17:55 2011 +0200 Fixed various stuff pointed out by nickm. * Renamed RECV_OBFS2_PENDING to RECV_SEND_PENDING. * Removed ugly casts. * Added correct documentation for obfs2_recv(). --- src/network.c | 2 +- src/network.h | 4 ++-- src/protocols/obfs2.c | 28 +++++++++++++++------------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/network.c b/src/network.c index f629df9..3d3f172 100644 --- a/src/network.c +++ b/src/network.c @@ -318,7 +318,7 @@ obfuscated_read_cb(struct bufferevent *bev, void *arg) if (r == RECV_BAD) conn_free(conn); - else if (r == RECV_OBFS2_PENDING) + else if (r == RECV_SEND_PENDING) proto_send(conn->proto, bufferevent_get_input(conn->input), bufferevent_get_output(conn->output)); diff --git a/src/network.h b/src/network.h index d33b377..80b3055 100644 --- a/src/network.h +++ b/src/network.h @@ -29,11 +29,11 @@ enum recv_ret { RECV_INCOMPLETE, /* Originally needed by the obfs2 protocol but it might get other - users in the future. Maybe it should be renamed to something neutral. + users in the future. It means: "We have pending data that we have to send. You should do that by calling proto_send() immediately." */ - RECV_OBFS2_PENDING + RECV_SEND_PENDING }; typedef struct listener_t listener_t; diff --git a/src/protocols/obfs2.c b/src/protocols/obfs2.c index 975458a..c93db0e 100644 --- a/src/protocols/obfs2.c +++ b/src/protocols/obfs2.c @@ -355,10 +355,16 @@ init_crypto(void *s) } /* Called when we receive data in an evbuffer 'source': deobfuscates that data - * and writes it to 'dest'. + * and writes it to 'dest', by using protocol state 's' to get crypto keys. * - * Returns x for "don't call again till you have x bytes". 0 for "all ok". -1 - * for "fail, close" */ + * It returns: + * RECV_GOOD to say that everything went fine. + * RECV_BAD to say that something went bad. + * RECV_INCOMPLETE to say that we need more data to form an opinion. + * RECV_SEND_PENDING to say that everything went fine and on top of + * that we also have pending data that we have to send. This notifies + * our callers that they must call obfs2_send() immediately. + */ static enum recv_ret obfs2_recv(void *s, struct evbuffer *source, struct evbuffer *dest) @@ -373,7 +379,7 @@ obfs2_recv(void *s, struct evbuffer *source, uint32_t magic, plength; if (evbuffer_get_length(source) < OBFUSCATE_SEED_LENGTH+8) { /* data not here yet */ - return (enum recv_ret) RECV_INCOMPLETE; + return RECV_INCOMPLETE; } evbuffer_remove(source, buf, OBFUSCATE_SEED_LENGTH+8); @@ -386,7 +392,7 @@ obfs2_recv(void *s, struct evbuffer *source, /* Now we can set up all the keys from the seed */ if (init_crypto(state) < 0) - return (enum recv_ret) RECV_BAD; + return RECV_BAD; /* Decrypt the next 8 bytes */ stream_crypt(state->recv_padding_crypto, buf+OBFUSCATE_SEED_LENGTH, 8); @@ -396,13 +402,9 @@ obfs2_recv(void *s, struct evbuffer *source, magic = ntohl(magic); plength = ntohl(plength); if (magic != OBFUSCATE_MAGIC_VALUE) - return (enum recv_ret) RECV_BAD; + return RECV_BAD; if (plength > OBFUSCATE_MAX_PADDING) - return (enum recv_ret) RECV_BAD; - - /* XXX FIXME we should now be sending any 'pending_data_to_send' - but we can't send them from here, so we send them with - obfs2_send() when we next have to send data */ + return RECV_BAD; /* Now we're waiting for plength bytes of padding */ state->padding_left_to_read = plength; @@ -417,7 +419,7 @@ obfs2_recv(void *s, struct evbuffer *source, appropriately so that we call proto_send() right after we get out of here! */ if (state->pending_data_to_send) - r = RECV_OBFS2_PENDING; + r = RECV_SEND_PENDING; /* If we're still looking for padding, start pulling off bytes and discarding them. */ @@ -441,7 +443,7 @@ obfs2_recv(void *s, struct evbuffer *source, (int) evbuffer_get_length(source))); crypt_and_transmit(state->recv_crypto, source, dest); - if (r != RECV_OBFS2_PENDING) + if (r != RECV_SEND_PENDING) r = RECV_GOOD; return r;

1 0

[obfsproxy/master] Kill some more redundant casts
by nickm＠torproject.org 30 May '11

30 May '11

commit 1ee9c960c8fd5554369daa9f6606a875e38eda23 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 30 10:43:20 2011 -0400 Kill some more redundant casts --- src/protocols/dummy.c | 4 ++-- src/test/unittest_obfs2.c | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/protocols/dummy.c b/src/protocols/dummy.c index ed8d672..68bd7a1 100644 --- a/src/protocols/dummy.c +++ b/src/protocols/dummy.c @@ -60,7 +60,7 @@ dummy_recv(void *nothing, (void)nothing; if (evbuffer_add_buffer(dest,source)<0) - return (enum recv_ret) RECV_BAD; + return RECV_BAD; else - return (enum recv_ret) RECV_GOOD; + return RECV_GOOD; } diff --git a/src/test/unittest_obfs2.c b/src/test/unittest_obfs2.c index 9226cdf..b04040d 100644 --- a/src/test/unittest_obfs2.c +++ b/src/test/unittest_obfs2.c @@ -101,13 +101,13 @@ test_proto_handshake(void *data) /* We simulate the server receiving and processing the client's handshake message, by using proto_recv() on the output_buffer */ - tt_assert((enum recv_ret) RECV_GOOD == proto_recv(server_proto, output_buffer, dummy_buffer)); + tt_assert(RECV_GOOD == proto_recv(server_proto, output_buffer, dummy_buffer)); /* Now, we create the server's handshake and pass it to output_buffer */ tt_int_op(0, <=, proto_handshake(server_proto, output_buffer)); /* We simulate the client receiving and processing the server's handshake */ - tt_assert((enum recv_ret) RECV_GOOD == proto_recv(client_proto, output_buffer, dummy_buffer)); + tt_assert(RECV_GOOD == proto_recv(client_proto, output_buffer, dummy_buffer)); /* The handshake is now complete. We should have: client's send_crypto == server's recv_crypto @@ -170,10 +170,10 @@ test_proto_transfer(void *data) /* Handshake */ tt_int_op(0, <=, proto_handshake(client_proto, output_buffer)); - tt_assert((enum recv_ret) RECV_GOOD == proto_recv(server_proto, + tt_assert(RECV_GOOD == proto_recv(server_proto, output_buffer, dummy_buffer)); tt_int_op(0, <=, proto_handshake(server_proto, output_buffer)); - tt_assert((enum recv_ret) RECV_GOOD == proto_recv(client_proto, + tt_assert(RECV_GOOD == proto_recv(client_proto, output_buffer, dummy_buffer)); /* End of Handshake */ @@ -185,7 +185,7 @@ test_proto_transfer(void *data) evbuffer_add(dummy_buffer, msg1, 54); proto_send(client_proto, dummy_buffer, output_buffer); - tt_assert((enum recv_ret) RECV_GOOD == proto_recv(server_proto, + tt_assert(RECV_GOOD == proto_recv(server_proto, output_buffer, dummy_buffer)); n = evbuffer_peek(dummy_buffer, -1, NULL, &v[0], 2); @@ -201,7 +201,7 @@ test_proto_transfer(void *data) evbuffer_add(dummy_buffer, msg2, 55); tt_int_op(0, <=, proto_send(server_proto, dummy_buffer, output_buffer)); - tt_assert((enum recv_ret) RECV_GOOD == proto_recv(client_proto, + tt_assert(RECV_GOOD == proto_recv(client_proto, output_buffer, dummy_buffer)); n = evbuffer_peek(dummy_buffer, -1, NULL, &v[1], 2); @@ -298,7 +298,7 @@ test_proto_splitted_handshake(void *data) evbuffer_add(output_buffer, msgclient_1, OBFUSCATE_SEED_LENGTH+8+plength1_msg1); /* Server receives handshake part 1 */ - tt_assert((enum recv_ret) RECV_INCOMPLETE == proto_recv(server_proto, + tt_assert(RECV_INCOMPLETE == proto_recv(server_proto, output_buffer, dummy_buffer)); tt_assert(server_state->state == ST_WAIT_FOR_PADDING); @@ -311,7 +311,7 @@ test_proto_splitted_handshake(void *data) evbuffer_add(output_buffer, msgclient_2, plength1_msg2); /* Server receives handshake part 2 */ - tt_assert((enum recv_ret) RECV_GOOD == proto_recv(server_proto, + tt_assert(RECV_GOOD == proto_recv(server_proto, output_buffer, dummy_buffer)); tt_assert(server_state->state == ST_OPEN); @@ -341,7 +341,7 @@ test_proto_splitted_handshake(void *data) evbuffer_add(output_buffer, msgserver_1, OBFUSCATE_SEED_LENGTH+8); /* Client receives handshake part 1 */ - tt_assert((enum recv_ret) RECV_INCOMPLETE == proto_recv(client_proto, + tt_assert(RECV_INCOMPLETE == proto_recv(client_proto, output_buffer, dummy_buffer)); tt_assert(client_state->state == ST_WAIT_FOR_PADDING); @@ -354,7 +354,7 @@ test_proto_splitted_handshake(void *data) evbuffer_add(output_buffer, msgserver_2, plength2); /* Client receives handshake part 2 */ - tt_assert((enum recv_ret) RECV_GOOD == proto_recv(client_proto, + tt_assert(RECV_GOOD == proto_recv(client_proto, output_buffer, dummy_buffer)); tt_assert(client_state->state == ST_OPEN); @@ -446,7 +446,7 @@ test_proto_wrong_handshake_magic(void *data) evbuffer_add(output_buffer, msg, OBFUSCATE_SEED_LENGTH+8+plength); - tt_assert((enum recv_ret) RECV_BAD == proto_recv(server_proto, + tt_assert(RECV_BAD == proto_recv(server_proto, output_buffer, dummy_buffer)); tt_assert(server_state->state == ST_WAIT_FOR_KEY); @@ -526,7 +526,7 @@ test_proto_wrong_handshake_plength(void *data) evbuffer_add(output_buffer, msg, OBFUSCATE_SEED_LENGTH+8+plength); - tt_assert((enum recv_ret) RECV_BAD == proto_recv(server_proto, + tt_assert(RECV_BAD == proto_recv(server_proto, output_buffer, dummy_buffer)); tt_assert(server_state->state == ST_WAIT_FOR_KEY);

1 0

r24794: {website} remove the 'please consider a donation' sidenav link. (website/trunk/download/en)
by Andrew Lewman 30 May '11

30 May '11

Author: phobos Date: 2011-05-30 12:13:48 +0000 (Mon, 30 May 2011) New Revision: 24794 Modified: website/trunk/download/en/download-easy.wml website/trunk/download/en/download.wml Log: remove the 'please consider a donation' sidenav link. Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2011-05-28 07:21:47 UTC (rev 24793) +++ website/trunk/download/en/download-easy.wml 2011-05-30 12:13:48 UTC (rev 24794) @@ -165,8 +165,6 @@ <li class="dropdown"><a href="<page download/download>#linux">Linux/Unix</a></li> <li class="dropdown"><a href="<page download/download>#smartphones">Smartphones</a></li> <li class="dropdown"><a href="<page download/download>#source">Source Code</a></li> -<li class="dropdown"><a href="<page donate/donate>">Please consider a -donation</a></li> </ul> </div> </div> Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-05-28 07:21:47 UTC (rev 24793) +++ website/trunk/download/en/download.wml 2011-05-30 12:13:48 UTC (rev 24794) @@ -362,8 +362,6 @@ <li class="dropdown"><a href="#linux">Linux/Unix</a></li> <li class="dropdown"><a href="#smartphones">Smartphones</a></li> <li class="dropdown"><a href="#source">Source Code</a></li> -<li class="dropdown"><a href="<page donate/donate>">Please consider a -donation</a></li> </ul> </div> </div>

1 0

[metrics-web/master] Don't smush the labels together!
by karsten＠torproject.org 30 May '11

30 May '11

commit cb1b41de3257c7289c695d2f2b41c77c46b8cfbe Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon May 30 09:36:46 2011 +0200 Don't smush the labels together! --- rserve/graphs.R | 176 +++++++++++++++++++++++++++++++----------------------- 1 files changed, 101 insertions(+), 75 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index f268a34..cff39a2 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -254,6 +254,17 @@ countryname <- function(country) { res } +date_breaks <- function(days) { + length <- cut(days, c(0, 7, 12, 56, 180, 600, 5000, Inf), labels=FALSE) + major <- c("days", "2 days", "weeks", "months", "3 months", "years", + "5 years")[length] + minor <- c("10 years", "days", "days", "weeks", "months", "months", + "years")[length] + format <- c("%d-%b", "%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", + "%Y")[length] + list(major = major, minor = minor, format = format) +} + plot_networksize <- function(start, end, path, dpi) { drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) @@ -283,14 +294,15 @@ plot_networksize <- function(start, end, path, dpi) { relays <- melt(relays, id = "date") bridges <- melt(bridges, id = "date") networksize <- rbind(relays, bridges) + date_breaks <- date_breaks( + as.numeric(max(as.Date(networksize$date, "%Y-%m-%d")) - + min(as.Date(networksize$date, "%Y-%m-%d")))) ggplot(networksize, aes(x = as.Date(date, "%Y-%m-%d"), y = value, colour = variable)) + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), format = - c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ - cut(as.numeric(max(as.Date(networksize$date, "%Y-%m-%d")) - - min(as.Date(networksize$date, "%Y-%m-%d"))), - c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + + "https://metrics.torproject.org/", sep = ""), + format = date_breaks$format, major = date_breaks$major, + minor = date_breaks$minor) + scale_y_continuous(name = "", limits = c(0, max(networksize$value, na.rm = TRUE))) + scale_colour_hue("", breaks = c("relays", "bridges"), @@ -329,14 +341,15 @@ plot_relaycountries <- function(start, end, country, path, dpi) { "Number of relays in all countries\n", paste("Number of relays in ", countryname(country), "\n", sep = "")) formatter <- function(x, ...) { format(x, scientific = FALSE, ...) } + date_breaks <- date_breaks( + as.numeric(max(as.Date(u$date, "%Y-%m-%d")) - + min(as.Date(u$date, "%Y-%m-%d")))) ggplot(u, aes(x = as.Date(date, "%Y-%m-%d"), y = relays)) + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), format = - c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ - cut(as.numeric(max(as.Date(u$date, "%Y-%m-%d")) - - min(as.Date(u$date, "%Y-%m-%d"))), - c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + + "https://metrics.torproject.org/", sep = ""), + format = date_breaks$format, major = date_breaks$major, + minor = date_breaks$minor) + scale_y_continuous(name = "", limits = c(0, max(u$relays, na.rm = TRUE)), formatter = formatter) + opts(title = title) @@ -360,15 +373,16 @@ plot_versions <- function(start, end, path, dpi) { date = as.Date(rep(end, 7)), version = known_versions, relays = rep(NA, 7)), versions) + date_breaks <- date_breaks( + as.numeric(max(as.Date(versions$date, "%Y-%m-%d")) - + min(as.Date(versions$date, "%Y-%m-%d")))) ggplot(versions, aes(x = as.Date(date, "%Y-%m-%d"), y = relays, colour = version)) + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), format = - c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ - cut(as.numeric(max(as.Date(versions$date, "%Y-%m-%d")) - - min(as.Date(versions$date, "%Y-%m-%d"))), - c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + + "https://metrics.torproject.org/", sep = ""), + format = date_breaks$format, major = date_breaks$major, + minor = date_breaks$minor) + scale_y_continuous(name = "", limits = c(0, max(versions$relays, na.rm = TRUE))) + scale_colour_hue(name = "Tor version", h.start = 280, @@ -388,15 +402,16 @@ plot_platforms <- function(start, end, path, dpi) { dbDisconnect(con) dbUnloadDriver(drv) platforms <- melt(platforms, id = "date") + date_breaks <- date_breaks( + as.numeric(max(as.Date(platforms$date, "%Y-%m-%d")) - + min(as.Date(platforms$date, "%Y-%m-%d")))) ggplot(platforms, aes(x = as.Date(date, "%Y-%m-%d"), y = value, colour = variable)) + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), format = - c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ - cut(as.numeric(max(as.Date(platforms$date, "%Y-%m-%d")) - - min(as.Date(platforms$date, "%Y-%m-%d"))), - c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + + "https://metrics.torproject.org/", sep = ""), + format = date_breaks$format, major = date_breaks$major, + minor = date_breaks$minor) + scale_y_continuous(name = "", limits = c(0, max(platforms$value, na.rm = TRUE))) + scale_colour_hue(name = "Platform", h.start = 180, @@ -425,15 +440,16 @@ plot_bandwidth <- function(start, end, path, dpi) { value = bw_desc$bwadvertised, variable = "bwadv"), data.frame(date = bw_hist$date, value = (bw_hist$read + bw_hist$written) / (2 * 86400), variable = "bwhist")) + date_breaks <- date_breaks( + as.numeric(max(as.Date(bandwidth$date, "%Y-%m-%d")) - + min(as.Date(bandwidth$date, "%Y-%m-%d")))) ggplot(bandwidth, aes(x = as.Date(date, "%Y-%m-%d"), y = value / 2^20, colour = variable)) + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), format = - c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ - cut(as.numeric(max(as.Date(bandwidth$date, "%Y-%m-%d")) - - min(as.Date(bandwidth$date, "%Y-%m-%d"))), - c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + + "https://metrics.torproject.org/", sep = ""), + format = date_breaks$format, major = date_breaks$major, + minor = date_breaks$minor) + scale_y_continuous(name="Bandwidth (MiB/s)", limits = c(0, max(bandwidth$value, na.rm = TRUE) / 2^20)) + scale_colour_hue(name = "", h.start = 90, @@ -470,15 +486,16 @@ plot_bwhist_flags <- function(start, end, path, dpi) { ifelse(bw$isguard, "Guard & Exit", "Exit only"), ifelse(bw$isguard, "Guard only", "Middle only")), value = (bw$read + bw$written) / 2) + date_breaks <- date_breaks( + as.numeric(max(as.Date(bw$date, "%Y-%m-%d")) - + min(as.Date(bw$date, "%Y-%m-%d")))) ggplot(bw, aes(x = as.Date(date, "%Y-%m-%d"), y = value / 2^20 / 86400, colour = variable)) + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), format = - c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ - cut(as.numeric(max(as.Date(bw$date, "%Y-%m-%d")) - - min(as.Date(bw$date, "%Y-%m-%d"))), - c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + + "https://metrics.torproject.org/", sep = ""), + format = date_breaks$format, major = date_breaks$major, + minor = date_breaks$minor) + scale_y_continuous(name="Bandwidth (MiB/s)", limits = c(0, max(bw$value, na.rm = TRUE) / 2^20 / 86400)) + scale_colour_hue(name = "") + @@ -502,15 +519,16 @@ plot_dirbytes <- function(start, end, path, dpi) { dirwrite = floor(dir$dw * dir$bwp / dir$bwd / 86400)) dir <- na.omit(dir) dir <- melt(dir, id = "date") + date_breaks <- date_breaks( + as.numeric(max(as.Date(dir$date, "%Y-%m-%d")) - + min(as.Date(dir$date, "%Y-%m-%d")))) ggplot(dir, aes(x = as.Date(date, "%Y-%m-%d"), y = value / 2^20, colour = variable)) + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), format = - c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ - cut(as.numeric(max(as.Date(dir$date, "%Y-%m-%d")) - - min(as.Date(dir$date, "%Y-%m-%d"))), - c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + + "https://metrics.torproject.org/", sep = ""), + format = date_breaks$format, major = date_breaks$major, + minor = date_breaks$minor) + scale_y_continuous(name="Bandwidth (MiB/s)", limits = c(0, max(dir$value, na.rm = TRUE) / 2^20)) + scale_colour_hue(name = "", @@ -538,14 +556,15 @@ plot_relayflags <- function(start, end, flags, granularity, path, dpi) { variable = paste("avg_", c("running", "exit", "guard", "fast", "stable"), sep = ""), value = rep(NA, 5)), networksize) + date_breaks <- date_breaks( + as.numeric(max(as.Date(networksize$date, "%Y-%m-%d")) - + min(as.Date(networksize$date, "%Y-%m-%d")))) ggplot(networksize, aes(x = as.Date(date, "%Y-%m-%d"), y = value, colour = variable)) + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), format = - c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ - cut(as.numeric(max(as.Date(networksize$date, "%Y-%m-%d")) - - min(as.Date(networksize$date, "%Y-%m-%d"))), - c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + + "https://metrics.torproject.org/", sep = ""), + format = date_breaks$format, major = date_breaks$major, + minor = date_breaks$minor) + scale_y_continuous(name = "", limits = c(0, max(networksize$value, na.rm = TRUE))) + scale_colour_hue(name = "Relay flags", h.start = 280, @@ -608,14 +627,15 @@ plot_direct_users <- function(start, end, country, path, dpi) { paste("Directly connecting users from ", countryname(country), "\n", sep = "")) formatter <- function(x, ...) { format(x, scientific = FALSE, ...) } + date_breaks <- date_breaks( + as.numeric(max(as.Date(u$date, "%Y-%m-%d")) - + min(as.Date(u$date, "%Y-%m-%d")))) ggplot(u, aes(x = as.Date(date, "%Y-%m-%d"), y = users)) + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), format = - c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ - cut(as.numeric(max(as.Date(u$date, "%Y-%m-%d")) - - min(as.Date(u$date, "%Y-%m-%d"))), - c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + + "https://metrics.torproject.org/", sep = ""), + format = date_breaks$format, major = date_breaks$major, + minor = date_breaks$minor) + scale_y_continuous(name = "", limits = c(0, max(u$users, na.rm = TRUE)), formatter = formatter) + opts(title = title) @@ -645,14 +665,15 @@ plot_bridge_users <- function(start, end, country, path, dpi) { "Bridge users from all countries\n", paste("Bridge users from ", countryname(country), "\n", sep = "")) formatter <- function(x, ...) { format(x, scientific = FALSE, ...) } + date_breaks <- date_breaks( + as.numeric(max(as.Date(bridgeusers$date, "%Y-%m-%d")) - + min(as.Date(bridgeusers$date, "%Y-%m-%d")))) ggplot(bridgeusers, aes(x = as.Date(date, "%Y-%m-%d"), y = users)) + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), format = - c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ - cut(as.numeric(max(as.Date(bridgeusers$date, "%Y-%m-%d")) - - min(as.Date(bridgeusers$date, "%Y-%m-%d"))), - c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + + "https://metrics.torproject.org/", sep = ""), + format = date_breaks$format, major = date_breaks$major, + minor = date_breaks$minor) + scale_y_continuous(name = "", limits = c(0, max(bridgeusers$users, na.rm = TRUE)), formatter = formatter) + opts(title = title) @@ -682,14 +703,15 @@ plot_gettor <- function(start, end, bundle, path, dpi) { "Total packages requested from GetTor per day\n", paste("Tor Browser Bundles (", bundle, ") requested from GetTor per day\n", sep = "")) + date_breaks <- date_breaks( + as.numeric(max(as.Date(downloads$date, "%Y-%m-%d")) - + min(as.Date(downloads$date, "%Y-%m-%d")))) ggplot(downloads, aes(x = as.Date(date, "%Y-%m-%d"), y = downloads)) + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), format = - c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ - cut(as.numeric(max(as.Date(downloads$date, "%Y-%m-%d")) - - min(as.Date(downloads$date, "%Y-%m-%d"))), - c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + + "https://metrics.torproject.org/", sep = ""), + format = date_breaks$format, major = date_breaks$major, + minor = date_breaks$minor) + scale_y_continuous(name = "", limits = c(0, max(downloads$downloads, na.rm = TRUE))) + opts(title = title) @@ -721,17 +743,18 @@ plot_torperf <- function(start, end, source, filesize, path, dpi) { label = c("5 MiB", "1 MiB", "50 KiB"), stringsAsFactors = FALSE) filesizeStr <- filesizes[filesizes$filesize == filesize, "label"] maxY <- max(torperf$q3, na.rm = TRUE) + date_breaks <- date_breaks( + as.numeric(max(as.Date(torperf$date, "%Y-%m-%d")) - + min(as.Date(torperf$date, "%Y-%m-%d")))) ggplot(torperf, aes(x = as.Date(date, "%Y-%m-%d"), y = md/1e3, fill = "line")) + geom_line(colour = colour, size = 0.75) + geom_ribbon(data = torperf, aes(x = date, ymin = q1/1e3, ymax = q3/1e3, fill = "ribbon")) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), format = - c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ - cut(as.numeric(max(as.Date(torperf$date, "%Y-%m-%d")) - - min(as.Date(torperf$date, "%Y-%m-%d"))), - c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + + "https://metrics.torproject.org/", sep = ""), + format = date_breaks$format, major = date_breaks$major, + minor = date_breaks$minor) + scale_y_continuous(name = "", limits = c(0, maxY) / 1e3) + scale_fill_manual(name = paste("Measured times on", ifelse(source == "all", "all sources", source), "per day"), @@ -777,15 +800,16 @@ plot_torperf_failures <- function(start, end, source, filesize, path, value = ifelse(torperf$requests > 0, torperf$failures / torperf$requests, 0), variable = "failures")) + date_breaks <- date_breaks( + as.numeric(max(as.Date(torperf$date, "%Y-%m-%d")) - + min(as.Date(torperf$date, "%Y-%m-%d")))) ggplot(torperf, aes(x = as.Date(date, "%Y-%m-%d"), y = value, colour = variable)) + geom_point(size = 2) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), format = - c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ - cut(as.numeric(max(as.Date(torperf$date, "%Y-%m-%d")) - - min(as.Date(torperf$date, "%Y-%m-%d"))), - c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + + "https://metrics.torproject.org/", sep = ""), + format = date_breaks$format, major = date_breaks$major, + minor = date_breaks$minor) + scale_y_continuous(name = "", formatter = "percent") + scale_colour_hue(name = paste("Problems encountered on", ifelse(source == "all", "all sources", source)), @@ -809,15 +833,16 @@ plot_connbidirect <- function(start, end, path, dpi) { connbidirect <- data.frame(date = c$date, c[, 2:4] / (c$readnum + c$writenum + c$bothnum)) connbidirect <- melt(connbidirect, id = "date") + date_breaks <- date_breaks( + as.numeric(max(as.Date(connbidirect$date, "%Y-%m-%d")) - + min(as.Date(connbidirect$date, "%Y-%m-%d")))) ggplot(connbidirect, aes(x = as.Date(date, "%Y-%m-%d"), y = value, colour = variable)) + geom_point(size = 2.5) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), format = - c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ - cut(as.numeric(max(as.Date(connbidirect$date, "%Y-%m-%d")) - - min(as.Date(connbidirect$date, "%Y-%m-%d"))), - c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + + "https://metrics.torproject.org/", sep = ""), + format = date_breaks$format, major = date_breaks$major, + minor = date_breaks$minor) + scale_y_continuous(name = "", formatter = "percent") + scale_colour_hue("", breaks = c("readnum", "writenum", "bothnum"), labels = c("Mostly reading", "Mostly writing", @@ -844,14 +869,15 @@ plot_routerdetail <- function(fingerprint, path) { ## TODO We should add NA's for missing dates. dbDisconnect(con) dbUnloadDriver(drv) + date_breaks <- date_breaks( + as.numeric(max(as.Date(routerdetail$date, "%Y-%m-%d")) - + min(as.Date(routerdetail$date, "%Y-%m-%d")))) ggplot(routerdetail, aes(x = as.Date(date, "%Y-%m-%d"), y = bw)) + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", - "https://metrics.torproject.org/", sep = ""), format = - c("%d-%b", "%d-%b", "%b-%Y", "%b-%Y", "%Y", "%Y")[ - cut(as.numeric(max(as.Date(routerdetail$date, "%Y-%m-%d")) - - min(as.Date(routerdetail$date, "%Y-%m-%d"))), - c(0, 10, 56, 365, 730, 5000, Inf), labels=FALSE)]) + + "https://metrics.torproject.org/", sep = ""), + format = date_breaks$format, major = date_breaks$major, + minor = date_breaks$minor) + scale_y_continuous(name = "") + opts(title = paste("Bandwidth history for ", fingerprint, "\n", sep = ""))

1 0

[tor/release-0.2.2] answer an XXX nickm asked in aa950e6c4
by arma＠torproject.org 29 May '11

29 May '11

commit 5f182ea10e25ed027cf75627f74013e7c6da2038 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun May 29 18:52:37 2011 -0400 answer an XXX nickm asked in aa950e6c4 --- src/or/circuitbuild.c | 2 +- src/or/main.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 108007e..9509b5a 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -262,7 +262,7 @@ circuit_build_times_test_frequency(void) } /** - * Retrieve and bounds-check the cbtmintimeout consensus paramter. + * Retrieve and bounds-check the cbtmintimeout consensus parameter. * * Effect: This is the minimum allowed timeout value in milliseconds. * The minimum is to prevent rounding to 0 (we only check once diff --git a/src/or/main.c b/src/or/main.c index d1ceeec..4fc6437 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1162,7 +1162,10 @@ run_scheduled_events(time_t now) * it's not comfortable with the number of available circuits. */ /* XXXX022 If our circuit build timeout is much lower than a second, maybe - we should do this more often? */ + * we should do this more often? -NM + * It can't be lower than 1.5 seconds currently; see + * circuit_build_times_min_timeout(). -RD + */ circuit_expire_building(); /** 3b. Also look at pending streams and prune the ones that 'began'

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 29 May '11

29 May '11

commit 688400c596c09e9a6d1a26668e4843ccd946a7be Merge: 6746293 5f182ea Author: Roger Dingledine <arma(a)torproject.org> Date: Sun May 29 19:11:22 2011 -0400 Merge branch 'maint-0.2.2' into release-0.2.2 src/or/circuitbuild.c | 2 +- src/or/main.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0