From cb0532e5b7a5676a3a1f62a75dbe3d371683f698 Mon Sep 17 00:00:00 2001 From: Eric Leblond Date: Mon, 29 Oct 2012 15:31:35 +0100 Subject: [PATCH] pf_ring: don't set cluster for DNA interface. --- src/source-pfring.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/source-pfring.c b/src/source-pfring.c index 694652c4ee..2d4b8c7de7 100644 --- a/src/source-pfring.c +++ b/src/source-pfring.c @@ -373,18 +373,22 @@ TmEcode ReceivePfringThreadInit(ThreadVars *tv, void *initdata, void **data) { ptv->cluster_id = pfconf->cluster_id; + if ((ptv->threads == 1) && (!strncmp(ptv->interface, "dna", 3))) { + SCLogInfo("DNA interface detected, not adding thread to cluster"); + } else { #ifdef HAVE_PFRING_CLUSTER_TYPE - ptv->ctype = pfconf->ctype; - rc = pfring_set_cluster(ptv->pd, ptv->cluster_id, ptv->ctype); + ptv->ctype = pfconf->ctype; + rc = pfring_set_cluster(ptv->pd, ptv->cluster_id, ptv->ctype); #else - rc = pfring_set_cluster(ptv->pd, ptv->cluster_id); + rc = pfring_set_cluster(ptv->pd, ptv->cluster_id); #endif /* HAVE_PFRING_CLUSTER_TYPE */ - if (rc != 0) { - SCLogError(SC_ERR_PF_RING_SET_CLUSTER_FAILED, "pfring_set_cluster " - "returned %d for cluster-id: %d", rc, ptv->cluster_id); - pfconf->DerefFunc(pfconf); - return TM_ECODE_FAILED; + if (rc != 0) { + SCLogError(SC_ERR_PF_RING_SET_CLUSTER_FAILED, "pfring_set_cluster " + "returned %d for cluster-id: %d", rc, ptv->cluster_id); + pfconf->DerefFunc(pfconf); + return TM_ECODE_FAILED; + } } if (ptv->threads > 1) {