X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;ds=sidebyside;f=src%2Fconfig%2Freports-config.c;fp=src%2Fconfig%2Freports-config.c;h=4bedfee72abe1d97a02f59fe6650bf3c741c1640;hb=3f728675941dc69d4e544d3a880a56240a6e394a;hp=984b26899fa355f8bc1416495ffd1f282161d3a8;hpb=927951d1c1ad45ba9e7325f07d996154a91c911b;p=ossec-hids.git

diff --git a/src/config/reports-config.c b/src/config/reports-config.c
index 984b268..4bedfee 100644
--- a/src/config/reports-config.c
+++ b/src/config/reports-config.c
@@ -1,6 +1,3 @@
-/* @(#) $Id: ./src/config/reports-config.c, 2011/09/08 dcid Exp $
- */
-
 /* Copyright (C) 2009 Trend Micro Inc.
  * All right reserved.
  *
@@ -10,80 +7,67 @@
  * Foundation
  */
 
-/* Functions to handle the configuration files
- */
-
-
 #include "shared.h"
 #include "reports-config.h"
+#include "config.h"
 
 
-/* Filter argument. */
+/* Filter argument */
 static int _filter_arg(char *mystr)
 {
-    if(!mystr)
-    {
-        return(0);
+    if (!mystr) {
+        return (0);
     }
 
-    while(*mystr)
-    {
-        if((*mystr >= 'a' && *mystr <= 'z') ||
-           (*mystr >= 'A' && *mystr <= 'Z') ||
-           (*mystr >= '0' && *mystr <= '9') ||
-           *mystr == '-' || *mystr == '_' || *mystr == '.')
-        {
+    while (*mystr) {
+        if ((*mystr >= 'a' && *mystr <= 'z') ||
+                (*mystr >= 'A' && *mystr <= 'Z') ||
+                (*mystr >= '0' && *mystr <= '9') ||
+                *mystr == '-' || *mystr == '_' || *mystr == '.') {
             mystr++;
-        }
-        else
-        {
+        } else {
             *mystr = '-';
             mystr++;
         }
     }
 
-    return(1);
+    return (1);
 }
 
-
-int Read_CReports(XML_NODE node, void *config, void *config2)
+int Read_CReports(XML_NODE node, void *config, __attribute__((unused)) void *config2)
 {
-    int i = 0,s = 0;
+    unsigned int i = 0, s = 0;
 
     /* XML definitions */
-    char *xml_title = "title";
-    char *xml_type = "type";
-    char *xml_categories = "category";
-    char *xml_group = "group";
-    char *xml_rule = "rule";
-    char *xml_level = "level";
-    char *xml_location = "location";
-    char *xml_showlogs = "showlogs";
-    char *xml_srcip = "srcip";
-    char *xml_user = "user";
-    char *xml_frequency = "frequency";
-    char *xml_email = "email_to";
-
+    const char *xml_title = "title";
+    const char *xml_type = "type";
+    const char *xml_categories = "category";
+    const char *xml_group = "group";
+    const char *xml_rule = "rule";
+    const char *xml_level = "level";
+    const char *xml_location = "location";
+    const char *xml_showlogs = "showlogs";
+    const char *xml_srcip = "srcip";
+    const char *xml_user = "user";
+    const char *xml_frequency = "frequency";
+    const char *xml_email = "email_to";
 
     monitor_config *mon_config = (monitor_config *)config;
 
-
-    /* Getting any configured entry. */
-    if(mon_config->reports)
-    {
-        while(mon_config->reports[s])
+    /* Get any configured entry */
+    if (mon_config->reports) {
+        while (mon_config->reports[s]) {
             s++;
+        }
     }
 
-
-    /* Allocating the memory for the config. */
+    /* Allocate the memory for the config */
     os_realloc(mon_config->reports, (s + 2) * sizeof(report_config *),
                mon_config->reports);
     os_calloc(1, sizeof(report_config), mon_config->reports[s]);
     mon_config->reports[s + 1] = NULL;
 
-
-    /* Zeroing the elements. */
+    /* Zero the elements */
     mon_config->reports[s]->title = NULL;
     mon_config->reports[s]->args = NULL;
     mon_config->reports[s]->relations = NULL;
@@ -105,96 +89,62 @@ int Read_CReports(XML_NODE node, void *config, void *config2)
     mon_config->reports[s]->r_filter.report_name = NULL;
     mon_config->reports[s]->r_filter.show_alerts = 0;
 
-
-
-    /* Reading the XML. */
-    while(node[i])
-    {
-        if(!node[i]->element)
-        {
+    /* Reading the XML */
+    while (node[i]) {
+        if (!node[i]->element) {
             merror(XML_ELEMNULL, __local_name);
-            return(OS_INVALID);
-        }
-        else if(!node[i]->content)
-        {
+            return (OS_INVALID);
+        } else if (!node[i]->content) {
             merror(XML_VALUENULL, __local_name, node[i]->element);
-            return(OS_INVALID);
-        }
-        else if(strcmp(node[i]->element, xml_title) == 0)
-        {
-            if(!mon_config->reports[s]->title)
-            {
+            return (OS_INVALID);
+        } else if (strcmp(node[i]->element, xml_title) == 0) {
+            if (!mon_config->reports[s]->title) {
                 os_strdup(node[i]->content, mon_config->reports[s]->title);
             }
-        }
-        else if(strcmp(node[i]->element, xml_type) == 0)
-        {
-            if(strcmp(node[i]->content, "email") == 0)
-            {
-                if(!mon_config->reports[s]->type)
-                {
+        } else if (strcmp(node[i]->element, xml_type) == 0) {
+            if (strcmp(node[i]->content, "email") == 0) {
+                if (!mon_config->reports[s]->type) {
                     os_strdup(node[i]->content, mon_config->reports[s]->type);
                 }
+            } else {
+                merror(XML_VALUEERR, __local_name, node[i]->element, node[i]->content);
             }
-            else
-            {
-                merror(XML_VALUEERR, __local_name,node[i]->element,node[i]->content);
-            }
-        }
-        else if(strcmp(node[i]->element, xml_frequency) == 0)
-        {
-        }
-        else if(strcmp(node[i]->element, xml_showlogs) == 0)
-        {
-            if(strcasecmp(node[i]->content, "yes") == 0)
-            {
+        } else if (strcmp(node[i]->element, xml_frequency) == 0) {
+        } else if (strcmp(node[i]->element, xml_showlogs) == 0) {
+            if (strcasecmp(node[i]->content, "yes") == 0) {
                 mon_config->reports[s]->r_filter.show_alerts = 1;
             }
-        }
-        else if(strcmp(node[i]->element, xml_categories) == 0)
-        {
+        } else if (strcmp(node[i]->element, xml_categories) == 0) {
             char *ncat = NULL;
             _filter_arg(node[i]->content);
 
-
             os_strdup(node[i]->content, ncat);
 
-            if(os_report_configfilter("group", ncat,
-                                      &mon_config->reports[s]->r_filter, REPORT_FILTER) < 0)
-            {
+            if (os_report_configfilter("group", ncat,
+                                       &mon_config->reports[s]->r_filter, REPORT_FILTER) < 0) {
                 merror(CONFIG_ERROR, __local_name, "user argument");
             }
-        }
-        else if((strcmp(node[i]->element, xml_group) == 0)||
-                (strcmp(node[i]->element, xml_rule) == 0)||
-                (strcmp(node[i]->element, xml_level) == 0)||
-                (strcmp(node[i]->element, xml_location) == 0)||
-                (strcmp(node[i]->element, xml_srcip) == 0)||
-                (strcmp(node[i]->element, xml_user) == 0))
-        {
+        } else if ((strcmp(node[i]->element, xml_group) == 0) ||
+                   (strcmp(node[i]->element, xml_rule) == 0) ||
+                   (strcmp(node[i]->element, xml_level) == 0) ||
+                   (strcmp(node[i]->element, xml_location) == 0) ||
+                   (strcmp(node[i]->element, xml_srcip) == 0) ||
+                   (strcmp(node[i]->element, xml_user) == 0)) {
             int reportf = REPORT_FILTER;
             char *ncat = NULL;
             _filter_arg(node[i]->content);
 
-            if(node[i]->attributes && node[i]->values)
-            {
-                if(node[i]->attributes[0] && node[i]->values[0])
-                {
-                    if(strcmp(node[i]->attributes[0], "type") == 0)
-                    {
-                        if(strcmp(node[i]->values[0], "relation") == 0)
-                        {
+            if (node[i]->attributes && node[i]->values) {
+                if (node[i]->attributes[0] && node[i]->values[0]) {
+                    if (strcmp(node[i]->attributes[0], "type") == 0) {
+                        if (strcmp(node[i]->values[0], "relation") == 0) {
                             reportf = REPORT_RELATED;
-                        }
-                        else
-                        {
+                        } else {
                             merror("%s: WARN: Invalid value for 'relation' attribute: '%s'. (ignored).", __local_name, node[i]->values[0]);
                             i++;
                             continue;
                         }
-                    }
-                    else
-                    {
+                    } else {
                         merror("%s: WARN: Invalid attribute: %s (ignored). ", __local_name, node[i]->attributes[0]);
                         i++;
                         continue;
@@ -204,44 +154,35 @@ int Read_CReports(XML_NODE node, void *config, void *config2)
 
             os_strdup(node[i]->content, ncat);
 
-            if(os_report_configfilter(node[i]->element, ncat,
-                                      &mon_config->reports[s]->r_filter, reportf) < 0)
-            {
+            if (os_report_configfilter(node[i]->element, ncat,
+                                       &mon_config->reports[s]->r_filter, reportf) < 0) {
                 merror("%s: Invalid filter: %s:%s (ignored).", __local_name, node[i]->element, node[i]->content);
             }
-        }
-        else if(strcmp(node[i]->element, xml_email) == 0)
-        {
+        } else if (strcmp(node[i]->element, xml_email) == 0) {
             mon_config->reports[s]->emailto = os_AddStrArray(node[i]->content, mon_config->reports[s]->emailto);
-        }
-        else
-        {
+        } else {
             merror(XML_INVELEM, __local_name, node[i]->element);
-            return(OS_INVALID);
+            return (OS_INVALID);
         }
         i++;
     }
 
-
-    /* Setting proper report type. */
+    /* Set proper report type */
     mon_config->reports[s]->r_filter.report_type = REPORT_TYPE_DAILY;
 
-    if(mon_config->reports[s]->emailto == NULL)
-    {
-        if(mon_config->reports[s]->title)
+    if (mon_config->reports[s]->emailto == NULL) {
+        if (mon_config->reports[s]->title) {
             merror("%s: No \"email to\" configured for the report '%s'. Ignoring it.", __local_name, mon_config->reports[s]->title);
-        else
+        } else {
             merror("%s: No \"email to\" and title configured for report. Ignoring it.", __local_name);
+        }
     }
 
-    if(!mon_config->reports[s]->title)
-    {
+    if (!mon_config->reports[s]->title) {
         os_strdup("OSSEC Report (unnamed)", mon_config->reports[s]->title);
     }
     mon_config->reports[s]->r_filter.report_name = mon_config->reports[s]->title;
 
-    return(0);
+    return (0);
 }
 
-
-/* EOF */