network-status-version must come first in a vote/consensus

Spec conformance issue: The code didn't force the network-status-version
token to be the first token in a v3 vote or consensus.

Problem discovered by Parakeep.

diff --git a/ChangeLog b/ChangeLog
index 2e75fc24b625e340958bed5a3bd78f6b18111493..be7b30b18247da44cf1ebd02be0a4aa92c84070c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,6 +42,9 @@ Changes in version 0.2.2.9-alpha - 2010-02-22
       control-spec.txt said they were.
     - Refactor resolve_my_address() to not use gethostbyname() anymore.
       Fixes bug 1244; bugfix on 0.0.2pre25. Reported by Mike Mestnik.
+    - Fix a spec conformance issue: the network-status-version token
+      must be the first token in a v3 consensus or vote. Discovered by
+      parakeep. Bugfix on 0.2.0.3-alpha.
 
   o Code simplifications and refactoring:
     - Generate our manpage and HTML documentation using Asciidoc. This

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 13dc10c0ea44f6e9f14c12a68d554d8d9a1341fa..f4af7cd5e23e77a8cc6868f681f4879bf088a702 100644 (file)
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -430,7 +430,7 @@ static token_rule_t client_keys_token_table[] = {
 
 /** List of tokens allowed in V3 networkstatus votes. */
 static token_rule_t networkstatus_token_table[] = {
-  T1("network-status-version", K_NETWORK_STATUS_VERSION,
+  T1_START("network-status-version", K_NETWORK_STATUS_VERSION,
                                                    GE(1),       NO_OBJ ),
   T1("vote-status",            K_VOTE_STATUS,      GE(1),       NO_OBJ ),
   T1("published",              K_PUBLISHED,        CONCAT_ARGS, NO_OBJ ),
@@ -458,7 +458,7 @@ static token_rule_t networkstatus_token_table[] = {
 
 /** List of tokens allowed in V3 networkstatus consensuses. */
 static token_rule_t networkstatus_consensus_token_table[] = {
-  T1("network-status-version", K_NETWORK_STATUS_VERSION,
+  T1_START("network-status-version", K_NETWORK_STATUS_VERSION,
                                                    GE(1),       NO_OBJ ),
   T1("vote-status",            K_VOTE_STATUS,      GE(1),       NO_OBJ ),
   T1("valid-after",            K_VALID_AFTER,      CONCAT_ARGS, NO_OBJ ),