Changeset 34

Timestamp:

04/25/07 17:05:21 (16 years ago)

Author:

andreu

Message:

bug on bad reading of routers configuration file fixed
bug on wrong sampled value fixed
in tool, we add a supervisor script shell

Location:

trunk

Files:

• README (modified) (5 diffs)
• configure.in (modified) (1 diff)
• src/dataFlowSet.c (modified) (2 diffs)
• src/dataFlowSet.h (modified) (1 diff)
• src/get_conf.c (modified) (1 diff)
• src/template.c (modified) (2 diffs)
• tool/check.sh (modified) (1 diff)

trunk/README

@@ -3 +3 @@
  ----------------------
 
-        tar xvzf renetcol-0.0.2.tar.gz
-        cd renetcol-0.0.2
+        tar xvzf renetcol-0.0.9.tar.gz
+        cd renetcol-0.0.9
         ./configure
+        (./configure --help)
         (before the make command you MUST change some values in renetcol.h, see below)
         make
@@ -25 +26 @@
 
         - create your IPv4 prefix file (or keep the default for test: 
-IPv4_prefix.txt, in this release the file must be present with a good syntax,
-but data are not important)
+IPv4_prefix.txt, in "quick start" with "--enable-ipv4agg=no" you don't 
+need a such file
         - create your router list file *REQUIRED* (exemple in src/routers.txt):
 syntax: <id> <name> <first IPv4 address> <second IPv4 or NULL>
 keep this first line: 0 null 0.0.0.0 null
 
-Note: no comment line in this two files.
+Note: no comment lines in this two files.
 
 
@@ -54 +55 @@
 colnet:/tmp/renetcol_user/src# ./renetcolMsgCtl renetcol
 
+We recommand to use in a crontab the script check.sh who is in tool/ directory.
+
  ----------------------------------
 | Use the client tool (python+GTK) |
@@ -60 +63 @@
     on Linux:
        cd tool
-       python renetcolGUI_0_0_2.py
+       python renetcolGUI_0_0_7.py
     on Win32:
-       copy the file renetcolGUI_0_0_2.py on your system
+       copy the file renetcolGUI_0_0_7.py on your system
        install python, GTK and requirements:
                for python:
                    http://www.python.org/ download section
-                   the last release is the 2.4.1 (python-2.4.1.msi)
                for pyGTK:
                    http://www.pcpm.ucl.ac.be/~gustin/win32_ports/
                    section pygtk on win32
-                   last release is pygtk 2.6 (pygtk-2.6.2-2.win32-py2.4.exe)
                for GTK+:
                    http://gladewin32.sourceforge.net/
-                   last release 2.6.8 (Runtime Environment Installer 2.6.8-rc1)
 
     Collector (renetcolSender) and remote client communication *REQUIRED*:
-        you MUST change few values in the renetcolGUI_0_0_2.py file:
+        you MUST change few values in the renetcolGUI_0_0_7.py file:
                 - line 28 : path to GTK
                 - line 47 to 53 : IP protocol choice and collector address
 
-    *REQUIRED* In this release (0.0.2) the client tool host MUST be have a
+    *REQUIRED* In this release (0.0.9) the client tool host MUST be have a
  reverse DNS for his name. If not the collector will not be able to 
 communicate with the client. Explication: the rules are registered on the 
@@ -92 +92 @@
     Note: For your first action from the client to the collector it's 
 possible to have a delay (>20s, it depends on the delay between two template
-definition). This delay desappears after. 
+definition). 

trunk/configure.in

@@ -3 +3 @@
 
 AC_PREREQ(2.59)
-AC_INIT(RENETCOL, 0.0.8, andreu@renater.fr)
+AC_INIT(RENETCOL, 0.0.9, andreu@renater.fr)
 AC_CONFIG_SRCDIR(src/)
 AC_PROG_MAKE_SET

trunk/src/dataFlowSet.c

@@ -109 +109 @@
 #ifdef DEBUG
     fprintf(stderr,"{d id: %hu, lg %hu", (*myPtrs->currentFlowsetIdPtr), data_length);
