bug fix

[l2tpns.git] / util.c

diff --git a/util.c b/util.c
index 4a2d623..2e438fe 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.6 2004/11/16 07:54:32 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>
 
 #include <unistd.h>
 #include <errno.h>


@@ -16,11 +16,16 @@ char const *cvs_id_util = "$Id: util.c,v 1.6 2004/11/16 07:54:32 bodea Exp $";
 #include "bgp.h"
 #endif
 
 #include "bgp.h"
 #endif
 

-char *inet_toa(unsigned long addr)
+// format ipv4 addr as a dotted-quad; n chooses one of 4 static buffers
+// to use
+char *fmtaddr(in_addr_t addr, int n)

 {
 {

+       static char addrs[4][16];

        struct in_addr in;
        struct in_addr in;

-       memcpy(&in, &addr, sizeof(unsigned long));
-       return inet_ntoa(in);
+
+       if (n < 0 || n >= 4) return "";
+       in.s_addr = addr;
+       return strcpy(addrs[n], inet_ntoa(in));

 }
 
 void *shared_malloc(unsigned int size)
 }
 
 void *shared_malloc(unsigned int size)


@@ -34,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 cluster_sockfd, tunfd, udpfd, controlfd, daefd, snoopfd, ifrfd, ifr6fd, rand_fd;

 extern int *radfds;
 
 pid_t fork_and_close()
 extern int *radfds;
 
 pid_t fork_and_close()


@@ -45,20 +51,21 @@ pid_t fork_and_close()
        if (pid)
                return pid;
 
        if (pid)
                return pid;
 

+       forked++;

        if (config->scheduler_fifo)
        {
                struct sched_param params = {0};
                params.sched_priority = 0;
                if (sched_setscheduler(0, SCHED_OTHER, &params))
                {
        if (config->scheduler_fifo)
        {
                struct sched_param params = {0};
                params.sched_priority = 0;
                if (sched_setscheduler(0, SCHED_OTHER, &params))
                {

-                       LOG(0, 0, 0, 0, "Error setting scheduler to OTHER after fork: %s\n", strerror(errno));
-                       LOG(0, 0, 0, 0, "This is probably really really bad.\n");
+                       LOG(0, 0, 0, "Error setting scheduler to OTHER after fork: %s\n", strerror(errno));
+                       LOG(0, 0, 0, "This is probably really really bad.\n");

                }
        }
 
        signal(SIGPIPE, SIG_DFL);
        signal(SIGCHLD, SIG_DFL);
                }
        }
 
        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);
        signal(SIGUSR1, SIG_DFL);
        signal(SIGQUIT, SIG_DFL);
        signal(SIGKILL, SIG_DFL);


@@ -66,15 +73,19 @@ pid_t fork_and_close()
        signal(SIGTERM, SIG_DFL);
 
        // Close sockets
        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 (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 (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++)
                close(radfds[i]);
 #ifdef BGP
        for (i = 0; i < BGP_NUM_PEERS; i++)