tor-commits February 2011

tor-commits@lists.torproject.org

14 participants
290 discussions

[tor/maint-0.2.2] Merge remote branch 'sebastian/bug2504' into maint-0.2.2
by nickm＠torproject.org 22 Feb '11

22 Feb '11

commit 613073e449c22ad3583e406e48cf5ada395489f0 Merge: 19e5b4c 5dbaf9d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 22 12:47:21 2011 -0500 Merge remote branch 'sebastian/bug2504' into maint-0.2.2 changes/bug2504 | 5 +++++ src/common/compat.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] Windows has EACCES, not EACCESS
by nickm＠torproject.org 22 Feb '11

22 Feb '11

commit 5dbaf9dbd545d7c9ecc18224883a74a9dc60ecf4 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Feb 11 16:57:53 2011 +0100 Windows has EACCES, not EACCESS Once again spotted by mobmix Also add a changes file for the fix --- changes/bug2504 | 5 +++++ src/common/compat.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/bug2504 b/changes/bug2504 new file mode 100644 index 0000000..791600e --- /dev/null +++ b/changes/bug2504 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix a bug with our locking implementation on windows that couldn't + correctly detect when a file was already locked. Fixes bug 2504, + bugfix on 0.2.1.6-alpha. + diff --git a/src/common/compat.c b/src/common/compat.c index 5dfde3d..d29cacf 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -699,7 +699,7 @@ tor_lockfile_lock(const char *filename, int blocking, int *locked_out) #ifdef WIN32 _lseek(fd, 0, SEEK_SET); if (_locking(fd, blocking ? _LK_LOCK : _LK_NBLCK, 1) < 0) { - if (errno != EACCESS && errno != EDEADLOCK) + if (errno != EACCES && errno != EDEADLOCK) log_warn(LD_FS,"Couldn't lock \"%s\": %s", filename, strerror(errno)); else *locked_out = 1;

1 0

[tor/master] Initial heartbeat subsystem commit.
by nickm＠torproject.org 22 Feb '11

22 Feb '11

commit 098b6ba72d636cf00cfa091e745c25a649fba493 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Dec 1 03:24:03 2010 +0200 Initial heartbeat subsystem commit. Sets: * Documentation * Logging domain * Configuration option * Scheduled event * Makefile It also creates status.c and the log_heartbeat() function. All code was written by Sebastian Hahn. Commit message was written by me (George Kadianakis). --- doc/tor.1.txt | 4 ++++ src/common/torlog.h | 4 +++- src/or/Makefile.am | 3 ++- src/or/config.c | 13 +++++++++++++ src/or/main.c | 7 +++++++ src/or/or.h | 3 +++ src/or/status.c | 27 +++++++++++++++++++++++++++ 7 files changed, 59 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index bc18b2f..9020a80 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -928,6 +928,10 @@ is non-zero): seconds, we exit. If we get a second SIGINT, we exit immedi- ately. (Default: 30 seconds) +**HeartbeatPeriod** __N__ **minutes**|**hours**|**days**|**weeks**:: + Log a heartbeat message every **HeartbeatPeriod** seconds. This is + a log level __info__ message, designed to let you know your Tor + instance is still alive and doing useful things. (Default: 6 hours) **AccountingMax** __N__ **bytes**|**KB**|**MB**|**GB**|**TB**:: Never send more than the specified number of bytes in a given accounting diff --git a/src/common/torlog.h b/src/common/torlog.h index 1fe5806..4192a88 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -92,8 +92,10 @@ #define LD_HIST (1u<<18) /** OR handshaking */ #define LD_HANDSHAKE (1u<<19) +/** Heartbeat messages */ +#define LD_HEARTBEAT (1u<<20) /** Number of logging domains in the code. */ -#define N_LOGGING_DOMAINS 20 +#define N_LOGGING_DOMAINS 21 /** This log message is not safe to send to a callback-based logger * immediately. Used as a flag, not a log domain. */ diff --git a/src/or/Makefile.am b/src/or/Makefile.am index b6637ba..a49a86a 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -52,7 +52,8 @@ libtor_a_SOURCES = \ routerparse.c \ $(evdns_source) \ $(tor_platform_source) \ - config_codedigest.c + config_codedigest.c \ + status.c #libtor_a_LIBADD = ../common/libor.a ../common/libor-crypto.a \ # ../common/libor-event.a diff --git a/src/or/config.c b/src/or/config.c index 65bc1d5..e2b2b5c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -267,6 +267,7 @@ static config_var_t _option_vars[] = { #endif OBSOLETE("Group"), V(HardwareAccel, BOOL, "0"), + V(HeartbeatPeriod, INTERVAL, "6 hours"), V(AccelName, STRING, NULL), V(AccelDir, FILENAME, NULL), V(HashedControlPassword, LINELIST, NULL), @@ -2915,6 +2916,10 @@ compute_publishserverdescriptor(or_options_t *options) * will generate too many circuits and potentially overload the network. */ #define MIN_CIRCUIT_STREAM_TIMEOUT 10 +/** Lowest allowable value for HeartbeatPeriod; if this is too low, we might + * expose more information than we're comfortable with. */ +#define MIN_HEARTBEAT_PERIOD (30*60) + /** Return 0 if every setting in options is reasonable, and a * permissible transition from old_options. Else return -1. * Should have no side effects, except for normalizing the contents of @@ -3376,6 +3381,14 @@ options_validate(or_options_t *old_options, or_options_t *options, "raising to %d seconds.", MIN_CIRCUIT_STREAM_TIMEOUT); options->CircuitStreamTimeout = MIN_CIRCUIT_STREAM_TIMEOUT; } + + if (options->HeartbeatPeriod && + options->HeartbeatPeriod < MIN_HEARTBEAT_PERIOD) { + log_warn(LD_CONFIG, "HeartbeatPeriod option is too short; " + "raising to %d seconds.", MIN_HEARTBEAT_PERIOD); + options->HeartbeatPeriod = MIN_HEARTBEAT_PERIOD; + } + if (options->KeepalivePeriod < 1) REJECT("KeepalivePeriod option must be positive."); diff --git a/src/or/main.c b/src/or/main.c index c6fd2c0..6e3cb2b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1050,6 +1050,7 @@ run_scheduled_events(time_t now) static time_t time_to_check_port_forwarding = 0; static int should_init_bridge_stats = 1; static time_t time_to_retry_dns_init = 0; + static time_t time_last_written_heartbeat = 0; or_options_t *options = get_options(); int is_server = server_mode(options); int i; @@ -1440,6 +1441,12 @@ run_scheduled_events(time_t now) now); time_to_check_port_forwarding = now+PORT_FORWARDING_CHECK_INTERVAL; } + + /** 11. write the heartbeat message */ + if (options->HeartbeatPeriod && + time_last_written_heartbeat + options->HeartbeatPeriod < now) + log_heartbeat(now); + time_last_written_heartbeat = now; } /** Timer: used to invoke second_elapsed_callback() once per second. */ diff --git a/src/or/or.h b/src/or/or.h index 9bf46e9..4f3fef0 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2718,6 +2718,9 @@ typedef struct { config_line_t *HidServAuth; /**< List of configuration lines for client-side * authorizations for hidden services */ char *ContactInfo; /**< Contact info to be published in the directory. */ + + int HeartbeatPeriod; /**< Log heartbeat messages after this many seconds + * have passed. */ char *HTTPProxy; /**< hostname[:port] to use as http proxy, if any. */ tor_addr_t HTTPProxyAddr; /**< Parsed IPv4 addr for http proxy, if any. */ diff --git a/src/or/status.c b/src/or/status.c new file mode 100644 index 0000000..0cd9a07 --- /dev/null +++ b/src/or/status.c @@ -0,0 +1,27 @@ +/* Copyright (c) 2010, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file status.c + * \brief Keep status information and log the heartbeat messages. + **/ + +#include "or.h" + + +/****************************************************************************/ + + + +#define BEAT(x) log_fn(LOG_NOTICE, LD_HEARTBEAT, (x) ) + +void +log_heartbeat(time_t now) { + or_options_t *opt = get_options(); + + (void) now; + log_fn(LOG_NOTICE, LD_HEARTBEAT, "This is the Tor heartbeat message."); + if (!server_mode(opt)) + BEAT("you are a client, hahaha"); + +}

