Changeset 73 for trunk

Timestamp:

07/24/08 10:47:32 (14 years ago)

Author:

andreu

Message:

last changes before next release

Location:

trunk

Files:

• README (modified) (2 diffs)
• conf/AS.txt (modified) (1 diff)
• conf/IPv4_Subnet_Aggregation_based_on_SNMP_index.txt (modified) (1 diff)
• conf/IPv4_Subnet_Aggregation_based_on_routers_ident.txt (modified) (1 diff)
• conf/SNMP_INDEX.txt (added)
• conf/routers.txt (modified) (1 diff)
• conf/rules.txt (modified) (3 diffs)
• src/dataFlowSet.c (modified) (3 diffs)
• src/renetcolParam.h (modified) (2 diffs)
• src/renetcolSender.c (modified) (3 diffs)
• tool/check.sh (modified) (1 diff)
• tool/renetcolGUI.py (modified) (4 diffs)

trunk/README

@@ -26 +26 @@
  
  -------------------------------------
-| Step 2: before configuration & start |
+| Step 2: before start                |
  -------------------------------------
 
@@ -49 +49 @@
 
 We recommand to use the script *check.sh* (in tool/) to launch renetcol. 
-This script required in parameters the path to renetcol. This file MUST be edited.
+This script required in parameters the path to renetcol and you must edit the file.
 We can also put the script in your root crontab to verify the collector state, 
 for exemple:

trunk/conf/AS.txt

@@ -1 @@
-5511
-3215
-12322
+65511
+65215
+65322

trunk/conf/IPv4_Subnet_Aggregation_based_on_SNMP_index.txt

@@ -1 @@
-195.98.247.0    24
-195.98.248.0    24
-195.98.249.0    24
-195.98.250.0    24
-195.98.251.0    24
-195.98.252.0    24
+192.168.247.0    24
+192.168.248.0    24
+192.168.249.0    24
+192.168.250.0    24
+192.168.251.0    24
+192.168.252.0    24

trunk/conf/IPv4_Subnet_Aggregation_based_on_routers_ident.txt

@@ -1 @@
-195.221.248.0/24-15
-195.221.249.0/24-21
-195.221.250.0/24-17
-195.221.252.0/24-12
+192.168.248.0/24-15
+192.168.249.0/24-21
+192.168.250.0/24-17
+192.168.252.0/24-12

trunk/conf/routers.txt

@@ -1 @@
-0 Name 0.0.0.5 null
-1 Besancon 0.0.0.1 null
-2 Bordeaux 0.0.0.2 0.0.0.12
-3 Caen 0.0.0.3 null
-4 Clermont 0.0.0.4 0.0.0.42
+1 router1 192.68.0.1 null
+2 router2 192.68.0.2 null
+3 router3 192.68.0.3 null
+4 router4 192.68.0.4 null

trunk/conf/rules.txt

@@ -1 +1 @@
 # This file is an exemple
-# you must create your own rules
+# you must create your own filters
 
 # #: commented line
-# N: rule name (string without space)
+# N: filter name (string without space)
 # O: output type (only socket in this release)
 # C: check field : C <field ID> <operator> <value> 
@@ -15 +15 @@
 # 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
+# Get this rule enable because the collector don't start without filter
+N BUG
+O socket 127.0.0.1 1111
+C 60 = 38
 
 # Example
-# This rule depends on functionnality not present in this release
+# This filter depends on functionnality not present in this release
 # from TCP flows
 # prefix aggregation
@@ -31 +32 @@
 
 # Example
-# This rule depends on functionnality not present in this release
+# This filter depends on functionnality not present in this release
 # get all flows whom size between 15 & 16 Mo
 # record all fields in a file

trunk/src/dataFlowSet.c

@@ -153 +153 @@
        * progression in a data flow Set 
        * notes:
-       *   48=header ip + header netf
-       *   shift = shift if there is a template declaration 
+       *   48= IP header size + NetFlow header size
+       *   shift = shift because we have a template declaration
+       *           inside data templates
        */
       cpt++;
@@ -273 +274 @@
               (*myPtrs->offsetV9Ptr)++;
               /* FIXME : here , add a check on the field type */
