Changeset 47 for trunk/src

Timestamp:

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

Author:

andreu

Message:

merge from tag REL-0.0.11beta

Location:

trunk/src

Files:

• Makefile.am (modified) (1 diff)
• dataFlowSet.c (modified) (4 diffs)
• mysql_mgmt.c (modified) (1 diff)
• mysql_mgmt.h (modified) (1 diff)
• renetcol.c (modified) (5 diffs)
• renetcolAgg.c (modified) (1 diff)
• renetcolDB.c (modified) (1 diff)
• renetcolDB.h (modified) (1 diff)
• renetcolSender.c (modified) (7 diffs)
• rrdwrap.c (deleted)
• rrdwrap.h (deleted)

trunk/src/Makefile.am

@@ -11 +11 @@
         remote_output.c fields_mgmt.h fields_mgmt.c pop.h renetcolParam.h
 renetcolMsgCtl_SOURCES = renetcolMsgCtl.c
-renetcolAgg_SOURCES = renetcolAgg.c renetcolAgg.h rrdwrap.h rrdwrap.c pop.h renetcolParam.h
+renetcolAgg_SOURCES = renetcolAgg.c renetcolAgg.h pop.h renetcolParam.h
 BUILT_SOURCES = renetcol.o renetcolSender.o renetcolAgg.o
 renetcol_LDADD = -ldl -lc_p

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 */

trunk/src/mysql_mgmt.c

@@ -2 +2 @@
  * File: mysql_mgmt.c
  * 
- * Authors: ANDREU François-Xavier 
+ * Authors: ANDREU Francois-Xavier 
  *
  * Copyright (C) 2005 GIP RENATER 

trunk/src/mysql_mgmt.h

@@ -2 +2 @@
  * File: mysql_mgmt.h
  * 
- * Authors: ANDREU François-Xavier 
+ * Authors: ANDREU Francois-Xavier 
  *
  * Copyright (C) 2005 GIP RENATER 

trunk/src/renetcol.c

@@ -155 +155 @@
   shmForAgg->currentTable = 0;
   shmForAgg->secondTable = 1;
+  shmForAgg->readed = 0;
 
   myPtrs.rulesListPtr = NULL;
@@ -166 +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");
@@ -329 +332 @@
   setCache(myPtrs.rulesListPtr);
   sendReadRulesSignal(myQueue);
+#ifdef DEBUG
+  printRule(myPtrs.rulesListPtr);
+#endif
 }
 
@@ -355 +361 @@
   RuleDefPtr def = NULL;
 
+#ifdef DEBUG
+  fprintf(stderr,"Cache for Rules\n");
+#endif 
   while (tmp) {
     def = tmp->def;
@@ -364 +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;
   }

trunk/src/renetcolAgg.c

@@ -381 +381 @@
           }
         }
-      }  
-    } 
+      } /* end is first update */ 
+    } /* end read ok */
     sleep(10);
   } while (1);

trunk/src/renetcolDB.c

@@ -2 +2 @@
  * File: renetcolDB.c
  * 
- * Authors: ANDREU François-Xavier 
+ * Authors: ANDREU Francois-Xavier 
  *
  * Copyright (C) 2007 GIP RENATER 

trunk/src/renetcolDB.h

@@ -2 +2 @@
  * File: renetcolDB.h
  * 
- * Authors: ANDREU François-Xavier 
+ * Authors: ANDREU Francois-Xavier 
  *
  * Copyright (C) 2007 GIP RENATER 

trunk/src/renetcolSender.c

@@ -70 +70 @@
     if (length < 0){
       syslog(LOG_ERR, " read : %s", strerror(errno));
+      close(sock);
       return 1;
     }
@@ -79 +80 @@
       if (!(ruleFile = fopen(rulesFileName, "r"))) {
         syslog (LOG_ERR, "error during %s opening\n", rulesFileName);
+        close(sock);
         exit(1);
       } else {
@@ -94 +96 @@
               }
             } else {
+              close(sock);
               return 1;
             }
@@ -106 +109 @@
         if (!(tmpFile = fopen(FILE_TEMPO, "w"))) {
           syslog (LOG_ERR, "error during %s opening", FILE_TEMPO);
+          close(sock);
           return 1;
         } else {
@@ -114 +118 @@
           if (remove(rulesFileName)!=0){
             syslog(LOG_ERR, "rules.txt remove pb: %s", strerror(errno));
+            close(sock);
             return 1;
           }
           if (rename(FILE_TEMPO, rulesFileName)!=0){
             syslog(LOG_ERR, "rename file pb: %s", strerror(errno));
+            close(sock);
             return 1;
           }
@@ -130 +136 @@
                  value) == 0) {
         syslog (LOG_ERR, "error in recept rule: %s", buffer);
+        close(sock);
         return 1;
       }
       if (!(ruleFile = fopen(rulesFileName, "a"))) {
         syslog (LOG_ERR, "error during %s opening", rulesFileName);
+        close(sock);
         return 1;
       } else {
@@ -217 +225 @@
     if (getnameinfo((struct sockaddr *) &clientAddress,
                     clientAddressLen, host, sizeof host,
-                    NULL, (size_t) 0, 0) == 0) {
+                    NULL, (size_t) 0, NI_NUMERICHOST) == 0) {
       syslog(LOG_INFO, 
              "New connection from %s", host);