Changeset 27

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

Location:

trunk

Files:

• src/dataFlowSet.c (modified) (13 diffs)
• src/dataFlowSet.h (modified) (1 diff)
• src/fields_mgmt.c (modified) (1 diff)
• src/fields_mgmt.h (modified) (1 diff)
• src/get_conf.c (modified) (1 diff)
• src/get_conf.h (modified) (1 diff)
• src/msg_mgmt.h (modified) (1 diff)
• src/renetcol.c (modified) (10 diffs)
• src/renetcol.h (modified) (1 diff)
• src/renetcolAgg.c (modified) (5 diffs)
• src/renetcolAgg.h (modified) (1 diff)
• src/routers_mgmt.c (modified) (4 diffs)
• src/rrdwrap.c (modified) (2 diffs)
• src/rules_mgmt.c (modified) (3 diffs)
• src/template.c (modified) (18 diffs)
• src/template.h (modified) (1 diff)
• tool/renetcolGUI_0_0_3.py (modified) (4 diffs)
• tool/renetcolGUI_0_0_7.py (added)

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);
 }

trunk/src/dataFlowSet.h

@@ -100 +100 @@
   unsigned long *ipNbPtr;
   unsigned long *mplsNbPtr;
+  unsigned long *routersID;
 };
 
-unsigned short 
-checkDataFlowSet(unsigned short, 
+short 
+checkDataFlowSet(short, 
                  struct MyPtrs *,
                  int,

trunk/src/fields_mgmt.c

@@ -43 +43 @@
  * invPrintFieldSet
  */
-void invPrintFieldSet(FieldPtr pf)
+void invPrintFieldSet(FILE *file, FieldPtr pf)
 {
   FieldPtr tmp = pf;
   for (; tmp; tmp=tmp->prev) {
-    fprintf(stderr, " %hu %hu \n", tmp->fieldType, tmp->fieldLength);
+    fprintf(file, "(%hu,%hu) ", tmp->fieldType, tmp->fieldLength);
   }
+  fprintf(file,"\n");
 }
 

trunk/src/fields_mgmt.h

@@ -39 +39 @@
 int delField(unsigned short, unsigned short);
 void printFieldSet(FILE *, FieldPtr);
-void invPrintFieldSet(FieldPtr);
+void invPrintFieldSet(FILE *, FieldPtr);
 void freeField(FieldPtr);
 /*p_routers search_fields(unsigned short);*/

trunk/src/get_conf.c

@@ -175 +175 @@
       pV4TabPtr[i].bytesNbIN = 0;
       pV4TabPtr[i].pktsNbIN = 0;
-      pV4TabPtr[i].udpPktsNbIN = 0;
-      pV4TabPtr[i].tcpPktsNbIN = 0;
-      pV4TabPtr[i].icmpPktsNbIN = 0;
-      pV4TabPtr[i].othersPktsNbIN = 0;
-      pV4TabPtr[i].udpBytesNbIN = 0;
-      pV4TabPtr[i].tcpBytesNbIN = 0;
-      pV4TabPtr[i].icmpBytesNbIN = 0;
-      pV4TabPtr[i].othersBytesNbIN = 0;
-      pV4TabPtr[i].udpFlowNbIN = 0;
-      pV4TabPtr[i].tcpFlowNbIN = 0;
-      pV4TabPtr[i].icmpFlowNbIN = 0;
-      pV4TabPtr[i].othersFlowNbIN = 0;
       pV4TabPtr[i].flowNbOUT = 0;
       pV4TabPtr[i].bytesNbOUT = 0;
       pV4TabPtr[i].pktsNbOUT = 0;
-      pV4TabPtr[i].udpPktsNbOUT = 0;
-      pV4TabPtr[i].tcpPktsNbOUT = 0;
-      pV4TabPtr[i].icmpPktsNbOUT = 0;
-      pV4TabPtr[i].othersPktsNbOUT = 0;
-      pV4TabPtr[i].udpBytesNbOUT = 0;
-      pV4TabPtr[i].tcpBytesNbOUT = 0;
-      pV4TabPtr[i].icmpBytesNbOUT = 0;
-      pV4TabPtr[i].othersBytesNbOUT = 0;
-      pV4TabPtr[i].udpFlowNbOUT = 0;
-      pV4TabPtr[i].tcpFlowNbOUT = 0;
-      pV4TabPtr[i].icmpFlowNbOUT = 0;
-      pV4TabPtr[i].othersFlowNbOUT = 0;
+      pV4TabPtr[i].firstCoSIN = 0;
+      pV4TabPtr[i].secondCoSIN = 0;
+      pV4TabPtr[i].thirdCoSIN = 0;
+      pV4TabPtr[i].fourthCoSIN = 0;
+      pV4TabPtr[i].firstCoSOUT = 0;
+      pV4TabPtr[i].secondCoSOUT = 0;
+      pV4TabPtr[i].thirdCoSOUT = 0;
+      pV4TabPtr[i].fourthCoSOUT = 0;
     }
   if( fclose(prefixFile) == 0) {

trunk/src/get_conf.h

@@ -33 +33 @@
   unsigned short mask;     /* prefix mask  */
   unsigned short routerNb; /* router ID */
-  unsigned long long flowNbIN; 
-  unsigned long long bytesNbIN; 
+  unsigned long long flowNbIN;  /* WARNING !!! */
+  unsigned long long bytesNbIN; /* Here, IN means "to the prefix" */
   unsigned long long pktsNbIN; 
-  unsigned long long udpPktsNbIN;   /* WARNING !!! */
-  unsigned long long tcpPktsNbIN;   /* Here, IN means "to the prefix" */
-  unsigned long long icmpPktsNbIN;  /* or "prefix in destination address */
-  unsigned long long othersPktsNbIN;
-  unsigned long long udpBytesNbIN;
-  unsigned long long tcpBytesNbIN;
-  unsigned long long icmpBytesNbIN;
-  unsigned long long othersBytesNbIN;
-  unsigned long long udpFlowNbIN;
-  unsigned long long tcpFlowNbIN;
-  unsigned long long icmpFlowNbIN;
-  unsigned long long othersFlowNbIN;
   unsigned long long flowNbOUT;  /* WARNING !!! */
   unsigned long long bytesNbOUT;  /* Here, OUT means "from the prefix" */
-  unsigned long long pktsNbOUT;  /* or "prefix in source address */
-  unsigned long long udpPktsNbOUT;
-  unsigned long long tcpPktsNbOUT;
-  unsigned long long icmpPktsNbOUT;
-  unsigned long long othersPktsNbOUT;
-  unsigned long long udpBytesNbOUT;
-  unsigned long long tcpBytesNbOUT;
-  unsigned long long icmpBytesNbOUT;
-  unsigned long long othersBytesNbOUT;
-  unsigned long long udpFlowNbOUT;
-  unsigned long long tcpFlowNbOUT;
-  unsigned long long icmpFlowNbOUT;
-  unsigned long long othersFlowNbOUT;
+  unsigned long long pktsNbOUT;
+  unsigned long long firstCoSIN; /* only the bytes for CoS */
+  unsigned long long secondCoSIN;
+  unsigned long long thirdCoSIN;
+  unsigned long long fourthCoSIN;
+  unsigned long long firstCoSOUT;
+  unsigned long long secondCoSOUT;
+  unsigned long long thirdCoSOUT;
+  unsigned long long fourthCoSOUT;
 };
 

trunk/src/msg_mgmt.h

@@ -28 +28 @@
 typedef struct {  
   long type;
-  char text [512];
+  unsigned char text [512];
 } msgType;
 

trunk/src/renetcol.c

@@ -69 +69 @@
 unsigned long indexedRouterList[ROUTER_INDEX_MAX];
 int routerNb = 0;                                  /* routers number */
-/* unsigned short v4PrefixNb = 0;                      IPv4 prefix number */ 
-/* struct PrefixV4 prefixV4Tab[2][MAX_IPV4_PREFIX];       IPv4 prefix structure */
+/* unsigned short v4PrefixNb = 0;                    IPv4 prefix number */ 
+/* struct PrefixV4 prefixV4Tab[2][MAX_IPV4_PREFIX];  IPv4 prefix structure */
 
 
@@ -208 +208 @@
   myPtrs.ipNbPtr =  &ipNb;
   myPtrs.mplsNbPtr =  &mplsNb;
-  
+  myPtrs.routersID = &indexedRouterList;
+ 
   if (myPtrs.pcktPtr==NULL) {
     fprintf(stderr, "ERROR in struct Datagram allocation\n");
@@ -378 +379 @@
 socketLoop()
 {
-  unsigned short shift;
+  short shift;
   short version = 0;
   int regRouter = 0;
@@ -384 +385 @@
   int iIP, iMPLS, i;
   int loopNb = 0;
+  int gardeFou = 0;
   time_t lastIPOutput, lastMPLSOutput;
   time_t receptionTime;
@@ -393 +395 @@
   lastIPOutput = now;
   do {
+    fprintf (stderr, "socket loop \n");
     if ( ((tmPtr->tm_min)%STEP == 0) && (currentIntervalle != tmPtr->tm_min)){
       currentIntervalle = tmPtr->tm_min;
@@ -401 +404 @@
       }
       shmForAgg->readed = 1;
-      printf("We change the table, min : %d, ct: %hu\n", tmPtr->tm_min,
-             shmForAgg->currentTable);
     }
     if (sigusr1Up == 1){
@@ -429 +430 @@
       currentFlowsetNumber = 0;
       shift = 0;
+      gardeFou=0;
       while ((currentFlowsetNumber < myPtrs.currentHeaderV9Ptr->count)) {
+        gardeFou++;
         curTplFlSetPtr = NULL;
         currentFlowsetId=getFlowsetId(currentFlowsetNumber, 
                                       myPtrs.offsetV9Ptr, myPtrs.ptr_buffer);
         if ( currentFlowsetId == 0 ) {
-          shift = checkTemplateFlowSet(myPtrs.currentRouterPtr, myPtrs.offsetV9Ptr, 
-                                       myPtrs.ptr_buffer, myPtrs.currentHeaderV9Ptr,
-                                       curTplFlSetPtr,
-                                       myPtrs.currentFlowsetNumberPtr,
-                                       myQueue);
+          if ( (shift = checkTemplateFlowSet(myPtrs.currentRouterPtr, myPtrs.offsetV9Ptr, 
+                                             myPtrs.ptr_buffer, myPtrs.currentHeaderV9Ptr,
+                                             curTplFlSetPtr,
+                                             myPtrs.currentFlowsetNumberPtr,
+                                             myQueue)) < 0 ) {
+            fprintf(stderr, "\nShift < 0 \n");
+            currentFlowsetNumber = myPtrs.currentHeaderV9Ptr->count + 1;
+          };
+          writeAllTplFlSet();
         } else if (currentFlowsetId == 1) {
-          shift = checkTemplateOption(myPtrs.currentRouterPtr, myPtrs.offsetV9Ptr, 
+          if ( (shift = checkTemplateOption(myPtrs.currentRouterPtr, myPtrs.offsetV9Ptr, 
                                       myPtrs.ptr_buffer, myPtrs.currentHeaderV9Ptr,
                                       curTplOptionPtr,
-                                      myPtrs.currentFlowsetNumberPtr);
+                                            myPtrs.currentFlowsetNumberPtr) ) < 0 ) {
+            fprintf(stderr, "\nShift Option < 0 \n");
+            currentFlowsetNumber = myPtrs.currentHeaderV9Ptr->count + 1;
+          }
         } else {
-          shift = checkDataFlowSet(shift,
-                                   &myPtrs,
-                                   myQueue, 
-                                   shmForAgg->prefixV4Tab[shmForAgg->currentTable],
-                                   (size_t) shmForAgg->v4PrefixNb
-                                   );
+          if ( (shift = checkDataFlowSet(shift,
+                                         &myPtrs,
+                                         myQueue, 
+                                         shmForAgg->prefixV4Tab[shmForAgg->currentTable],
+                                         (size_t) shmForAgg->v4PrefixNb
+                                         ) ) < 0 ) {
+            fprintf(stderr, "\nShift check < 0 \n");
+            currentFlowsetNumber = myPtrs.currentHeaderV9Ptr->count + 1;
+          }
         }
+        if ( gardeFou > 200) { exit(-1); }
       } /* end while flowset exist */
       break;
@@ -467 +481 @@
       /* FIXME perhaps call this function via the compilation options */
       writeAllTplFlSet();
-/*       for (i=0; i<shmForAgg->v4PrefixNb; i++){ */
-/*      fprintf(stderr, "%lu \n %llu flows,\t %llu bytes,\t %llu pkts\n Pkts (udp tcp icmp others): %llu \t %llu \t %llu \t %llu\n Bytes (udp tcp icmp others): %llu \t %llu \t %llu \t %llu\n Flows (udp tcp icmp others): %llu \t %llu \t %llu \t %llu\n \n %llu flows,\t %llu bytes,\t %llu pkts\n Pkts (udp tcp icmp others): %llu \t %llu \t %llu \t %llu\n Bytes (udp tcp icmp others): %llu \t %llu \t %llu \t %llu\n Flows (udp tcp icmp others): %llu \t %llu \t %llu \t %llu\n \n", */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].beginning, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].flowNbIN, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].bytesNbIN, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].pktsNbIN, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].udpPktsNbIN, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].tcpPktsNbIN, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].icmpPktsNbIN, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].othersPktsNbIN, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].udpBytesNbIN, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].tcpBytesNbIN, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].icmpBytesNbIN, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].othersBytesNbIN, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].udpFlowNbIN, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].tcpFlowNbIN, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].icmpFlowNbIN, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].othersFlowNbIN, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].flowNbOUT, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].bytesNbOUT, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].pktsNbOUT, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].udpPktsNbOUT, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].tcpPktsNbOUT, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].icmpPktsNbOUT, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].othersPktsNbOUT, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].udpBytesNbOUT, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].tcpBytesNbOUT, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].icmpBytesNbOUT, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].othersBytesNbOUT, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].udpFlowNbOUT, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].tcpFlowNbOUT, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].icmpFlowNbOUT, */
-/*              shmForAgg->prefixV4Tab[shmForAgg->currentTable][i].othersFlowNbOUT */
-/*              ); */
-/*       } */
+      fprintf(stderr, " loop %d \n", loopNb);
       loopNb = 0;
     }
