commit af02c4a9c3ee0ab85a4ecf5c7ff16e2da901c886 Author: Sebastian Hahn <sebastian@torproject.org> Date: Fri Oct 7 02:42:52 2011 +0200 remove code related to tracking descriptor serving times This had broken due to bitrot - it doesn't know about microdescriptors at all, and afaik hasn't generally been used in ages. --- changes/remove_TRACK_SERVED_TIME | 4 ++++ src/or/dirserv.c | 6 ------ src/or/or.h | 5 ----- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/changes/remove_TRACK_SERVED_TIME b/changes/remove_TRACK_SERVED_TIME new file mode 100644 index 0000000..cd5d380 --- /dev/null +++ b/changes/remove_TRACK_SERVED_TIME @@ -0,0 +1,4 @@ + o Removed features: + - Remove the ability to define TRACK_SERVED_TIME. The feature wasn't used + and is now outdated that microdescriptors are around. + diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 96a5913..f64dcff 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3482,9 +3482,6 @@ connection_dirserv_finish_spooling(dir_connection_t *conn) static int connection_dirserv_add_servers_to_outbuf(dir_connection_t *conn) { -#ifdef TRACK_SERVED_TIME - time_t now = time(NULL); -#endif int by_fp = (conn->dir_spool_src == DIR_SPOOL_SERVER_BY_FP || conn->dir_spool_src == DIR_SPOOL_EXTRA_BY_FP); int extra = (conn->dir_spool_src == DIR_SPOOL_EXTRA_BY_FP || @@ -3512,9 +3509,6 @@ connection_dirserv_add_servers_to_outbuf(dir_connection_t *conn) * unknown bridge descriptor has shown up between then and now. */ continue; } -#ifdef TRACK_SERVED_TIME - sd->last_served_at = now; -#endif body = signed_descriptor_get_body(sd); if (conn->zlib_state) { /* XXXX022 This 'last' business should actually happen on the last diff --git a/src/or/or.h b/src/or/or.h index 6969a9c..7a901e7 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1690,11 +1690,6 @@ typedef struct signed_descriptor_t { * networkstatus that listed it. 0 for "never listed in a consensus or * status, so far as we know." */ time_t last_listed_as_valid_until; -#ifdef TRACK_SERVED_TIME - /** The last time we served anybody this descriptor. Used for internal - * testing to see whether we're holding on to descriptors too long. */ - time_t last_served_at; /*XXXX remove if not useful. */ -#endif /* If true, we do not ever try to save this object in the cache. */ unsigned int do_not_cache : 1; /* If true, this item is meant to represent an extrainfo. */