[prelude-cvslog] r9576 - prelude-lml/trunk/src
noreply at prelude-ids.org
noreply at prelude-ids.org
Mon Jun 11 14:56:41 CEST 2007
Author: yoann
Date: 2007-06-11 14:56:39 +0200 (Mon, 11 Jun 2007)
New Revision: 9576
Modified:
prelude-lml/trunk/src/prelude-lml.c
Log:
Whitespace police.
Modified: prelude-lml/trunk/src/prelude-lml.c
===================================================================
--- prelude-lml/trunk/src/prelude-lml.c 2007-06-11 11:32:28 UTC (rev 9575)
+++ prelude-lml/trunk/src/prelude-lml.c 2007-06-11 12:56:39 UTC (rev 9576)
@@ -6,7 +6,7 @@
* This file is part of the Prelude-LML program.
*
* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
+* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
@@ -92,7 +92,7 @@
double tdiv;
tdiv = (end->tv_sec + (double) end->tv_usec / 1000000) - (start.tv_sec + (double) start.tv_usec / 1000000);
-
+
prelude_log(PRELUDE_LOG_WARN, "%s%lu line processed in %.2f seconds (%.2f EPS), %lu alert emited.\n",
prefix, config.line_processed, tdiv, config.line_processed / tdiv, config.alert_count);
}
@@ -101,17 +101,17 @@
static RETSIGTYPE sig_handler(int signum)
{
- got_signal = signum;
+ got_signal = signum;
}
static void handle_signal(void)
{
size_t i;
-
+
for ( i = 0; i < config.udp_nserver; i++ )
udp_server_close(config.udp_server[i]);
-
+
exit(2);
}
@@ -120,7 +120,7 @@
static void handle_sigquit(void)
{
struct timeval end;
-
+
gettimeofday(&end, NULL);
print_stats("statistics signal received: ", &end);
}
@@ -132,15 +132,15 @@
int ret;
size_t i;
prelude_string_t *buf;
-
+
ret = prelude_string_new(&buf);
if ( ret < 0 )
return global_argv[0];
-
+
for ( i = 0; global_argv[i] != NULL; i++ ) {
if ( ! prelude_string_is_empty(buf) )
prelude_string_cat(buf, " ");
-
+
prelude_string_cat(buf, global_argv[i]);
}
@@ -148,7 +148,7 @@
}
-static void handle_sighup(void)
+static void handle_sighup(void)
{
int ret;
size_t i;
@@ -158,7 +158,7 @@
*/
for ( i = 0; i < config.udp_nserver; i++ )
udp_server_close(config.udp_server[i]);
-
+
/*
* Here we go !
*/
@@ -174,7 +174,7 @@
void _lml_handle_signal_if_needed(void)
{
int signo;
-
+
if ( ! got_signal )
return;
@@ -185,22 +185,22 @@
prelude_log(PRELUDE_LOG_WARN, "signal %d received, restarting (%s).\n", signo, get_restart_string());
handle_sighup();
}
-
+
if ( signo == SIGQUIT || signo == SIGUSR1 ) {
handle_sigquit();
return;
}
-
+
prelude_log(PRELUDE_LOG_WARN, "signal %d received, terminating prelude-lml.\n", signo);
handle_signal();
}
-static void regex_match_cb(void *plugin, void *data)
+static void regex_match_cb(void *plugin, void *data)
{
struct regex_data *rdata = data;
-
+
log_plugin_run(plugin, rdata->log_source, rdata->log_entry);
}
@@ -221,18 +221,18 @@
{
struct regex_data rdata;
lml_log_entry_t *log_entry;
-
+
prelude_log_debug(3, "[LOG] %s\n", str);
log_entry = lml_log_entry_new();
if ( ! log_entry )
return;
-
+
lml_log_entry_set_log(log_entry, ls, str, size);
rdata.log_source = ls;
rdata.log_entry = log_entry;
-
+
regex_exec(lml_log_source_get_regex_list(ls), ®ex_match_cb, &rdata,
lml_log_entry_get_message(log_entry), lml_log_entry_get_message_len(log_entry));
@@ -241,61 +241,61 @@
-static void wait_for_event(void)
+static void wait_for_event(void)
{
int ret;
size_t i;
fd_set fds;
struct timeval tv, lstart, end;
int file_event_fd, udp_event_fd, max = 0;
-
+
FD_ZERO(&fds);
- file_event_fd = file_server_get_event_fd();
+ file_event_fd = file_server_get_event_fd();
if ( file_event_fd >= 0 ) {
max = file_event_fd;
FD_SET(file_event_fd, &fds);
}
-
+
for ( i = 0; i < config.udp_nserver; i++ ) {
udp_event_fd = udp_server_get_event_fd(config.udp_server[i]);
-
+
FD_SET(udp_event_fd, &fds);
max = MAX(max, udp_event_fd);
}
gettimeofday(&start, NULL);
gettimeofday(&lstart, NULL);
-
+
while ( 1 ) {
_lml_handle_signal_if_needed();
-
+
tv.tv_sec = 1;
tv.tv_usec = 0;
-
+
ret = select(max + 1, &fds, NULL, NULL, &tv);
if ( ret < 0 ) {
if ( errno == EINTR )
continue;
-
+
prelude_log(PRELUDE_LOG_ERR, "select returned an error: %s.\n", strerror(errno));
break;
}
-
+
gettimeofday(&end, NULL);
-
+
if ( ret == 0 || end.tv_sec - lstart.tv_sec >= 1 ) {
gettimeofday(&lstart, NULL);
prelude_timer_wake_up();
-
+
if ( file_event_fd < 0 )
file_server_wake_up();
}
for ( i = 0; i < config.udp_nserver; i++ ) {
udp_event_fd = udp_server_get_event_fd(config.udp_server[i]);
-
- if ( FD_ISSET(udp_event_fd, &fds) )
+
+ if ( FD_ISSET(udp_event_fd, &fds) )
udp_server_process_event(config.udp_server[i]);
else
FD_SET(udp_event_fd, &fds);
@@ -303,7 +303,7 @@
if ( file_event_fd < 0 )
continue;
-
+
if ( FD_ISSET(file_event_fd, &fds) )
file_server_wake_up();
else
@@ -318,7 +318,7 @@
int ret;
struct timeval end;
struct sigaction action;
-
+
/*
* make sure we ignore sighup until acceptable.
*/
@@ -326,26 +326,26 @@
action.sa_handler = SIG_IGN;
sigemptyset(&action.sa_mask);
sigaction(SIGHUP, &action, NULL);
-
+
memset(&start, 0, sizeof(start));
memset(&end, 0, sizeof(end));
-
+
prelude_init(&argc, argv);
global_argv = argv;
-
+
PRELUDE_PLUGIN_SET_PRELOADED_SYMBOLS();
-
+
ret = prelude_option_new_root(&lml_root_optlist);
if ( ret < 0 )
return ret;
-
+
ret = log_plugins_init(LOG_PLUGIN_DIR, lml_root_optlist);
if (ret < 0) {
prelude_log(PRELUDE_LOG_WARN, "error initializing logs plugins.\n");
return -1;
}
prelude_log_debug(1, "- Initialized %d logs plugins.\n", ret);
-
+
ret = lml_options_init(lml_root_optlist, argc, argv);
if ( ret < 0 )
exit(1);
@@ -356,7 +356,7 @@
action.sa_flags = 0;
sigemptyset(&action.sa_mask);
action.sa_handler = sig_handler;
-
+
#ifdef SA_INTERRUPT
action.sa_flags |= SA_INTERRUPT;
#endif
@@ -368,7 +368,7 @@
sigaction(SIGUSR1, &action, NULL);
sigaction(SIGQUIT, &action, NULL);
sigaction(SIGHUP, &action, NULL);
-
+
file_server_start_monitoring();
/*
@@ -380,20 +380,20 @@
wait_for_event();
else {
gettimeofday(&start, NULL);
-
+
do {
_lml_handle_signal_if_needed();
ret = file_server_wake_up();
-
+
if ( ! config.batch_mode )
sleep(1);
-
+
prelude_timer_wake_up();
-
+
} while ( ! config.batch_mode || ret > 0 );
gettimeofday(&end, NULL);
-
+
/*
* only call prelude_client_destroy in case we are running in batch
* mode, causing an heartbeat to be sent to notice of a normal exit.
@@ -403,6 +403,6 @@
print_stats("- ", &end);
}
-
+
return 0;
}
More information about the Prelude-cvslog
mailing list