aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--src/or/control.c6
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4409bdcc0..d7d5ed63b 100644
--- a/ChangeLog
+++ b/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
diff --git a/src/or/control.c b/src/or/control.c
index e839cea62..a9f0c364f 100644
--- a/src/or/control.c
+++ b/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);
}
}