February 2013 - tor-commits - lists.torproject.org

[tor/master] Ignore tiny bandwidths entirely when computing thresholds
by nickm＠torproject.org 04 Feb '13

04 Feb '13

commit 61995d3e2cd7631df1fcb9fbdf9333dee24566b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 4 10:47:08 2013 -0500 Ignore tiny bandwidths entirely when computing thresholds Another bug 8145 fix. --- changes/bug8146_etc | 3 +++ src/or/dirserv.c | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/changes/bug8146_etc b/changes/bug8146_etc index 3775aa5..274e2ab 100644 --- a/changes/bug8146_etc +++ b/changes/bug8146_etc @@ -5,3 +5,6 @@ - When computing thresholds for flags, never let the threshold for the Fast flag to 4096 bytes. Fixes bug 8145. + - Do not consider nodes with extremely low bandwidths when deciding + thresholds for various directory flags. Another fix for 8145. + diff --git a/src/or/dirserv.c b/src/or/dirserv.c index f3cb2de..0c3e72f 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1884,6 +1884,10 @@ dirserv_thinks_router_is_hs_dir(const routerinfo_t *router, node->is_running); } +/** Don't consider routers with less bandwidth than this when computing + * thresholds. */ +#define ABSOLUTE_MIN_BW_VALUE_TO_CONSIDER 4096 + /** Helper for dirserv_compute_performance_thresholds(): Decide whether to * include a router in our calculations, and return true iff we should. */ static int @@ -1891,7 +1895,9 @@ router_counts_toward_thresholds(const node_t *node, time_t now, const digestmap_t *omit_as_sybil) { return node->ri && router_is_active(node->ri, node, now) && - !digestmap_get(omit_as_sybil, node->ri->cache_info.identity_digest); + !digestmap_get(omit_as_sybil, node->ri->cache_info.identity_digest) && + (router_get_advertised_bandwidth(node->ri) >= + ABSOLUTE_MIN_BW_VALUE_TO_CONSIDER); } /** Look through the routerlist, the Mean Time Between Failure history, and

1 0

[tor/master] When we mark a node as a sybil, mark it down and reset its uptime to 0
by nickm＠torproject.org 04 Feb '13

04 Feb '13

commit 4eff8b65305248b1e7a57d1efdf8f55039719bd7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 4 11:11:54 2013 -0500 When we mark a node as a sybil, mark it down and reset its uptime to 0 This prevents bug 8147, where such nodes would accrue points towards Guard, Fast, HSDir, and so on. Fixes bug 8147. --- changes/bug8146_etc | 3 +++ src/or/dirserv.c | 5 +++++ src/or/rephist.c | 15 +++++++++++++++ src/or/rephist.h | 2 ++ 4 files changed, 25 insertions(+), 0 deletions(-) diff --git a/changes/bug8146_etc b/changes/bug8146_etc index 274e2ab..173ea3b 100644 --- a/changes/bug8146_etc +++ b/changes/bug8146_etc @@ -8,3 +8,6 @@ - Do not consider nodes with extremely low bandwidths when deciding thresholds for various directory flags. Another fix for 8145. + - When marking a node as a likely sybil, reset its uptime metrics + to zero, so that it cannot time towards getting marked as Guard, + Stable, or HSDir. Fix for bug 8147. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 0c3e72f..b59478e 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2776,6 +2776,11 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, routers_sort_by_identity(routers); omit_as_sybil = get_possible_sybil_list(routers); + DIGESTMAP_FOREACH(omit_as_sybil, sybil_id, void *, ignore) { + (void) ignore; + rep_hist_make_router_pessimal(sybil_id, now); + } DIGESTMAP_FOREACH_END; + dirserv_compute_performance_thresholds(rl, omit_as_sybil); routerstatuses = smartlist_new(); diff --git a/src/or/rephist.c b/src/or/rephist.c index 925ca88..34caa4b 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -422,6 +422,21 @@ rep_hist_note_router_unreachable(const char *id, time_t when) } } +/** Mark a router with ID id as non-Running, and retroactively declare + * that it has never been running: give it no stability and no WFU. */ +void +rep_hist_make_router_pessimal(const char *id, time_t when) +{ + or_history_t *hist = get_or_history(id); + tor_assert(hist); + + rep_hist_note_router_unreachable(id, when); + mark_or_down(hist, when, 1); + + hist->weighted_run_length = 0; + hist->weighted_uptime = 0; +} + /** Helper: Discount all old MTBF data, if it is time to do so. Return * the time at which we should next discount MTBF data. */ time_t diff --git a/src/or/rephist.h b/src/or/rephist.h index 5568330..811cd8d 100644 --- a/src/or/rephist.h +++ b/src/or/rephist.h @@ -24,6 +24,8 @@ void rep_hist_dump_stats(time_t now, int severity); void rep_hist_note_bytes_read(size_t num_bytes, time_t when); void rep_hist_note_bytes_written(size_t num_bytes, time_t when); +void rep_hist_make_router_pessimal(const char *id, time_t when); + void rep_hist_note_dir_bytes_read(size_t num_bytes, time_t when); void rep_hist_note_dir_bytes_written(size_t num_bytes, time_t when);

1 0

[tor/master] Fix a warning when building with --disable-curve25519
by nickm＠torproject.org 04 Feb '13

04 Feb '13

commit 7cde094fd538c5c68f37071c94f39b55020d786e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 4 11:34:23 2013 -0500 Fix a warning when building with --disable-curve25519 It appears that the code for 7291 gave an unused-value warning when built with --disable-curve25519. --- src/or/onion.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/onion.c b/src/or/onion.c index b9f5aa6..d4a6502 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -82,6 +82,8 @@ have_room_for_onionskin(uint16_t type) if (type == ONION_HANDSHAKE_TYPE_TAP && tap_usec / 1000 > (uint64_t)options->MaxOnionQueueDelay * 2 / 3) return 0; +#else + (void) type; #endif return 1;

