clear cluster_master on election so that slaves will accept a new master

[l2tpns.git] / util.c

diff --git a/util.c b/util.c
index fccfa58..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.7 2004/11/29 02:17:18 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>


@@ -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(ipt addr, int n)
+char *fmtaddr(in_addr_t addr, int n)

 {
        static char addrs[4][16];
        struct in_addr in;
 {
        static char addrs[4][16];
        struct in_addr in;


@@ -39,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;
 


@@ -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};