r8983@totoro: nickm | 2006-10-09 14:19:18 -0400

 Add missing ! to code to generate short/verbose nicknames for orconn events.


svn:r8674

ChangeLog

@@ -15,6 +15,9 @@ Changes in version 0.1.2.3-alpha - 2006-10-??
       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

src/or/control.c

@@ -2975,7 +2975,7 @@ static void
 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 @@ orconn_target_get_name(int long_names,
       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);
     }
   }