Changeset 73 for trunk/src

Timestamp:

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

Author:

andreu

Message:

last changes before next release

Location:

trunk/src

Files:

• dataFlowSet.c (modified) (3 diffs)
• renetcolParam.h (modified) (2 diffs)
• renetcolSender.c (modified) (3 diffs)

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);
+      }
+
     }
   }