diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-06-05 10:16:28 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-06-05 10:16:28 -0400 |
| commit | c19a2ff6913111d69f2b541194ae188dc354fc54 (patch) | |
| tree | 19e412267e5aabc8a30f771ba2c7557d6087db05 | |
| parent | 20d6f787aaea3252a07e5913e67cf63d60de4d9f (diff) | |
| parent | 2b6e91c2ee4f89c0ee31c83c3a5e5414fd2b3d40 (diff) | |
| download | tor-c19a2ff6913111d69f2b541194ae188dc354fc54.tar.gz tor-c19a2ff6913111d69f2b541194ae188dc354fc54.zip | |
Merge remote-tracking branch 'public/bug4710'
| -rw-r--r-- | changes/bug4710 | 5 | ||||
| -rw-r--r-- | src/or/reasons.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug4710 b/changes/bug4710 new file mode 100644 index 0000000000..7f94b4d20d --- /dev/null +++ b/changes/bug4710 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Exit nodes now correcly report EADDRINUSE and EADDRNOTAVAIL as + resource exhaustion, so that clients can adjust their load to + try other exits. Fix for bug 4710; bugfix on 0.1.0.1-rc, which + started using END_STREAM_REASON_RESOURCELIMIT. diff --git a/src/or/reasons.c b/src/or/reasons.c index 227ae8c6e3..c51d8ee6f5 100644 --- a/src/or/reasons.c +++ b/src/or/reasons.c @@ -184,6 +184,8 @@ errno_to_stream_end_reason(int e) S_CASE(ENOBUFS): case ENOMEM: case ENFILE: + S_CASE(EADDRINUSE): + S_CASE(EADDRNOTAVAIL): E_CASE(EMFILE): return END_STREAM_REASON_RESOURCELIMIT; default: |