Changeset 77 for trunk/src

Timestamp:

11/03/08 10:46:51 (14 years ago)

Author:

andreu

Message:

some updates to prepare release 0.0.12

Location:

trunk/src

Files:

• as.h (modified) (2 diffs)
• renetcolSender.c (modified) (3 diffs)
• renetcolSender.h (modified) (1 diff)
• template.c (modified) (11 diffs)

trunk/src/as.h

@@ -35 +35 @@
 #include <syslog.h>
 
-#ifdef ASACC
 struct AS{
   unsigned short as;
@@ -46 +45 @@
   unsigned long long pktsNbOUT;
 };
-#endif
 
 int asGlobalCmp(const void *, const void *);

trunk/src/renetcolSender.c

@@ -43 +43 @@
 
 /*
+ *   subsstr
+ *   
+ *   substitute '_' char in a string with ' '
+ */
+char *subsstr(char *chin)
+{
+    int i;
+    for (i = 0; i < strlen(chin); i++) {
+        if (chin[i] == '_') {
+            chin[i] = ' ';
+        }
+    }
+    return chin;
+}
+
+/*
  * todo
  */
@@ -53 +69 @@
   FILE *tmpFile;
   char port[6];
+/*  char value[44]; */
   char filters[249];
+/*  char operator[2]; */
   char lines[256][256];
   char line[256];
@@ -129 +147 @@
       /* NEW RULE */
       if (sscanf(buffer, "%s %s\n",
-                port,
-                filters) == 0) {
+                port, 
+                filters) == 0) { 
+syslog (LOG_ERR, "reception de : %s, %s et %s", buffer, port, filters);
         syslog (LOG_ERR, "error in rule syntax: %s", filters);
         close(sock);
         return 1;
       }
+syslog (LOG_ERR, "filters : %s", filters);
       subsstr(filters);
+syslog (LOG_ERR, "filters modifies : %s", 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, "%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/src/renetcolSender.h

@@ -43 +43 @@
 #include "renetcolParam.h"
 
+#define CONST1 "C "
+
 typedef union semun
 {

trunk/src/template.c

@@ -36 +36 @@
   unsigned short os;
   unsigned char buffer2[2];
-  
+
   if ( cfn == 0 ) {
     os = 20+8+20;
@@ -78 +78 @@
   unsigned short badFieldLength = 0;
   unsigned short badFieldCount = 0;
-  
+
   buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
   buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
@@ -166 +166 @@
         buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
         buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
-        if ( (fldPtr->fieldType = *((unsigned short*)&buffer2) ) > 89) {
+        if ( (fldPtr->fieldType = *((unsigned short*)&buffer2) ) > 216) {
           badFieldNumber = 1;
         }
@@ -205 +205 @@
           }
           syslog (LOG_INFO, 
-                  "in new template: field nb gt 89, field lg gt 16 or too many fields, bad template definition possibility");
+                  "in new template: field nb gt 216, field lg gt 16 or too many fields, bad template definition possibility");
           fprintf(stderr,  
                   "\n in new template function: too many fields, bug collector or wrong template def \n");  
@@ -272 +272 @@
         buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
         buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
-        if ( (fldPtr->fieldType = *((unsigned short*)&buffer2) ) > 89) {
+        if ( (fldPtr->fieldType = *((unsigned short*)&buffer2) ) > 216) {
           badFieldNumber = 1;
         }
@@ -397 +397 @@
   length = *((unsigned short*)&buffer2);
   do {
-    /*#ifdef DEBUG    */
+#ifdef DEBUG    
     fprintf (stderr, "< %hu, %hu, ",getFlowsetId, length);
-    /*#endif*/
+#endif
     badFieldNumber = 0;
     badFieldLength = 0;
@@ -425 +425 @@
         buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
         buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
-        if ( (tmp->fieldType = *((unsigned short*)&buffer2) ) > 89) {
+        if ( (tmp->fieldType = *((unsigned short*)&buffer2) ) > 216) {
           badFieldNumber = 1;
         }
@@ -454 +454 @@
           syslog (LOG_INFO, 
                   "in option template function: too many fields, bug collector or wrong template def in template update");
-          /*#ifdef DEBUG*/
+#ifdef DEBUG
           fprintf(stderr,
                   "\nin option template function: too many fields, bug collector or wrong template def in template update\n");
-          /*#endif*/
+#endif
           while ( ((*offV9))> (index)){
             buffer2[1]= *(buf+index); index++;
@@ -518 +518 @@
         buffer2[1]= *(buf+(*offV9)); (*offV9)++; cpt++;
         buffer2[0]= *(buf+(*offV9)); (*offV9)++; cpt++;
-        if ( (tmp->fieldType = *((unsigned short*)&buffer2) ) > 89) {
+        if ( (tmp->fieldType = *((unsigned short*)&buffer2) ) > 216) {
           badFieldNumber = 1;
         }
@@ -545 +545 @@
           syslog (LOG_INFO, 
                   "in update option tpl function: too many fields, bug collector or wrong template def in template update");
-          /*#ifdef DEBUG*/
+#ifdef DEBUG
           fprintf(stderr,
                   "\nin update option tpl function: too many fields, bug collector or wrong template def in template update\n");
-          /*#endif*/
+#endif
           ptplotmp = cTOPtr;
           if (ptplotmp->prev == NULL) {
@@ -574 +574 @@
   } while ((cpt) < (length-2));
   /*   show_all_tplFlSet(); */
-  /*#ifdef DEBUG*/
+#ifdef DEBUG
   fprintf (stderr, ">");
-  /*#endif*/
+#endif
   return length;
 }