projects
/
l2tpns.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[l2tpns.git]
/
util.c
diff --git
a/util.c
b/util.c
index
fccfa58
..
20bcab8
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-1,6
+1,6
@@
/* Misc util functions */
/* 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.
10 2005/01/25 04:19:07
bodea Exp $";
#include <unistd.h>
#include <errno.h>
#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
// format ipv4 addr as a dotted-quad; n chooses one of 4 static buffers
// to use
-char *fmtaddr(i
p
t addr, int n)
+char *fmtaddr(i
n_addr_
t addr, int n)
{
static char addrs[4][16];
struct in_addr in;
{
static char addrs[4][16];
struct in_addr in;
@@
-39,7
+39,8
@@
void *shared_malloc(unsigned int size)
return p;
}
return p;
}
-extern int udpfd, controlfd, tunfd, snoopfd, ifrfd, cluster_sockfd;
+extern int forked;
+extern int udpfd, controlfd, tunfd, snoopfd, ifrfd, ifr6fd, cluster_sockfd;
extern int *radfds;
pid_t fork_and_close()
extern int *radfds;
pid_t fork_and_close()
@@
-50,6
+51,7
@@
pid_t fork_and_close()
if (pid)
return pid;
if (pid)
return pid;
+ forked++;
if (config->scheduler_fifo)
{
struct sched_param params = {0};
if (config->scheduler_fifo)
{
struct sched_param params = {0};
@@
-76,6
+78,7
@@
pid_t fork_and_close()
if (controlfd != -1) close(controlfd);
if (snoopfd != -1) close(snoopfd);
if (ifrfd != -1) close(ifrfd);
if (controlfd != -1) close(controlfd);
if (snoopfd != -1) close(snoopfd);
if (ifrfd != -1) close(ifrfd);
+ if (ifr6fd != -1) close(ifr6fd);
if (cluster_sockfd != -1) close(cluster_sockfd);
if (clifd != -1) close(clifd);
if (cluster_sockfd != -1) close(cluster_sockfd);
if (clifd != -1) close(clifd);