diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-12-21 09:33:11 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-12-21 09:33:11 +0000 |
| commit | 3f4080d15d74df52600a352a02dab7ba7a797cee (patch) | |
| tree | 838ac3fdd404d7b73c6368dd2ab8e5e7a97a29f6 | |
| parent | 90fcfade4ef7d290a1da4540187196ce873c71b0 (diff) | |
| download | tor-3f4080d15d74df52600a352a02dab7ba7a797cee.tar.gz tor-3f4080d15d74df52600a352a02dab7ba7a797cee.zip | |
tiny tweaks on r12900
svn:r12901
| -rw-r--r-- | src/or/rendservice.c | 6 | ||||
| -rw-r--r-- | src/or/routerparse.c | 2 | ||||
| -rw-r--r-- | src/or/test.c | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c index cd8af9f19a..e80d5e947e 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -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); diff --git a/src/or/routerparse.c b/src/or/routerparse.c index a7eeeb4408..6ec4e4bcce 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -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 ")) { diff --git a/src/or/test.c b/src/or/test.c index c314a21cd7..d009bfd88b 100644 --- a/src/or/test.c +++ b/src/or/test.c @@ -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 |