Changeset 30

Timestamp:

04/20/07 16:31:36 (16 years ago)

Author:

andreu

Message:

bug of "template fantom" correction

Location:

trunk

Files:

• src/dataFlowSet.c (modified) (9 diffs)
• src/renetcol.c (modified) (3 diffs)
• src/renetcolAgg.c (modified) (3 diffs)
• src/renetcolSender.c (modified) (1 diff)
• src/routers_mgmt.c (modified) (5 diffs)
• src/template.c (modified) (10 diffs)
• tool/metro.php (added)

trunk/src/dataFlowSet.c

@@ -38 +38 @@
                  )
 {
-  TplFlowSetPtr tmp;
-  TplOptionPtr tmpOpt;
-  FieldPtr pftmp;
-  FieldPtr secondPftmp;
+  TplFlowSetPtr tmp = NULL;
+  TplOptionPtr tmpOpt = NULL;
+  FieldPtr pftmp = NULL;
+  FieldPtr secondPftmp = NULL;
   unsigned short data_length = 0;
   unsigned short flow_size = 0;
@@ -104 +104 @@
   buffer2[0] = *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr));(*myPtrs->offsetV9Ptr)++;
   data_length = *((unsigned short*)&buffer2);
+
   if ( (tmp=existTplId(myPtrs->currentRouterPtr, myPtrs->currentHeaderV9Ptr->sourceId, 
                       (*myPtrs->currentFlowsetIdPtr)))!=NULL ) {
 #ifdef DEBUG
-      fprintf(stderr,"{d");
+    fprintf(stderr,"{d id: %hu, lg %hu", (*myPtrs->currentFlowsetIdPtr), data_length);
+    if ( (*myPtrs->currentFlowsetIdPtr) > 270 ) {
+/*      fprintf(stderr,"Bad TID from router: %lu.%lu.%lu.%lu\n", */
+/*              (*myPtrs->currentFlowsetIdPtr), */
+/*              (myPtrs->pcktPtr->ipH->srcAdd>>24), */
+/*              (myPtrs->pcktPtr->ipH->srcAdd<<8>>24), */
+/*              (myPtrs->pcktPtr->ipH->srcAdd<<16>>24), */
+/*              (myPtrs->pcktPtr->ipH->srcAdd<<24>>24)); */
+/*      fprintf(stderr," Bytes : \n"); */
+/*      while ( ( myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr) ) > (myPtrs->ptr_buffer+1416) ){ */
+/*        buffer1= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr));(*myPtrs->offsetV9Ptr)++; */
+/*        tmp = *((unsigned char*)&buffer1); */
+/*        fprintf (stderr, " %s ", tmp); */
+/*      } */
+/*      exit(-1); */
+      return (data_length+shift);
+    }
 #endif
     pftmp = tmp->lastField;
@@ -741 +758 @@
         tmpRuleList = myPtrs->rulesListPtr;
         while (tmpRuleList){
-          RulesPtr tmpRuleList_for_to = myPtrs->rulesListPtr;
+/*        RulesPtr tmpRuleList_for_to = myPtrs->rulesListPtr; */
           RuleDefPtr tmpRuleDefList = tmpRuleList->def;
           unsigned short check = 1;
-          int s=0;
+/*        int s=0; */
           secondOffset = secondOldOffset;
           while (tmpRuleDefList){
@@ -810 +827 @@
       }
     } /* end of the while on one flow record */
+
+    /* new place */
+    
+    while ( ((*myPtrs->offsetV9Ptr)-48-shift) < data_length ) {
+      (*myPtrs->offsetV9Ptr)++; /* if padding */
+      paddingCounter++;
+      if ( paddingCounter > 8 ) {
+#ifdef DEBUG
+        fprintf(stderr," padding too high: %d ", paddingCounter);
+#endif
+        syslog(LOG_INFO,"padding too high: %d ", paddingCounter);
+        return (-1);
+      }
+    }
+    while ( (*myPtrs->offsetV9Ptr)-48-shift > data_length ) { 
+      (*myPtrs->offsetV9Ptr)--; /* crazy loop (when bug appears in template def) */
+      crazyCounter++;
+    }
+#ifdef DEBUG
+    if (crazyCounter != 0){ fprintf(stderr," crazyCounter: %d ", crazyCounter); }
+#endif
+    if (crazyCounter!=0) { syslog(LOG_INFO,"crazyCounter: %d ", crazyCounter);}
+    
 #ifdef DEBUG
     fprintf(stderr,"}");
 #endif
+
+    return (data_length+shift);
+    /* end new place */
+    
   }else{
-      /* 
-       * Optional template
-       */
-#ifdef DEBUG
-    fprintf(stderr,"<d");
-#endif
+    /*
+     *
+     *
+     *       Optional template
+     *
+     *
+     */
     if ((tmpOpt=existTplOptId(myPtrs->currentRouterPtr, myPtrs->currentHeaderV9Ptr->sourceId, 
                               (*myPtrs->currentFlowsetIdPtr)))!=NULL) {        
-            
+#ifdef DEBUG
+      fprintf(stderr,"<d id: %hu, lg %hu", (*myPtrs->currentFlowsetIdPtr), data_length);
+#endif      
       for ( i=0; i<(tmpOpt->optionScopeLg/4); i++){
         /* FIXME : today we skip the scope fields, it's bad :( */ 
-        if (pftmp=tmpOpt->lastField) {
+        if ((pftmp=tmpOpt->lastField)!=NULL) {
           for (j=0; j<pftmp->fieldLength; j++) {
             (*myPtrs->offsetV9Ptr)++; 
@@ -847 +894 @@
           if (pftmp->fieldType==34){
             if (myPtrs->currentRouterPtr->sampled != *((unsigned long*)&buffer4) ) {
+#ifdef DEBUGAGG
+              fprintf(stderr,"SV (p) %lu != %lu (r)\n", *((unsigned long*)&buffer4),
+                      myPtrs->currentRouterPtr->sampled);
+#endif                     
               myPtrs->currentRouterPtr->sampled = *((unsigned long*)&buffer4);
               for (i=0; i<nbPV4; i++) {
@@ -853 +904 @@
                   V4PTab[i].sampling = *((unsigned long*)&buffer4);
                   myPtrs->secondV4Tab[i].sampling = *((unsigned long*)&buffer4); 
-#ifdef DEBUGAGG
-                  fprintf(stderr," SV %lu ", *((unsigned long*)&buffer4));
-#endif            
                 }
               }
@@ -866 +914 @@
         while ((*myPtrs->offsetV9Ptr)%4 != 0) {
           (*myPtrs->offsetV9Ptr)++;
+#ifdef DEBUG
+          fprintf(stderr," p ");
+#endif
         }
       } else {
@@ -873 +924 @@
       fprintf(stderr,">");
 #endif
-      /*       (*myPtrs->offsetV9Ptr)+=(data_length-4); */
-      /*       (*myPtrs->currentFlowsetNumberPtr) = myPtrs->currentHeaderV9Ptr->count; */      
+      return (data_length+shift);
     } else {
       /* 
@@ -891 +941 @@
               );
 #endif
+      return (data_length+shift);
     }
   }
-  while ( ((*myPtrs->offsetV9Ptr)-48-shift) < data_length ) {
-    (*myPtrs->offsetV9Ptr)++; /* if padding */
-    paddingCounter++;
-    if ( paddingCounter > 8 ) {
-#ifdef DEBUG
-    fprintf(stderr," padding too high: %d ", paddingCounter);
-#endif
-      syslog(LOG_INFO,"padding too high: %d ", paddingCounter);
-      return (-1);
-    }
-  }
-  while ( (*myPtrs->offsetV9Ptr)-48-shift > data_length ) { 
-    (*myPtrs->offsetV9Ptr)--; /* crazy loop (when bug appears in template def) */
-    crazyCounter++;
-  }
-#ifdef DEBUG
-  if (crazyCounter != 0){ fprintf(stderr," crazyCounter: %d ", crazyCounter); }
-#endif
-  if (crazyCounter!=0) { syslog(LOG_INFO,"crazyCounter: %d ", crazyCounter);}
-  return (data_length+shift);
+  /* old place */
+
 }

trunk/src/renetcol.c

@@ -442 +442 @@
                                              myPtrs.currentFlowsetNumberPtr,
                                              myQueue)) < 0 ) {
-#ifdef DEBUG    
+#ifdef DEBUG
             fprintf (stderr, "w>\n");
 #endif
@@ -453 +453 @@
                                       curTplOptionPtr,
                                             myPtrs.currentFlowsetNumberPtr) ) < 0 ) {
-#ifdef DEBUG    
+#ifdef DEBUG
             fprintf (stderr, "wo>\n");
-#endif
+#endif 
             currentFlowsetNumber = myPtrs.currentHeaderV9Ptr->count + 1;
           }
