Changeset 27 for trunk/src/dataFlowSet.c

Timestamp:

04/05/07 18:10:36 (16 years ago)

Author:

andreu

Message:

explicite output to find wrong definition bug - memory leak in renetcolAgg find

Files:

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

trunk/src/dataFlowSet.c

@@ -30 +30 @@
  *
  */
-unsigned short 
-checkDataFlowSet(unsigned short shift, 
+short 
+checkDataFlowSet(short shift, 
                  struct MyPtrs *myPtrs,
                  int myQueue, 
@@ -66 +66 @@
   int bool = 0; /* in IPV4 Agg mode enabled, we need to now if it's an IPv4 */
                 /* flow, we test on the field and then put bool at 1 */
+  int isMplsFlow = 0;
+  int paddingCounter = 0;
+  int crazyCounter = 0;
+
 #ifdef CRIHAN
   struct IPFLowCache ipFirstCache;
@@ -115 +119 @@
       return (data_length+shift);
     }
+    if ( data_length >= 1452 ) {
+      syslog(LOG_INFO, "data flowset length too raised; 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);
+    }
 #ifdef IPV4AGG
     agCache.routerAd = myPtrs->pcktPtr->ipH->srcAdd; 
@@ -136 +149 @@
        */
       cpt++;
-      j=0;
+      j = 0;
       pos = (pftmp->fieldType)*10+j;
       field_size = (int) pftmp->fieldLength;
+      
+      /* special case: check yes on all flows from one router (phantom field nb 0) */
+      while ( ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+j))) != NULL ) {  
+        if  ( (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+j)))->value->stor.lvalue)
+              == myPtrs->pcktPtr->ipH->srcAdd )
+          {
+            ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+j)))->check = 1;
+          }     
+        j++;
+      }    
+      j = 0;
+      
       /*
        * Comparaison between the field value and the rules
        * ... if one rule exist
+       * FIXME : warning, if no rules, no accounting ?
        */
       if (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos))) != NULL) {
@@ -153 +179 @@
                   (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->operator)){
           case 2:
+            /* operator: "=" */ 
             switch (field_size) {
             case 1:
@@ -234 +261 @@
               /* aggregation */
               /* end aggregation */
+              if (pftmp->fieldType==70){
+                isMplsFlow = 1;
+              }
 #ifdef CRIHAN
               if (pftmp->fieldType==70){
@@ -255 +285 @@
 #ifdef IPV4AGG
               if ((pftmp->fieldType==8)){
+                bool = 1; /* very important, test if we have an IPv4 flow for Agg */
                 agCache.v4AdS = *((unsigned long*)&buffer4);
               }
@@ -506 +537 @@
           /* aggregation */
           /* end aggregation */
+          if (pftmp->fieldType==70){
+            isMplsFlow = 1;
+          }
 #ifdef CRIHAN
           if (pftmp->fieldType==70){
@@ -620 +654 @@
         /* first we must know if the address belong to our prefix   */
 #ifdef IPV4AGG
-        if (bool == 1){
+        if ( (bool == 1) && (isMplsFlow == 0) ){
           prefixKey.beginning = agCache.v4AdS>>(32-agCache.maskS)<<(32-agCache.maskS);
           res = bsearch(&prefixKey, V4PTab, nbPV4, 
-                        sizeof(struct PrefixV4), prefCmp);
-          if (res!=NULL){ 
-            /* OUT ("traffic from the prefix/subnet")  */
-            res->bytesNbOUT += agCache.bytes;
-            res->pktsNbOUT += agCache.pkts;
-            (res->flowNbOUT)++;
-            switch (agCache.tProt) {
-            case 1:
-              res->icmpBytesNbOUT += agCache.bytes;
-              res->icmpPktsNbOUT += agCache.pkts;
-              (res->icmpFlowNbOUT)++;
-              break;
-            case 6:
-              res->tcpBytesNbOUT += agCache.bytes;
-              res->tcpPktsNbOUT += agCache.pkts;
-              (res->tcpFlowNbOUT)++;          
-              break;
-            case 17:
-              res->udpBytesNbOUT += agCache.bytes;
-              res->udpPktsNbOUT += agCache.pkts;
-              (res->udpFlowNbOUT)++;
-              break;
-            default:
-              res->othersBytesNbOUT += agCache.bytes;
-              res->othersPktsNbOUT += agCache.pkts;
-              (res->othersFlowNbOUT)++;
+                        sizeof(struct PrefixV4), prefGlobalCmp);
+          if (res!=NULL){
+            if ( myPtrs->routersID[res->routerNb] == agCache.routerAd  ) {
+              /* OUT ("traffic from the prefix/subnet")  */
+              res->bytesNbOUT += agCache.bytes;
+              res->pktsNbOUT += agCache.pkts;
+              (res->flowNbOUT)++;
+            } else {
+              /* doublon or bad reference in prefix list */
             }
           } else {
             prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD);
             res = bsearch(&prefixKey, V4PTab, nbPV4, 
-                          sizeof(struct PrefixV4), prefCmp);
-            if (res!=NULL){ /* IN ("traffic to the prefix")  */
-              res->bytesNbIN += agCache.bytes;
-              res->pktsNbIN += agCache.pkts;
-              (res->flowNbIN)++;
-              switch (agCache.tProt) {
-              case 1:
-                res->icmpBytesNbIN += agCache.bytes;
-                res->icmpPktsNbIN += agCache.pkts;
-                (res->icmpFlowNbIN)++;
-                break;
-              case 6:
-                res->tcpBytesNbIN += agCache.bytes;
-                res->tcpPktsNbIN += agCache.pkts;
-                (res->tcpFlowNbIN)++;
-                break;
-              case 17:
-                res->udpBytesNbIN += agCache.bytes;
-                res->udpPktsNbIN += agCache.pkts;
-                (res->udpFlowNbIN)++;
-                break;
-              default:
-                res->othersBytesNbIN += agCache.bytes;
-                res->othersPktsNbIN += agCache.pkts;
-                (res->othersFlowNbIN)++;
+                          sizeof(struct PrefixV4), prefGlobalCmp);
+            if (res!=NULL){ 
+              if ( myPtrs->routersID[res->routerNb] == agCache.routerAd  ) {
+                /* IN ("traffic to the prefix")  */
+                res->bytesNbIN += agCache.bytes;
+                res->pktsNbIN += agCache.pkts;
+                (res->flowNbIN)++;
+              } else {
+                /* doublon or bad reference in prefix list */
+                
+/*              fprintf(stderr, "IN NC: %lu.%lu.%lu.%lu/%hu -> %lu.%lu.%lu.%lu/%hu R:%lu.%lu.%lu.%lu \n", */
+/*                      (agCache.v4AdS>>24), */
+/*                      (agCache.v4AdS<<8>>24),  */
+/*                      (agCache.v4AdS<<16>>24),  */
+/*                      (agCache.v4AdS<<24>>24),  */
+/*                      (agCache.maskS),  */
+/*                      (agCache.v4AdD>>24),  */
+/*                      (agCache.v4AdD<<8>>24),  */
+/*                      (agCache.v4AdD<<16>>24),  */
+/*                      (agCache.v4AdD<<24>>24),  */
+/*                      (agCache.maskD),  */
+/*                      (myPtrs->pcktPtr->ipH->srcAdd>>24),  */
+/*                      (myPtrs->pcktPtr->ipH->srcAdd<<8>>24), */
+/*                      (myPtrs->pcktPtr->ipH->srcAdd<<16>>24), */
+/*                      (myPtrs->pcktPtr->ipH->srcAdd<<24>>24) */
+/*                      ); */
               }
             } else {
@@ -706 +724 @@
         }
         bool = 0;
+        isMplsFlow = 0;
 #endif
         /* 
          * Redirection if needed 
          * switch the rules definition (check & fieldToRecord), 
-         * we send the flow or a part of the flow to a remote host or a file
+         * we send the flow or a part of the flow to a remote host or a file.
+         * In a first time (until release 0.0.7, the information was sent via
+         * the process renetcolSender with an IPC message queue. But, the perf
+         * of IPC Msg was very bad with a system compilation by default.
+         * So now, we send information directly from here.
          */
         tmpRuleList = myPtrs->rulesListPtr;
         while (tmpRuleList){
+          RulesPtr tmpRuleList_for_to = myPtrs->rulesListPtr;
+          RuleDefPtr tmpRuleDefList = tmpRuleList->def;
           unsigned short check = 1;
-          RuleDefPtr tmpRuleDefList = tmpRuleList->def;
+          int s=0;
           secondOffset = secondOldOffset;
           while (tmpRuleDefList){
@@ -725 +750 @@
             /* msg building */
             secondPftmp = tmp->lastField;
-/*          memcpy(myMsg.text, (char*)(myPtrs->ptr_buffer+secondOffset),flow_size); */
             msgTextIndex = mempcpy(mempcpy(mempcpy(myMsg.text, 
                                                    &tplMsgType, 
@@ -747 +771 @@
                                    ); 
             myMsg.type = 1;
+            /* OLD transfert type */
             msgSend( myQueue, myMsg);
+            /* NEW transfert type */
+/*          for ( ; tmpRuleList_for_to; tmpRuleList_for_to=tmpRuleList_for_to->next){ */
+/*            fprintf(stderr, "?\n"); */
+/*            if (tmpRuleList_for_to->id == tmpRuleList->id){ */
+/*              fprintf(stderr, "y\n"); */
+/*              s = sendMessage(tmpRuleList_for_to->host->sockId, &(myMsg.text), sizeof(myMsg.text), */
+/*                              tmpRuleList_for_to->host->hostAddressPtr); */
+/*              fprintf(stderr, "o\n"); */
+/*            } */
+/*          } */
+            /* FIXME : perhaps check "s" */
             noEnd = 1;
             secondCpt=0;
@@ -776 +812 @@
     (*myPtrs->offsetV9Ptr)+=(data_length-4);
     (*myPtrs->currentFlowsetNumberPtr) = myPtrs->currentHeaderV9Ptr->count;
+    fprintf(stderr, "\n unknown template \n");
   }
   while ( ((*myPtrs->offsetV9Ptr)-48-shift) < data_length ) {
     (*myPtrs->offsetV9Ptr)++; /* if padding */
+    paddingCounter++;
+    fprintf(stderr, "\n padding \n");
+    if ( paddingCounter > 8 ) {
+      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++;
   }
+  if (crazyCounter!=0) { syslog(LOG_INFO,"crazyCounter: %d ", crazyCounter);}
   return (data_length+shift);
 }