projects
/
ossec-hids.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 2.7
[ossec-hids.git]
/
src
/
remoted
/
secure.c
diff --git
a/src/remoted/secure.c
b/src/remoted/secure.c
index
9f40f12
..
39f4269
100755
(executable)
--- a/
src/remoted/secure.c
+++ b/
src/remoted/secure.c
@@
-1,4
+1,5
@@
-/* @(#) $Id$ */
+/* @(#) $Id: ./src/remoted/secure.c, 2011/09/08 dcid Exp $
+ */
/* Copyright (C) 2009 Trend Micro Inc.
* All right reserved.
/* Copyright (C) 2009 Trend Micro Inc.
* All right reserved.
@@
-26,7
+27,7
@@
void HandleSecure()
int agentid;
char buffer[OS_MAXSTR +1];
int agentid;
char buffer[OS_MAXSTR +1];
- char cleartext_msg[OS_MAXSTR +1];
+ char cleartext_msg[OS_MAXSTR +1];
char srcip[IPSIZE +1];
char *tmp_msg;
char srcmsg[OS_FLSIZE +1];
char srcip[IPSIZE +1];
char *tmp_msg;
char srcmsg[OS_FLSIZE +1];
@@
-55,7
+56,7
@@
void HandleSecure()
{
ErrorExit(THREAD_ERROR, ARGV0);
}
{
ErrorExit(THREAD_ERROR, ARGV0);
}
-
+
/* Creating wait_for_msgs thread */
if(CreateThread(wait_for_msgs, (void *)NULL) != 0)
{
/* Creating wait_for_msgs thread */
if(CreateThread(wait_for_msgs, (void *)NULL) != 0)
{
@@
-70,16
+71,16
@@
void HandleSecure()
{
ErrorExit(QUEUE_FATAL, ARGV0, DEFAULTQUEUE);
}
{
ErrorExit(QUEUE_FATAL, ARGV0, DEFAULTQUEUE);
}
-
-
- verbose(AG_AX_AGENTS, ARGV0, MAX_AGENTS);
-
+
+ verbose(AG_AX_AGENTS, ARGV0, MAX_AGENTS);
+
+
/* Reading authentication keys */
verbose(ENC_READ, ARGV0);
/* Reading authentication keys */
verbose(ENC_READ, ARGV0);
-
+
OS_ReadKeys(&keys);
OS_ReadKeys(&keys);
-
+
debug1("%s: DEBUG: OS_StartCounter.", ARGV0);
OS_StartCounter(&keys);
debug1("%s: DEBUG: OS_StartCounter completed.", ARGV0);
debug1("%s: DEBUG: OS_StartCounter.", ARGV0);
OS_StartCounter(&keys);
debug1("%s: DEBUG: OS_StartCounter completed.", ARGV0);
@@
-95,14
+96,14
@@
void HandleSecure()
memset(cleartext_msg, '\0', OS_MAXSTR +1);
memset(srcmsg, '\0', OS_FLSIZE +1);
tmp_msg = NULL;
memset(cleartext_msg, '\0', OS_MAXSTR +1);
memset(srcmsg, '\0', OS_FLSIZE +1);
tmp_msg = NULL;
-
-
-
+
+
+
/* loop in here */
while(1)
{
/* Receiving message */
/* loop in here */
while(1)
{
/* Receiving message */
- recv_b = recvfrom(logr.sock, buffer, OS_MAXSTR, 0,
+ recv_b = recvfrom(logr.sock, buffer, OS_MAXSTR, 0,
(struct sockaddr *)&peer_info, &peer_size);
(struct sockaddr *)&peer_info, &peer_size);
@@
-119,13
+120,13
@@
void HandleSecure()
- /* Getting a valid agentid */
+ /* Getting a valid agentid */
if(buffer[0] == '!')
{
tmp_msg = buffer;
tmp_msg++;
if(buffer[0] == '!')
{
tmp_msg = buffer;
tmp_msg++;
-
-
+
+
/* We need to make sure that we have a valid id
* and that we reduce the recv buffer size.
*/
/* We need to make sure that we have a valid id
* and that we reduce the recv buffer size.
*/
@@
-166,7
+167,7
@@
void HandleSecure()
}
else
{
}
else
{
- agentid = OS_IsAllowedIP(&keys, srcip);
+ agentid = OS_IsAllowedIP(&keys, srcip);
if(agentid < 0)
{
if(check_keyupdate())
if(agentid < 0)
{
if(check_keyupdate())
@@
-186,9
+187,9
@@
void HandleSecure()
}
tmp_msg = buffer;
}
}
tmp_msg = buffer;
}
-
- /* Decrypting the message */
+
+ /* Decrypting the message */
tmp_msg = ReadSecMSG(&keys, tmp_msg, cleartext_msg,
agentid, recv_b -1);
if(tmp_msg == NULL)
tmp_msg = ReadSecMSG(&keys, tmp_msg, cleartext_msg,
agentid, recv_b -1);
if(tmp_msg == NULL)
@@
-198,7
+199,7
@@
void HandleSecure()
}
}
- /* Check if it is a control message */
+ /* Check if it is a control message */
if(IsValidHeader(tmp_msg))
{
/* We need to save the peerinfo if it is a control msg */
if(IsValidHeader(tmp_msg))
{
/* We need to save the peerinfo if it is a control msg */
@@
-212,14
+213,14
@@
void HandleSecure()
/* Generating srcmsg */
/* Generating srcmsg */
- snprintf(srcmsg, OS_FLSIZE,"(%s) %s",keys.keyentries[agentid]->name,
+ snprintf(srcmsg, OS_FLSIZE,"(%s) %s",keys.keyentries[agentid]->name,
keys.keyentries[agentid]->ip->ip);
keys.keyentries[agentid]->ip->ip);
-
+
/* If we can't send the message, try to connect to the
* socket again. If it not exit.
*/
/* If we can't send the message, try to connect to the
* socket again. If it not exit.
*/
- if(SendMSG(logr.m_queue, tmp_msg, srcmsg,
+ if(SendMSG(logr.m_queue, tmp_msg, srcmsg,
SECURE_MQ) < 0)
{
merror(QUEUE_ERROR, ARGV0, DEFAULTQUEUE, strerror(errno));
SECURE_MQ) < 0)
{
merror(QUEUE_ERROR, ARGV0, DEFAULTQUEUE, strerror(errno));