Changeset 30 for trunk/src/dataFlowSet.c

Timestamp:

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

Author:

andreu

Message:

bug of "template fantom" correction

Files:

• trunk/src/dataFlowSet.c (modified) (9 diffs)

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 */
+
 }