pf_ring: don't set cluster for DNA interface.

pull/161/merge
Eric Leblond 13 years ago committed by Victor Julien
parent 7a7cd6999e
commit d3195b0f70

@ -394,18 +394,22 @@ TmEcode ReceivePfringThreadInit(ThreadVars *tv, void *initdata, void **data) {
ptv->cluster_id = pfconf->cluster_id; 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 #ifdef HAVE_PFRING_CLUSTER_TYPE
ptv->ctype = pfconf->ctype; ptv->ctype = pfconf->ctype;
rc = pfring_set_cluster(ptv->pd, ptv->cluster_id, ptv->ctype); rc = pfring_set_cluster(ptv->pd, ptv->cluster_id, ptv->ctype);
#else #else
rc = pfring_set_cluster(ptv->pd, ptv->cluster_id); rc = pfring_set_cluster(ptv->pd, ptv->cluster_id);
#endif /* HAVE_PFRING_CLUSTER_TYPE */ #endif /* HAVE_PFRING_CLUSTER_TYPE */
if (rc != 0) { if (rc != 0) {
SCLogError(SC_ERR_PF_RING_SET_CLUSTER_FAILED, "pfring_set_cluster " SCLogError(SC_ERR_PF_RING_SET_CLUSTER_FAILED, "pfring_set_cluster "
"returned %d for cluster-id: %d", rc, ptv->cluster_id); "returned %d for cluster-id: %d", rc, ptv->cluster_id);
pfconf->DerefFunc(pfconf); pfconf->DerefFunc(pfconf);
return TM_ECODE_FAILED; return TM_ECODE_FAILED;
}
} }
if (ptv->threads > 1) { if (ptv->threads > 1) {

Loading…
Cancel
Save