CSTAT() adds "call_"

[l2tpns.git] / util.c

diff --git a/util.c b/util.c
index 4a2d623..f01749e 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.9 2004/12/20 07:23:53 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,6 +39,7 @@ void *shared_malloc(unsigned int size)
        return p;
 }
 
        return p;
 }
 

+extern int forked;

 extern int udpfd, controlfd, tunfd, snoopfd, ifrfd, cluster_sockfd;
 extern int *radfds;
 
 extern int udpfd, controlfd, tunfd, snoopfd, ifrfd, cluster_sockfd;
 extern int *radfds;
 


@@ -45,14 +51,15 @@ 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");

                }
        }
 
                }
        }