Changeset 20 for trunk/src/dataFlowSet.c

Timestamp:

11/22/06 14:04:22 (16 years ago)

Author:

andreu

Message:

new release 0.0.6, with CRIHAN compilation feature

Files:

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

trunk/src/dataFlowSet.c

@@ -65 +65 @@
   struct PrefixV4 prefixKey, *res; /* for bsearch */
   struct AggCache agCache;
+#ifdef CRIHAN
   struct IPFLowCache ipFirstCache; /* CRI */
   struct MPLSFlowCache mplsFirstCache; /* CRI */
   unsigned long firstTime = 0; /* CRI */
   unsigned long lastTime = 0; /* CRI */
+#endif /* CRIHAN */
   int bool = 0;
 
-  /* CRI */
+#ifdef CRIHAN
   ipFirstCache.ipProt = 0;
   ipFirstCache.bytes = 0;
@@ -89 +91 @@
   mplsFirstCache.v4AdS = 0;
   mplsFirstCache.v4AdD = 0;
-  mplsFirstCache.outSnmp = 0;
-  mplsFirstCache.inSnmp = 0;
   mplsFirstCache.routerAd = 0;
   mplsFirstCache.mplsLabel1 = 0;
-
-  /* CRI */
+#endif /* CRIHAN */
 
   buffer2[1] = *(buf+(*offV9));(*offV9)++;
@@ -122 +121 @@
     /* end aggreg */
 
-    /* CRI */
+#ifdef CRIHAN
     ipFirstCache.routerAd = pcktPtr->ipH->srcAdd;
     mplsFirstCache.routerAd = pcktPtr->ipH->srcAdd;
-    /* end CRI */
+#endif /* CRIHAN */
 
     pftmp = tmp->lastField;
@@ -185 +184 @@
 /*            } */
               /* end aggregation */
-              /* CRI */
+#ifdef CRIHAN
               if ((pftmp->fieldType==9)||(pftmp->fieldType==29)){
                 ipFirstCache.maskS = *((unsigned char*)&buffer1);
@@ -199 +198 @@
                 ipFirstCache.tProt = *((unsigned char*)&buffer1); 
               }
-/*            if (pftmp->fieldType==46){  */
-/*              mplsFirstCache.topLabelType = *((unsigned char*)&buffer1);  */
-/*            } */
-              /* end CRI */
+#endif /* CRIHAN */
               break;
             case 2:
@@ -215 +211 @@
 /*            } */
               /* end aggregation */
-              /* CRI */
+#ifdef CRIHAN
               if (pftmp->fieldType==10){
                 ipFirstCache.inSnmp = *((unsigned short*)&buffer2);
-                mplsFirstCache.inSnmp = *((unsigned short*)&buffer2);
               }
               if (pftmp->fieldType==14){
                 ipFirstCache.outSnmp = *((unsigned short*)&buffer2);
-                mplsFirstCache.outSnmp = *((unsigned short*)&buffer2);
               }
               if (pftmp->fieldType==7){
@@ -230 +224 @@
                 ipFirstCache.dPort = *((unsigned short*)&buffer2);
               }
-              /* end CRI */ 
+#endif /* CRIHAN */ 
               break;
             case 3:
@@ -242 +236 @@
               /* aggregation */
               /* end aggregation */
-              /* CRI */
+#ifdef CRIHAN
               if (pftmp->fieldType==70){
                 mplsFirstCache.mplsLabel1 = (*((unsigned long*)&buffer4))>>4;
               }
-              /* end CRI */
+#endif /* CRIHAN */
               break;
             case 4:
@@ -275 +269 @@
 /*            } */
               /* end aggregation */
-              /* CRI */
+#ifdef CRIHAN
               if (pftmp->fieldType==8){
                 ipFirstCache.v4AdS = *((unsigned long*)&buffer4);
@@ -296 +290 @@
                 lastTime = *((unsigned long*)&buffer4);
               }
-              /* end CRI */
+#endif /* CRIHAN */
               break;
             case 16:
@@ -468 +462 @@
 /*        }        */
           /* end aggregation */
-          /* CRI */
+#ifdef CRIHAN
           if ((pftmp->fieldType==9)||(pftmp->fieldType==29)){
             ipFirstCache.maskS = *((unsigned char*)&buffer1);
@@ -482 +476 @@
             ipFirstCache.tProt = *((unsigned char*)&buffer1); 
           }
