defer shutdown counters for a minute after normal acct dump

[l2tpns.git] / l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index 0654daf..bfa7545 100644 (file)
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -4,7 +4,7 @@
 // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
 // vim: sw=8 ts=8
 
 // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
 // vim: sw=8 ts=8
 

-char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.65 2004-12-13 02:27:31 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.68 2004-12-13 05:27:19 bodea Exp $";

 
 #include <arpa/inet.h>
 #include <assert.h>
 
 #include <arpa/inet.h>
 #include <assert.h>


@@ -2206,12 +2206,13 @@ static int regular_cleanups(void)
                {
                        // Dump accounting data
                        next_acct = TIME + ACCT_TIME;
                {
                        // Dump accounting data
                        next_acct = TIME + ACCT_TIME;

+                       next_shut_acct = TIME + ACCT_SHUT_TIME;

                        dump_acct_info(1);
                }
                else if (next_shut_acct <= TIME)
                {
                        // Dump accounting data for shutdown sessions
                        dump_acct_info(1);
                }
                else if (next_shut_acct <= TIME)
                {
                        // Dump accounting data for shutdown sessions

-                       next_acct = TIME + ACCT_SHUT_TIME;
+                       next_shut_acct = TIME + ACCT_SHUT_TIME;

                        if (shut_acct_n)
                                dump_acct_info(0);
                }
                        if (shut_acct_n)
                                dump_acct_info(0);
                }


@@ -2431,9 +2432,9 @@ static void mainloop(void)
                                // incoming IP
                                if (FD_ISSET(tunfd, &r))
                                {
                                // incoming IP
                                if (FD_ISSET(tunfd, &r))
                                {

-                                       if ((n = read(tunfd, buf, sizeof(buf))) > 0)
+                                       if ((s = read(tunfd, buf, sizeof(buf))) > 0)

                                        {
                                        {

-                                               processtun(buf, n);
+                                               processtun(buf, s);

                                        }
                                        else
                                        {
                                        }
                                        else
                                        {