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

[tor/master] Move code from choose_random_entry_impl() to the new function.
by nickm＠torproject.org 16 Jul '14

16 Jul '14

commit 427cc8a4520e6ea93608957fd2aabe6364c678de Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jun 9 18:04:39 2014 +0100 Move code from choose_random_entry_impl() to the new function. This commit only _moves_ code. --- src/or/entrynodes.c | 64 +++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 8208af3..1b0979b 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -1003,6 +1003,38 @@ populate_live_entry_guards(const smartlist_t *live_entry_guards, int need_capacity, int need_descriptor) { + if (chosen_exit) { + nodelist_add_node_and_family(exit_family, chosen_exit); + } + + SMARTLIST_FOREACH_BEGIN(entry_guards, entry_guard_t *, entry) { + const char *msg; + node = entry_is_live(entry, need_uptime, need_capacity, 0, + need_descriptor, &msg); + if (!node) + continue; /* down, no point */ + if (for_directory) { + if (!entry->is_dir_cache) + continue; /* We need a directory and didn't get one. */ + } + if (node == chosen_exit) + continue; /* don't pick the same node for entry and exit */ + if (smartlist_contains(exit_family, node)) + continue; /* avoid relays that are family members of our exit */ + if (dirinfo_type != NO_DIRINFO && + !node_can_handle_dirinfo(node, dirinfo_type)) + continue; /* this node won't be able to answer our dir questions */ + smartlist_add(live_entry_guards, (void*)node); + if (!entry->made_contact) { + /* Always start with the first not-yet-contacted entry + * guard. Otherwise we might add several new ones, pick + * the second new one, and now we've expanded our entry + * guard list without needing to. */ + goto choose_and_finish; + } + if (smartlist_len(live_entry_guards) >= num_needed) + goto choose_and_finish; /* we have enough */ + } SMARTLIST_FOREACH_END(entry); } /** Helper for choose_random{entry,dirguard}. */ @@ -1025,10 +1057,6 @@ choose_random_entry_impl(cpath_build_state_t *state, int for_directory, if (n_options_out) *n_options_out = 0; - if (chosen_exit) { - nodelist_add_node_and_family(exit_family, chosen_exit); - } - if (!entry_guards) entry_guards = smartlist_new(); @@ -1041,34 +1069,6 @@ choose_random_entry_impl(cpath_build_state_t *state, int for_directory, retry: smartlist_clear(live_entry_guards); - SMARTLIST_FOREACH_BEGIN(entry_guards, entry_guard_t *, entry) { - const char *msg; - node = entry_is_live(entry, need_uptime, need_capacity, 0, - need_descriptor, &msg); - if (!node) - continue; /* down, no point */ - if (for_directory) { - if (!entry->is_dir_cache) - continue; /* We need a directory and didn't get one. */ - } - if (node == chosen_exit) - continue; /* don't pick the same node for entry and exit */ - if (smartlist_contains(exit_family, node)) - continue; /* avoid relays that are family members of our exit */ - if (dirinfo_type != NO_DIRINFO && - !node_can_handle_dirinfo(node, dirinfo_type)) - continue; /* this node won't be able to answer our dir questions */ - smartlist_add(live_entry_guards, (void*)node); - if (!entry->made_contact) { - /* Always start with the first not-yet-contacted entry - * guard. Otherwise we might add several new ones, pick - * the second new one, and now we've expanded our entry - * guard list without needing to. */ - goto choose_and_finish; - } - if (smartlist_len(live_entry_guards) >= num_needed) - goto choose_and_finish; /* we have enough */ - } SMARTLIST_FOREACH_END(entry); if (entry_list_is_constrained(options)) { /* If we prefer the entry nodes we've got, and we have at least

1 0

[tor/master] Fix the functionality of populate_live_entry_guards().
by nickm＠torproject.org 16 Jul '14

16 Jul '14

commit a59429f1e49d2666d31ec9a3b34dd861c96cddaa Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jun 9 18:23:07 2014 +0100 Fix the functionality of populate_live_entry_guards(). --- src/or/entrynodes.c | 48 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 1b0979b..4ece81e 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -995,14 +995,24 @@ choose_random_dirguard(dirinfo_type_t type) return choose_random_entry_impl(NULL, 1, type, NULL); } +/* DOCDOCODC + Return 1 if we should choose a guard right away. */ static int -populate_live_entry_guards(const smartlist_t *live_entry_guards, +populate_live_entry_guards(smartlist_t *live_entry_guards, const node_t *chosen_exit, dirinfo_type_t dirinfo_type, - int need_uptime, - int need_capacity, - int need_descriptor) + int for_directory, + int need_uptime, int need_capacity) { + const or_options_t *options = get_options(); + const node_t *node = NULL; + const int num_needed = decide_num_guards(options, for_directory); + smartlist_t *exit_family = smartlist_new(); + int retval = 0; + int need_descriptor = !for_directory; + + tor_assert(entry_guards); + if (chosen_exit) { nodelist_add_node_and_family(exit_family, chosen_exit); } @@ -1030,11 +1040,19 @@ populate_live_entry_guards(const smartlist_t *live_entry_guards, * guard. Otherwise we might add several new ones, pick * the second new one, and now we've expanded our entry * guard list without needing to. */ - goto choose_and_finish; + retval = 1; + goto done; + } + if (smartlist_len(live_entry_guards) >= num_needed) { + retval = 1; + goto done; /* We picked enough entry guards. Done! */ } - if (smartlist_len(live_entry_guards) >= num_needed) - goto choose_and_finish; /* we have enough */ } SMARTLIST_FOREACH_END(entry); + + done: + smartlist_free(exit_family); + + return retval; } /** Helper for choose_random{entry,dirguard}. */ @@ -1044,15 +1062,14 @@ choose_random_entry_impl(cpath_build_state_t *state, int for_directory, { const or_options_t *options = get_options(); smartlist_t *live_entry_guards = smartlist_new(); - smartlist_t *exit_family = smartlist_new(); const node_t *chosen_exit = state?build_state_get_exit_node(state) : NULL; const node_t *node = NULL; int need_uptime = state ? state->need_uptime : 0; int need_capacity = state ? state->need_capacity : 0; int preferred_min = 0; - int need_descriptor = !for_directory; const int num_needed = decide_num_guards(options, for_directory); + int retval = 0; if (n_options_out) *n_options_out = 0; @@ -1070,6 +1087,18 @@ choose_random_entry_impl(cpath_build_state_t *state, int for_directory, retry: smartlist_clear(live_entry_guards); + /* Populate the list of live entry guards so that we pick one of + them. */ + retval = populate_live_entry_guards(live_entry_guards, + chosen_exit, + dirinfo_type, + for_directory, + need_uptime, need_capacity); + + if (retval == 1) { /* We should choose a guard right now. */ + goto choose_and_finish; + } + if (entry_list_is_constrained(options)) { /* If we prefer the entry nodes we've got, and we have at least * one choice, that's great. Use it. */ @@ -1126,7 +1155,6 @@ choose_random_entry_impl(cpath_build_state_t *state, int for_directory, if (n_options_out) *n_options_out = smartlist_len(live_entry_guards); smartlist_free(live_entry_guards); - smartlist_free(exit_family); return node; }

1 0

[tor/master] Make populate_live_entry_guards() more smoothly testable.
by nickm＠torproject.org 16 Jul '14

16 Jul '14

commit 71da44f159ae0a3b0d267673ab5a74b51a843dca Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jun 9 19:14:40 2014 +0100 Make populate_live_entry_guards() more smoothly testable. --- src/or/entrynodes.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 50138cd..d732791 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -999,6 +999,7 @@ choose_random_dirguard(dirinfo_type_t type) Return 1 if we should choose a guard right away. */ static int populate_live_entry_guards(smartlist_t *live_entry_guards, + const smartlist_t *all_entry_guards, const node_t *chosen_exit, dirinfo_type_t dirinfo_type, int for_directory, @@ -1011,13 +1012,13 @@ populate_live_entry_guards(smartlist_t *live_entry_guards, int retval = 0; int need_descriptor = !for_directory; - tor_assert(entry_guards); + tor_assert(all_entry_guards); if (chosen_exit) { nodelist_add_node_and_family(exit_family, chosen_exit); } - SMARTLIST_FOREACH_BEGIN(entry_guards, const entry_guard_t *, entry) { + SMARTLIST_FOREACH_BEGIN(all_entry_guards, const entry_guard_t *, entry) { const char *msg; node = entry_is_live(entry, need_uptime, need_capacity, 0, need_descriptor, &msg); @@ -1090,6 +1091,7 @@ choose_random_entry_impl(cpath_build_state_t *state, int for_directory, /* Populate the list of live entry guards so that we pick one of them. */ retval = populate_live_entry_guards(live_entry_guards, + entry_guards, chosen_exit, dirinfo_type, for_directory,

1 0

[tor/master] Constify aggressively in populate_live_entry_guards().
by nickm＠torproject.org 16 Jul '14

16 Jul '14

commit c7b05a6aefc012b769443e7299e5a8fe13b32fa8 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jun 9 18:23:41 2014 +0100 Constify aggressively in populate_live_entry_guards(). --- src/or/entrynodes.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 4ece81e..50138cd 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -155,7 +155,7 @@ entry_guard_set_status(entry_guard_t *e, const node_t *node, /** Return true iff enough time has passed since we last tried to connect * to the unreachable guard e that we're willing to try again. */ static int -entry_is_time_to_retry(entry_guard_t *e, time_t now) +entry_is_time_to_retry(const entry_guard_t *e, time_t now) { long diff; if (e->last_attempted < e->unreachable_since) @@ -189,7 +189,7 @@ entry_is_time_to_retry(entry_guard_t *e, time_t now) * a descriptor (routerinfo or microdesc) for it. */ static INLINE const node_t * -entry_is_live(entry_guard_t *e, int need_uptime, int need_capacity, +entry_is_live(const entry_guard_t *e, int need_uptime, int need_capacity, int assume_reachable, int need_descriptor, const char **msg) { const node_t *node; @@ -1017,7 +1017,7 @@ populate_live_entry_guards(smartlist_t *live_entry_guards, nodelist_add_node_and_family(exit_family, chosen_exit); } - SMARTLIST_FOREACH_BEGIN(entry_guards, entry_guard_t *, entry) { + SMARTLIST_FOREACH_BEGIN(entry_guards, const entry_guard_t *, entry) { const char *msg; node = entry_is_live(entry, need_uptime, need_capacity, 0, need_descriptor, &msg);

1 0

[tor/master] Make a few entrynodes.c functions testable.
by nickm＠torproject.org 16 Jul '14

16 Jul '14

commit bf263a9b99c41becc62ebe967124931330ae4016 Author: George Kadianakis <desnacked(a)riseup.net> Date: Sun Jun 15 18:38:52 2014 -0700 Make a few entrynodes.c functions testable. --- src/or/entrynodes.c | 10 ++++++---- src/or/entrynodes.h | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index d732791..360c738 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -12,6 +12,8 @@ * circumvention). **/ +#define ENTRYNODES_PRIVATE + #include "or.h" #include "circpathbias.h" #include "circuitbuild.h" @@ -350,7 +352,7 @@ control_event_guard_deferred(void) * If chosen is defined, use that one, and if it's not * already in our entry_guards list, put it at the *beginning*. * Else, put the one we pick at the end of the list. */ -static const node_t * +STATIC const node_t * add_an_entry_guard(const node_t *chosen, int reset_status, int prepend, int for_discovery, int for_directory) { @@ -437,7 +439,7 @@ add_an_entry_guard(const node_t *chosen, int reset_status, int prepend, /** Choose how many entry guards or directory guards we'll use. If * for_directory is true, we return how many directory guards to * use; else we return how many entry guards to use. */ -static int +STATIC int decide_num_guards(const or_options_t *options, int for_directory) { if (for_directory && options->NumDirectoryGuards != 0) @@ -836,7 +838,7 @@ update_node_guard_status(void) /** Adjust the entry guards list so that it only contains entries from * EntryNodes, adding new entries from EntryNodes to the list as needed. */ -static void +STATIC void entry_guards_set_from_config(const or_options_t *options) { smartlist_t *entry_nodes, *worse_entry_nodes, *entry_fps; @@ -997,7 +999,7 @@ choose_random_dirguard(dirinfo_type_t type) /* DOCDOCODC Return 1 if we should choose a guard right away. */ -static int +STATIC int populate_live_entry_guards(smartlist_t *live_entry_guards, const smartlist_t *all_entry_guards, const node_t *chosen_exit, diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index e229f3b..d49ca50 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -77,6 +77,22 @@ int num_live_entry_guards(int for_directory); #endif +#ifdef ENTRYNODES_PRIVATE +STATIC const node_t *add_an_entry_guard(const node_t *chosen, + int reset_status, int prepend, + int for_discovery, int for_directory); + +STATIC int populate_live_entry_guards(smartlist_t *live_entry_guards, + const smartlist_t *all_entry_guards, + const node_t *chosen_exit, + dirinfo_type_t dirinfo_type, + int for_directory, + int need_uptime, int need_capacity); +STATIC int decide_num_guards(const or_options_t *options, int for_directory); + +STATIC void entry_guards_set_from_config(const or_options_t *options); +#endif + void remove_all_entry_guards(void); void entry_guards_compute_status(const or_options_t *options, time_t now);

1 0

[tor/master] fix a c99-ism
by nickm＠torproject.org 16 Jul '14

16 Jul '14

commit 8c7fbdf3af2a28893ab68411d7d534792ccad34d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 16 15:30:14 2014 +0200 fix a c99-ism --- src/common/log.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/log.c b/src/common/log.c index 4ddd54f..2e51e5c 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -1305,7 +1305,8 @@ switch_logs_debug(void) void truncate_logs(void) { - for (logfile_t *lf = logfiles; lf; lf = lf->next) { + logfile_t *lf; + for (lf = logfiles; lf; lf = lf->next) { if (lf->fd >= 0) { tor_ftruncate(lf->fd); }

1 0

[tor/master] Clarify TruncateLogFile manpage entry
by nickm＠torproject.org 16 Jul '14

16 Jul '14

commit c793a6edb441fdad568c26dc417e98484c74f897 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 16 14:01:38 2014 +0200 Clarify TruncateLogFile manpage entry --- doc/tor.1.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 193f943..ca6ac7b 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -562,7 +562,8 @@ GENERAL OPTIONS syslog messages, or the mtime fields on log files. (Default: 1 second) [[TruncateLogFile]] **TruncateLogFile** **0**|**1**:: - If 1, Tor will overwrite logs, instead of appending them. (Default: 0) + If 1, Tor will overwrite logs at startup and in response to a HUP signal, + instead of appending to them. (Default: 0) [[SafeLogging]] **SafeLogging** **0**|**1**|**relay**:: Tor can scrub potentially sensitive strings from log messages (e.g.

1 0

[tor/master] Add an option to overwrite logs
by nickm＠torproject.org 16 Jul '14

16 Jul '14

commit 15e170e01b3f67325f952d0becda0438fa879907 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sun Mar 23 09:24:26 2014 -0700 Add an option to overwrite logs * Issue #5583 --- changes/feature5583 | 2 ++ doc/tor.1.txt | 3 +++ src/common/log.c | 15 +++++++++++++-- src/common/torlog.h | 4 +++- src/or/config.c | 29 ++++++++++++++++++++++++----- src/or/main.c | 4 ++++ src/or/or.h | 2 ++ src/test/test_logging.c | 2 +- 8 files changed, 52 insertions(+), 9 deletions(-) diff --git a/changes/feature5583 b/changes/feature5583 new file mode 100644 index 0000000..cd5eb69 --- /dev/null +++ b/changes/feature5583 @@ -0,0 +1,2 @@ + o Minor features: + - Add an option to overwrite logs (TruncateLogFile). Closes ticket #5583. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 1ccf847..193f943 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -561,6 +561,9 @@ GENERAL OPTIONS messages to affect times logged by a controller, times attached to syslog messages, or the mtime fields on log files. (Default: 1 second) +[[TruncateLogFile]] **TruncateLogFile** **0**|**1**:: + If 1, Tor will overwrite logs, instead of appending them. (Default: 0) + [[SafeLogging]] **SafeLogging** **0**|**1**|**relay**:: Tor can scrub potentially sensitive strings from log messages (e.g. addresses) by replacing them with the string [scrubbed]. This way logs can diff --git a/src/common/log.c b/src/common/log.c index 517fa4f..7c8a487 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -1010,12 +1010,16 @@ mark_logs_temp(void) * logfile fails, -1 is returned and errno is set appropriately (by open(2)). */ int -add_file_log(const log_severity_list_t *severity, const char *filename) +add_file_log(const log_severity_list_t *severity, const char *filename, + const int truncate) { int fd; logfile_t *lf; - fd = tor_open_cloexec(filename, O_WRONLY|O_CREAT|O_APPEND, 0644); + int open_flags = O_WRONLY|O_CREAT; + open_flags |= truncate ? O_TRUNC : O_APPEND; + + fd = tor_open_cloexec(filename, open_flags, 0644); if (fd<0) return -1; if (tor_fd_seekend(fd)<0) { @@ -1297,3 +1301,10 @@ switch_logs_debug(void) UNLOCK_LOGS(); } +/** Truncate all the log files. */ +void +truncate_logs(void) +{ + for (logfile_t *lf = logfiles; lf; lf = lf->next) + ftruncate(lf->fd, 0); +} diff --git a/src/common/torlog.h b/src/common/torlog.h index 34f70f3..34e39b4 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -130,7 +130,8 @@ void set_log_severity_config(int minSeverity, int maxSeverity, log_severity_list_t *severity_out); void add_stream_log(const log_severity_list_t *severity, const char *name, int fd); -int add_file_log(const log_severity_list_t *severity, const char *filename); +int add_file_log(const log_severity_list_t *severity, const char *filename, + const int truncate); #ifdef HAVE_SYSLOG_H int add_syslog_log(const log_severity_list_t *severity); #endif @@ -148,6 +149,7 @@ void change_callback_log_severity(int loglevelMin, int loglevelMax, void flush_pending_log_callbacks(void); void log_set_application_name(const char *name); void set_log_time_granularity(int granularity_msec); +void truncate_logs(void); void tor_log(int severity, log_domain_mask_t domain, const char *format, ...) CHECK_PRINTF(3,4); diff --git a/src/or/config.c b/src/or/config.c index 2c3dfc2..310cef8 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -302,6 +302,7 @@ static config_var_t option_vars_[] = { OBSOLETE("LogLevel"), OBSOLETE("LogFile"), V(LogTimeGranularity, MSEC_INTERVAL, "1 second"), + V(TruncateLogFile, BOOL, "0"), V(LongLivedPorts, CSV, "21,22,706,1863,5050,5190,5222,5223,6523,6667,6697,8300"), VAR("MapAddress", LINELIST, AddressMap, NULL), @@ -557,7 +558,8 @@ static int check_server_ports(const smartlist_t *ports, static int validate_data_directory(or_options_t *options); static int write_configuration_file(const char *fname, const or_options_t *options); -static int options_init_logs(or_options_t *options, int validate_only); +static int options_init_logs(const or_options_t *old_options, + or_options_t *options, int validate_only); static void init_libevent(const or_options_t *options); static int opt_streq(const char *s1, const char *s2); @@ -1145,7 +1147,8 @@ options_act_reversible(const or_options_t *old_options, char **msg) mark_logs_temp(); /* Close current logs once new logs are open. */ logs_marked = 1; - if (options_init_logs(options, 0)<0) { /* Configure the tor_log(s) */ + /* Configure the tor_log(s) */ + if (options_init_logs(old_options, options, 0)<0) { *msg = tor_strdup("Failed to init Log options. See logs for details."); goto rollback; } @@ -2547,7 +2550,8 @@ options_validate(or_options_t *old_options, or_options_t *options, config_line_append(&options->Logs, "Log", "warn stdout"); } - if (options_init_logs(options, 1)<0) /* Validate the tor_log(s) */ + /* Validate the tor_log(s) */ + if (options_init_logs(old_options, options, 1)<0) REJECT("Failed to validate Log options. See logs for details."); if (authdir_mode(options)) { @@ -4449,7 +4453,8 @@ addressmap_register_auto(const char *from, const char *to, * Initialize the logs based on the configuration file. */ static int -options_init_logs(or_options_t *options, int validate_only) +options_init_logs(const or_options_t *old_options, or_options_t *options, + int validate_only) { config_line_t *opt; int ok; @@ -4542,7 +4547,21 @@ options_init_logs(or_options_t *options, int validate_only) !strcasecmp(smartlist_get(elts,0), "file")) { if (!validate_only) { char *fname = expand_filename(smartlist_get(elts, 1)); - if (add_file_log(severity, fname) < 0) { + /* Truncate if TruncateLogFile is set and we haven't seen this option + line before. */ + int truncate = 0; + if (options->TruncateLogFile) { + truncate = 1; + if (old_options) { + config_line_t *opt2; + for (opt2 = old_options->Logs; opt2; opt2 = opt2->next) + if (!strcmp(opt->value, opt2->value)) { + truncate = 0; + break; + } + } + } + if (add_file_log(severity, fname, truncate) < 0) { log_warn(LD_CONFIG, "Couldn't open file for 'Log %s': %s", opt->value, strerror(errno)); ok = 0; diff --git a/src/or/main.c b/src/or/main.c index b4b2fae..c7b532b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1861,6 +1861,10 @@ do_hup(void) return -1; } options = get_options(); /* they have changed now */ + /* Logs are only truncated the first time they are opened, but were + probably intended to be cleaned up on signal. */ + if (options->TruncateLogFile) + truncate_logs(); } else { char *msg = NULL; log_notice(LD_GENERAL, "Not reloading config file: the controller told " diff --git a/src/or/or.h b/src/or/or.h index 131bce3..0419111 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3402,6 +3402,8 @@ typedef struct { int LogMessageDomains; /**< Boolean: Should we log the domain(s) in which * each log message occurs? */ + int TruncateLogFile; /**< Boolean: Should we truncate the log file + before we start writing? */ char *DebugLogFile; /**< Where to send verbose log messages. */ char *DataDirectory; /**< OR only: where to store long-term data. */ diff --git a/src/test/test_logging.c b/src/test/test_logging.c index 7e558f8..9f57000 100644 --- a/src/test/test_logging.c +++ b/src/test/test_logging.c @@ -89,7 +89,7 @@ test_sigsafe_err(void *arg) init_logging(); mark_logs_temp(); - add_file_log(&include_bug, fn); + add_file_log(&include_bug, fn, 0); tor_log_update_sigsafe_err_fds(); close_temp_logs();

1 0

[tor/master] Add a tor_ftruncate to replace ftruncate.
by nickm＠torproject.org 16 Jul '14

16 Jul '14

commit 867f5e6a7602fe5cf54686aa04995eaabaea4c80 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 16 13:58:55 2014 +0200 Add a tor_ftruncate to replace ftruncate. (Windows doesn't have ftruncate, and some ftruncates do not move the file pointer to the start of the file.) --- src/common/compat.c | 17 +++++++++++++++++ src/common/compat.h | 1 + src/common/log.c | 8 ++++++-- src/test/test_util.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+), 2 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 1760684..dcdf78d 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1004,6 +1004,23 @@ tor_fd_setpos(int fd, off_t pos) #endif } +/** Replacement for ftruncate(fd, 0): move to the front of the file and remove + * all the rest of the file. Return -1 on error, 0 on success. */ +int +tor_ftruncate(int fd) +{ + /* Rumor has it that some versions of ftruncate do not move the file pointer. + */ + if (tor_fd_setpos(fd, 0) < 0) + return -1; + +#ifdef _WIN32 + return _chsize(fd, 0); +#else + return ftruncate(fd, 0); +#endif +} + #undef DEBUG_SOCKET_COUNTING #ifdef DEBUG_SOCKET_COUNTING /** A bitarray of all fds that should be passed to tor_socket_close(). Only diff --git a/src/common/compat.h b/src/common/compat.h index 296042f..852a432 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -408,6 +408,7 @@ void tor_lockfile_unlock(tor_lockfile_t *lockfile); off_t tor_fd_getpos(int fd); int tor_fd_setpos(int fd, off_t pos); int tor_fd_seekend(int fd); +int tor_ftruncate(int fd); #ifdef _WIN32 #define PATH_SEPARATOR "\\" diff --git a/src/common/log.c b/src/common/log.c index 7c8a487..4ddd54f 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -1305,6 +1305,10 @@ switch_logs_debug(void) void truncate_logs(void) { - for (logfile_t *lf = logfiles; lf; lf = lf->next) - ftruncate(lf->fd, 0); + for (logfile_t *lf = logfiles; lf; lf = lf->next) { + if (lf->fd >= 0) { + tor_ftruncate(lf->fd); + } + } } + diff --git a/src/test/test_util.c b/src/test/test_util.c index cf116ef..3a1ebb8 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2385,6 +2385,54 @@ test_util_parent_dir(void *ptr) tor_free(cp); } +static void +test_util_ftruncate(void *ptr) +{ + char *buf = NULL; + const char *fname; + int fd = -1; + const char *message = "Hello world"; + const char *message2 = "Hola mundo"; + struct stat st; + + (void) ptr; + + fname = get_fname("ftruncate"); + + fd = tor_open_cloexec(fname, O_WRONLY|O_CREAT, 0600); + tt_int_op(fd, >=, 0); + + /* Make the file be there. */ + tt_int_op(strlen(message), ==, write_all(fd, message, strlen(message), 0)); + tt_int_op(tor_fd_getpos(fd), ==, strlen(message)); + tt_int_op(0, ==, fstat(fd, &st)); + tt_int_op(st.st_size, ==, strlen(message)); + + /* Truncate and see if it got truncated */ + tt_int_op(0, ==, tor_ftruncate(fd)); + tt_int_op(tor_fd_getpos(fd), ==, 0); + tt_int_op(0, ==, fstat(fd, &st)); + tt_int_op(st.st_size, ==, 0); + + /* Replace, and see if it got replaced */ + tt_int_op(strlen(message2), ==, + write_all(fd, message2, strlen(message2), 0)); + tt_int_op(tor_fd_getpos(fd), ==, strlen(message2)); + tt_int_op(0, ==, fstat(fd, &st)); + tt_int_op(st.st_size, ==, strlen(message2)); + + close(fd); + fd = -1; + + buf = read_file_to_str(fname, 0, NULL); + tt_str_op(message2, ==, buf); + + done: + if (fd >= 0) + close(fd); + tor_free(buf); +} + #ifdef _WIN32 static void test_util_load_win_lib(void *ptr) @@ -3798,6 +3846,7 @@ struct testcase_t util_tests[] = { UTIL_TEST(asprintf, 0), UTIL_TEST(listdir, 0), UTIL_TEST(parent_dir, 0), + UTIL_TEST(ftruncate, 0), #ifdef _WIN32 UTIL_TEST(load_win_lib, 0), #endif

1 0

[tor/master] Add coverage-html makefile target
by nickm＠torproject.org 16 Jul '14

16 Jul '14

commit 8fa845548bc2883c6b1335b4815fa945964f517f Author: Kevin Murray <spam(a)kdmurray.id.au> Date: Wed Jul 9 18:37:32 2014 +1000 Add coverage-html makefile target This uses lcov to generate a nice HTML report of test code coverage, including branch coverage. Signed-off-by: Kevin Murray <spam(a)kdmurray.id.au> --- Makefile.am | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Makefile.am b/Makefile.am index 6eceb76..ab0caf0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -74,6 +74,17 @@ test-network: all reset-gcov: rm -f src/*/*.gcda +HTML_COVER_DIR=./coverage_html +coverage-html: all + test -d $(HTML_COVER_DIR) && rm -rf $(HTML_COVER_DIR) || true + test -e `which lcov` || (echo "lcov must be installed. See <http://ltp.sourceforge.net/coverage/lcov.php>." && false) + mkdir -p $(HTML_COVER_DIR) + lcov --rc lcov_branch_coverage=1 --directory ./src --zerocounters + ./src/test/test + lcov --capture --rc lcov_branch_coverage=1 --no-external --directory . --output-file "$(HTML_COVER_DIR)/lcov.tmp" + lcov --remove "$(HTML_COVER_DIR)/lcov.tmp" --rc lcov_branch_coverage=1 'test/*' 'ext/tinytest*' '/usr/*' --output-file "$(HTML_COVER_DIR)/lcov.info" + genhtml --branch-coverage -o "$(HTML_COVER_DIR)" "$(HTML_COVER_DIR)/lcov.info" + # Avoid strlcpy.c, strlcat.c, aes.c, OpenBSD_malloc_Linux.c, sha256.c, # eventdns.[hc], tinytest*.[ch] check-spaces:

1 0