-/*        if (pftmp->fieldType==46){  */
-/*          mplsFirstCache.topLabelType = *((unsigned char*)&buffer1);  */
-/*        } */
+#endif /* CRIHAN */
           break;
         case 2:
@@ -494 +486 @@
           }       
           /* end aggregation */
-          /* CRI */
+#ifdef CRIHAN
           if (pftmp->fieldType==10){
             ipFirstCache.inSnmp = *((unsigned short*)&buffer2);
-            mplsFirstCache.inSnmp = *((unsigned short*)&buffer2);
           }
           if (pftmp->fieldType==14){
             ipFirstCache.outSnmp = *((unsigned short*)&buffer2);
-            mplsFirstCache.outSnmp = *((unsigned short*)&buffer2);
           }
           if (pftmp->fieldType==7){
@@ -509 +499 @@
             ipFirstCache.dPort = *((unsigned short*)&buffer2);
           }
-          /* end CRI */ 
+#endif /* CRIHAN */
           break;
         case 3:
@@ -518 +508 @@
           /* aggregation */
           /* end aggregation */
-          /* CRI */
+#ifdef CRIHAN
           if (pftmp->fieldType==70){
             mplsFirstCache.mplsLabel1 = (*((unsigned long*)&buffer4))>>4;
           }
-          /* end CRI */
+#endif /* CRIHAN */
           break;
         case 4:
@@ -541 +531 @@
 /*        } */
           /* end aggregation */
-          /* CRI */
+#ifdef CRIHAN
           if (pftmp->fieldType==8){
             ipFirstCache.v4AdS = *((unsigned long*)&buffer4);
@@ -562 +552 @@
             lastTime = *((unsigned long*)&buffer4);
           }
-          /* end CRI */
+#endif /* CRIHAN */
           break;
         case 16:
@@ -585 +575 @@
          * end of one flow (not the flowset) 
          */
-        /* CRI */
+#ifdef CRIHAN
         if ( mplsFirstCache.mplsLabel1 == 0 ) {
           (ipCache+(*ipCounter))->ipProt = ipFirstCache.ipProt;
@@ -618 +608 @@
           (mplsCache+(*mplsCounter))->ipProt = mplsFirstCache.ipProt;
           mplsFirstCache.ipProt = 0;
-/*        (mplsCache+(*mplsCounter))->topLabelType = mplsFirstCache.topLabelType; */
-/*        mplsFirstCache.topLabelType = 0; */
           (mplsCache+(*mplsCounter))->v4AdS =  mplsFirstCache.v4AdS;
           mplsFirstCache.v4AdS = 0;
           (mplsCache+(*mplsCounter))->v4AdD =  mplsFirstCache.v4AdD; 
           mplsFirstCache.v4AdD = 0;
-          (mplsCache+(*mplsCounter))->inSnmp =  mplsFirstCache.inSnmp;
-          mplsFirstCache.inSnmp = 0;
-          (mplsCache+(*mplsCounter))->outSnmp =  mplsFirstCache.outSnmp; 
-          mplsFirstCache.outSnmp = 0;
           (mplsCache+(*mplsCounter))->routerAd =  mplsFirstCache.routerAd;
           (mplsCache+(*mplsCounter))->mplsLabel1 =  mplsFirstCache.mplsLabel1;
@@ -633 +617 @@
           (*mplsCounter)++;
         }
-        /* end CRI */
+#endif /* CRIHAN */
         /* put aggregation cache information to tables */
-        if (bool == 1){
-          prefixKey.beginning = agCache.v4AdS>>(32-agCache.maskS)<<(32-agCache.maskS);
-          res = bsearch(&prefixKey, V4PTab, nbPV4, 
-                        sizeof(struct PrefixV4), prefCmp);
-        }
+/*      if (bool == 1){ */
+/*        prefixKey.beginning = agCache.v4AdS>>(32-agCache.maskS)<<(32-agCache.maskS); */
+/*        res = bsearch(&prefixKey, V4PTab, nbPV4,  */
+/*                      sizeof(struct PrefixV4), prefCmp); */
+/*      } */
         bool = 0;    
         /* end put */