From: Eric Leblond <eric@regit.org>
Date: Mon, 29 Oct 2012 14:31:35 +0000 (+0100)
Subject: pf_ring: don't set cluster for DNA interface.
X-Git-Tag: suricata-1.4beta3~51
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d3195b0f70e62c605a8beb9f0f762373eda7f2d3;p=thirdparty%2Fsuricata.git

pf_ring: don't set cluster for DNA interface.
---

diff --git a/src/source-pfring.c b/src/source-pfring.c
index f67a84ca1f..b02de9d3bc 100644
--- a/src/source-pfring.c
+++ b/src/source-pfring.c
@@ -394,18 +394,22 @@ TmEcode ReceivePfringThreadInit(ThreadVars *tv, void *initdata, void **data) {
 
     ptv->cluster_id = pfconf->cluster_id;
 
+    if ((ptv->threads == 1) && (strncmp(ptv->interface, "dna", 3) == 0)) {
+        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) {