Changeset 19 for trunk/src/dataFlowSet.c

Timestamp:

09/25/06 18:21:02 (17 years ago)

Author:

andreu

Message:

last changes for Crihan -> 0.0.5

Files:

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

trunk/src/dataFlowSet.c

@@ -89 +89 @@
   mplsFirstCache.v4AdS = 0;
   mplsFirstCache.v4AdD = 0;
+  mplsFirstCache.outSnmp = 0;
+  mplsFirstCache.inSnmp = 0;
   mplsFirstCache.routerAd = 0;
   mplsFirstCache.mplsLabel1 = 0;
+
   /* CRI */
 
@@ -196 +199 @@
                 ipFirstCache.tProt = *((unsigned char*)&buffer1); 
               }
+/*            if (pftmp->fieldType==46){  */
+/*              mplsFirstCache.topLabelType = *((unsigned char*)&buffer1);  */
+/*            } */
               /* end CRI */
               break;
@@ -212 +218 @@
               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){
@@ -270 +278 @@
               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){
@@ -472 +482 @@
             ipFirstCache.tProt = *((unsigned char*)&buffer1); 
           }
+/*        if (pftmp->fieldType==46){  */
+/*          mplsFirstCache.topLabelType = *((unsigned char*)&buffer1);  */
+/*        } */
           break;
         case 2:
@@ -484 +497 @@
           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){
@@ -529 +544 @@
           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){
@@ -569 +586 @@
          */
         /* CRI */
-        printf("!");
         if ( mplsFirstCache.mplsLabel1 == 0 ) {
           (ipCache+(*ipCounter))->ipProt = ipFirstCache.ipProt;
@@ -600 +616 @@
           (*ipCounter)++;
         } else {
-          printf("im\n");
           (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;
@@ -612 +633 @@
           (*mplsCounter)++;
         }
-        /* CRI */
+        /* end CRI */
         /* put aggregation cache information to tables */
         if (bool == 1){