commit - cdfd248aa718819d40d0bf972b7efbb2eabd31c9
commit + 0c64c2f8032e7c3de8b5b3ca5c5bd9047b89b17c
blob - d5fda8da9e59b01cc49feab0b96c7ebec5256b68
blob + 44293b62e594c517072cd3268cb34949d7393bd0
--- gotwebd/gotwebd.h
+++ gotwebd/gotwebd.h
TAILQ_ENTRY(address) entry;
struct sockaddr_storage ss;
socklen_t slen;
+ int ai_family;
+ int ai_socktype;
+ int ai_protocol;
in_port_t port;
char ifname[IFNAMSIZ];
};
blob - 4b2db2c1ab45af5408ec20a9ce4e350fa0877b05
blob + b02dbb86b14c946386f468402580e3119a1f1e61
--- gotwebd/parse.y
+++ gotwebd/parse.y
return (-1);
}
}
- h->ss.ss_family = res->ai_family;
+ h->ai_family = res->ai_family;
+ h->ai_socktype = res->ai_socktype;
+ h->ai_protocol = res->ai_protocol;
memcpy(&h->ss, res->ai_addr, res->ai_addrlen);
h->slen = res->ai_addrlen;
const char *addrstr;
TAILQ_FOREACH(a, al, entry) {
- if (a->slen != h->slen ||
+ if (a->ai_family != h->ai_family ||
+ a->ai_socktype != h->ai_socktype ||
+ a->ai_protocol != h->ai_protocol ||
+ a->slen != h->slen ||
memcmp(&a->ss, &h->ss, a->slen) != 0)
continue;
blob - dedacef4dfcf53fb027cced30494bbc5781d81c3
blob + 16a74076b94ffabf45821936ff713dacb0e1dff0
--- gotwebd/sockets.c
+++ gotwebd/sockets.c
static int sockets_dispatch_gotwebd(int, struct privsep_proc *,
struct imsg *);
static int sockets_unix_socket_listen(struct privsep *, struct socket *);
-static int sockets_create_socket(struct address *, in_port_t);
+static int sockets_create_socket(struct address *);
static int sockets_accept_reserve(int, struct sockaddr *, socklen_t *,
int, volatile int *);
memcpy(&acp->ss, &a->ss, sizeof(acp->ss));
acp->slen = a->slen;
+ acp->ai_family = a->ai_family;
+ acp->ai_socktype = a->ai_socktype;
+ acp->ai_protocol = a->ai_protocol;
acp->port = a->port;
if (*a->ifname != '\0') {
if (strlcpy(acp->ifname, a->ifname,
log_debug("%s: initializing %s FCGI socket on port %d for %s",
__func__, sock->conf.af_type == AF_INET ? "inet" : "inet6",
sock->conf.fcgi_socket_port, sock->conf.name);
- sock->fd = sockets_create_socket(&sock->conf.addr,
- sock->conf.fcgi_socket_port);
+ sock->fd = sockets_create_socket(&sock->conf.addr);
if (sock->fd == -1) {
log_warnx("%s: create FCGI socket failed", __func__);
return -1;
}
static int
-sockets_create_socket(struct address *a, in_port_t port)
+sockets_create_socket(struct address *a)
{
- struct addrinfo hints;
int fd = -1, o_val = 1, flags;
- memset(&hints, 0, sizeof(hints));
- hints.ai_family = AF_UNSPEC;
- hints.ai_socktype = SOCK_STREAM;
- hints.ai_flags |= AI_PASSIVE;
-
- fd = socket(a->ss.ss_family, hints.ai_socktype, 0);
+ fd = socket(a->ai_family, a->ai_socktype, a->ai_protocol);
if (fd == -1)
return -1;
if (bind(fd, (struct sockaddr *)&a->ss, a->slen) == -1) {
close(fd);
- log_info("%s: can't bind to port %d", __func__,
- ntohs(port));
+ log_info("%s: can't bind to port %d", __func__, a->port);
return -1;
}