static void listenloop(struct muth *muth, va_list args)
{
vavar(struct sslport *, pd);
- int ns;
+ int i, ns;
struct sockaddr_storage name;
socklen_t namelen;
while(1) {
namelen = sizeof(name);
- block(pd->fd, EV_READ, 0);
+ if(block(pd->fd, EV_READ, 0) == 0)
+ goto out;
ns = accept(pd->fd, (struct sockaddr *)&name, &namelen);
if(ns < 0) {
flog(LOG_ERR, "accept: %s", strerror(errno));
out:
close(pd->fd);
free(pd);
+ for(i = 0; i < listeners.d; i++) {
+ if(listeners.b[i] == muth)
+ bufdel(listeners, i);
+ }
}
static gnutls_dh_params_t dhparams(void)
pd->sport = port;
pd->creds = creds;
pd->ncreds = ncreds.b;
- mustart(listenloop, pd);
- if((fd = listensock6(port)) < 0) {
+ bufadd(listeners, mustart(listenloop, pd));
+ if((fd = listensock4(port)) < 0) {
if(errno != EADDRINUSE) {
- flog(LOG_ERR, "could not listen on IPv6 port (port %i): %s", port, strerror(errno));
+ flog(LOG_ERR, "could not listen on IPv4 port (port %i): %s", port, strerror(errno));
exit(1);
}
} else {
pd->fd = fd;
pd->sport = port;
pd->creds = creds;
- mustart(listenloop, pd);
+ bufadd(listeners, mustart(listenloop, pd));
}
}