1 0

[tor/master] Add a changes file for the heartbeat code
by nickm＠torproject.org 22 Feb '11

22 Feb '11

commit ce4f8791010819309f44eceb8f1ae064c5560e79 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 22 12:39:28 2011 -0500 Add a changes file for the heartbeat code --- changes/heartbeat | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/changes/heartbeat b/changes/heartbeat new file mode 100644 index 0000000..008d915 --- /dev/null +++ b/changes/heartbeat @@ -0,0 +1,7 @@ + o Minor features + - Add a new 'Heartbeat' log message type to periodically log a + message describing Tor's status at level Notice. This feature + is meant for operators who log at notice, adn want to make sure + that their Tor server is still working. Implementation by + George Kadianakis. +

1 0

[tor/master] Implement more heartbeat message stuff.
by nickm＠torproject.org 22 Feb '11

22 Feb '11

commit ee95430d397d2382227cdeac8c678c7345df594d Author: George Kadianakis <desnacked(a)gmail.com> Date: Wed Dec 1 03:32:42 2010 +0200 Implement more heartbeat message stuff. (This squashes multiple commits: * Adds uptime monitoring support. * Adds circuit counting code. * Trivially tweaks the documentation. * Trivial run_scheduled_events() code tweaking. * Adds a status.h to export functions. * Added bandwidth monitoring code. * Added consensus presense detection code. * Restricts the precision of the bandwidth output. * Various fixes. * Fixed style and spacing problems. * Tidied up src/or/Makefile.am * Couple of minor fixes on status.c functions. * 'Implemented' client heartbeat support ) --- doc/tor.1.txt | 3 +- src/or/Makefile.am | 7 ++-- src/or/config.c | 3 +- src/or/main.c | 32 +++++++++++++---- src/or/main.h | 3 ++ src/or/or.h | 2 +- src/or/status.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++----- src/or/status.h | 10 +++++ 8 files changed, 140 insertions(+), 23 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 9020a80..7ba5302 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -931,7 +931,8 @@ is non-zero): **HeartbeatPeriod** __N__ **minutes**|**hours**|**days**|**weeks**:: Log a heartbeat message every **HeartbeatPeriod** seconds. This is a log level __info__ message, designed to let you know your Tor - instance is still alive and doing useful things. (Default: 6 hours) + server is still alive and doing useful things. Settings this + to 0 will disable the heartbeat. (Default: 6 hours) **AccountingMax** __N__ **bytes**|**KB**|**MB**|**GB**|**TB**:: Never send more than the specified number of bytes in a given accounting diff --git a/src/or/Makefile.am b/src/or/Makefile.am index a49a86a..f0d5a0f 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -50,10 +50,10 @@ libtor_a_SOURCES = \ router.c \ routerlist.c \ routerparse.c \ + status.c \ $(evdns_source) \ $(tor_platform_source) \ - config_codedigest.c \ - status.c + config_codedigest.c #libtor_a_LIBADD = ../common/libor.a ../common/libor-crypto.a \ # ../common/libor-event.a @@ -120,7 +120,8 @@ noinst_HEADERS = \ router.h \ routerlist.h \ routerparse.h \ - micro-revision.i + status.h \ + micro-revision.i config_codedigest.o: or_sha1.i diff --git a/src/or/config.c b/src/or/config.c index e2b2b5c..8bf4842 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3381,7 +3381,7 @@ options_validate(or_options_t *old_options, or_options_t *options, "raising to %d seconds.", MIN_CIRCUIT_STREAM_TIMEOUT); options->CircuitStreamTimeout = MIN_CIRCUIT_STREAM_TIMEOUT; } - + if (options->HeartbeatPeriod && options->HeartbeatPeriod < MIN_HEARTBEAT_PERIOD) { log_warn(LD_CONFIG, "HeartbeatPeriod option is too short; " @@ -3389,7 +3389,6 @@ options_validate(or_options_t *old_options, or_options_t *options, options->HeartbeatPeriod = MIN_HEARTBEAT_PERIOD; } - if (options->KeepalivePeriod < 1) REJECT("KeepalivePeriod option must be positive."); diff --git a/src/or/main.c b/src/or/main.c index 6e3cb2b..c1335ff 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -45,6 +45,7 @@ #include "router.h" #include "routerlist.h" #include "routerparse.h" +#include "status.h" #ifdef USE_DMALLOC #include <dmalloc.h> #include <openssl/crypto.h> @@ -1050,7 +1051,7 @@ run_scheduled_events(time_t now) static time_t time_to_check_port_forwarding = 0; static int should_init_bridge_stats = 1; static time_t time_to_retry_dns_init = 0; - static time_t time_last_written_heartbeat = 0; + static time_t time_to_next_heartbeat = 0; or_options_t *options = get_options(); int is_server = server_mode(options); int i; @@ -1265,7 +1266,7 @@ run_scheduled_events(time_t now) /* If we're a server and initializing dns failed, retry periodically. */ if (time_to_retry_dns_init < now) { time_to_retry_dns_init = now + RETRY_DNS_INTERVAL; - if (server_mode(options) && has_dns_init_failed()) + if (is_server && has_dns_init_failed()) dns_init(); } @@ -1296,7 +1297,7 @@ run_scheduled_events(time_t now) consider_publishable_server(0); /* also, check religiously for reachability, if it's within the first * 20 minutes of our uptime. */ - if (server_mode(options) && + if (is_server && (can_complete_circuit || !any_predicted_circuits(now)) && !we_are_hibernating()) { if (stats_n_seconds_working < TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT) { @@ -1433,7 +1434,7 @@ run_scheduled_events(time_t now) if (time_to_check_port_forwarding < now && options->PortForwarding && - server_mode(options)) { + is_server) { #define PORT_FORWARDING_CHECK_INTERVAL 5 tor_check_port_forwarding(options->PortForwardingHelper, options->DirPort, @@ -1441,12 +1442,13 @@ run_scheduled_events(time_t now) now); time_to_check_port_forwarding = now+PORT_FORWARDING_CHECK_INTERVAL; } - + /** 11. write the heartbeat message */ if (options->HeartbeatPeriod && - time_last_written_heartbeat + options->HeartbeatPeriod < now) + time_to_next_heartbeat < now) { log_heartbeat(now); - time_last_written_heartbeat = now; + time_to_next_heartbeat = now+options->HeartbeatPeriod; + } } /** Timer: used to invoke second_elapsed_callback() once per second. */ @@ -1911,6 +1913,22 @@ signal_callback(int fd, short events, void *arg) } } +/** Returns Tor's uptime. */ +long +get_uptime(void) +{ + return stats_n_seconds_working; +} + +/** Fills n_read_in with total bytes read and n_written_out + with total bytes written */ +void +get_traffic_stats(uint64_t *n_read_in, uint64_t *n_written_out) +{ + *n_read_in = stats_n_bytes_read; + *n_written_out = stats_n_bytes_written; +} + extern uint64_t rephist_total_alloc; extern uint32_t rephist_total_num; diff --git a/src/or/main.h b/src/or/main.h index 4e15d4d..49ed5fe 100644 --- a/src/or/main.h +++ b/src/or/main.h @@ -49,6 +49,9 @@ void directory_info_has_arrived(time_t now, int from_cache); void ip_address_changed(int at_interface); void dns_servers_relaunch_checks(void); +long get_uptime(void); +void get_traffic_stats(uint64_t *in, uint64_t *out); + void control_signal_act(int the_signal); void handle_signals(int is_parent); diff --git a/src/or/or.h b/src/or/or.h index 4f3fef0..90f01e1 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2718,7 +2718,7 @@ typedef struct { config_line_t *HidServAuth; /**< List of configuration lines for client-side * authorizations for hidden services */ char *ContactInfo; /**< Contact info to be published in the directory. */ - + int HeartbeatPeriod; /**< Log heartbeat messages after this many seconds * have passed. */ diff --git a/src/or/status.c b/src/or/status.c index 0cd9a07..c6a007b 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -7,21 +7,106 @@ **/ #include "or.h" +#include "config.h" +#include "status.h" +#include "nodelist.h" +#include "router.h" +#include "circuitlist.h" +#include "main.h" +/** Returns the number of open circuits. */ +static int +count_circuits(void) +{ + circuit_t *circ; + int nr=0; -/****************************************************************************/ + for (circ = _circuit_get_global_list(); circ; circ = circ->next) + nr++; + return nr; +} + +/* Takes seconds secs and returns a human-readable uptime string */ +static char * +secs_to_uptime(long secs) +{ + long int days = secs / 86400; + int hours = (secs - (days * 86400)) / 3600; + int minutes = (secs - (days * 86400) - (hours * 3600)) / 60; + char *uptime_string = NULL; + + switch (days) { + case 0: + tor_asprintf(&uptime_string, "%d:%02d", hours, minutes); + break; + case 1: + tor_asprintf(&uptime_string, "%ld day %d:%02d", days, hours, minutes); + break; + default: + tor_asprintf(&uptime_string, "%ld days %d:%02d", days, hours, minutes); + break; + } + + return uptime_string; +} + +/* Takes bytes and returns a human-readable bandwidth string. */ +static char * +bytes_to_bandwidth(uint64_t bytes) +{ + char *bw_string = NULL; + if (bytes < (1<<20)) /* Less than a megabyte. */ + tor_asprintf(&bw_string, U64_FORMAT" kB", U64_PRINTF_ARG(bytes>>10)); + else if (bytes < (1<<30)) { /* Megabytes. Let's add some precision. */ + double bw = U64_TO_DBL(bytes); + tor_asprintf(&bw_string, "%.2f MB", bw/(1<<20)); + } else { /* Gigabytes. */ + double bw = U64_TO_DBL(bytes); + tor_asprintf(&bw_string, "%.2f GB", bw/(1<<30)); + } -#define BEAT(x) log_fn(LOG_NOTICE, LD_HEARTBEAT, (x) ) + return bw_string; +} + +/* This function provides the heartbeat log message */ +int +log_heartbeat(time_t now) +{ + uint64_t in,out; + char *bw_sent = NULL; + char *bw_rcvd = NULL; + char *uptime = NULL; + const routerinfo_t *me; + const node_t *myself; + + or_options_t *options = get_options(); + int is_server = server_mode(options); -void -log_heartbeat(time_t now) { - or_options_t *opt = get_options(); + if (is_server) { + /* Let's check if we are in the current cached consensus. */ + if (!(me = router_get_my_routerinfo())) + return -1; /* Something stinks, we won't even attempt this. */ + else + if (!(myself = node_get_by_id(me->cache_info.identity_digest))) + log_fn(LOG_NOTICE, LD_HEARTBEAT, "Heartbeat: It seems like we are not " + "in the cached consensus."); + } - (void) now; - log_fn(LOG_NOTICE, LD_HEARTBEAT, "This is the Tor heartbeat message."); - if (!server_mode(opt)) - BEAT("you are a client, hahaha"); + get_traffic_stats(&in, &out); + uptime = secs_to_uptime(get_uptime()); + bw_sent = bytes_to_bandwidth(out); + bw_rcvd = bytes_to_bandwidth(in); + log_fn(LOG_NOTICE, LD_HEARTBEAT, "Heartbeat: Tor's uptime is %s, with %d " + "circuits open, I've pushed %s and received %s.", + uptime, count_circuits(),bw_sent,bw_rcvd); + + tor_free(uptime); + tor_free(bw_sent); + tor_free(bw_rcvd); + + return 0; } + diff --git a/src/or/status.h b/src/or/status.h new file mode 100644 index 0000000..ac726a1 --- /dev/null +++ b/src/or/status.h @@ -0,0 +1,10 @@ +/* Copyright (c) 2010, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#ifndef _TOR_STATUS_H +#define _TOR_STATUS_H + +int log_heartbeat(time_t now); + +#endif +

