X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/2f5b811429a2690c2ce44d09cc571c3230420c1b..c826a9e4b3a9bf20c55ffc723fa5337147e7a557:/util.c

diff --git a/util.c b/util.c
index 3dc9f05..e2941c8 100644
--- a/util.c
+++ b/util.c
@@ -1,6 +1,6 @@
 /* Misc util functions */
 
-char const *cvs_id_util = "$Id: util.c,v 1.7 2004-11-29 02:17:18 bodea Exp $";
+char const *cvs_id_util = "$Id: util.c,v 1.12 2005-06-28 14:48:28 bodea Exp $";
 
 #include <unistd.h>
 #include <errno.h>
@@ -18,7 +18,7 @@ char const *cvs_id_util = "$Id: util.c,v 1.7 2004-11-29 02:17:18 bodea Exp $";
 
 // format ipv4 addr as a dotted-quad; n chooses one of 4 static buffers
 // to use
-char *fmtaddr(ipt addr, int n)
+char *fmtaddr(in_addr_t addr, int n)
 {
 	static char addrs[4][16];
 	struct in_addr in;
@@ -39,7 +39,8 @@ void *shared_malloc(unsigned int size)
 	return p;
 }
 
-extern int udpfd, controlfd, tunfd, snoopfd, ifrfd, cluster_sockfd;
+extern int forked;
+extern int cluster_sockfd, tunfd, udpfd, controlfd, daefd, snoopfd, ifrfd, ifr6fd, rand_fd;
 extern int *radfds;
 
 pid_t fork_and_close()
@@ -50,6 +51,7 @@ pid_t fork_and_close()
 	if (pid)
 		return pid;
 
+	forked++;
 	if (config->scheduler_fifo)
 	{
 		struct sched_param params = {0};
@@ -63,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);
@@ -71,15 +73,19 @@ pid_t fork_and_close()
 	signal(SIGTERM, SIG_DFL);
 
 	// Close sockets
+	if (clifd != -1)          close(clifd);
+	if (cluster_sockfd != -1) close(cluster_sockfd);
 	if (tunfd != -1)          close(tunfd);
 	if (udpfd != -1)          close(udpfd);
 	if (controlfd != -1)      close(controlfd);
+	if (daefd != -1)          close(daefd);
 	if (snoopfd != -1)        close(snoopfd);
 	if (ifrfd != -1)          close(ifrfd);
-	if (cluster_sockfd != -1) close(cluster_sockfd);
-	if (clifd != -1)          close(clifd);
+	if (ifr6fd != -1)         close(ifr6fd);
+	if (rand_fd != -1)        close(rand_fd);
+	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++)