Anoop Saldanha
4f7df1029d
Unify the use of slots to a single struct for threading API. Remove separate slot append functions for 1slot and varslot
14 years ago
Jason Ish
7257fed0f3
Fix bug 288, accept true in output configuration.
...
Refactor a bit to run checks for truth through a common function
that takes yes, true, on and 1 as true values.
14 years ago
Victor Julien
169104a803
Slightly clean up --list-runmodes output.
14 years ago
Anoop Saldanha
e4d890e186
modify runmode api to accept conf runmode paramter as a char string, instead of an interger id
14 years ago
Anoop Saldanha
229f7281ea
list runmodes. Allow specification of runmode id from cof file. Also allow for command line override
14 years ago
Anoop Saldanha
6fceeda8c5
move erf dag runmode into its own file runmode-erf-dag.[ch]
14 years ago
Anoop Saldanha
f51cf34210
move erf file runmode into its own file runmode-erf-file.[ch]
14 years ago
Anoop Saldanha
86eabbc2f5
move ipfw runmode into its own file runmode-ipfw.[ch]
14 years ago
Anoop Saldanha
036015d6b9
move nfq runmode into its own file runmode-nfq.[ch]
14 years ago
Anoop Saldanha
9affa39b29
move pfring runmode into its own file runmode-pfring.[ch]
14 years ago
Anoop Saldanha
e7ac1d7c4c
move pcap file runmode into its own file runmode-pcap-file.[ch]
14 years ago
Anoop Saldanha
f6af567ce0
move pcap live runmode into its own file runmode-pcap.[ch]
14 years ago
Victor Julien
07776c113b
Fix valgrind error on pfring_recv, rename threads from RecvPfring to RxPfring so the name still looks right for 100+ threads. Add --pfring commandline option that just enables pfring, then takes interface from config.
15 years ago
Victor Julien
1c9e48ae98
Fix compilation error on non-pfring systems.
15 years ago
Victor Julien
91f28afef4
Add option to PF_RING to have multiple reader threads. Improve general performance of the PF_RING module.
15 years ago
Eric Leblond
8330747234
Add multi queue support to NFQ run mode
...
This patch adds support for multiple Netfilter queue
in the NFQ run mode. Suricata can now be started on
multiple queue by using a comma separated list of
queue identifier on the command line. The following syntax:
suricata -q 0 -q 1 -c /opt/suricata/etc/suricata.yaml
will start a suricata listening to Netfilter queue 0 and 1.
Signed-off-by: Eric Leblond <eric@regit.org>
15 years ago
Eric Leblond
d0faa6c96e
Fix some spacing.
...
This trivial patch fixes some indentation problems.
Signed-off-by: Eric Leblond <eric@regit.org>
15 years ago
Eric Leblond
88fb3a641e
Delete some commented code in runmodes
...
This patch simply suppress some commented code in runmodes.c.
Signed-off-by: Eric Leblond <eric@regit.org>
15 years ago
Eric Leblond
f9e453e14c
affinity: Use configured 'threads' value if set
...
This patch modifies runmodes to make them use the new 'threads'
variable.
Signed-off-by: Eric Leblond <eric@regit.org>
15 years ago
Eric Leblond
a11e40dedf
Pcapfile mode: support for cpu affinity settings
...
This patch adds support for cpu affinity setting in the pcapfile
runmode.
Signed-off-by: Eric Leblond <eric@regit.org>
15 years ago
Eric Leblond
9d5f08e0d9
Pcap mode: use CPU affinity setting
...
This patch adds support for CPU affinity settings
in pcap mode.
Signed-off-by: Eric Leblond <eric@regit.org>
15 years ago
Eric Leblond
51df6beb26
Convert RunModeIpsNFQAuto to new affinity mode.
...
The default NFQ run mode is now using the new affinity system. It
thus can be configured via suricata.yaml.
Signed-off-by: Eric Leblond <eric@regit.org>
15 years ago
Eric Leblond
77f2b6a7a9
Make runmode parse affinity settings.
...
This patch modifies runmode to parse configuration file related
to affinity settings. It also prepare the export of the
set_cpu_affinity which was previously local. It is now used
in the affinity and tm-threads files.
Signed-off-by: Eric Leblond <eric@regit.org>
15 years ago
Eric Leblond
2011366429
Include affinity in runmodes and threadvars.
...
This small patch add inclusion of util-affinity.h in the
files that will have to use affinity related features.
Signed-off-by: Eric Leblond <eric@regit.org>
15 years ago
Victor Julien
878d3d87db
Add (experimental) support for using multiple pcap devices to acquire packets from. Just passing multiple -i <dev> options on the commandline will activate this. Windows not yet supported.
15 years ago
Victor Julien
3d60e9bfeb
Clean up output.
15 years ago
Anoop Saldanha
05adf2de41
fix live runmode decode TM for cuda
15 years ago
Victor Julien
dec4218d62
Layout updates to NFQ runmode.
15 years ago
Victor Julien
7e49aa7f76
Simplify NFQ runmode reducing the number of threads and thus queues.
15 years ago
Victor Julien
e7cb7c6b97
Make outputs part of the flowpinned threads in the AutoFp runmode.
15 years ago
Victor Julien
1bd2d59253
Merge decode and stream threads in RunModeIdsPcapAuto like in the file runmode. Fix these runmodes not adhering to the cpu affinity setting if CUDA is compiled in.
15 years ago
Victor Julien
b4db93fa94
Remove leftover printf.
15 years ago
Victor Julien
8d737310aa
Use 'simple' queue for cuda too. Fix hanging in cuda mode.
15 years ago
Victor Julien
3c1ae607cf
Fix cuda compilation.
15 years ago
Anoop Saldanha
33f4beb0bc
batching of packets support for cuda b2g mpm. Supported for both 32 and 64 bit platforms
15 years ago
Victor Julien
ec277b292c
Fall back to the old mutex based queue's to see if that fixes an obscure lockup at higher optimization levels in gcc in file pcap mode.
15 years ago
Victor Julien
b67fb5229b
Fix pcap file auto flow pinned runmode (disabled by default).
15 years ago
Victor Julien
6519a86ec7
Move packet pool to ringbuffer, update packet pool api and ringbuffer api. Remove memset usage from PACKET_RECYCLE, add proper cleanup macros.
15 years ago
Victor Julien
c7a744c937
Split ringbuffer queue handler into multiple, for mrsw, srsw, srmw modes.
15 years ago
Victor Julien
012e602c3f
Add a (disabled by default) flow pinned runmode for file pcap.
15 years ago
Anoop Saldanha
bbb5bf5c51
allow counters clubbing for detect TM
15 years ago
Jason MacLulich
835630efbd
Add initial support for reading packets from a DAG card, we only support reading from a single stream at this time.
...
Use the --dag <dagname> cmd line option to specify from which DAG card to read pkts
from.
Issue at the moment with pkts being ejected during shutdown -- at the moment we
ignore any packets that are not of link type Ethernet.
15 years ago
Victor Julien
49d68169ea
Allow the user to disable setting cpu affinity and allow configuring the number of detect threads relative to the number of CPU's/CPU cores.
15 years ago
Victor Julien
2fe77bf65e
Use ringbuffers in the pcap live auto runmode as well.
15 years ago
Victor Julien
53acf08996
Add multi packet reading for pcap live mode. Add a partly lock free multi writer, multi reader ringbuffer.
15 years ago
Victor Julien
4e7df60b2f
Make pcap file mode read multiple packets per 'read'. Update threading model to deal with this.
15 years ago
Victor Julien
a48a767efc
Lockfree ringbuffer wip.
15 years ago
Jason Ish
a93b2e6b84
Support for reading ERF files.
15 years ago
Gerardo Iglesias Galvan
9f4fae5b1a
Fix inconsistent use of dynamic memory allocation
15 years ago
Victor Julien
42c4b5d53c
Use one less thread in pcap file mode. Reduces locking overhead.
15 years ago