aboutsummaryrefslogtreecommitdiffstats
path: root/framework/src/suricata/src/runmode-pfring.c
diff options
context:
space:
mode:
authorAshlee Young <ashlee@wildernessvoice.com>2015-11-24 23:17:00 -0800
committerAshlee Young <ashlee@wildernessvoice.com>2015-11-24 23:17:00 -0800
commit43f0d5031db2a43ecdbee6f7dfda75cef6d4f56e (patch)
treef73f4185f5fe44cc44b823cb6137542be7edc9ef /framework/src/suricata/src/runmode-pfring.c
parent77ce3be7567bd01c66d8ee88a93b485666723501 (diff)
Added apache 2 license verbage
Change-Id: I6a0b484496f7f3ba77c3584f5ab5a1acf353b298 Signed-off-by: Ashlee Young <ashlee@wildernessvoice.com>
Diffstat (limited to 'framework/src/suricata/src/runmode-pfring.c')
-rw-r--r--framework/src/suricata/src/runmode-pfring.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/framework/src/suricata/src/runmode-pfring.c b/framework/src/suricata/src/runmode-pfring.c
index fbbd8c91..f08bdad8 100644
--- a/framework/src/suricata/src/runmode-pfring.c
+++ b/framework/src/suricata/src/runmode-pfring.c
@@ -109,6 +109,7 @@ void *OldParsePfringConfig(const char *iface)
}
strlcpy(pfconf->iface, iface, sizeof(pfconf->iface));
+ pfconf->flags = 0;
pfconf->threads = 1;
pfconf->cluster_id = 1;
#ifdef HAVE_PFRING
@@ -143,6 +144,7 @@ void *OldParsePfringConfig(const char *iface)
SCLogError(SC_ERR_INVALID_ARGUMENT,"Could not get cluster-id from config");
} else {
pfconf->cluster_id = (uint16_t)atoi(tmpclusterid);
+ pfconf->flags |= PFRING_CONF_FLAGS_CLUSTER;
SCLogDebug("Going to use cluster-id %" PRId32, pfconf->cluster_id);
}
@@ -263,6 +265,7 @@ void *ParsePfringConfig(const char *iface)
/* command line value has precedence */
if (ConfGet("pfring.cluster-id", &tmpclusterid) == 1) {
pfconf->cluster_id = (uint16_t)atoi(tmpclusterid);
+ pfconf->flags |= PFRING_CONF_FLAGS_CLUSTER;
SCLogDebug("Going to use command-line provided cluster-id %" PRId32,
pfconf->cluster_id);
} else {
@@ -278,6 +281,7 @@ void *ParsePfringConfig(const char *iface)
"Could not get cluster-id from config");
} else {
pfconf->cluster_id = (uint16_t)atoi(tmpclusterid);
+ pfconf->flags |= PFRING_CONF_FLAGS_CLUSTER;
SCLogDebug("Going to use cluster-id %" PRId32, pfconf->cluster_id);
}
}