commit f3e827165294d34dbd58dbb372525b259f1acb72 Author: Nick Mathewson nickm@torproject.org Date: Fri Feb 21 17:27:35 2014 +0000

Style tweaks on code, changes file for 10987 --- changes/bug10987 | 12 +++++++----- src/or/connection_edge.c | 5 ++--- 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/changes/bug10987 b/changes/bug10987 index 108eea9..cc5dd8f 100644 --- a/changes/bug10987 +++ b/changes/bug10987 @@ -1,5 +1,7 @@ - o Minor bugfixes - - Fix IPv6 support when using the SocksPort with SOCKS5. Fixes bug10987. - Using IPv6 through a SOCKS5 using the SocksPort option will now work - with this fix. This part of the code has never been updated to support - IPv6 thus this does not fix a previously introduced regression. + o Minor bugfixes + + - Fix IPv6 support when using the SocksPort with SOCKS5. Using IPv6 + through a SOCKS5 using the SocksPort option will now work with + this fix. This part of the code has never been updated to support + IPv6 thus this does not fix a previously introduced regression. + Fixes bug 10987; bugfix on 0.2.4.7-alpha. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index bb24134..2832abb 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2088,7 +2088,6 @@ connection_ap_handshake_socks_resolved_addr(entry_connection_t *conn, } }

- /** Send an answer to an AP connection that has requested a DNS lookup via * SOCKS. The type should be one of RESOLVED_TYPE_(IPV4|IPV6|HOSTNAME) or -1 * for unreachable; the answer should be in the format specified in the socks @@ -2280,14 +2279,14 @@ connection_ap_handshake_socks_reply(entry_connection_t *conn, char *reply, buf[1] = (char)status; buf[2] = 0; buf[3] = 1; /* ipv4 addr */ - /* 4 bytes for the header, 2 bytes for the port and 4 for the address. */ + /* 4 bytes for the header, 2 bytes for the port, 4 for the address. */ buf_len = 10; } else { /* AF_INET6. */ buf[0] = 5; /* version 5 */ buf[1] = (char)status; buf[2] = 0; buf[3] = 4; /* ipv6 addr */ - /* 4 bytes for the header, 2 bytes for the port and 16 for the address. */ + /* 4 bytes for the header, 2 bytes for the port, 16 for the address. */ buf_len = 22; } connection_write_to_buf(buf,buf_len,ENTRY_TO_CONN(conn));