Changeset 57 for trunk/src

Timestamp:

09/26/07 14:13:56 (15 years ago)

Author:

andreu

Message:

delete all CRIHAN code and some outputs; add param in check.sh

Location:

trunk/src

Files:

• dataFlowSet.c (modified) (20 diffs)
• renetcol.c (modified) (9 diffs)
• renetcolAgg.c (modified) (4 diffs)
• renetcolParam.h (modified) (1 diff)
• routers_mgmt.h (modified) (1 diff)

trunk/src/dataFlowSet.c

@@ -63 +63 @@
   msgType myMsg;
   char *msgTextIndex;
-  char *msgToSend;
+
   unsigned short tplMsgType = 11;
   struct PrefixV4 prefixKey, *res, *res2; /* for bsearch */
@@ -73 +73 @@
   int crazyCounter = 0;
 
-#ifdef CRIHAN
-  struct IPFLowCache ipFirstCache;
-  struct MPLSFlowCache mplsFirstCache;
-  unsigned long firstTime = 0; 
-  unsigned long lastTime = 0; 
-
-  ipFirstCache.ipProt = 0;
-  ipFirstCache.bytes = 0;
-  ipFirstCache.pkts = 0;
-  ipFirstCache.inSnmp = 0;
-  ipFirstCache.outSnmp = 0;
-  ipFirstCache.v4AdS = 0;
-  ipFirstCache.v4AdD = 0;
-  ipFirstCache.tProt = 0;
-  ipFirstCache.sPort = 0;
-  ipFirstCache.dPort = 0;
-  ipFirstCache.maskD = 0;
-  ipFirstCache.maskS = 0;
-  ipFirstCache.routerAd = 0;
-  ipFirstCache.liveTime = 0;
-  mplsFirstCache.ipProt = 0;
-  mplsFirstCache.v4AdS = 0;
-  mplsFirstCache.v4AdD = 0;
-  mplsFirstCache.routerAd = 0;
-  mplsFirstCache.mplsLabel1 = 0;
-#endif /* CRIHAN */
-
-  buffer2[1] = *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr));(*myPtrs->offsetV9Ptr)++;
-  buffer2[0] = *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr));(*myPtrs->offsetV9Ptr)++;
+  buffer2[1] = *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr));
+  (*myPtrs->offsetV9Ptr)++;
+  buffer2[0] = *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr));
+  (*myPtrs->offsetV9Ptr)++;
   (*myPtrs->currentFlowsetIdPtr) = *((unsigned short*)&buffer2);
