Changeset 118

Timestamp:

10.12.2005 19:05:36 (3 years ago)

Author:

tibob

Message:

• Added bps output (Closes #5)
• Fixed a bug in [117] (xfree(stringTime) to early)

Location:

trunk/source

Files:

• config.h.in (modified) (1 diff)
• config.l (modified) (1 diff)
• config.y (modified) (5 diffs)
• data.c (modified) (9 diffs)
• data.h (modified) (1 diff)
• filter.c (modified) (1 diff)
• filter.h (modified) (2 diffs)
• init.c (modified) (1 diff)
• ipfm.c (modified) (1 diff)
• pcap.c (modified) (1 diff)

trunk/source/config.h.in

@@ -20 +20 @@
 #define DEFAULT_OPTIONS_TIMEZONE      local
 #define DEFAULT_OPTIONS_TIMESTAMP     right_dump
+#define DEFAULT_OPTIONS_DIVIDE        1
+#define DEFAULT_OPTIONS_BPS           0
 
 /* But leave these defines untouched */

trunk/source/config.l

@@ -88 +88 @@
 [Rr]ight                         return RIGHT;
 [Ll]eft                          return LEFT;
+[Oo]utput                        return OUTPUT;
+bps                              return BPS;
+[Bb]yte[s]                       return BYTES;
+[Dd]ivide                        return DIVIDE;
+by                               return BY;
 
 [Pp][Rr][Oo][Mm][Ii][Ss][Cc]         { yylval.longval = 1; return PROMISC; }

trunk/source/config.y

@@ -108 +108 @@
 %token RIGHT
 %token LEFT
+%token DIVIDE BY OUTPUT BYTES BPS
 
 %token<SortFunc>  SORTFUNC
@@ -126 +127 @@
 %type<longval>   Not
 %type<stringval> Device
+%type<longval>   Divide
 
 %start Input
@@ -255 +257 @@
           pNewLog->ReverseLookup = DEFAULT_OPTIONS_REVERSELOOKUP;
           pNewLog->Append = DEFAULT_OPTIONS_APPEND;
-  
+          pNewLog->Divide = DEFAULT_OPTIONS_DIVIDE;
+          pNewLog->bps = DEFAULT_OPTIONS_BPS;
+
           checkdump = 2;
           pAllLogs = pNewLog;
@@ -266 +270 @@
         }
       | TimeStamp EOL
+      | Output EOL
       | error EOL {
           parseerror("Skipping invalid line", line);
@@ -411 +416 @@
       ;
 
+Output:
+        OUTPUT BPS Divide {
+          pAllLogs->Divide = $3;
+          pAllLogs->bps = 1;
+        }
+      | OUTPUT BYTES Divide {
+          pAllLogs->Divide = $3;
+          pAllLogs->bps = 0;
+        }
+      ;
+
+Divide:
+        /* nothing */ {
+          $$ = 1;
+        }
+      | DIVIDE BY NUMBER {
+          $$ = $3;
+        }
 %%
 

trunk/source/data.c

@@ -139 +139 @@
     char *stringTime, *DumpTime, *ClearTime=NULL, *PrevClear=NULL, *PrevDump, *stringAction;
     char *timezonestring;
-
+    time_t now;
+    int DivideFactor=1, MultiplyFactor=1;
+
+    now = time(NULL);
     if (tz == local) {
       timezonestring = "local time";
@@ -179 +182 @@
     }
 
-    stringTime = timefile("%Y/%m/%d %H:%M:%S", time(NULL));
+    stringTime = timefile("%Y/%m/%d %H:%M:%S", now);
 
     DumpTime = timefile("%Y/%m/%d %H:%M:%S", pLog->NextDump);
@@ -191 +194 @@
     fprintf(logfile, "# ipfm %s %s at %s (%s)\n",
             VERSION, stringAction, stringTime, timezonestring);
-    fprintf(logfile, "# Listening on %s\n", device);
+    fprintf(logfile, "# Listening on %s, dumping in %s divided by %i\n",
+            device, pLog->bps?"bps":"bytes", pLog->Divide);
     fprintf(logfile, "# Dump period :  %s -- %s\n",
             PrevDump, DumpTime);
@@ -203 +207 @@
       xfree(PrevClear);
     }
-
     xfree(DumpTime);
     xfree(PrevDump);
