conntrackd: generalize caching infrastructure

This patch generalizes the caching infrastructure to store different
object types. This patch is the first in the series to prepare
support for the synchronization of expectations.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

1 files changed, 34 insertions, 33 deletions

diff --git a/src/internal_bypass.c b/src/internal_bypass.c
index 1e1478f..8ecec34 100644
--- a/src/internal_bypass.c
+++ b/src/internal_bypass.c
@@ -1,6 +1,7 @@
 /*
- * (C) 2009 by Pablo Neira Ayuso <pablo@netfilter.org>
- * 
+ * (C) 2006-2011 by Pablo Neira Ayuso <pablo@netfilter.org>
+ * (C) 2011 by Vyatta Inc. <http://www.vyatta.com>
+ *
  * 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
  * the Free Software Foundation; either version 2 of the License, or
@@ -16,17 +17,18 @@
 #include "network.h"
 #include "origin.h"
 
-static int _init(void)
+static int internal_bypass_init(void)
 {
 	return 0;
 }
 
-static void _close(void)
+static void internal_bypass_close(void)
 {
 }
 
-static int dump_cb(enum nf_conntrack_msg_type type,
-		   struct nf_conntrack *ct, void *data)
+static int
+internal_bypass_ct_dump_cb(enum nf_conntrack_msg_type type,
+			   struct nf_conntrack *ct, void *data)
 {
 	char buf[1024];
 	int size, *fd = data;
@@ -44,7 +46,7 @@ static int dump_cb(enum nf_conntrack_msg_type type,
 	return NFCT_CB_CONTINUE;
 }
 
-static void dump(int fd, int type)
+static void internal_bypass_ct_dump(int fd, int type)
 {
 	struct nfct_handle *h;
 	u_int32_t family = AF_UNSPEC;
@@ -55,7 +57,7 @@ static void dump(int fd, int type)
 		dlog(LOG_ERR, "can't allocate memory for the internal cache");
 		return;
 	}
-	nfct_callback_register(h, NFCT_T_ALL, dump_cb, &fd);
+	nfct_callback_register(h, NFCT_T_ALL, internal_bypass_ct_dump_cb, &fd);
 	ret = nfct_query(h, NFCT_Q_DUMP, &family);
 	if (ret == -1) {
 		dlog(LOG_ERR, "can't dump kernel table");
@@ -63,7 +65,7 @@ static void dump(int fd, int type)
 	nfct_close(h);
 }
 
-static void flush(void)
+static void internal_bypass_ct_flush(void)
 {
 	nl_flush_conntrack_table(STATE(flush));
 }
@@ -74,7 +76,7 @@ struct {
 	uint32_t	del;
 } internal_bypass_stats;
 
-static void stats(int fd)
+static void internal_bypass_ct_stats(int fd)
 {
 	char buf[512];
 	int size;
@@ -91,25 +93,24 @@ static void stats(int fd)
 }
 
 /* unused, INTERNAL_F_POPULATE is unset. No cache, nothing to populate. */
-static void populate(struct nf_conntrack *ct)
+static void internal_bypass_ct_populate(struct nf_conntrack *ct)
 {
 }
 
 /* unused, INTERNAL_F_RESYNC is unset. */
-static void purge(void)
+static void internal_bypass_ct_purge(void)
 {
 }
 
 /* unused, INTERNAL_F_RESYNC is unset. Nothing to resync, we have no cache. */
-static int resync(enum nf_conntrack_msg_type type,
-		  struct nf_conntrack *ct,
-		  void *data)
+static int
+internal_bypass_ct_resync(enum nf_conntrack_msg_type type,
+			  struct nf_conntrack *ct, void *data)
 {
 	return NFCT_CB_CONTINUE;
 }
 
-static void
-event_new_sync(struct nf_conntrack *ct, int origin)
+static void internal_bypass_ct_event_new(struct nf_conntrack *ct, int origin)
 {
 	struct nethdr *net;
 
@@ -122,8 +123,7 @@ event_new_sync(struct nf_conntrack *ct, int origin)
 	internal_bypass_stats.new++;
 }
 
-static void
-event_update_sync(struct nf_conntrack *ct, int origin)
+static void internal_bypass_ct_event_upd(struct nf_conntrack *ct, int origin)
 {
 	struct nethdr *net;
 
@@ -136,8 +136,7 @@ event_update_sync(struct nf_conntrack *ct, int origin)
 	internal_bypass_stats.upd++;
 }
 
-static int
-event_destroy_sync(struct nf_conntrack *ct, int origin)
+static int internal_bypass_ct_event_del(struct nf_conntrack *ct, int origin)
 {
 	struct nethdr *net;
 
@@ -153,16 +152,18 @@ event_destroy_sync(struct nf_conntrack *ct, int origin)
 }
 
 struct internal_handler internal_bypass = {
-	.init			= _init,
-	.close			= _close,
-	.dump			= dump,
-	.flush			= flush,
-	.stats			= stats,
-	.stats_ext		= stats,
-	.populate		= populate,
-	.purge			= purge,
-	.resync			= resync,
-	.new			= event_new_sync,
-	.update			= event_update_sync,
-	.destroy		= event_destroy_sync,
+	.init			= internal_bypass_init,
+	.close			= internal_bypass_close,
+	.ct = {
+		.dump			= internal_bypass_ct_dump,
+		.flush			= internal_bypass_ct_flush,
+		.stats			= internal_bypass_ct_stats,
+		.stats_ext		= internal_bypass_ct_stats,
+		.populate		= internal_bypass_ct_populate,
+		.purge			= internal_bypass_ct_purge,
+		.resync			= internal_bypass_ct_resync,
+		.new			= internal_bypass_ct_event_new,
+		.upd			= internal_bypass_ct_event_upd,
+		.del			= internal_bypass_ct_event_del,
+	},
 };