Changeset 9027 for src/router/rc/ttraff.c

Timestamp:

02/12/08 22:05:03 (5 years ago)

Author:

eko

Message:

new smaller ttraff

File:

• src/router/rc/ttraff.c (modified) (6 diffs)

src/router/rc/ttraff.c

@@ -1 @@
-/* ttraff.c by Eko: 11.feb.2008
+/* ttraff.c by Eko: 12.feb.2008
   
   used for collecting and storing WAN traffic info to nvram
@@ -15 +15 @@
 #include <syslog.h>
 #include <utils.h>
-#include <wlutils.h>
 
 
-unsigned long get_todays_rcvd (int day, int month, int year)
+
+void 
+write_to_nvram (int day, int month, int year, unsigned long rcvd, unsigned long sent)
 {
-//fprintf (stderr, "entering get_todays_rcvd\n");
-char *next;
-char var[80];
-char tq[32];
-int i = 1;
-unsigned long rcvd = 0;
-
-  sprintf (tq, "traff-%02u-%u", month, year);
-  char *tdata = nvram_safe_get (tq);
-  if (tdata != NULL || strlen(tdata))
-   {
-    foreach (var, tdata, next)
-    {
-     if (i == day)
-            sscanf (var, "%lu:%*lu", &rcvd);
-         i++;
-    }
-   }
-//fprintf (stderr, "leaving get_todays_rcvd: rcvd=%lu\n", rcvd);
-  return rcvd;
-}
-
-unsigned long get_todays_sent (int day, int month, int year)
-{
-//fprintf (stderr, "entering get_todays_sent\n");
-char *next;
-char var[80];
-char tq[32];
-int i = 1;
-unsigned long sent = 0;
-
-  sprintf (tq, "traff-%02u-%u", month, year);
-  char *tdata = nvram_safe_get (tq);
-  if (tdata != NULL || strlen(tdata))
-   {
-    foreach (var, tdata, next)
-    {
-     if (i == day)
-            sscanf (var, "%*lu:%lu", &sent);
-         i++;
-    }
-   }
-//fprintf (stderr, "leaving get_todays_sent: sent=%lu\n", sent);
-  return sent;
-}
-
-int write_to_nvram (int day, int month, int year, unsigned long rcvd, unsigned long sent)
-{
-//fprintf (stderr, "entering write_to_nvram\n");
 char *next;
 char var[80];
 char tq[32];
 char temp[64] = "";
+char sbuff[256] = "";
 char buffer[2048] = "";
-int i;
-int days = daysformonth (month, year);
+int i = 1, d = 1;
+unsigned int days = daysformonth (month, year);
+unsigned long old_rcvd;
+unsigned long old_sent;
+char *tdata;
 
   sprintf (tq, "traff-%02u-%u", month, year);
+  tdata = nvram_safe_get (tq);
+  
+  if (tdata == NULL || strlen (tdata) == 0)
+  {
+   for (d = 0; d < days; d++)
+   {
+    strcat (sbuff, "0:0 ");
+   }
+   nvram_set (tq, sbuff);
+   tdata = nvram_safe_get (tq);
+  }
 
-  for (i = 1; i <= days; i++)
-  {
-   if (i == day)          
-   { 
-        sprintf (temp, "%lu:%lu", rcvd, sent);
-   }
-   else
-   {
-        sprintf (temp, "%lu:%lu", get_todays_rcvd (i, month, year) , get_todays_sent (i, month, year));
-   }
-   strcat (buffer, temp);
-   if (i < days) strcat (buffer, " ");
-  }
-  
-  nvram_set (tq, buffer);
-//fprintf (stderr, "leaving write_to_nvram\n");
-  return 1;
+    foreach (var, tdata, next)
+    {
+     if (i == day)
+     {
+          sscanf (var, "%lu:%lu", &old_rcvd, &old_sent);
+          sprintf (temp, "%lu:%lu ", old_rcvd + rcvd, old_sent + sent);     
+          strcat (buffer, temp);
+     }
+     else
+     {
+          strcat (buffer, var);
+          strcat (buffer, " ");
+      }    
+         i++;
+    }     
+
+    nvram_set (tq, buffer);
+
+  return;
 }
+
 
 int
@@ -174 +144 @@
     out_dev_last = out_dev;
     needbase = 0;
-    sleep (2);
     continue;
    }
@@ -181 +150 @@
    {
          needbase = 1;
-         sleep (2);
          continue;
    }
@@ -192 +160 @@
   
    if (in_diff || out_diff)
-   { 
-    write_to_nvram (day, month, year, get_todays_rcvd (day, month, year) + in_diff, get_todays_sent (day, month, year) + out_diff);
+   {
+    write_to_nvram (day, month, year, in_diff, out_diff);
+    
     in_dev_last = in_dev_last + (in_diff << 20);
     out_dev_last = out_dev_last + (out_diff << 20);    
@@ -212 +181 @@
      commited = 1;
      needcommit = 0;
-     syslog (LOG_DEBUG, "ttraff: data for %d-%d-%d commited to nvram\n", year, month, day);
+     syslog (LOG_DEBUG, "ttraff: data for %d-%d-%d commited to nvram\n", day, month, year);
    }