[or-cvs] r8674: Add missing ! to code to generate short/verbose nicknames fo (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2006-10-09 14:19:32 -0400 (Mon, 09 Oct 2006)
New Revision: 8674

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/control.c
Log:
 r8983 at totoro:  nickm | 2006-10-09 14:19:18 -0400
 Add missing ! to code to generate short/verbose nicknames for orconn events.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r8983] on 96637b51-b116-0410-a10e-9941ebb49b64

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2006-10-09 17:22:38 UTC (rev 8673)
+++ tor/trunk/ChangeLog	2006-10-09 18:19:32 UTC (rev 8674)
@@ -15,6 +15,9 @@
       uses EVENT_NEW_DESC with verbose nicknames.
     - When stopping an NT service, wait up to 10 sec for it to actually
       stop.  (Patch from Matt Edman; resolves bug 295.)
+    - Fix handling of verbose nicknames with ORCONN controller events:
+      make them show up exactly when requested, rather than exactly when
+      not requested.
 
 
 Changes in version 0.1.2.2-alpha - 2006-10-07

Modified: tor/trunk/src/or/control.c
===================================================================
--- tor/trunk/src/or/control.c	2006-10-09 17:22:38 UTC (rev 8673)
+++ tor/trunk/src/or/control.c	2006-10-09 18:19:32 UTC (rev 8674)
@@ -2975,7 +2975,7 @@
 orconn_target_get_name(int long_names,
                        char *name, size_t len, or_connection_t *conn)
 {
-  if (long_names) {
+  if (! long_names) {
     if (conn->nickname)
       strlcpy(name, conn->nickname, len);
     else
@@ -2990,8 +2990,8 @@
       name[0] = '$';
       base16_encode(name+1, len-1, conn->identity_digest,
                     DIGEST_LEN);
-    } else {
-      tor_snprintf(name, len, "%s:%d",
+    } else { 
+     tor_snprintf(name, len, "%s:%d",
                    conn->_base.address, conn->_base.port);
     }
   }