Bulletproof conn_get_outbound_address() a little.

This commit is contained in:
Nick Mathewson 2017-01-27 08:12:14 -05:00
parent 782c52658c
commit 795582169a

View file

@ -1902,10 +1902,18 @@ conn_get_outbound_address(sa_family_t family,
{ {
const tor_addr_t *ext_addr = NULL; const tor_addr_t *ext_addr = NULL;
int fam_index=0; int fam_index;
if (family==AF_INET6) { switch (family) {
fam_index=1; case AF_INET:
fam_index = 0;
break;
case AF_INET6:
fam_index = 1;
break;
default:
return NULL;
} }
// If an exit connection, use the exit address (if present) // If an exit connection, use the exit address (if present)
if (conn_type == CONN_TYPE_EXIT) { if (conn_type == CONN_TYPE_EXIT) {
if (!tor_addr_is_null( if (!tor_addr_is_null(