Changeset 47 for trunk/src/dataFlowSet.c

Show
Ignore:
Timestamp:
08/30/07 17:46:34 (15 years ago)
Author:
andreu
Message:

merge from tag REL-0.0.11beta

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/src/dataFlowSet.c

    r36 r47  
    173173      cpt++; 
    174174      j = 0; 
    175       pos = (pftmp->fieldType)*10+j; 
     175      pos = (pftmp->fieldType)*MAX_RULES_PER_FIELD+j; 
    176176      field_size = (int) pftmp->fieldLength; 
    177177       
    178178      /* special case: check yes on all flows from one router (phantom field nb 0) */ 
    179       while ( ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+j))) != NULL ) {   
     179      /* FIXME : this code is repeated, perhaps past before */ 
     180      while ( ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+j))) != NULL ) { 
    180181        if  ( (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+j)))->value->stor.lvalue) 
    181182              == myPtrs->pcktPtr->ipH->srcAdd ) 
     
    791792         * In a first time (until release 0.0.7, the information was sent via 
    792793         * the process renetcolSender with an IPC message queue. But, the perf 
    793          * of IPC Msg was very bad with a system compilation by default. 
    794          * So now, we send information directly from here. 
     794         * of IPC Msg was very bad with a default system compilation. 
     795         * So, now, we send information directly from here. 
    795796         */ 
    796797        tmpRuleList = myPtrs->rulesListPtr; 
     
    834835            /* NEW transfert type */ 
    835836            for ( ; tmpRL; tmpRL=tmpRL->next){ 
    836               if (tmpRL->id == tmpRuleList->id){ 
     837              if (tmpRL->id == tmpRuleList->id){         
    837838                s = sendMessage(tmpRL->host->sockId, myMsg.text, sizeof(myMsg.text), 
    838839                                tmpRL->host->hostAddressPtr); 
     
    844845          } /* end if check */ 
    845846          tmpRuleList = tmpRuleList->next; 
     847          tmpRL = myPtrs->rulesListPtr; /* ticket #11 */ 
    846848          secondPftmp = tmp->lastField; 
    847849        } /* end while tmpRuleList */