diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-07 12:43:54 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-07 12:43:54 -0500 |
| commit | 98cef0ac1e94fbcf7d1f9f70e077f22624033ecc (patch) | |
| tree | 624391497bc20e75f26116622514242eb6692f8d /src/or/reasons.c | |
| parent | e9803aa71003079cc00a8b3c80324581758a36be (diff) | |
| parent | e854e01d5713108cf28e99ef9bc15ea27cb30759 (diff) | |
| download | tor-98cef0ac1e94fbcf7d1f9f70e077f22624033ecc.tar.gz tor-98cef0ac1e94fbcf7d1f9f70e077f22624033ecc.zip | |
Merge branch 'bug2279' into maint-0.2.2
Diffstat (limited to 'src/or/reasons.c')
| -rw-r--r-- | src/or/reasons.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/reasons.c b/src/or/reasons.c index 1401552223..304ea9fcfa 100644 --- a/src/or/reasons.c +++ b/src/or/reasons.c @@ -40,6 +40,8 @@ stream_end_reason_to_control_string(int reason) case END_STREAM_REASON_NET_UNREACHABLE: return "NET_UNREACHABLE"; case END_STREAM_REASON_SOCKSPROTOCOL: return "SOCKS_PROTOCOL"; + case END_STREAM_REASON_PRIVATE_ADDR: return "PRIVATE_ADDR"; + default: return NULL; } } @@ -125,6 +127,9 @@ stream_end_reason_to_socks5_response(int reason) return SOCKS5_NET_UNREACHABLE; case END_STREAM_REASON_SOCKSPROTOCOL: return SOCKS5_GENERAL_ERROR; + case END_STREAM_REASON_PRIVATE_ADDR: + return SOCKS5_GENERAL_ERROR; + default: log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, "Reason for ending (%d) not recognized; " |