Changeset 8 for trunk/src/rules_mgmt.c

Timestamp:

10/20/05 15:05:40 (17 years ago)

Author:

andreu

Message:

second RENETCOL CVS Integration

Files:

• trunk/src/rules_mgmt.c (modified) (26 diffs)

trunk/src/rules_mgmt.c

@@ -72 +72 @@
   if (rPtr!=NULL){
     fprintf(stderr, "\nid: %hu\n", rPtr->id);
+    if (rPtr->prev) { fprintf(stderr, "\nid prev: %hu\n", rPtr->prev->id);}
+    if (rPtr->next) { fprintf(stderr, "\nid next: %hu\n", rPtr->next->id);}
     fprintf(stderr, "Name: %s\n", rPtr->ruleName);    
 /*     puts (asctime (& rPtr->begin)); */
@@ -137 +139 @@
 {
   RulesPtr tmp = NULL;
-  if (rPtr->prev!=NULL) {
-    rPtr->prev->next = rPtr->next;
+  if (rPtr==firstrPtr) {
+    if (rPtr->next) {
+      tmp = rPtr->next;
+      tmp->prev = NULL;
+      freeRule(rPtr);
+      return tmp; 
+    }else{
+      freeRule(rPtr);
+      return NULL;
+    }
+  } else {
+    if (rPtr->prev->next) { rPtr->prev->next = rPtr->next;}
     if (rPtr->next) {rPtr->next->prev = rPtr->prev;}
     freeRule(rPtr);
     return firstrPtr;
-  } else {
-    if (rPtr->next) {
-      rPtr->next->prev = NULL;
-      tmp = rPtr->next;
-    }
-    freeRule(rPtr);
-    return tmp; 
-  }
-}
-
-RulesPtr 
+  }
+}
+
+RulesPtr
 getRules(RulesPtr rPtr, char *filename)
 {
   FILE *ruleFile;
   RulesPtr tmp = NULL;
+  RulesPtr tmp2 = NULL;
   time_t hour;
   char line[512];
@@ -168 +174 @@
   
   if (!(ruleFile = fopen(filename, "r"))) {
-    fprintf (stderr, "error during %s opening\n", filename);
+    syslog(LOG_ERR, "error during %s opening\n", filename);
     exit(1);
   }
@@ -184 +190 @@
                    strTok,        
                    strName) == 0) {
-          fprintf(stderr, "Error in file %s, line %d\n", 
+          syslog(LOG_ERR, "Error in file %s, line %d\n", 
                   filename, cptLine);
           exit(1);
@@ -192 +198 @@
           tmp = (RulesPtr) malloc(sizeof(struct Rules));
           if (tmp==NULL) {
-            fprintf(stderr, "ERROR in malloc in getRule function\n");
+            syslog(LOG_ERR, "ERROR in malloc in getRule function\n");
             exit(1);
           } else {
@@ -202 +208 @@
             tmp->db = NULL;
             tmp->next = rPtr;
+            /* rPtr->prev = tmp; */
             tmp->prev = NULL;
           }
@@ -214 +221 @@
                    str1,
                    str2) == 0) {
-          fprintf(stderr, "Error in file %s, line %d\n", 
+          syslog(LOG_ERR, "Error in file %s, line %d\n", 
                   filename, cptLine);
           exit(1);
@@ -244 +251 @@
       cptLine++;
     }
-    /*     if (rPtr!=NULL) { rPtr->prev = tmp;} */
     /*     tmp->prev = NULL; */
   }
-  return tmp;
+  tmp2 = tmp;
+  for ( ; tmp2; tmp2=tmp2->next) {
+    if (tmp2->next) {
+      tmp2->next->prev = tmp2;
+    } 
+  }
+  fclose(ruleFile);
+  return tmp; 
 }
 
@@ -255 +268 @@
   FILE *ruleFile;
   RulesPtr tmp = NULL;
+  RulesPtr tmp2 = NULL;
   time_t hour;
   char line[512];
@@ -266 +280 @@
   
   if (!(ruleFile = fopen(filename, "r"))) {
-    fprintf (stderr, "error during %s opening\n", filename);
+    syslog(LOG_ERR, "error during %s opening\n", filename);
     exit(1);
   }
@@ -282 +296 @@
                    strTok,        
                    strName) == 0) {
-          fprintf(stderr, "Error in file %s, line %d\n", 
+          syslog(LOG_ERR, "Error in file %s, line %d\n", 
                   filename, cptLine);
           exit(1);
@@ -290 +304 @@
           tmp = (RulesPtr) malloc(sizeof(struct Rules));
           if (tmp==NULL) {
-            fprintf(stderr, "ERROR in malloc in getRule function\n");
+            syslog(LOG_ERR, "ERROR in malloc in getRule function\n");
             exit(1);
           } else {
@@ -312 +326 @@
                    str1,
                    str2) == 0) {
-          fprintf(stderr, "Error in file %s, line %d\n", 
+          syslog(LOG_ERR, "Error in file %s, line %d\n", 
                   filename, cptLine);
           exit(1);
@@ -332 +346 @@
       }
       if (strncmp("A", lineCopy, 1) == 0){
-        syslog(LOG_INFO,"Aggregation mode isn't yet implemented\n");
+        syslog(LOG_INFO,"Aggregation mode isn't yet implemented");
       }
       if (strncmp("R", lineCopy, 1) == 0){
@@ -339 +353 @@
       cptLine++;
     }
-    /*     if (rPtr!=NULL) { rPtr->prev = tmp;} */
-    /*     tmp->prev = NULL; */
-  }
+  }
+  tmp2 = tmp;
+  for ( ; tmp2; tmp2=tmp2->next) {
+    if (tmp2->next) {
+      tmp2->next->prev = tmp2;
+    } 
+  }
+  fclose(ruleFile);
   return tmp;
 }
