bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Pass address family when binding to outgoing socket"

Browse Source 
This reverts commit 65ef313cc4.
This patch could've been the reason for BB#69.
This commit is contained in:
Mukund Sivaraman 2010-01-21 06:29:15 +05:30
parent 9b9d8c10f8
commit 70885bf029
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/sock.c
View File

@ -39,8 +39,7 @@
* returned if the bind succeeded. Otherwise, -1 is returned
* to indicate an error.
*/
static int
bind_socket (int sockfd, const char *addr, int family)
static int bind_socket (int sockfd, const char *addr)
{
struct addrinfo hints, *res, *ressave;
@ -48,7 +47,7 @@ bind_socket (int sockfd, const char *addr, int family)
assert (addr != NULL && strlen (addr) != 0);
memset (&hints, 0, sizeof (struct addrinfo));
hints.ai_family = family;
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
/* The local port it not important */
@ -106,14 +105,12 @@ int opensock (const char *host, int port, const char *bind_to)
/* Bind to the specified address */
if (bind_to) {
if (bind_socket (sockfd, bind_to,
res->ai_family) < 0) {
if (bind_socket (sockfd, bind_to) < 0) {
close (sockfd);
continue; /* can't bind, so try again */
}
} else if (config.bind_address) {
if (bind_socket (sockfd, config.bind_address,
res->ai_family) < 0) {
if (bind_socket (sockfd, config.bind_address) < 0) {
close (sockfd);
continue; /* can't bind, so try again */
}