diff options
| author | George Kadianakis <desnacked@riseup.net> | 2020-07-03 10:50:47 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2020-07-03 10:50:47 +0300 |
| commit | 3bb9b7e743c5463e4516cdd53a02c319dc825290 (patch) | |
| tree | 7122c90fbc55665d5fecf780cecd9fe0a0cce0f7 /src/test/test_circuitpadding.c | |
| parent | a73049d1a083afd75740327b20ab939b6339e270 (diff) | |
| parent | c047c6d5b85d4935814630c59ee7ce47a01e23cf (diff) | |
| download | tor-3bb9b7e743c5463e4516cdd53a02c319dc825290.tar.gz tor-3bb9b7e743c5463e4516cdd53a02c319dc825290.zip | |
Merge branch 'tor-github/pr/1934'
Diffstat (limited to 'src/test/test_circuitpadding.c')
| -rw-r--r-- | src/test/test_circuitpadding.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/test/test_circuitpadding.c b/src/test/test_circuitpadding.c index cc8c63d608..c3346e2e03 100644 --- a/src/test/test_circuitpadding.c +++ b/src/test/test_circuitpadding.c @@ -1733,9 +1733,9 @@ helper_create_conditional_machines(void) add->conditions.requires_vanguards = 0; add->conditions.min_hops = 2; - add->conditions.state_mask = CIRCPAD_CIRC_BUILDING| + add->conditions.apply_state_mask = CIRCPAD_CIRC_BUILDING| CIRCPAD_CIRC_NO_STREAMS|CIRCPAD_CIRC_HAS_RELAY_EARLY; - add->conditions.purpose_mask = CIRCPAD_PURPOSE_ALL; + add->conditions.apply_purpose_mask = CIRCPAD_PURPOSE_ALL; circpad_register_padding_machine(add, origin_padding_machines); add = helper_create_conditional_machine(); @@ -1752,9 +1752,9 @@ helper_create_conditional_machines(void) add->conditions.requires_vanguards = 1; add->conditions.min_hops = 3; - add->conditions.state_mask = CIRCPAD_CIRC_OPENED| + add->conditions.apply_state_mask = CIRCPAD_CIRC_OPENED| CIRCPAD_CIRC_STREAMS|CIRCPAD_CIRC_HAS_NO_RELAY_EARLY; - add->conditions.purpose_mask = CIRCPAD_PURPOSE_ALL; + add->conditions.apply_purpose_mask = CIRCPAD_PURPOSE_ALL; circpad_register_padding_machine(add, origin_padding_machines); add = helper_create_conditional_machine(); @@ -2728,8 +2728,8 @@ helper_create_ender_machine(void) circ_client_machine.states[CIRCPAD_STATE_START]. next_state[CIRCPAD_EVENT_NONPADDING_RECV] = CIRCPAD_STATE_END; - circ_client_machine.conditions.state_mask = CIRCPAD_STATE_ALL; - circ_client_machine.conditions.purpose_mask = CIRCPAD_PURPOSE_ALL; + circ_client_machine.conditions.apply_state_mask = CIRCPAD_STATE_ALL; + circ_client_machine.conditions.apply_purpose_mask = CIRCPAD_PURPOSE_ALL; } static time_t mocked_timeofday; |