-/* @(#) $Id: ./src/remoted/manager.c, 2011/09/08 dcid Exp $
- */
-
/* Copyright (C) 2009 Trend Micro Inc.
* All right reserved.
*
*/
#include "shared.h"
-#include <pthread.h>
-
#include "remoted.h"
-#include "os_net/os_net.h"
#include "os_crypto/md5/md5_op.h"
-
+#include "os_net/os_net.h"
+#include <pthread.h>
/* Internal structures */
-typedef struct _file_sum
-{
+typedef struct _file_sum {
int mark;
char *name;
os_md5 sum;
-}file_sum;
-
-
+} file_sum;
/* Internal functions prototypes */
-void read_controlmsg(int agentid, char *msg);
-
-
-
-
-/* Global vars, acessible every where */
-file_sum **f_sum;
-
-time_t _ctime;
-time_t _stime;
-
+static void read_controlmsg(unsigned int agentid, char *msg);
+static int send_file_toagent(unsigned int agentid, const char *name, const char *sum);
+static void f_files(void);
+static void c_files(void);
+/* Global vars */
+static file_sum **f_sum;
+static time_t _ctime;
+static time_t _stime;
/* For the last message tracking */
-char *_msg[MAX_AGENTS +1];
-char *_keep_alive[MAX_AGENTS +1];
-int _changed[MAX_AGENTS +1];
-int modified_agentid;
-
+static char *_msg[MAX_AGENTS + 1];
+static char *_keep_alive[MAX_AGENTS + 1];
+static int _changed[MAX_AGENTS + 1];
+static int modified_agentid;
/* pthread mutex variables */
-pthread_mutex_t lastmsg_mutex;
-pthread_cond_t awake_mutex;
-
+static pthread_mutex_t lastmsg_mutex;
+static pthread_cond_t awake_mutex;
-/* save_controlmsg: Save a control message received
- * from an agent. read_contromsg (other thread) is going
- * to deal with it (only if message changed).
+/* Save a control message received from an agent
+ * read_controlmsg (other thread) is going to deal with it
+ * (only if message changed)
*/
-void save_controlmsg(int agentid, char *r_msg)
+void save_controlmsg(unsigned int agentid, char *r_msg)
{
- char msg_ack[OS_FLSIZE +1];
+ char msg_ack[OS_FLSIZE + 1];
-
- /* Replying to the agent. */
+ /* Reply to the agent */
snprintf(msg_ack, OS_FLSIZE, "%s%s", CONTROL_HEADER, HC_ACK);
send_msg(agentid, msg_ack);
-
- /* Checking if there is a keep alive already for this agent. */
- if(_keep_alive[agentid] && _msg[agentid] &&
- (strcmp(_msg[agentid], r_msg) == 0))
- {
+ /* Check if there is a keep alive already for this agent */
+ if (_keep_alive[agentid] && _msg[agentid] &&
+ (strcmp(_msg[agentid], r_msg) == 0)) {
utimes(_keep_alive[agentid], NULL);
}
- else if(strcmp(r_msg, HC_STARTUP) == 0)
- {
+ else if (strcmp(r_msg, HC_STARTUP) == 0) {
return;
}
- else
- {
+ else {
FILE *fp;
char *uname = r_msg;
char *random_leftovers;
-
- /* locking mutex. */
- if(pthread_mutex_lock(&lastmsg_mutex) != 0)
- {
+ /* Lock mutex */
+ if (pthread_mutex_lock(&lastmsg_mutex) != 0) {
merror(MUTEX_ERROR, ARGV0);
return;
}
-
- /* Update rmsg. */
- if(_msg[agentid])
- {
+ /* Update rmsg */
+ if (_msg[agentid]) {
free(_msg[agentid]);
}
os_strdup(r_msg, _msg[agentid]);
-
- /* Unlocking mutex. */
- if(pthread_mutex_unlock(&lastmsg_mutex) != 0)
- {
+ /* Unlock mutex */
+ if (pthread_mutex_unlock(&lastmsg_mutex) != 0) {
merror(MUTEX_ERROR, ARGV0);
return;
}
-
r_msg = strchr(r_msg, '\n');
- if(!r_msg)
- {
+ if (!r_msg) {
merror("%s: WARN: Invalid message from agent id: '%d'(uname)",
- ARGV0,
- agentid);
+ ARGV0,
+ agentid);
return;
}
-
*r_msg = '\0';
random_leftovers = strchr(r_msg, '\n');
- if(random_leftovers)
- {
+ if (random_leftovers) {
*random_leftovers = '\0';
}
-
- /* Updating the keep alive. */
- if(!_keep_alive[agentid])
- {
- char agent_file[OS_SIZE_1024 +1];
+ /* Update the keep alive */
+ if (!_keep_alive[agentid]) {
+ char agent_file[OS_SIZE_1024 + 1];
agent_file[OS_SIZE_1024] = '\0';
- /* Writting to the agent file */
+ /* Write to the agent file */
snprintf(agent_file, OS_SIZE_1024, "%s/%s-%s",
- AGENTINFO_DIR,
- keys.keyentries[agentid]->name,
- keys.keyentries[agentid]->ip->ip);
-
+ AGENTINFO_DIR,
+ keys.keyentries[agentid]->name,
+ keys.keyentries[agentid]->ip->ip);
os_strdup(agent_file, _keep_alive[agentid]);
}
-
- /* Writing to the file. */
+ /* Write to the file */
fp = fopen(_keep_alive[agentid], "w");
- if(fp)
- {
+ if (fp) {
fprintf(fp, "%s\n", uname);
fclose(fp);
+ } else {
+ merror("ossec-remoted: ERROR: Could not open %s: %s", _keep_alive[agentid], strerror(errno));
}
}
-
- /* Locking now to notify of change. */
- if(pthread_mutex_lock(&lastmsg_mutex) != 0)
- {
+ /* Lock now to notify of change */
+ if (pthread_mutex_lock(&lastmsg_mutex) != 0) {
merror(MUTEX_ERROR, ARGV0);
return;
}
-
/* Assign new values */
_changed[agentid] = 1;
- modified_agentid = agentid;
-
+ modified_agentid = (int) agentid;
/* Signal that new data is available */
pthread_cond_signal(&awake_mutex);
-
- /* Unlocking mutex */
- if(pthread_mutex_unlock(&lastmsg_mutex) != 0)
- {
+ /* Unlock mutex */
+ if (pthread_mutex_unlock(&lastmsg_mutex) != 0) {
merror(MUTEX_ERROR, ARGV0);
return;
}
-
return;
}
-
-
-/* f_files: Free the files memory
- */
-void f_files()
+/* Free the files memory */
+static void f_files()
{
int i;
- if(!f_sum)
+ if (!f_sum) {
return;
- for(i = 0;;i++)
- {
- if(f_sum[i] == NULL)
+ }
+ for (i = 0;; i++) {
+ if (f_sum[i] == NULL) {
break;
+ }
- if(f_sum[i]->name)
+ if (f_sum[i]->name) {
free(f_sum[i]->name);
+ }
free(f_sum[i]);
f_sum[i] = NULL;
f_sum = NULL;
}
-
-
-/* c_files: Create the structure with the files and checksums
- * Returns void
- */
-void c_files()
+/* Create the structure with the files and checksums */
+static void c_files()
{
DIR *dp;
-
struct dirent *entry;
-
os_md5 md5sum;
-
- int f_size = 0;
-
+ unsigned int f_size = 0;
f_sum = NULL;
-
- /* Creating merged file. */
- os_realloc(f_sum, (f_size +2) * sizeof(file_sum *), f_sum);
+ /* Create 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;
MergeAppendFile(SHAREDCFG_FILE, NULL);
f_size++;
-
-
- /* Opening the directory given */
+ /* Open directory */
dp = opendir(SHAREDCFG_DIR);
- if(!dp)
- {
+ if (!dp) {
merror("%s: Error opening directory: '%s': %s ",
- ARGV0,
- SHAREDCFG_DIR,
- strerror(errno));
+ ARGV0,
+ SHAREDCFG_DIR,
+ strerror(errno));
return;
}
-
- /* Reading directory */
- while((entry = readdir(dp)) != NULL)
- {
+ /* Read directory */
+ while ((entry = readdir(dp)) != NULL) {
char tmp_dir[512];
- /* Just ignore . and .. */
- if((strcmp(entry->d_name,".") == 0) ||
- (strcmp(entry->d_name,"..") == 0))
- {
+ /* Ignore . and .. */
+ if ((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)
- {
+ /* Leave the shared config file for later */
+ if (strcmp(tmp_dir, SHAREDCFG_FILE) == 0) {
continue;
}
-
- if(OS_MD5_File(tmp_dir, md5sum) != 0)
- {
- merror("%s: Error accessing file '%s'",ARGV0, tmp_dir);
+ if (OS_MD5_File(tmp_dir, md5sum, OS_TEXT) != 0) {
+ merror("%s: Error accessing file '%s'", ARGV0, tmp_dir);
continue;
}
-
- f_sum = (file_sum **)realloc(f_sum, (f_size +2) * sizeof(file_sum *));
- if(!f_sum)
- {
- ErrorExit(MEM_ERROR,ARGV0);
+ f_sum = (file_sum **)realloc(f_sum, (f_size + 2) * sizeof(file_sum *));
+ if (!f_sum) {
+ ErrorExit(MEM_ERROR, ARGV0, errno, strerror(errno));
}
- f_sum[f_size] = calloc(1, sizeof(file_sum));
- if(!f_sum[f_size])
- {
- ErrorExit(MEM_ERROR,ARGV0);
+ f_sum[f_size] = (file_sum *) calloc(1, sizeof(file_sum));
+ if (!f_sum[f_size]) {
+ ErrorExit(MEM_ERROR, ARGV0, errno, strerror(errno));
}
-
strncpy(f_sum[f_size]->sum, md5sum, 32);
os_strdup(entry->d_name, f_sum[f_size]->name);
f_sum[f_size]->mark = 0;
-
MergeAppendFile(SHAREDCFG_FILE, tmp_dir);
f_size++;
}
- if(f_sum != NULL)
+ if (f_sum != NULL) {
f_sum[f_size] = NULL;
+ }
closedir(dp);
-
- if(OS_MD5_File(SHAREDCFG_FILE, md5sum) != 0)
- {
- merror("%s: Error accessing file '%s'",ARGV0, SHAREDCFG_FILE);
+ if (OS_MD5_File(SHAREDCFG_FILE, md5sum, OS_TEXT) != 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(SHAREDCFG_FILENAME, f_sum[0]->name);
return;
}
-
-
-/* send_file_toagent: Sends a file to the agent.
+/* Send a file to the agent
* Returns -1 on error
*/
-int send_file_toagent(int agentid, char *name, char *sum)
+static int send_file_toagent(unsigned int agentid, const char *name, const char *sum)
{
- int i = 0, n = 0;
- char file[OS_SIZE_1024 +1];
- char buf[OS_SIZE_1024 +1];
-
+ int i = 0;
+ size_t n = 0;
+ char file[OS_SIZE_1024 + 1];
+ char buf[OS_SIZE_1024 + 1];
FILE *fp;
-
- snprintf(file, OS_SIZE_1024, "%s/%s",SHAREDCFG_DIR, name);
+ snprintf(file, OS_SIZE_1024, "%s/%s", SHAREDCFG_DIR, name);
fp = fopen(file, "r");
- if(!fp)
- {
- merror(FOPEN_ERROR, ARGV0, file);
- return(-1);
+ if (!fp) {
+ merror(FOPEN_ERROR, ARGV0, file, errno, strerror(errno));
+ return (-1);
}
-
- /* Sending the file name first */
+ /* Send the file name first */
snprintf(buf, OS_SIZE_1024, "%s%s%s %s\n",
- CONTROL_HEADER, FILE_UPDATE_HEADER, sum, name);
-
- if(send_msg(agentid, buf) == -1)
- {
- merror(SEC_ERROR,ARGV0);
+ CONTROL_HEADER, FILE_UPDATE_HEADER, sum, name);
+ if (send_msg(agentid, buf) == -1) {
+ merror(SEC_ERROR, ARGV0);
fclose(fp);
- return(-1);
+ return (-1);
}
-
- /* Sending the file content */
- while((n = fread(buf, 1, 900, fp)) > 0)
- {
+ /* Send the file contents */
+ while ((n = fread(buf, 1, 900, fp)) > 0) {
buf[n] = '\0';
- if(send_msg(agentid, buf) == -1)
- {
- merror(SEC_ERROR,ARGV0);
+ if (send_msg(agentid, buf) == -1) {
+ merror(SEC_ERROR, ARGV0);
fclose(fp);
- return(-1);
+ return (-1);
}
/* Sleep 1 every 30 messages -- no flood */
- if(i > 30)
- {
+ if (i > 30) {
sleep(1);
i = 0;
}
i++;
}
-
- /* Sending the message to close the file */
+ /* Send the message to close the file */
snprintf(buf, OS_SIZE_1024, "%s%s", CONTROL_HEADER, FILE_CLOSE_HEADER);
- if(send_msg(agentid, buf) == -1)
- {
- merror(SEC_ERROR,ARGV0);
+ if (send_msg(agentid, buf) == -1) {
+ merror(SEC_ERROR, ARGV0);
fclose(fp);
- return(-1);
+ return (-1);
}
-
fclose(fp);
- return(0);
+ return (0);
}
-
-
-/** void read_contromsg(int agentid, char *msg) v0.2.
- * Reads the available control message from
- * the agent.
- */
-void read_controlmsg(int agentid, char *msg)
+/* Read the available control message from the agent */
+static void read_controlmsg(unsigned int agentid, char *msg)
{
int i;
-
/* Remove uname */
- msg = strchr(msg,'\n');
- if(!msg)
- {
- merror("%s: Invalid message from '%d' (uname)",ARGV0, agentid);
+ msg = strchr(msg, '\n');
+ if (!msg) {
+ merror("%s: Invalid message from '%d' (uname)", ARGV0, agentid);
return;
}
-
*msg = '\0';
msg++;
-
- if(!f_sum)
- {
+ if (!f_sum) {
/* Nothing to share with agent */
return;
}
-
/* Parse message */
- while(*msg != '\0')
- {
+ while (*msg != '\0') {
char *md5;
char *file;
file = msg;
msg = strchr(msg, '\n');
- if(!msg)
- {
+ if (!msg) {
merror("%s: Invalid message from '%s' (strchr \\n)",
- ARGV0,
- keys.keyentries[agentid]->ip->ip);
+ ARGV0,
+ keys.keyentries[agentid]->ip->ip);
break;
}
msg++;
file = strchr(file, ' ');
- if(!file)
- {
+ if (!file) {
merror("%s: Invalid message from '%s' (strchr ' ')",
- ARGV0,
- keys.keyentries[agentid]->ip->ip);
+ ARGV0,
+ keys.keyentries[agentid]->ip->ip);
break;
}
*file = '\0';
file++;
-
- /* New agents only have merged.mg. */
- if(strcmp(file, SHAREDCFG_FILENAME) == 0)
- {
- if(strcmp(f_sum[0]->sum, md5) != 0)
- {
+ /* New agents only have merged.mg */
+ if (strcmp(file, SHAREDCFG_FILENAME) == 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)
- {
+ 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);
+ ARGV0,
+ f_sum[0]->name);
}
}
i = 0;
- while(f_sum[i])
- {
+ while (f_sum[i]) {
f_sum[i]->mark = 0;
i++;
}
return;
}
-
- for(i = 1;;i++)
- {
- if(f_sum[i] == NULL)
+ for (i = 1;; i++) {
+ if (f_sum[i] == NULL) {
break;
+ }
- else if(strcmp(f_sum[i]->name, file) != 0)
+ else if (strcmp(f_sum[i]->name, file) != 0) {
continue;
+ }
- else if(strcmp(f_sum[i]->sum, md5) != 0)
- f_sum[i]->mark = 1; /* Marked to update */
+ else if (strcmp(f_sum[i]->sum, md5) != 0) {
+ f_sum[i]->mark = 1; /* Marked to update */
+ }
- else
- {
+ else {
f_sum[i]->mark = 2;
}
break;
}
}
-
- /* Updating each file marked */
- for(i = 1;;i++)
- {
- if(f_sum[i] == NULL)
+ /* Update each marked file */
+ for (i = 1;; i++) {
+ if (f_sum[i] == NULL) {
break;
+ }
- if((f_sum[i]->mark == 1) ||
- (f_sum[i]->mark == 0))
- {
+ if ((f_sum[i]->mark == 1) ||
+ (f_sum[i]->mark == 0)) {
debug1("%s: Sending file '%s' to agent.", ARGV0, f_sum[i]->name);
- if(send_file_toagent(agentid,f_sum[i]->name,f_sum[i]->sum) < 0)
- {
+ if (send_file_toagent(agentid, f_sum[i]->name, f_sum[i]->sum) < 0) {
merror("%s: Error sending file '%s' to agent.",
- ARGV0,
- f_sum[i]->name);
+ ARGV0,
+ f_sum[i]->name);
}
}
f_sum[i]->mark = 0;
}
-
return;
}
-
-
-/** void *wait_for_msgs(void *none) v0.1
- * Wait for new messages to read.
- * The messages are going to be sent from save_controlmsg.
+/* Wait for new messages to read
+ * The messages will be sent using save_controlmsg
*/
-void *wait_for_msgs(void *none)
+void *wait_for_msgs(__attribute__((unused)) void *none)
{
- int id, i;
- char msg[OS_SIZE_1024 +2];
-
+ int id;
+ char msg[OS_SIZE_1024 + 2];
- /* Initializing the memory */
- memset(msg, '\0', OS_SIZE_1024 +2);
+ /* Initialize the memory */
+ memset(msg, '\0', OS_SIZE_1024 + 2);
-
- /* should never leave this loop */
- while(1)
- {
- /* Every NOTIFY * 30 minutes, re read the files.
+ /* Should never leave this loop */
+ while (1) {
+ unsigned int i;
+ /* Every NOTIFY * 30 minutes, re-read the files
* If something changed, notify all agents
*/
_ctime = time(0);
- if((_ctime - _stime) > (NOTIFY_TIME*30))
- {
+ if ((_ctime - _stime) > (NOTIFY_TIME * 30)) {
f_files();
c_files();
_stime = _ctime;
}
-
- /* locking mutex */
- if(pthread_mutex_lock(&lastmsg_mutex) != 0)
- {
+ /* Lock mutex */
+ if (pthread_mutex_lock(&lastmsg_mutex) != 0) {
merror(MUTEX_ERROR, ARGV0);
- return(NULL);
+ return (NULL);
}
/* If no agent changed, wait for signal */
- if(modified_agentid == -1)
- {
+ if (modified_agentid == -1) {
pthread_cond_wait(&awake_mutex, &lastmsg_mutex);
}
- /* Unlocking mutex */
- if(pthread_mutex_unlock(&lastmsg_mutex) != 0)
- {
+ /* Unlock mutex */
+ if (pthread_mutex_unlock(&lastmsg_mutex) != 0) {
merror(MUTEX_ERROR, ARGV0);
- return(NULL);
+ return (NULL);
}
-
- /* Checking if any agent is ready */
- for(i = 0;i<keys.keysize; i++)
- {
+ /* Check if any agent is ready */
+ for (i = 0; i < keys.keysize; i++) {
/* If agent wasn't changed, try next */
- if(_changed[i] != 1)
- {
+ if (_changed[i] != 1) {
continue;
}
id = 0;
- /* locking mutex */
- if(pthread_mutex_lock(&lastmsg_mutex) != 0)
- {
+ /* Lock mutex */
+ if (pthread_mutex_lock(&lastmsg_mutex) != 0) {
merror(MUTEX_ERROR, ARGV0);
break;
}
- if(_msg[i])
- {
- /* Copying the message to be analyzed */
+ if (_msg[i]) {
+ /* Copy the message to be analyzed */
strncpy(msg, _msg[i], OS_SIZE_1024);
_changed[i] = 0;
- if(modified_agentid >= i)
- {
+ if (modified_agentid >= (int) i) {
modified_agentid = -1;
}
id = 1;
}
- /* Unlocking mutex */
- if(pthread_mutex_unlock(&lastmsg_mutex) != 0)
- {
+ /* Unlock mutex */
+ if (pthread_mutex_unlock(&lastmsg_mutex) != 0) {
merror(MUTEX_ERROR, ARGV0);
break;
}
- if(id)
- {
+ if (id) {
read_controlmsg(i, msg);
}
}
}
- return(NULL);
+ return (NULL);
}
-
-
-/* manager_init: Should be called before anything here */
+/* Should be called before anything here */
void manager_init(int isUpdate)
{
int i;
+
_stime = time(0);
f_files();
debug1("%s: DEBUG: Running manager_init", ARGV0);
- for(i=0; i<MAX_AGENTS +1; i++)
- {
+ modified_agentid = -1;
+
+ for (i = 0; i < MAX_AGENTS + 1; i++) {
_keep_alive[i] = NULL;
_msg[i] = NULL;
_changed[i] = 0;
}
- /* Initializing mutexes */
- if(isUpdate == 0)
- {
+ /* Initialize mutexes */
+ if (isUpdate == 0) {
pthread_mutex_init(&lastmsg_mutex, NULL);
pthread_cond_init(&awake_mutex, NULL);
}
- modified_agentid = -1;
-
return;
}
-
-
-/* EOF */
projects / ossec-hids.git / blobdiff