X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;ds=sidebyside;f=src%2Fwin32%2Fwin_agent.c;fp=src%2Fwin32%2Fwin_agent.c;h=e92247d6d82ac0da002b02d9a3d7b8ee1b3a32f7;hb=789cbc8e52da68eba3517b920ef22e000cf3c9fd;hp=c2b80ca87b5ff6a1f568d75eb60170d829c318d5;hpb=ef70704f0b31b59bb719b884d6a99cb9e3e2044a;p=ossec-hids.git

diff --git a/src/win32/win_agent.c b/src/win32/win_agent.c
index c2b80ca..e92247d 100755
--- a/src/win32/win_agent.c
+++ b/src/win32/win_agent.c
@@ -45,6 +45,7 @@ void agent_help()
 {
     printf("\nOSSEC HIDS %s %s .\n", ARGV0, __version);
     printf("Available options:\n");
+    printf("\t/?                This help message.\n");    
     printf("\t-h                This help message.\n");
     printf("\thelp              This help message.\n");
     printf("\tinstall-service   Installs as a service\n");
@@ -71,6 +72,7 @@ int main(int argc, char **argv)
 {
     char *tmpstr;
     char mypath[OS_MAXSTR +1];
+    char myfinalpath[OS_MAXSTR +1];
     char myfile[OS_MAXSTR +1];
 
     /* Setting the name */
@@ -79,6 +81,7 @@ int main(int argc, char **argv)
 
     /* Find where I'm */
     mypath[OS_MAXSTR] = '\0';
+    myfinalpath[OS_MAXSTR] = '\0';
     myfile[OS_MAXSTR] = '\0';
 
 
@@ -100,15 +103,14 @@ int main(int argc, char **argv)
     }
     chdir(mypath);
     getcwd(mypath, OS_MAXSTR -1);
-    strncat(mypath, "\\", OS_MAXSTR - (strlen(mypath) + 2));
-    strncat(mypath, myfile, OS_MAXSTR - (strlen(mypath) + 2));
+    snprintf(myfinalpath, OS_MAXSTR, "\"%s\\%s\"", mypath, myfile);
 
 
     if(argc > 1)
     {
         if(strcmp(argv[1], "install-service") == 0)
         {
-            return(InstallService(mypath));
+            return(InstallService(myfinalpath));
         }
         else if(strcmp(argv[1], "uninstall-service") == 0)
         {
@@ -118,6 +120,10 @@ int main(int argc, char **argv)
         {
             return(local_start());
         }
+        else if(strcmp(argv[1], "/?") == 0)
+        {
+            agent_help();
+        }
         else if(strcmp(argv[1], "-h") == 0)
         {
             agent_help();
@@ -155,14 +161,13 @@ int local_start()
     DWORD  threadID2;
 
 
-    /* Starting logr */
-    logr = (agent *)calloc(1, sizeof(agent));
-    if(!logr)
+    /* Starting agt */
+    agt = (agent *)calloc(1, sizeof(agent));
+    if(!agt)
     {
         ErrorExit(MEM_ERROR, ARGV0);
     }
-    logr->port = DEFAULT_SECURE;
-
+    agt->port = DEFAULT_SECURE;
 
     /* Getting debug level */
     debug_level = getDefine_Int("windows","debug", 0, 2);
@@ -195,7 +200,20 @@ int local_start()
     {
         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: 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: Using notify time: %d and max time to reconnect: %d",ARGV0,agt->notify_time,agt->max_time_reconnect_try);
 
     /* Reading logcollector config file */
     debug1("%s: DEBUG: Reading logcollector configuration.", ARGV0);
@@ -233,7 +251,7 @@ int local_start()
     /* Reading execd config. */
     if(!WinExecd_Start())
     {
-        logr->execdq = -1;
+        agt->execdq = -1;
     }
 
 
@@ -242,7 +260,7 @@ int local_start()
 
     OS_ReadKeys(&keys);
     OS_StartCounter(&keys);
-    os_write_agent_info(keys.keyentries[0]->name, NULL, keys.keyentries[0]->id, NULL);
+    os_write_agent_info(keys.keyentries[0]->name, NULL, keys.keyentries[0]->id, agt->profile);
 
 
     /* Initial random numbers */
@@ -251,7 +269,7 @@ int local_start()
 
 
     /* Socket connection */
-    logr->sock = -1;
+    agt->sock = -1;
     StartMQ(NULL, 0);
 
 
@@ -331,7 +349,6 @@ int SendMSG(int queue, char *message, char *locmsg, char loc)
     tmpstr[OS_MAXSTR +1] = '\0';
     crypt_msg[OS_MAXSTR +1] = '\0';
 
-
     debug2("%s: DEBUG: Attempting to send message to server.", ARGV0);
 
     /* Using a mutex to synchronize the writes */
@@ -360,28 +377,29 @@ int SendMSG(int queue, char *message, char *locmsg, char loc)
             /* Lock acquired */
             break;
         }
-    }
-
+    }	/*end - while for mutex...*/
 
     cu_time = time(0);
 
 
     #ifndef ONEWAY
     /* Check if the server has responded */
-    if((cu_time - available_server) > (NOTIFY_TIME - 180))
+    if((cu_time - available_server) > agt->notify_time)
     {
         debug1("%s: DEBUG: Sending info to server (c1)...", ARGV0);
+        verbose("%s: More than %d seconds without server response...sending win32info", ARGV0,agt->notify_time);
         send_win32_info(cu_time);
 
 
         /* Attempting to send message again. */
-        if((cu_time - available_server) > NOTIFY_TIME)
+        if((cu_time - available_server) > agt->notify_time)
         {
+            /* Try again... */
             sleep(1);
             send_win32_info(cu_time);
             sleep(1);
 
-            if((cu_time - available_server) > NOTIFY_TIME)
+            if((cu_time - available_server) > agt->notify_time)
             {
                 send_win32_info(cu_time);
             }
@@ -389,16 +407,16 @@ int SendMSG(int queue, char *message, char *locmsg, char loc)
 
 
         /* If we reached here, the server is unavailable for a while. */
-        if((cu_time - available_server) > ((3 * NOTIFY_TIME) - 180))
+        if((cu_time - available_server) > agt->max_time_reconnect_try)
         {
             int wi = 1;
-
+            verbose("%s: More than %d seconds without server response...is server alive? and Is there connection?", ARGV0,agt->max_time_reconnect_try);
 
             /* Last attempt before going into reconnect mode. */
             debug1("%s: DEBUG: Sending info to server (c3)...", ARGV0);
             sleep(1);
             send_win32_info(cu_time);
-            if((cu_time - available_server) > ((3 * NOTIFY_TIME) - 180))
+            if((cu_time - available_server) > agt->max_time_reconnect_try)
             {
                 sleep(1);
                 send_win32_info(cu_time);
@@ -408,7 +426,7 @@ int SendMSG(int queue, char *message, char *locmsg, char loc)
 
             /* Checking and generating log if unavailable. */
             cu_time = time(0);
-            if((cu_time - available_server) > ((3 * NOTIFY_TIME) - 180))
+            if((cu_time - available_server) > agt->max_time_reconnect_try)
             {
                 int global_sleep = 1;
                 int mod_sleep = 12;
@@ -420,10 +438,10 @@ int SendMSG(int queue, char *message, char *locmsg, char loc)
 
 
                 /* Going into reconnect mode. */
-                while((cu_time - available_server) > ((3*NOTIFY_TIME) - 180))
+                while((cu_time - available_server) > agt->max_time_reconnect_try)
                 {
                     /* Sending information to see if server replies */
-                    if(logr->sock != -1)
+                    if(agt->sock != -1)
                     {
                         send_win32_info(cu_time);
                     }
@@ -442,28 +460,28 @@ int SendMSG(int queue, char *message, char *locmsg, char loc)
 
 
                     /* If we have more than one server, try all. */
-                    if(wi > 12 && logr->rip[1])
+                    if(wi > 12 && agt->rip[1])
                     {
-                        int curr_rip = logr->rip_id;
+                        int curr_rip = agt->rip_id;
                         merror("%s: INFO: Trying next server ip in "
                                "line: '%s'.",
                                ARGV0,
-                               logr->rip[logr->rip_id + 1] != NULL?
-                               logr->rip[logr->rip_id + 1]:
-                               logr->rip[0]);
+                               agt->rip[agt->rip_id + 1] != NULL?
+                               agt->rip[agt->rip_id + 1]:
+                               agt->rip[0]);
 
-                        connect_server(logr->rip_id +1);
+                        connect_server(agt->rip_id +1);
 
-                        if(logr->rip_id != curr_rip)
+                        if(agt->rip_id != curr_rip)
                         {
                             wi = 1;
                         }
                     }
                     else if(global_sleep == 2 || ((global_sleep % mod_sleep) == 0) ||
-                            (logr->sock == -1))
+                            (agt->sock == -1))
                     {
-                        connect_server(logr->rip_id +1);
-                        if(logr->sock == -1)
+                        connect_server(agt->rip_id +1);
+                        if(agt->sock == -1)
                         {
                             sleep(wi + global_sleep);
                         }
@@ -479,8 +497,8 @@ int SendMSG(int queue, char *message, char *locmsg, char loc)
                     }
                 }
 
-                verbose(AG_CONNECTED, ARGV0, logr->rip[logr->rip_id],
-                                             logr->port);
+                verbose(AG_CONNECTED, ARGV0, agt->rip[agt->rip_id],
+                                             agt->port);
                 verbose(SERVER_UP, ARGV0);
             }
         }
@@ -534,7 +552,7 @@ int SendMSG(int queue, char *message, char *locmsg, char loc)
     }
 
     /* Send _ssize of crypt_msg */
-    if(OS_SendUDPbySize(logr->sock, _ssize, crypt_msg) < 0)
+    if(OS_SendUDPbySize(agt->sock, _ssize, crypt_msg) < 0)
     {
         merror(SEND_ERROR,ARGV0, "server");
         sleep(1);
@@ -576,7 +594,6 @@ void send_win32_info(time_t curr_time)
 
     debug1("%s: DEBUG: Sending keep alive message.", ARGV0);
 
-
     /* fixing time */
     __win32_curr_time = curr_time;
 
@@ -654,7 +671,7 @@ void send_win32_info(time_t curr_time)
     }
 
     /* Sending UDP message */
-    if(OS_SendUDPbySize(logr->sock, msg_size, crypt_msg) < 0)
+    if(OS_SendUDPbySize(agt->sock, msg_size, crypt_msg) < 0)
     {
         merror(SEND_ERROR, ARGV0, "server");
         sleep(1);