X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fclient-agent%2Fmain.c;h=2567eb761a562bab1dd012e2a1d3fc1dbe23d5a0;hb=refs%2Fheads%2Fmaster;hp=bda8ced488adde484445fc6eaa1a6681fb2fc7bb;hpb=6ef2f786c6c8ead94841b5f93baf9f43421f08c8;p=ossec-hids.git

diff --git a/src/client-agent/main.c b/src/client-agent/main.c
old mode 100755
new mode 100644
index bda8ced..2567eb7
--- a/src/client-agent/main.c
+++ b/src/client-agent/main.c
@@ -1,6 +1,3 @@
-/* @(#) $Id: ./src/client-agent/main.c, 2011/09/08 dcid Exp $
- */
-
 /* Copyright (C) 2009 Trend Micro Inc.
  * All right reserved.
  *
@@ -10,130 +7,170 @@
  * Foundation
  */
 
-/* Part of the OSSEC HIDS
- * Available at http://www.ossec.net
- */
-
-
-/* agent daemon.
- */
-
+/* agent daemon */
 
 #include "shared.h"
 #include "agentd.h"
 
 #ifndef ARGV0
-   #define ARGV0 "ossec-agentd"
+#define ARGV0 "ossec-agentd"
 #endif
 
+/* Prototypes */
+static void help_agentd(void) __attribute((noreturn));
 
 
+/* Print help statement */
+static void help_agentd()
+{
+    print_header();
+    print_out("  %s: -[Vhdtf] [-u user] [-g group] [-c config] [-D dir]", 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("    -u <user>   User to run as (default: %s)", USER);
+    print_out("    -g <group>  Group to run as (default: %s)", GROUPGLOBAL);
+    print_out("    -c <config> Configuration file to use (default: %s)", DEFAULTCPATH);
+    print_out("    -D <dir>    Directory to chroot into (default: %s)", DEFAULTDIR);
+    print_out(" ");
+    exit(1);
+}
 
-
-/* main, v0.2, 2005/11/09
- */
 int main(int argc, char **argv)
 {
     int c = 0;
     int test_config = 0;
+    int debug_level = 0;
 
-    char *dir = DEFAULTDIR;
-    char *user = USER;
-    char *group = GROUPGLOBAL;
+    const char *dir = DEFAULTDIR;
+    const char *user = USER;
+    const char *group = GROUPGLOBAL;
+    const char *cfg = DEFAULTCPATH;
 
-    int uid = 0;
-    int gid = 0;
+    uid_t uid;
+    gid_t gid;
 
+    run_foreground = 0;
 
-    /* Setting the name */
+    /* Set the name */
     OS_SetName(ARGV0);
 
-
-    while((c = getopt(argc, argv, "Vtdhu:g:D:")) != -1){
-        switch(c){
+    while ((c = getopt(argc, argv, "Vtdfhu:g:D:c:")) != -1) {
+        switch (c) {
             case 'V':
                 print_version();
                 break;
             case 'h':
-                help(ARGV0);
+                help_agentd();
                 break;
             case 'd':
                 nowDebug();
+                debug_level = 1;
+                break;
+            case 'f':
+                run_foreground = 1;
                 break;
             case 'u':
-                if(!optarg)
-                    ErrorExit("%s: -u needs an argument",ARGV0);
+                if (!optarg) {
+                    ErrorExit("%s: -u needs an argument", ARGV0);
+                }
                 user = optarg;
                 break;
             case 'g':
-                if(!optarg)
-                    ErrorExit("%s: -g needs an argument",ARGV0);
+                if (!optarg) {
+                    ErrorExit("%s: -g needs an argument", ARGV0);
+                }
                 group = optarg;
-                break;		
+                break;
             case 't':
                 test_config = 1;
                 break;
             case 'D':
-                if(!optarg)
-                    ErrorExit("%s: -D needs an argument",ARGV0);
+                if (!optarg) {
+                    ErrorExit("%s: -D needs an argument", ARGV0);
+                }
                 dir = optarg;
                 break;
+            case 'c':
+                if (!optarg) {
+                    ErrorExit("%s: -c needs an argument.", ARGV0);
+                }
+                cfg = optarg;
+                break;
+            default:
+                help_agentd();
+                break;
         }
     }
 
     debug1(STARTED_MSG, ARGV0);
 
-    logr = (agent *)calloc(1, sizeof(agent));
-    if(!logr)
-    {
-        ErrorExit(MEM_ERROR, ARGV0);
+    agt = (agent *)calloc(1, sizeof(agent));
+    if (!agt) {
+        ErrorExit(MEM_ERROR, ARGV0, errno, strerror(errno));
     }
 
+    /* Check current debug_level
+     * Command line setting takes precedence
+     */
+    if (debug_level == 0) {
+        /* Get debug level */
+        debug_level = getDefine_Int("agent", "debug", 0, 2);
+        while (debug_level != 0) {
+            nowDebug();
+            debug_level--;
+        }
+    }
 
-    /* Reading config */
-    if(ClientConf(DEFAULTCPATH) < 0)
-    {
-        ErrorExit(CLIENT_ERROR,ARGV0);
+    /* Read config */
+    if (ClientConf(cfg) < 0) {
+        ErrorExit(CLIENT_ERROR, ARGV0);
     }
 
-    if(!logr->rip)
-    {
+    if (!agt->rip) {
         merror(AG_INV_IP, ARGV0);
-        ErrorExit(CLIENT_ERROR,ARGV0);
+        ErrorExit(CLIENT_ERROR, ARGV0);
     }
 
+    if (agt->notify_time == 0) {
+        agt->notify_time = NOTIFY_TIME;
+    }
+    if (agt->max_time_reconnect_try == 0 ) {
+        agt->max_time_reconnect_try = NOTIFY_TIME * 3;
+    }
+    if (agt->max_time_reconnect_try <= agt->notify_time) {
+        agt->max_time_reconnect_try = (agt->notify_time * 3);
+        verbose("%s: INFO: Max time to reconnect can't be less than notify_time(%d), using notify_time*3 (%d)", ARGV0, agt->notify_time, agt->max_time_reconnect_try);
+    }
+    verbose("%s: INFO: Using notify time: %d and max time to reconnect: %d", ARGV0, agt->notify_time, agt->max_time_reconnect_try);
 
-    /* Checking auth keys */
-    if(!OS_CheckKeys())
-    {
+    /* Check auth keys */
+    if (!OS_CheckKeys()) {
         ErrorExit(AG_NOKEYS_EXIT, ARGV0);
     }
 
-
     /* Check if the user/group given are valid */
     uid = Privsep_GetUser(user);
     gid = Privsep_GetGroup(group);
-    if((uid < 0)||(gid < 0))
-    {
-        ErrorExit(USER_ERROR,ARGV0,user,group);
+    if (uid == (uid_t) - 1 || gid == (gid_t) - 1) {
+        ErrorExit(USER_ERROR, ARGV0, user, group);
     }
 
-
-
     /* Exit if test config */
-    if(test_config)
+    if (test_config) {
         exit(0);
+    }
 
-
-    /* Starting the signal manipulation */
-    StartSIG(ARGV0);	
-
+    /* Start the signal manipulation */
+    StartSIG(ARGV0);
 
     /* Agentd Start */
     AgentdStart(dir, uid, gid, user, group);
 
-
-    return(0);
+    return (0);
 }
 
-/* EOF */