Changeset 111 for trunk/src/dataFlowSet.c

Timestamp:

06/17/09 14:44:04 (14 years ago)

Author:

andreu

Message:

ticket #41 Pcap file integration

Files:

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

trunk/src/dataFlowSet.c

@@ -81 +81 @@
   int paddingCounter = 0;
   int crazyCounter = 0;
+#ifdef DEBUG
+  int flowCpt = 0;
+#endif
 
   buffer2[1] = *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr));
@@ -93 +96 @@
   data_length = *((unsigned short*)&buffer2);
   if (data_length == 0) {
-    syslog(LOG_INFO, "data flowset length null; all next informations of this data flowset are not considered! flowset ID: %hu, from router: %lu.%lu.%lu.%lu",
-           (*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));
+#ifdef DEBUG    
+    fprintf (stderr, " dlg==0 <--| ");
+#endif
+/*     syslog(LOG_INFO, "data flowset length null; all next informations of this data flowset are not considered! flowset ID: %hu, from router: %lu.%lu.%lu.%lu", */
+/*         (*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)); */
     return (-1);
 
@@ -112 +118 @@
             data_length);
     if ( (*myPtrs->currentFlowsetIdPtr) > TRESHOLD_TEMPLATE_ID ) {
-      /*        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); */
+        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);
     }
@@ -134 +140 @@
     if ( data_length%flow_size >= 9 ) {
       (*myPtrs->currentFlowsetNumberPtr) = myPtrs->currentHeaderV9Ptr->count;
-      syslog(LOG_INFO, "data flowset length not match with length from template definition, wrong template definition suspected; all next informations of this data flowset are not considered! flowset ID: %hu, from router: %lu.%lu.%lu.%lu",
+      syslog(LOG_INFO, "data flowset length not match with length from template definition, wrong template definition suspected; all next informations of this data flowset are not considered! sourceID: %lu flowset ID: %hu, from router: %lu.%lu.%lu.%lu",
+             myPtrs->currentHeaderV9Ptr->sourceId,
              (*myPtrs->currentFlowsetIdPtr),
              (myPtrs->pcktPtr->ipH->srcAdd>>24),
@@ -140 +147 @@
              (myPtrs->pcktPtr->ipH->srcAdd<<16>>24),
              (myPtrs->pcktPtr->ipH->srcAdd<<24>>24));
+#ifdef DEBUG    
+    fprintf (stderr, " dlg%flsz >=9 skip data ");
+#endif
       return (data_length+shift);
     }
@@ -149 +159 @@
              (myPtrs->pcktPtr->ipH->srcAdd<<16>>24),
              (myPtrs->pcktPtr->ipH->srcAdd<<24>>24));
+#ifdef DEBUG    
+    fprintf (stderr, " dlg >= 1452 skip pckt ");
+#endif
       return (-1);
     }
@@ -641 +654 @@
          * end of one flow (not the flowset) 
          */
-
+#ifdef DEBUG
+        flowCpt++;
+        fprintf(stderr," F%d ", flowCpt);
+#endif 
         /* put aggregation cache information to IPv4 Prefixes table */
         /* Aggregation mode must be enable in ./configure options   */
@@ -1212 +1228 @@
         /* not the flow end, progress in field list */
         pftmp = pftmp->prev;
-      }
+      }    
     } /* end of the while on one flow record */
-      
+       
     while ( ((*myPtrs->offsetV9Ptr)-48-shift) < data_length ) {
       (*myPtrs->offsetV9Ptr)++; /* if padding */
       paddingCounter++;
+#ifdef DEBUG
+      fprintf(stderr,", pC: %d ", paddingCounter);
       if ( paddingCounter > 8 ) {
-#ifdef DEBUG
-        fprintf(stderr," padding too high: %d ", paddingCounter);
-#endif
         syslog(LOG_INFO,"padding too high: %d ", paddingCounter);
+        fprintf(stderr,", pC: %d <--| ", paddingCounter);
         return (-1);
+#endif
       }
+      return (-1);
     }
     while ( (*myPtrs->offsetV9Ptr)-48-shift > data_length ) { 
@@ -1232 +1250 @@
 #ifdef DEBUG
     if (crazyCounter != 0){ fprintf(stderr," crazyCounter: %d ", crazyCounter); }
-#endif
     if (crazyCounter!=0) { syslog(LOG_INFO,"crazyCounter: %d ", crazyCounter);}
-      
-#ifdef DEBUG
-    fprintf(stderr,"}");
+    fprintf(stderr,"(%hu,%hu)}", data_length, data_length+shift);
 #endif
       
@@ -1326 +1341 @@
     } else {
       /* 
-       * template unknown, we skip this all the data 
+       * template unknown, we skip the data 
        */
       (*myPtrs->offsetV9Ptr)+=(data_length-4);
-      (*myPtrs->currentFlowsetNumberPtr) = myPtrs->currentHeaderV9Ptr->count;
+      (*myPtrs->currentFlowsetNumberPtr)+= 1 ;
+      /*      (*myPtrs->currentFlowsetNumberPtr) = myPtrs->currentHeaderV9Ptr->count;*/
 #ifdef DEBUG
-      fprintf(stderr, " U, r: %lu.%lu.%lu.%lu, sourceId: %lu, TID: %hu",
+      fprintf(stderr, " U, r: %lu.%lu.%lu.%lu, sourceId: %lu, TID: %hu ",
               (myPtrs->pcktPtr->ipH->srcAdd>>24),
               (myPtrs->pcktPtr->ipH->srcAdd<<8>>24),
@@ -1339 +1355 @@
               (*myPtrs->currentFlowsetIdPtr)
               );
+      fprintf(stderr,"(%hu,%hu) ", data_length, data_length+shift);
 #endif
       return (data_length+shift);