-  buffer2[1] = *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr));(*myPtrs->offsetV9Ptr)++;
-  buffer2[0] = *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr));(*myPtrs->offsetV9Ptr)++;
+  buffer2[1] = *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr));
+  (*myPtrs->offsetV9Ptr)++;
+  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 id: %hu, lg %hu", (*myPtrs->currentFlowsetIdPtr), data_length);
+    fprintf(stderr,
+            "{d id: %hu, lg %hu", 
+            (*myPtrs->currentFlowsetIdPtr), 
+            data_length);
     if ( (*myPtrs->currentFlowsetIdPtr) > TRESHOLD_TEMPLATE_ID ) {
 /*      fprintf(stderr,"Bad TID from router: %lu.%lu.%lu.%lu\n", */
@@ -155 +136 @@
 #endif
 
-#ifdef CRIHAN
-    ipFirstCache.routerAd = myPtrs->pcktPtr->ipH->srcAdd;
-    mplsFirstCache.routerAd = myPtrs->pcktPtr->ipH->srcAdd;
-#endif /* CRIHAN */
-
     pftmp = tmp->lastField;
     secondPftmp = tmp->lastField;    
     secondOffset = *myPtrs->offsetV9Ptr;
     secondOldOffset = secondOffset;
-    while ( (((*myPtrs->offsetV9Ptr)-48-shift) <= data_length) && (overflow!=1) ) { 
+    while ( (((*myPtrs->offsetV9Ptr)-48-shift) <= data_length) 
+            && (overflow!=1) ) { 
       /* 
        * progression in a data flow Set 
@@ -179 +156 @@
       /* FIXME : this code is repeated, perhaps past before */
       while ( ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+j))) != NULL ) {
-        if  ( (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+j)))->value->stor.lvalue)
+        if ( (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+j)))->value->stor.lvalue)
               == myPtrs->pcktPtr->ipH->srcAdd )
           {
@@ -206 +183 @@
             switch (field_size) {
             case 1:
-              buffer1 = *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); (*myPtrs->offsetV9Ptr)++;
+              buffer1 = *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
+              (*myPtrs->offsetV9Ptr)++;
               /* rule check */
               if (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.cvalue 
@@ -233 +211 @@
               }
 #endif        
-#ifdef CRIHAN
-              if ((pftmp->fieldType==9)||(pftmp->fieldType==29)){
-                ipFirstCache.maskS = *((unsigned char*)&buffer1);
-              }
-              if ((pftmp->fieldType==13)||(pftmp->fieldType==30)){
-                ipFirstCache.maskD = *((unsigned char*)&buffer1);
-              }
-              if (pftmp->fieldType==60){ 
-                ipFirstCache.ipProt = *((unsigned char*)&buffer1); 
-                mplsFirstCache.ipProt = *((unsigned char*)&buffer1); 
-              }
-              if (pftmp->fieldType==4){ 
-                ipFirstCache.tProt = *((unsigned char*)&buffer1); 
-              }
-#endif
               break;
             case 2:
-              buffer2[1]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); (*myPtrs->offsetV9Ptr)++;
-              buffer2[0]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); (*myPtrs->offsetV9Ptr)++;
+              buffer2[1]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
+              (*myPtrs->offsetV9Ptr)++;
+              buffer2[0]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
+              (*myPtrs->offsetV9Ptr)++;
               if (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.svalue 
                   == *((unsigned short*)&buffer2))
@@ -260 +225 @@
               }
 #endif
-#ifdef CRIHAN
-              /* FIXME : add this two following bloc in the case N = 4 */
-              if (pftmp->fieldType==10){
-                ipFirstCache.inSnmp = *((unsigned short*)&buffer2);
-                if ( (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.svalue) 
-                     == (*((unsigned short*)&buffer2))
-                     )
-                  {
-                    ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 1;
-                  }
-              }
-              if (pftmp->fieldType==14){
-                ipFirstCache.outSnmp = *((unsigned short*)&buffer2);
-                if ( (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.svalue) 
-                     == (*((unsigned short*)&buffer2))
-                     )
-                  {
-                    ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 1;
-                  }
-              }
-              if (pftmp->fieldType==7){
-                ipFirstCache.sPort = *((unsigned short*)&buffer2);
-                if ( (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.svalue) 
-                     == (*((unsigned short*)&buffer2))
-                     )
-                  {
-                    ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 1;
-                  }
-              }
-              if (pftmp->fieldType==11){
-                ipFirstCache.dPort = *((unsigned short*)&buffer2);
-                if ( (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.svalue) 
-                     == (*((unsigned short*)&buffer2))
-                     )
-                  {
-                    ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 1;
-                  }
-              }
-#endif
               break;
             case 3:
               buffer4[3]= 0;
-              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)++;
+              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 (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.lvalue 
                   == *((unsigned long*)&buffer4))
@@ -313 +242 @@
                 isMplsFlow = 1;
               }
-#ifdef CRIHAN
-              if (pftmp->fieldType==70){
-                mplsFirstCache.mplsLabel1 = (*((unsigned long*)&buffer4))>>4;
-              }
-#endif
               break;
             case 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)++;
+              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)++;
               /* FIXME : here , add a check on the field type */
               if ((pftmp->fieldType==8)||(pftmp->fieldType==12)){
@@ -360 +288 @@
               }
 #endif