1 0

[tor/master] Tweak some names and comments in asn's heartbeat patch
by nickm＠torproject.org 22 Feb '11

22 Feb '11

commit eb403b46960c6528a51730fe1917633ea1cf1308 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 22 12:36:46 2011 -0500 Tweak some names and comments in asn's heartbeat patch --- src/or/status.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/or/status.c b/src/or/status.c index c6a007b..36b3f7b 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, The Tor Project, Inc. */ +/* Copyright (c) 2010-2011, The Tor Project, Inc. */ /* See LICENSE for licensing information */ /** @@ -14,7 +14,7 @@ #include "circuitlist.h" #include "main.h" -/** Returns the number of open circuits. */ +/** Return the total number of circuits. */ static int count_circuits(void) { @@ -27,7 +27,8 @@ count_circuits(void) return nr; } -/* Takes seconds secs and returns a human-readable uptime string */ +/** Take seconds secs and return a newly allocated human-readable + * uptime string */ static char * secs_to_uptime(long secs) { @@ -51,18 +52,19 @@ secs_to_uptime(long secs) return uptime_string; } -/* Takes bytes and returns a human-readable bandwidth string. */ +/** Take bytes and returns a newly allocated human-readable usage + * string. */ static char * -bytes_to_bandwidth(uint64_t bytes) +bytes_to_usage(uint64_t bytes) { char *bw_string = NULL; - if (bytes < (1<<20)) /* Less than a megabyte. */ + if (bytes < (1<<20)) { /* Less than a megabyte. */ tor_asprintf(&bw_string, U64_FORMAT" kB", U64_PRINTF_ARG(bytes>>10)); - else if (bytes < (1<<30)) { /* Megabytes. Let's add some precision. */ + } else if (bytes < (1<<30)) { /* Megabytes. Let's add some precision. */ double bw = U64_TO_DBL(bytes); tor_asprintf(&bw_string, "%.2f MB", bw/(1<<20)); - } else { /* Gigabytes. */ + } else { /* Gigabytes. */ double bw = U64_TO_DBL(bytes); tor_asprintf(&bw_string, "%.2f GB", bw/(1<<30)); } @@ -70,7 +72,9 @@ bytes_to_bandwidth(uint64_t bytes) return bw_string; } -/* This function provides the heartbeat log message */ +/** Log a "heartbeat" message describing Tor's status and history so that the + * user can know that there is indeed a running Tor. Return 0 on success and + * -1 on failure. */ int log_heartbeat(time_t now) { @@ -83,6 +87,7 @@ log_heartbeat(time_t now) or_options_t *options = get_options(); int is_server = server_mode(options); + (void)now; if (is_server) { /* Let's check if we are in the current cached consensus. */ @@ -96,11 +101,11 @@ log_heartbeat(time_t now) get_traffic_stats(&in, &out); uptime = secs_to_uptime(get_uptime()); - bw_sent = bytes_to_bandwidth(out); - bw_rcvd = bytes_to_bandwidth(in); + bw_sent = bytes_to_usage(out); + bw_rcvd = bytes_to_usage(in); log_fn(LOG_NOTICE, LD_HEARTBEAT, "Heartbeat: Tor's uptime is %s, with %d " - "circuits open, I've pushed %s and received %s.", + "circuits open. I've pushed %s and received %s.", uptime, count_circuits(),bw_sent,bw_rcvd); tor_free(uptime);

1 0

[tor/master] Merge remote branch 'sebastian/bug2444'
by nickm＠torproject.org 22 Feb '11

22 Feb '11

commit 0ba69714b4c51bfddcce16b7e1b309fad4e3e3bc Merge: d120ee1 490d397 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 22 11:10:57 2011 -0500 Merge remote branch 'sebastian/bug2444' changes/bug2444 | 4 ++++ src/or/config.c | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --combined src/or/config.c index 3f10224,54df65b..65bc1d5 --- a/src/or/config.c +++ b/src/or/config.c @@@ -44,8 -44,6 +44,8 @@@ typedef enum config_type_t CONFIG_TYPE_FILENAME, /**< A filename: some prefixes get expanded. */ CONFIG_TYPE_UINT, /**< A non-negative integer less than MAX_INT */ CONFIG_TYPE_INTERVAL, /**< A number of seconds, with optional units*/ + CONFIG_TYPE_MSEC_INTERVAL,/**< A number of milliseconds, with optional + * units */ CONFIG_TYPE_MEMUNIT, /**< A number of bytes, with optional units*/ CONFIG_TYPE_DOUBLE, /**< A floating-point value */ CONFIG_TYPE_BOOL, /**< A boolean value, expressed as 0 or 1. */ @@@ -197,11 -195,9 +197,11 @@@ static config_var_t _option_vars[] = V(CircuitStreamTimeout, INTERVAL, "0"), V(CircuitPriorityHalflife, DOUBLE, "-100.0"), /*negative:'Use default'*/ V(ClientDNSRejectInternalAddresses, BOOL,"1"), + V(ClientRejectInternalAddresses, BOOL, "1"), V(ClientOnly, BOOL, "0"), V(ConsensusParams, STRING, NULL), V(ConnLimit, UINT, "1000"), + V(ConnDirectionStatistics, BOOL, "0"), V(ConstrainedSockets, BOOL, "0"), V(ConstrainedSockSize, MEMUNIT, "8192"), V(ContactInfo, STRING, NULL), @@@ -225,10 -221,9 +225,10 @@@ OBSOLETE("DirRecordUsageGranularity"), OBSOLETE("DirRecordUsageRetainIPs"), OBSOLETE("DirRecordUsageSaveInterval"), - V(DirReqStatistics, BOOL, "0"), + V(DirReqStatistics, BOOL, "1"), VAR("DirServer", LINELIST, DirServers, NULL), V(DisableAllSwap, BOOL, "0"), + V(DisableIOCP, BOOL, "1"), V(DNSPort, UINT, "0"), V(DNSListenAddress, LINELIST, NULL), V(DownloadExtraInfo, BOOL, "0"), @@@ -243,7 -238,7 +243,7 @@@ V(ExitPolicy, LINELIST, NULL), V(ExitPolicyRejectPrivate, BOOL, "1"), V(ExitPortStatistics, BOOL, "0"), - V(ExtraInfoStatistics, BOOL, "0"), + V(ExtraInfoStatistics, BOOL, "1"), #if defined (WINCE) V(FallbackNetworkstatusFile, FILENAME, "fallback-consensus"), @@@ -295,7 -290,6 +295,7 @@@ OBSOLETE("LinkPadding"), OBSOLETE("LogLevel"), OBSOLETE("LogFile"), + V(LogTimeGranularity, MSEC_INTERVAL, "1 second"), V(LongLivedPorts, CSV, "21,22,706,1863,5050,5190,5222,5223,6667,6697,8300"), VAR("MapAddress", LINELIST, AddressMap, NULL), @@@ -312,7 -306,7 +312,7 @@@ V(WarnUnsafeSocks, BOOL, "1"), OBSOLETE("NoPublish"), VAR("NodeFamily", LINELIST, NodeFamilies, NULL), - V(NumCPUs, UINT, "1"), + V(NumCPUs, UINT, "0"), V(NumEntryGuards, UINT, "3"), V(ORListenAddress, LINELIST, NULL), V(ORPort, UINT, "0"), @@@ -322,8 -316,6 +322,8 @@@ V(PerConnBWRate, MEMUNIT, "0"), V(PidFile, STRING, NULL), V(TestingTorNetwork, BOOL, "0"), + V(PortForwarding, BOOL, "0"), + V(PortForwardingHelper, FILENAME, "tor-fw-helper"), V(PreferTunneledDirConns, BOOL, "1"), V(ProtocolWarnings, BOOL, "0"), V(PublishServerDescriptor, CSV, "1"), @@@ -392,7 -384,6 +392,7 @@@ VAR("VersioningAuthoritativeDirectory",BOOL,VersioningAuthoritativeDir, "0"), V(VirtualAddrNetwork, STRING, "127.192.0.0/10"), V(WarnPlaintextPorts, CSV, "23,109,110,143"), + V(_UseFilteringSSLBufferevents, BOOL, "0"), VAR("__ReloadTorrcOnSIGHUP", BOOL, ReloadTorrcOnSIGHUP, "1"), VAR("__AllDirActionsPrivate", BOOL, AllDirActionsPrivate, "0"), VAR("__DisablePredictedCircuits",BOOL,DisablePredictedCircuits, "0"), @@@ -414,7 -405,6 +414,7 @@@ static config_var_t testing_tor_network V(AuthDirMaxServersPerAddr, UINT, "0"), V(AuthDirMaxServersPerAuthAddr,UINT, "0"), V(ClientDNSRejectInternalAddresses, BOOL,"0"), + V(ClientRejectInternalAddresses, BOOL, "0"), V(ExitPolicyRejectPrivate, BOOL, "0"), V(V3AuthVotingInterval, INTERVAL, "5 minutes"), V(V3AuthVoteDelay, INTERVAL, "20 seconds"), @@@ -565,9 -555,8 +565,9 @@@ static int is_listening_on_low_port(uin const config_line_t *listen_options); static uint64_t config_parse_memunit(const char *s, int *ok); +static int config_parse_msec_interval(const char *s, int *ok); static int config_parse_interval(const char *s, int *ok); -static void init_libevent(void); +static void init_libevent(const or_options_t *options); static int opt_streq(const char *s1, const char *s2); /** Magic value for or_options_t. */ @@@ -701,11 -690,6 +701,11 @@@ or_options_free(or_options_t *options return; routerset_free(options->_ExcludeExitNodesUnion); + if (options->NodeFamilySets) { + SMARTLIST_FOREACH(options->NodeFamilySets, routerset_t *, + rs, routerset_free(rs)); + smartlist_free(options->NodeFamilySets); + } config_free(&options_format, options); } @@@ -973,7 -957,7 +973,7 @@@ options_act_reversible(or_options_t *ol /* Set up libevent. (We need to do this before we can register the * listeners as listeners.) */ if (running_tor && !libevent_initialized) { - init_libevent(); + init_libevent(options); libevent_initialized = 1; } @@@ -1249,17 -1233,6 +1249,17 @@@ options_act(or_options_t *old_options if (accounting_is_enabled(options)) configure_accounting(time(NULL)); +#ifdef USE_BUFFEREVENTS + /* If we're using the bufferevents implementation and our rate limits + * changed, we need to tell the rate-limiting system about it. */ + if (!old_options || + old_options->BandwidthRate != options->BandwidthRate || + old_options->BandwidthBurst != options->BandwidthBurst || + old_options->RelayBandwidthRate != options->RelayBandwidthRate || + old_options->RelayBandwidthBurst != options->RelayBandwidthBurst) + connection_bucket_init(); +#endif + /* parse RefuseUnknownExits tristate */ if (!strcmp(options->RefuseUnknownExits, "0")) options->RefuseUnknownExits_ = 0; @@@ -1371,52 -1344,44 +1371,52 @@@ tor_free(actual_fname); } - if (options->DirReqStatistics && !geoip_is_loaded()) { - /* Check if GeoIP database could be loaded. */ - log_warn(LD_CONFIG, "Configured to measure directory request " - "statistics, but no GeoIP database found!"); - return -1; - } - - if (options->EntryStatistics) { - if (should_record_bridge_info(options)) { - /* Don't allow measuring statistics on entry guards when configured - * as bridge. */ - log_warn(LD_CONFIG, "Bridges cannot be configured to measure " - "additional GeoIP statistics as entry guards."); - return -1; - } else if (!geoip_is_loaded()) { - /* Check if GeoIP database could be loaded. */ - log_warn(LD_CONFIG, "Configured to measure entry node statistics, " - "but no GeoIP database found!"); - return -1; - } - } - if (options->CellStatistics || options->DirReqStatistics || - options->EntryStatistics || options->ExitPortStatistics) { + options->EntryStatistics || options->ExitPortStatistics || + options->ConnDirectionStatistics) { time_t now = time(NULL); + int print_notice = 0; if ((!old_options || !old_options->CellStatistics) && - options->CellStatistics) + options->CellStatistics) { rep_hist_buffer_stats_init(now); + print_notice = 1; + } if ((!old_options || !old_options->DirReqStatistics) && - options->DirReqStatistics) - geoip_dirreq_stats_init(now); + options->DirReqStatistics) { + if (geoip_is_loaded()) { + geoip_dirreq_stats_init(now); + print_notice = 1; + } else { + options->DirReqStatistics = 0; + log_notice(LD_CONFIG, "Configured to measure directory request " + "statistics, but no GeoIP database found! " + "Please specify a GeoIP database using the " + "GeoIPFile option!"); + } + } if ((!old_options || !old_options->EntryStatistics) && - options->EntryStatistics) - geoip_entry_stats_init(now); + options->EntryStatistics && !should_record_bridge_info(options)) { + if (geoip_is_loaded()) { + geoip_entry_stats_init(now); + print_notice = 1; + } else { + options->EntryStatistics = 0; + log_notice(LD_CONFIG, "Configured to measure entry node " + "statistics, but no GeoIP database found! " + "Please specify a GeoIP database using the " + "GeoIPFile option!"); + } + } if ((!old_options || !old_options->ExitPortStatistics) && - options->ExitPortStatistics) + options->ExitPortStatistics) { rep_hist_exit_stats_init(now); - if (!old_options) + print_notice = 1; + } + if ((!old_options || !old_options->ConnDirectionStatistics) && + options->ConnDirectionStatistics) { + rep_hist_conn_stats_init(now); + } + if (print_notice) log_notice(LD_CONFIG, "Configured to measure statistics. Look for " "the *-stats files that will first be written to the " "data directory in 24 hours from now."); @@@ -1434,9 -1399,6 +1434,9 @@@ if (old_options && old_options->ExitPortStatistics && !options->ExitPortStatistics) rep_hist_exit_stats_term(); + if (old_options && old_options->ConnDirectionStatistics && + !options->ConnDirectionStatistics) + rep_hist_conn_stats_term(); /* Check if we need to parse and add the EntryNodes config option. */ if (options->EntryNodes && @@@ -1742,18 -1704,6 +1742,18 @@@ config_assign_value(config_format_t *fm break; } + case CONFIG_TYPE_MSEC_INTERVAL: { + i = config_parse_msec_interval(c->value, &ok); + if (!ok) { + tor_asprintf(msg, + "Msec interval '%s %s' is malformed or out of bounds.", + c->key, c->value); + return -1; + } + *(int *)lvalue = i; + break; + } + case CONFIG_TYPE_MEMUNIT: { uint64_t u64 = config_parse_memunit(c->value, &ok); if (!ok) { @@@ -2041,7 -1991,6 +2041,7 @@@ get_assigned_option(config_format_t *fm escape_val = 0; /* Can't need escape. */ break; case CONFIG_TYPE_INTERVAL: + case CONFIG_TYPE_MSEC_INTERVAL: case CONFIG_TYPE_UINT: /* This means every or_options_t uint or bool element * needs to be an int. Not, say, a uint16_t or char. */ @@@ -2269,7 -2218,6 +2269,7 @@@ option_clear(config_format_t *fmt, or_o *(time_t*)lvalue = 0; break; case CONFIG_TYPE_INTERVAL: + case CONFIG_TYPE_MSEC_INTERVAL: case CONFIG_TYPE_UINT: case CONFIG_TYPE_BOOL: *(int*)lvalue = 0; @@@ -2376,7 -2324,7 +2376,7 @@@ resolve_my_address(int warn_severity, o int explicit_ip=1; int explicit_hostname=1; int from_interface=0; - char tmpbuf[INET_NTOA_BUF_LEN]; + char *addr_string = NULL; const char *address = options->Address; int notice_severity = warn_severity <= LOG_NOTICE ? LOG_NOTICE : warn_severity; @@@ -2418,43 -2366,48 +2418,43 @@@ return -1; } from_interface = 1; - in.s_addr = htonl(interface_ip); - tor_inet_ntoa(&in,tmpbuf,sizeof(tmpbuf)); + addr = interface_ip; log_fn(notice_severity, LD_CONFIG, "Learned IP address '%s' for " - "local interface. Using that.", tmpbuf); + "local interface. Using that.", fmt_addr32(addr)); strlcpy(hostname, "<guessed from interfaces>", sizeof(hostname)); } else { /* resolved hostname into addr */ - in.s_addr = htonl(addr); - if (!explicit_hostname && - is_internal_IP(ntohl(in.s_addr), 0)) { + is_internal_IP(addr, 0)) { uint32_t interface_ip; - tor_inet_ntoa(&in,tmpbuf,sizeof(tmpbuf)); log_fn(notice_severity, LD_CONFIG, "Guessed local hostname '%s' " - "resolves to a private IP address (%s). Trying something " - "else.", hostname, tmpbuf); + "resolves to a private IP address (%s). Trying something " + "else.", hostname, fmt_addr32(addr)); if (get_interface_address(warn_severity, &interface_ip)) { log_fn(warn_severity, LD_CONFIG, "Could not get local interface IP address. Too bad."); } else if (is_internal_IP(interface_ip, 0)) { - struct in_addr in2; - in2.s_addr = htonl(interface_ip); - tor_inet_ntoa(&in2,tmpbuf,sizeof(tmpbuf)); log_fn(notice_severity, LD_CONFIG, "Interface IP address '%s' is a private address too. " - "Ignoring.", tmpbuf); + "Ignoring.", fmt_addr32(interface_ip)); } else { from_interface = 1; - in.s_addr = htonl(interface_ip); - tor_inet_ntoa(&in,tmpbuf,sizeof(tmpbuf)); + addr = interface_ip; log_fn(notice_severity, LD_CONFIG, "Learned IP address '%s' for local interface." - " Using that.", tmpbuf); + " Using that.", fmt_addr32(addr)); strlcpy(hostname, "<guessed from interfaces>", sizeof(hostname)); } } } + } else { + addr = ntohl(in.s_addr); /* set addr so that addr_string is not + * illformed */ } - tor_inet_ntoa(&in,tmpbuf,sizeof(tmpbuf)); - if (is_internal_IP(ntohl(in.s_addr), 0)) { + addr_string = tor_dup_ip(addr); + if (is_internal_IP(addr, 0)) { /* make sure we're ok with publishing an internal IP */ if (!options->DirServers && !options->AlternateDirAuthority) { /* if they are using the default dirservers, disallow internal IPs @@@ -2462,8 -2415,7 +2462,8 @@@ log_fn(warn_severity, LD_CONFIG, "Address '%s' resolves to private IP address '%s'. " "Tor servers that use the default DirServers must have public " - "IP addresses.", hostname, tmpbuf); + "IP addresses.", hostname, addr_string); + tor_free(addr_string); return -1; } if (!explicit_ip) { @@@ -2471,20 -2423,19 +2471,20 @@@ * they're using an internal address. */ log_fn(warn_severity, LD_CONFIG, "Address '%s' resolves to private " "IP address '%s'. Please set the Address config option to be " - "the IP address you want to use.", hostname, tmpbuf); + "the IP address you want to use.", hostname, addr_string); + tor_free(addr_string); return -1; } } - log_debug(LD_CONFIG, "Resolved Address to '%s'.", tmpbuf); - *addr_out = ntohl(in.s_addr); + log_debug(LD_CONFIG, "Resolved Address to '%s'.", fmt_addr32(addr)); + *addr_out = addr; if (last_resolved_addr && last_resolved_addr != *addr_out) { /* Leave this as a notice, regardless of the requested severity, * at least until dynamic IP address support becomes bulletproof. */ log_notice(LD_NET, "Your IP address seems to have changed to %s. Updating.", - tmpbuf); + addr_string); ip_address_changed(0); } if (last_resolved_addr != *addr_out) { @@@ -2503,12 -2454,11 +2503,12 @@@ } control_event_server_status(LOG_NOTICE, "EXTERNAL_ADDRESS ADDRESS=%s METHOD=%s %s%s", - tmpbuf, method, h?"HOSTNAME=":"", h); + addr_string, method, h?"HOSTNAME=":"", h); } last_resolved_addr = *addr_out; if (hostname_out) *hostname_out = tor_strdup(hostname); + tor_free(addr_string); return 0; } @@@ -2889,9 -2839,7 +2889,9 @@@ compute_publishserverdescriptor(or_opti else if (!strcasecmp(string, "bridge")) *auth |= BRIDGE_AUTHORITY; else if (!strcasecmp(string, "hidserv")) - *auth |= HIDSERV_AUTHORITY; + log_warn(LD_CONFIG, + "PublishServerDescriptor hidserv is invalid. See " + "PublishHidServDescriptors."); else if (!strcasecmp(string, "") || !strcmp(string, "0")) /* no authority */; else @@@ -3115,24 -3063,17 +3115,24 @@@ options_validate(or_options_t *old_opti routerset_union(options->_ExcludeExitNodesUnion,options->ExcludeNodes); } + if (options->NodeFamilies) { + options->NodeFamilySets = smartlist_create(); + for (cl = options->NodeFamilies; cl; cl = cl->next) { + routerset_t *rs = routerset_new(); + if (routerset_parse(rs, cl->value, cl->key) == 0) { + smartlist_add(options->NodeFamilySets, rs); + } else { + routerset_free(rs); + } + } + } + if (options->ExcludeNodes && options->StrictNodes) { COMPLAIN("You have asked to exclude certain relays from all positions " "in your circuits. Expect hidden services and other Tor " "features to be broken in unpredictable ways."); } - if (options->EntryNodes && !routerset_is_list(options->EntryNodes)) { - /* XXXX fix this; see entry_guards_prepend_from_config(). */ - REJECT("IPs or countries are not yet supported in EntryNodes."); - } - if (options->AuthoritativeDir) { if (!options->ContactInfo && !options->TestingTorNetwork) REJECT("Authoritative directory servers must set ContactInfo"); @@@ -3402,11 -3343,6 +3402,11 @@@ "PerConnBWBurst", msg) < 0) return -1; + if (options->RelayBandwidthRate && !options->RelayBandwidthBurst) + options->RelayBandwidthBurst = options->RelayBandwidthRate; + if (options->RelayBandwidthBurst && !options->RelayBandwidthRate) + options->RelayBandwidthRate = options->RelayBandwidthBurst; + if (server_mode(options)) { if (options->BandwidthRate < ROUTER_REQUIRED_MIN_BANDWIDTH) { tor_asprintf(msg, @@@ -3435,6 -3371,9 +3435,6 @@@ } } - if (options->RelayBandwidthRate && !options->RelayBandwidthBurst) - options->RelayBandwidthBurst = options->RelayBandwidthRate; - if (options->RelayBandwidthRate > options->RelayBandwidthBurst) REJECT("RelayBandwidthBurst must be at least equal " "to RelayBandwidthRate."); @@@ -3595,12 -3534,8 +3595,12 @@@ if (check_nickname_list(options->MyFamily, "MyFamily", msg)) return -1; for (cl = options->NodeFamilies; cl; cl = cl->next) { - if (check_nickname_list(cl->value, "NodeFamily", msg)) + routerset_t *rs = routerset_new(); + if (routerset_parse(rs, cl->value, cl->key)) { + routerset_free(rs); return -1; + } + routerset_free(rs); } if (validate_addr_policies(options, msg) < 0) @@@ -4093,6 -4028,8 +4093,8 @@@ load_torrc_from_disk(int argc, char **a "Unable to open configuration file \"%s\".", fname); goto err; } + } else { + log(LOG_NOTICE, LD_CONFIG, "Read configuration file \"%s\".", fname); } return cf; @@@ -4381,35 -4318,6 +4383,35 @@@ options_init_logs(or_options_t *options options->RunAsDaemon; #endif + if (options->LogTimeGranularity <= 0) { + log_warn(LD_CONFIG, "Log time granularity '%d' has to be positive.", + options->LogTimeGranularity); + return -1; + } else if (1000 % options->LogTimeGranularity != 0 && + options->LogTimeGranularity % 1000 != 0) { + int granularity = options->LogTimeGranularity; + if (granularity < 40) { + do granularity++; + while (1000 % granularity != 0); + } else if (granularity < 1000) { + granularity = 1000 / granularity; + while (1000 % granularity != 0) + granularity--; + granularity = 1000 / granularity; + } else { + granularity = 1000 * ((granularity / 1000) + 1); + } + log_warn(LD_CONFIG, "Log time granularity '%d' has to be either a " + "divisor or a multiple of 1 second. Changing to " + "'%d'.", + options->LogTimeGranularity, granularity); + if (!validate_only) + set_log_time_granularity(granularity); + } else { + if (!validate_only) + set_log_time_granularity(options->LogTimeGranularity); + } + ok = 1; elts = smartlist_create(); @@@ -4898,26 -4806,6 +4900,26 @@@ static struct unit_table_t time_units[ { NULL, 0 }, }; +/** Table to map the names of time units to the number of milliseconds + * they contain. */ +static struct unit_table_t time_msec_units[] = { + { "", 1 }, + { "msec", 1 }, + { "millisecond", 1 }, + { "milliseconds", 1 }, + { "second", 1000 }, + { "seconds", 1000 }, + { "minute", 60*1000 }, + { "minutes", 60*1000 }, + { "hour", 60*60*1000 }, + { "hours", 60*60*1000 }, + { "day", 24*60*60*1000 }, + { "days", 24*60*60*1000 }, + { "week", 7*24*60*60*1000 }, + { "weeks", 7*24*60*60*1000 }, + { NULL, 0 }, +}; + /** Parse a string val containing a number, zero or more * spaces, and an optional unit string. If the unit appears in the * table u, then multiply the number by the unit multiplier. @@@ -4981,25 -4869,6 +4983,25 @@@ config_parse_memunit(const char *s, in return u; } +/** Parse a string in the format "number unit", where unit is a unit of + * time in milliseconds. On success, set *ok to true and return + * the number of milliseconds in the provided interval. Otherwise, set + * *ok to 0 and return -1. */ +static int +config_parse_msec_interval(const char *s, int *ok) +{ + uint64_t r; + r = config_parse_units(s, time_msec_units, ok); + if (!ok) + return -1; + if (r > INT_MAX) { + log_warn(LD_CONFIG, "Msec interval '%s' is too long", s); + *ok = 0; + return -1; + } + return (int)r; +} + /** Parse a string in the format "number unit", where unit is a unit of time. * On success, set *ok to true and return the number of seconds in * the provided interval. Otherwise, set *ok to 0 and return -1. @@@ -5019,29 -4888,13 +5021,29 @@@ config_parse_interval(const char *s, in return (int)r; } +/** Return the number of cpus configured in options. If we are + * told to auto-detect the number of cpus, return the auto-detected number. */ +int +get_num_cpus(const or_options_t *options) +{ + if (options->NumCPUs == 0) { + int n = compute_num_cpus(); + return (n >= 1) ? n : 1; + } else { + return options->NumCPUs; + } +} + /** * Initialize the libevent library. */ static void -init_libevent(void) +init_libevent(const or_options_t *options) { const char *badness=NULL; + tor_libevent_cfg cfg; + + tor_assert(options); configure_libevent_logging(); /* If the kernel complains that some method (say, epoll) doesn't @@@ -5051,11 -4904,7 +5053,11 @@@ tor_check_libevent_header_compatibility(); - tor_libevent_initialize(); + memset(&cfg, 0, sizeof(cfg)); + cfg.disable_iocp = options->DisableIOCP; + cfg.num_cpus = get_num_cpus(options); + + tor_libevent_initialize(&cfg); suppress_libevent_log_msg(NULL); @@@ -5396,7 -5245,6 +5398,7 @@@ getinfo_helper_config(control_connectio case CONFIG_TYPE_FILENAME: type = "Filename"; break; case CONFIG_TYPE_UINT: type = "Integer"; break; case CONFIG_TYPE_INTERVAL: type = "TimeInterval"; break; + case CONFIG_TYPE_MSEC_INTERVAL: type = "TimeMsecInterval"; break; case CONFIG_TYPE_MEMUNIT: type = "DataSize"; break; case CONFIG_TYPE_DOUBLE: type = "Float"; break; case CONFIG_TYPE_BOOL: type = "Boolean"; break;

1 0

[tor/master] Log which config file we read
by nickm＠torproject.org 22 Feb '11

22 Feb '11

commit 490d397dbf4e9edd4f37f5bef26d388da6ce06b3 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Jan 27 15:31:34 2011 +0100 Log which config file we read It is often not entirely clear what options Tor was built with, so it might not be immediately obvious which config file Tor is using when it found one. Log the config file at startup. --- changes/bug2444 | 4 ++++ src/or/config.c | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/bug2444 b/changes/bug2444 new file mode 100644 index 0000000..405e8dc --- /dev/null +++ b/changes/bug2444 @@ -0,0 +1,4 @@ + o Minor features: + - If we did find a configuration file, log a message saying where we found + it during startup. Implements ticket 2444. + diff --git a/src/or/config.c b/src/or/config.c index 8c1205d..54df65b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4028,6 +4028,8 @@ load_torrc_from_disk(int argc, char **argv) "Unable to open configuration file \"%s\".", fname); goto err; } + } else { + log(LOG_NOTICE, LD_CONFIG, "Read configuration file \"%s\".", fname); } return cf;

