From: teor <teor@torproject.org>
Date: Tue, 26 Mar 2019 08:12:16 +0000 (+1000)
Subject: dircache: Refactor handle_get_next_bandwidth() to use connection_dir_buf_add()
X-Git-Tag: tor-0.4.0.4-rc~18^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=194b25f0c7043b2485bb90da6fb24c0e96957875;p=thirdparty%2Ftor.git

dircache: Refactor handle_get_next_bandwidth() to use connection_dir_buf_add()

Implements ticket 29897.
---

diff --git a/changes/ticket29897 b/changes/ticket29897
new file mode 100644
index 0000000000..232a79fbce
--- /dev/null
+++ b/changes/ticket29897
@@ -0,0 +1,3 @@
+  o Code simplification and refactoring:
+    - Refactor handle_get_next_bandwidth() to use connection_dir_buf_add().
+      Implements ticket 29897.
diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c
index caa085dd63..62eb4c86c2 100644
--- a/src/feature/dircache/dircache.c
+++ b/src/feature/dircache/dircache.c
@@ -1486,13 +1486,10 @@ handle_get_next_bandwidth(dir_connection_t *conn,
         conn->compress_state = tor_compress_new(1, compress_method,
                                         choose_compression_level(len/2));
         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 {
         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);
       return 0;
     }