{
vavar(int, fd);
char *buf;
- int ret;
+ int i, ret;
while(1) {
if(block(fd, EV_READ, 0) == 0)
flog(LOG_WARNING, "received error on rootplex read channel: %s", strerror(errno));
exit(1);
} else if(ret == 0) {
- exit(0);
+ free(buf);
+ break;
}
/* Maybe I'd like to implement some protocol in this direction
* some day... */
}
close(plex);
plex = -1;
+ for(i = 0; i < listeners.d; i++) {
+ if(listeners.b[i] == muth)
+ bufdel(listeners, i);
+ }
+ flog(LOG_INFO, "root handler exited, so shutting down listening...");
+ while(listeners.d > 0)
+ resume(listeners.b[0], 0);
}
static void initroot(void *uu)
break;
case 1:
if(listeners.d > 0) {
- for(i = 0; i < listeners.d; i++)
- resume(listeners.b[i], 0);
- listeners.d = 0;
+ while(listeners.d > 0)
+ resume(listeners.b[0], 0);
flog(LOG_INFO, "no longer listening");
} else {
d = 1;
static void listenloop(struct muth *muth, va_list args)
{
vavar(struct tcpport *, tcp);
- int ns;
+ int i, ns;
struct sockaddr_storage name;
socklen_t namelen;
out:
close(tcp->fd);
free(tcp);
+ for(i = 0; i < listeners.d; i++) {
+ if(listeners.b[i] == muth)
+ bufdel(listeners, i);
+ }
}
void handleplain(int argc, char **argp, char **argv)
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;
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)