[or-cvs] r11500: right before publishing our service descriptor, we were rewr (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2007-09-18 20:30:19 -0400 (Tue, 18 Sep 2007)
New Revision: 11500

Modified:
   tor/trunk/src/or/rendservice.c
Log:
right before publishing our service descriptor, we were
rewriting the hexdigest back to an ambiguous nickname.
if this patches it, we should write a changelog and then
backport.


Modified: tor/trunk/src/or/rendservice.c
===================================================================
--- tor/trunk/src/or/rendservice.c	2007-09-18 23:48:39 UTC (rev 11499)
+++ tor/trunk/src/or/rendservice.c	2007-09-19 00:30:19 UTC (rev 11500)
@@ -304,16 +304,17 @@
   /* 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);
+    const char *name = smartlist_get(service->intro_nodes, i);
+    router = router_get_by_nickname(name, 1);
     if (!router) {
       log_info(LD_REND,"Router '%s' not found for intro point %d. Skipping.",
-               safe_str((char*)smartlist_get(service->intro_nodes, i)), i);
+               safe_str(name), i);
       continue;
     }
     circ = find_intro_circuit(router, service->pk_digest);
     if (circ && circ->_base.purpose == CIRCUIT_PURPOSE_S_INTRO) {
       /* We have an entirely established intro circuit. */
-      d->intro_points[d->n_intro_points] = tor_strdup(router->nickname);
+      d->intro_points[d->n_intro_points] = tor_strdup(name);
       d->intro_point_extend_info[d->n_intro_points] =
         extend_info_from_router(router);
       d->n_intro_points++;