Changeset 53

Timestamp:

24.12.2001 22:21:27 (7 years ago)

Author:

tibob

Message:

IPFM v0.11.2 from official tarball

Location:

branches/TGZ_SOURCE

Files:

• HISTORY (modified) (1 diff)
• TODO (modified) (2 diffs)
• VERSION (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• doc/ipfm.conf.man (modified) (1 diff)
• doc/ipfm.man (modified) (3 diffs)
• source/config.l (modified) (1 diff)
• source/config.y (modified) (3 diffs)
• source/data.c (modified) (1 diff)
• source/filter.c (modified) (2 diffs)
• source/init.c (modified) (10 diffs)
• source/ipfm.c (modified) (1 diff)
• source/pcap.c (modified) (1 diff)

branches/TGZ_SOURCE/HISTORY

@@ +1 @@
+Version 0.11.2 - 8 December 2000
+--------------------------------
+sam (debian patches) :
+- changed a line in config.y (CLEAR ALWAYs bug)
+- Set umask to 0022 instead of 0027.
+- The ipfm.conf manpage now states that ALWAYS is the default behaviour
+  for CLEAR.
+tibob :
+- corrected SIGHUP behavior (the dates were wrong and the memory wasn't
+  totally freed)
+- configuration file parsing (exit on error in config file, prints the correct
+  line number when an error occurs).
+- The ipfm manpage now documents SIGUSR1 signal
+
 Version 0.11 - 21 October 2000 - Samuel HOCEVAR (sam@via.ecp.fr),
 Robert CHERAMY (tibob@via.ecp.fr)

branches/TGZ_SOURCE/TODO

@@ +1 @@
+* Error messages should go to syslog in daemon mode.
 
 * log by selecting protocol (TCP/UDP) and port
@@ -8 +9 @@
 * be able to configure the output file format.
 
-* Output Bandwidth (bps) instead of bytes in log file.
-
 * Output how much time the log ran in output file (especially in case of a kill -HUP)
-
-* Output total D/L size(bytes) or Bandwidth(bps)
 
 * HTML output
 * CISCO accounting process compatible format : host source total_trafic number_of_packet
 
-
-

branches/TGZ_SOURCE/VERSION

@@ -1 @@
-0.11.1
+0.11.2

branches/TGZ_SOURCE/debian/changelog

@@ -1 @@
-ipfm (0.11) unstable; urgency=low
+ipfm (0.11-3) unstable; urgency=low
 
-  * new features (see HISTORY)
+  * Corrected ipfm SigHUP behaviour
+  * Documented SIGUSR1 signal
+  * Configuration file parsing corrections (exit on error in config file,
+    prints the correct line number when an error occurs).
 
- -- Robert CHERAMY <robert@cheramy.net>  Tue,  7 Nov 2000 01:18:35 +0100
+ -- Robert CHERAMY <robert@cheramy.net>  Fri,  8 Dec 2000 01:11:29 +0100
+
+ipfm (0.11-2) unstable; urgency=low
+
+  * Set umask to 0022 instead of 0027.
+  * Fixed a bug in config.l which made "CLEAR ALWAYS" invalid.
+  * The ipfm.conf manpage now states that ALWAYS is the default behaviour
+   for CLEAR.
+
+ -- Samuel Hocevar <sam@zoy.org>  Sat, 11 Nov 2000 13:24:57 +0100
+
+ipfm (0.11-1) unstable; urgency=low
+
+  * Initial Debian release (Closes: #75675)
+  * New features (see HISTORY)
+
+ -- Samuel Hocevar <sam@zoy.org>  Tue,  7 Nov 2000 01:18:35 +0100
 
 ipfm (0.10.4) stable; urgency=low

branches/TGZ_SOURCE/doc/ipfm.conf.man

@@ -131 +131 @@
  <number> day(s)
 
-Default AFTER time is 0 seconds. Note that both time values MUST be a multiple of the DUMP delay. Also, this line MUST come after the DUMP line.
+Default CLEAR mode is ALWAYS. Default AFTER time is 0 seconds. Note that both time values MUST be a multiple of the DUMP delay. Also, this line MUST come after the DUMP line.
 .TP
 .B Examples

branches/TGZ_SOURCE/doc/ipfm.man

@@ -66 +66 @@
 This causes
 .B ipfm
-to flush its data tables in the log file (see
+to dump (and clear) its data tables in the log file (see
 .BR ipfm.conf (8)
 ), close pcap descriptor, reload configuration file and restart.
@@ -74 +74 @@
 This causes
 .B ipfm
-to flush its data tables in the log file (see
+to dump (and clear) its data tables in the log file (see
 .BR ipfm.conf (8)
 ) and exit.
@@ -88 +88 @@
 This causes
 .B ipfm
-to exit after having flushed its buffers.
+to exit after having dumped and cleared its buffers.
+
+.TP
+.I SigUSR1
+This causes
+.B ipfm
+to dump its data tables in the log file without exiting or clearing them.
 
 .SH SEE ALSO

branches/TGZ_SOURCE/source/config.l

@@ -65 +65 @@
 
 [Aa][Ff][Tt][Ee][Rr]             return AFTER;
-[Aa][Ll][Ww][Aa][Yy][ss]         return ALWAYS;
+[Aa][Ll][Ww][Aa][Yy][Ss]         return ALWAYS;
 [Aa][Pp][Pp][Ee][Nn][Dd]         return APPEND;
 [Bb][Oo][Tt][Hh]                 return BOTH;

branches/TGZ_SOURCE/source/config.y

@@ -52 +52 @@
 int yylex(void);
 int checkdump = 2;
+int yyfailed = 0;
 
 extern int line;
 extern int promisc;
-extern int dump;
-
-extern char *filemask;
+
 extern char *device;
 extern struct OptionsType Options;
@@ -161 +160 @@
           pAllLogs->DumpInterval = $1;
           /* We can be sure that NextDump > time(NULL)
-             _and_ that it's the closest value. I did the maths. */
+             _and_ that it's the closest value. sam did the maths. */
           pAllLogs->NextDump = (((time(NULL) - $2) / $1) + 1) * $1 + $2;
         }
@@ -374 +373 @@
 
 void yyerror(char *s) {
-  printf("yacc error : %s\n",s);
+  yyfailed = 1;
 }
 
 void parseerror(char *s, int line) {
-  printf("Parse error line %d: %s\n", line, s);
+  yyfailed = 1;
+  fprintf(stderr, "Parse error line %d: %s\n", line, s);
 }

branches/TGZ_SOURCE/source/data.c

@@ -197 +197 @@
       pLog->Data->prev = NULL;
     } else {
+      free(pLog->Data);
       pLog->Data = NULL;
     }

branches/TGZ_SOURCE/source/filter.c

@@ -46 +46 @@
 extern FILE * yyin;
 extern struct AllLogsType * pAllLogs;
+extern int yyfailed;
 
 /* is host on subnet address/mask ? */
@@ -111 +112 @@
   }
 
-  line = 1;
+  line = 0;
+  yyfailed = 0;
 
-  yyparse();
+  if (0 != yyparse() || yyfailed != 0) {
+    fprintf(stderr, "[ipfm] Error parsing configuration file. Exiting.\n");
+    fclose(yyin);
+    Exit(1);
+  }
+  
   fclose(yyin);
 }

