X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fwin32%2Fwin_agent.c;h=40a37e6218243dd6b55e4c85a4f1cd24545fd668;hb=3f728675941dc69d4e544d3a880a56240a6e394a;hp=c2b80ca87b5ff6a1f568d75eb60170d829c318d5;hpb=6ef2f786c6c8ead94841b5f93baf9f43421f08c8;p=ossec-hids.git

diff --git a/src/win32/win_agent.c b/src/win32/win_agent.c
old mode 100755
new mode 100644
index c2b80ca..40a37e6
--- a/src/win32/win_agent.c
+++ b/src/win32/win_agent.c
@@ -1,6 +1,3 @@
-/* @(#) $Id: ./src/win32/win_agent.c, 2011/11/01 dcid Exp $
- */
-
 /* Copyright (C) 2009 Trend Micro Inc.
  * All rights reserved.
  *
@@ -8,17 +5,13 @@
  * 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
  */
 
-
 #ifdef WIN32
 
 #include "shared.h"
-#include "agentd.h"
-#include "logcollector.h"
+#include "client-agent/agentd.h"
+#include "logcollector/logcollector.h"
 #include "os_win.h"
 #include "os_net/os_net.h"
 #include "os_execd/execd.h"
@@ -34,7 +27,6 @@ char *__win32_uname = NULL;
 char *__win32_shared = NULL;
 HANDLE hMutex;
 
-
 /** Prototypes **/
 int Start_win32_Syscheck();
 void send_win32_info(time_t curr_time);
