X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fclient-agent%2Fagentd.c;h=347c2d2ab0310e01ec5fe6b5aa24a379424c6ae0;hb=HEAD;hp=6439250dceb7e582ae5b9fabd7b483808ba0c67e;hpb=6ef2f786c6c8ead94841b5f93baf9f43421f08c8;p=ossec-hids.git

diff --git a/src/client-agent/agentd.c b/src/client-agent/agentd.c
old mode 100755
new mode 100644
index 6439250..347c2d2
--- a/src/client-agent/agentd.c
+++ b/src/client-agent/agentd.c
@@ -1,6 +1,3 @@
-/* @(#) $Id: ./src/client-agent/agentd.c, 2011/09/08 dcid Exp $
- */
-
 /* Copyright (C) 2009 Trend Micro Inc.
  * All right reserved.
  *
@@ -10,198 +7,145 @@
  * Foundation
  */
 
-/* Part of the OSSEC HIDS
- * Available at http://www.ossec.net/hids/
- */
-
-
 #include "shared.h"
 #include "agentd.h"
-
 #include "os_net/os_net.h"
 
 
-
-/* AgentdStart v0.2, 2005/11/09
- * Starts the agent daemon.
- */
-void AgentdStart(char *dir, int uid, int gid, char *user, char *group)
+/* Start the agent daemon */
+void AgentdStart(const char *dir, int uid, int gid, const char *user, const char *group)
 {
     int rc = 0;
-    int pid = 0;
     int maxfd = 0;
-
     fd_set fdset;
-
     struct timeval fdtimeout;
 
-
-    /* Going daemon */
-    pid = getpid();
     available_server = 0;
-    nowDaemon();
-    goDaemon();
 
+    /* Initial random numbers must happen before chroot */
+    srandom_init();
 
-    /* Setting group ID */
-    if(Privsep_SetGroup(gid) < 0)
-        ErrorExit(SETGID_ERROR, ARGV0, group);
-
-
-    /* chrooting */
-    if(Privsep_Chroot(dir) < 0)
-        ErrorExit(CHROOT_ERROR, ARGV0, dir);
+    /* Going Daemon */
+    if (!run_foreground) {
+        nowDaemon();
+        goDaemon();
+    }
 
+    /* Set group ID */
+    if (Privsep_SetGroup(gid) < 0) {
+        ErrorExit(SETGID_ERROR, ARGV0, group, errno, strerror(errno));
+    }
 
+    /* chroot */
+    if (Privsep_Chroot(dir) < 0) {
+        ErrorExit(CHROOT_ERROR, ARGV0, dir, errno, strerror(errno));
+    }
     nowChroot();
 
+    if (Privsep_SetUser(uid) < 0) {
+        ErrorExit(SETUID_ERROR, ARGV0, user, errno, strerror(errno));
+    }
 
-    if(Privsep_SetUser(uid) < 0)
-        ErrorExit(SETUID_ERROR, ARGV0, user);
-
-
-    /* Create the queue. In this case we are going to create
-     * and read from it
-     * Exit if fails.
-     */
-    if((logr->m_queue = StartMQ(DEFAULTQUEUE, READ)) < 0)
+    /* Create the queue and read from it. Exit if fails. */
+    if ((agt->m_queue = StartMQ(DEFAULTQUEUE, READ)) < 0) {
         ErrorExit(QUEUE_ERROR, ARGV0, DEFAULTQUEUE, strerror(errno));
+    }
 
-    maxfd = logr->m_queue;
-    logr->sock = -1;
-
-
-
-    /* Creating PID file */	
-    if(CreatePID(ARGV0, getpid()) < 0)
-        merror(PID_ERROR,ARGV0);
+    maxfd = agt->m_queue;
+    agt->sock = -1;
 
+    /* Create PID file */
+    if (CreatePID(ARGV0, getpid()) < 0) {
+        merror(PID_ERROR, ARGV0);
+    }
 
-    /* Reading the private keys  */
+    /* Read private keys  */
     verbose(ENC_READ, ARGV0);
 
     OS_ReadKeys(&keys);
     OS_StartCounter(&keys);
 
-    /* cmoraes : changed the following call to
-    os_write_agent_info(keys.keyentries[0]->name, NULL, keys.keyentries[0]->id);
-    */
     os_write_agent_info(keys.keyentries[0]->name, NULL, keys.keyentries[0]->id,
-                        logr->profile);
-
+                        agt->profile);
 
     /* Start up message */
     verbose(STARTUP_MSG, ARGV0, (int)getpid());
 
