finish incorporating ipv6 patches

[l2tpns.git] / util.c

diff --git a/util.c b/util.c
index 572af84..205fe03 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1,6 +1,6 @@
 /* Misc util functions */
 
-char const *cvs_id_util = "$Id: util.c,v 1.4 2004-11-02 04:35:04 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>
@@ -16,11 +16,16 @@ char const *cvs_id_util = "$Id: util.c,v 1.4 2004-11-02 04:35:04 bodea Exp $";
 #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;
-       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)
@@ -34,7 +39,8 @@ void *shared_malloc(unsigned int size)
        return p;
 }
 
-extern int udpfd, 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()
@@ -45,14 +51,15 @@ pid_t fork_and_close()
        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))
                {
-                       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");
                }
        }
 
@@ -66,14 +73,17 @@ pid_t fork_and_close()
        signal(SIGTERM, SIG_DFL);
 
        // Close sockets
-       if (udpfd) close(udpfd); udpfd = 0;
-       if (tunfd) close(tunfd); tunfd = 0;
-       if (snoopfd) close(snoopfd); snoopfd = 0;
-       for (i = 0; i < config->num_radfds; i++)
-               if (radfds[i]) close(radfds[i]);
-       if (ifrfd) close(ifrfd); ifrfd = 0;
-       if (cluster_sockfd) close(cluster_sockfd); cluster_sockfd = 0;
-       if (clifd) close(clifd); clifd = 0;
+       if (tunfd != -1)          close(tunfd);
+       if (udpfd != -1)          close(udpfd);
+       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);
+
+       for (i = 0; radfds && i < config->num_radfds; i++)
+               close(radfds[i]);
 #ifdef BGP
        for (i = 0; i < BGP_NUM_PEERS; i++)
                if (bgp_peers[i].sock != -1)