aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-03-28 13:42:59 -0400
committerNick Mathewson <nickm@torproject.org>2011-03-28 13:42:59 -0400
commitfc647832783cab352bebba63fe0210d7be395058 (patch)
tree65ef4ec7ac2c1ad366e02549d26b23535f51a9c1
parent9facf8918f959cc9d9c2674afbd0630718460dc3 (diff)
downloadtor-fc647832783cab352bebba63fe0210d7be395058.tar
tor-fc647832783cab352bebba63fe0210d7be395058.tar.gz
Send END_STREAM_REASON_NOROUTE: clients that didn't grok it are now obsolete
-rw-r--r--changes/noroute5
-rw-r--r--src/or/reasons.c8
2 files changed, 6 insertions, 7 deletions
diff --git a/changes/noroute b/changes/noroute
new file mode 100644
index 000000000..644deec45
--- /dev/null
+++ b/changes/noroute
@@ -0,0 +1,5 @@
+ - Minor features
+ - Send END_STREAM_REASON_NOROUTE in response to EHOSTUNREACH errors.
+ Clients before 0.2.1.27 didn't handle NOROUTE correctly, but
+ such clients are already deprecated because of security bugs.
+
diff --git a/src/or/reasons.c b/src/or/reasons.c
index 27c947edf..319e6c055 100644
--- a/src/or/reasons.c
+++ b/src/or/reasons.c
@@ -174,13 +174,7 @@ errno_to_stream_end_reason(int e)
S_CASE(ENETUNREACH):
return END_STREAM_REASON_INTERNAL;
S_CASE(EHOSTUNREACH):
- /* XXXX023
- * The correct behavior is END_STREAM_REASON_NOROUTE, but older
- * clients don't recognize it. So we're going to continue sending
- * "MISC" until 0.2.1.27 or later is "well established".
- */
- /* return END_STREAM_REASON_NOROUTE; */
- return END_STREAM_REASON_MISC;
+ return END_STREAM_REASON_NOROUTE;
S_CASE(ECONNREFUSED):
return END_STREAM_REASON_CONNECTREFUSED;
S_CASE(ECONNRESET):