@@ -763 +743 @@
     if ((tmpOP = tmp->tplOptList) != NULL){
       for (; tmpOP; tmpOP=tmpOP->next) {
-        fprintf(TPLFILE,"OpTId %hu (sourceId: %lu) >\n", 
+        fprintf(TPLFILE,"OpTId %hu (sourceId: %lu) >\n lg: %hu, opScopeLg: %hu, opLg: %hu\n", 
                 tmpOP->templateOptionId,
-                tmpOP->sourceId);
+                tmpOP->sourceId,
+                tmpOP->length,
+                tmpOP->optionScopeLg,
+                tmpOP->optionLg);
         printFieldSet(TPLFILE, tmpOP->fieldSet);
         fprintf(TPLFILE,"\n");
@@ -773 +756 @@
   }
   fclose(TPLFILE);
-}
+  fprintf (stderr, "end write file def template \n");
+}

trunk/src/renetcol.h

@@ -86 +86 @@
 #define MAX_MPLS_FLOW 200
 
-#define SHMSIZE 3000000
+#define SHMSIZE 33554432
 
 #define STEP 5  /* in min */

trunk/src/renetcolAgg.c

@@ -24 +24 @@
  */
 
+/*
+ * In this file, I use directly the C rrd librairy to create and update
+ * the rrd files which contain the statistique for each subnet.
+ * When your system (CPU+MEM+HD) is too fast and the number of your subnet too big
+ * (> 1024), the create and update process can be too fast and before the 
+ * creation end the maximum number of files which can be opened for one process
+ * in the same time is reached. So we must temporize.
+ */
+
 #include "renetcolAgg.h"
 
