[or-cvs] in circuit_list_path(), don"t redundantly print the intende...

arma at seul.org arma at seul.org
Wed Jul 20 20:33:15 UTC 2005


Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	circuitbuild.c 
Log Message:
in circuit_list_path(), don't redundantly print the intended exit
nickname when the circuit is open.


Index: circuitbuild.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- circuitbuild.c	18 Jul 2005 23:18:00 -0000	1.123
+++ circuitbuild.c	20 Jul 2005 20:33:13 -0000	1.124
@@ -84,11 +84,13 @@
 
   if (verbose) {
     const char *nickname = build_state_get_exit_nickname(circ->build_state);
-    tor_snprintf(buf, sizeof(buf)-1, "%s%s circ (length %d, exit %s):",
+    tor_snprintf(buf, sizeof(buf)-1, "%s%s circ (length %d%s%s):",
                  circ->build_state->is_internal ? "internal" : "exit",
                  circ->build_state->need_uptime ? " (high-uptime)" : "",
                  circ->build_state->desired_path_len,
-                 nickname?nickname:"*unnamed*");
+                 circ->state == CIRCUIT_STATE_OPEN ? "" : ", exit ",
+                 circ->state == CIRCUIT_STATE_OPEN ? "" :
+                   (nickname?nickname:"*unnamed*"));
     smartlist_add(elements, tor_strdup(buf));
   }
 



More information about the tor-commits mailing list