nfq: remove unused queue handler type

diff --git a/src/Makefile.am b/src/Makefile.am
index 75ca465ccdd9129a12bfa8ab90bb693fd427588d..8999f5dac88314ac8f8b0b13931188cdbb712f6b 100755 (executable)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -408,7 +408,6 @@ threads.c threads.h \
 threads-debug.h threads-profile.h \
 tm-modules.c tm-modules.h \
 tmqh-flow.c tmqh-flow.h \
-tmqh-nfq.c tmqh-nfq.h \
 tmqh-packetpool.c tmqh-packetpool.h \
 tmqh-simple.c tmqh-simple.h \
 tm-queuehandlers.c tm-queuehandlers.h \

diff --git a/src/tm-queuehandlers.c b/src/tm-queuehandlers.c
index adf793b595537f3ed8e10633b47836d3a4090bce..862fc7d396aec766b18b1ffc98e000d9cd661545 100644 (file)
--- a/src/tm-queuehandlers.c
+++ b/src/tm-queuehandlers.c
@@ -31,7 +31,6 @@
 
 #include "tm-queuehandlers.h"
 #include "tmqh-simple.h"
-#include "tmqh-nfq.h"
 #include "tmqh-packetpool.h"
 #include "tmqh-flow.h"
 
@@ -40,7 +39,6 @@ void TmqhSetup (void)
     memset(&tmqh_table, 0, sizeof(tmqh_table));
 
     TmqhSimpleRegister();
-    TmqhNfqRegister();
     TmqhPacketpoolRegister();
     TmqhFlowRegister();
 }

diff --git a/src/tm-queuehandlers.h b/src/tm-queuehandlers.h
index 592f1811ac6e6d72b14f34efeebe533ca7410cde..e4dc329db3d55ced3c477845361a159506194da6 100644 (file)
--- a/src/tm-queuehandlers.h
+++ b/src/tm-queuehandlers.h
@@ -26,7 +26,6 @@
 
 enum {
     TMQH_SIMPLE,
-    TMQH_NFQ,
     TMQH_PACKETPOOL,
     TMQH_FLOW,
 

diff --git a/src/tmqh-nfq.c b/src/tmqh-nfq.c
deleted file mode 100644 (file)
index 599dc1d..0000000
--- a/src/tmqh-nfq.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright (C) 2007-2010 Open Information Security Foundation
- *
- * You can copy, redistribute or modify this Program under the terms of
- * the GNU General Public License version 2 as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * version 2 along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-/**
- * \file
- *
- * \author Victor Julien <victor@inliniac.net>
- *
- * NFQ Verdict Handler
- */
-
-#include "suricata-common.h"
-#include "packet-queue.h"
-#include "decode.h"
-#include "threads.h"
-#include "threadvars.h"
-
-#include "tm-queuehandlers.h"
-#include "tmqh-nfq.h"
-
-void TmqhOutputVerdictNfq(ThreadVars *t, Packet *p);
-
-void TmqhNfqRegister (void)
-{
-    tmqh_table[TMQH_NFQ].name = "nfq";
-    tmqh_table[TMQH_NFQ].InHandler = NULL;
-    tmqh_table[TMQH_NFQ].OutHandler = TmqhOutputVerdictNfq;
-}
-
-void TmqhOutputVerdictNfq(ThreadVars *t, Packet *p)
-{
-/* XXX not scaling */
-#if 0
-    PacketQueue *q = &trans_q[p->verdict_q_id];
-
-    SCMutexLock(&q->mutex_q);
-    PacketEnqueue(q, p);
-    SCCondSignal(&q->cond_q);
-    SCMutexUnlock(&q->mutex_q);
-#endif
-}
-

diff --git a/src/tmqh-nfq.h b/src/tmqh-nfq.h
deleted file mode 100644 (file)
index 50884c8..0000000
--- a/src/tmqh-nfq.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (C) 2007-2010 Open Information Security Foundation
- *
- * You can copy, redistribute or modify this Program under the terms of
- * the GNU General Public License version 2 as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * version 2 along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-/**
- * \file
- *
- * \author Victor Julien <victor@inliniac.net>
- */
-
-#ifndef __TMQH_NFQ_H__
-#define __TMQH_NFQ_H__
-
-void TmqhNfqRegister (void);
-
-#endif /* __TMQH_NFQ_H__ */