clean up r11496

svn:r11498
This commit is contained in:
Roger Dingledine
2007-09-18 23:34:27 +00:00
parent eb9dc12ce9
commit 82da6c02ba
3 changed files with 73 additions and 71 deletions
+1 -1
View File
@@ -43,7 +43,7 @@ rend_service_descriptor_free(rend_service_descriptor_t *desc)
tor_free(desc);
}
/** Encode a service descriptor for <b>desc</b>, and sign it with
/** Encode a V0 service descriptor for <b>desc</b>, and sign it with
* <b>key</b>. Store the descriptor in *<b>str_out</b>, and set
* *<b>len_out</b> to its length.
*/
+3 -2
View File
@@ -301,7 +301,8 @@ rend_service_update_descriptor(rend_service_t *service)
d->n_intro_points = 0;
d->intro_points = tor_malloc_zero(sizeof(char*)*n);
d->intro_point_extend_info = tor_malloc_zero(sizeof(extend_info_t*)*n);
d->protocols = (1<<2) | (1<<0); /* We support protocol 2 and protocol 0. */
/* We support intro protocol 2 and protocol 0. */
d->protocols = (1<<2) | (1<<0);
for (i=0; i < n; ++i) {
router = router_get_by_nickname(smartlist_get(service->intro_nodes, i),1);
if (!router) {
@@ -541,7 +542,7 @@ rend_service_introduce(origin_circuit_t *circuit, const char *request,
* any */
router = router_get_by_nickname(rp_nickname, 0);
if (!router) {
log_info(LD_REND, "Couldn't find router %s named in rendezvous cell.",
log_info(LD_REND, "Couldn't find router %s named in introduce2 cell.",
escaped_safe_str(rp_nickname));
/* XXXX Add a no-such-router reason? */
reason = END_CIRC_REASON_TORPROTOCOL;