-#ifdef CRIHAN
-              if (pftmp->fieldType==8){
-                ipFirstCache.v4AdS = *((unsigned long*)&buffer4);
-                mplsFirstCache.v4AdS = *((unsigned long*)&buffer4);
-              }
-              if (pftmp->fieldType==12){
-                ipFirstCache.v4AdD = *((unsigned long*)&buffer4);
-                mplsFirstCache.v4AdD = *((unsigned long*)&buffer4);
-              }
-              if (pftmp->fieldType==1){
-                ipFirstCache.bytes = *((unsigned long*)&buffer4);
-              }
-              if (pftmp->fieldType==2){
-                ipFirstCache.pkts = *((unsigned long*)&buffer4);
-              }
-              if (pftmp->fieldType==22){
-                firstTime = *((unsigned long*)&buffer4);
-              }
-              if (pftmp->fieldType==21){
-                lastTime = *((unsigned long*)&buffer4);
-              }
-#endif
               break;
             case 16:
               for (i=0; i<4; i++) {
-                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)++;
+                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 (1==moreIsNecessary){
                   switch(i){
@@ -532 +442 @@
         switch (field_size) {
         case 1:
-          buffer1 = *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); (*myPtrs->offsetV9Ptr)++;
+          buffer1 = *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
+          (*myPtrs->offsetV9Ptr)++;
 #ifdef IPV4AGG
           if ((pftmp->fieldType==9)||(pftmp->fieldType==29)){
@@ -553 +464 @@
           }       
 #endif
-#ifdef CRIHAN
-          if ((pftmp->fieldType==9)||(pftmp->fieldType==29)){
-            ipFirstCache.maskS = *((unsigned char*)&buffer1);
-          }
-          if ((pftmp->fieldType==13)||(pftmp->fieldType==30)){
-            ipFirstCache.maskD = *((unsigned char*)&buffer1);
-          }
-          if (pftmp->fieldType==60){ 
-            ipFirstCache.ipProt = *((unsigned char*)&buffer1); 
-            mplsFirstCache.ipProt = *((unsigned char*)&buffer1); 
-          }
-          if (pftmp->fieldType==4){ 
-            ipFirstCache.tProt = *((unsigned char*)&buffer1); 
-          }
-#endif
           break;
         case 2:
-          buffer2[1]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); (*myPtrs->offsetV9Ptr)++;
-          buffer2[0]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); (*myPtrs->offsetV9Ptr)++;
+          buffer2[1]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
+          (*myPtrs->offsetV9Ptr)++;
+          buffer2[0]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
+          (*myPtrs->offsetV9Ptr)++;
 #ifdef IPV4AGG
           if (pftmp->fieldType==10){
@@ -577 +475 @@
           }       
 #endif
-#ifdef CRIHAN
-          if (pftmp->fieldType==10){
-            ipFirstCache.inSnmp = *((unsigned short*)&buffer2);
-          }
-          if (pftmp->fieldType==14){
-            ipFirstCache.outSnmp = *((unsigned short*)&buffer2);
-          }
-          if (pftmp->fieldType==7){
-            ipFirstCache.sPort = *((unsigned short*)&buffer2);
-          }
-          if (pftmp->fieldType==11){
-            ipFirstCache.dPort = *((unsigned short*)&buffer2);
-          }
-#endif
           break;
         case 3:
           buffer4[3]= 0;
-          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)++;
+          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)++;
           /* aggregation */
           /* end aggregation */
@@ -602 +489 @@
             isMplsFlow = 1;
           }
-#ifdef CRIHAN
-          if (pftmp->fieldType==70){
-            mplsFirstCache.mplsLabel1 = (*((unsigned long*)&buffer4))>>4;
-          }
-#endif
           break;
         case 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)++;
+          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)++;
 #ifdef IPV4AGG
           if ((pftmp->fieldType==8)){
@@ -625 +511 @@
           }
 #endif
