aboutsummaryrefslogtreecommitdiff
path: root/src/core/or/circuitlist.c
diff options
context:
space:
mode:
authorMike Perry <mikeperry-git@torproject.org>2018-10-23 19:51:22 +0000
committerGeorge Kadianakis <desnacked@riseup.net>2019-01-02 15:12:09 +0200
commit2f7b5a2d4468532251dd7b177c02a9c192690174 (patch)
treeae28eaa136c2381498846e7bc1bbb67347afdaa8 /src/core/or/circuitlist.c
parent2a24e21fb07ade157f1226039d71713c0c5b47b7 (diff)
downloadtor-2f7b5a2d4468532251dd7b177c02a9c192690174.tar.gz
tor-2f7b5a2d4468532251dd7b177c02a9c192690174.zip
Hook up circuit padding to circuit_t.
Co-authored-by: George Kadianakis <desnacked@riseup.net>
Diffstat (limited to 'src/core/or/circuitlist.c')
-rw-r--r--src/core/or/circuitlist.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c
index c4b5f7ee3e..71f8becddc 100644
--- a/src/core/or/circuitlist.c
+++ b/src/core/or/circuitlist.c
@@ -62,6 +62,7 @@
#include "core/or/circuitlist.h"
#include "core/or/circuituse.h"
#include "core/or/circuitstats.h"
+#include "core/or/circuitpadding.h"
#include "core/mainloop/connection.h"
#include "app/config/config.h"
#include "core/or/connection_edge.h"
@@ -1231,6 +1232,9 @@ circuit_free_(circuit_t *circ)
CIRCUIT_IS_ORIGIN(circ) ?
TO_ORIGIN_CIRCUIT(circ)->global_identifier : 0);
+ /* Free any circuit padding structures */
+ circpad_circuit_free_all_machineinfos(circ);
+
if (should_free) {
memwipe(mem, 0xAA, memlen); /* poison memory */
tor_free(mem);