summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-05-17 14:50:45 -0400
committerNick Mathewson <nickm@torproject.org>2013-05-17 14:50:45 -0400
commitbc56918e5abb48f67f31012838c689e9572eec69 (patch)
tree0b9b78867a38b294110c08579943b909b9f57b62
parent31a6b4e11fd875addd1ae9f35677a3944cafb0d5 (diff)
downloadtor-bc56918e5abb48f67f31012838c689e9572eec69.tar.gz
tor-bc56918e5abb48f67f31012838c689e9572eec69.zip
Fix bug 8846: better log message on IP version confusion
-rw-r--r--changes/bug88464
-rw-r--r--src/or/connection_edge.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/changes/bug8846 b/changes/bug8846
new file mode 100644
index 0000000000..377cc3708a
--- /dev/null
+++ b/changes/bug8846
@@ -0,0 +1,4 @@
+ o Minor bugfixes:
+ - Give a less useless error message when the user asks for an IPv4
+ address on an IPv6-only port, or vice versa. Fixes bug 8846; bugfix
+ on 0.2.4.7-alpha.
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 926fcab90c..4d317d0bd9 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1769,9 +1769,10 @@ connection_ap_get_begincell_flags(entry_connection_t *ap_conn)
}
if (flags == BEGIN_FLAG_IPV4_NOT_OK) {
- log_warn(LD_BUG, "Hey; I'm about to ask a node for a connection that I "
+ log_warn(LD_EDGE, "I'm about to ask a node for a connection that I "
"am telling it to fulfil with neither IPv4 nor IPv6. That's "
- "probably not going to work.");
+ "not going to work. Did you perhaps ask for an IPv6 address "
+ "on an IPv4Only port, or vice versa?");
}
return flags;