X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=ossec-hids.git;a=blobdiff_plain;f=src%2Fanalysisd%2Fdodiff.c;fp=src%2Fanalysisd%2Fdodiff.c;h=d05860153b9abf88c2118c87db3d91cde02924fa;hp=cc4b47d9b898bcbc8541cb53ccc6b2ec3a1fc9c0;hb=3f728675941dc69d4e544d3a880a56240a6e394a;hpb=927951d1c1ad45ba9e7325f07d996154a91c911b

diff --git a/src/analysisd/dodiff.c b/src/analysisd/dodiff.c
old mode 100755
new mode 100644
index cc4b47d..d058601
--- a/src/analysisd/dodiff.c
+++ b/src/analysisd/dodiff.c
@@ -1,6 +1,3 @@
-/* @(#) $Id: ./src/analysisd/dodiff.c, 2012/07/23 dcid Exp $
- */
-
 /* Copyright (C) 2010 Trend Micro Inc.
  * All rights reserved.
  *
@@ -8,182 +5,141 @@
  * and/or modify it under the terms of the GNU General Public
  * License (version 2) as published by the FSF - Free Software
  * Foundation.
- *
- * License details at the LICENSE file included with OSSEC or
- * online at: http://www.ossec.net/en/licensing.html
  */
 
+#include "dodiff.h"
 
-
-#include "eventinfo.h"
 #include "shared.h"
 
