diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-04 12:12:41 +0100 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-04 12:12:41 +0100 |
| commit | 2d926d0147af8c632fe389e770c5832009f2ddc0 (patch) | |
| tree | 1d46c517ba8f526605f3b792421d5224527fb204 | |
| parent | 0f2f8fd68a54707bb256b446cff524f0e1ef1658 (diff) | |
| download | tor-2d926d0147af8c632fe389e770c5832009f2ddc0.tar.gz tor-2d926d0147af8c632fe389e770c5832009f2ddc0.zip | |
only declare rv when it is used in destination_from_socket. Fixes 15151
| -rw-r--r-- | changes/bug15151 | 3 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug15151 b/changes/bug15151 new file mode 100644 index 0000000000..b9c3061554 --- /dev/null +++ b/changes/bug15151 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Fix a compilation warning on FreeBSD. Fixes bug 15151; bugfix on + 0.2.6.2-alpha. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 3c817decfb..e6dfc634e9 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -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: |