1 0

[tor/master] Fix compilation with --disable-curve25519 option
by nickm＠torproject.org 04 Feb '13

04 Feb '13

commit 5ea9a90d682279e857efd63e2a829bd5a39b0178 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 4 11:32:55 2013 -0500 Fix compilation with --disable-curve25519 option The fix is to move the two functions to format/parse base64 curve25519 public keys into a new "crypto_format.c" file. I could have put them in crypto.c, but that's a big file worth splitting anyway. Fixes bug 8153; bugfix on 0.2.4.8-alpha where I did the fix for 7869. --- changes/bug8153 | 3 ++ src/common/crypto_curve25519.c | 31 --------------------------- src/common/crypto_curve25519.h | 12 +++++----- src/common/crypto_format.c | 46 ++++++++++++++++++++++++++++++++++++++++ src/common/include.am | 1 + 5 files changed, 56 insertions(+), 37 deletions(-) diff --git a/changes/bug8153 b/changes/bug8153 new file mode 100644 index 0000000..9178f25 --- /dev/null +++ b/changes/bug8153 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Compile correctly with the --disable-curve25519 option. Fix for + bug 8153; bugfix on 0.2.4.8-alpha. diff --git a/src/common/crypto_curve25519.c b/src/common/crypto_curve25519.c index 62398f6..425a1a0 100644 --- a/src/common/crypto_curve25519.c +++ b/src/common/crypto_curve25519.c @@ -182,34 +182,3 @@ curve25519_handshake(uint8_t *output, curve25519_impl(output, skey->secret_key, pkey->public_key); } -int -curve25519_public_to_base64(char *output, - const curve25519_public_key_t *pkey) -{ - char buf[128]; - base64_encode(buf, sizeof(buf), - (const char*)pkey->public_key, CURVE25519_PUBKEY_LEN); - buf[CURVE25519_BASE64_PADDED_LEN] = '\0'; - memcpy(output, buf, CURVE25519_BASE64_PADDED_LEN+1); - return 0; -} - -int -curve25519_public_from_base64(curve25519_public_key_t *pkey, - const char *input) -{ - size_t len = strlen(input); - if (len == CURVE25519_BASE64_PADDED_LEN - 1) { - /* not padded */ - return digest256_from_base64((char*)pkey->public_key, input); - } else if (len == CURVE25519_BASE64_PADDED_LEN) { - char buf[128]; - if (base64_decode(buf, sizeof(buf), input, len) != CURVE25519_PUBKEY_LEN) - return -1; - memcpy(pkey->public_key, buf, CURVE25519_PUBKEY_LEN); - return 0; - } else { - return -1; - } -} - diff --git a/src/common/crypto_curve25519.h b/src/common/crypto_curve25519.h index 5524415..652f188 100644 --- a/src/common/crypto_curve25519.h +++ b/src/common/crypto_curve25519.h @@ -51,6 +51,12 @@ int curve25519_keypair_read_from_file(curve25519_keypair_t *keypair_out, char **tag_out, const char *fname); +#ifdef CRYPTO_CURVE25519_PRIVATE +int curve25519_impl(uint8_t *output, const uint8_t *secret, + const uint8_t *basepoint); +#endif +#endif + #define CURVE25519_BASE64_PADDED_LEN 44 int curve25519_public_from_base64(curve25519_public_key_t *pkey, @@ -58,11 +64,5 @@ int curve25519_public_from_base64(curve25519_public_key_t *pkey, int curve25519_public_to_base64(char *output, const curve25519_public_key_t *pkey); -#ifdef CRYPTO_CURVE25519_PRIVATE -int curve25519_impl(uint8_t *output, const uint8_t *secret, - const uint8_t *basepoint); -#endif -#endif - #endif diff --git a/src/common/crypto_format.c b/src/common/crypto_format.c new file mode 100644 index 0000000..93932f8 --- /dev/null +++ b/src/common/crypto_format.c @@ -0,0 +1,46 @@ +/* Copyright (c) 2012-2013, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/* Formatting and parsing code for crypto-related data structures. */ + +#define CRYPTO_CURVE25519_PRIVATE +#include "orconfig.h" +#ifdef HAVE_SYS_STAT_H +#include <sys/stat.h> +#endif +#include "crypto.h" +#include "crypto_curve25519.h" +#include "util.h" +#include "torlog.h" + +int +curve25519_public_to_base64(char *output, + const curve25519_public_key_t *pkey) +{ + char buf[128]; + base64_encode(buf, sizeof(buf), + (const char*)pkey->public_key, CURVE25519_PUBKEY_LEN); + buf[CURVE25519_BASE64_PADDED_LEN] = '\0'; + memcpy(output, buf, CURVE25519_BASE64_PADDED_LEN+1); + return 0; +} + +int +curve25519_public_from_base64(curve25519_public_key_t *pkey, + const char *input) +{ + size_t len = strlen(input); + if (len == CURVE25519_BASE64_PADDED_LEN - 1) { + /* not padded */ + return digest256_from_base64((char*)pkey->public_key, input); + } else if (len == CURVE25519_BASE64_PADDED_LEN) { + char buf[128]; + if (base64_decode(buf, sizeof(buf), input, len) != CURVE25519_PUBKEY_LEN) + return -1; + memcpy(pkey->public_key, buf, CURVE25519_PUBKEY_LEN); + return 0; + } else { + return -1; + } +} + diff --git a/src/common/include.am b/src/common/include.am index 808238d..b796ebf 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -52,6 +52,7 @@ src_common_libor_a_SOURCES = \ src_common_libor_crypto_a_SOURCES = \ src/common/aes.c \ src/common/crypto.c \ + src/common/crypto_format.c \ src/common/torgzip.c \ src/common/tortls.c \ $(libcrypto_extra_source)

1 0

[tor/master] Merge branch 'bug8153'
by nickm＠torproject.org 04 Feb '13

04 Feb '13

commit 898f2d7c278442d2c4fbdf0126eaa406d503d088 Merge: b64dc35 7cde094 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 4 11:54:38 2013 -0500 Merge branch 'bug8153' changes/bug8153 | 3 ++ src/common/crypto_curve25519.c | 31 --------------------------- src/common/crypto_curve25519.h | 12 +++++----- src/common/crypto_format.c | 46 ++++++++++++++++++++++++++++++++++++++++ src/common/include.am | 1 + src/or/onion.c | 2 + 6 files changed, 58 insertions(+), 37 deletions(-)

1 0

[tor/master] Reinstate some fixes/tweaks from 6e4a4002
by nickm＠torproject.org 04 Feb '13

04 Feb '13

commit b64dc35b5c27feb4a2df41934d644bc4957921bb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 4 11:51:39 2013 -0500 Reinstate some fixes/tweaks from 6e4a4002 These seem to have gotten conflicted out of existence while mike was working on path bias stuff. Thanks to sysrqb for collecting these in a handy patch. --- src/or/circuitbuild.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 5a5a3af..05f9d76 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2164,11 +2164,11 @@ pathbias_count_circs_in_states(entry_guard_t *guard, path_state_t from, path_state_t to) { - circuit_t *circ = global_circuitlist; + circuit_t *circ; int open_circuits = 0; - /* Count currently open circuits. Give them the benefit of the doubt */ - for ( ; circ; circ = circ->next) { + /* Count currently open circuits. Give them the benefit of the doubt. */ + for (circ = global_circuitlist; circ; circ = circ->next) { origin_circuit_t *ocirc = NULL; if (!CIRCUIT_IS_ORIGIN(circ) || /* didn't originate here */ circ->marked_for_close) /* already counted */ @@ -2183,8 +2183,8 @@ pathbias_count_circs_in_states(entry_guard_t *guard, ocirc->path_state <= to && pathbias_should_count(ocirc) && fast_memeq(guard->identity, - ocirc->cpath->extend_info->identity_digest, - DIGEST_LEN)) { + ocirc->cpath->extend_info->identity_digest, + DIGEST_LEN)) { log_debug(LD_CIRC, "Found opened circuit %d in path_state %s", ocirc->global_identifier, pathbias_state_to_string(ocirc->path_state)); @@ -2252,7 +2252,7 @@ pathbias_measure_use_rate(entry_guard_t *guard) log_warn(LD_CIRC, "Your Guard %s=%s is failing to carry an extremely large " "amount of stream on its circuits. " - "To avoid potential route manipluation attacks, Tor has " + "To avoid potential route manipulation attacks, Tor has " "disabled use of this guard. " "Use counts are %ld/%ld. Success counts are %ld/%ld. " "%ld circuits completed, %ld were unusable, %ld collapsed, " @@ -2355,7 +2355,7 @@ pathbias_measure_close_rate(entry_guard_t *guard) log_warn(LD_CIRC, "Your Guard %s=%s is failing an extremely large " "amount of circuits. " - "To avoid potential route manipluation attacks, Tor has " + "To avoid potential route manipulation attacks, Tor has " "disabled use of this guard. " "Success counts are %ld/%ld. Use counts are %ld/%ld. " "%ld circuits completed, %ld were unusable, %ld collapsed, " @@ -2531,9 +2531,10 @@ pathbias_scale_use_rates(entry_guard_t *guard) } /** Increment the number of times we successfully extended a circuit to - * 'guard', first checking if the failure rate is high enough that we should - * eliminate the guard. Return -1 if the guard looks no good; return 0 if the - * guard looks fine. */ + * guard, first checking if the failure rate is high enough that + * we should eliminate the guard. Return -1 if the guard looks no good; + * return 0 if the guard looks fine. + */ static int entry_guard_inc_circ_attempt_count(entry_guard_t *guard) {

1 0

[tor/master] Whoops: evdns_log, not tor_log, in src/ext/eventdns.c
by nickm＠torproject.org 04 Feb '13

04 Feb '13

commit ddf2c36ab1e606ea9dcd0253512da16ab17b3457 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 4 10:07:02 2013 -0500 Whoops: evdns_log, not tor_log, in src/ext/eventdns.c --- src/ext/eventdns.c | 118 +++++++++++++++++++++++++-------------------------- 1 files changed, 58 insertions(+), 60 deletions(-) diff --git a/src/ext/eventdns.c b/src/ext/eventdns.c index 5316338..3ee9f72 100644 --- a/src/ext/eventdns.c +++ b/src/ext/eventdns.c @@ -427,9 +427,9 @@ evdns_set_log_fn(evdns_debug_log_fn_type fn) #define EVDNS_LOG_CHECK #endif -static void _evdns_log(int warn, const char *fmt, ...) EVDNS_LOG_CHECK; +static void evdns_log(int warn, const char *fmt, ...) EVDNS_LOG_CHECK; static void -_evdns_log(int warn, const char *fmt, ...) +evdns_log(int warn, const char *fmt, ...) { va_list args; static char buf[512]; @@ -446,8 +446,6 @@ _evdns_log(int warn, const char *fmt, ...) va_end(args); } -#define log _evdns_log - static int sockaddr_eq(const struct sockaddr *sa1, const struct sockaddr *sa2, int include_port) @@ -534,7 +532,7 @@ nameserver_probe_failed(struct nameserver *const ns) { ns->failed_times++; if (add_timeout_event(ns, (struct timeval *) timeout) < 0) { - tor_log(EVDNS_LOG_WARN, + evdns_log(EVDNS_LOG_WARN, "Error from libevent when adding timer event for %s", debug_ntop((struct sockaddr *)&ns->address)); /* ???? Do more? */ @@ -550,19 +548,19 @@ nameserver_failed(struct nameserver *const ns, const char *msg) { /* then don't do anything */ if (!ns->state) return; - tor_log(EVDNS_LOG_WARN, "Nameserver %s has failed: %s", + evdns_log(EVDNS_LOG_WARN, "Nameserver %s has failed: %s", debug_ntop((struct sockaddr *)&ns->address), msg); global_good_nameservers--; assert(global_good_nameservers >= 0); if (global_good_nameservers == 0) { - tor_log(EVDNS_LOG_WARN, "All nameservers have failed"); + evdns_log(EVDNS_LOG_WARN, "All nameservers have failed"); } ns->state = 0; ns->failed_times = 1; if (add_timeout_event(ns, (struct timeval *) &global_nameserver_timeouts[0]) < 0) { - tor_log(EVDNS_LOG_WARN, + evdns_log(EVDNS_LOG_WARN, "Error from libevent when adding timer event for %s", debug_ntop((struct sockaddr *)&ns->address)); /* ???? Do more? */ @@ -593,7 +591,7 @@ nameserver_failed(struct nameserver *const ns, const char *msg) { static void nameserver_up(struct nameserver *const ns) { if (ns->state) return; - tor_log(EVDNS_LOG_WARN, "Nameserver %s is back up", + evdns_log(EVDNS_LOG_WARN, "Nameserver %s is back up", debug_ntop((struct sockaddr *)&ns->address)); del_timeout_event(ns); ns->state = 1; @@ -624,7 +622,7 @@ request_finished(struct evdns_request *const req, struct evdns_request **head) { } } - tor_log(EVDNS_LOG_DEBUG, "Removing timeout for request %lx", + evdns_log(EVDNS_LOG_DEBUG, "Removing timeout for request %lx", (unsigned long) req); del_timeout_event(req); @@ -776,7 +774,7 @@ reply_handle(struct evdns_request *const req, u16 flags, u32 ttl, struct reply * * confusing." Treat this as a timeout, not a failure. */ /*XXXX refactor the parts of */ - tor_log(EVDNS_LOG_DEBUG, "Got a SERVERFAILED from nameserver %s; " + evdns_log(EVDNS_LOG_DEBUG, "Got a SERVERFAILED from nameserver %s; " "will allow the request to time out.", debug_ntop((struct sockaddr *)&req->ns->address)); break; @@ -1268,7 +1266,7 @@ nameserver_read(struct nameserver *ns) { } /* XXX Match port too? */ if (!sockaddr_eq(sa, (struct sockaddr*)&ns->address, 0)) { - tor_log(EVDNS_LOG_WARN, + evdns_log(EVDNS_LOG_WARN, "Address mismatch on received DNS packet. Address was %s", debug_ntop(sa)); return; @@ -1294,7 +1292,7 @@ server_port_read(struct evdns_server_port *s) { if (r < 0) { int err = last_error(s->socket); if (error_is_eagain(err)) return; - tor_log(EVDNS_LOG_WARN, "Error %s (%d) while reading request.", + evdns_log(EVDNS_LOG_WARN, "Error %s (%d) while reading request.", tor_socket_strerror(err), err); return; } @@ -1314,7 +1312,7 @@ server_port_flush(struct evdns_server_port *port) int err = last_error(port->socket); if (error_is_eagain(err)) return; - tor_log(EVDNS_LOG_WARN, "Error %s (%d) while writing response to port; dropping", tor_socket_strerror(err), err); + evdns_log(EVDNS_LOG_WARN, "Error %s (%d) while writing response to port; dropping", tor_socket_strerror(err), err); } if (server_request_free(req)) { /* we released the last reference to req->port. */ @@ -1331,7 +1329,7 @@ server_port_flush(struct evdns_server_port *port) event_set(&port->event, port->socket, EV_READ | EV_PERSIST, server_port_ready_callback, port); if (event_add(&port->event, NULL) < 0) { - tor_log(EVDNS_LOG_WARN, "Error from libevent when adding event for DNS server."); + evdns_log(EVDNS_LOG_WARN, "Error from libevent when adding event for DNS server."); /* ???? Do more? */ } } @@ -1349,7 +1347,7 @@ nameserver_write_waiting(struct nameserver *ns, char waiting) { event_set(&ns->event, ns->socket, EV_READ | (waiting ? EV_WRITE : 0) | EV_PERSIST, nameserver_ready_callback, ns); if (event_add(&ns->event, NULL) < 0) { - tor_log(EVDNS_LOG_WARN, "Error from libevent when adding event for %s", + evdns_log(EVDNS_LOG_WARN, "Error from libevent when adding event for %s", debug_ntop((struct sockaddr *)&ns->address)); /* ???? Do more? */ } @@ -1859,7 +1857,7 @@ evdns_server_request_respond(struct evdns_server_request *_req, int err) event_set(&port->event, port->socket, (port->closing?0:EV_READ) | EV_WRITE | EV_PERSIST, server_port_ready_callback, port); if (event_add(&port->event, NULL) < 0) { - tor_log(EVDNS_LOG_WARN, "Error from libevent when adding event for DNS server"); + evdns_log(EVDNS_LOG_WARN, "Error from libevent when adding event for DNS server"); } } @@ -1995,7 +1993,7 @@ evdns_request_timeout_callback(int fd, short events, void *arg) { (void) fd; (void) events; - tor_log(EVDNS_LOG_DEBUG, "Request %lx timed out", (unsigned long) arg); + evdns_log(EVDNS_LOG_DEBUG, "Request %lx timed out", (unsigned long) arg); req->ns->timedout++; if (req->ns->timedout > global_max_nameserver_timeout) { @@ -2074,11 +2072,11 @@ evdns_request_transmit(struct evdns_request *req) { * and make us retransmit the request anyway. */ default: /* transmitted; we need to check for timeout. */ - tor_log(EVDNS_LOG_DEBUG, + evdns_log(EVDNS_LOG_DEBUG, "Setting timeout for request %lx", (unsigned long) req); if (add_timeout_event(req, &global_timeout) < 0) { - tor_log(EVDNS_LOG_WARN, + evdns_log(EVDNS_LOG_WARN, "Error from libevent when adding timer for request %lx", (unsigned long) req); /* ???? Do more? */ @@ -2126,7 +2124,7 @@ nameserver_send_probe(struct nameserver *const ns) { addr = mm_malloc(sizeof(struct sockaddr_storage)); memcpy(addr, &ns->address, sizeof(struct sockaddr_storage)); - tor_log(EVDNS_LOG_DEBUG, "Sending probe to %s", debug_ntop((struct sockaddr *)&ns->address)); + evdns_log(EVDNS_LOG_DEBUG, "Sending probe to %s", debug_ntop((struct sockaddr *)&ns->address)); req = request_new(TYPE_A, "www.google.com", DNS_QUERY_NO_SEARCH, nameserver_probe_callback, addr); if (!req) { @@ -2282,14 +2280,14 @@ _evdns_nameserver_add_impl(const struct sockaddr *address, if (server) { do { if (sockaddr_eq(address, (struct sockaddr *)&server->address, 1)) { - tor_log(EVDNS_LOG_DEBUG, "Duplicate nameserver."); + evdns_log(EVDNS_LOG_DEBUG, "Duplicate nameserver."); return 3; } server = server->next; } while (server != started_at); } if (addrlen > (int)sizeof(ns->address)) { - tor_log(EVDNS_LOG_DEBUG, "Addrlen %d too long.", (int)addrlen); + evdns_log(EVDNS_LOG_DEBUG, "Addrlen %d too long.", (int)addrlen); return 2; } @@ -2315,14 +2313,14 @@ _evdns_nameserver_add_impl(const struct sockaddr *address, !sockaddr_is_loopback((struct sockaddr*)&global_bind_address)) { if (bind(ns->socket, (struct sockaddr *)&global_bind_address, global_bind_addrlen) < 0) { - tor_log(EVDNS_LOG_DEBUG, "Couldn't bind to outgoing address."); + evdns_log(EVDNS_LOG_DEBUG, "Couldn't bind to outgoing address."); err = 2; goto out2; } } if (connect(ns->socket, address, addrlen) != 0) { - tor_log(EVDNS_LOG_DEBUG, "Couldn't open socket to nameserver."); + evdns_log(EVDNS_LOG_DEBUG, "Couldn't open socket to nameserver."); err = 2; goto out2; } @@ -2331,12 +2329,12 @@ _evdns_nameserver_add_impl(const struct sockaddr *address, ns->state = 1; event_set(&ns->event, ns->socket, EV_READ | EV_PERSIST, nameserver_ready_callback, ns); if (event_add(&ns->event, NULL) < 0) { - tor_log(EVDNS_LOG_DEBUG, "Couldn't add event for nameserver."); + evdns_log(EVDNS_LOG_DEBUG, "Couldn't add event for nameserver."); err = 2; goto out2; } - tor_log(EVDNS_LOG_DEBUG, "Added nameserver %s", debug_ntop(address)); + evdns_log(EVDNS_LOG_DEBUG, "Added nameserver %s", debug_ntop(address)); /* insert this nameserver into the list of them */ if (!server_head) { @@ -2360,7 +2358,7 @@ out2: out1: CLEAR(ns); mm_free(ns); - tor_log(EVDNS_LOG_WARN, "Unable to add nameserver %s: error %d", debug_ntop(address), err); + evdns_log(EVDNS_LOG_WARN, "Unable to add nameserver %s: error %d", debug_ntop(address), err); return err; } @@ -2393,18 +2391,18 @@ evdns_nameserver_ip_add(const char *ip_as_string) { * ipv4 */ - tor_log(EVDNS_LOG_DEBUG, "Trying to add nameserver <%s>", ip_as_string); + evdns_log(EVDNS_LOG_DEBUG, "Trying to add nameserver <%s>", ip_as_string); cp = strchr(ip_as_string, ':'); if (*ip_as_string == '[') { size_t len; if (!(cp = strchr(ip_as_string, ']'))) { - tor_log(EVDNS_LOG_DEBUG, "Nameserver missing closing ]"); + evdns_log(EVDNS_LOG_DEBUG, "Nameserver missing closing ]"); return 4; } len = cp-(ip_as_string + 1); if (len > sizeof(buf)-1) { - tor_log(EVDNS_LOG_DEBUG, "[Nameserver] does not fit in buffer."); + evdns_log(EVDNS_LOG_DEBUG, "[Nameserver] does not fit in buffer."); return 4; } memcpy(buf, ip_as_string+1, len); @@ -2422,7 +2420,7 @@ evdns_nameserver_ip_add(const char *ip_as_string) { } else if (cp) { is_ipv6 = 0; if (cp - ip_as_string > (int)sizeof(buf)-1) { - tor_log(EVDNS_LOG_DEBUG, "Nameserver does not fit in buffer."); + evdns_log(EVDNS_LOG_DEBUG, "Nameserver does not fit in buffer."); return 4; } memcpy(buf, ip_as_string, cp-ip_as_string); @@ -2440,7 +2438,7 @@ evdns_nameserver_ip_add(const char *ip_as_string) { } else { port = strtoint(port_part); if (port <= 0 || port > 65535) { - tor_log(EVDNS_LOG_DEBUG, "Nameserver port <%s> out of range", + evdns_log(EVDNS_LOG_DEBUG, "Nameserver port <%s> out of range", port_part); return 4; } @@ -2457,7 +2455,7 @@ evdns_nameserver_ip_add(const char *ip_as_string) { sin6.sin6_family = AF_INET6; sin6.sin6_port = htons(port); if (1 != tor_inet_pton(AF_INET6, addr_part, &sin6.sin6_addr)) { - tor_log(EVDNS_LOG_DEBUG, "inet_pton(%s) failed", addr_part); + evdns_log(EVDNS_LOG_DEBUG, "inet_pton(%s) failed", addr_part); return 4; } return _evdns_nameserver_add_impl((struct sockaddr*)&sin6, @@ -2471,7 +2469,7 @@ evdns_nameserver_ip_add(const char *ip_as_string) { sin.sin_family = AF_INET; sin.sin_port = htons(port); if (!inet_aton(addr_part, &sin.sin_addr)) { - tor_log(EVDNS_LOG_DEBUG, "inet_pton(%s) failed", addr_part); + evdns_log(EVDNS_LOG_DEBUG, "inet_pton(%s) failed", addr_part); return 4; } return _evdns_nameserver_add_impl((struct sockaddr*)&sin, @@ -2594,7 +2592,7 @@ request_submit(struct evdns_request *const req) { /* exported function */ int evdns_resolve_ipv4(const char *name, int flags, evdns_callback_type callback, void *ptr) { - tor_log(EVDNS_LOG_DEBUG, "Resolve requested for %s", name); + evdns_log(EVDNS_LOG_DEBUG, "Resolve requested for %s", name); if (flags & DNS_QUERY_NO_SEARCH) { struct evdns_request *const req = request_new(TYPE_A, name, flags, callback, ptr); @@ -2610,7 +2608,7 @@ int evdns_resolve_ipv4(const char *name, int flags, /* exported function */ int evdns_resolve_ipv6(const char *name, int flags, evdns_callback_type callback, void *ptr) { - tor_log(EVDNS_LOG_DEBUG, "Resolve requested for %s", name); + evdns_log(EVDNS_LOG_DEBUG, "Resolve requested for %s", name); if (flags & DNS_QUERY_NO_SEARCH) { struct evdns_request *const req = request_new(TYPE_AAAA, name, flags, callback, ptr); @@ -2634,7 +2632,7 @@ int evdns_resolve_reverse(const struct in_addr *in, int flags, evdns_callback_ty (int)(u8)((a>>8 )&0xff), (int)(u8)((a>>16)&0xff), (int)(u8)((a>>24)&0xff)); - tor_log(EVDNS_LOG_DEBUG, "Resolve requested for %s (reverse)", buf); + evdns_log(EVDNS_LOG_DEBUG, "Resolve requested for %s (reverse)", buf); req = request_new(TYPE_PTR, buf, flags, callback, ptr); if (!req) return 1; request_submit(req); @@ -2658,7 +2656,7 @@ int evdns_resolve_reverse_ipv6(const struct in6_addr *in, int flags, evdns_callb } assert(cp + strlen("ip6.arpa") < buf+sizeof(buf)); memcpy(cp, "ip6.arpa", strlen("ip6.arpa")+1); - tor_log(EVDNS_LOG_DEBUG, "Resolve requested for %s (reverse)", buf); + evdns_log(EVDNS_LOG_DEBUG, "Resolve requested for %s (reverse)", buf); req = request_new(TYPE_PTR, buf, flags, callback, ptr); if (!req) return 1; request_submit(req); @@ -2874,7 +2872,7 @@ search_try_next(struct evdns_request *const req) { if (string_num_dots(req->search_origname) < req->search_state->ndots) { /* yep, we need to try it raw */ struct evdns_request *const newreq = request_new(req->request_type, req->search_origname, req->search_flags, req->user_callback, req->user_pointer); - tor_log(EVDNS_LOG_DEBUG, "Search: trying raw query %s", req->search_origname); + evdns_log(EVDNS_LOG_DEBUG, "Search: trying raw query %s", req->search_origname); if (newreq) { request_submit(newreq); return 0; @@ -2885,7 +2883,7 @@ search_try_next(struct evdns_request *const req) { new_name = search_make_new(req->search_state, req->search_index, req->search_origname); if (!new_name) return 1; - tor_log(EVDNS_LOG_DEBUG, "Search: now trying %s (%d)", new_name, req->search_index); + evdns_log(EVDNS_LOG_DEBUG, "Search: now trying %s (%d)", new_name, req->search_index); newreq = request_new(req->request_type, new_name, req->search_flags, req->user_callback, req->user_pointer); mm_free(new_name); if (!newreq) return 1; @@ -2955,7 +2953,7 @@ evdns_set_option(const char *option, const char *val, int flags) const int ndots = strtoint(val); if (ndots == -1) return -1; if (!(flags & DNS_OPTION_SEARCH)) return 0; - tor_log(EVDNS_LOG_DEBUG, "Setting ndots to %d", ndots); + evdns_log(EVDNS_LOG_DEBUG, "Setting ndots to %d", ndots); if (!global_search_state) global_search_state = search_state_new(); if (!global_search_state) return -1; global_search_state->ndots = ndots; @@ -2963,20 +2961,20 @@ evdns_set_option(const char *option, const char *val, int flags) const int timeout = strtoint(val); if (timeout == -1) return -1; if (!(flags & DNS_OPTION_MISC)) return 0; - tor_log(EVDNS_LOG_DEBUG, "Setting timeout to %d", timeout); + evdns_log(EVDNS_LOG_DEBUG, "Setting timeout to %d", timeout); global_timeout.tv_sec = timeout; } else if (!strncmp(option, "max-timeouts:", 12)) { const int maxtimeout = strtoint_clipped(val, 1, 255); if (maxtimeout == -1) return -1; if (!(flags & DNS_OPTION_MISC)) return 0; - tor_log(EVDNS_LOG_DEBUG, "Setting maximum allowed timeouts to %d", + evdns_log(EVDNS_LOG_DEBUG, "Setting maximum allowed timeouts to %d", maxtimeout); global_max_nameserver_timeout = maxtimeout; } else if (!strncmp(option, "max-inflight:", 13)) { const int maxinflight = strtoint_clipped(val, 1, 65000); if (maxinflight == -1) return -1; if (!(flags & DNS_OPTION_MISC)) return 0; - tor_log(EVDNS_LOG_DEBUG, "Setting maximum inflight requests to %d", + evdns_log(EVDNS_LOG_DEBUG, "Setting maximum inflight requests to %d", maxinflight); global_max_requests_inflight = maxinflight; } else if (!strncmp(option, "attempts:", 9)) { @@ -2984,12 +2982,12 @@ evdns_set_option(const char *option, const char *val, int flags) if (retries == -1) return -1; if (retries > 255) retries = 255; if (!(flags & DNS_OPTION_MISC)) return 0; - tor_log(EVDNS_LOG_DEBUG, "Setting retries to %d", retries); + evdns_log(EVDNS_LOG_DEBUG, "Setting retries to %d", retries); global_max_retransmits = retries; } else if (!strncmp(option, "randomize-case:", 15)) { int randcase = strtoint(val); if (!(flags & DNS_OPTION_MISC)) return 0; - tor_log(EVDNS_LOG_DEBUG, "Setting randomize_case to %d", randcase); + evdns_log(EVDNS_LOG_DEBUG, "Setting randomize_case to %d", randcase); global_randomize_case = randcase; } return 0; @@ -3047,7 +3045,7 @@ evdns_resolv_conf_parse(int flags, const char *const filename) { char *start; int err = 0; - tor_log(EVDNS_LOG_DEBUG, "Parsing resolv.conf file %s", filename); + evdns_log(EVDNS_LOG_DEBUG, "Parsing resolv.conf file %s", filename); fd = tor_open_cloexec(filename, O_RDONLY, 0); if (fd < 0) { @@ -3146,13 +3144,13 @@ load_nameservers_with_getnetworkparams(void) GetNetworkParams_fn_t fn; if (!(handle = load_windows_system_library(TEXT("iphlpapi.dll")))) { - tor_log(EVDNS_LOG_WARN, "Could not open iphlpapi.dll"); + evdns_log(EVDNS_LOG_WARN, "Could not open iphlpapi.dll"); /* right now status = 0, doesn't that mean "good" - mikec */ status = -1; goto done; } if (!(fn = (GetNetworkParams_fn_t) GetProcAddress(handle, TEXT("GetNetworkParams")))) { - tor_log(EVDNS_LOG_WARN, "Could not get address of function."); + evdns_log(EVDNS_LOG_WARN, "Could not get address of function."); /* same as above */ status = -1; goto done; @@ -3173,7 +3171,7 @@ load_nameservers_with_getnetworkparams(void) fixed = buf; r = fn(fixed, &size); if (r != ERROR_SUCCESS) { - tor_log(EVDNS_LOG_DEBUG, "fn() failed."); + evdns_log(EVDNS_LOG_DEBUG, "fn() failed."); status = -1; goto done; } @@ -3185,12 +3183,12 @@ load_nameservers_with_getnetworkparams(void) while (ns) { r = evdns_nameserver_ip_add_line(ns->IpAddress.String); if (r) { - tor_log(EVDNS_LOG_DEBUG,"Could not add nameserver %s to list, " + evdns_log(EVDNS_LOG_DEBUG,"Could not add nameserver %s to list, " "error: %d; status: %d", (ns->IpAddress.String),(int)GetLastError(), r); status = r; } else { - tor_log(EVDNS_LOG_DEBUG,"Successfully added %s as nameserver",ns->IpAddress.String); + evdns_log(EVDNS_LOG_DEBUG,"Successfully added %s as nameserver",ns->IpAddress.String); added_any++; } @@ -3198,7 +3196,7 @@ load_nameservers_with_getnetworkparams(void) } if (!added_any) { - tor_log(EVDNS_LOG_DEBUG, "No nameservers added."); + evdns_log(EVDNS_LOG_DEBUG, "No nameservers added."); if (status == 0) status = -1; } else { @@ -3254,10 +3252,10 @@ load_nameservers_from_registry(void) #define TRY(k, name) \ if (!found && config_nameserver_from_reg_key(k,TEXT(name)) == 0) { \ - tor_log(EVDNS_LOG_DEBUG,"Found nameservers in %s/%s",#k,name); \ + evdns_log(EVDNS_LOG_DEBUG,"Found nameservers in %s/%s",#k,name); \ found = 1; \ } else if (!found) { \ - tor_log(EVDNS_LOG_DEBUG,"Didn't find nameservers in %s/%s", \ + evdns_log(EVDNS_LOG_DEBUG,"Didn't find nameservers in %s/%s", \ #k,#name); \ } @@ -3266,14 +3264,14 @@ load_nameservers_from_registry(void) if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, KEY_READ, &nt_key) != ERROR_SUCCESS) { - tor_log(EVDNS_LOG_DEBUG,"Couldn't open nt key, %d",(int)GetLastError()); + evdns_log(EVDNS_LOG_DEBUG,"Couldn't open nt key, %d",(int)GetLastError()); return -1; } r = RegOpenKeyEx(nt_key, TEXT("Interfaces"), 0, KEY_QUERY_VALUE|KEY_ENUMERATE_SUB_KEYS, &interfaces_key); if (r != ERROR_SUCCESS) { - tor_log(EVDNS_LOG_DEBUG,"Couldn't open interfaces key, %d",(int)GetLastError()); + evdns_log(EVDNS_LOG_DEBUG,"Couldn't open interfaces key, %d",(int)GetLastError()); return -1; } TRY(nt_key, "NameServer"); @@ -3286,7 +3284,7 @@ load_nameservers_from_registry(void) HKEY win_key = 0; if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_9X_KEY, 0, KEY_READ, &win_key) != ERROR_SUCCESS) { - tor_log(EVDNS_LOG_DEBUG, "Couldn't open registry key, %d", (int)GetLastError()); + evdns_log(EVDNS_LOG_DEBUG, "Couldn't open registry key, %d", (int)GetLastError()); return -1; } TRY(win_key, "NameServer"); @@ -3294,7 +3292,7 @@ load_nameservers_from_registry(void) } if (found == 0) { - tor_log(EVDNS_LOG_WARN,"Didn't find any nameservers."); + evdns_log(EVDNS_LOG_WARN,"Didn't find any nameservers."); } return found ? 0 : -1;

1 0

[metrics-web/master] Further specify sanitized bridge network statuses.
by karsten＠torproject.org 04 Feb '13

04 Feb '13

commit 1070c92cb174fc7fc545cd862653b8836d7cd6df Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Feb 4 11:35:46 2013 +0100 Further specify sanitized bridge network statuses. As discussed in #7938. --- web/WEB-INF/formats.jsp | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp index 0fa7201..f5514b4 100644 --- a/web/WEB-INF/formats.jsp +++ b/web/WEB-INF/formats.jsp @@ -362,8 +362,17 @@ arguments are removed, only leaving in the supported transport names.</li> </ol> +Apart from these processing steps, sanitized bridge server descriptors +follow the same format as relay server descriptors. +The same applies to sanitized bridge extra-info descriptors. +Sanitized bridge network statuses are similar to version 2 relay network +statuses, but with only a <tt>published</tt> line in the header and +without any lines in the footer. + + + The two documents below show an example bridge server -descriptor that is referenced from a bridge network status entry. +descriptor that is referenced from a bridge network status. For more details about this process, see the <a href="https://gitweb.torproject.org/metrics-db.git">metrics data processor</a> software. @@ -373,6 +382,7 @@ For more details about this process, see the Sanitized bridge server descriptor: +<tt>@type bridge-server-descriptor 1.0</tt> <tt>router Unnamed 10.74.150.129 443 0 0</tt> <tt>platform Tor 0.2.2.19-alpha (git-1988927edecce4c7) on Linux i686</tt> <tt>opt protocols Link 1 2 Circuit 1</tt> @@ -389,12 +399,16 @@ For more details about this process, see the <blockquote> -Sanitized bridge network status entry: +Sanitized bridge network status: +<tt>@type bridge-network-status 1.0</tt> +<tt>published 2010-12-27 22:03:01</tt> +<tt>[...status entries...]</tt> <tt>r Unnamed pfp/OLAqQV5y/mFMZKHlqSupm70 dByzfWWLas9cen7PtZ3XGYIJHt4 2010-12-27 18:55:01 10.74.150.129 443 0</tt> <tt>s Fast Guard HSDir Running Stable Valid</tt> +<tt>[...status entries...]</tt> </blockquote> <hr>

1 0

[metrics-web/master] Use better colors for the versions graph, suggested by bastik.
by karsten＠torproject.org 04 Feb '13

04 Feb '13

commit 6481dac7b2200c1d1bf8066730e55df9b68d7118 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Feb 4 11:09:21 2013 +0100 Use better colors for the versions graph, suggested by bastik. Implements #7812. Thanks, bastik! --- rserve/graphs.R | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index 22225be..2a59396 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -415,7 +415,7 @@ plot_versions <- function(start, end, path) { known_versions <- c("0.1.0", "0.1.1", "0.1.2", "0.2.0", "0.2.1", "0.2.2", "0.2.3", "0.2.4") colours <- data.frame(breaks = known_versions, - values = brewer.pal(length(known_versions), "YlOrBr"), + values = brewer.pal(length(known_versions), "Accent"), stringsAsFactors = FALSE) versions <- versions[versions$version %in% known_versions, ] visible_versions <- sort(unique(versions$version))

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 04 Feb '13

04 Feb '13

commit 323330863bd063654b53560136016878f0c38206 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 4 09:16:28 2013 +0000 Update translations for torbirdy_completed --- eu/torbirdy.dtd | 1 + eu/torbirdy.properties | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/eu/torbirdy.dtd b/eu/torbirdy.dtd index 7052000..a234f0a 100644 --- a/eu/torbirdy.dtd +++ b/eu/torbirdy.dtd @@ -43,4 +43,5 @@ <!ENTITY torbirdy.panel.usetor.label "Erabili Tor Tipula Bideratzailea"> <!ENTITY torbirdy.panel.usejondo.label "Erabili JonDo (Premium)"> +<!ENTITY torbirdy.panel.usewhonix.label "Erabili Whonix"> <!ENTITY torbirdy.panel.preferences.label "Ireki TorBirdy hobespenak"> diff --git a/eu/torbirdy.properties b/eu/torbirdy.properties index 15cc9d5..a9c0b32 100644 --- a/eu/torbirdy.properties +++ b/eu/torbirdy.properties @@ -1,9 +1,10 @@ torbirdy.name=TorBirdy -torbirdy.enabled.tor=TorBirdy Gaituta: Tor -torbirdy.enabled.jondo=TorBirdy Gaituta: JonDo -torbirdy.enabled.custom=TorBirdy Gaituta: Pertsonalizatutako proxya -torbirdy.enabled.torification=TorBirdy Gaituta: Torifikazio gardena +torbirdy.enabled.tor=TorBirdy gaituta: Tor +torbirdy.enabled.jondo=TorBirdy gaituta: JonDo +torbirdy.enabled.custom=TorBirdy gaituta: Pertsonalizatutako proxya +torbirdy.enabled.torification=TorBirdy gaituta: Torifikazio gardena +torbirdy.enabled.whonix=TorBirdy gaituta: Whonix torbirdy.disabled=TorBirdy: Ezgaituta! torbirdy.email.prompt=TorBirdyk Thunderbirden autokonfigurazio morroia ezgaitu du zure anonimotasuna babesteko.\n\n%S rentzako gomendatutako segurtasun ezarpenak ezarri dira.\n\nOrain beste kontu ezarpenak eskuz konfigura ditzakezu.

1 0