summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2009-06-10 01:45:43 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2009-06-10 01:45:43 +0200
commitc72da10b9b1193f7ecb84a5db7dbf943891b9e96 (patch)
treee8e3c34207ef4ce9bbc5599c1b393c58c3eff9fa
parent4e60aa36a78532d5b2675ec054f3c9abca0e933d (diff)
downloadconntrack-tools-c72da10b9b1193f7ecb84a5db7dbf943891b9e96.tar.gz
conntrack-tools-c72da10b9b1193f7ecb84a5db7dbf943891b9e96.zip
conntrackd: remove unused request nfct handler
This patch is a cleanup, it removes an unused nfct handler. This removal is due to recent commits that has obsolete it. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--include/conntrackd.h1
-rw-r--r--src/run.c10
2 files changed, 0 insertions, 11 deletions
diff --git a/include/conntrackd.h b/include/conntrackd.h
index 5a9e385..0546855 100644
--- a/include/conntrackd.h
+++ b/include/conntrackd.h
@@ -119,7 +119,6 @@ struct ct_general_state {
int event_iterations_limit;
struct nfct_handle *dump; /* dump handler */
- struct nfct_handle *request; /* request handler */
struct nfct_handle *resync; /* resync handler */
struct nfct_handle *get; /* get handler */
int get_retval; /* hackish */
diff --git a/src/run.c b/src/run.c
index 990b202..21ff715 100644
--- a/src/run.c
+++ b/src/run.c
@@ -47,7 +47,6 @@ void killer(int foo)
nfct_close(STATE(resync));
nfct_close(STATE(get));
- nfct_close(STATE(request));
if (STATE(us_filter))
ct_filter_destroy(STATE(us_filter));
@@ -408,15 +407,6 @@ init(void)
}
nfct_callback_register(STATE(get), NFCT_T_ALL, get_handler, NULL);
- /* no callback, it does not do anything with the output */
- STATE(request) = nfct_open(CONNTRACK, 0);
- if (STATE(request) == NULL) {
- dlog(LOG_ERR, "can't open netlink handler: %s",
- strerror(errno));
- dlog(LOG_ERR, "no ctnetlink kernel support?");
- return -1;
- }
-
if (CONFIG(flags) & CTD_POLL) {
init_alarm(&STATE(polling_alarm), NULL, do_polling_alarm);
add_alarm(&STATE(polling_alarm), CONFIG(poll_kernel_secs), 0);