diff options
| author | Alexander Færøy <ahf@torproject.org> | 2017-05-04 16:21:05 +0200 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2017-05-12 17:18:45 +0200 |
| commit | ca632144e59304ce2e41a32ddd1cf302d651cc68 (patch) | |
| tree | d9767a93acb2cebefeb90e00de256e90bb8b67f0 /src/or/directory.c | |
| parent | 44102714460aafe59d77fdba0b1101a7bea8ab75 (diff) | |
| download | tor-ca632144e59304ce2e41a32ddd1cf302d651cc68.tar.gz tor-ca632144e59304ce2e41a32ddd1cf302d651cc68.zip | |
Use dir_compressed(_len) instead of dir_z(_len).
This patch renames `dir_z` to `dir_compressed` and `dir_z_len` to
`dir_compressed_len`.
See: https://bugs.torproject.org/21667
Diffstat (limited to 'src/or/directory.c')
| -rw-r--r-- | src/or/directory.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index da92e0f897..83a2e6c598 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3885,7 +3885,9 @@ handle_get_status_vote(dir_connection_t *conn, const get_handler_args_t *args) goto vote_done; } SMARTLIST_FOREACH(dir_items, cached_dir_t *, d, - body_len += compressed ? d->dir_z_len : d->dir_len); + body_len += compressed + ? d->dir_compressed_len + : d->dir_len); estimated_len += body_len; SMARTLIST_FOREACH(items, const char *, item, { size_t ln = strlen(item); @@ -3917,8 +3919,10 @@ handle_get_status_vote(dir_connection_t *conn, const get_handler_args_t *args) } } else { SMARTLIST_FOREACH(dir_items, cached_dir_t *, d, - connection_write_to_buf(compressed ? d->dir_z : d->dir, - compressed ? d->dir_z_len : d->dir_len, + connection_write_to_buf(compressed + ? d->dir_compressed : d->dir, + compressed + ? d->dir_compressed_len : d->dir_len, TO_CONN(conn))); } vote_done: |