[tor-commits] [tor/maint-0.2.4] Fix bug 8846: better log message on IP version confusion

[nickm at torproject.org]

commit bc56918e5abb48f67f31012838c689e9572eec69
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 17 14:50:45 2013 -0400

    Fix bug 8846: better log message on IP version confusion
---
 changes/bug8846          |    4 ++++
 src/or/connection_edge.c |    5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changes/bug8846 b/changes/bug8846
new file mode 100644
index 0000000..377cc37
--- /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 926fcab..4d317d0 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;