implement buffered connection logging to improve performance

3 files changed, 28 insertions, 1 deletions

diff --git a/include/buffer.h b/include/buffer.h
new file mode 100644
index 0000000..5b854f3
--- /dev/null
+++ b/include/buffer.h
@@ -0,0 +1,18 @@
+#ifndef _BUFFER_H_
+#define _BUFFER_H_
+
+struct buffer {
+	unsigned char *data;
+	unsigned int size;
+	unsigned int cur_size;
+};
+
+struct buffer *buffer_create(unsigned int size);
+int buffer_add(struct buffer *b, void *data, unsigned int size);
+void buffer_flush(struct buffer *b, 
+		  void (*cb)(void *buffer_data, 
+		  void *data),
+		  void *data);
+unsigned int buffer_size(struct buffer *b);
+
+#endif
diff --git a/include/conntrackd.h b/include/conntrackd.h
index a4a91ea..3bfcf18 100644
--- a/include/conntrackd.h
+++ b/include/conntrackd.h
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h> 
 #include "cache.h"
+#include "buffer.h"
 #include "debug.h"
 #include <signal.h>
 #include "state_helper.h"
@@ -93,6 +94,7 @@ struct ct_conf {
 	struct {
 		char logfile[FILENAME_MAXLEN];
 		int syslog_facility;
+		unsigned int buffer_size;
 	} stats;
 };
 
@@ -136,6 +138,7 @@ struct ct_sync_state {
 
 struct ct_stats_state {
 	struct cache *cache;            /* internal events cache (netlink) */
+	struct buffer *buffer_log;
 };
 
 union ct_state {
diff --git a/include/log.h b/include/log.h
index 467ae8f..b5bbddb 100644
--- a/include/log.h
+++ b/include/log.h
@@ -1,9 +1,15 @@
 #ifndef _LOG_H_
 #define _LOG_H_
 
+#include <stdio.h>
+
+struct buffer;
+struct nf_conntrack;
+
 int init_log();
 void dlog(FILE *fd, int priority, char *format, ...);
-void dlog_ct(FILE *fd, struct nf_conntrack *ct);
+void dlog_buffered_ct(FILE *fd, struct buffer *b, struct nf_conntrack *ct);
+void dlog_buffered_ct_flush(void *buffer_data, void *data);
 void close_log();
 
 #endif