Changeset 15 for trunk/src/dataFlowSet.c
- Timestamp:
- 03/16/06 17:45:26 (17 years ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/dataFlowSet.c
r14 r15 2 2 * File: dataFlowSet.c 3 3 * 4 * Authors: ANDREU Fran çois-Xavier4 * Authors: ANDREU Francois-Xavier 5 5 * 6 6 * Copyright (C) 2005 GIP RENATER … … 132 132 buffer4[1]= *(buf+(*offV9)); (*offV9)++; 133 133 buffer4[0]= *(buf+(*offV9)); (*offV9)++; 134 /* here , add a check on the field type */134 /* FIXME : here , add a check on the field type */ 135 135 if ((((RuleDefPtr)(*(rulesCache+pos)))->value->stor.lvalue) 136 136 == (*((unsigned long*)&buffer4))>>(32-((RuleDefPtr)(*(rulesCache+pos)))->value->mask)<<(32-((RuleDefPtr)(*(rulesCache+pos)))->value->mask) ) … … 145 145 buffer4[1]= *(buf+(*offV9)); (*offV9)++; 146 146 buffer4[0]= *(buf+(*offV9)); (*offV9)++; 147 /* here check a new var : moreIsNecessary */148 147 if (1==moreIsNecessary){ 149 148 switch(i){ 150 149 case 0: 151 /* fprintf(stderr, "i:%d case0, N:%lu V:%lu TC:%lu, %hu\n", */152 /* i, */153 /* ntohl(((RuleDefPtr)(*(rulesCache+pos)))->value->stor.tabAdd6[i]), */154 /* (*((unsigned long*)&buffer4)), */155 /* (*((unsigned long*)&buffer4))>>(32-((RuleDefPtr)(*(rulesCache+pos)))->value->mask)<<(32-((RuleDefPtr)(*(rulesCache+pos)))->value->mask), */156 /* ((RuleDefPtr)(*(rulesCache+pos)))->value->mask */157 /* ); */158 150 if (((RuleDefPtr)(*(rulesCache+pos)))->value->mask <= 32){ 159 151 if (ntohl(((RuleDefPtr)(*(rulesCache+pos)))->value->stor.tabAdd6[i]) … … 182 174 break; 183 175 case 1: 184 /* fprintf(stderr, "i:%d case1, N:%lu V:%lu TC:%lu\n", */185 /* i, */186 /* ntohl(((RuleDefPtr)(*(rulesCache+pos)))->value->stor.tabAdd6[i]), */187 /* (*((unsigned long*)&buffer4)), */188 /* (*((unsigned long*)&buffer4))>>(64-((RuleDefPtr)(*(rulesCache+pos)))->value->mask)<<(64-((RuleDefPtr)(*(rulesCache+pos)))->value->mask)); */189 176 if (((RuleDefPtr)(*(rulesCache+pos)))->value->mask <= 64){ 190 177 if (ntohl(((RuleDefPtr)(*(rulesCache+pos)))->value->stor.tabAdd6[i]) … … 274 261 } /* end of if moreIsNecessary */ 275 262 } 276 /* fprintf(stderr,"GOOD %d\n", */277 /* ((RuleDefPtr)(*(rulesCache+pos)))->check); */278 263 moreIsNecessary = 1; 279 264 break; … … 409 394 return (data_length+shift); 410 395 } 411 412 /* for (i=0; i<(90); i++){ */413 /* int k=0; */414 /* pos = i*10+k; */415 /* if (((RuleDefPtr)(*(rulesCache+pos))) != NULL){ */416 /* fprintf(stderr," type: %d ",i); */417 /* while ( ((RuleDefPtr)(*(rulesCache+pos))) != NULL){ */418 /* fprintf(stderr, "\n op:%hu, pos: %d", */419 /* ((RuleDefPtr)(*(rulesCache+pos)))->operator, */420 /* pos); */421 /* k++; */422 /* pos = i*10+k; */423 /* } */424 /* fprintf(stderr,"\n"); */425 /* } */426 /* } */