Changeset 47 for trunk/src/dataFlowSet.c

Timestamp:

08/30/07 17:46:34 (15 years ago)

Author:

andreu

Message:

merge from tag REL-0.0.11beta

Files:

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

trunk/src/dataFlowSet.c

@@ -173 +173 @@
       cpt++;
       j = 0;
-      pos = (pftmp->fieldType)*10+j;
+      pos = (pftmp->fieldType)*MAX_RULES_PER_FIELD+j;
       field_size = (int) pftmp->fieldLength;
       
       /* special case: check yes on all flows from one router (phantom field nb 0) */
-      while ( ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+j))) != NULL ) {  
+      /* FIXME : this code is repeated, perhaps past before */
+      while ( ((RuleDefPtr)(*(myPtrs->rulesAddressPtr+j))) != NULL ) {
         if  ( (((RuleDefPtr)(*(myPtrs->rulesAddressPtr+j)))->value->stor.lvalue)
               == myPtrs->pcktPtr->ipH->srcAdd )
@@ -791 +792 @@
          * In a first time (until release 0.0.7, the information was sent via
          * the process renetcolSender with an IPC message queue. But, the perf
-         * of IPC Msg was very bad with a system compilation by default.
-         * So now, we send information directly from here.
+         * of IPC Msg was very bad with a default system compilation.
+         * So, now, we send information directly from here.
          */
         tmpRuleList = myPtrs->rulesListPtr;
@@ -834 +835 @@
             /* NEW transfert type */
             for ( ; tmpRL; tmpRL=tmpRL->next){
-              if (tmpRL->id == tmpRuleList->id){
+              if (tmpRL->id == tmpRuleList->id){        
                 s = sendMessage(tmpRL->host->sockId, myMsg.text, sizeof(myMsg.text),
                                 tmpRL->host->hostAddressPtr);
@@ -844 +845 @@
           } /* end if check */
           tmpRuleList = tmpRuleList->next;
+          tmpRL = myPtrs->rulesListPtr; /* ticket #11 */
           secondPftmp = tmp->lastField;
         } /* end while tmpRuleList */