1 0

[metrics-db/master] Exclude bridge network statuses from duplicates check
by karsten＠torproject.org 22 Feb '11

22 Feb '11

commit b982a538824667313f6a31319c2ed3ee4df7e741 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Feb 22 15:16:17 2011 +0100 Exclude bridge network statuses from duplicates check There's simply no way for us to detect whether two (subsequent) statuses are legitimately equal or not, so we'll have to consider them valid. The only thing we can do is warn if referenced descriptors are older than a given number of hours and ask the operator to investigate manually. (This check will be contained in a separate commit.) --- .../torproject/ernie/db/BridgeSnapshotReader.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/org/torproject/ernie/db/BridgeSnapshotReader.java b/src/org/torproject/ernie/db/BridgeSnapshotReader.java index 13ab58d..310029a 100644 --- a/src/org/torproject/ernie/db/BridgeSnapshotReader.java +++ b/src/org/torproject/ernie/db/BridgeSnapshotReader.java @@ -94,13 +94,6 @@ public class BridgeSnapshotReader { } String fileDigest = Hex.encodeHexString(DigestUtils.sha( allData)); - if (!descriptorImportHistory.contains(fileDigest)) { - descriptorImportHistory.add(fileDigest); - parsedFiles++; - } else { - skippedFiles++; - continue; - } String ascii = new String(allData, "US-ASCII"); BufferedReader br3 = new BufferedReader(new StringReader( ascii)); @@ -115,6 +108,11 @@ public class BridgeSnapshotReader { if (firstLine.startsWith("r ")) { bdp.parse(allData, dateTime, false); parsedStatuses++; + } else if (descriptorImportHistory.contains(fileDigest)) { + /* Skip server descriptors or extra-info descriptors if + * we parsed them before. */ + skippedFiles++; + continue; } else { int start = -1, sig = -1, end = -1; String startToken = @@ -160,6 +158,8 @@ public class BridgeSnapshotReader { } } } + descriptorImportHistory.add(fileDigest); + parsedFiles++; } } in.close();

1 0

[tor/master] Don't crash a bridge authority on SIGHUP if it's not in the consensus
by nickm＠torproject.org 22 Feb '11

22 Feb '11

commit 444a955e4a3877e9a7b3016deee9f1f4dfafdd93 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Feb 16 04:12:37 2011 -0800 Don't crash a bridge authority on SIGHUP if it's not in the consensus Fixes bug 2572. --- changes/bug2572 | 5 +++++ src/or/router.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/bug2572 b/changes/bug2572 new file mode 100644 index 0000000..a5cca28 --- /dev/null +++ b/changes/bug2572 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Don't crash a bridge authority on SIGHUP if it can't force itself + into its routerlist. Fixes bug 2572. + + diff --git a/src/or/router.c b/src/or/router.c index 26ac351..59276ba 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -629,7 +629,7 @@ init_keys(void) /* 4. Build our router descriptor. */ /* Must be called after keys are initialized. */ mydesc = router_get_my_descriptor(); - if (authdir_mode(options)) { + if (authdir_mode_handles_descs(options, ROUTER_PURPOSE_GENERAL)) { const char *m = NULL; routerinfo_t *ri; /* We need to add our own fingerprint so it gets recognized. */

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits February 2011