o add support for connection logging to the statistics mode via Logfile

o minor irrelevant fixes for uncommon error paths and fix several typos
o use LOG_INFO for connection logging, use LOG_NOTICE for other information
o minor error handling updates

2 files changed, 9 insertions, 4 deletions

diff --git a/include/conntrackd.h b/include/conntrackd.h
index 1bb3879..e5b8a4e 100644
--- a/include/conntrackd.h
+++ b/include/conntrackd.h
@@ -31,6 +31,7 @@
 #define DEFAULT_CONFIGFILE	"/etc/conntrackd/conntrackd.conf"
 #define DEFAULT_LOCKFILE	"/var/lock/conntrackd.lock"
 #define DEFAULT_LOGFILE		"/var/log/conntrackd.log"
+#define DEFAULT_STATS_LOGFILE	"/var/log/conntrackd-stats.log"
 #define DEFAULT_SYSLOG_FACILITY	LOG_DAEMON
 
 enum {
@@ -87,6 +88,10 @@ struct ct_conf {
 	unsigned int resend_buffer_size;/* FTFW protocol */
 	unsigned int window_size;
 	int cache_write_through;
+	struct {
+		char logfile[FILENAME_MAXLEN];
+		int syslog_facility;
+	} stats;
 };
 
 #define STATE(x) st.x
@@ -94,6 +99,7 @@ struct ct_conf {
 struct ct_general_state {
 	sigset_t 			block;
 	FILE 				*log;
+	FILE				*stats_log;
 	int 				local;
 	struct ct_mode 			*mode;
 	struct ignore_pool		*ignore_pool;
diff --git a/include/log.h b/include/log.h
index f6f450c..467ae8f 100644
--- a/include/log.h
+++ b/include/log.h
@@ -1,10 +1,9 @@
 #ifndef _LOG_H_
 #define _LOG_H_
 
-#include <stdio.h>
-
-FILE *init_log(char *filename);
+int init_log();
 void dlog(FILE *fd, int priority, char *format, ...);
-void close_log(FILE *fd);
+void dlog_ct(FILE *fd, struct nf_conntrack *ct);
+void close_log();
 
 #endif