@@ -209 +212 @@
 
     fprintf(logfile, "# %-33s%15s%15s%15s\n",
-            "Host",
-            "In (bytes)",
-            "Out (bytes)",
-            "Total (bytes)");
-    
+            "Host", "In", "Out",  "Total");
+
+    DivideFactor *= pLog->Divide;
+    if (1 == pLog->bps) {
+      MultiplyFactor *= 8;
+      if (now < pLog->NextDump) {
+        DivideFactor *= ( now - pLog->PrevClear);
+      } else {
+        DivideFactor *= (pLog->NextDump - pLog->PrevClear);
+      }
+    }
+
     while (NULL != pLog->Data) {
-      DataFormat(pLog, pLog->Data, DataToFile, MAX_DATA_SIZE);
+      DataFormat(pLog, pLog->Data, DataToFile, MAX_DATA_SIZE,
+                 DivideFactor, MultiplyFactor);
       fprintf(logfile, "%s", DataToFile);
       /* Do not forget to free tables */
@@ -228 +239 @@
     pLog->DataSize = 0;
 
+    stringTime = timefile("%Y/%m/%d %H:%M:%S", time(NULL));
     fprintf(logfile, "# end of dump %s\n", stringTime);
+    xfree(stringTime);
+
     if (1 == pLog->Append) {
       fprintf(logfile, "\n");
@@ -333 +347 @@
 
 void DataFormat(struct AllLogsType *pLog, struct ipfm_data *pData,
-                char *pFormatedData, int BufLen) {
+                char *pFormatedData, int BufLen,
+                int DivideFactor, int MultiplyFactor) {
   struct in_addr addr;
   int NotLookedUp = 0;
@@ -345 +360 @@
     if ((NULL != he) && (strlen(he->h_name) <= 34) &&
         (strlen(he->h_name) > 0)) {
+      /* LONGINTFORMAT should be changed to something that prints decimals... */
       snprintf(pFormatedData, BufLen, "%-35s%15" LONGINTFORMAT "%15" LONGINTFORMAT "%15" LONGINTFORMAT "\n",
                he->h_name,
-               pData->in, 
-               pData->out, 
-               pData->in + pData->out);
+               pData->in * MultiplyFactor / DivideFactor,
+               pData->out * MultiplyFactor / DivideFactor,
+               (pData->in + pData->out) * MultiplyFactor / DivideFactor);
     } else {
       NotLookedUp = 1;
@@ -357 +373 @@
     char *res;
     res = inet_ntoa(addr);
-      snprintf(pFormatedData, BufLen, "%-35s%15" LONGINTFORMAT "%15" LONGINTFORMAT "%15" LONGINTFORMAT "\n",
-             res,
-             pData->in, 
-             pData->out, 
-             pData->in + pData->out);
-  }
-}
+    snprintf(pFormatedData, BufLen, "%-35s%15" LONGINTFORMAT "%15" LONGINTFORMAT "%15" LONGINTFORMAT "\n",
+             res,
+             pData->in * MultiplyFactor / DivideFactor,
+             pData->out * MultiplyFactor / DivideFactor,
+             (pData->in + pData->out) * MultiplyFactor / DivideFactor);
+  }
+}

trunk/source/data.h

@@ -49 +49 @@
 int DataCompareTotal(const void *ptr1, const void *ptr2);
 void DataFormat(struct AllLogsType *pLog, struct ipfm_data *pData,
-                char *pFormatedData, int BufLen);
+                char *pFormatedData, int BufLen,
+                int DivideFactor, int MultiplyFactor);
 
 #endif

trunk/source/filter.c

@@ -1 +1 @@
 /*
  *  filter.c - Filtering mechanism
- *  
+ *
  *  (c) 1999-2001 Robert Cheramy <tibob@via.ecp.fr>
  *  (c) 1999      Andres Krapf <dae@via.ecp.fr>

trunk/source/filter.h

@@ -70 +70 @@
   int ReverseLookup;
   int Append;
-  
+
   /* right or left Timestamp selector */
   enum enumTimeStampType TimeStampType;
@@ -88 +88 @@
   unsigned long int ClearInterval;
 
+  /* Output format */
+  /* divide bytes by this number */
+  int Divide;
+  /* 1: produce bps */
+  int bps;
+
   struct AllLogsType *Next;
 };

trunk/source/init.c

@@ -198 +198 @@
   pNewLog->ReverseLookup = DEFAULT_OPTIONS_REVERSELOOKUP;
   pNewLog->Append = DEFAULT_OPTIONS_APPEND;
+  pNewLog->Divide = DEFAULT_OPTIONS_DIVIDE;
+  pNewLog->bps = DEFAULT_OPTIONS_BPS;
 
   pAllLogs = pNewLog;

trunk/source/ipfm.c

@@ -122 +122 @@
     /* Well that's an approximation. I should perhaps use an alarm() */
     for (pTempLog = pAllLogs; NULL != pTempLog; pTempLog = pTempLog->Next) {
-      DEBUG_MSG("time %d nextdump %d delta %d\n", time(NULL), pTempLog->NextDump, pTempLog->NextDump - time(NULL));
+/* DEBUG_MSG("time %d nextdump %d delta %d\n", time(NULL), pTempLog->NextDump, pTempLog->NextDump - time(NULL));*/
       if (time(NULL) > pTempLog->NextDump) {
         data_dump(pTempLog);

trunk/source/pcap.c

@@ -256 +256 @@
   for (;;) {
     pcap_result = pcap_next_ex(pcap_global_descriptor, &header, (const u_char **) &packet);
-    DEBUG_MSG("pcap_next_ex returned %i\n", pcap_result);
+    /*    DEBUG_MSG("pcap_next_ex returned %i\n", pcap_result); */
     switch (pcap_result) {
       case 1:
         /* A packet was received, nothing to do! */
-        DEBUG_MSG("packet time/length/size %i %i %i\n", header->ts, header->caplen, header->len);
+        /* DEBUG_MSG("packet time/length/size %i %i %i\n", header->ts, header->caplen, header->len); */
         break;
       case 0: