diff options
author | teor <teor@torproject.org> | 2019-03-20 09:48:03 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2019-03-20 09:48:03 +1000 |
commit | 41cd05562f68c23f8c3d95472e20a86165f6dc20 (patch) | |
tree | 9dc527fb881e5244f3ff0767ef037495ee6d0222 /src/feature/dirauth | |
parent | 6bf9078cebad2d993c4b82b15b668ddcb26fa948 (diff) | |
parent | d7a5fdcb7408536008e8142becc323148e901da5 (diff) | |
download | tor-41cd05562f68c23f8c3d95472e20a86165f6dc20.tar.gz tor-41cd05562f68c23f8c3d95472e20a86165f6dc20.zip |
Merge branch 'maint-0.3.4' into maint-0.3.5
Diffstat (limited to 'src/feature/dirauth')
-rw-r--r-- | src/feature/dirauth/shared_random_state.c | 4 | ||||
-rw-r--r-- | src/feature/dirauth/shared_random_state.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c index 2bc030f4a7..b3e4a4ef92 100644 --- a/src/feature/dirauth/shared_random_state.c +++ b/src/feature/dirauth/shared_random_state.c @@ -985,7 +985,7 @@ state_query(sr_state_action_t action, sr_state_object_t obj_type, /* Delete the current SRV value from the state freeing it and the value is set * to NULL meaning empty. */ -static void +STATIC void state_del_current_srv(void) { state_query(SR_STATE_ACTION_DEL, SR_STATE_OBJ_CURSRV, NULL, NULL); @@ -993,7 +993,7 @@ state_del_current_srv(void) /* Delete the previous SRV value from the state freeing it and the value is * set to NULL meaning empty. */ -static void +STATIC void state_del_previous_srv(void) { state_query(SR_STATE_ACTION_DEL, SR_STATE_OBJ_PREVSRV, NULL, NULL); diff --git a/src/feature/dirauth/shared_random_state.h b/src/feature/dirauth/shared_random_state.h index 35626be3f6..08f999f9d4 100644 --- a/src/feature/dirauth/shared_random_state.h +++ b/src/feature/dirauth/shared_random_state.h @@ -140,6 +140,8 @@ STATIC int is_phase_transition(sr_phase_t next_phase); STATIC void set_sr_phase(sr_phase_t phase); STATIC sr_state_t *get_sr_state(void); +STATIC void state_del_previous_srv(void); +STATIC void state_del_current_srv(void); #endif /* defined(TOR_UNIT_TESTS) */ |