@@ -32 +41 @@
 {
   int shmid;
-  int i, index;
+  int i, j, index;
+  int rrd_update_er_ct = 0;
+  int rrd_update_ok_ct = 0;
+  int rrd_already_created_ct = 0;
+  int rrd_create_er_ct = 0;
+  int rrd_create_ok_ct = 0;
+  int rrd_ct = 0;
   key_t key;
   static char buf[2048];
@@ -38 +53 @@
   static char ipStr[20];
   static char createstr[2048];
+  char *opt[27];
+  char *optUpdate[3];
   int res_rrd = 0;
   FILE *fp;
-  static time_t now;
-
+  static time_t now, now2;
+  
   key = 8765;
   if ((shmid = shmget(key, SHMSIZE, 0666)) < 0) {
@@ -75 +92 @@
         buf[0] = '\0';
         strcat(name, RRD_LOCATION);
-        sprintf(ipStr, "%lu", shmForAgg->prefixV4Tab[index][i].beginning); 
+        sprintf(ipStr, "%lu_%lu_%lu_%lu_%hu", 
+                shmForAgg->prefixV4Tab[index][i].beginning>>24,
+                shmForAgg->prefixV4Tab[index][i].beginning<<8>>24,
+                shmForAgg->prefixV4Tab[index][i].beginning<<16>>24,
+                shmForAgg->prefixV4Tab[index][i].beginning<<24>>24,
+                shmForAgg->prefixV4Tab[index][i].mask
+                ); 
         strcat(name, ipStr);
         /*      strcat(name, SAMPLING_HERE); */
         strcat(name, RRD_EXTENSION);
-        fprintf(stderr, "%s\n", name);
         if ( (fp=fopen(name,"r")) == NULL ){
-          strcat(createstr, name);
-          strcat(createstr, END_RRD_CREATE);
-          fprintf(stderr, "%s\n", createstr);
-          res_rrd = wrap_rrd_create(createstr);
-        }else{
+          opt[0]= (char *) malloc((strlen(RRD_PARAM_0) + 1) * sizeof(char));
+          strcpy(opt[0], RRD_PARAM_0);
+          opt[1]= (char *) malloc((strlen(name) + 1) * sizeof(char));
+          strcpy(opt[1], name);
+          opt[2]= (char *) malloc((strlen(RRD_PARAM_1) + 1) * sizeof(char));
+          strcpy(opt[2], RRD_PARAM_1);
+          opt[3]= (char *) malloc((strlen(RRD_PARAM_2) + 1) * sizeof(char));
+          strcpy(opt[3], RRD_PARAM_2);
+          opt[4]= (char *) malloc((strlen(RRD_PARAM_3) + 1) * sizeof(char));
+          strcpy(opt[4], RRD_PARAM_3);
+          opt[5]= (char *) malloc((strlen(RRD_PARAM_4) + 1) * sizeof(char));
+          strcpy(opt[5], RRD_PARAM_4);
+          opt[6]= (char *) malloc((strlen(RRD_PARAM_5) + 1) * sizeof(char));
+          strcpy(opt[6], RRD_PARAM_5);
+          opt[7]= (char *) malloc((strlen(RRD_PARAM_6) + 1) * sizeof(char));
+          strcpy(opt[7], RRD_PARAM_6);
+          opt[8]= (char *) malloc((strlen(RRD_PARAM_7) + 1) * sizeof(char));
+          strcpy(opt[8], RRD_PARAM_7);
+          opt[9]= (char *) malloc((strlen(RRD_PARAM_8) + 1) * sizeof(char));
+          strcpy(opt[9], RRD_PARAM_8);
+          opt[10]= (char *) malloc((strlen(RRD_PARAM_9) + 1) * sizeof(char));
+          strcpy(opt[10], RRD_PARAM_9);
+          opt[12]= (char *) malloc((strlen(RRD_PARAM_10) + 1) * sizeof(char));
+          strcpy(opt[11], RRD_PARAM_10);
+          opt[12]= (char *) malloc((strlen(RRD_PARAM_11) + 1) * sizeof(char));
+          strcpy(opt[12], RRD_PARAM_11);
+          opt[13]= (char *) malloc((strlen(RRD_PARAM_12) + 1) * sizeof(char));
+          strcpy(opt[13], RRD_PARAM_12);
+          opt[14]= (char *) malloc((strlen(RRD_PARAM_13) + 1) * sizeof(char));
+          strcpy(opt[14], RRD_PARAM_13);
+          opt[15]= (char *) malloc((strlen(RRD_PARAM_14) + 1) * sizeof(char));
+          strcpy(opt[15], RRD_PARAM_14);
+          opt[16]= (char *) malloc((strlen(RRD_PARAM_15) + 1) * sizeof(char));
+          strcpy(opt[16], RRD_PARAM_15);
+          opt[17]= (char *) malloc((strlen(RRD_PARAM_16) + 1) * sizeof(char));
+          strcpy(opt[17], RRD_PARAM_16);
+          opt[18]= (char *) malloc((strlen(RRD_PARAM_17) + 1) * sizeof(char));
+          strcpy(opt[18], RRD_PARAM_17);
+          opt[19]= (char *) malloc((strlen(RRD_PARAM_18) + 1) * sizeof(char));
+          strcpy(opt[19], RRD_PARAM_18);
+          opt[20]= (char *) malloc((strlen(RRD_PARAM_19) + 1) * sizeof(char));
+          strcpy(opt[20], RRD_PARAM_19);
+          opt[21]= (char *) malloc((strlen(RRD_PARAM_20) + 1) * sizeof(char));
+          strcpy(opt[21], RRD_PARAM_20);
+          opt[22]= (char *) malloc((strlen(RRD_PARAM_21) + 1) * sizeof(char));
+          strcpy(opt[22], RRD_PARAM_21);
+          opt[23]= (char *) malloc((strlen(RRD_PARAM_22) + 1) * sizeof(char));
+          strcpy(opt[23], RRD_PARAM_22);
+          opt[24]= (char *) malloc((strlen(RRD_PARAM_23) + 1) * sizeof(char));
+          strcpy(opt[24], RRD_PARAM_23);
+          opt[25]= (char *) malloc((strlen(RRD_PARAM_24) + 1) * sizeof(char));
+          strcpy(opt[25], RRD_PARAM_24);
+          opt[26]= (char *) malloc((strlen(RRD_PARAM_25) + 1) * sizeof(char));
+          strcpy(opt[26], RRD_PARAM_25);
+          optind = opterr = 0;
+          rrd_clear_error();
+          if ( rrd_create(27,opt) < 0) {
+            syslog(LOG_ERR, "RRD create file %s, error: %s\n", name, rrd_get_error());
+            rrd_create_er_ct++;
+          } else {
+            rrd_create_ok_ct++;
+          }
+          for ( j=0; j<27; j++) {
+            free(opt[j]);
+            opt[j] = NULL;
+          }
+        }else{ 
           fclose(fp);
-        }
-    
-        snprintf(buf, 2048, "%s%s%s %lu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu", 
-                 RRD_LOCATION, 
-                 ipStr,
-                 RRD_EXTENSION, 
-                 now-300,  /* or ctime(&now) with %s */
-                 shmForAgg->prefixV4Tab[index][i].flowNbIN,  /* 1  */
-                 shmForAgg->prefixV4Tab[index][i].flowNbOUT,
-                 shmForAgg->prefixV4Tab[index][i].bytesNbIN,
-                 shmForAgg->prefixV4Tab[index][i].bytesNbOUT,
-                 shmForAgg->prefixV4Tab[index][i].pktsNbIN,  /* 5 */
-                 shmForAgg->prefixV4Tab[index][i].pktsNbOUT,
-                 shmForAgg->prefixV4Tab[index][i].udpPktsNbIN,
-                 shmForAgg->prefixV4Tab[index][i].udpPktsNbOUT,
-                 shmForAgg->prefixV4Tab[index][i].tcpPktsNbIN,
-                 shmForAgg->prefixV4Tab[index][i].tcpPktsNbOUT, /* 10 */
-                 shmForAgg->prefixV4Tab[index][i].icmpPktsNbIN,
-                 shmForAgg->prefixV4Tab[index][i].icmpPktsNbOUT,
-                 shmForAgg->prefixV4Tab[index][i].othersPktsNbIN,
-                 shmForAgg->prefixV4Tab[index][i].othersPktsNbOUT,
-                 shmForAgg->prefixV4Tab[index][i].udpBytesNbIN,  /* 15 */
-                 shmForAgg->prefixV4Tab[index][i].udpBytesNbOUT,
-                 shmForAgg->prefixV4Tab[index][i].tcpBytesNbIN,
-                 shmForAgg->prefixV4Tab[index][i].tcpBytesNbOUT,
-                 shmForAgg->prefixV4Tab[index][i].icmpBytesNbIN,
-                 shmForAgg->prefixV4Tab[index][i].icmpBytesNbOUT,  /*  20 */
-                 shmForAgg->prefixV4Tab[index][i].othersBytesNbIN,
-                 shmForAgg->prefixV4Tab[index][i].othersBytesNbOUT,
-                 shmForAgg->prefixV4Tab[index][i].udpFlowNbIN,
-                 shmForAgg->prefixV4Tab[index][i].udpFlowNbOUT,
-                 shmForAgg->prefixV4Tab[index][i].tcpFlowNbIN, /* 25 */
-                 shmForAgg->prefixV4Tab[index][i].tcpFlowNbOUT,
-                 shmForAgg->prefixV4Tab[index][i].icmpFlowNbIN,
-                 shmForAgg->prefixV4Tab[index][i].icmpFlowNbOUT,
-                 shmForAgg->prefixV4Tab[index][i].othersFlowNbIN,
-                 shmForAgg->prefixV4Tab[index][i].othersFlowNbOUT  /* 30 */
-                 );
-        printf("\n%s\n", buf); 
-        if ( (res_rrd = wrap_rrd_update(buf)) < 0 ) { 
-          syslog(LOG_ERR, "wrap_rrd_update return : %d, param were : %s", res_rrd, buf);
+          rrd_already_created_ct++;
+          snprintf(buf, 
+                   2048, 
+                   "%lu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu",  
+                   now-300,  /* or ctime(&now) with %s */
+                   shmForAgg->prefixV4Tab[index][i].flowNbIN,  /* 1 */
+                   shmForAgg->prefixV4Tab[index][i].flowNbOUT,
+                   shmForAgg->prefixV4Tab[index][i].bytesNbIN,
+                   shmForAgg->prefixV4Tab[index][i].bytesNbOUT,
+                   shmForAgg->prefixV4Tab[index][i].pktsNbIN,  /* 5 */
+                   shmForAgg->prefixV4Tab[index][i].pktsNbOUT,
+                   shmForAgg->prefixV4Tab[index][i].firstCoSIN,
+                   shmForAgg->prefixV4Tab[index][i].firstCoSOUT,
+                   shmForAgg->prefixV4Tab[index][i].secondCoSIN,
+                   shmForAgg->prefixV4Tab[index][i].secondCoSOUT,
+                   shmForAgg->prefixV4Tab[index][i].thirdCoSIN,
+                   shmForAgg->prefixV4Tab[index][i].thirdCoSOUT,
+                   shmForAgg->prefixV4Tab[index][i].fourthCoSIN,
+                   shmForAgg->prefixV4Tab[index][i].fourthCoSOUT
+                   );
+          optUpdate[0]= (char *) malloc((strlen(RRD_UPDATE_0) + 1) * sizeof(char));
+          strcpy(optUpdate[0], RRD_UPDATE_0);
+          optUpdate[1]= (char *) malloc((strlen(name) + 1) * sizeof(char));
+          strcpy(optUpdate[1], name);
+          optUpdate[2]= (char *) malloc((strlen(buf) + 1) * sizeof(char));
+          strcpy(optUpdate[2], buf);
+          optind = opterr = 0; 
+          rrd_clear_error();
+          if ( rrd_update(3, optUpdate) < 0 ) { 
+            syslog(LOG_ERR, "RRD update file %s, error: %s\n", name, rrd_get_error());
+            rrd_update_er_ct++;
+          } else {
+            rrd_update_ok_ct++;
+          }
+          for ( j=0; j<3; j++) {
+            free(optUpdate[j]);
+            optUpdate[j] = NULL;
+          }
         }
         /* Reinit the shared table */
@@ -133 +214 @@
         shmForAgg->prefixV4Tab[index][i].bytesNbIN = 0;
         shmForAgg->prefixV4Tab[index][i].pktsNbIN = 0;
-        shmForAgg->prefixV4Tab[index][i].udpPktsNbIN = 0;
-        shmForAgg->prefixV4Tab[index][i].tcpPktsNbIN = 0;
-        shmForAgg->prefixV4Tab[index][i].icmpPktsNbIN = 0;
-        shmForAgg->prefixV4Tab[index][i].othersPktsNbIN = 0;
-        shmForAgg->prefixV4Tab[index][i].udpBytesNbIN = 0;
-        shmForAgg->prefixV4Tab[index][i].tcpBytesNbIN = 0;
-        shmForAgg->prefixV4Tab[index][i].icmpBytesNbIN = 0;
-        shmForAgg->prefixV4Tab[index][i].othersBytesNbIN = 0;
-        shmForAgg->prefixV4Tab[index][i].udpFlowNbIN = 0;
-        shmForAgg->prefixV4Tab[index][i].tcpFlowNbIN = 0;
-        shmForAgg->prefixV4Tab[index][i].icmpFlowNbIN = 0;
-        shmForAgg->prefixV4Tab[index][i].othersFlowNbIN = 0;
         shmForAgg->prefixV4Tab[index][i].flowNbOUT = 0;
         shmForAgg->prefixV4Tab[index][i].bytesNbOUT = 0;
         shmForAgg->prefixV4Tab[index][i].pktsNbOUT = 0;
-        shmForAgg->prefixV4Tab[index][i].udpPktsNbOUT = 0;
-        shmForAgg->prefixV4Tab[index][i].tcpPktsNbOUT = 0;
-        shmForAgg->prefixV4Tab[index][i].icmpPktsNbOUT = 0;
-        shmForAgg->prefixV4Tab[index][i].othersPktsNbOUT = 0;
-        shmForAgg->prefixV4Tab[index][i].udpBytesNbOUT = 0;
-        shmForAgg->prefixV4Tab[index][i].tcpBytesNbOUT = 0;
-        shmForAgg->prefixV4Tab[index][i].icmpBytesNbOUT = 0;
-        shmForAgg->prefixV4Tab[index][i].othersBytesNbOUT = 0;
-        shmForAgg->prefixV4Tab[index][i].udpFlowNbOUT = 0;
-        shmForAgg->prefixV4Tab[index][i].tcpFlowNbOUT = 0;
-        shmForAgg->prefixV4Tab[index][i].icmpFlowNbOUT = 0;
-        shmForAgg->prefixV4Tab[index][i].othersFlowNbOUT = 0;   
+        shmForAgg->prefixV4Tab[index][i].firstCoSIN = 0;
+        shmForAgg->prefixV4Tab[index][i].secondCoSIN = 0;
+        shmForAgg->prefixV4Tab[index][i].thirdCoSIN = 0;
+        shmForAgg->prefixV4Tab[index][i].fourthCoSIN = 0;
+        shmForAgg->prefixV4Tab[index][i].firstCoSOUT = 0;
+        shmForAgg->prefixV4Tab[index][i].secondCoSOUT = 0;
+        shmForAgg->prefixV4Tab[index][i].thirdCoSOUT = 0;
+        shmForAgg->prefixV4Tab[index][i].fourthCoSOUT = 0;
       }
+      now2 = time((time_t *)NULL);
+      fprintf(stderr, "IPv4 subnet managment (rrd update) : \n %d sec, %d files updated, %d errors, total %d\n %d rrd file already created, %d errors in creation, %d new rrd file creations",
+              now2-now,
+              rrd_update_ok_ct,
+              rrd_update_er_ct,
+              rrd_update_ok_ct+rrd_update_er_ct,
+              rrd_already_created_ct,
+              rrd_create_er_ct,
+              rrd_create_ok_ct);
+      rrd_update_ok_ct = 0;
+      rrd_update_er_ct = 0;
+      rrd_already_created_ct = 0;
+      rrd_create_er_ct = 0;
+      rrd_create_ok_ct = 0;
+      rrd_clear_error();
     }
     sleep(5);

