aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pf_ring: set cluster_id even if only one thread is used.

Browse Source
pull/71/merge
Eric Leblond 13 years ago committed by Victor Julien
parent 1f92307517
commit cdbc9be1c3
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File

28
src/source-pfring.c
Unescape Escape View File

@ -370,30 +370,30 @@ TmEcode ReceivePfringThreadInit(ThreadVars *tv, void *initdata, void **data) {
/* We only set cluster info if the number of pfring threads is greater than 1 */ /* We only set cluster info if the number of pfring threads is greater than 1 */
ptv->threads = pfconf->threads; ptv->threads = pfconf->threads;
if (ptv->threads > 1) { ptv->cluster_id = pfconf->cluster_id;
ptv->cluster_id = pfconf->cluster_id;
#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) {
SCLogInfo("(%s) Using PF_RING v.%d.%d.%d, interface %s, cluster-id %d", SCLogInfo("(%s) Using PF_RING v.%d.%d.%d, interface %s, cluster-id %d",
tv->name, (version & 0xFFFF0000) >> 16, (version & 0x0000FF00) >> 8, tv->name, (version & 0xFFFF0000) >> 16, (version & 0x0000FF00) >> 8,
version & 0x000000FF, ptv->interface, ptv->cluster_id); version & 0x000000FF, ptv->interface, ptv->cluster_id);
} else { } else {
SCLogInfo("(%s) Using PF_RING v.%d.%d.%d, interface %s, single-pfring-thread", SCLogInfo("(%s) Using PF_RING v.%d.%d.%d, interface %s, cluster-id %d, single-pfring-thread",
tv->name, (version & 0xFFFF0000) >> 16, (version & 0x0000FF00) >> 8, tv->name, (version & 0xFFFF0000) >> 16, (version & 0x0000FF00) >> 8,
version & 0x000000FF, ptv->interface); version & 0x000000FF, ptv->interface, ptv->cluster_id);
} }
#ifdef HAVE_PFRING_SET_BPF_FILTER #ifdef HAVE_PFRING_SET_BPF_FILTER

Write Preview
Loading…
Cancel
Save