-              if ((pftmp->fieldType==8)||(pftmp->fieldType==12)){
+              if ((pftmp->fieldType==8)||(pftmp->fieldType==12)
+                  ||(pftmp->fieldType==15)||(pftmp->fieldType==18)){
                 if ((((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->stor.lvalue) 
                     == (*((unsigned long*)&buffer4))>>(32-((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask)<<(32-((RuleDefPtr)(*(myPtrs->rulesAddressPtr+pos)))->value->mask) )
@@ -804 +806 @@
          * the process renetcolSender with an IPC message queue. But, the perf
          * of IPC Msg was very bad with a default system compilation.
-         * So, now, we send information directly from here via sockets.
+         * So, now, we send information directly from here through sockets.
          */
         tmpRuleList = myPtrs->rulesListPtr;

trunk/src/renetcolParam.h

@@ -48 +48 @@
  * FILE with your prefix/subnet 
  */
-#define SUBNETS_LIST "<path to renetcol>/renetcol-0.0.12beta/conf/IPv4_prefix.txt"
+#define SUBNETS_LIST "<path to renetcol>/renetcol-0.0.12beta/conf/IPv4_Subnet_Aggregation_based_on_SNMP_index.txt"
 /* 
  * FILE with the list of AS with accounting
@@ -67 +67 @@
  * tagged "C"ustomers or "B"ackbone 
  */
-#define INTERFACES_TYPE_LIST ""
+#define INTERFACES_TYPE_LIST "<path to renetcol>/renetcol-0.0.12beta/conf/SNMP_INDEX.txt"
 /* 
  * maximum SNMP index 

trunk/src/renetcolSender.c

@@ -52 +52 @@
   FILE *ruleFile;
   FILE *tmpFile;
-  char field[4];
   char port[6];
-  char value[44];
   char filters[249];
-  char operator[2];
-  char poubelle[2];
   char lines[256][256];
   char line[256];
@@ -66 +62 @@
   int i = 0;
   int ruleToDelete = 0;
+  static char * fields;
 
   while (1){
@@ -131 +128 @@
     } else {
       /* NEW RULE */
-      /*      if (sscanf(buffer, "%s %s %1s %s\n",*/
-/*               port, */
-/*               field, */
-/*               operator, */
-/*               value) == 0) { */
-      if (sscanf(buffer, "%s %1s %s\n",
-                 port,
-                 poubelle,
-                 filters) == 0) {
-        syslog (LOG_ERR, "error in recept rule: %s", buffer);
-        close(sock);
-        return 1;
-      }
+      if (sscanf(buffer, "%s %s\n",
+                port,
+                filters) == 0) {
+        syslog (LOG_ERR, "error in rule syntax: %s", filters);
+        close(sock);
+        return 1;
+      }
+      subsstr(filters);
       if (!(ruleFile = fopen(RULES_FILE, "a"))) {
-        syslog (LOG_ERR, "error during %s opening", RULES_FILE);
-        close(sock);
-        return 1;
+        syslog (LOG_ERR, "error during %s opening", RULES_FILE);
+        close(sock);
+        return 1;
       } else {
-        fprintf(ruleFile, "N %s\n", host);
-        fprintf(ruleFile, "O socket %s %s\n", host, port);
-/*      fprintf(ruleFile, "C %s %s %s\n", field, operator, value); */
-        fprintf(ruleFile, "%s\n", filters);
-        fclose(ruleFile);
-      }
+        fprintf(ruleFile, "N %s\n", host);
+        fprintf(ruleFile, "O socket %s %s\n", host, port);
+        fprintf(ruleFile, "%s\n", filters);
+        fclose(ruleFile);
+      }
+
     }
   }

trunk/tool/check.sh

@@ -14 +14 @@
   echo "renetcolMsgCtl started"
   sleep 2
-  $1/src/renetcol $1/src/info_routeur_netflow.txt $1/src/donneesblocsadresses2 $1/src/rules.txt
+  $1/src/renetcol
   echo "renetcol restarted"
-  $1/src/renetcolSender $1/src/renetcol 1 $1/src/rules.txt
+  $1/src/renetcolSender $1/src/renetcol 1
   echo "renetcolSender restarted"
   $1/src/renetcolAgg

trunk/tool/renetcolGUI.py

@@ -52 +52 @@
 collectorAddr = "127.0.0.1"
 collectorAddr6 = "0::"
-collectorPort = 52571  # if you change it, apply the modification on
-                       # the renetcolSender.h file and recompil the collector 
+collectorPort = 52571  # if you change this port number, apply the
+                       # modification on the renetcolSender.h file
+                       # and you'll need a new compilation of the colllector 
 ##############################################################################
 
@@ -599 +600 @@
     old_record_file.close()
     now2 = time.time()
-    reste = 86400-(operator.mod(now2,86400))
-    myTimer = threading.Timer(300.0,timer_action)
+    reste = 360-(operator.mod(now2,360))
+    myTimer = threading.Timer(360.0,timer_action)
     myTimer.start()
 
@@ -612 +613 @@
             print "STARTING RECORD ROTATION"
             now2 = time.time()
-            reste = 86400-(operator.mod(now2,86400))
-            myTimer = threading.Timer(300.0,timer_action)
+            reste = 360-(operator.mod(now2,360))
+            myTimer = threading.Timer(360,timer_action)
             myTimer.start()
         if widget.get_active() == 0:
@@ -695 +696 @@
             coll_window.show_all()
             if (is_already_see==0):
-                info_dialog(widget, None, "You should registered only one rule for each GUI parser ! Think of using the DELETE button !")
+                info_dialog(widget, None, "You should register only one rule for each GUI parser ! Think of using the DELETE button !")
                 is_already_see=1