From e6732c96ffd9baaaa84dab763ff6e600bf6abc95 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Sun, 25 Jan 2009 17:51:09 +0100
Subject: cache: remove nl_exist_conntrack() function

This function is a synonimous of nl_get_conntrack(), use the get
function instead.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 src/cache_wt.c |  2 +-
 src/netlink.c  | 15 ++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/cache_wt.c b/src/cache_wt.c
index 84a816f..4b67e8e 100644
--- a/src/cache_wt.c
+++ b/src/cache_wt.c
@@ -30,7 +30,7 @@ static void add_wt(struct cache_object *obj)
 	char __ct[nfct_maxsize()];
 	struct nf_conntrack *ct = (struct nf_conntrack *)(void*) __ct;
 
-	ret = nl_exist_conntrack(STATE(request), obj->ct);
+	ret = nl_get_conntrack(STATE(request), obj->ct);
 	switch (ret) {
 	case -1:
 		dlog(LOG_ERR, "cache_wt problem: %s", strerror(errno));
diff --git a/src/netlink.c b/src/netlink.c
index 15a30f6..e538aa0 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -178,8 +178,8 @@ int nl_send_resync(struct nfct_handle *h)
 	return nfct_send(h, NFCT_Q_DUMP, &family);
 }
 
-static int
-__nl_get_conntrack(struct nfct_handle *h, const struct nf_conntrack *ct)
+/* if the handle has no callback, check for existence, otherwise, update */
+int nl_get_conntrack(struct nfct_handle *h, const struct nf_conntrack *ct)
 {
 	int ret;
 	char __tmp[nfct_maxsize()];
@@ -197,17 +197,6 @@ __nl_get_conntrack(struct nfct_handle *h, const struct nf_conntrack *ct)
 	return 1;
 }
 
-int nl_exist_conntrack(struct nfct_handle *h, const struct nf_conntrack *ct)
-{
-	return __nl_get_conntrack(h, ct);
-}
-
-/* get the conntrack and update the cache */
-int nl_get_conntrack(struct nfct_handle *h, const struct nf_conntrack *ct)
-{
-	return __nl_get_conntrack(h, ct);
-}
-
 int nl_create_conntrack(struct nfct_handle *h, const struct nf_conntrack *orig)
 {
 	int ret;
-- 
cgit v1.2.3