aboutsummaryrefslogtreecommitdiff
path: root/src/or/dirserv.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-02-19 10:39:27 -0500
committerNick Mathewson <nickm@torproject.org>2013-02-19 11:06:24 -0500
commit6170bc5a9378bda9b300241fa53785b5cbe44b55 (patch)
tree895307932c7f3bcb13b80af06f467e944f43747b /src/or/dirserv.h
parent4c45b3d8455ecc14daeaacc02330f60603925d95 (diff)
downloadtor-6170bc5a9378bda9b300241fa53785b5cbe44b55.tar
tor-6170bc5a9378bda9b300241fa53785b5cbe44b55.tar.gz
Refactor storing of measured_bw versus Unmeasured=1.
This patch moves the measured_bw field and the has_measured_bw field into vote_routerstatus_t, since only votes have 'Measured=XX' set on their weight line. I also added a new bw_is_unmeasured flag to routerstatus_t to represent the Unmeasured=1 flag on a w line. Previously, I was using has_measured_bw for this, which was quite incorrect: has_measured_bw means that the measured_bw field is set, and it's probably a mistake to have it serve double duty as meaning that 'baandwidth' represents a measured value. While making this change,I also found a harmless but stupid bug in dirserv_read_measured_bandwidths: It assumes that it's getting a smartlist of routerstatus_t, when really it's getting a smartlist of vote_routerstatus_t. C's struct layout rules mean that we could never actually get an error because of that, but it's still quite incorrect. I fixed that, and in the process needed to add two more sorting and searching helpers. Finally, I made the Unmeasured=1 flag get parsed. We don't use it for anything yet, but someday we might. This isn't complete yet -- the new 2286 unit test doesn't build.
Diffstat (limited to 'src/or/dirserv.h')
-rw-r--r--src/or/dirserv.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/dirserv.h b/src/or/dirserv.h
index add09f44a..0caf55f83 100644
--- a/src/or/dirserv.h
+++ b/src/or/dirserv.h
@@ -131,7 +131,8 @@ size_t dirserv_estimate_microdesc_size(const smartlist_t *fps, int compressed);
int routerstatus_format_entry(char *buf, size_t buf_len,
const routerstatus_t *rs, const char *platform,
- routerstatus_format_type_t format);
+ routerstatus_format_type_t format,
+ const vote_routerstatus_t *vrs);
void dirserv_free_all(void);
void cached_dir_decref(cached_dir_t *d);
cached_dir_t *new_cached_dir(char *s, time_t published);