nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-01 08:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.0'

Browse Source
This commit is contained in:
George Kadianakis 2019-04-03 17:59:46 +03:00
commit 0b6769a99e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket29897 Normal file
View File

@ -0,0 +1,3 @@
o Code simplification and refactoring:
- Refactor handle_get_next_bandwidth() to use connection_dir_buf_add().
Implements ticket 29897.

5
src/feature/dircache/dircache.c
View File

@ -1478,13 +1478,10 @@ handle_get_next_bandwidth(dir_connection_t *conn,
conn->compress_state = tor_compress_new(1, compress_method, conn->compress_state = tor_compress_new(1, compress_method,
choose_compression_level(len/2)); choose_compression_level(len/2));
log_debug(LD_DIR, "Compressing bandwidth file."); log_debug(LD_DIR, "Compressing bandwidth file.");
connection_buf_add_compress(bandwidth, len, conn, 0);
/* Flush the compression state. */
connection_buf_add_compress("", 0, conn, 1);
} else { } else {
log_debug(LD_DIR, "Not compressing bandwidth file."); log_debug(LD_DIR, "Not compressing bandwidth file.");
connection_buf_add(bandwidth, len, TO_CONN(conn));
} }
connection_dir_buf_add((const char*)bandwidth, len, conn, 1);
tor_free(bandwidth); tor_free(bandwidth);
return 0; return 0;
} }