Changeset 17 for trunk/src/dataFlowSet.c

Timestamp:

05/22/06 16:25:24 (17 years ago)

Author:

andreu

Message:

*** empty log message ***

Files:

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

trunk/src/dataFlowSet.c

@@ -63 +63 @@
   struct PrefixV4 prefixKey, *res; /* for bsearch */
   struct AggCache agCache;
+  int bool = 0;
 
   buffer2[1] = *(buf+(*offV9));(*offV9)++;
@@ -86 +87 @@
       return (data_length+shift);
     }
+    /* aggreg */
+    agCache.routerAd = pcktPtr->ipH->srcAdd;
+    /* end aggreg */
     pftmp = tmp->lastField;
     secondPftmp = tmp->lastField;    
@@ -118 +122 @@
             case 1:
               buffer1 = *(buf+(*offV9)); (*offV9)++;
+              /* rule check */
               if (((RuleDefPtr)(*(rulesCache+pos)))->value->stor.cvalue 
                   == *((unsigned char*)&buffer1)) {
                 ((RuleDefPtr)(*(rulesCache+pos)))->check = 1;
               }
+              /* end rule check */
               /* aggregation */
-
+              if ((pftmp->fieldType==9)||(pftmp->fieldType==29)){
+                agCache.maskS = *((unsigned char*)&buffer1);
+              }
+              if ((pftmp->fieldType==13)||(pftmp->fieldType==30)){
+                agCache.maskD = *((unsigned char*)&buffer1);
+              }
+              if (pftmp->fieldType==60){
+                agCache.ipProt = *((unsigned char*)&buffer1);
+              }
+              if (pftmp->fieldType==4){
+                agCache.tProt = *((unsigned char*)&buffer1);
+              }
+              if (pftmp->fieldType==61){
+                agCache.sens = *((unsigned char*)&buffer1);
+              }
+              if (pftmp->fieldType==5){
+                agCache.dscp = *((unsigned char*)&buffer1);
+              }
               /* end aggregation */
               break;
@@ -133 +156 @@
                 ((RuleDefPtr)(*(rulesCache+pos)))->check = 1;
               /* aggregation */
-
+              if (pftmp->fieldType==10){
+                agCache.idSnmp = *((unsigned short*)&buffer2);
+              }
+              /* end aggregation */
+              break;
+            case 3:
+              buffer4[3]= 0;
+              buffer4[2]= *(buf+(*offV9)); (*offV9)++;
+              buffer4[1]= *(buf+(*offV9)); (*offV9)++;
+              buffer4[0]= *(buf+(*offV9)); (*offV9)++;
+              if (((RuleDefPtr)(*(rulesCache+pos)))->value->stor.lvalue 
+                  == *((unsigned long*)&buffer4))
+                ((RuleDefPtr)(*(rulesCache+pos)))->check = 1;
+              /* aggregation */
               /* end aggregation */
               break;
@@ -148 +184 @@
                     ((RuleDefPtr)(*(rulesCache+pos)))->check = 1;
                   }
-                prefixKey.beginning = *((unsigned long*)&buffer4);
-                res = bsearch(&prefixKey, V4PTab, nbPV4, 
-                              sizeof(struct PrefixV4), prefCmp);
-                if (res == NULL)
-                  fprintf(stderr,"!");
-                else
-                  fprintf(stderr,".");
               }       
               /* aggregation */
-
+              if ((pftmp->fieldType==8)){
+                agCache.v4AdS = *((unsigned long*)&buffer4);
+              }
+              if ((pftmp->fieldType==12)){
+                agCache.v4AdD = *((unsigned long*)&buffer4);
+              }
+              if (pftmp->fieldType==1){
+                agCache.bytes = *((unsigned long*)&buffer4);
+              }
+              if (pftmp->fieldType==2){
+                agCache.pkts = *((unsigned long*)&buffer4);
+              }
               /* end aggregation */
               break;
@@ -311 +351 @@
           buffer1 = *(buf+(*offV9)); (*offV9)++;
           /* aggregation */
-          
+          if ((pftmp->fieldType==9)||(pftmp->fieldType==29)){
+            agCache.maskS = *((unsigned char*)&buffer1);
+          }
+          if ((pftmp->fieldType==13)||(pftmp->fieldType==30)){
+            agCache.maskD = *((unsigned char*)&buffer1);
+          }
+          if (pftmp->fieldType==60){
+            agCache.ipProt = *((unsigned char*)&buffer1);
+          }
+          if (pftmp->fieldType==4){
+            agCache.tProt = *((unsigned char*)&buffer1);
+          }
+          if (pftmp->fieldType==61){
+            agCache.sens = *((unsigned char*)&buffer1);
+          }
+          if (pftmp->fieldType==5){
+            agCache.dscp = *((unsigned char*)&buffer1);
+          }       
           /* end aggregation */
           break;
@@ -318 +375 @@
           buffer2[0]= *(buf+(*offV9)); (*offV9)++;
           /* aggregation */
-          
+          if (pftmp->fieldType==10){
+            agCache.idSnmp = *((unsigned short*)&buffer2);
+          }       
+          /* end aggregation */
+          break;
+        case 3:
+          buffer4[3]= 0;
+          buffer4[2]= *(buf+(*offV9)); (*offV9)++;
+          buffer4[1]= *(buf+(*offV9)); (*offV9)++;
+          buffer4[0]= *(buf+(*offV9)); (*offV9)++;
+/*        fprintf(stderr,"L: %lu\n",(*((unsigned long*)&buffer4))); */
+/*        fprintf(stderr,"L>>4: %lu\n",(*((unsigned long*)&buffer4))>>4); */
+/*        fprintf(stderr,"L>>1<<29>>29: %lu\n",(*((unsigned long*)&buffer4))>>1<<29>>29); */
+/*        fprintf(stderr,"L<<31>>31: %lu\n",(*((unsigned long*)&buffer4))<<31>>31); */
+          /* aggregation */
           /* end aggregation */
           break;
@@ -327 +398 @@
           buffer4[0]= *(buf+(*offV9)); (*offV9)++;
           /* aggregation */
-          
+          if ((pftmp->fieldType==8)){
+            bool = 1;
+            agCache.v4AdS = *((unsigned long*)&buffer4);
+          } else if ((pftmp->fieldType==12)){
+            agCache.v4AdD = *((unsigned long*)&buffer4);
+          } else if (pftmp->fieldType==1){
+            agCache.bytes = *((unsigned long*)&buffer4);
+          } else if (pftmp->fieldType==2){
+            agCache.pkts = *((unsigned long*)&buffer4);
+          }
           /* end aggregation */
           break;
@@ -353 +433 @@
          */
         /* 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);
+        }
+        bool = 0;    
         /* end put */
         /*