X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/68921aa65a0336c8fb9933c0f19542918285eed6..05fa1ef8275b4b0bde5282eb1ef708629d9d5ee9:/util.c?ds=inline diff --git a/util.c b/util.c index f01749e..79f52a4 100644 --- a/util.c +++ b/util.c @@ -1,6 +1,6 @@ /* Misc util functions */ -char const *cvs_id_util = "$Id: util.c,v 1.9 2004/12/20 07:23:53 bodea Exp $"; +char const *cvs_id_util = "$Id: util.c,v 1.11 2005/06/04 15:42:36 bodea Exp $"; #include #include @@ -40,7 +40,7 @@ void *shared_malloc(unsigned int size) } extern int forked; -extern int udpfd, controlfd, tunfd, snoopfd, ifrfd, cluster_sockfd; +extern int udpfd, controlfd, tunfd, snoopfd, ifrfd, ifr6fd, rand_fd, cluster_sockfd; extern int *radfds; pid_t fork_and_close() @@ -65,7 +65,7 @@ pid_t fork_and_close() signal(SIGPIPE, SIG_DFL); signal(SIGCHLD, SIG_DFL); - signal(SIGHUP, SIG_DFL); + signal(SIGHUP, SIG_DFL); signal(SIGUSR1, SIG_DFL); signal(SIGQUIT, SIG_DFL); signal(SIGKILL, SIG_DFL); @@ -78,10 +78,13 @@ pid_t fork_and_close() if (controlfd != -1) close(controlfd); if (snoopfd != -1) close(snoopfd); if (ifrfd != -1) close(ifrfd); + if (ifr6fd != -1) close(ifr6fd); + if (rand_fd != -1) close(rand_fd); if (cluster_sockfd != -1) close(cluster_sockfd); if (clifd != -1) close(clifd); + if (epollfd != -1) close(epollfd); - for (i = 0; radfds && i < config->num_radfds; i++) + for (i = 0; radfds && i < RADIUS_FDS; i++) close(radfds[i]); #ifdef BGP for (i = 0; i < BGP_NUM_PEERS; i++)