-
-    /* Initial random numbers */
-    #ifdef __OpenBSD__
-    srandomdev();
-    #else
-    srandom( time(0) + getpid()+ pid + getppid());
-    #endif
-
     random();
 
-
-    /* Connecting UDP */
+    /* Connect UDP */
     rc = 0;
-    while(rc < logr->rip_id)
-    {
-        verbose("%s: INFO: Server IP Address: %s", ARGV0, logr->rip[rc]);
+    while (rc < agt->rip_id) {
+        verbose("%s: INFO: Server %d: %s", ARGV0, rc+1, agt->rip[rc]);
         rc++;
     }
 
-
-    /* Trying to connect to the server */
-    if(!connect_server(0))
-    {
+    /* Try to connect to the server */
+    if (!connect_server(0)) {
         ErrorExit(UNABLE_CONN, ARGV0);
     }
 
-
-    /* Setting max fd for select */
-    if(logr->sock > maxfd)
-    {
-        maxfd = logr->sock;
+    /* Set max fd for select */
+    if (agt->sock > maxfd) {
+        maxfd = agt->sock;
     }
 
-
-    /* Connecting to the execd queue */
-    if(logr->execdq == 0)
-    {
-        if((logr->execdq = StartMQ(EXECQUEUE, WRITE)) < 0)
-        {
+    /* Connect to the execd queue */
+    if (agt->execdq == 0) {
+        if ((agt->execdq = StartMQ(EXECQUEUE, WRITE)) < 0) {
             merror("%s: INFO: Unable to connect to the active response "
                    "queue (disabled).", ARGV0);
-            logr->execdq = -1;
+            agt->execdq = -1;
         }
     }
 
-
-
-    /* Trying to connect to server */
+    /* Try to connect to server */
     os_setwait();
 
     start_agent(1);
 
     os_delwait();
 
-
-    /* Sending integrity message for agent configs */
+    /* Send integrity message for agent configs */
     intcheck_file(OSSECCONF, dir);
     intcheck_file(OSSEC_DEFINES, dir);
 
-
-    /* Sending first notification */
+    /* Send first notification */
     run_notify();
 
-
     /* Maxfd must be higher socket +1 */
     maxfd++;
 
-
-    /* monitor loop */
-    while(1)
-    {
-        /* Monitoring all available sockets from here */
+    /* Monitor loop */
+    while (1) {
+        /* Monitor all available sockets from here */
         FD_ZERO(&fdset);
-        FD_SET(logr->sock, &fdset);
-        FD_SET(logr->m_queue, &fdset);
+        FD_SET(agt->sock, &fdset);
+        FD_SET(agt->m_queue, &fdset);
 
-        fdtimeout.tv_sec = 120;
+        fdtimeout.tv_sec = 1;
         fdtimeout.tv_usec = 0;
 
+        /* Continuously send notifications */
+        run_notify();
 
-        /* Wait for 120 seconds at a maximum for any descriptor */
+        /* Wait with a timeout for any descriptor */
         rc = select(maxfd, &fdset, NULL, NULL, &fdtimeout);
-        if(rc == -1)
-        {
-            ErrorExit(SELECT_ERROR, ARGV0);
-        }
-
-
-        else if(rc == 0)
-        {
+        if (rc == -1) {
+            ErrorExit(SELECT_ERROR, ARGV0, errno, strerror(errno));
+        } else if (rc == 0) {
             continue;
         }
 
-
         /* For the receiver */
-        if(FD_ISSET(logr->sock, &fdset))
-        {
+        if (FD_ISSET(agt->sock, &fdset)) {
             receive_msg();
         }
 
-
         /* For the forwarder */
-        if(FD_ISSET(logr->m_queue, &fdset))
-        {
+        if (FD_ISSET(agt->m_queue, &fdset)) {
             EventForward();
         }
     }
 }
 
-
-
-/* EOF */