@@ -348 +367 @@
 addFileDef(FilePtr fPtr, char *str1, char *str2)
 {
-  fprintf(stderr,"add file def: %s %s \n", str1, str2);
+/*   fprintf(stderr,"add file def: %s %s \n", str1, str2); */
   return NULL;
 }
@@ -358 +377 @@
   tmp = (RemoteHostPtr) malloc(sizeof(struct RemoteHost));
   if (tmp==NULL) {
-    fprintf(stderr, "ERROR in malloc in addRemoteHostDef function\n");
+    syslog(LOG_ERR, "ERROR in malloc in addRemoteHostDef function");
     exit(1);
   } else {
-    tmp->hostAddressPtr = (struct sockaddr_in*)
-      malloc(sizeof(struct sockaddr_in));
+    tmp->hostAddressPtr = (struct sockaddr_storage*)
+      malloc(sizeof(struct sockaddr_storage));
     if (tmp->hostAddressPtr==NULL) {
-      fprintf(stderr, "ERROR in malloc in addRemoteHostDef function\n");
+      syslog(LOG_ERR, "ERROR in malloc in addRemoteHostDef function");
       exit(1);
     } else {
-      tmp->sockId = create_socket( str1, atoi(str2), tmp->hostAddressPtr);
+      if ((tmp->sockId=create_socket( str1, str2, tmp->hostAddressPtr))==0)
+        return NULL;
       tmp->next = rPtr;
     }
@@ -376 +396 @@
 DbPtr
 addDataBase(DbPtr dPtr, char *str1, char *str2){
-  fprintf(stderr,"add DB def: %s %s \n", str1, str2);
+  syslog(LOG_INFO,"DB output not in this release");
   return NULL;
 }
@@ -392 +412 @@
     unsigned short length;
     if (sscanf(fields, " %hu %hu ", &type, &length) == 0) {
-      fprintf(stderr, 
-              "Errors in definition of fields to record: wrong syntax\n");
+      syslog(LOG_ERR, 
+              "Errors in definition of fields to record: wrong syntax");
       exit(1);
     } else {
@@ -424 +444 @@
     tmp = (RuleDefPtr) malloc(sizeof(struct RuleDef));
     if (tmp==NULL) {
-      fprintf(stderr, "ERROR in malloc in addRuleDef function\n");
+      syslog(LOG_ERR, "ERROR in malloc in addRuleDef function");
       exit(1);
     } else { 
       if (sscanf(fields, " %hu %1s %s ", &ft, operator, value) == 0) {
-        fprintf(stderr, "Errors in Tests definition : wrong syntax\n");
+        syslog(LOG_ERR, "Errors in Tests definition : wrong syntax");
         exit(1);
       }
@@ -456 +476 @@
       } else {
         syslog(LOG_INFO, 
-                "You can't compare the field <%hu> currently, sorry\n",
+                "You can't compare the field <%hu> in this release, sorry",
                 ft); 
       }
@@ -479 +499 @@
   tmp = (ValuesPtr) malloc(sizeof(struct Values));
   if (tmp==NULL) {
-    fprintf(stderr, "ERROR in malloc in addAddress function\n");
+    syslog(LOG_ERR, "ERROR in malloc in addAddress function");
     exit(1);
   } else {
     if (sscanf(val, "%hu.%hu.%hu.%hu", &v0, &v1, &v2, &v3) == 0) {
-      fprintf(stderr, "Errors in Tests definition : wrong IPv4 value\n");
+      syslog(LOG_ERR, "Errors in Tests definition : wrong IPv4 value");
       exit(1);
     }
@@ -507 +527 @@
   tmp = (ValuesPtr) malloc(sizeof(struct Values));
   if (tmp==NULL) {
-    fprintf(stderr, "ERROR in malloc in addV6Address function\n");
+    syslog(LOG_ERR, "ERROR in malloc in addV6Address function");
     exit(1);
   } else {
@@ -513 +533 @@
     switch(result) {
     case 0 : 
-      printf(" inet_pton : Invalid IPv6 Address\n");
+      syslog(LOG_ERR," inet_pton : Invalid IPv6 Address");
       exit(1);
       break;
     case -1: 
-      printf(" inet_pton : AF unknown \n");
+      syslog(LOG_ERR," inet_pton : AF unknown");
       exit(1);
       break;
@@ -540 +560 @@
   tmp = (ValuesPtr) malloc(sizeof(struct Values));
   if (tmp==NULL) {
-    fprintf(stderr, "ERROR in malloc in addValue function\n");
+    syslog(LOG_ERR, "ERROR in malloc in addValue function");
     exit(1);
   } else {
     if (sscanf(val, "%s", value) == 0) {
-      fprintf(stderr, "Errors in Tests definition : wrong short value\n");
+      syslog(LOG_ERR, "Errors in Tests definition : wrong short value");
       exit(1);
     }   
@@ -562 +582 @@
   tmp = (ValuesPtr) malloc(sizeof(struct Values));
   if (tmp==NULL) {
-    fprintf(stderr, "ERROR in malloc in addValue function\n");
+    syslog(LOG_ERR, "ERROR in malloc in addValue function");
     exit(1);
   } else {
     if (sscanf(val, "%s", value) == 0) {
-      fprintf(stderr, "Errors in Tests definition : wrong char value\n");
+      syslog(LOG_ERR, "Errors in Tests definition : wrong char value");
       exit(1);
     }