nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 06:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'isis/bug12951_r1'

Browse Source
This commit is contained in:
Nick Mathewson 2014-10-13 13:22:10 -04:00
commit 032e3b733f
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/or/networkstatus.c
View File

@ -1678,17 +1678,22 @@ networkstatus_dump_bridge_status_to_file(time_t now)
char *status = networkstatus_getinfo_by_purpose("bridge", now); char *status = networkstatus_getinfo_by_purpose("bridge", now);
const or_options_t *options = get_options(); const or_options_t *options = get_options();
char *fname = NULL; char *fname = NULL;
char *thresholds = NULL, *thresholds_and_status = NULL; char *thresholds = NULL;
char *published_thresholds_and_status = NULL;
routerlist_t *rl = router_get_routerlist(); routerlist_t *rl = router_get_routerlist();
char published[ISO_TIME_LEN+1];
format_iso_time(published, now);
dirserv_compute_bridge_flag_thresholds(rl); dirserv_compute_bridge_flag_thresholds(rl);
thresholds = dirserv_get_flag_thresholds_line(); thresholds = dirserv_get_flag_thresholds_line();
tor_asprintf(&thresholds_and_status, "flag-thresholds %s\n%s", tor_asprintf(&published_thresholds_and_status,
thresholds, status); "published %s\nflag-thresholds %s\n%s",
published, thresholds, status);
tor_asprintf(&fname, "%s"PATH_SEPARATOR"networkstatus-bridges", tor_asprintf(&fname, "%s"PATH_SEPARATOR"networkstatus-bridges",
options->DataDirectory); options->DataDirectory);
write_str_to_file(fname,thresholds_and_status,0); write_str_to_file(fname,published_thresholds_and_status,0);
tor_free(thresholds); tor_free(thresholds);
tor_free(thresholds_and_status); tor_free(published_thresholds_and_status);
tor_free(fname); tor_free(fname);
tor_free(status); tor_free(status);
} }