trunk/src/renetcolAgg.h

@@ -38 +38 @@
 #include <sys/sem.h>
 
+#include "rrd.h"
 #include "rrdwrap.h"
 #include "dataFlowSet.h"
 
-#define RRD_LOCATION ""
+#define RRD_LOCATION "/home/maintenance/RRD/"
 #define RRD_EXTENSION ".rrd"
-#define END_RRD_CREATE " --start 1106560200 DS:inFlows:GAUGE:600:U:U DS:outFlows:GAUGE:600:U:U DS:inBytes:GAUGE:600:U:U DS:outBytes:GAUGE:600:U:U DS:inPkts:GAUGE:600:U:U DS:outPkts:GAUGE:600:U:U DS:inUdpPkts:GAUGE:600:U:U DS:outUdpPkts:GAUGE:600:U:U DS:inTcpPkts:GAUGE:600:U:U DS:outTcpPkts:GAUGE:600:U:U DS:inIcmpPkts:GAUGE:600:U:U DS:outIcmpPkts:GAUGE:600:U:U DS:inOthersPkts:GAUGE:600:U:U DS:outOthersPkts:GAUGE:600:U:U DS:inUdpBytes:GAUGE:600:U:U DS:outUdpBytes:GAUGE:600:U:U DS:inTcpBytes:GAUGE:600:U:U DS:outTcpBytes:GAUGE:600:U:U DS:inIcmpBytes:GAUGE:600:U:U DS:outIcmpBytes:GAUGE:600:U:U DS:inOthersBytes:GAUGE:600:U:U DS:outOthersBytes:GAUGE:600:U:U DS:inUdpFlows:GAUGE:600:U:U DS:outUdpFlows:GAUGE:600:U:U DS:inTcpFlows:GAUGE:600:U:U DS:outTcpFlows:GAUGE:600:U:U DS:inIcmpFlows:GAUGE:600:U:U DS:outIcmpFlows:GAUGE:600:U:U DS:inOthersFlows:GAUGE:600:U:U DS:outOthersFlows:GAUGE:600:U:U RRA:AVERAGE:0.5:1:2100 RRA:AVERAGE:0.5:24:1550 RRA:AVERAGE:0.5:288:1594 RRA:AVERAGE:0.5:2016:1040 RRA:MAX:0.5:1:2100 RRA:MAX:0.5:24:1550 RRA:MAX:0.5:288:1594 RRA:MAX:0.5:2016:1040"
-#define SHMSIZE 3000000
+
+#define RRD_PARAM_0 "rrdcreate"
+#define RRD_PARAM_1 "--start"
+#define RRD_PARAM_2 "1106560200"
+#define RRD_PARAM_3 "--step"
+#define RRD_PARAM_4 "300"
+#define RRD_PARAM_5 "DS:inFlows:GAUGE:600:U:U"
+#define RRD_PARAM_6 "DS:outFlows:GAUGE:600:U:U"
+#define RRD_PARAM_7 "DS:inBytes:GAUGE:600:U:U"
+#define RRD_PARAM_8 "DS:outBytes:GAUGE:600:U:U"
+#define RRD_PARAM_9 "DS:inPkts:GAUGE:600:U:U"
+#define RRD_PARAM_10 "DS:outPkts:GAUGE:600:U:U"
+#define RRD_PARAM_11 "DS:inFirstCoS:GAUGE:600:U:U"
+#define RRD_PARAM_12 "DS:outFirstCoS:GAUGE:600:U:U"
+#define RRD_PARAM_13 "DS:inSecondCoS:GAUGE:600:U:U"
+#define RRD_PARAM_14 "DS:outSecondCoS:GAUGE:600:U:U"
+#define RRD_PARAM_15 "DS:inThirdCoS:GAUGE:600:U:U"
+#define RRD_PARAM_16 "DS:outThirdCoS:GAUGE:600:U:U"
+#define RRD_PARAM_17 "DS:inFourthCoS:GAUGE:600:U:U"
+#define RRD_PARAM_18 "DS:outFourthCoS:GAUGE:600:U:U"
+#define RRD_PARAM_19 "RRA:AVERAGE:0.5:1:2100"
+#define RRD_PARAM_20 "RRA:AVERAGE:0.5:24:1550"
+#define RRD_PARAM_21 "RRA:AVERAGE:0.5:288:1594"
+#define RRD_PARAM_22 "RRA:AVERAGE:0.5:2016:1040"
+#define RRD_PARAM_23 "RRA:MAX:0.5:1:2100"
+#define RRD_PARAM_24 "RRA:MAX:0.5:24:1550"
+#define RRD_PARAM_25 "RRA:MAX:0.5:288:1594"
+
+#define RRD_UPDATE_0 "rrdupdate"
+
+#define SHMSIZE 33554432 /* FIXME get from another file ? */
 
 struct SHMForAgg {

trunk/src/routers_mgmt.c

@@ -29 +29 @@
 {
   RouterPtr tmp = rL;
+  int i = 0;
   for ( ; tmp; tmp=tmp->next) {
+    i++;
     if ( tmp->IpAddress == address ){
+/*       fprintf (stderr, "ExistRouter %d parcours %lu.%lu.%lu.%lu\ \n",  */
+/*             i, */
+/*             address>>24, */
+/*             address<<8>>24, */
+/*             address<<16>>24, */
+/*             address<<24>>24 */
+/*             ); */
       return tmp;
     }
   }
+/*   fprintf (stderr, "notExistRouter %lu.%lu.%lu.%lu\n", */
+/*         address>>24, */
+/*         address<<8>>24, */
+/*         address<<16>>24, */
+/*         address<<24>>24); */
   return NULL;
 }
@@ -42 +56 @@
   RouterPtr tmp = (RouterPtr) malloc(sizeof(struct Router));
   if (tmp==NULL) {
+    /* FIXME : syslog here */
     fprintf(stderr, "ERROR in malloc in add_routers function\n");
     exit(1);
@@ -74 +89 @@
   if (ptpl) {
     while ( ptpl->fieldSet != NULL ){
+/*       fprintf(stderr, "deleteTplFlSet\n"); */
       if (!(ptpl->lastField->prev)) {
         freeField(ptpl->lastField);
@@ -111 +127 @@
   if (ptplo) {
     while ( ptplo->fieldSet != NULL ){
+/*       fprintf(stderr, "deleteTplFlSet\n"); */
       if (!(ptplo->lastField->prev)) {
         freeField(ptplo->lastField);

trunk/src/rrdwrap.c

@@ -2 +2 @@
 
 /*      Contributed by Antony Clothier */
+
+/*  Ligne 152 commented FXA*/
 
 #include "rrdwrap.h"
@@ -148 +150 @@
       opterr=0; /* no error messages */
       
-      i = rrd_graph(argc, argv, prdata, &xsize, &ysize);
+/*       i = rrd_graph(argc, argv, prdata, &xsize, &ysize); */
       
       /*        free up the memory*/

trunk/src/rules_mgmt.c

@@ -82 +82 @@
       printHostDef(rPtr->host);
     }
-    invPrintFieldSet(rPtr->fieldToRecord);
+/*     invPrintFieldSet(rPtr->fieldToRecord); */
     printRule(rPtr->next);
   }
@@ -174 +174 @@
   int cptLine;
   
-  if (!(ruleFile = fopen(filename, "r"))) {
+  if ((ruleFile = fopen(filename, "r")) == NULL) {
     syslog(LOG_ERR, "error during %s opening\n", filename);
     exit(1);
@@ -469 +469 @@
       if ((ft==1) || (ft==25)){
           tmp->value = addValue(tmp->value, operatorToNumber, value);
-      } else if ( (ft==8) || (ft==12) || (ft==15) || (ft==18) ){
+      } else if ( (ft==0) || (ft==8) || (ft==12) || (ft==15) || (ft==18) ){
           tmp->value = addAddress(tmp->value, operatorToNumber, value);
       } else if ( (ft==27) || (ft==28) || (ft==62) || (ft==63) ){

trunk/src/template.c

@@ -53 +53 @@
  * it can exist many templates definitions in a template flowset
  */
-unsigned short 
+short 
 checkTemplateFlowSet(RouterPtr cr, unsigned short *offV9, 
                      unsigned char *buf, 
@@ -69 +69 @@
   unsigned short getFlowsetId = 0;
   unsigned short length = 0;
-  TplFlowSetPtr ptpltmp;
+  TplFlowSetPtr ptpltmp = NULL;
   /* for msg sending: */
   msgType myMsg;
@@ -75 +75 @@
   char *msgTextIndex;
   unsigned short tplMsgType = 1;
+  unsigned short badFieldNumber = 0;
+  unsigned short badFieldLength = 0;
 
   buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
@@ -83 +85 @@
   length = *((unsigned short*)&buffer2);
   do {
+    fprintf (stderr, " TD \n");
+    badFieldNumber = 0;
+    badFieldLength = 0;
     buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
     buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
@@ -102 +107 @@
         buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
         buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
-        fldPtr->fieldType = *((unsigned short*)&buffer2);
-        buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
-        buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
-        fldPtr->fieldLength = *((unsigned short*)&buffer2);
+        if ( (fldPtr->fieldType = *((unsigned short*)&buffer2) ) > 89) {
+          badFieldNumber = 1;
+        }
+        buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
+        buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
+        if ( (fldPtr->fieldLength = *((unsigned short*)&buffer2) ) > 16) {
+          badFieldLength = 1;
+        }
         fldPtr->next = cTFSPtr->fieldSet;
         fldPtr->prev = NULL;
@@ -114 +123 @@
         }
         cpt_fields++;
-        if ( cpt_fields > 40 ) { /* FIXME : declarer une constante pour cela */
-          fprintf(stderr,"IP: %lu \n",cr->IpAddress);
-          fprintf (stderr, "cTFSPtr->templateFlowSetId: %hu\n", 
+        if ( (cpt_fields > 40) || (badFieldNumber == 1) || badFieldLength == 1) { /* FIXME : constante pour cela */
+          fprintf(stderr,"\n IP: %lu.%lu.%lu.%lu, %d,%d\n",
+                  cr->IpAddress>>24,
+                  cr->IpAddress<<8>>24,
+                  cr->IpAddress<<16>>24,
+                  cr->IpAddress<<24>>24,
+                  badFieldNumber,
+                  badFieldLength
+                  );
+          fprintf (stderr, "\n cTFSPtr->templateFlowSetId: %hu\n", 
                    cTFSPtr->templateFlowSetId);
           while ( ((*offV9))> (index)){
@@ -125 +141 @@
           }
           syslog (LOG_INFO, 
-                  "fields nb too large, bug collector or wrong template def"); 
-          cTFSPtr = deleteTplFlSet(cTFSPtr);
-        }
+                  "in new template: field nb gt 89, field lg gt 16 or too many fields, bad template definition possibility");
+          fprintf(stderr, 
+                  "\n in new template function: too many fields, bug collector or wrong template def \n"); 
+          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);
+        }
+        fprintf (stderr, "t for new \n");
       }
     } else { /*update*/
@@ -158 +191 @@
         buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
         buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
-        fldPtr->fieldType = *((unsigned short*)&buffer2);
-        buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
-        buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
-        fldPtr->fieldLength = *((unsigned short*)&buffer2);
+        if ( (fldPtr->fieldType = *((unsigned short*)&buffer2) ) > 89) {
+          badFieldNumber = 1;
+        }
+        buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
+        buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
+        if ( (fldPtr->fieldLength = *((unsigned short*)&buffer2) ) > 16) {
+          badFieldLength = 1;
+        }
         fldPtr->next = cTFSPtr->fieldSet;
         fldPtr->prev = NULL;
@@ -172 +209 @@
         }
         cpt_fields++;
-        if ( cpt_fields > 40 ) { /* FIXME : declarer une constante pour cela */
+        if ( (cpt_fields > 40) || (badFieldNumber == 1) || badFieldLength == 1) { /* FIXME : declarer une constante pour cela */
           while ( ((*offV9))> (index)){
             buffer2[1]= *(buf+index); index++;
@@ -180 +217 @@
           }
           syslog (LOG_INFO, 
-                  "fields nb too large, bug collector or wrong template def"); 
-          cTFSPtr = deleteTplFlSet(cTFSPtr);
-        }
+                  "in update template function: too many fields, bug collector or wrong template def in template update");
+          fprintf(stderr,
+                  "\nin update template function: too many fields, bug collector or wrong template def in template update\n");
+          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);    
+        }
+        fprintf (stderr, "t for up \n");
       }
     } /* end if template creation or update */
@@ -232 +286 @@
  *
  */
-unsigned short 
+short 
 checkTemplateOption(RouterPtr cr, unsigned short *offV9, 
                     unsigned char *buf, NetFlowV9HeaderPtr v9Ptr,
@@ -244 +298 @@
   unsigned char buffer2[2];
   TplOptionPtr ptplotmp;
+  unsigned short badFieldNumber = 0;
+  unsigned short badFieldLength = 0;
+  int cpt_fields = 0;
 
   buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
@@ -252 +309 @@
   length = *((unsigned short*)&buffer2);
   do {
+    fprintf (stderr, " TO \n");
+    badFieldNumber = 0;
+    badFieldLength = 0;
     buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
     buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
@@ -269 +329 @@
       buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
       cTOPtr->optionLg = *((unsigned short*)&buffer2);
+      cpt_fields = 0;
       for ( i=0; i<(((cTOPtr->optionScopeLg)+(cTOPtr->optionLg))/4); i++) {
         FieldPtr tmp = (FieldPtr) malloc(sizeof(struct Field));
         buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
         buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
-        tmp->fieldType = *((unsigned short*)&buffer2);
-        buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
-        buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
-        tmp->fieldLength = *((unsigned short*)&buffer2);
+        if ( (tmp->fieldType = *((unsigned short*)&buffer2) ) > 89) {
+          badFieldNumber = 1;
+        }
+        buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
+        buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
+        if ( (tmp->fieldLength = *((unsigned short*)&buffer2) ) > 16) {
+          badFieldLength = 1;
+        }
         tmp->next = cTOPtr->fieldSet;
         tmp->prev = NULL;
@@ -284 +349 @@
           cTOPtr->lastField = tmp;
         }
+        cpt_fields++;
+        if ( (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");
+          fprintf(stderr,
+                  "\nin option template function: too many fields, bug collector or wrong template def in template update\n");
+          ptplotmp = cTOPtr;
+          if (ptplotmp->prev == NULL) {
+            cr->tplOptList = ptplotmp->next;
+            if (cr->tplOptList) {
+              cr->tplOptList->prev = NULL;
+            }
+          } else {
+            ptplotmp->prev->next = ptplotmp->next;
+            if (ptplotmp->next) {
+              ptplotmp->next->prev = ptplotmp->prev;
+            }
+          }
+          deleteTplOption(ptplotmp);
+          cTOPtr = NULL;
+          return (-1);
+        }
+        fprintf (stderr, "to for new \n");
       }
       while ((*offV9)%4 != 0) {
         (*offV9)++; cpt++;
+        fprintf (stderr, " TO new padding \n");
       } /*padding case*/
     } else { /*update */
@@ -315 +404 @@
       buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
       cTOPtr->optionLg = *((unsigned short*)&buffer2);
+      cpt_fields = 0;
       for ( i=0; i<(((cTOPtr->optionScopeLg)+(cTOPtr->optionLg))/4); i++) {
         FieldPtr tmp = (FieldPtr) malloc(sizeof(struct Field));
         buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
         buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
-        tmp->fieldType = *((unsigned short*)&buffer2);
-        buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
-        buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
-        tmp->fieldLength = *((unsigned short*)&buffer2);
+        if ( (tmp->fieldType = *((unsigned short*)&buffer2) ) > 89) {
+          badFieldNumber = 1;
+        }
+        buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
+        buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
+        if ( (tmp->fieldLength = *((unsigned short*)&buffer2) ) > 16) {
+          badFieldLength = 1;
+        }
         tmp->next = cTOPtr->fieldSet;
         tmp->prev = NULL;
@@ -330 +424 @@
           cTOPtr->lastField = tmp;
         }
+        cpt_fields++;
+        if ( (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");
+          fprintf(stderr,
+                  "\nin update option tpl function: too many fields, bug collector or wrong template def in template update\n");
+          ptplotmp = cTOPtr;
+          if (ptplotmp->prev == NULL) {
+            cr->tplOptList = ptplotmp->next;
+            if (cr->tplOptList) {
+              cr->tplOptList->prev = NULL;
+            }
+          } else {
+            ptplotmp->prev->next = ptplotmp->next;
+            if (ptplotmp->next) {
+              ptplotmp->next->prev = ptplotmp->prev;
+            }
+          }
+          deleteTplOption(ptplotmp);
+          cTOPtr = NULL;
+          return (-1);
+        }
+        fprintf (stderr, "to for up \n");
       }
       while ((*offV9)%4 != 0) {
         (*offV9)++; cpt++;
+        fprintf (stderr, " TO update padding \n");
       } /*padding case*/
     }
@@ -338 +456 @@
   } while ((cpt) < (length-2));
 /*   show_all_tplFlSet(); */
+  fprintf (stderr, "to return %d \n", length);
   return length;
 }

trunk/src/template.h

@@ -34 +34 @@
 
 short getFlowsetId(short, unsigned short *, unsigned char *);
-unsigned short checkTemplateFlowSet(RouterPtr, unsigned short *,
+short checkTemplateFlowSet(RouterPtr, unsigned short *,
                                     unsigned char *,
                                     NetFlowV9HeaderPtr,
                                     TplFlowSetPtr, short *, int);
-unsigned short checkTemplateOption(RouterPtr, unsigned short *, 
+short checkTemplateOption(RouterPtr, unsigned short *, 
                                    unsigned char *, 
                                    NetFlowV9HeaderPtr,

trunk/tool/renetcolGUI_0_0_3.py

@@ -589 +589 @@
             coll_hbox.set_border_width(5)
             coll_frame.add(coll_hbox)
-            button = gtk.CheckButton(" router ")
+##            button = gtk.CheckButton(" router ")
             button.connect("toggled", callback_check_rule, None)
             coll_hbox.pack_start(button, False, False, 0)
-            mainTT.set_tip(button, "Check it to capture all flows from one router and enter the IPv4 address of this router. NOT SUPPORTED IN THIS RELEASE")
-            button.show()
+            mainTT.set_tip(button, "Check it to capture all flows from one router and enter the IPv4 address of this router. IN TEST")
+##            button.show()
             coll_pbbox = gtk.HButtonBox()
             coll_hbox.pack_start(coll_pbbox, False, True, 5)
-            prefix_entry(45, "Required Format : \n <field> <operation> <address>\nlike 8 = 10.0.0.1 \nor 8 = 10.0.1.0/24 \nor 27 = 2001::1 \nor 27 = 2001::/64 (IPv6 address only on Linux system)\nonly '=' operator for the moment\n------------------------------\nIn this version 0.0.2, you can compare the following fields:\nIPV4_SRC_ADDR: 8\nIPV4_DST_ADDR: 12\nIPV4_NEXT_HOP: 15\nBGP_IPV4_NEXT_HOP: 18\nIPV6_SRC_ADDR: 27\nIPV6_DST_ADDR: 28\nIPV6_NEXT_HOP: 62\nBPG_IPV6_NEXT_HOP: 63\nIP_PROTOCOL_VERSION: 60\n---------------------------", coll_pbbox, "", 0)
+            prefix_entry(45, "Required Format : \n <field> <operation> <address>\nlike 8 = 10.0.0.1 \nor 8 = 10.0.1.0/24 \nor 27 = 2001::1 \nor 27 = 2001::/64 (IPv6 address only on Linux system)\nonly '=' operator for the moment\n------------------------------\nIn this version 0.0.7, you can compare the following fields:\nROUTER_SRC_ADDR: 0\nIPV4_SRC_ADDR: 8\nIPV4_DST_ADDR: 12\nIPV4_NEXT_HOP: 15\nBGP_IPV4_NEXT_HOP: 18\nIPV6_SRC_ADDR: 27\nIPV6_DST_ADDR: 28\nIPV6_NEXT_HOP: 62\nBPG_IPV6_NEXT_HOP: 63\nIP_PROTOCOL_VERSION: 60\n---------------------------", coll_pbbox, "", 0)
             coll_frame2 = gtk.Frame("Disable rules")
             coll_vbox.pack_start(coll_frame2, False, False, 5)
@@ -724 +724 @@
             operator = rule[1]
             value = rule[2]
-            if (field=='8' or field=='12' or field=='15' or field=='18' or field=='47'):
+            if (field=='0' or field=='8' or field=='12' or field=='15' or field=='18' or field=='47'):
                 if (re.match('^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(/\d{1,2})?$',value)):
                     splitter = value.split('/')
@@ -992 +992 @@
 
     print "---------------------------------------------------------------"
-    print "In this version 0.0.3, you can apply rules on the collector based on the following fields:"
+    print "In this version 0.0.7, you can apply rules on the collector based on the following fields:"
     print "IPV4_SRC_ADDR: 8,"
     print "IPV4_DST_ADDR: 12,"
@@ -1002 +1002 @@
     print "IPV6_NEXT_HOP: 62,"
     print "BPG_IPV6_NEXT_HOP: 63,"
-    print "IP_PROTOCOL_VERSION: 60"
+    print "IP_PROTOCOL_VERSION: 60, please note that the IPv4 template don't have this field"
+    print "ROUTER_SRC_ADDR: 0, here it's not a real number for a field"
     print "----------------------------------------------------------------"