branches/TGZ_SOURCE/source/init.c

@@ -1 +1 @@
 /*
-  init.c - ipfm initialization functions
+  init.c - ipfm initialisation functions
  
   (c) 1999      Andres Krapf <dae@via.ecp.fr>
@@ -7 +7 @@
   200010xx : sam   : pid file & daemon mode handling
   20001107 : tibob : SIGUSR1 handling
+  20001207 : tibob : modifications to have a correct SIGHUP behaviour.
  */
 
@@ -54 +55 @@
 extern int SigHup;
 extern int SigDump;
+extern int checkdump;
 extern struct AllLogsType * pAllLogs;
 int run_as_daemon = 1;
@@ -128 +130 @@
 void InitOnce()
 {
-/*
-  struct sigaction SigChld;
-  sigset_t SigChldMask;
-
-  sigemptyset(&SigChldMask);
-  SigChld.sa_handler = SIG_DFL;
-  SigChld.sa_mask = SigChldMask;
-  SigChld.sa_flags = SA_NOCLDWAIT;
-*/
   signal(SIGHUP,  SigHupHandler);
   signal(SIGTERM, SigTermHandler);
@@ -154 +147 @@
 
   pNewLog = (struct AllLogsType *) malloc (sizeof(struct AllLogsType));
-  pNewLog->Next = pAllLogs;
+  pNewLog->Next = NULL;
   pNewLog->Filter = NULL;
   pNewLog->Data = NULL;
@@ -170 +163 @@
   pAllLogs = pNewLog;
 
+  checkdump = 2;
+
   configure();
 
@@ -180 +175 @@
   if(!openpcap(device, promisc))
   {
-    printf("[ipfm] Unable to open pcap descriptor on device %s\n", device);
+    fprintf(stderr, "[ipfm] Unable to open pcap descriptor on device %s\n", device);
     Exit(-1);
   }
@@ -194 +189 @@
 {
   struct AllLogsType * pTempLog;
+  struct AllLogsType * pTempLogFree;
   struct s_filter * pTempRule;
-  struct s_data * pTempData;
 
 /* clean the rules (deallocate the chained list) */
   
-  for (pTempLog = pAllLogs; NULL != pTempLog; pTempLog = pTempLog->Next)
+  for (pTempLog = pAllLogs; NULL != pTempLog;)
   {
     while (NULL != pTempLog->Filter)
@@ -211 +206 @@
     }
   
-/* clean the stats (the same) */
-  
-    while (NULL != pTempLog->Data)
-    {
-      pTempData = pTempLog->Data;
-      pTempLog->Data = pTempLog->Data->next;
-      pTempLog->DataSize--;
-      if (pTempData)
-        free(pTempData);
-      else
-        fprintf(stderr, "[init.c] BUG 2!\n");
-    }
-  }
+    /* clean the stats  */
+    data_clear(pTempLog);
+
+    pTempLogFree = pTempLog;
+    pTempLog = pTempLog->Next;
+    free(pTempLog);
+  }
+  pAllLogs = NULL;
 
 /* close the pcap descriptor */
@@ -318 +308 @@
   struct AllLogsType * pNextLog;
 
-  pNextLog = pAllLogs->Next;
   pPrevLog = NULL;
   for (pTempLog = pAllLogs; NULL != pTempLog; pTempLog = pNextLog)

branches/TGZ_SOURCE/source/ipfm.c

@@ -82 +82 @@
     }
     daemon (0, 0);
-    umask (027);
+    umask (022);
 
     /* Write PID file */

branches/TGZ_SOURCE/source/pcap.c

@@ -162 +162 @@
 {
   if (NULL == pcap_global_descriptor) {
-          fprintf(stderr, "[pcap] Can't close non-opened pcap descriptor\n");
+    //    fprintf(stderr, "[pcap] Can't close non-opened pcap descriptor\n");
   } else {
     pcap_close(pcap_global_descriptor);