diff options
| author | Alexander Færøy <ahf@0x90.dk> | 2017-06-23 23:55:54 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-27 18:25:48 -0400 |
| commit | 07f2940b4519d801eb10b9f5e49790aced1f6322 (patch) | |
| tree | 39edf7225a819fc8bbae289307c3bb22402a623f /src/or/dirserv.c | |
| parent | 32eba3d6aa7bd39048d32a566d119c013e526759 (diff) | |
| download | tor-07f2940b4519d801eb10b9f5e49790aced1f6322.tar.gz tor-07f2940b4519d801eb10b9f5e49790aced1f6322.zip | |
Set published_out for consensus cache entries in spooled_resource_estimate_size().
This patch ensures that the published_out output parameter is set to the
current consensus cache entry's "valid after" field.
See: https://bugs.torproject.org/22702
Diffstat (limited to 'src/or/dirserv.c')
| -rw-r--r-- | src/or/dirserv.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 408f58b22b..4954471c6a 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -14,6 +14,7 @@ #include "connection.h" #include "connection_or.h" #include "conscache.h" +#include "consdiffmgr.h" #include "control.h" #include "directory.h" #include "dirserv.h" @@ -3518,6 +3519,11 @@ spooled_resource_estimate_size(const spooled_resource_t *spooled, } else { cached_dir_t *cached; if (spooled->consensus_cache_entry) { + if (published_out) { + consensus_cache_entry_get_valid_after( + spooled->consensus_cache_entry, published_out); + } + return spooled->cce_len; } if (spooled->cached_dir_ref) { |