diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-08-15 21:32:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-08-15 21:32:06 -0400 |
| commit | 6a77bde8d887bb9dd46c5c75e8bffb2f402feb39 (patch) | |
| tree | 36c0cb2cc5dc22c2d65799d6adef2e2cbd861b59 | |
| parent | 9bcea4a8ef33bc3f1b66682a0eea463b891cd7ba (diff) | |
| download | tor-6a77bde8d887bb9dd46c5c75e8bffb2f402feb39.tar.gz tor-6a77bde8d887bb9dd46c5c75e8bffb2f402feb39.zip | |
Make Sebastian's misc-reasons branch compile; frob the changes file
| -rw-r--r-- | changes/misc-reason | 8 | ||||
| -rw-r--r-- | src/or/reasons.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/changes/misc-reason b/changes/misc-reason index cd21718533..9d173fd3c1 100644 --- a/changes/misc-reason +++ b/changes/misc-reason @@ -1,4 +1,6 @@ o Minor bugfixes: - - Exit nodes didn't recognize EHOSTUNREACH as a stream ending reason - and sent back END_STREAM_REASON_NOROUTE. Also update the spec to - reflect this new reason. Bugfix on 0.1.0.1-rc; fixes bug 1793. + - Exit nodes didn't recognize EHOSTUNREACH as a plausible error + code, and sent back END_STREAM_REASON_MISC. They now send a a + new stream ending reason: END_STREAM_REASON_NOROUTE. Also update + the spec to reflect this new reason. Bugfix on 0.1.0.1-rc; fixes + bug 1793. diff --git a/src/or/reasons.c b/src/or/reasons.c index 8d71f3b39e..8bce3625d8 100644 --- a/src/or/reasons.c +++ b/src/or/reasons.c @@ -28,7 +28,7 @@ stream_end_reason_to_control_string(int reason) case END_STREAM_REASON_DESTROY: return "DESTROY"; case END_STREAM_REASON_DONE: return "DONE"; case END_STREAM_REASON_TIMEOUT: return "TIMEOUT"; - case END_STREAM_REASON_NOROUTE: "return "NOROUTE"; + case END_STREAM_REASON_NOROUTE: return "NOROUTE"; case END_STREAM_REASON_HIBERNATING: return "HIBERNATING"; case END_STREAM_REASON_INTERNAL: return "INTERNAL"; case END_STREAM_REASON_RESOURCELIMIT: return "RESOURCELIMIT"; |