-#ifdef CRIHAN
-          if (pftmp->fieldType==8){
-            ipFirstCache.v4AdS = *((unsigned long*)&buffer4);
-            mplsFirstCache.v4AdS = *((unsigned long*)&buffer4);
-          }
-          if (pftmp->fieldType==12){
-            ipFirstCache.v4AdD = *((unsigned long*)&buffer4);
-            mplsFirstCache.v4AdD = *((unsigned long*)&buffer4);
-          }
-          if (pftmp->fieldType==1){
-            ipFirstCache.bytes = *((unsigned long*)&buffer4);
-          }
-          if (pftmp->fieldType==2){
-            ipFirstCache.pkts = *((unsigned long*)&buffer4);
-          }
-          if (pftmp->fieldType==22){
-            firstTime = *((unsigned long*)&buffer4);
-          }
-          if (pftmp->fieldType==21){
-            lastTime = *((unsigned long*)&buffer4);
-          }
-#endif
           break;
         case 16:
           for (i=0; i<4; i++) {
-            buffer2[1]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); (*myPtrs->offsetV9Ptr)++;
-            buffer2[0]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); (*myPtrs->offsetV9Ptr)++;
-            buffer2[1]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); (*myPtrs->offsetV9Ptr)++;
-            buffer2[0]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); (*myPtrs->offsetV9Ptr)++;
+            buffer2[1]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
+            (*myPtrs->offsetV9Ptr)++;
+            buffer2[0]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
+            (*myPtrs->offsetV9Ptr)++;
+            buffer2[1]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
+            (*myPtrs->offsetV9Ptr)++;
+            buffer2[0]= *(myPtrs->ptr_buffer+(*myPtrs->offsetV9Ptr)); 
+            (*myPtrs->offsetV9Ptr)++;
           }
           /* aggregation IPv6 */          
@@ -669 +537 @@
          * end of one flow (not the flowset) 
          */
-#ifdef CRIHAN
-        if ( mplsFirstCache.mplsLabel1 == 0 ) {
-          (myPtrs->tabIPPtr+(*myPtrs->ipNbPtr))->ipProt = ipFirstCache.ipProt;
-          ipFirstCache.ipProt = 0;
-          (myPtrs->tabIPPtr+(*myPtrs->ipNbPtr))->bytes = ipFirstCache.bytes;
-          ipFirstCache.bytes = 0;
-          (myPtrs->tabIPPtr+(*myPtrs->ipNbPtr))->pkts = ipFirstCache.pkts;
-          ipFirstCache.pkts = 0;
-          (myPtrs->tabIPPtr+(*myPtrs->ipNbPtr))->inSnmp = ipFirstCache.inSnmp;
-          ipFirstCache.inSnmp = 0;
-          (myPtrs->tabIPPtr+(*myPtrs->ipNbPtr))->outSnmp = ipFirstCache.outSnmp;
-          ipFirstCache.outSnmp = 0;
-          (myPtrs->tabIPPtr+(*myPtrs->ipNbPtr))->v4AdS = ipFirstCache.v4AdS;
-          ipFirstCache.outSnmp = 0;
-          (myPtrs->tabIPPtr+(*myPtrs->ipNbPtr))->v4AdD = ipFirstCache.v4AdD;
-          ipFirstCache.v4AdD = 0;
-          (myPtrs->tabIPPtr+(*myPtrs->ipNbPtr))->tProt = ipFirstCache.tProt;
-          ipFirstCache.tProt = 0;
-          (myPtrs->tabIPPtr+(*myPtrs->ipNbPtr))->sPort = ipFirstCache.sPort;
-          ipFirstCache.sPort = 0;
-          (myPtrs->tabIPPtr+(*myPtrs->ipNbPtr))->dPort = ipFirstCache.dPort;
-          ipFirstCache.dPort = 0;
-          (myPtrs->tabIPPtr+(*myPtrs->ipNbPtr))->maskD = ipFirstCache.maskD;
-          ipFirstCache.maskD = 0;
-          (myPtrs->tabIPPtr+(*myPtrs->ipNbPtr))->maskS = ipFirstCache.maskS;
-          ipFirstCache.maskS = 0;
-          (myPtrs->tabIPPtr+(*myPtrs->ipNbPtr))->routerAd = ipFirstCache.routerAd;
-          (myPtrs->tabIPPtr+(*myPtrs->ipNbPtr))->liveTime = lastTime - firstTime;
-          firstTime = 0; lastTime = 0;
-          (*myPtrs->ipNbPtr)++;
-        } else {
-          (myPtrs->tabMPLSPtr+(*myPtrs->mplsNbPtr))->ipProt = mplsFirstCache.ipProt;
-          mplsFirstCache.ipProt = 0;
-          (myPtrs->tabMPLSPtr+(*myPtrs->mplsNbPtr))->v4AdS =  mplsFirstCache.v4AdS;
-          mplsFirstCache.v4AdS = 0;
-          (myPtrs->tabMPLSPtr+(*myPtrs->mplsNbPtr))->v4AdD =  mplsFirstCache.v4AdD; 
-          mplsFirstCache.v4AdD = 0;
-          (myPtrs->tabMPLSPtr+(*myPtrs->mplsNbPtr))->routerAd =  mplsFirstCache.routerAd;
-          (myPtrs->tabMPLSPtr+(*myPtrs->mplsNbPtr))->mplsLabel1 =  mplsFirstCache.mplsLabel1;
-          mplsFirstCache.mplsLabel1 = 0;
-          (*myPtrs->mplsNbPtr)++;
-        }
-#endif 
+
         /* put aggregation cache information to IPv4 Prefixes table */
         /* Aggregation mode must be enable in ./configure options   */
         /* first we must know if the address belong to our prefix   */
