nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 13:06:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Style tweaks on code, changes file for 10987

Browse Source
This commit is contained in:
Nick Mathewson 2014-02-21 17:27:35 +00:00
parent 1532cff2ce
commit f3e8271652
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
changes/bug10987
View File

@ -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.

5
src/or/connection_edge.c
View File

@ -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));