@@ -43,8 +35,9 @@ void send_win32_info(time_t curr_time);
 /* Help message */
 void agent_help()
 {
-    printf("\nOSSEC HIDS %s %s .\n", ARGV0, __version);
+    printf("\n%s %s %s .\n", __ossec_name, 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");
@@ -63,88 +56,66 @@ void *skthread()
     return (NULL);
 }
 
-
-/** main(int argc, char **argv)
- * ..
- */
 int main(int argc, char **argv)
 {
     char *tmpstr;
-    char mypath[OS_MAXSTR +1];
-    char myfile[OS_MAXSTR +1];
+    char mypath[OS_MAXSTR + 1];
+    char myfinalpath[OS_MAXSTR + 1];
+    char myfile[OS_MAXSTR + 1];
 
-    /* Setting the name */
+    /* Set the name */
     OS_SetName(ARGV0);
 
-
-    /* Find where I'm */
+    /* Find where we are */
     mypath[OS_MAXSTR] = '\0';
+    myfinalpath[OS_MAXSTR] = '\0';
     myfile[OS_MAXSTR] = '\0';
 
-
     /* mypath is going to be the whole path of the file */
     strncpy(mypath, argv[0], OS_MAXSTR);
     tmpstr = strrchr(mypath, '\\');
-    if(tmpstr)
-    {
+    if (tmpstr) {
         /* tmpstr is now the file name */
         *tmpstr = '\0';
         tmpstr++;
         strncpy(myfile, tmpstr, OS_MAXSTR);
-    }
-    else
-    {
+    } else {
         strncpy(myfile, argv[0], OS_MAXSTR);
         mypath[0] = '.';
         mypath[1] = '\0';
     }
     chdir(mypath);
-    getcwd(mypath, OS_MAXSTR -1);
-    strncat(mypath, "\\", OS_MAXSTR - (strlen(mypath) + 2));
-    strncat(mypath, myfile, OS_MAXSTR - (strlen(mypath) + 2));
-
-
-    if(argc > 1)
-    {
-        if(strcmp(argv[1], "install-service") == 0)
-        {
-            return(InstallService(mypath));
-        }
-        else if(strcmp(argv[1], "uninstall-service") == 0)
-        {
-            return(UninstallService());
-        }
-        else if(strcmp(argv[1], "start") == 0)
-        {
-            return(local_start());
-        }
-        else if(strcmp(argv[1], "-h") == 0)
-        {
+    getcwd(mypath, OS_MAXSTR - 1);
+    snprintf(myfinalpath, OS_MAXSTR, "\"%s\\%s\"", mypath, myfile);
+
+    if (argc > 1) {
+        if (strcmp(argv[1], "install-service") == 0) {
+            return (InstallService(myfinalpath));
+        } else if (strcmp(argv[1], "uninstall-service") == 0) {
+            return (UninstallService());
+        } else if (strcmp(argv[1], "start") == 0) {
+            return (local_start());
+        } else if (strcmp(argv[1], "/?") == 0) {
             agent_help();
-        }
-        else if(strcmp(argv[1], "help") == 0)
-        {
+        } else if (strcmp(argv[1], "-h") == 0) {
             agent_help();
-        }
-        else
-        {
+        } else if (strcmp(argv[1], "help") == 0) {
+            agent_help();
+        } else {
             merror("%s: Unknown option: %s", ARGV0, argv[1]);
             exit(1);
         }
     }
 
-
     /* Start it */
-    if(!os_WinMain(argc, argv))
-    {
+    if (!os_WinMain(argc, argv)) {
         ErrorExit("%s: Unable to start WinMain.", ARGV0);
     }
 
-    return(0);
+    return (0);
 }
 
-
-/* Locally starts (after service/win init) */
+/* Locally start (after service/win init) */
 int local_start()
 {
     int debug_level;
@@ -154,70 +125,66 @@ int local_start()
     DWORD  threadID;
     DWORD  threadID2;
 
-
-    /* Starting logr */
-    logr = (agent *)calloc(1, sizeof(agent));
-    if(!logr)
-    {
-        ErrorExit(MEM_ERROR, ARGV0);
+    /* Start agent */
+    agt = (agent *)calloc(1, sizeof(agent));
+    if (!agt) {
+        ErrorExit(MEM_ERROR, ARGV0, errno, strerror(errno));
     }
-    logr->port = DEFAULT_SECURE;
+    agt->port = DEFAULT_SECURE;
 
-
-    /* Getting debug level */
-    debug_level = getDefine_Int("windows","debug", 0, 2);
-    while(debug_level != 0)
-    {
+    /* Get debug level */
+    debug_level = getDefine_Int("windows", "debug", 0, 2);
+    while (debug_level != 0) {
         nowDebug();
         debug_level--;
     }
     accept_manager_commands = getDefine_Int("logcollector",
-                              "remote_commands", 0, 1);
-
-
-
+                                            "remote_commands", 0, 1);
+    loop_timeout = getDefine_Int("logcollector",  "loop_timeout", 1, 120);
+    open_file_attempts = getDefine_Int("logcollector", "open_attempts", 2, 998);
 
     /* Configuration file not present */
-    if(File_DateofChange(cfg) < 0)
-        ErrorExit("%s: Configuration file '%s' not found",ARGV0,cfg);
-
+    if (File_DateofChange(cfg) < 0) {
+        ErrorExit("%s: Configuration file '%s' not found", ARGV0, cfg);
+    }
 
-    /* Starting Winsock */
-    if (WSAStartup(MAKEWORD(2, 0), &wsaData) != 0)
-    {
+    /* Start Winsock */
+    if (WSAStartup(MAKEWORD(2, 0), &wsaData) != 0) {
         ErrorExit("%s: WSAStartup() failed", ARGV0);
     }
 
-
     /* Read agent config */
     debug1("%s: DEBUG: Reading agent configuration.", ARGV0);
-    if(ClientConf(cfg) < 0)
-    {
-        ErrorExit(CLIENT_ERROR,ARGV0);
+    if (ClientConf(cfg) < 0) {
+        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 */
+    /* Read logcollector config file */
     debug1("%s: DEBUG: Reading logcollector configuration.", ARGV0);
-    if(LogCollectorConfig(cfg, accept_manager_commands) < 0)
-    {
+    if (LogCollectorConfig(cfg, accept_manager_commands) < 0) {
         ErrorExit(CONFIG_ERROR, ARGV0, cfg);
     }
 
-
-    /* Checking auth keys */
-    if(!OS_CheckKeys())
-    {
+    /* Check auth keys */
+    if (!OS_CheckKeys()) {
         ErrorExit(AG_NOKEYS_EXIT, ARGV0);
     }
 
-
-
-    /* If there is not file to monitor, create a clean entry
+    /* If there is no file to monitor, create a clean entry
      * for the mark messages.
      */
-    if(logff == NULL)
-    {
+    if (logff == NULL) {
         os_calloc(2, sizeof(logreader), logff);
         logff[0].file = NULL;
         logff[0].ffile = NULL;
@@ -229,375 +196,295 @@ int local_start()
         merror(NO_FILE, ARGV0);
     }
 
-
-    /* Reading execd config. */
-    if(!WinExecd_Start())
-    {
-        logr->execdq = -1;
+    /* Read execd config */
+    if (!WinExecd_Start()) {
+        agt->execdq = -1;
     }
 
-
-    /* Reading keys */
+    /* Read keys */
     verbose(ENC_READ, ARGV0);
 
     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 */
+    /* Initialize random numbers */
     srandom(time(0));
     random();
 
-
     /* Socket connection */
-    logr->sock = -1;
-    StartMQ(NULL, 0);
-
+    agt->sock = -1;
+    StartMQ("", 0);
 
-    /* Starting mutex */
+    /* Start mutex */
     debug1("%s: DEBUG: Creating thread mutex.", ARGV0);
     hMutex = CreateMutex(NULL, FALSE, NULL);
-    if(hMutex == NULL)
-    {
+    if (hMutex == NULL) {
         ErrorExit("%s: Error creating mutex.", ARGV0);
     }
 
-
-
-    /* Starting syscheck thread */
-    if(CreateThread(NULL,
-                    0,
-                    (LPTHREAD_START_ROUTINE)skthread,
-                    NULL,
-                    0,
-                    (LPDWORD)&threadID) == NULL)
-    {
+    /* Start syscheck thread */
+    if (CreateThread(NULL,
+                     0,
+                     (LPTHREAD_START_ROUTINE)skthread,
+                     NULL,
+                     0,
+                     (LPDWORD)&threadID) == NULL) {
         merror(THREAD_ERROR, ARGV0);
     }
 
-
-
-    /* Checking if server is connected */
+    /* Check if server is connected */
     os_setwait();
-
     start_agent(1);
-
     os_delwait();
 
-
-    /* Sending integrity message for agent configs */
+    /* Send integrity message for agent configs */
     intcheck_file(cfg, "");
     intcheck_file(OSSEC_DEFINES, "");
 
-
-    /* Starting receiver thread */
-    if(CreateThread(NULL,
-                    0,
-                    (LPTHREAD_START_ROUTINE)receiver_thread,
-                    NULL,
-                    0,
-                    (LPDWORD)&threadID2) == NULL)
-    {
+    /* Start receiver thread */
+    if (CreateThread(NULL,
+                     0,
+                     (LPTHREAD_START_ROUTINE)receiver_thread,
+                     NULL,
+                     0,
+                     (LPDWORD)&threadID2) == NULL) {
         merror(THREAD_ERROR, ARGV0);
     }
 
-
-    /* Sending agent information message */
+    /* Send agent information message */
     send_win32_info(time(0));
 
-
-    /* Startting logcollector -- main process here */
+    /* Start logcollector -- main process here */
     LogCollectorStart();
 
     WSACleanup();
-    return(0);
+    return (0);
 }
 
-
-/* SendMSG for windows */
-int SendMSG(int queue, char *message, char *locmsg, char loc)
+/* SendMSG for Windows */
+int SendMSG(__attribute__((unused)) int queue, const char *message, const char *locmsg, char loc)
 {
     int _ssize;
-
     time_t cu_time;
-
-    char *pl;
-    char tmpstr[OS_MAXSTR+2];
-    char crypt_msg[OS_MAXSTR +2];
-
+    const char *pl;
+    char tmpstr[OS_MAXSTR + 2];
+    char crypt_msg[OS_MAXSTR + 2];
     DWORD dwWaitResult;
 
-    tmpstr[OS_MAXSTR +1] = '\0';
-    crypt_msg[OS_MAXSTR +1] = '\0';
-
+    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 */
-    while(1)
-    {
+    while (1) {
         dwWaitResult = WaitForSingleObject(hMutex, 1000000L);
 
-        if(dwWaitResult != WAIT_OBJECT_0)
-        {
-            switch(dwWaitResult)
-            {
+        if (dwWaitResult != WAIT_OBJECT_0) {
+            switch (dwWaitResult) {
                 case WAIT_TIMEOUT:
                     merror("%s: Error waiting mutex (timeout).", ARGV0);
                     sleep(5);
                     continue;
                 case WAIT_ABANDONED:
                     merror("%s: Error waiting mutex (abandoned).", ARGV0);
-                    return(0);
+                    return (0);
                 default:
                     merror("%s: Error waiting mutex.", ARGV0);
-                    return(0);
+                    return (0);
             }
-        }
-        else
-        {
+        } else {
             /* Lock acquired */
             break;
         }
-    }
-
+    }   /* end - while for mutex... */
 
     cu_time = time(0);
 
-
-    #ifndef ONEWAY
+#ifndef ONEWAY_ENABLED
     /* 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)
-        {
+        /* Attempt to send message again */
+        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);
             }
         }
 
-
-        /* If we reached here, the server is unavailable for a while. */
-        if((cu_time - available_server) > ((3 * NOTIFY_TIME) - 180))
-        {
+        /* If we reached here, the server is unavailable for a while */
+        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. */
+            /* 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);
                 sleep(1);
             }
 
-
-            /* Checking and generating log if unavailable. */
+            /* Check and generate 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;
 
-                /* If response is not available, set lock and
-                 * wait for it.
-                 */
+                /* If response is not available, set lock and wait for it */
                 verbose(SERVER_UNAV, ARGV0);
 
-
-                /* Going into reconnect mode. */
-                while((cu_time - available_server) > ((3*NOTIFY_TIME) - 180))
-                {
-                    /* Sending information to see if server replies */
-                    if(logr->sock != -1)
-                    {
+                /* Go into reconnect mode */
+                while ((cu_time - available_server) > agt->max_time_reconnect_try) {
+                    /* Send information to see if server replies */
+                    if (agt->sock != -1) {
                         send_win32_info(cu_time);
                     }
 
                     sleep(wi);
                     cu_time = time(0);
 
-                    if(wi < 20)
-                    {
+                    if (wi < 20) {
                         wi++;
-                    }
-                    else
-                    {
+                    } else {
                         global_sleep++;
                     }
 
-
-                    /* If we have more than one server, try all. */
-                    if(wi > 12 && logr->rip[1])
-                    {
-                        int curr_rip = logr->rip_id;
+                    /* If we have more than one server, try all */
+                    if (wi > 12 && agt->rip[1]) {
+                        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))
-                    {
-                        connect_server(logr->rip_id +1);
-                        if(logr->sock == -1)
-                        {
+                    } else if (global_sleep == 2 || ((global_sleep % mod_sleep) == 0) ||
+                               (agt->sock == -1)) {
+                        connect_server(agt->rip_id + 1);
+                        if (agt->sock == -1) {
                             sleep(wi + global_sleep);
-                        }
-                        else
-                        {
+                        } else {
                             sleep(global_sleep);
                         }
 
-                        if(global_sleep > 30)
-                        {
+                        if (global_sleep > 30) {
                             mod_sleep = 50;
                         }
                     }
                 }
 
-                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);
             }
         }
     }
-    #else
-    if(0)
-    {
+#else
+    if (0) {
     }
-    #endif
-
+#endif
 
     /* Send notification */
-    else if((cu_time - __win32_curr_time) > (NOTIFY_TIME - 200))
-    {
+    else if ((cu_time - __win32_curr_time) > (NOTIFY_TIME - 200)) {
         debug1("%s: DEBUG: Sending info to server (ctime2)...", ARGV0);
         send_win32_info(cu_time);
     }
 
-
-
     /* locmsg cannot have the C:, as we use it as delimiter */
     pl = strchr(locmsg, ':');
-    if(pl)
-    {
-        /* Setting pl after the ":" if it exists. */
+    if (pl) {
+        /* Set pl after the ":" if it exists */
         pl++;
-    }
-    else
-    {
+    } else {
         pl = locmsg;
     }
 
 
     debug2("%s: DEBUG: Sending message to server: '%s'", ARGV0, message);
 
-    snprintf(tmpstr,OS_MAXSTR,"%c:%s:%s", loc, pl, message);
-
+    snprintf(tmpstr, OS_MAXSTR, "%c:%s:%s", loc, pl, message);
     _ssize = CreateSecMSG(&keys, tmpstr, crypt_msg, 0);
 
-
     /* Returns NULL if can't create encrypted message */
-    if(_ssize == 0)
-    {
-        merror(SEC_ERROR,ARGV0);
-        if(!ReleaseMutex(hMutex))
-        {
+    if (_ssize == 0) {
+        merror(SEC_ERROR, ARGV0);
+        if (!ReleaseMutex(hMutex)) {
             merror("%s: Error releasing mutex.", ARGV0);
         }
 
-        return(-1);
+        return (-1);
     }
 
     /* Send _ssize of crypt_msg */
-    if(OS_SendUDPbySize(logr->sock, _ssize, crypt_msg) < 0)
-    {
-        merror(SEND_ERROR,ARGV0, "server");
+    if (OS_SendUDPbySize(agt->sock, _ssize, crypt_msg) < 0) {
+        merror(SEND_ERROR, ARGV0, "server");
         sleep(1);
     }
 
-    if(!ReleaseMutex(hMutex))
-    {
+    if (!ReleaseMutex(hMutex)) {
         merror("%s: Error releasing mutex.", ARGV0);
     }
-    return(0);
+    return (0);
 }
 
-
-/* StartMQ for windows */
-int StartMQ(char * path, short int type)
+/* StartMQ for Windows */
+int StartMQ(const char *path, short int type)
 {
-    /* Connecting to the server. */
+    /* Connect to the server */
     connect_server(0);
 
-    if((path == NULL) && (type == 0))
-    {
-        return(0);
+    if ((path == NULL) && (type == 0)) {
+        return (0);
     }
 
-    return(0);
+    return (0);
 }
 
-
 /* Send win32 info to server */
 void send_win32_info(time_t curr_time)
 {
     int msg_size;
-    char tmp_msg[OS_MAXSTR +2];
-    char crypt_msg[OS_MAXSTR +2];
-
-    tmp_msg[OS_MAXSTR +1] = '\0';
-    crypt_msg[OS_MAXSTR +1] = '\0';
+    char tmp_msg[OS_MAXSTR + 2];
+    char crypt_msg[OS_MAXSTR + 2];
 
+    tmp_msg[OS_MAXSTR + 1] = '\0';
+    crypt_msg[OS_MAXSTR + 1] = '\0';
 
     debug1("%s: DEBUG: Sending keep alive message.", ARGV0);
 
-
-    /* fixing time */
+    /* Fix time */
     __win32_curr_time = curr_time;
 
-
-    /* Getting uname. */
-    if(!__win32_uname)
-    {
+    /* Get uname */
+    if (!__win32_uname) {
         __win32_uname = getuname();
-        if(!__win32_uname)
-        {
+        if (!__win32_uname) {
             merror("%s: Error generating system information.", ARGV0);
             os_strdup("Microsoft Windows - Unknown (unable to get system info)", __win32_uname);
         }
     }
 
-
-    /* Getting shared files list -- every 30 seconds only. */
-    if((__win32_curr_time - __win32_shared_time) > 30)
-    {
-        if(__win32_shared)
-        {
+    /* Get shared files list -- every 30 seconds only */
+    if ((__win32_curr_time - __win32_shared_time) > 30) {
+        if (__win32_shared) {
             free(__win32_shared);
             __win32_shared = NULL;
         }
@@ -605,57 +492,42 @@ void send_win32_info(time_t curr_time)
         __win32_shared_time = __win32_curr_time;
     }
 
-
-    /* get shared files */
-    if(!__win32_shared)
-    {
+    /* Get shared files */
+    if (!__win32_shared) {
         __win32_shared = getsharedfiles();
-        if(!__win32_shared)
-        {
+        if (!__win32_shared) {
             __win32_shared = strdup("\0");
-            if(!__win32_shared)
-            {
-                merror(MEM_ERROR, ARGV0);
+            if (!__win32_shared) {
+                merror(MEM_ERROR, ARGV0, errno, strerror(errno));
                 return;
             }
         }
     }
 
-
-
-    /* creating message */
-    if(File_DateofChange(AGENTCONFIGINT) > 0)
-    {
+    /* Create message */
+    if (File_DateofChange(AGENTCONFIGINT) > 0) {
         os_md5 md5sum;
-        if(OS_MD5_File(AGENTCONFIGINT, md5sum) != 0)
-        {
+        if (OS_MD5_File(AGENTCONFIGINT, md5sum, OS_TEXT) != 0) {
             snprintf(tmp_msg, OS_SIZE_1024, "#!-%s\n%s", __win32_uname, __win32_shared);
-        }
-        else
-        {
+        } else {
             snprintf(tmp_msg, OS_SIZE_1024, "#!-%s / %s\n%s", __win32_uname, md5sum, __win32_shared);
         }
-    }
-    else
-    {
+    } else {
         snprintf(tmp_msg, OS_SIZE_1024, "#!-%s\n%s", __win32_uname, __win32_shared);
     }
 
-
-    /* creating message */
+    /* Create message */
     debug1("%s: DEBUG: Sending keep alive: %s", ARGV0, tmp_msg);
 
     msg_size = CreateSecMSG(&keys, tmp_msg, crypt_msg, 0);
 
-    if(msg_size == 0)
-    {
+    if (msg_size == 0) {
         merror(SEC_ERROR, ARGV0);
         return;
     }
 
-    /* Sending UDP message */
-    if(OS_SendUDPbySize(logr->sock, msg_size, crypt_msg) < 0)
-    {
+    /* Send UDP message */
+    if (OS_SendUDPbySize(agt->sock, msg_size, crypt_msg) < 0) {
         merror(SEND_ERROR, ARGV0, "server");
         sleep(1);
     }
@@ -664,4 +536,3 @@ void send_win32_info(time_t curr_time)
 }
 
 #endif
-/* EOF */