nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

r13950@catbus: nickm | 2007-07-27 18:15:23 -0400

Browse Source 
Wrap bandwidth usage info in another ifdef so we can easily drop it on august 1 when it is time to finalize proposal 104.


svn:r10951
This commit is contained in:
Nick Mathewson 2007-07-27 23:18:55 +00:00
parent 51c734384a
commit f6229d6432
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/or/or.h
View File

@ -156,6 +156,9 @@
/** Undefine this when it's time to stop generating v1 directories. */ /** Undefine this when it's time to stop generating v1 directories. */
#define FULL_V1_DIRECTORIES #define FULL_V1_DIRECTORIES
/** Undefine this when it's time to stop includeing bandwidth info in router
* descriptors. */
#define INCLUDE_BW_INFO_IN_ROUTERDESCS
/** Length of longest allowable configured nickname. */ /** Length of longest allowable configured nickname. */
#define MAX_NICKNAME_LEN 19 #define MAX_NICKNAME_LEN 19

13
src/or/router.c
View File

@ -1399,7 +1399,9 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router,
size_t written; size_t written;
int result=0; int result=0;
addr_policy_t *tmpe; addr_policy_t *tmpe;
#ifdef INCLUDE_BW_INFO_IN_ROUTERDESCS
char *bandwidth_usage; char *bandwidth_usage;
#endif
char *family_line; char *family_line;
or_options_t *options = get_options(); or_options_t *options = get_options();
@ -1434,8 +1436,10 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router,
/* Encode the publication time. */ /* Encode the publication time. */
format_iso_time(published, router->cache_info.published_on); format_iso_time(published, router->cache_info.published_on);
#ifdef INCLUDE_BW_INFO_IN_ROUTERDESCS
/* How busy have we been? */ /* How busy have we been? */
bandwidth_usage = rep_hist_get_bandwidth_lines(0); bandwidth_usage = rep_hist_get_bandwidth_lines(0);
#endif
if (router->declared_family && smartlist_len(router->declared_family)) { if (router->declared_family && smartlist_len(router->declared_family)) {
size_t n; size_t n;
@ -1477,12 +1481,19 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router,
extra_info_digest, extra_info_digest,
options->DownloadExtraInfo ? "opt caches-extra-info\n" : "", options->DownloadExtraInfo ? "opt caches-extra-info\n" : "",
onion_pkey, identity_pkey, onion_pkey, identity_pkey,
family_line, bandwidth_usage, family_line,
#ifdef INCLUDE_BW_INFO_IN_ROUTERDESCS
bandwidth_usage,
#else
"",
#endif
we_are_hibernating() ? "opt hibernating 1\n" : ""); we_are_hibernating() ? "opt hibernating 1\n" : "");
tor_free(family_line); tor_free(family_line);
tor_free(onion_pkey); tor_free(onion_pkey);
tor_free(identity_pkey); tor_free(identity_pkey);
#ifdef INCLUDE_BW_INFO_IN_ROUTERDESCS
tor_free(bandwidth_usage); tor_free(bandwidth_usage);
#endif
if (result < 0) { if (result < 0) {
log_warn(LD_BUG,"descriptor snprintf #1 ran out of room!"); log_warn(LD_BUG,"descriptor snprintf #1 ran out of room!");