Changeset 54 for trunk/src

Timestamp:

09/10/07 15:27:27 (16 years ago)

Author:

andreu

Message:

add the comparaison with fields 7 and 11 (ports)

Location:

trunk/src

Files:

• dataFlowSet.c (modified) (3 diffs)
• rules_mgmt.c (modified) (2 diffs)

trunk/src/dataFlowSet.c

@@ -269 +269 @@
               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
@@ -307 +319 @@
                   }
               }
-#ifdef IPV4AGG
-              if ((pftmp->fieldType==8)){
-                bool = 1; /* very important, test if we have an IPv4 flow for Agg */
-                agCache.v4AdS = *((unsigned long*)&buffer4);
-              }
-              if ((pftmp->fieldType==12)){
-                agCache.v4AdD = *((unsigned long*)&buffer4);
-              }
               if (pftmp->fieldType==1){
                 agCache.bytes = *((unsigned long*)&buffer4);
                 if (
-                    ((unsigned long)((((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.svalue) + ( (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.svalue)*10/100))
+                    ((unsigned long)((((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.lvalue) + ( (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.lvalue)*10/100))
                      >= (*((unsigned long*)&buffer4)))
                     &&
-                    ( (unsigned long)((((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.svalue) - ( (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.svalue)*10/100))
+                    ( (unsigned long)((((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.lvalue) - ( (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.lvalue)*10/100))
                       <= (*((unsigned long*)&buffer4)) )
                     )
@@ -327 +331 @@
                     ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->check = 1;
                   }
+              }
+#ifdef IPV4AGG
+              if ((pftmp->fieldType==8)){
+                bool = 1; /* very important, test if we have an IPv4 flow for Agg */
+                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){

trunk/src/rules_mgmt.c

@@ -467 +467 @@
       tmp->fieldType = ft;
       tmp->value = NULL;
-      if ((ft==25)){
+      if ((ft==25) || (ft==7) || (ft==11) ){
           tmp->value = addValue(tmp->value, operatorToNumber, value);
       } else if ((ft==1)){
@@ -651 +651 @@
     }   
     tmp->valueLength = 4;
-    tmp->stor.lvalue = (unsigned short) atoi(value);
+    tmp->stor.lvalue = (unsigned long) atol(value);
     tmp->next = vPtr;
   }