mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 02:09:24 +01:00
Code Issues Projects Releases Wiki Activity

New consensus method: clip the maximum votable unmeasured bw

Browse Source 
If we're deciding on a node's bandwidth based on "Bandwidth="
declarations, clip it to "20" or to the maxunmeasuredbw parameter,
if it's voted on.

This adds a new consensus method.

This is "part A" of bug 2286
This commit is contained in:
Nick Mathewson 2012-05-16 17:04:51 -04:00
parent 2dcad03eba
commit 1cd6744338
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/or/dirvote.c
View File

@ -1388,6 +1388,8 @@ networkstatus_compute_consensus(smartlist_t *votes,
char *client_versions = NULL, *server_versions = NULL; char *client_versions = NULL, *server_versions = NULL;
smartlist_t *flags; smartlist_t *flags;
const char *flavor_name; const char *flavor_name;
#define DEFAULT_MAX_UNMEASURED_BW 20
uint32_t max_unmeasured_bw = DEFAULT_MAX_UNMEASURED_BW;
int64_t G=0, M=0, E=0, D=0, T=0; /* For bandwidth weights */ int64_t G=0, M=0, E=0, D=0, T=0; /* For bandwidth weights */
const routerstatus_format_type_t rs_format = const routerstatus_format_type_t rs_format =
flavor == FLAV_NS ? NS_V3_CONSENSUS : NS_V3_CONSENSUS_MICRODESC; flavor == FLAV_NS ? NS_V3_CONSENSUS : NS_V3_CONSENSUS_MICRODESC;
@ -1586,6 +1588,30 @@ networkstatus_compute_consensus(smartlist_t *votes,
smartlist_free(dir_sources); smartlist_free(dir_sources);
} }
if (consensus_method >= MIN_METHOD_TO_CLIP_UNMEASURED_BW) {
char *max_unmeasured_param = NULL;
if (params) {
if (strcmpstart(params, "maxunmeasuredbw=") == 0)
max_unmeasured_param = params;
else
max_unmeasured_param = strstr(params, " maxunmeasuredbw=");
}
if (max_unmeasured_param) {
int ok = 0;
char *eq = strchr(max_unmeasured_param, '=');
if (eq) {
max_unmeasured_bw = (uint32_t)
tor_parse_ulong(eq+1, 10, 1, UINT32_MAX, &ok, NULL);
if (!ok) {
log_warn(LD_DIR, "Bad element '%s' in max unmeasured bw param",
escaped(max_unmeasured_param));
max_unmeasured_bw = DEFAULT_MAX_UNMEASURED_BW;
}
}
}
}
/* Add the actual router entries. */ /* Add the actual router entries. */
{ {
int *index; /* index[j] is the current index into votes[j]. */ int *index; /* index[j] is the current index into votes[j]. */
@ -1867,6 +1893,11 @@ networkstatus_compute_consensus(smartlist_t *votes,
} else if (consensus_method >= 5 && num_bandwidths > 0) { } else if (consensus_method >= 5 && num_bandwidths > 0) {
rs_out.has_bandwidth = 1; rs_out.has_bandwidth = 1;
rs_out.bandwidth = median_uint32(bandwidths, num_bandwidths); rs_out.bandwidth = median_uint32(bandwidths, num_bandwidths);
if (consensus_method >= MIN_METHOD_TO_CLIP_UNMEASURED_BW) {
/* Cap non-measured bandwidths to 20k. */
if (rs_out.bandwidth > max_unmeasured_bw)
rs_out.bandwidth = max_unmeasured_bw;
}
} }
/* Fix bug 2203: Do not count BadExit nodes as Exits for bw weights */ /* Fix bug 2203: Do not count BadExit nodes as Exits for bw weights */

6
src/or/dirvote.h
View File

@ -20,7 +20,7 @@
#define MIN_VOTE_INTERVAL 300 #define MIN_VOTE_INTERVAL 300
/** The highest consensus method that we currently support. */ /** The highest consensus method that we currently support. */
#define MAX_SUPPORTED_CONSENSUS_METHOD 16 #define MAX_SUPPORTED_CONSENSUS_METHOD 17
/** Lowest consensus method that contains a 'directory-footer' marker */ /** Lowest consensus method that contains a 'directory-footer' marker */
#define MIN_METHOD_FOR_FOOTER 9 #define MIN_METHOD_FOR_FOOTER 9
@ -52,6 +52,10 @@
* line */ * line */
#define MIN_METHOD_FOR_NTOR_KEY 16 #define MIN_METHOD_FOR_NTOR_KEY 16
/** Lowest consensus method that ensures that authorities output an
* Unmeasured=1 flag for unmeasured bandwidths */
#define MIN_METHOD_TO_CLIP_UNMEASURED_BW 17
void dirvote_free_all(void); void dirvote_free_all(void);
/* vote manipulation */ /* vote manipulation */