diff options
author | Roger Dingledine <arma@torproject.org> | 2007-11-29 15:30:32 +0000 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2007-11-29 15:30:32 +0000 |
commit | 8ac5f24c33f73bd4d192e86e5e535e2cb35288e1 (patch) | |
tree | e4399ca1d5824d5bf3ec429ec1f9a267994998f3 /src/or/routerparse.c | |
parent | aaf35cccf7ac60c17dac687127ec82c612232836 (diff) | |
download | tor-8ac5f24c33f73bd4d192e86e5e535e2cb35288e1.tar.gz tor-8ac5f24c33f73bd4d192e86e5e535e2cb35288e1.zip |
easy tweaks on r12607
svn:r12608
Diffstat (limited to 'src/or/routerparse.c')
-rw-r--r-- | src/or/routerparse.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index abd84e160b..ac1c565d71 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3261,10 +3261,11 @@ rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out, /* If it's <2, it shouldn't be under this format. If the number * is greater than 2, we bumped it because we broke backward * compatibility. See how version numbers in our other formats - * work. */ + * work. -NM */ /* That means that adding optional fields to the descriptor wouldn't * require a new version number, but the way of verifying it's origin * would. Okay. -KL */ + /* XXX020 Nick, confirm that you're happy here -RD */ log_warn(LD_REND, "Wrong descriptor version: %d", result->version); goto err; } @@ -3304,7 +3305,7 @@ rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out, smartlist_split_string(versions, tok->args[0], ",", SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); for (i = 0; i < smartlist_len(versions); i++) { - /* XXXX020 validate the numbers here. */ + /* XXXX020 validate the numbers here. -NM */ /* As above, validating these numbers on a hidden service directory * might require an extension to new valid numbers at some time. But * this would require making a distinction of hidden service direcoties @@ -3313,13 +3314,14 @@ rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out, /* As above, increased version numbers are for * non-backward-compatible changes. This code doesn't know how to * parse a v3 descriptor, because a v3 descriptor is by definition not - * compatible with this code. */ + * compatible with this code. -NM */ /* This refers to the permitted versions of introduction cells which might * change independently from the descriptor version. If we validated the * numbers here, a hidden service directory might reject a descriptor that * would be understood by newer clients. Then we would need a "HSDir3" tag * only to be able to use a new introduction cell version. I really think * we should not validate it here. -KL */ + /* XXX020 Nick, confirm that you're happy here -RD */ version = atoi(smartlist_get(versions, i)); result->protocols |= 1 << version; } @@ -3475,8 +3477,9 @@ rend_decrypt_introduction_points(rend_service_descriptor_t *parsed, /* Parse onion port. */ tok = find_first_by_keyword(tokens, R_IPO_ONION_PORT); info->port = (uint16_t) atoi(tok->args[0]); - /* XXXX020 this next check fails with ports like 65537. */ + /* XXXX020 this next check fails with ports like 65537. -NM */ /* No, uint16_t only allows numbers in the interval 0..65535. -KL */ + /* XXX020 Nick, confirm that you're happy here -RD */ if (!info->port) { log_warn(LD_REND, "Introduction point onion port is out of range: %d", info->port); |