tiny tweaks on r12900

svn:r12901
This commit is contained in:
Roger Dingledine 2007-12-21 09:33:11 +00:00
parent 90fcfade4e
commit 3f4080d15d
3 changed files with 5 additions and 4 deletions

View File

@ -347,9 +347,9 @@ rend_service_update_descriptor(rend_service_t *service)
d->timestamp = time(NULL);
d->version = service->descriptor_version;
d->intro_nodes = smartlist_create();
/* XXXX020 Why should we support the old intro protocol 0? Whoever
* understands descriptor version 2 also understands intro protocol 2. */
d->protocols = 1 << 2; /*< We only support intro protocol 2. */
/* Whoever understands descriptor version 2 also understands intro
* protocol 2. So we only support 2. */
d->protocols = 1 << 2;
for (i = 0; i < smartlist_len(service->intro_nodes); ++i) {
rend_intro_point_t *intro_svc = smartlist_get(service->intro_nodes, i);

View File

@ -3414,7 +3414,7 @@ rend_decrypt_introduction_points(rend_service_descriptor_t *parsed,
intro_points_encrypted_size = unenclen;
}
/* Consider one intro point after the other. */
current_ipo = (const char **)&intro_points_encrypted;
current_ipo = &intro_points_encrypted;
tokens = smartlist_create();
parsed->intro_nodes = smartlist_create();
while (!strcmpstart(*current_ipo, "introduction-point ")) {

View File

@ -3374,6 +3374,7 @@ test_rend_fns_v2(void)
rend_encoded_v2_service_descriptor_free(smartlist_get(descs, i));
smartlist_free(descs);
rend_service_descriptor_free(parsed);
rend_service_descriptor_free(generated);
}
static void