commit 97337844b7282946dda12f59bcabc097fad42647 Merge: a633baf 501fc3b Author: Nick Mathewson <nickm@torproject.org> Date: Mon Sep 26 11:00:08 2016 -0700 Merge branch 'protover_v2_squashed' changes/prop264 | 18 ++ src/or/dirserv.c | 36 +++ src/or/dirserv.h | 4 +- src/or/dirvote.c | 181 ++++++++++-- src/or/dirvote.h | 10 +- src/or/include.am | 2 + src/or/main.c | 2 + src/or/networkstatus.c | 142 +++++++++- src/or/or.h | 28 +- src/or/protover.c | 712 +++++++++++++++++++++++++++++++++++++++++++++++ src/or/protover.h | 67 +++++ src/or/router.c | 13 +- src/or/routerlist.c | 8 +- src/or/routerparse.c | 59 +++- src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_dir.c | 2 - src/test/test_protover.c | 195 +++++++++++++ 19 files changed, 1443 insertions(+), 39 deletions(-) diff --cc src/or/dirvote.c index ae869c9,9b41e8f..8b195f8 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@@ -1580,9 -1706,10 +1706,10 @@@ networkstatus_compute_consensus(smartli routerstatus_t rs_out; const char *current_rsa_id = NULL; const char *chosen_version; + const char *chosen_protocol_list; const char *chosen_name = NULL; int exitsummary_disagreement = 0; - int is_named = 0, is_unnamed = 0, is_running = 0; + int is_named = 0, is_unnamed = 0, is_running = 0, is_valid = 0; int is_guard = 0, is_exit = 0, is_bad_exit = 0; int naming_conflict = 0; int n_listing = 0; diff --cc src/or/dirvote.h index 06bfe67,a6c847e..efd233e --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@@ -55,7 -55,7 +55,7 @@@ #define MIN_SUPPORTED_CONSENSUS_METHOD 13 /** The highest consensus method that we currently support. */ --#define MAX_SUPPORTED_CONSENSUS_METHOD 24 ++#define MAX_SUPPORTED_CONSENSUS_METHOD 25 /** Lowest consensus method where microdesc consensuses omit any entry * with no microdesc. */ @@@ -99,10 -99,14 +99,18 @@@ * value(s). */ #define MIN_METHOD_FOR_SHARED_RANDOM 23 +/** Lowest consensus method where authorities drop all nodes that don't get + * the Valid flag. */ +#define MIN_METHOD_FOR_EXCLUDING_INVALID_NODES 24 + + /** Lowest consensus method where authorities vote on required/recommended + * protocols. */ -#define MIN_METHOD_FOR_RECOMMENDED_PROTOCOLS 24 ++#define MIN_METHOD_FOR_RECOMMENDED_PROTOCOLS 25 + + /** Lowest consensus method where authorities add protocols to routerstatus + * entries. */ -#define MIN_METHOD_FOR_RS_PROTOCOLS 24 ++#define MIN_METHOD_FOR_RS_PROTOCOLS 25 + /** Default bandwidth to clip unmeasured bandwidths to using method >= * MIN_METHOD_TO_CLIP_UNMEASURED_BW. (This is not a consensus method; do not * get confused with the above macros.) */