-char flastcontent[OS_SIZE_8192 +1];
-char *fmsglast = "Previous output:";
-
-static int _add2last(char *str, int strsize, char *file)
+static int _add2last(const char *str, size_t strsize, const char *file)
 {
     FILE *fp;
 
     fp = fopen(file, "w");
-    if(!fp)
-    {
-        /* Try to create the directories. */
+    if (!fp) {
+        /* Try to create the directories */
         char *dirrule = NULL;
         char *diragent = NULL;
 
         dirrule = strrchr(file, '/');
-        if(!dirrule)
-        {
+        if (!dirrule) {
             merror("%s: ERROR: Invalid file name to diff: %s",
                    ARGV0, file);
-            return(0);
+            return (0);
         }
         *dirrule = '\0';
 
         diragent = strrchr(file, '/');
-        if(!diragent)
-        {
+        if (!diragent) {
             merror("%s: ERROR: Invalid file name to diff (2): %s",
                    ARGV0, file);
-            return(0);
+            return (0);
         }
         *diragent = '\0';
 
-        /* Checking if the diragent exists. */
-        if(IsDir(file) != 0)
-        {
-            if(mkdir(file, 0770) == -1)
-            {
-                merror(MKDIR_ERROR, ARGV0, file);
-                return(0);
+        /* Check if the diragent exists */
+        if (IsDir(file) != 0) {
+            if (mkdir(file, 0770) == -1) {
+                merror(MKDIR_ERROR, ARGV0, file, errno, strerror(errno));
+                return (0);
             }
         }
         *diragent = '/';
 
-        if(IsDir(file) != 0)
-        {
-            if(mkdir(file, 0770) == -1)
-            {
-                merror(MKDIR_ERROR, ARGV0, file);
-                return(0);
+        if (IsDir(file) != 0) {
+            if (mkdir(file, 0770) == -1) {
+                merror(MKDIR_ERROR, ARGV0, file, errno, strerror(errno));
+                return (0);
             }
         }
         *dirrule = '/';
 
         fp = fopen(file, "w");
-        if(!fp)
-        {
-            merror(FOPEN_ERROR, ARGV0, file);
-            return(0);
+        if (!fp) {
+            merror(FOPEN_ERROR, ARGV0, file, errno, strerror(errno));
+            return (0);
         }
     }
 
     fwrite(str, strsize + 1, 1, fp);
     fclose(fp);
-    return(1);
+    return (1);
 }
 
-
-int doDiff(RuleInfo *currently_rule, Eventinfo *lf)
+int doDiff(RuleInfo *rule, const Eventinfo *lf)
 {
-    int date_of_change;
+    time_t date_of_change;
     char *htpt = NULL;
-    char flastfile[OS_SIZE_2048 +1];
-    char flastcontent[OS_SIZE_8192 +1];
-
+    char flastfile[OS_SIZE_2048 + 1];
+    char flastcontent[OS_SIZE_8192 + 1];
 
-    /* Cleaning up global. */
+    /* Clean up global */
     flastcontent[0] = '\0';
     flastcontent[OS_SIZE_8192] = '\0';
-    currently_rule->last_events[0] = NULL;
-
-
+    rule->last_events[0] = NULL;
 
-    if(lf->hostname[0] == '(')
-    {
+    if (lf->hostname[0] == '(') {
         htpt = strchr(lf->hostname, ')');
-        if(htpt)
-        {
+        if (htpt) {
             *htpt = '\0';
         }
-        snprintf(flastfile, OS_SIZE_2048, "%s/%s/%d/%s", DIFF_DIR, lf->hostname+1,
-                 currently_rule->sigid, DIFF_LAST_FILE);
+        snprintf(flastfile, OS_SIZE_2048, "%s/%s/%d/%s", DIFF_DIR, lf->hostname + 1,
+                 rule->sigid, DIFF_LAST_FILE);
 
-        if(htpt)
-        {
+        if (htpt) {
             *htpt = ')';
         }
         htpt = NULL;
-    }
-    else
-    {
+    } else {
         snprintf(flastfile, OS_SIZE_2048, "%s/%s/%d/%s", DIFF_DIR, lf->hostname,
-                 currently_rule->sigid, DIFF_LAST_FILE);
+                 rule->sigid, DIFF_LAST_FILE);
     }
 
-    /* lf->size can't be too long. */
-    if(lf->size >= OS_SIZE_8192)
-    {
-        merror("%s: ERROR: event size (%d) too long for diff.", ARGV0, lf->size);
-        return(0);
+    /* lf->size can't be too long */
+    if (lf->size >= OS_SIZE_8192) {
+        merror("%s: ERROR: event size (%ld) too long for diff.", ARGV0, lf->size);
+        return (0);
     }
 
-
-    /* Checking if last diff exists. */
+    /* Check if last diff exists */
     date_of_change = File_DateofChange(flastfile);
-    if(date_of_change <= 0)
-    {
-        if(!_add2last(lf->log, lf->size, flastfile))
-        {
+    if (date_of_change <= 0) {
+        if (!_add2last(lf->log, lf->size, flastfile)) {
             merror("%s: ERROR: unable to create last file: %s", ARGV0, flastfile);
-            return(0);
+            return (0);
         }
-        return(0);
-    }
-    else
-    {
+        return (0);
+    } else {
         FILE *fp;
-        int n;
-        fp = fopen(flastfile,"r");
-        if(!fp)
-        {
-            merror(FOPEN_ERROR, ARGV0, flastfile);
-            return(0);
+        size_t n;
+        fp = fopen(flastfile, "r");
+        if (!fp) {
+            merror(FOPEN_ERROR, ARGV0, flastfile, errno, strerror(errno));
+            return (0);
         }
 
         n = fread(flastcontent, 1, OS_SIZE_8192, fp);
-        if(n > 0)
-        {
+        if (n > 0) {
             flastcontent[n] = '\0';
-        }
-        else
-        {
+        } else {
             merror("%s: ERROR: read error on %s", ARGV0, flastfile);
             fclose(fp);
-            return(0);
+            return (0);
         }
         fclose(fp);
     }
 
-    /* Nothing changed. */
-    if(strcmp(flastcontent, lf->log) == 0)
-    {
-        return(0);
+    /* Nothing changed */
+    if (strcmp(flastcontent, lf->log) == 0) {
+        return (0);
     }
 
-
-    if(!_add2last(lf->log, lf->size, flastfile))
-    {
+    if (!_add2last(lf->log, lf->size, flastfile)) {
         merror("%s: ERROR: unable to create last file: %s", ARGV0, flastfile);
     }
 
-    currently_rule->last_events[0] = fmsglast;
-    currently_rule->last_events[1] = flastcontent;
-    return(1);
-
+    rule->last_events[0] = "Previous output:";
+    rule->last_events[1] = flastcontent;
+    return (1);
 }
 
-
-
-/* EOF */