From 267c0e5aa14deeb2ca0d7997b4ef5a5c2bbf5fd4 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 23 Nov 2012 11:36:44 -0500
Subject: [PATCH] Make sure that the error in ADDRMAP events is well-formed
"error=Unable to launch resolve request" is not a nice thing to tell
the controller. Bugfix on 0.2.0.19-alpha (c11c48fc).
---
changes/addrmap_error | 5 +++++
src/or/control.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
create mode 100644 changes/addrmap_error
diff --git a/changes/addrmap_error b/changes/addrmap_error
new file mode 100644
index 0000000000..17d9b54232
--- /dev/null
+++ b/changes/addrmap_error
@@ -0,0 +1,5 @@
+ o Minor bugfixes (controller):
+ - The ADDRMAP command can no longer generate an ill-formed error
+ code on a failed MAPADDRESS. It now says "internal" rather than
+ an English sentence fragment with spaces in the middle. Bugfix on
+ Tor 0.2.0.19-alpha.
diff --git a/src/or/control.c b/src/or/control.c
index c6a66ae5f5..0b7f04adac 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -2943,7 +2943,7 @@ handle_control_resolve(control_connection_t *conn, uint32_t len,
send_control_done(conn);
SMARTLIST_FOREACH(failed, const char *, arg, {
control_event_address_mapped(arg, arg, time(NULL),
- "Unable to launch resolve request");
+ "internal");
});
SMARTLIST_FOREACH(args, char *, cp, tor_free(cp));
--
GitLab