Changeset 34 for trunk/src

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/src

Files:

• dataFlowSet.c (modified) (2 diffs)
• dataFlowSet.h (modified) (1 diff)
• get_conf.c (modified) (1 diff)
• template.c (modified) (2 diffs)

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) {