diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-07-05 17:00:43 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-07-05 17:00:43 -0400 |
| commit | 2251667ff239d508be6b01a59a47d0c235da2465 (patch) | |
| tree | a2e5fe99eafdbd7b0c855b5e58dd34338bac1942 /src | |
| parent | 15b13578e89e79d1f2199e05e0b4faba2b64bf9d (diff) | |
| parent | 5b5e20a478e7c151f78b8c905a2b8470a7a159be (diff) | |
| download | tor-2251667ff239d508be6b01a59a47d0c235da2465.tar.gz tor-2251667ff239d508be6b01a59a47d0c235da2465.zip | |
Merge remote-tracking branch 'karsten/task-22207' into maint-0.3.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/networkstatus.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index fffd1078be..3bbe636a99 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2308,13 +2308,22 @@ networkstatus_dump_bridge_status_to_file(time_t now) char *thresholds = NULL; char *published_thresholds_and_status = NULL; char published[ISO_TIME_LEN+1]; + const routerinfo_t *me = router_get_my_routerinfo(); + char fingerprint[FINGERPRINT_LEN+1]; + char *fingerprint_line = NULL; + if (me && crypto_pk_get_fingerprint(me->identity_pkey, fingerprint, 0) >= 0) { + tor_asprintf(&fingerprint_line, "fingerprint %s\n", fingerprint); + } else { + log_warn(LD_BUG, "Error computing fingerprint for bridge status."); + } format_iso_time(published, now); dirserv_compute_bridge_flag_thresholds(); thresholds = dirserv_get_flag_thresholds_line(); tor_asprintf(&published_thresholds_and_status, - "published %s\nflag-thresholds %s\n%s", - published, thresholds, status); + "published %s\nflag-thresholds %s\n%s%s", + published, thresholds, fingerprint_line ? fingerprint_line : "", + status); tor_asprintf(&fname, "%s"PATH_SEPARATOR"networkstatus-bridges", options->DataDirectory); write_str_to_file(fname,published_thresholds_and_status,0); @@ -2322,6 +2331,7 @@ networkstatus_dump_bridge_status_to_file(time_t now) tor_free(published_thresholds_and_status); tor_free(fname); tor_free(status); + tor_free(fingerprint_line); } /* DOCDOC get_net_param_from_list */ |