aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuinness <guinness@crans.org>2020-10-20 21:04:33 +0200
committerGuinness <guinness@crans.org>2020-10-20 21:04:33 +0200
commit0668437b5895c2a870f38557b4f432ebade07e8d (patch)
treef3ab0dfc7d6ce6105a0d207325c668f19933466d
parent66cd12e044a33870e5ce0732de21a1d7810d2469 (diff)
downloadtor-0668437b5895c2a870f38557b4f432ebade07e8d.tar.gz
tor-0668437b5895c2a870f38557b4f432ebade07e8d.zip
Set is_padding_timer_scheduled to 0
When calling `circpad_send_padding_cell_for_callback()`, the flag `is_padding_timer_scheduled` was not resetted to 0 which caused an issue in the circpad simulator. This commit fixes this problem. Fixes #32671.
-rw-r--r--changes/bug326714
-rw-r--r--src/core/or/circuitpadding.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug32671 b/changes/bug32671
new file mode 100644
index 0000000000..d12e35c7fc
--- /dev/null
+++ b/changes/bug32671
@@ -0,0 +1,4 @@
+ o Minor bugfixes (circuit padding):
+ - When circpad_send_padding_cell_for_callback is called,
+ `is_padding_timer_scheduled` flag was not reset. Now it is set to 0 at
+ the top of that function. Fix bug #32671.
diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index 889ffb03f1..e6daba5469 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -1226,6 +1226,7 @@ circpad_send_padding_cell_for_callback(circpad_machine_runtime_t *mi)
circuit_t *circ = mi->on_circ;
int machine_idx = mi->machine_index;
mi->padding_scheduled_at_usec = 0;
+ mi->is_padding_timer_scheduled = 0;
circpad_statenum_t state = mi->current_state;
/* Make sure circuit didn't close on us */