Rename circuit_expire_all_dirty_circs

The new name is circuit_mark_all_dirty_circs_as_unusable.

This resolves an XXX024
This commit is contained in:
Nick Mathewson 2013-02-19 18:37:03 -05:00
parent 62fb209d83
commit 7bb51fdd89
5 changed files with 6 additions and 7 deletions

View File

@ -901,7 +901,7 @@ circuit_note_clock_jumped(int seconds_elapsed)
control_event_client_status(severity, "CIRCUIT_NOT_ESTABLISHED REASON=%s", control_event_client_status(severity, "CIRCUIT_NOT_ESTABLISHED REASON=%s",
"CLOCK_JUMPED"); "CLOCK_JUMPED");
circuit_mark_all_unused_circs(); circuit_mark_all_unused_circs();
circuit_expire_all_dirty_circs(); circuit_mark_all_dirty_circs_as_unusable();
} }
/** Take the 'extend' <b>cell</b>, pull out addr/port plus the onion /** Take the 'extend' <b>cell</b>, pull out addr/port plus the onion

View File

@ -1300,9 +1300,8 @@ circuit_mark_all_unused_circs(void)
* This is useful for letting the user change pseudonyms, so new * This is useful for letting the user change pseudonyms, so new
* streams will not be linkable to old streams. * streams will not be linkable to old streams.
*/ */
/* XXX024 this is a bad name for what this function does */
void void
circuit_expire_all_dirty_circs(void) circuit_mark_all_dirty_circs_as_unusable(void)
{ {
circuit_t *circ; circuit_t *circ;

View File

@ -46,7 +46,7 @@ or_circuit_t *circuit_get_intro_point(const char *digest);
origin_circuit_t *circuit_find_to_cannibalize(uint8_t purpose, origin_circuit_t *circuit_find_to_cannibalize(uint8_t purpose,
extend_info_t *info, int flags); extend_info_t *info, int flags);
void circuit_mark_all_unused_circs(void); void circuit_mark_all_unused_circs(void);
void circuit_expire_all_dirty_circs(void); void circuit_mark_all_dirty_circs_as_unusable(void);
void circuit_mark_for_close_(circuit_t *circ, int reason, void circuit_mark_for_close_(circuit_t *circ, int reason,
int line, const char *file); int line, const char *file);
int circuit_get_cpath_len(origin_circuit_t *circ); int circuit_get_cpath_len(origin_circuit_t *circ);

View File

@ -1500,7 +1500,7 @@ options_act(const or_options_t *old_options)
"preferred or excluded node lists. " "preferred or excluded node lists. "
"Abandoning previous circuits."); "Abandoning previous circuits.");
circuit_mark_all_unused_circs(); circuit_mark_all_unused_circs();
circuit_expire_all_dirty_circs(); circuit_mark_all_dirty_circs_as_unusable();
revise_trackexithosts = 1; revise_trackexithosts = 1;
} }

View File

@ -1129,7 +1129,7 @@ signewnym_impl(time_t now)
return; return;
} }
circuit_expire_all_dirty_circs(); circuit_mark_all_dirty_circs_as_unusable();
addressmap_clear_transient(); addressmap_clear_transient();
rend_client_purge_state(); rend_client_purge_state();
time_of_last_signewnym = now; time_of_last_signewnym = now;
@ -1848,7 +1848,7 @@ do_hup(void)
/* Rotate away from the old dirty circuits. This has to be done /* Rotate away from the old dirty circuits. This has to be done
* after we've read the new options, but before we start using * after we've read the new options, but before we start using
* circuits for directory fetches. */ * circuits for directory fetches. */
circuit_expire_all_dirty_circs(); circuit_mark_all_dirty_circs_as_unusable();
/* retry appropriate downloads */ /* retry appropriate downloads */
router_reset_status_download_failures(); router_reset_status_download_failures();