-        } else {
+        } else if (currentFlowsetId > 255) {
           if ( (shift = checkDataFlowSet(shift,
                                          &myPtrs,
@@ -470 +470 @@
             currentFlowsetNumber = myPtrs.currentHeaderV9Ptr->count + 1;
           }
+        } else {
+#ifdef DEBUG    
+          fprintf (stderr, "1<<255\n");
+#endif
+          currentFlowsetNumber = myPtrs.currentHeaderV9Ptr->count + 1;
         }
         if ( gardeFou > 200) { exit(-1); }

trunk/src/renetcolAgg.c

@@ -95 +95 @@
           for (j=0; j<strlen(buf); j++) {buf[j] = '\0';}
           strcat(name, RRD_LOCATION);
-          fprintf(stderr," SPL : %lu\n ",shmForAgg->prefixV4Tab[index][i].sampling);
           sprintf(ipStr, "%lu_%lu_%lu_%lu_%hu_%lu", 
                   shmForAgg->prefixV4Tab[index][i].beginning>>24,
@@ -107 +106 @@
           strcat(name, RRD_EXTENSION);
           if ( (fp=fopen(name,"r")) == NULL ){
-#ifdef DEBUGAGG
-            fprintf(stderr, "Creation %s ... ", name); 
-#endif
             opt[0]= (char *) malloc((strlen(RRD_PARAM_0) + 1) * sizeof(char));
             strcpy(opt[0], RRD_PARAM_0);
@@ -176 +172 @@
               opt[j] = NULL;
             }
-#ifdef DEBUGAGG
-            fprintf(stderr, "end creation \n", name); 
-#endif
           }else{ 
             fclose(fp);
-#ifdef DEBUGAGG
-            fprintf(stderr, "Update %s \n", name); 
-#endif
             rrd_already_created_ct++;
             snprintf(buf, 

trunk/src/renetcolSender.c

@@ -309 +309 @@
   strcpy (rulesFileName, argv[3]);
   rulesListPtr = NULL;
-  fprintf(stderr, "renetcolSender: reading the rules...\n");
   rulesListPtr = getRules(rulesListPtr, rulesFileName);
-  fprintf(stderr, "renetcolSender: OK\n");
   /* we delete rules which are not type socket */
   tmp = rulesListPtr;

trunk/src/routers_mgmt.c

@@ -75 +75 @@
   TplFlowSetPtr tmp = (TplFlowSetPtr) malloc(sizeof(struct TemplateFlowSet));
   tmp->sourceId = 0;
-  tmp->templateFlowSetId = 0;
+  tmp->templateFlowSetId = 99;
   tmp->fieldCount = 0;
   tmp->fieldSet = NULL;
@@ -89 +89 @@
   if (ptpl) {
     while ( ptpl->fieldSet != NULL ){
-/*       fprintf(stderr, "deleteTplFlSet\n"); */
       if (!(ptpl->lastField->prev)) {
         freeField(ptpl->lastField);
@@ -104 +103 @@
     ptpl = NULL;
   }
-  return NULL; /* FIXME I don't known */
+  return NULL;
 }
 
@@ -111 +110 @@
   TplOptionPtr tmp = (TplOptionPtr) malloc(sizeof(struct TemplateOption));
   tmp->sourceId = 0;
-  tmp->templateOptionId = 0;
+  tmp->templateOptionId = 66;
   tmp->length = 0;
   tmp->optionScopeLg = 0;
@@ -127 +126 @@
   if (ptplo) {
     while ( ptplo->fieldSet != NULL ){
-/*       fprintf(stderr, "deleteTplFlSet\n"); */
       if (!(ptplo->lastField->prev)) {
         freeField(ptplo->lastField);

trunk/src/template.c

@@ -67 +67 @@
   unsigned char buffer2[2];
   unsigned short tmp = 0;
-  unsigned short getFlowsetId = 0;
+  unsigned short flowsetId = 0;
   unsigned short length = 0;
   TplFlowSetPtr ptpltmp = NULL;
@@ -77 +77 @@
   unsigned short badFieldNumber = 0;
   unsigned short badFieldLength = 0;
+  unsigned short badFieldCount = 0;
 
   buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
   buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
-  getFlowsetId = *((unsigned short*)&buffer2);
+  flowsetId = *((unsigned short*)&buffer2);
   buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
   buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
@@ -90 +91 @@
     badFieldNumber = 0;
     badFieldLength = 0;
+    badFieldCount = 0;
     buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
     buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
@@ -103 +105 @@
       buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
       buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
-      cTFSPtr->fieldCount = *((unsigned short*)&buffer2);
+      if ( (cTFSPtr->fieldCount = *((unsigned short*)&buffer2) ) == 0 ) {
+        badFieldCount = 1;
+        ptpltmp = cTFSPtr;
+        if (ptpltmp->prev == NULL) {
+          cr->tplList = ptpltmp->next;
+          if (cr->tplList) {
+            cr->tplList->prev = NULL;
+          }
+        } else {
+          ptpltmp->prev->next = ptpltmp->next;
+          if (ptpltmp->next) {
+            ptpltmp->next->prev = ptpltmp->prev;
+          }
+        }
+        deleteTplFlSet(ptpltmp);
+        cTFSPtr = NULL;
+        return (-1);
+      }
       cpt_fields = 0;
       for ( i=0; i<cTFSPtr->fieldCount; i++) {
@@ -125 +144 @@
         }
         cpt_fields++;
-        if ( (cpt_fields > 40) || (badFieldNumber == 1) || badFieldLength == 1) { /* FIXME : constante pour cela */
+        if ( (cTFSPtr->templateFlowSetId < 256 ) 
+             || (cpt_fields > 40) 
+             || (badFieldNumber == 1) 
+             || badFieldLength == 1 
+             || (badFieldCount == 1)) {
           fprintf(stderr,"\n IP: %lu.%lu.%lu.%lu, %d,%d\n",
                   cr->IpAddress>>24,
@@ -177 +200 @@
       }
       deleteTplFlSet(ptpltmp);
+      ptpltmp = NULL;
       cTFSPtr = NULL;
       cTFSPtr = newRouterTplList();
@@ -186 +210 @@
       buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
       buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
-      cTFSPtr->fieldCount = *((unsigned short*)&buffer2);
+      if ( (cTFSPtr->fieldCount = *((unsigned short*)&buffer2) ) == 0 ) {
+        badFieldCount = 1;
+        ptpltmp = cTFSPtr;
+        if (ptpltmp->prev == NULL) {
+          cr->tplList = ptpltmp->next;
+          if (cr->tplList) {
+            cr->tplList->prev = NULL;
+          }
+        } else {
+          ptpltmp->prev->next = ptpltmp->next;
+          if (ptpltmp->next) {
+            ptpltmp->next->prev = ptpltmp->prev;
+          }
+        }
+        deleteTplFlSet(ptpltmp);
+        cTFSPtr = NULL;
+        return (-1);
+      }
       cpt_fields = 0;
       for ( i=0; i<cTFSPtr->fieldCount; i++) {
@@ -210 +251 @@
         }
         cpt_fields++;
-        if ( (cpt_fields > 40) || (badFieldNumber == 1) || badFieldLength == 1) { /* FIXME : declarer une constante pour cela */
+        if ( (cTFSPtr->templateFlowSetId < 256 ) 
+             || (cpt_fields > 40) 
+             || (badFieldNumber == 1) 
+             || badFieldLength == 1 
+             || (badFieldCount == 1)) {
           while ( ((*offV9))> (index)){
             buffer2[1]= *(buf+index); index++;
@@ -355 +400 @@
         }
         cpt_fields++;
-        if ( (cpt_fields > 40) || (badFieldNumber == 1) || badFieldLength == 1) {
+        if ( (cTOPtr->templateOptionId < 256) || (cpt_fields > 40) || (badFieldNumber == 1) || badFieldLength == 1) {
           syslog (LOG_INFO, 
                   "in option template function: too many fields, bug collector or wrong template def in template update");
@@ -430 +475 @@
         }
         cpt_fields++;
-        if ( (cpt_fields > 40) || (badFieldNumber == 1) || badFieldLength == 1) {
+        if ( (cTOPtr->templateOptionId < 256) || (cpt_fields > 40) || (badFieldNumber == 1) || badFieldLength == 1) {
           syslog (LOG_INFO, 
                   "in update option tpl function: too many fields, bug collector or wrong template def in template update");