Changeset 44 for tags/REL-0.0.11beta

Timestamp:

08/30/07 00:53:49 (16 years ago)

Author:

andreu

Message:

ticket #11 and add generic conf in conf/rules.txt & tool/check.sh

Location:

tags/REL-0.0.11beta/trunk

Files:

• conf/rules.txt (modified) (1 diff)
• src/dataFlowSet.c (modified) (3 diffs)
• src/renetcol.c (modified) (4 diffs)
• tool/check.sh (modified) (1 diff)

tags/REL-0.0.11beta/trunk/conf/rules.txt

@@ -13 +13 @@
 # in table 6
 
-N test_MPLS
-O socket 10.0.0.1 1111
-C 46 = 5
+# Example
+# Dump on 10.0.01:1111 all MPLS flow (field 46 = 5)
+#N test_MPLS
+#O socket 10.0.0.1 1111
+#C 46 = 5
 
-# This rule depends on functionnality not present in this beta release
+# Example
+# This rule depends on functionnality not present in this release
 # from TCP flows
 # prefix aggregation
 # five minutes
 # record in/out octets
-N TCPVolumetry
-O file ascii /tmp/output2.txt
-A P
-R 4 1 R 4 25
+#N TCPVolumetry
+#O file ascii /tmp/output2.txt
+#A P
+#R 4 1 R 4 25
 
-# This rule depends on functionnality not present in this beta release
+# Example
+# This rule depends on functionnality not present in this release
 # get all flows whom size between 15 & 16 Mo
 # record all fields in a file
-N Get_From_Size
-O file bin /tmp/output.txt
-C 1 > 15 C 1 < 16
+#N Get_From_Size
+#O file bin /tmp/output.txt
+#C 1 > 15 C 1 < 16
 

tags/REL-0.0.11beta/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 )
@@ -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 */

tags/REL-0.0.11beta/trunk/src/renetcol.c

@@ -167 +167 @@
   }
   tmp = NULL;
-/*   printRule(rulesListPtr); */
-/*   exit(1); */
+#ifdef DEBUG
+  printRule(rulesListPtr);
+#endif
+
 
   fprintf(stderr, "renetcol: I become a deamon, next messages via syslogd. By.\n");
@@ -330 +332 @@
   setCache(myPtrs.rulesListPtr);
   sendReadRulesSignal(myQueue);
+#ifdef DEBUG
+  printRule(myPtrs.rulesListPtr);
+#endif
 }
 
@@ -356 +361 @@
   RuleDefPtr def = NULL;
 
+#ifdef DEBUG
+  fprintf(stderr,"Cache for Rules\n");
+#endif 
   while (tmp) {
     def = tmp->def;
@@ -365 +373 @@
       rulesAddress[def->fieldType][i] = def;
       def = def->next;
-    }
+#ifdef DEBUG
+      fprintf(stderr,"%d: %d ", def->fieldType, i);
+#endif     
+    }
+#ifdef DEBUG
+    fprintf(stderr,"\n");
+#endif      
     tmp = tmp->next;
   }

tags/REL-0.0.11beta/trunk/tool/check.sh

@@ -11 +11 @@
   killall renetcolAgg
   sleep 1
-  /home/maintenance/renetcol-0.0.9/src/renetcolMsgCtl /home/maintenance/renetcol-0.0.9/src/renetcol
+  /home/maintenance/renetcol-0.0.11beta/src/renetcolMsgCtl /home/maintenance/renetcol-0.0.11beta/src/renetcol
   echo "renetcolMsgCtl started"
   sleep 2
-  /home/maintenance/renetcol-0.0.9/src/renetcol /home/maintenance/renetcol-0.0.9/src/info_routeur_netflow.txt /home/maintenance/renetcol-0.0.9/src/donneesblocsadresses2 /home/maintenance/renetcol-0.0.9/src/rules.txt
+  /home/maintenance/renetcol-0.0.11beta/src/renetcol /home/maintenance/renetcol-0.0.11beta/src/info_routeur_netflow.txt /home/maintenance/renetcol-0.0.11beta/src/donneesblocsadresses2 /home/maintenance/renetcol-0.0.11beta/src/rules.txt
   echo "renetcol restarted"
-  /home/maintenance/renetcol-0.0.9/src/renetcolSender /home/maintenance/renetcol-0.0.9/src/renetcol 1 /home/maintenance/renetcol-0.0.9/src/rules.txt
+  /home/maintenance/renetcol-0.0.11beta/src/renetcolSender /home/maintenance/renetcol-0.0.11beta/src/renetcol 1 /home/maintenance/renetcol-0.0.11beta/src/rules.txt
   echo "renetcolSender restarted"
-  /home/maintenance/renetcol-0.0.9/src/renetcolAgg
+  /home/maintenance/renetcol-0.0.11beta/src/renetcolAgg
 else
   echo "All is up"