Changeset 29 for trunk/src/dataFlowSet.c

Timestamp:

04/13/07 17:40:49 (16 years ago)

Author:

andreu

Message:

sampling information in rrd filename - optional template first step

Files:

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

trunk/src/dataFlowSet.c

@@ -39 +39 @@
 {
   TplFlowSetPtr tmp;
+  TplOptionPtr tmpOpt;
   FieldPtr pftmp;
   FieldPtr secondPftmp;
@@ -103 +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) {
+  if ( (tmp=existTplId(myPtrs->currentRouterPtr, myPtrs->currentHeaderV9Ptr->sourceId, 
+                      (*myPtrs->currentFlowsetIdPtr)))!=NULL ) {
+#ifdef DEBUG
+      fprintf(stderr,"{d");
+#endif
     pftmp = tmp->lastField;
     for (; pftmp; pftmp = pftmp->prev) {
@@ -143 +147 @@
     while ( (((*myPtrs->offsetV9Ptr)-48-shift) <= data_length) && (overflow!=1) ) { 
       /* 
-       * progression in a flow Set 
+       * progression in a data flow Set 
        * notes:
        *   48=header ip + header netf
@@ -282 +286 @@
                     ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 1;
                   }
-              }       
+              }
 #ifdef IPV4AGG
               if ((pftmp->fieldType==8)){
@@ -805 +809 @@
         pftmp = pftmp->prev;
       }
-    } /* end of the while on one flow record */    
+    } /* end of the while on one flow record */
+#ifdef DEBUG
+    fprintf(stderr,"}");
+#endif
   }else{
-    /* 
-     * template unknown, we skip this all the data 
-     */
-    (*myPtrs->offsetV9Ptr)+=(data_length-4);
-    (*myPtrs->currentFlowsetNumberPtr) = myPtrs->currentHeaderV9Ptr->count;
+      /* 
+       * Optional template
+       */
 #ifdef DEBUG
-    fprintf(stderr, " U, r: %lu.%lu.%lu.%lu, sourceId: %lu, TID: %hu",
-            (myPtrs->pcktPtr->ipH->srcAdd>>24),
-            (myPtrs->pcktPtr->ipH->srcAdd<<8>>24),
-            (myPtrs->pcktPtr->ipH->srcAdd<<16>>24),
-            (myPtrs->pcktPtr->ipH->srcAdd<<24>>24),
-            myPtrs->currentHeaderV9Ptr->sourceId, 
-            (*myPtrs->currentFlowsetIdPtr)
-            );
-#endif
+    fprintf(stderr,"<d");
+#endif
+    if ((tmpOpt=existTplOptId(myPtrs->currentRouterPtr, myPtrs->currentHeaderV9Ptr->sourceId, 
+                              (*myPtrs->currentFlowsetIdPtr)))!=NULL) {        
+            
+      for ( i=0; i<(tmpOpt->optionScopeLg/4); i++){
+        /* FIXME : today we skip the scope fields, it's bad :( */ 
+        if (pftmp=tmpOpt->lastField) {
+          for (j=0; j<pftmp->fieldLength; j++) {
+            (*myPtrs->offsetV9Ptr)++; 
+          }
+          pftmp = pftmp->prev;
+        }
+      }
+      while (pftmp != NULL) {
+        if (pftmp->fieldLength==1){ 
+          buffer1 = *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); (*myPtrs->offsetV9Ptr)++;
+        }
+        if (pftmp->fieldLength==2){ 
+          buffer2[1]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); (*myPtrs->offsetV9Ptr)++;
+          buffer2[0]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); (*myPtrs->offsetV9Ptr)++;
+        }
+        if (pftmp->fieldLength==4){ 
+          buffer4[3]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); (*myPtrs->offsetV9Ptr)++;
+          buffer4[2]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); (*myPtrs->offsetV9Ptr)++;
+          buffer4[1]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); (*myPtrs->offsetV9Ptr)++;
+          buffer4[0]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); (*myPtrs->offsetV9Ptr)++;
+          if (pftmp->fieldType==34){
+            if (myPtrs->currentRouterPtr->sampled != *((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); 
+#ifdef DEBUGAGG
+                  fprintf(stderr," SV %lu ", *((unsigned long*)&buffer4));
+#endif            
+                }
+              }
+            }
+          }
+        }       
+        pftmp = pftmp->prev;
+      }
+      if ( pftmp == NULL ) {
+        while ((*myPtrs->offsetV9Ptr)%4 != 0) {
+          (*myPtrs->offsetV9Ptr)++;
+        }
+      } else {
+        fprintf(stderr,"PB ");
+      }
+#ifdef DEBUG
+      fprintf(stderr,">");
+#endif
+      /*       (*myPtrs->offsetV9Ptr)+=(data_length-4); */
+      /*       (*myPtrs->currentFlowsetNumberPtr) = myPtrs->currentHeaderV9Ptr->count; */      
+    } else {
+      /* 
+       * template unknown, we skip this all the data 
+       */
+      (*myPtrs->offsetV9Ptr)+=(data_length-4);
+      (*myPtrs->currentFlowsetNumberPtr) = myPtrs->currentHeaderV9Ptr->count;
+#ifdef DEBUG
+      fprintf(stderr, " U, r: %lu.%lu.%lu.%lu, sourceId: %lu, TID: %hu",
+              (myPtrs->pcktPtr->ipH->srcAdd>>24),
+              (myPtrs->pcktPtr->ipH->srcAdd<<8>>24),
+              (myPtrs->pcktPtr->ipH->srcAdd<<16>>24),
+              (myPtrs->pcktPtr->ipH->srcAdd<<24>>24),
+              myPtrs->currentHeaderV9Ptr->sourceId, 
+              (*myPtrs->currentFlowsetIdPtr)
+              );
+#endif
+    }
   }
   while ( ((*myPtrs->offsetV9Ptr)-48-shift) < data_length ) {
@@ -839 +909 @@
   }
 #ifdef DEBUG
-  if (crazyCounter != 0){
-    fprintf(stderr," crazyCounter: %d ", crazyCounter);
-  }
+  if (crazyCounter != 0){ fprintf(stderr," crazyCounter: %d ", crazyCounter); }
 #endif
   if (crazyCounter!=0) { syslog(LOG_INFO,"crazyCounter: %d ", crazyCounter);}