Changeset 11 for trunk/src

Timestamp:

02/14/06 17:56:11 (17 years ago)

Author:

andreu

Message:

prefix v4 comparaison ok

Files:

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

trunk/src/dataFlowSet.c

@@ -131 +131 @@
               buffer4[1]= *(buf+(*offV9)); (*offV9)++;
               buffer4[0]= *(buf+(*offV9)); (*offV9)++;
+              /* here , add a check on the field type */
               if ((((RuleDefPtr)(*(rulesCache+pos)))->value->stor.lvalue) 
-                  == (*((unsigned long*)&buffer4)))
+                  == (*((unsigned long*)&buffer4))>>(32-((RuleDefPtr)(*(rulesCache+pos)))->value->mask)<<(32-((RuleDefPtr)(*(rulesCache+pos)))->value->mask) )
                 {
                   ((RuleDefPtr)(*(rulesCache+pos)))->check = 1;
@@ -144 +145 @@
                 buffer4[0]= *(buf+(*offV9)); (*offV9)++;
                 if (ntohl(((RuleDefPtr)(*(rulesCache+pos)))->value->stor.tabAdd6[i]) 
-                    == (*((unsigned long*)&buffer4)))
+                    == (*((unsigned long*)&buffer4))>>(12-(((RuleDefPtr)(*(rulesCache+pos)))->value->mask)%32)<<(32-(((RuleDefPtr)(*(rulesCache+pos)))->value->mask)%32)
+                    )
                   {
                     if (0==i){
@@ -154 +156 @@
                   } else {
                     ((RuleDefPtr)(*(rulesCache+pos)))->check = 0;
-                  }                           
+                  }
               }
               break;