welterde/l2tpns
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Include endpoint address in accounting dump files.

Browse source 
Convert mainloop to use epoll rather than select.
This commit is contained in:
Brendan O'Dea 2005-06-04 15:42:35 +00:00
parent 788fb3cb6d
commit b830a899ca
12 changed files with 549 additions and 267 deletions
Download patch file Download diff file Expand all files Collapse all files

10
util.c
View file

@ -1,6 +1,6 @@
/* Misc util functions */
char const *cvs_id_util = "$Id: util.c,v 1.10 2005-01-25 04:19:07 bodea Exp $";
char const *cvs_id_util = "$Id: util.c,v 1.11 2005-06-04 15:42:36 bodea Exp $";
#include <unistd.h>
#include <errno.h>
@ -40,7 +40,7 @@ void *shared_malloc(unsigned int size)
}
extern int forked;
extern int udpfd, controlfd, tunfd, snoopfd, ifrfd, ifr6fd, 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);
@ -79,10 +79,12 @@ pid_t fork_and_close()
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++)