ossec-hids: manager.c (HEAD) [dcid]
OSSEC CVS
Changes by: dcid 09/04/16 19:01:21
Modified files:
manager.c
Log message:
Description: More agent-server communication improvements.
Reviewed by: dcid
Bug:
Index: manager.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/remoted/manager.c,v
diff -u -r1.44 -r1.45
--- manager.c 17 Jun 2008 17:04:07 -0000 1.44
+++ manager.c 16 Apr 2009 22:01:20 -0000 1.45
@@ -220,6 +220,18 @@
f_sum = NULL;
+
+ /* Creating merged file. */
+ os_realloc(f_sum, (f_size +2) * sizeof(file_sum *), f_sum);
+ os_calloc(1, sizeof(file_sum), f_sum[f_size]);
+ f_sum[f_size]->mark = 0;
+ f_sum[f_size]->name = NULL;
+ f_sum[f_size]->sum[0] = '\0';
+ MergeAppendFile(SHAREDCFG_FILE, NULL);
+ f_size++;
+
+
+
/* Opening the directory given */
dp = opendir(SHAREDCFG_DIR);
if(!dp)
@@ -239,11 +251,20 @@
/* Just ignore . and .. */
if((strcmp(entry->d_name,".") == 0) ||
- (strcmp(entry->d_name,"..") == 0))
+ (strcmp(entry->d_name,"..") == 0))
+ {
continue;
+ }
snprintf(tmp_dir, 512, "%s/%s", SHAREDCFG_DIR, entry->d_name);
+
+ /* Leaving the shared config file for later. */
+ if(strcmp(tmp_dir, SHAREDCFG_FILE) == 0)
+ {
+ continue;
+ }
+
if(OS_MD5_File(tmp_dir, md5sum) != 0)
{
@@ -266,13 +287,11 @@
strncpy(f_sum[f_size]->sum, md5sum, 32);
- f_sum[f_size]->name = strdup(entry->d_name);
- if(!f_sum[f_size]->name)
- {
- ErrorExit(MEM_ERROR,ARGV0);
- }
-
+ os_strdup(entry->d_name, f_sum[f_size]->name);
f_sum[f_size]->mark = 0;
+
+
+ MergeAppendFile(SHAREDCFG_FILE, tmp_dir);
f_size++;
}
@@ -280,6 +299,16 @@
f_sum[f_size] = NULL;
closedir(dp);
+
+
+ if(OS_MD5_File(SHAREDCFG_FILE, md5sum) != 0)
+ {
+ merror("%s: Error accessing file '%s'",ARGV0, SHAREDCFG_FILE);
+ f_sum[0]->sum[0] = '\0';
+ }
+ strncpy(f_sum[0]->sum, md5sum, 32);
+ os_strdup(strrchr(SHAREDCFG_FILE, '/'), f_sum[0]->name);
+
return;
}
@@ -319,7 +348,7 @@
/* Sending the file content */
- while((n = fread(buf, 1, 512, fp)) > 0)
+ while((n = fread(buf, 1, 900, fp)) > 0)
{
buf[n] = '\0';
@@ -419,7 +448,34 @@
*file = '\0';
file++;
- for(i = 0;;i++)
+
+ /* New agents only have merged.mg. */
+ if(strcmp(file, "merged.mg") == 0)
+ {
+ if(strcmp(f_sum[0]->sum, md5) != 0)
+ {
+ debug1("%s: DEBUG Sending file '%s' to agent.", ARGV0,
+ f_sum[0]->name);
+ if(send_file_toagent(agentid,f_sum[0]->name,f_sum[0]->sum)<0)
+ {
+ merror("%s: ERROR: Unable to send file '%s' to agent.",
+ ARGV0,
+ f_sum[0]->name);
+ }
+ }
+
+ i = 0;
+ while(f_sum[i])
+ {
+ f_sum[i]->mark = 0;
+ i++;
+ }
+
+ return;
+ }
+
+
+ for(i = 1;;i++)
{
if(f_sum[i] == NULL)
break;
@@ -440,7 +496,7 @@
/* Updating each file marked */
- for(i = 0;;i++)
+ for(i = 1;;i++)
{
if(f_sum[i] == NULL)
break;
@@ -484,11 +540,11 @@
/* should never leave this loop */
while(1)
{
- /* Every 60 minutes, re read the files.
+ /* Every NOTIFY * 30 minutes, re read the files.
* If something changed, notify all agents
*/
_ctime = time(0);
- if((_ctime - _stime) > (NOTIFY_TIME*6))
+ if((_ctime - _stime) > (NOTIFY_TIME*30))
{
f_files();
c_files();
OSSEC CVS
Changes by: dcid 09/04/16 22:36:41
Modified files:
manager.c
Log message:
Description: A few more fixes for the shared config.
Reviewed by: dcid
Bug:
Index: manager.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/remoted/manager.c,v
diff -u -r1.45 -r1.46
--- manager.c 16 Apr 2009 22:01:20 -0000 1.45
+++ manager.c 17 Apr 2009 01:36:41 -0000 1.46
@@ -307,7 +307,9 @@
f_sum[0]->sum[0] = '\0';
}
strncpy(f_sum[0]->sum, md5sum, 32);
- os_strdup(strrchr(SHAREDCFG_FILE, '/'), f_sum[0]->name);
+
+
+ os_strdup(SHAREDCFG_FILENAME, f_sum[0]->name);
return;
}
@@ -450,7 +452,7 @@
/* New agents only have merged.mg. */
- if(strcmp(file, "merged.mg") == 0)
+ if(strcmp(file, SHAREDCFG_FILENAME) == 0)
{
{
OSSEC CVS
Changes by: dcid 09/06/24 15:53:07
Modified files:
COPYRIGHT ar-forward.c config.c main.c manager.c remoted.c remoted.h
secure.c sendmsg.c syslog.c syslogtcp.c
Log message:
Description: Changing copyrights to Trend Micro
Reviewed by: dcid
Bug:
Index: COPYRIGHT
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/remoted/COPYRIGHT,v
diff -u -r1.3 -r1.4
--- COPYRIGHT 17 Jun 2008 17:04:07 -0000 1.3
+++ COPYRIGHT 24 Jun 2009 18:53:07 -0000 1.4
@@ -1,4 +1,4 @@
-Copyright (C) 2004-2008 Third Brigade, Inc.
+Copyright (C) 2009 Trend Micro Inc.
All rights reserved.
This program is a free software; you can redistribute it
and/or modify it under the terms of the GNU General Public
Index: ar-forward.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/remoted/ar-forward.c,v
diff -u -r1.26 -r1.27
--- ar-forward.c 17 Jun 2008 17:04:07 -0000 1.26
+++ ar-forward.c 24 Jun 2009 18:53:07 -0000 1.27
@@ -1,6 +1,6 @@
/* @(#) $Id$ */
-/* Copyright (C) 2008 Third Brigade, Inc.
+/* Copyright (C) 2009 Trend Micro Inc.
* All right reserved.
*
* This program is a free software; you can redistribute it
Index: config.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/remoted/config.c,v
diff -u -r1.11 -r1.12
--- config.c 17 Jun 2008 17:04:07 -0000 1.11
+++ config.c 24 Jun 2009 18:53:07 -0000 1.12
@@ -1,6 +1,6 @@
/* @(#) $Id$ */
-/* Copyright (C) 2003-2008 Third Brigade, Inc.
+/* Copyright (C) 2009 Trend Micro Inc.
* All rights reserved.
*
* This program is a free software; you can redistribute it
Index: main.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/remoted/main.c,v
diff -u -r1.21 -r1.22
--- main.c 15 Aug 2008 21:03:07 -0000 1.21
+++ main.c 24 Jun 2009 18:53:07 -0000 1.22
@@ -1,6 +1,6 @@
/* @(#) $Id$ */
-/* Copyright (C) 2003-2008 Third Brigade, Inc.
+/* Copyright (C) 2009 Trend Micro Inc.
* All right reserved.
*
* This program is a free software; you can redistribute it
Index: manager.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/remoted/manager.c,v
diff -u -r1.46 -r1.47
--- manager.c 17 Apr 2009 01:36:41 -0000 1.46
+++ manager.c 24 Jun 2009 18:53:07 -0000 1.47
@@ -1,6 +1,6 @@
/* @(#) $Id$ */
-/* Copyright (C) 2005-2008 Third Brigade, Inc.
+/* Copyright (C) 2009 Trend Micro Inc.
* All right reserved.
*
* This program is a free software; you can redistribute it
Index: remoted.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/remoted/remoted.c,v
diff -u -r1.33 -r1.34
--- remoted.c 15 Aug 2008 21:03:07 -0000 1.33
+++ remoted.c 24 Jun 2009 18:53:07 -0000 1.34
@@ -1,6 +1,6 @@
/* @(#) $Id$ */
-/* Copyright (C) 2008 Third Brigade, Inc.
+/* Copyright (C) 2009 Trend Micro Inc.
* All rights reserved.
*
* This program is a free software; you can redistribute it
Index: remoted.h
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/remoted/remoted.h,v
diff -u -r1.17 -r1.18
--- remoted.h 17 Jun 2008 17:04:07 -0000 1.17
+++ remoted.h 24 Jun 2009 18:53:07 -0000 1.18
@@ -1,6 +1,6 @@
/* @(#) $Id$ */
-/* Copyright (C) 2003,2004,2008 Third Brigade, Inc.
+/* Copyright (C) 2009 Trend Micro Inc.
* All right reserved.
*
* This program is a free software; you can redistribute it
Index: secure.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/remoted/secure.c,v
diff -u -r1.28 -r1.29
--- secure.c 20 Aug 2008 19:48:40 -0000 1.28
+++ secure.c 24 Jun 2009 18:53:07 -0000 1.29
@@ -1,6 +1,6 @@
/* @(#) $Id$ */
-/* Copyright (C) 2003-2008 Third Brigade, Inc.
+/* Copyright (C) 2009 Trend Micro Inc.
* All right reserved.
*
* This program is a free software; you can redistribute it
Index: sendmsg.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/remoted/sendmsg.c,v
diff -u -r1.3 -r1.4
--- sendmsg.c 17 Jun 2008 17:04:07 -0000 1.3
+++ sendmsg.c 24 Jun 2009 18:53:07 -0000 1.4
@@ -1,6 +1,6 @@
/* @(#) $Id$ */
-/* Copyright (C) 2005-2008 Third Brigade, Inc.
+/* Copyright (C) 2009 Trend Micro Inc.
* All right reserved.
*
* This program is a free software; you can redistribute it
Index: syslog.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/remoted/syslog.c,v
diff -u -r1.16 -r1.17
--- syslog.c 17 Jun 2008 17:04:07 -0000 1.16
+++ syslog.c 24 Jun 2009 18:53:07 -0000 1.17
@@ -1,6 +1,6 @@
/* @(#) $Id$ */
-/* Copyright (C) 2003,2004,2008 Third Brigade, Inc.
+/* Copyright (C) 2009 Trend Micro Inc.
* All right reserved.
*
* This program is a free software; you can redistribute it
Index: syslogtcp.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/remoted/syslogtcp.c,v
diff -u -r1.7 -r1.8
--- syslogtcp.c 17 Jun 2008 17:04:07 -0000 1.7
+++ syslogtcp.c 24 Jun 2009 18:53:07 -0000 1.8
@@ -1,6 +1,6 @@
/* @(#) $Id$ */
-/* Copyright (C) 2003-2008 Third Brigade, Inc.
+/* Copyright (C) 2009 Trend Micro Inc.
* All right reserved.
*
* This program is a free software; you can redistribute it