-    if ( (*myPtrs->currentFlowsetIdPtr) > 270 ) {
+    if ( (*myPtrs->currentFlowsetIdPtr) > TRESHOLD_TEMPLATE_ID ) {
 /*      fprintf(stderr,"Bad TID from router: %lu.%lu.%lu.%lu\n", */
 /*              (*myPtrs->currentFlowsetIdPtr), */
@@ -893 +893 @@
           buffer4[0]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); (*myPtrs->offsetV9Ptr)++;
           if (pftmp->fieldType==34){
-            if (myPtrs->currentRouterPtr->sampled != *((unsigned long*)&buffer4) ) {
+            if ((*((unsigned long*)&buffer4)==1) 
+                || (*((unsigned long*)&buffer4)==10) 
+                || (*((unsigned long*)&buffer4)==1000)) {
+              if (myPtrs->currentRouterPtr->sampled != *((unsigned long*)&buffer4) ) {
 #ifdef DEBUGAGG
-              fprintf(stderr,"SV (p) %lu != %lu (r)\n", *((unsigned long*)&buffer4),
-                      myPtrs->currentRouterPtr->sampled);
+                fprintf(stderr,"\n SV (p) %lu != %lu (r)", *((unsigned long*)&buffer4),
+                        myPtrs->currentRouterPtr->sampled);
 #endif                     
-              myPtrs->currentRouterPtr->sampled = *((unsigned long*)&buffer4);
-              for (i=0; i<nbPV4; i++) {
-                /* we update the PrefixV4 structure with the sampled information */
-                if ( myPtrs->currentRouterPtr->IpAddress == myPtrs->routersID[V4PTab[i].routerNb]) {
-                  V4PTab[i].sampling = *((unsigned long*)&buffer4);
-                  myPtrs->secondV4Tab[i].sampling = *((unsigned long*)&buffer4); 
+                myPtrs->currentRouterPtr->sampled = *((unsigned long*)&buffer4);
+                for (i=0; i<nbPV4; i++) {
+                  /* we update the PrefixV4 structure with the sampled information */
+                  if ( myPtrs->currentRouterPtr->IpAddress == myPtrs->routersID[V4PTab[i].routerNb]) {
+                    V4PTab[i].sampling = *((unsigned long*)&buffer4);
+                    myPtrs->secondV4Tab[i].sampling = *((unsigned long*)&buffer4);
+                  }
                 }
               }

trunk/src/dataFlowSet.h

@@ -33 +33 @@
 #include "get_conf.h"
 #include "prefix_mgmt.h"
+
+#define TRESHOLD_TEMPLATE_ID 300
 
 struct IPFLowCache {

trunk/src/get_conf.c

@@ -58 +58 @@
   int nbR = 0;
   char tindex[5];
-  char tname[20];
-  char tad[15];
-  char tad2[15];
+  char tname[40];
+  char tad[16];
+  char tad2[16];
   int ind=0;
   unsigned short n0, n1, n2, n3;

trunk/src/template.c

@@ -149 +149 @@
              || badFieldLength == 1 
              || (badFieldCount == 1)) {
-          fprintf(stderr,"\n IP: %lu.%lu.%lu.%lu, %d,%d\n",
-                  cr->IpAddress>>24,
-                  cr->IpAddress<<8>>24,
-                  cr->IpAddress<<16>>24,
-                  cr->IpAddress<<24>>24,
-                  badFieldNumber,
-                  badFieldLength
-                  );
-          fprintf (stderr, "\n cTFSPtr->templateFlowSetId: %hu\n", 
-                   cTFSPtr->templateFlowSetId);
+/*        fprintf(stderr,"\n IP: %lu.%lu.%lu.%lu, %d,%d\n", */
+/*                cr->IpAddress>>24, */
+/*                cr->IpAddress<<8>>24, */
+/*                cr->IpAddress<<16>>24, */
+/*                cr->IpAddress<<24>>24, */
+/*                badFieldNumber, */
+/*                badFieldLength */
+/*                ); */
+/*        fprintf (stderr, "\n cTFSPtr->templateFlowSetId: %hu\n",  */
+/*                 cTFSPtr->templateFlowSetId); */
           while ( ((*offV9))> (index)){
             buffer2[1]= *(buf+index); index++;
             buffer2[0]= *(buf+index); index++;
             tmp = *((unsigned short*)&buffer2);
-            fprintf (stderr, " %hu ", tmp);
+/*          fprintf (stderr, " %hu ", tmp); */
           }
           syslog (LOG_INFO, 
                   "in new template: field nb gt 89, field lg gt 16 or too many fields, bad template definition possibility");
-          fprintf(stderr, 
-                  "\n in new template function: too many fields, bug collector or wrong template def \n"); 
+/*        fprintf(stderr,  */
+/*                "\n in new template function: too many fields, bug collector or wrong template def \n");  */
           ptpltmp = cTFSPtr;
           if (ptpltmp->prev == NULL) {
@@ -260 +260 @@
             buffer2[0]= *(buf+index); index++;
             tmp = *((unsigned short*)&buffer2);
-            fprintf (stderr, " %hu ", tmp);
+/*          fprintf (stderr, " %hu ", tmp); */
           }
           syslog (LOG_INFO, 
                   "in update template function: too many fields, bug collector or wrong template def in template update");
-          fprintf(stderr,
-                  "\nin update template function: too many fields, bug collector or wrong template def in template update\n");
+/*        fprintf(stderr, */
+/*                "\nin update template function: too many fields, bug collector or wrong template def in template update\n"); */
           ptpltmp = cTFSPtr;
           if (ptpltmp->prev == NULL) {

trunk/tool/check.sh

@@ -9 +9 @@
   killall renetcolAgg
   sleep 1
-  /home/maintenance/renetcol-0.0.8/src/renetcolMsgCtl /home/maintenance/renetcol-0.0.8/src/renetcol
+  /home/maintenance/renetcol-0.0.9/src/renetcolMsgCtl /home/maintenance/renetcol-0.0.9/src/renetcol
   echo "renetcolMsgCtl started"
   sleep 5
-  /home/maintenance/renetcol-0.0.8/src/renetcol /home/maintenance/renetcol-0.0.8/src/info_routeur_netflow.txt /home/maintenance/renetcol-0.0.8/src/donneesblocsadresses2 /home/maintenance/renetcol-0.0.8/src/rules.txt
+  /home/maintenance/renetcol-0.0.9/src/renetcol /home/maintenance/renetcol-0.0.9/src/info_routeur_netflow.txt /home/maintenance/renetcol-0.0.8/src/donneesblocsadresses2 /home/maintenance/renetcol-0.0.8/src/rules.txt
   echo "renetcol restarted"
-  /home/maintenance/renetcol-0.0.8/src/renetcolSender /home/maintenance/renetcol-0.0.8/src/renetcol 1 /home/maintenance/renetcol-0.0.8/src/rules.txt
+  /home/maintenance/renetcol-0.0.9/src/renetcolSender /home/maintenance/renetcol-0.0.9/src/renetcol 1 /home/maintenance/renetcol-0.0.8/src/rules.txt
   echo "renetcolSender restarted"
-  /home/maintenance/renetcol-0.0.8/src/renetcolAgg 
+  /home/maintenance/renetcol-0.0.9/src/renetcolAgg 
 else
   echo "All is up"