-        myPtrs->nbFluxTT++;
 #ifdef IPV4AGG
         if ( (bool == 1) && (isMplsFlow == 0) ){
@@ -723 +548 @@
           if (res!=NULL){
             if ( myPtrs->routersID[res->routerNb] == agCache.routerAd  ) {
-              myPtrs->nbFluxSR4++;
               /* OUT ("traffic from the prefix/subnet")  */
               res->bytesNbOUT += agCache.bytes;
@@ -733 +557 @@
                             sizeof(struct PrefixV4), prefGlobalCmp);
               if (res2!=NULL){
-                myPtrs->nbFluxIR4++;
                 ((struct POP *)((myPtrs->matrixPOP)
                                 +((res->routerNb)*ROUTER_INDEX_MAX)
@@ -744 +567 @@
                                 +((res2->routerNb))))->flowNb++; 
               } else {
-                myPtrs->nbFluxSE++;
                 (
                  ((struct POP *)(myPtrs->matrixPOP)
@@ -799 +621 @@
               /*     -  prefix not referenced but not allowed to be routed */
               /*     -  spoofing                                           */
-              myPtrs->nbFluxUK++;
 #ifdef PRINTUNKNOWNSUBNET 
               fprintf(stderr, "%lu.%lu.%lu.%lu/%hu -> %lu.%lu.%lu.%lu/%hu (R:%lu.%lu.%lu.%lu) \n",
@@ -869 +690 @@
                                    ); 
             myMsg.type = 1;
-            /* OLD transfert type */
-/*          msgSend( myQueue, myMsg); */
+
+
             /* NEW transfert type */
             for ( ; tmpRL; tmpRL=tmpRL->next){

trunk/src/renetcol.c

@@ -29 +29 @@
 
 struct SHMForAgg *shmForAgg;
-
-struct IPFLowCache tabIP[MAX_IP_FLOW];
-struct MPLSFlowCache tabMPLS[MAX_MPLS_FLOW];
-unsigned long ipNb = 0;                     /* counter of IP flows number */
-unsigned long mplsNb = 0;                   /* counter of MPLS flow number */
 
 unsigned short currentIPOutputFile = 0;    /* index on the current IP file */
@@ -78 +73 @@
 int reInitConf = 0;
 
-static time_t lastRock;
 static struct tm *tmPtr;
 
@@ -115 +109 @@
   }
 
-#ifdef CRIHAN
-  fprintf(stderr, "renetcol compilation with CRIHAN feature enable\n");
-#endif
 #ifdef IPV4AGG
   fprintf(stderr, "renetcol compilation and execution with IPv4 Aggregation feature enable\n");
@@ -203 +194 @@
   myPtrs.pcktPtr = (DatagramPtr) malloc(sizeof(struct Datagram));
   myPtrs.currentFlowsetNumberPtr = &currentFlowsetNumber;
-  myPtrs.ipNbPtr =  &ipNb;
-  myPtrs.mplsNbPtr =  &mplsNb;
   myPtrs.routersID = &indexedRouterList;
   myPtrs.currentV4Tab = shmForAgg->prefixV4Tab[shmForAgg->currentTable];
   myPtrs.secondV4Tab = shmForAgg->prefixV4Tab[shmForAgg->secondTable];
   myPtrs.matrixPOP = &(shmForAgg->matrixPOP[shmForAgg->currentTable][0][0]);
-
-  myPtrs.nbFluxSR4 =0;
-  myPtrs.nbFluxSE =0;
-  myPtrs.nbFluxIR4 =0;
-  myPtrs.nbFluxUK = 0;
-  myPtrs.nbFluxTT = 0;
 
   for (i=0; i<ROUTER_INDEX_MAX; i++){
@@ -412 +395 @@
   int regRouter = 0;
   time_t now = time((time_t *)NULL);
-  int iIP, iMPLS, i, z, x;
   int loopNb = 0;
   int gardeFou = 0;
   time_t lastIPOutput, lastMPLSOutput;
-  time_t receptionTime;
 
   now = time((time_t *)NULL);
@@ -438 +419 @@
       shmForAgg->readed = 1;
       myPtrs.matrixPOP = &(shmForAgg->matrixPOP[shmForAgg->currentTable][0][0]);
-      fprintf(stderr,"\n\nComptage FLUX:\n SR4: %llu\n SE: %llu\n IR4: %llu\n UK: %llu\n TT: %llu\n",
-              myPtrs.nbFluxSR4,
-              myPtrs.nbFluxSE,
-              myPtrs.nbFluxIR4,
-              myPtrs.nbFluxUK,
-              myPtrs.nbFluxTT
-              );
-      myPtrs.nbFluxSR4 =0;
-      myPtrs.nbFluxSE =0;
-      myPtrs.nbFluxIR4 =0;
-      myPtrs.nbFluxUK = 0;
-      myPtrs.nbFluxTT = 0;
     }
     if (sigusr1Up == 1){
@@ -487 +456 @@
                                       myPtrs.offsetV9Ptr, myPtrs.ptr_buffer);
         if ( currentFlowsetId == 0 ) {
-          if ( (shift = checkTemplateFlowSet(myPtrs.currentRouterPtr, myPtrs.offsetV9Ptr, 
-                                             myPtrs.ptr_buffer, myPtrs.currentHeaderV9Ptr,
+          if ( (shift = checkTemplateFlowSet(myPtrs.currentRouterPtr, 
+                                             myPtrs.offsetV9Ptr, 
+                                             myPtrs.ptr_buffer, 
+                                             myPtrs.currentHeaderV9Ptr,
                                              curTplFlSetPtr,
                                              myPtrs.currentFlowsetNumberPtr,
@@ -499 +470 @@
           writeAllTplFlSet();
         } else if (currentFlowsetId == 1) {
-          if ( (shift = checkTemplateOption(myPtrs.currentRouterPtr, myPtrs.offsetV9Ptr, 
-                                      myPtrs.ptr_buffer, myPtrs.currentHeaderV9Ptr,
-                                      curTplOptionPtr,
+          if ( (shift = checkTemplateOption(myPtrs.currentRouterPtr, 
+                                            myPtrs.offsetV9Ptr, 
+                                            myPtrs.ptr_buffer, 
+                                            myPtrs.currentHeaderV9Ptr,
+                                            curTplOptionPtr,
                                             myPtrs.currentFlowsetNumberPtr) ) < 0 ) {
 #ifdef DEBUG
@@ -549 +522 @@
     loopNb++;
 
-#ifdef CRIHAN
-    now = time((time_t *)NULL);
-    receptionTime = now;
-    if ( (ipNb > (MAX_IP_FLOW - 50)) || 
-         ( (now-lastIPOutput) > IP_TIME_THRESHOLD) ) {
-      outputName[0] = '\0';
-      sprintf(cof_str, "%d", currentIPOutputFile);
-      strcat(outputName, OUTPUT_IP);
-      strcat(outputName, cof_str);
-      strcat(outputName, EXTENSION);
-      if (fopen(outputName, "x") == NULL) {
-        currentIPOutputFile = (currentIPOutputFile + 1)%MAX_IP_OUTPUT_FILES;
-        outputName[0] = '\0';
-        sprintf(cof_str, "%d", currentIPOutputFile);
-        strcat(outputName, OUTPUT_IP);
-        strcat(outputName, cof_str);
-        strcat(outputName, EXTENSION);
-      } 
-      if ((fIP = fopen(outputName, "w")) == NULL) {
-        syslog(LOG_ERR,"Error in OUTPUT_IP opening : %s", strerror(errno));
-      } else {
-        for ( iIP = 0; iIP < ipNb; iIP++){
-          if ( tabIP[iIP].ipProt == 0 ) {
-            fprintf(fIP, "%lu;%lu;%hu;%hu;%lu.%lu.%lu.%lu;%lu.%lu.%lu.%lu;%d;%hu;%hu;%d;%d;%lu.%lu.%lu.%lu;%lu;%d\n",
-                    tabIP[iIP].bytes, tabIP[iIP].pkts,
-                    tabIP[iIP].inSnmp,  tabIP[iIP].outSnmp,
-                    tabIP[iIP].v4AdS>>24, tabIP[iIP].v4AdS<<8>>24,
-                    tabIP[iIP].v4AdS<<16>>24, tabIP[iIP].v4AdS<<24>>24,
-                    tabIP[iIP].v4AdD>>24, tabIP[iIP].v4AdD<<8>>24,
-                    tabIP[iIP].v4AdD<<16>>24, tabIP[iIP].v4AdD<<24>>24,
-                    tabIP[iIP].tProt, tabIP[iIP].sPort,
-                    tabIP[iIP].dPort, tabIP[iIP].maskD,
-                    tabIP[iIP].maskS, tabIP[iIP].routerAd>>24,
-                    tabIP[iIP].routerAd<<8>>24, tabIP[iIP].routerAd<<16>>24,
-                    tabIP[iIP].routerAd<<24>>24, tabIP[iIP].liveTime,
-                    receptionTime
-                    );
-          }
-        }
-        fclose(fIP);
-      }
-      ipNb = 0;
-      lastIPOutput = now;
-    }
-    now = time((time_t *)NULL);
-    if ( mplsNb > (MAX_MPLS_FLOW - 50) || 
-         ( (now-lastMPLSOutput) > MPLS_TIME_THRESHOLD) ) {
-      outputName[0] = '\0';
-      sprintf(cof_str, "%d", currentMPLSOutputFile);
-      strcat(outputName, OUTPUT_MPLS);
-      strcat(outputName, cof_str);
-      strcat(outputName, EXTENSION);
-      if (fopen(outputName, "x") == NULL) {
-        currentMPLSOutputFile = (currentMPLSOutputFile + 1)%MAX_MPLS_OUTPUT_FILES;
-        outputName[0] = '\0';
-        sprintf(cof_str, "%d", currentMPLSOutputFile);
-        strcat(outputName, OUTPUT_MPLS);
-        strcat(outputName, cof_str);
-        strcat(outputName, EXTENSION);
-      }
-      if ((fMPLS = fopen(outputName, "w")) == NULL) {
-        syslog(LOG_ERR,"Error in OUTPUT_MPLS opening : %s", strerror(errno));
-      } else {
-        for ( iMPLS = 0; iMPLS < mplsNb; iMPLS++){
-          if ( tabMPLS[iMPLS].ipProt == 0 ) {
-            fprintf(fMPLS, "%lu.%lu.%lu.%lu;%hu;%lu.%lu.%lu.%lu;%lu.%lu.%lu.%lu\n",
-                    tabMPLS[iMPLS].routerAd>>24,tabMPLS[iMPLS].routerAd<<8>>24,
-                    tabMPLS[iMPLS].routerAd<<16>>24,
-                    tabMPLS[iMPLS].routerAd<<24>>24,
-                    tabMPLS[iMPLS].mplsLabel1,tabMPLS[iMPLS].v4AdS>>24,
-                    tabMPLS[iMPLS].v4AdS<<8>>24,tabMPLS[iMPLS].v4AdS<<16>>24,
-                    tabMPLS[iMPLS].v4AdS<<24>>24,tabMPLS[iMPLS].v4AdD>>24,
-                    tabMPLS[iMPLS].v4AdD<<8>>24,tabMPLS[iMPLS].v4AdD<<16>>24,
-                    tabMPLS[iMPLS].v4AdD<<24>>24 
-                    );
-          }
-        }
-        fclose(fMPLS);
-      }
-      mplsNb = 0;
-      lastMPLSOutput = now;
-    }
-#endif /* CRIHAN */
     now = time((time_t *)NULL);
     tmPtr = localtime(&now);

trunk/src/renetcolAgg.c

@@ -48 +48 @@
   int rrd_create_er_ct = 0;
   int rrd_create_ok_ct = 0;
-  int rrd_ct = 0;
   int isFirstUpdate = 1;
   key_t key;
@@ -58 +57 @@
   char *opt[27];
   char *optUpdate[3];
-  int res_rrd = 0;
   FILE *fp;
   static time_t now, now2;
-  struct shmid_ds shminfo;
   
   key = 8765;
@@ -338 +335 @@
         /* END MATRIX INTER POP ACC */
         now2 = time((time_t *)NULL);
-        /* #ifdef DEBUGAGG */
+#ifdef DEBUGAGG
         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,
+                (int)now2-now,
                 rrd_update_ok_ct,
                 rrd_update_er_ct,
@@ -347 +344 @@
                 rrd_create_er_ct,
                 rrd_create_ok_ct);
-        /* #endif */
+#endif
         rrd_update_ok_ct = 0;
         rrd_update_er_ct = 0;

trunk/src/renetcolParam.h

@@ -36 +36 @@
 #define FIELD_TYPE_NUMBER 89
 #define MAX_RULES_PER_FIELD 10 /* maximum rules number for one field */
-#define MAX_IP_FLOW 10000
-#define MAX_MPLS_FLOW 200
 #define SHMSIZE 33554432
 #define SOCKET_BUFFER_SIZE 1500
 #define TIME_OUT 300
-
-#ifdef CRIHAN
-#define OUTPUT_IP "/tmp/ipflow"
-#define EXTENSION ".txt" 
-#define OUTPUT_MPLS "/tmp/mplsflow"
-#define MAX_IP_OUTPUT_FILES 3
-#define MAX_MPLS_OUTPUT_FILES 3
-#define IP_TIME_THRESHOLD 60 /* in sec */
-#define MPLS_TIME_THRESHOLD 60 /* in sec */
-#endif /* CRIHAN */
 
 /*

trunk/src/routers_mgmt.h

@@ -60 +60 @@
   RuleDefPtr *rulesAddressPtr;
   RulesPtr rulesListPtr;                             /* Rules list */
-  struct IPFLowCache *tabIPPtr;
-  struct MPLSFlowCache *tabMPLSPtr;
-  unsigned long *ipNbPtr;
-  unsigned long *mplsNbPtr;
   unsigned long *routersID;
   struct PrefixV4 *currentV4Tab;
   struct PrefixV4 *secondV4Tab;
   struct POP *matrixPOP;
-  unsigned long long nbFluxSR4;
-  unsigned long long nbFluxSE;
-  unsigned long long nbFluxIR4;
-  unsigned long long nbFluxUK;
-  unsigned long long nbFluxTT;
 };