summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMukund Sivaraman <muks@banu.com>2010-01-21 06:29:15 +0530
committerMukund Sivaraman <muks@banu.com>2010-01-21 06:29:15 +0530
commit70885bf029a6f857684f99618f867b5c47767ae0 (patch)
treede2b0fba717fc217a41f4dc8c7ad56bf5b037720
parent9b9d8c10f817e8fb81d761f3f4ba915cc79ae776 (diff)
downloadtinyproxy-70885bf029a6f857684f99618f867b5c47767ae0.tar.gz
tinyproxy-70885bf029a6f857684f99618f867b5c47767ae0.zip
Revert "Pass address family when binding to outgoing socket"
This reverts commit 65ef313cc4601b5ad84d1da1800ff38bf8f046a9. This patch could've been the reason for BB#69.
Diffstat (limited to '')
-rw-r--r--src/sock.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/sock.c b/src/sock.c
index f7ddd74..bf32c78 100644
--- a/src/sock.c
+++ b/src/sock.c
@@ -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 */
}