sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

only declare rv when it is used in destination_from_socket. Fixes 15151

This commit is contained in:
Nick Mathewson 2015-03-04 12:12:41 +01:00
parent 0f2f8fd68a
commit 2d926d0147
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug15151 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (compilation):
- Fix a compilation warning on FreeBSD. Fixes bug 15151; bugfix on
0.2.6.2-alpha.

2
src/or/connection_edge.c
View File

@ -1598,7 +1598,6 @@ destination_from_socket(entry_connection_t *conn, socks_request_t *req)
struct sockaddr_storage orig_dst;
socklen_t orig_dst_len = sizeof(orig_dst);
tor_addr_t addr;
int rv;
#ifdef TRANS_TRPOXY
if (options->TransProxyType_parsed == TPT_TPROXY) {
@ -1613,6 +1612,7 @@ destination_from_socket(entry_connection_t *conn, socks_request_t *req)
#endif
#ifdef TRANS_NETFILTER
int rv = -1;
switch (ENTRY_TO_CONN(conn)->socket_family) {
#ifdef TRANS_NETFILTER_IPV4
case AF_INET: