X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Flogcollector%2Fmain.c;h=d28a9fef5dadaac77200aedc73270a712536ffa1;hb=3f728675941dc69d4e544d3a880a56240a6e394a;hp=fe143c2f268a2214fc6c3904db91a0228f22e15c;hpb=6ef2f786c6c8ead94841b5f93baf9f43421f08c8;p=ossec-hids.git

diff --git a/src/logcollector/main.c b/src/logcollector/main.c
old mode 100755
new mode 100644
index fe143c2..d28a9fe
--- a/src/logcollector/main.c
+++ b/src/logcollector/main.c
@@ -1,6 +1,3 @@
-/* @(#) $Id: ./src/logcollector/main.c, 2012/03/28 dcid Exp $
- */
-
 /* Copyright (C) 2009 Trend Micro Inc.
  * All right reserved.
  *
@@ -10,18 +7,10 @@
  * Foundation
  */
 
-
-/* v0.4 (2005/11/11): Some cleanup and bug fixes
- * v0.3 (2005/08/26): Reading all files in just one process
- * v0.2 (2005/04/04):
- */
-
-
-/* Logcollector daemon.
- * Monitor some files and forward the output to our analysis system.
+/* Logcollector daemon
+ * Monitor some files and forward the output to our analysis system
  */
 
-
 #include <sys/types.h>
 #include <sys/time.h>
 #include <stdio.h>
@@ -31,86 +20,97 @@
 #include <fcntl.h>
 
 #include "os_regex/os_regex.h"
-
 #include "logcollector.h"
 
+/* Prototypes */
+static void help_logcollector(void) __attribute__((noreturn));
 
 
-/* main: v0.3: 2005/04/04 */
+/* Print help statement */
+static void help_logcollector()
+{
+    print_header();
+    print_out("  %s: -[Vhdtf] [-c config]", ARGV0);
+    print_out("    -V          Version and license message");
+    print_out("    -h          This help message");
+    print_out("    -d          Execute in debug mode. This parameter");
+    print_out("                can be specified multiple times");
+    print_out("                to increase the debug level.");
+    print_out("    -t          Test configuration");
+    print_out("    -f          Run in foreground");
+    print_out("    -c <config> Configuration file to use (default: %s)", DEFAULTCPATH);
+    print_out(" ");
+    exit(1);
+}
+
 int main(int argc, char **argv)
 {
     int c;
-    int debug_flag = 0;
-    int test_config = 0,run_foreground = 0;
+    int debug_level = 0;
+    int test_config = 0, run_foreground = 0;
     int accept_manager_commands = 0;
-    char *cfg = DEFAULTCPATH;
-    char *dir = DEFAULTDIR;
-
-
-    /* Setuping up random */
-    #ifndef WIN32
-        #ifdef __OpenBSD__
-        srandomdev();
-        #else
-        srandom(time(0));
-        #endif
-    #else
-    srandom(time(0))
-    #endif
-
-    /* Setting the name */
-    OS_SetName(ARGV0);
+    const char *cfg = DEFAULTCPATH;
 
+    /* Setup random */
+    srandom_init();
 
-    while((c = getopt(argc, argv, "VtdhfD:c:")) != -1)
-    {
-        switch(c)
-        {
+    /* Set the name */
+    OS_SetName(ARGV0);
+
+    while ((c = getopt(argc, argv, "Vtdhfc:")) != -1) {
+        switch (c) {
             case 'V':
                 print_version();
                 break;
             case 'h':
-                help(ARGV0);
+                help_logcollector();
                 break;
             case 'd':
                 nowDebug();
+                debug_level = 1;
                 break;
             case 'f':
                 run_foreground = 1;
                 break;
-            case 'D':
-                if(!optarg)
-                    ErrorExit("%s: -D needs an argument",ARGV0);
-                dir = optarg;
-                break;
             case 'c':
-                if(!optarg)
-                    ErrorExit("%s: -c needs an argument",ARGV0);
+                if (!optarg) {
+                    ErrorExit("%s: -c needs an argument", ARGV0);
+                }
                 cfg = optarg;
                 break;
             case 't':
                 test_config = 1;
                 break;
             default:
-                help(ARGV0);
+                help_logcollector();
                 break;
         }
 
     }
 
-    debug1(STARTED_MSG,ARGV0);
+    /* Check current debug_level
+     * Command line setting takes precedence
+     */
+    if (debug_level == 0) {
+        /* Get debug level */
+        debug_level = getDefine_Int("logcollector", "debug", 0, 2);
+        while (debug_level != 0) {
+            nowDebug();
+            debug_level--;
+        }
+    }
 
+    debug1(STARTED_MSG, ARGV0);
 
     accept_manager_commands = getDefine_Int("logcollector", "remote_commands",
-                                       0, 1);
-
+                                            0, 1);
 
-    /* Reading config file */
-    if(LogCollectorConfig(cfg, accept_manager_commands) < 0)
+    /* Read config file */
+    if (LogCollectorConfig(cfg, accept_manager_commands) < 0) {
         ErrorExit(CONFIG_ERROR, ARGV0, cfg);
+    }
 
-
-    /* Getting loop timeout */
+    /* Get loop timeout */
     loop_timeout = getDefine_Int("logcollector",
                                  "loop_timeout",
                                  1, 120);
@@ -118,28 +118,13 @@ int main(int argc, char **argv)
     open_file_attempts = getDefine_Int("logcollector", "open_attempts",
                                        2, 998);
 
-    debug_flag = getDefine_Int("logcollector",
-                               "debug",
-                               0,2);
-    accept_manager_commands = getDefine_Int("logcollector", "remote_commands",
-                                       0, 1);
-
-    /* Getting debug values */
-    while(debug_flag != 0)
-    {
-        nowDebug();
-        debug_flag--;
-    }
-
-
     /* Exit if test config */
-    if(test_config)
+    if (test_config) {
         exit(0);
-
+    }
 
     /* No file available to monitor -- continue */
-    if(logff == NULL)
-    {
+    if (logff == NULL) {
         os_calloc(2, sizeof(logreader), logff);
         logff[0].file = NULL;
         logff[0].ffile = NULL;
@@ -151,42 +136,30 @@ int main(int argc, char **argv)
         merror(NO_FILE, ARGV0);
     }
 
+    /* Start signal handler */
+    StartSIG(ARGV0);
 
-    /* Starting signal handler */
-    StartSIG(ARGV0);	
-
-
-    if (!run_foreground)
-    {
+    if (!run_foreground) {
         /* Going on daemon mode */
         nowDaemon();
         goDaemon();
     }
 
-
-    /* Creating PID file */
-    if(CreatePID(ARGV0, getpid()) < 0)
+    /* Create PID file */
+    if (CreatePID(ARGV0, getpid()) < 0) {
         merror(PID_ERROR, ARGV0);
+    }
 
-
-
-    /* Waiting 6 seconds for the analysisd/agentd to settle */
+    /* Wait 6 seconds for the analysisd/agentd to settle */
     debug1("%s: DEBUG: Waiting main daemons to settle.", ARGV0);
     sleep(6);
 
-
-    /* Starting the queue. */
-    if((logr_queue = StartMQ(DEFAULTQPATH,WRITE)) < 0)
+    /* Start the queue */
+    if ((logr_queue = StartMQ(DEFAULTQPATH, WRITE)) < 0) {
         ErrorExit(QUEUE_FATAL, ARGV0, DEFAULTQPATH);
-
+    }
 
     /* Main loop */
     LogCollectorStart();
-
-
-    return(0);
 }
 
-
-
-/* EOF */