diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-07 10:06:50 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-07 10:06:50 -0500 |
| commit | cb54cd6745eaf15716aa357fc253f43f26c051a6 (patch) | |
| tree | 8637fbe20d722885eb295aee4f5f0ac86683854f /src/or/rendcommon.c | |
| parent | 49dca8b1beae9c2dade2c3193fa7f77f5c15d869 (diff) | |
| parent | 7984fc153112baa5c370215f2205025a7648d7b4 (diff) | |
| download | tor-cb54cd6745eaf15716aa357fc253f43f26c051a6.tar.gz tor-cb54cd6745eaf15716aa357fc253f43f26c051a6.zip | |
Merge branch 'bug9286_v3_squashed'
Diffstat (limited to 'src/or/rendcommon.c')
| -rw-r--r-- | src/or/rendcommon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index e54ca40a25..0f75118be2 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -411,7 +411,7 @@ rend_desc_v2_is_parsable(rend_encoded_v2_service_descriptor_t *desc) &test_intro_content, &test_intro_size, &test_encoded_size, - &test_next, desc->desc_str); + &test_next, desc->desc_str, 1); rend_service_descriptor_free(test_parsed); tor_free(test_intro_content); return (res >= 0); @@ -946,7 +946,7 @@ rend_cache_store_v2_desc_as_dir(const char *desc) } while (rend_parse_v2_service_descriptor(&parsed, desc_id, &intro_content, &intro_size, &encoded_size, - &next_desc, current_desc) >= 0) { + &next_desc, current_desc, 1) >= 0) { number_parsed++; /* We don't care about the introduction points. */ tor_free(intro_content); @@ -1091,7 +1091,7 @@ rend_cache_store_v2_desc_as_client(const char *desc, /* Parse the descriptor. */ if (rend_parse_v2_service_descriptor(&parsed, desc_id, &intro_content, &intro_size, &encoded_size, - &next_desc, desc) < 0) { + &next_desc, desc, 0) < 0) { log_warn(LD_REND, "Could not parse descriptor."); goto err; } |