[or-cvs] r12901: tiny tweaks on r12900 (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2007-12-21 04:33:11 -0500 (Fri, 21 Dec 2007)
New Revision: 12901

Modified:
   tor/trunk/src/or/rendservice.c
   tor/trunk/src/or/routerparse.c
   tor/trunk/src/or/test.c
Log:
tiny tweaks on r12900


Modified: tor/trunk/src/or/rendservice.c
===================================================================
--- tor/trunk/src/or/rendservice.c	2007-12-21 09:28:22 UTC (rev 12900)
+++ tor/trunk/src/or/rendservice.c	2007-12-21 09:33:11 UTC (rev 12901)
@@ -347,9 +347,9 @@
   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);

Modified: tor/trunk/src/or/routerparse.c
===================================================================
--- tor/trunk/src/or/routerparse.c	2007-12-21 09:28:22 UTC (rev 12900)
+++ tor/trunk/src/or/routerparse.c	2007-12-21 09:33:11 UTC (rev 12901)
@@ -3414,7 +3414,7 @@
     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 ")) {

Modified: tor/trunk/src/or/test.c
===================================================================
--- tor/trunk/src/or/test.c	2007-12-21 09:28:22 UTC (rev 12900)
+++ tor/trunk/src/or/test.c	2007-12-21 09:33:11 UTC (rev 12901)
@@ -3374,6 +3374,7 @@
     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