projects
/
ossec-hids.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'upstream/2.7'
[ossec-hids.git]
/
src
/
client-agent
/
receiver.c
diff --git
a/src/client-agent/receiver.c
b/src/client-agent/receiver.c
index
b9ab116
..
1a35484
100755
(executable)
--- a/
src/client-agent/receiver.c
+++ b/
src/client-agent/receiver.c
@@
-1,4
+1,5
@@
-/* @(#) $Id$ */
+/* @(#) $Id: ./src/client-agent/receiver.c, 2011/09/08 dcid Exp $
+ */
/* Copyright (C) 2009 Trend Micro Inc.
* All right reserved.
/* Copyright (C) 2009 Trend Micro Inc.
* All right reserved.
@@
-29,7
+30,7
@@
char file_sum[34] = "";
char file[OS_SIZE_1024 +1] = "";
char file[OS_SIZE_1024 +1] = "";
-/* receive_msg:
+/* receive_msg:
* Receive events from the server.
*/
void *receive_msg()
* Receive events from the server.
*/
void *receive_msg()
@@
-47,7
+48,7
@@
void *receive_msg()
- /* Read until no more messages are available */
+ /* Read until no more messages are available */
while((recv_b = recv(logr->sock, buffer, OS_SIZE_1024, MSG_DONTWAIT)) > 0)
{
buffer[recv_b] = '\0';
while((recv_b = recv(logr->sock, buffer, OS_SIZE_1024, MSG_DONTWAIT)) > 0)
{
buffer[recv_b] = '\0';
@@
-83,7
+84,7
@@
void *receive_msg()
{
if(OS_SendUnix(logr->execdq, tmp_msg, 0) < 0)
{
{
if(OS_SendUnix(logr->execdq, tmp_msg, 0) < 0)
{
- merror("%s: Error communicating with execd",
+ merror("%s: Error communicating with execd",
ARGV0);
}
}
ARGV0);
}
}
@@
-101,7
+102,7
@@
void *receive_msg()
continue;
continue;
- }
+ }
/* Restart syscheck. */
/* Restart syscheck. */
@@
-128,7
+129,7
@@
void *receive_msg()
/* File update message */
/* File update message */
- if(strncmp(tmp_msg, FILE_UPDATE_HEADER,
+ if(strncmp(tmp_msg, FILE_UPDATE_HEADER,
strlen(FILE_UPDATE_HEADER)) == 0)
{
char *validate_file;
strlen(FILE_UPDATE_HEADER)) == 0)
{
char *validate_file;
@@
-164,10
+165,10
@@
void *receive_msg()
}
if(tmp_msg[0] == '.')
}
if(tmp_msg[0] == '.')
- tmp_msg[0] = '-';
+ tmp_msg[0] = '-';
- snprintf(file, OS_SIZE_1024, "%s/%s",
+ snprintf(file, OS_SIZE_1024, "%s/%s",
SHAREDCFG_DIR,
tmp_msg);
SHAREDCFG_DIR,
tmp_msg);
@@
-179,7
+180,7
@@
void *receive_msg()
}
}
}
}
- else if(strncmp(tmp_msg, FILE_CLOSE_HEADER,
+ else if(strncmp(tmp_msg, FILE_CLOSE_HEADER,
strlen(FILE_CLOSE_HEADER)) == 0)
{
/* no error */
strlen(FILE_CLOSE_HEADER)) == 0)
{
/* no error */
@@
-208,7
+209,7
@@
void *receive_msg()
if(strcmp(currently_md5, file_sum) != 0)
{
debug1("%s: ERROR: Failed md5 for: %s -- deleting.",
if(strcmp(currently_md5, file_sum) != 0)
{
debug1("%s: ERROR: Failed md5 for: %s -- deleting.",
- ARGV0, file);
+ ARGV0, file);
unlink(file);
}
else
unlink(file);
}
else
@@
-252,7
+253,7
@@
void *receive_msg()
merror("%s: WARN: Unknown message received. No action defined.",
ARGV0);
}
merror("%s: WARN: Unknown message received. No action defined.",
ARGV0);
}
- }
+ }
return(NULL);
return(NULL);