April 2017 - tor-commits - lists.torproject.org

[tor/master] New force-delete option on consensus_cache_delete_pending()
by nickm＠torproject.org 28 Apr '17

28 Apr '17

commit 920475f293a8a69dd846cd06249b4b699857a3d4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 26 10:13:25 2017 -0400 New force-delete option on consensus_cache_delete_pending() If we're out of file space in the storage directory, we'll need to get rid of old files fast. --- src/or/conscache.c | 16 +++++++++------- src/or/conscache.h | 3 ++- src/or/consdiffmgr.c | 2 +- src/test/test_conscache.c | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/or/conscache.c b/src/or/conscache.c index 2544f56..7760d13 100644 --- a/src/or/conscache.c +++ b/src/or/conscache.c @@ -95,7 +95,7 @@ consensus_cache_register_with_sandbox(consensus_cache_t *cache, static void consensus_cache_clear(consensus_cache_t *cache) { - consensus_cache_delete_pending(cache); + consensus_cache_delete_pending(cache, 0); SMARTLIST_FOREACH_BEGIN(cache->entries, consensus_cache_entry_t *, ent) { ent->in_cache = NULL; @@ -401,17 +401,19 @@ consensus_cache_unmap_lazy(consensus_cache_t *cache, time_t cutoff) /** * Delete every element of cache has been marked with - * consensus_cache_entry_mark_for_removal, and which is not in use except by - * the cache. + * consensus_cache_entry_mark_for_removal. If force is false, + * retain those entries which are not in use except by the cache. */ void -consensus_cache_delete_pending(consensus_cache_t *cache) +consensus_cache_delete_pending(consensus_cache_t *cache, int force) { SMARTLIST_FOREACH_BEGIN(cache->entries, consensus_cache_entry_t *, ent) { tor_assert_nonfatal(ent->in_cache == cache); - if (ent->refcnt > 1 || BUG(ent->in_cache == NULL)) { - /* Somebody is using this entry right now */ - continue; + if (! force) { + if (ent->refcnt > 1 || BUG(ent->in_cache == NULL)) { + /* Somebody is using this entry right now */ + continue; + } } if (ent->can_remove == 0) { /* Don't want to delete this. */ diff --git a/src/or/conscache.h b/src/or/conscache.h index f3110e2..ea27733 100644 --- a/src/or/conscache.h +++ b/src/or/conscache.h @@ -17,7 +17,8 @@ struct sandbox_cfg_elem; int consensus_cache_register_with_sandbox(consensus_cache_t *cache, struct sandbox_cfg_elem **cfg); void consensus_cache_unmap_lazy(consensus_cache_t *cache, time_t cutoff); -void consensus_cache_delete_pending(consensus_cache_t *cache); +void consensus_cache_delete_pending(consensus_cache_t *cache, + int force); consensus_cache_entry_t *consensus_cache_add(consensus_cache_t *cache, const config_line_t *labels, const uint8_t *data, diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index fb09d21..1f3915f 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -614,7 +614,7 @@ consdiffmgr_cleanup(void) smartlist_free(diffs); // Actually remove files, if they're not used. - consensus_cache_delete_pending(cdm_cache_get()); + consensus_cache_delete_pending(cdm_cache_get(), 0); return n_to_delete; } diff --git a/src/test/test_conscache.c b/src/test/test_conscache.c index c316411..aee1ba8 100644 --- a/src/test/test_conscache.c +++ b/src/test/test_conscache.c @@ -203,7 +203,7 @@ test_conscache_cleanup(void *arg) tt_assert(e_tmp == NULL); // not found because pending deletion. /* Delete the pending-deletion items. */ - consensus_cache_delete_pending(cache); + consensus_cache_delete_pending(cache, 0); { smartlist_t *entries = smartlist_new(); consensus_cache_find_all(entries, cache, NULL, NULL);

1 0

[tor/master] Merge branches 'consdiffmgr_orig_squashed' and 'actually_compute_diffs_squashed'
by nickm＠torproject.org 28 Apr '17

28 Apr '17

commit 00a12337ff068d47d92352541665ee73cbd9ff4b Merge: 480dab4 1e1581a 7a09642 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 27 21:42:51 2017 -0400 Merge branches 'consdiffmgr_orig_squashed' and 'actually_compute_diffs_squashed' src/common/storagedir.c | 21 ++- src/common/storagedir.h | 1 + src/or/config.c | 10 + src/or/conscache.c | 40 +++- src/or/conscache.h | 7 +- src/or/consdiffmgr.c | 439 +++++++++++++++++++++++++++++++++++--------- src/or/consdiffmgr.h | 8 +- src/or/main.c | 23 +++ src/or/networkstatus.c | 4 + src/test/test_conscache.c | 2 +- src/test/test_consdiffmgr.c | 26 +-- 11 files changed, 470 insertions(+), 111 deletions(-) diff --cc src/or/consdiffmgr.c index a57edf9,9a3c56d,ba52650..4329fb2 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@@@ -1050,20 -1202,35 -1139,22 +1299,37 @@@@ consensus_diff_worker_replyfn(void *wor cache = 0; } - - int status; - - consensus_cache_entry_handle_t *handle = NULL; - - if (job->body_out && job->bodylen_out && job->labels_out) { - - /* Success! Store the results */ - - log_info(LD_DIRSERV, "Adding consensus diff from %s to %s", - - lv_from_digest, lv_to_digest); - - consdiffmgr_ensure_space_for_files(1); - - consensus_cache_entry_t *ent = - - consensus_cache_add(cdm_cache_get(), job->labels_out, - - job->body_out, - - job->bodylen_out); - - status = CDM_DIFF_PRESENT; - - handle = consensus_cache_entry_handle_new(ent); - - consensus_cache_entry_decref(ent); - - } else { + + int status = CDM_DIFF_ERROR; + + consensus_cache_entry_handle_t *handles[ARRAY_LENGTH(compress_diffs_with)]; + + memset(handles, 0, sizeof(handles)); + + +++ consdiffmgr_ensure_space_for_files(n_diff_compression_methods()); +++ + + unsigned u; + + for (u = 0; u < n_diff_compression_methods(); ++u) { + + compress_method_t method = compress_diffs_with[u]; + + uint8_t *body_out = job->out[u].body; + + size_t bodylen_out = job->out[u].bodylen; + + config_line_t *labels = job->out[u].labels; + + const char *methodname = compression_method_get_name(method); + + if (body_out && bodylen_out && labels) { + + /* Success! Store the results */ + + log_info(LD_DIRSERV, "Adding consensus diff from %s to %s, " + + "compressed with %s", + + lv_from_digest, lv_to_digest, methodname); + + + + consensus_cache_entry_t *ent = + + consensus_cache_add(cdm_cache_get(), + + labels, + + body_out, + + bodylen_out); + + + + status = CDM_DIFF_PRESENT; + + handles[u] = consensus_cache_entry_handle_new(ent); + + consensus_cache_entry_decref(ent); + + } + + } + + if (status != CDM_DIFF_PRESENT) { /* Failure! Nothing to do but complain */ log_warn(LD_DIRSERV, "Worker was unable to compute consensus diff "

1 0

[tor/master] Lower the file limit in consdiffmgr, to support seccomp2
by nickm＠torproject.org 28 Apr '17

28 Apr '17

commit 466e9140888f0a6a504dc642a0426bd2352f0490 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 26 09:29:58 2017 -0400 Lower the file limit in consdiffmgr, to support seccomp2 --- src/or/consdiffmgr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index 160dcaf..fb09d21 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -101,7 +101,10 @@ static HT_HEAD(cdm_diff_ht, cdm_diff_t) cdm_diff_ht = HT_INITIALIZER(); */ static consdiff_cfg_t consdiff_cfg = { /* .cache_max_age_hours = */ 24 * 90, - /* .cache_max_num = */ 1440 + // XXXX I'd like to make this number bigger, but it interferes with the + // XXXX seccomp2 syscall filter, which tops out at BPF_MAXINS (4096) + // XXXX rules. + /* .cache_max_num = */ 128 }; static int consensus_diff_queue_diff_work(consensus_cache_entry_t *diff_from,

1 0

[tor/master] Functionality to ensure there is space to add files to cache.
by nickm＠torproject.org 28 Apr '17

28 Apr '17

commit 7a0964279fafc9912ed5cc4b82abfb81328f5150 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 26 10:42:11 2017 -0400 Functionality to ensure there is space to add files to cache. --- src/common/storagedir.c | 10 ++++++ src/common/storagedir.h | 1 + src/or/conscache.c | 13 ++++++++ src/or/conscache.h | 1 + src/or/consdiffmgr.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 106 insertions(+) diff --git a/src/common/storagedir.c b/src/common/storagedir.c index 9d3c32e..309d42d 100644 --- a/src/common/storagedir.c +++ b/src/common/storagedir.c @@ -530,3 +530,13 @@ storage_dir_remove_all(storage_dir_t *d) return storage_dir_shrink(d, 0, d->max_files); } +/** + * Return the largest number of non-temporary files we're willing to + * store in d. + */ +int +storage_dir_get_max_files(storage_dir_t *d) +{ + return d->max_files; +} + diff --git a/src/common/storagedir.h b/src/common/storagedir.h index 7811944..db25057 100644 --- a/src/common/storagedir.h +++ b/src/common/storagedir.h @@ -45,6 +45,7 @@ int storage_dir_shrink(storage_dir_t *d, uint64_t target_size, int min_to_remove); int storage_dir_remove_all(storage_dir_t *d); +int storage_dir_get_max_files(storage_dir_t *d); #endif diff --git a/src/or/conscache.c b/src/or/conscache.c index 7760d13..5ffa129 100644 --- a/src/or/conscache.c +++ b/src/or/conscache.c @@ -400,6 +400,19 @@ consensus_cache_unmap_lazy(consensus_cache_t *cache, time_t cutoff) } /** + * Return the number of currently unused filenames available in this cache. + */ +int +consensus_cache_get_n_filenames_available(consensus_cache_t *cache) +{ + tor_assert(cache); + int max = storage_dir_get_max_files(cache->dir); + int used = smartlist_len(storage_dir_list(cache->dir)); + tor_assert_nonfatal(max >= used); + return max - used; +} + +/** * Delete every element of cache has been marked with * consensus_cache_entry_mark_for_removal. If force is false, * retain those entries which are not in use except by the cache. diff --git a/src/or/conscache.h b/src/or/conscache.h index ea27733..aef5420 100644 --- a/src/or/conscache.h +++ b/src/or/conscache.h @@ -19,6 +19,7 @@ int consensus_cache_register_with_sandbox(consensus_cache_t *cache, void consensus_cache_unmap_lazy(consensus_cache_t *cache, time_t cutoff); void consensus_cache_delete_pending(consensus_cache_t *cache, int force); +int consensus_cache_get_n_filenames_available(consensus_cache_t *cache); consensus_cache_entry_t *consensus_cache_add(consensus_cache_t *cache, const config_line_t *labels, const uint8_t *data, diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index 1f3915f..ba52650 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -107,6 +107,7 @@ static consdiff_cfg_t consdiff_cfg = { /* .cache_max_num = */ 128 }; +static int consdiffmgr_ensure_space_for_files(int n); static int consensus_diff_queue_diff_work(consensus_cache_entry_t *diff_from, consensus_cache_entry_t *diff_to); static void consdiffmgr_set_cache_flags(void); @@ -413,6 +414,8 @@ consdiffmgr_add_consensus(const char *consensus, } /* We don't have it. Add it to the cache. */ + consdiffmgr_ensure_space_for_files(1); + { size_t bodylen = strlen(consensus); config_line_t *labels = NULL; @@ -853,6 +856,82 @@ consdiffmgr_rescan(void) } /** + * Helper: compare two files by their from-valid-after and valid-after labels, + * trying to sort in ascending order by from-valid-after (when present) and + * valid-after (when not). Place everything that has neither label first in + * the list. + */ +static int +compare_by_staleness_(const void **a, const void **b) +{ + const consensus_cache_entry_t *e1 = *a; + const consensus_cache_entry_t *e2 = *b; + const char *va1, *fva1, *va2, *fva2; + va1 = consensus_cache_entry_get_value(e1, LABEL_VALID_AFTER); + va2 = consensus_cache_entry_get_value(e2, LABEL_VALID_AFTER); + fva1 = consensus_cache_entry_get_value(e1, LABEL_FROM_VALID_AFTER); + fva2 = consensus_cache_entry_get_value(e2, LABEL_FROM_VALID_AFTER); + + if (fva1) + va1 = fva1; + if (fva2) + va2 = fva2; + + /* See note about iso-encoded values in compare_by_valid_after_. Also note + * that missing dates will get placed first. */ + return strcmp_opt(va1, va2); +} + +/** If there are not enough unused filenames to store n files, then + * delete old consensuses until there are. (We have to keep track of the + * number of filenames because of the way that the seccomp2 cache works.) + * + * Return 0 on success, -1 on failure. + **/ +static int +consdiffmgr_ensure_space_for_files(int n) +{ + consensus_cache_t *cache = cdm_cache_get(); + if (consensus_cache_get_n_filenames_available(cache) >= n) { + // there are already enough unused filenames. + return 0; + } + // Try a cheap deletion of stuff that's waiting to get deleted. + consensus_cache_delete_pending(cache, 0); + if (consensus_cache_get_n_filenames_available(cache) >= n) { + // okay, _that_ made enough filenames available. + return 0; + } + // Let's get more assertive: clean out unused stuff, and force-remove + // the files. + consdiffmgr_cleanup(); + consensus_cache_delete_pending(cache, 1); + const int n_to_remove = n - consensus_cache_get_n_filenames_available(cache); + if (n_to_remove <= 0) { + // okay, finally! + return 0; + } + + // At this point, we're going to have to throw out objects that will be + // missed. Too bad! + smartlist_t *objects = smartlist_new(); + consensus_cache_find_all(objects, cache, NULL, NULL); + smartlist_sort(objects, compare_by_staleness_); + int n_marked = 0; + SMARTLIST_FOREACH_BEGIN(objects, consensus_cache_entry_t *, ent) { + consensus_cache_entry_mark_for_removal(ent); + if (++n_marked >= n_to_remove) + break; + } SMARTLIST_FOREACH_END(ent); + + consensus_cache_delete_pending(cache, 1); + if (BUG(n_marked < n_to_remove)) + return -1; + else + return 0; +} + +/** * Set consensus cache flags on the objects in this consdiffmgr. */ static void @@ -1066,6 +1145,8 @@ consensus_diff_worker_replyfn(void *work_) /* Success! Store the results */ log_info(LD_DIRSERV, "Adding consensus diff from %s to %s", lv_from_digest, lv_to_digest); + + consdiffmgr_ensure_space_for_files(1); consensus_cache_entry_t *ent = consensus_cache_add(cdm_cache_get(), job->labels_out, job->body_out,

1 0

[tor/master] Increase MALLOC_MP_LIM to 16MB
by nickm＠torproject.org 28 Apr '17

28 Apr '17

commit 531835f5611994def74d790f43df01d828724513 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 28 10:53:05 2017 -0400 Increase MALLOC_MP_LIM to 16MB Increase the maximum allowed size passed to mprotect(PROT_WRITE) from 1MB to 16MB. This was necessary with the glibc allocator in order to allow worker threads to allocate more memory -- which in turn is necessary because of our new use of worker threads for compression. Closes ticket #22096. Found while working on #21648. --- changes/bug22096 | 6 ++++++ src/common/sandbox.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug22096 b/changes/bug22096 new file mode 100644 index 0000000..83dac9c --- /dev/null +++ b/changes/bug22096 @@ -0,0 +1,6 @@ + o Minor features (linux seccomp2 sandbox): + - Increase the maximum allowed size passed to mprotect(PROT_WRITE) + from 1MB to 16MB. This was necessary with the glibc allocator in + order to allow worker threads to allocate more memory -- which in + turn is necessary because of our new use of worker threads for + compression. Closes ticket 22096. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index ddb1f02..ab2de52 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -20,7 +20,7 @@ #endif /** Malloc mprotect limit in bytes. */ -#define MALLOC_MP_LIM 1048576 +#define MALLOC_MP_LIM (16*1024*1024) #include <stdio.h> #include <string.h>

1 0

[tor/master] Fix use-after-free bug in storage_dir sandbox code.
by nickm＠torproject.org 28 Apr '17

28 Apr '17

commit 16d6ab6640b4404d47096cbf1d25e1b57b0b26bb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 26 08:43:38 2017 -0400 Fix use-after-free bug in storage_dir sandbox code. --- src/common/storagedir.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/common/storagedir.c b/src/common/storagedir.c index 7e0be67..9d3c32e 100644 --- a/src/common/storagedir.c +++ b/src/common/storagedir.c @@ -89,11 +89,12 @@ storage_dir_register_with_sandbox(storage_dir_t *d, sandbox_cfg_t **cfg) tor_asprintf(&path, "%s/%d", d->directory, idx); tor_asprintf(&tmppath, "%s/%d.tmp", d->directory, idx); - problems += sandbox_cfg_allow_open_filename(cfg, path); - problems += sandbox_cfg_allow_open_filename(cfg, tmppath); - problems += sandbox_cfg_allow_stat_filename(cfg, path); - problems += sandbox_cfg_allow_stat_filename(cfg, tmppath); - problems += sandbox_cfg_allow_rename(cfg, tmppath, path); + problems += sandbox_cfg_allow_open_filename(cfg, tor_strdup(path)); + problems += sandbox_cfg_allow_open_filename(cfg, tor_strdup(tmppath)); + problems += sandbox_cfg_allow_stat_filename(cfg, tor_strdup(path)); + problems += sandbox_cfg_allow_stat_filename(cfg, tor_strdup(tmppath)); + problems += sandbox_cfg_allow_rename(cfg, + tor_strdup(tmppath), tor_strdup(path)); tor_free(path); tor_free(tmppath);

1 0

[tor/master] Configure sandbox using consdiffmgr; free cdm on exit.
by nickm＠torproject.org 28 Apr '17

28 Apr '17

commit 24f7059704433834a7335286e552eda7f030666f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 25 19:52:34 2017 -0400 Configure sandbox using consdiffmgr; free cdm on exit. --- src/or/conscache.c | 11 +++++++++++ src/or/conscache.h | 3 +++ src/or/consdiffmgr.c | 10 ++++++++++ src/or/consdiffmgr.h | 2 ++ src/or/main.c | 4 ++++ 5 files changed, 30 insertions(+) diff --git a/src/or/conscache.c b/src/or/conscache.c index 9dedb43..2544f56 100644 --- a/src/or/conscache.c +++ b/src/or/conscache.c @@ -78,6 +78,17 @@ consensus_cache_open(const char *subdir, int max_entries) } /** + * Tell the sandbox (if any) configured by cfg to allow the + * operations that cache will need. + */ +int +consensus_cache_register_with_sandbox(consensus_cache_t *cache, + struct sandbox_cfg_elem **cfg) +{ + return storage_dir_register_with_sandbox(cache->dir, cfg); +} + +/** * Helper: clear all entries from cache (but do not delete * any that aren't marked for removal */ diff --git a/src/or/conscache.h b/src/or/conscache.h index c8cda60..f3110e2 100644 --- a/src/or/conscache.h +++ b/src/or/conscache.h @@ -13,6 +13,9 @@ HANDLE_DECL(consensus_cache_entry, consensus_cache_entry_t, ) consensus_cache_t *consensus_cache_open(const char *subdir, int max_entries); void consensus_cache_free(consensus_cache_t *cache); +struct sandbox_cfg_elem; +int consensus_cache_register_with_sandbox(consensus_cache_t *cache, + struct sandbox_cfg_elem **cfg); void consensus_cache_unmap_lazy(consensus_cache_t *cache, time_t cutoff); void consensus_cache_delete_pending(consensus_cache_t *cache); consensus_cache_entry_t *consensus_cache_add(consensus_cache_t *cache, diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index 59d0f28..41e37ac 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -628,6 +628,16 @@ consdiffmgr_configure(const consdiff_cfg_t *cfg) } /** + * Tell the sandbox (if any) configured by cfg to allow the + * operations that the consensus diff manager will need. + */ +int +consdiffmgr_register_with_sandbox(struct sandbox_cfg_elem **cfg) +{ + return consensus_cache_register_with_sandbox(cdm_cache_get(), cfg); +} + +/** * Scan the consensus diff manager's cache for any grossly malformed entries, * and mark them as deletable. Return 0 if no problems were found; 1 * if problems were found and fixed. diff --git a/src/or/consdiffmgr.h b/src/or/consdiffmgr.h index 6932b2f..55ce1c8 100644 --- a/src/or/consdiffmgr.h +++ b/src/or/consdiffmgr.h @@ -32,6 +32,8 @@ consdiff_status_t consdiffmgr_find_diff_from( void consdiffmgr_rescan(void); int consdiffmgr_cleanup(void); void consdiffmgr_configure(const consdiff_cfg_t *cfg); +struct sandbox_cfg_elem; +int consdiffmgr_register_with_sandbox(struct sandbox_cfg_elem **cfg); void consdiffmgr_free_all(void); int consdiffmgr_validate(void); diff --git a/src/or/main.c b/src/or/main.c index 5fec7e4..452c350 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -64,6 +64,7 @@ #include "connection.h" #include "connection_edge.h" #include "connection_or.h" +#include "consdiffmgr.h" #include "control.h" #include "cpuworker.h" #include "crypto_s2k.h" @@ -3162,6 +3163,7 @@ tor_free_all(int postfork) sandbox_free_getaddrinfo_cache(); protover_free_all(); bridges_free_all(); + consdiffmgr_free_all(); if (!postfork) { config_free_all(); or_state_free_all(); @@ -3584,6 +3586,8 @@ sandbox_init_filter(void) OPEN_DATADIR("stats"); STAT_DATADIR("stats"); STAT_DATADIR2("stats", "dirreq-stats"); + + consdiffmgr_register_with_sandbox(&cfg); } init_addrinfo();

1 0

[tor/master] Merge branch 'ticket21648'
by nickm＠torproject.org 28 Apr '17

28 Apr '17

commit dcc0a49a8477a33ba6b90839ae152230f0eac692 Merge: 480dab4 531835f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 28 11:04:49 2017 -0400 Merge branch 'ticket21648' changes/bug22096 | 6 + src/common/sandbox.c | 2 +- src/common/storagedir.c | 21 ++- src/common/storagedir.h | 1 + src/or/config.c | 10 + src/or/conscache.c | 40 +++- src/or/conscache.h | 7 +- src/or/consdiffmgr.c | 439 +++++++++++++++++++++++++++++++++++--------- src/or/consdiffmgr.h | 8 +- src/or/main.c | 23 +++ src/or/networkstatus.c | 4 + src/test/test_conscache.c | 2 +- src/test/test_consdiffmgr.c | 26 +-- 13 files changed, 477 insertions(+), 112 deletions(-)

1 0

[tor/master] Clean the consdiffmgr cache and launch new diffs as needed.
by nickm＠torproject.org 28 Apr '17

28 Apr '17

commit 7b8d48a6cb1109a5cd16e4db7b088a968b0186e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 25 20:01:09 2017 -0400 Clean the consdiffmgr cache and launch new diffs as needed. --- src/or/main.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index 452c350..0da43dc 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1186,6 +1186,7 @@ CALLBACK(check_dns_honesty); CALLBACK(write_bridge_ns); CALLBACK(check_fw_helper_app); CALLBACK(heartbeat); +CALLBACK(clean_consdiffmgr); #undef CALLBACK @@ -1218,6 +1219,7 @@ static periodic_event_item_t periodic_events[] = { CALLBACK(write_bridge_ns), CALLBACK(check_fw_helper_app), CALLBACK(heartbeat), + CALLBACK(clean_consdiffmgr), END_OF_PERIODIC_EVENTS }; #undef CALLBACK @@ -1473,6 +1475,12 @@ run_scheduled_events(time_t now) /* 11b. check pending unconfigured managed proxies */ if (!net_is_disabled() && pt_proxies_configuration_pending()) pt_configure_remaining_proxies(); + + /* 12. launch diff computations. (This is free if there are none to + * launch.) */ + if (server_mode(options)) { + consdiffmgr_rescan(); + } } /* Periodic callback: rotate the onion keys after the period defined by the @@ -2036,6 +2044,17 @@ heartbeat_callback(time_t now, const or_options_t *options) return options->HeartbeatPeriod; } +#define CDM_CLEAN_CALLBACK_INTERVAL 600 +static int +clean_consdiffmgr_callback(time_t now, const or_options_t *options) +{ + (void)now; + if (server_mode(options)) { + consdiffmgr_cleanup(); + } + return CDM_CLEAN_CALLBACK_INTERVAL; +} + /** Timer: used to invoke second_elapsed_callback() once per second. */ static periodic_timer_t *second_timer = NULL; /** Number of libevent errors in the last second: we die if we get too many. */

1 0

[tor/master] Pass incoming consensus documents to the consdiffmgr code
by nickm＠torproject.org 28 Apr '17

28 Apr '17

commit ab73bda0604dccd899061f338122ed7f9faf8c4f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 26 08:44:01 2017 -0400 Pass incoming consensus documents to the consdiffmgr code --- src/or/networkstatus.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 9d27e57..188e753 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -46,6 +46,7 @@ #include "config.h" #include "connection.h" #include "connection_or.h" +#include "consdiffmgr.h" #include "control.h" #include "directory.h" #include "dirserv.h" @@ -1981,6 +1982,9 @@ networkstatus_set_current_consensus(const char *consensus, flavor, &c->digests, c->valid_after); + if (server_mode(get_options())) { + consdiffmgr_add_consensus(consensus, c); + } } if (!from_cache) {

1 0