]> git.ipfire.org Git - thirdparty/suricata.git/log
thirdparty/suricata.git
8 years agotemplate script: use bash and require ed 2516/head
Jason Ish [Thu, 19 Jan 2017 15:28:45 +0000 (09:28 -0600)] 
template script: use bash and require ed

For now these scripts only work in bash, and the "ed" program
is required.

8 years agotemplates: require the protocol name to start with a capital
Jason Ish [Fri, 18 Nov 2016 16:53:25 +0000 (10:53 -0600)] 
templates: require the protocol name to start with a capital

When running ./setup-app-layer.sh require the protocol name to
start with a capital letter so it looks somewhat like a proper
name. This will help give better function names.

For example:

   ./setup-app-layer.sh IRC
   ./setup-app-layer.sh Irc

will create function names starting with IRC or Irc. But we do
not want function names to start with "irc".

8 years agoconfigure: prevent combination of unittests and debug-validation
Andreas Herz [Thu, 19 Jan 2017 22:48:59 +0000 (23:48 +0100)] 
configure: prevent combination of unittests and debug-validation

8 years agodoc: add documentation for Lua SCFlowHasAlerts
Mats Klepsland [Fri, 13 Jan 2017 10:50:35 +0000 (11:50 +0100)] 
doc: add documentation for Lua SCFlowHasAlerts

8 years agooutput-json-flow: add has_alerts field
Mats Klepsland [Fri, 13 Jan 2017 10:46:59 +0000 (11:46 +0100)] 
output-json-flow: add has_alerts field

Add has_alerts field to flow eve-log to indicate if a flow has
any alerts or not.

8 years agolua: add SCFlowHasAlerts function
Mats Klepsland [Fri, 13 Jan 2017 10:08:55 +0000 (11:08 +0100)] 
lua: add SCFlowHasAlerts function

Add SCFlowHasAlerts() to check if a flow has alerts. Returns true
on alerts, false otherwise.

Example:

  has_alerts = SCFlowHasAlerts()
  if has_alerts then
    -- do something
  end

8 years agoflow: set flag to indicate that a flow has alerts
Mats Klepsland [Fri, 13 Jan 2017 10:03:55 +0000 (11:03 +0100)] 
flow: set flag to indicate that a flow has alerts

Set FLOW_HAS_ALERTS flag on the flow on alerts. Add FlowHasAlerts(..)
and FlowSetHasAlertsFlag(..) to check and set this flag.

8 years agoutil-file: introduce new functions for file size 2514/head
Eric Leblond [Thu, 19 Jan 2017 18:52:41 +0000 (10:52 -0800)] 
util-file: introduce new functions for file size

This patch introduces the FileDataSize and FileTrackedSize functions.
The first one is just a renaming of the initial FilSize function
whereas the other one is using the newly introduced size field as
value.

8 years agooutput-json-file: use size instead of FileSize
Eric Leblond [Wed, 18 Jan 2017 19:09:29 +0000 (11:09 -0800)] 
output-json-file: use size instead of FileSize

FileSize is not returning the actual value when file store is not
used.

8 years agoutil-file: change file size computation
Eric Leblond [Wed, 18 Jan 2017 19:08:21 +0000 (11:08 -0800)] 
util-file: change file size computation

The file size returned by FileSize is invalid if file store is not
used so we introduce a new size field in File structure that is used
to store the size.

8 years agoBug #2009: added CAP_NET_ADMIN for PCAP and af-packet modes.
Alexander Gozman [Thu, 19 Jan 2017 10:31:38 +0000 (13:31 +0300)] 
Bug #2009: added CAP_NET_ADMIN for PCAP and af-packet modes.

Without this capability suricata is unable to get network
interface's settings.

8 years agopcap-log: fix pcre_study error check
Jason Ish [Thu, 19 Jan 2017 05:23:11 +0000 (23:23 -0600)] 
pcap-log: fix pcre_study error check

Code was failing on a NULL return value which can be returned
when there was nothing todo instead of an error. Instead
check the errbuf for a non-NULL value to determine error.

8 years agodoc: napatech formatting fixes
Victor Julien [Tue, 17 Jan 2017 15:28:49 +0000 (16:28 +0100)] 
doc: napatech formatting fixes

8 years agodoc: add napatech to userguide
Victor Julien [Tue, 17 Jan 2017 15:07:37 +0000 (16:07 +0100)] 
doc: add napatech to userguide

8 years agodoc: initial Napatech documentation
Peter Sanders [Fri, 9 Dec 2016 20:18:47 +0000 (15:18 -0500)] 
doc: initial Napatech documentation

8 years agoapp-layer-detect-proto.c: fix indent
Jason Ish [Wed, 18 Jan 2017 15:32:23 +0000 (09:32 -0600)] 
app-layer-detect-proto.c: fix indent

A recent commit was outdented by 1 column.

8 years agoapp-layer - fix secondary probing parser logic
Jason Ish [Wed, 18 Jan 2017 15:30:48 +0000 (09:30 -0600)] 
app-layer - fix secondary probing parser logic

Apply the same logic to pe2 as pe1 for determining which
probe to call. Missed in previous commit.

8 years agohyperscan: fix minor coverity issue in error path
Victor Julien [Wed, 18 Jan 2017 14:13:40 +0000 (15:13 +0100)] 
hyperscan: fix minor coverity issue in error path

*** CID 1398951:  API usage errors  (LOCK)
/src/util-mpm-hs.c: 722 in SCHSPreparePatterns()
716         SCMutexUnlock(&g_db_table_mutex);
717
718         SCHSFreeCompileData(cd);
719         return 0;
720
721     error:
>>>     CID 1398951:  API usage errors  (LOCK)
>>>     "pthread_mutex_unlock" unlocks "g_db_table_mutex" while it is unlocked.
722         SCMutexUnlock(&g_db_table_mutex);
723         if (pd) {
724             PatternDatabaseFree(pd);
725         }
726         if (cd) {

8 years agosmb: add tcp/445 to proto detect fallback 2501/head
Victor Julien [Wed, 18 Jan 2017 10:37:25 +0000 (11:37 +0100)] 
smb: add tcp/445 to proto detect fallback

8 years agosmb: detect protocol in both directions
Victor Julien [Wed, 18 Jan 2017 10:36:33 +0000 (11:36 +0100)] 
smb: detect protocol in both directions

8 years agotx logging: only update logged tx id if all loggers logged 2499/head
Jason Ish [Mon, 9 Jan 2017 22:11:08 +0000 (16:11 -0600)] 
tx logging: only update logged tx id if all loggers logged

Prevents the case where the logged id is incremented if a newer
transaction is complete and an older one is still outstanding.

For example, dns request0, unsolicited dns response, dns response0

would result in the valid response0 never being logged.

Similarily this could happen for:
  request0, request1, response1, response0

which would end up having request0, request1 and response1 logged,
but response0 would not be logged.

8 years agoutil-file: fix error logic in hash computation
Eric Leblond [Tue, 17 Jan 2017 20:59:51 +0000 (12:59 -0800)] 
util-file: fix error logic in hash computation

This patch fixes an issue with hash computation resulting in the
invalidity of at least one hash when at least two different hashes
functions were used.

Impact was setting as `force-hash: [md5, sha256]` not to be valid.
Also it could lead to false negative if too different hash functions
had to be used on a single file due to signatures.

8 years agounix-socket: fix shadowed variable 2495/head
Jason Ish [Tue, 17 Jan 2017 21:48:33 +0000 (15:48 -0600)] 
unix-socket: fix shadowed variable

ret does not need to be redefined here, the existing
declaration of ret can be used.

8 years agotravis: export CFLAGS on linux
Jason Ish [Tue, 17 Jan 2017 21:39:15 +0000 (15:39 -0600)] 
travis: export CFLAGS on linux

8 years agotravis: add a build with -DNDEBUG
Jason Ish [Tue, 17 Jan 2017 21:31:25 +0000 (15:31 -0600)] 
travis: add a build with -DNDEBUG

8 years agoaddress parsing: fix memory leak in error path 2494/head
Victor Julien [Wed, 11 Jan 2017 14:36:15 +0000 (15:36 +0100)] 
address parsing: fix memory leak in error path

8 years agossl: suppress scan-build warnings
Victor Julien [Wed, 11 Jan 2017 14:32:45 +0000 (15:32 +0100)] 
ssl: suppress scan-build warnings

8 years agooutput: clean up output function
Victor Julien [Wed, 11 Jan 2017 14:20:25 +0000 (15:20 +0100)] 
output: clean up output function

Don't allocate memory per call.

8 years agosmb/dcerpc: suppress scan-build warnings
Victor Julien [Wed, 11 Jan 2017 13:55:34 +0000 (14:55 +0100)] 
smb/dcerpc: suppress scan-build warnings

8 years agoac-bs: fix scan-build warnings
Victor Julien [Wed, 11 Jan 2017 13:55:13 +0000 (14:55 +0100)] 
ac-bs: fix scan-build warnings

8 years agoqueue: add debug assertions to TAILQ
Victor Julien [Wed, 11 Jan 2017 13:34:41 +0000 (14:34 +0100)] 
queue: add debug assertions to TAILQ

To avoid scan-build fp's add assertions that are only active if
built with scan-build.

8 years agoyaml: update commented rule files
Travis Green [Wed, 21 Dec 2016 15:56:15 +0000 (08:56 -0700)] 
yaml: update commented rule files

Disabled scada.rules, added commented rule file names to help
administrators find informational rule files.

8 years agotls-store: fix bug that causes Suricata to crash
Mats Klepsland [Thu, 22 Dec 2016 07:38:46 +0000 (08:38 +0100)] 
tls-store: fix bug that causes Suricata to crash

Fix bug that causes Suricata to crash when the tls.store keyword is used.

*** Error in `/usr/bin/suricata': free(): invalid next size (fast):
0x00007fd4b4373180 ***

8 years agoproto detect - fix coverity CID 1204325 2489/head
Jason Ish [Mon, 16 Jan 2017 16:44:19 +0000 (10:44 -0600)] 
proto detect - fix coverity CID 1204325

CID 1204325 (#1 of 1): Logically dead code (DEADCODE)
dead_error_line: Execution cannot reach this statement: mask = 0U;.
433        mask = 0;

additionally, mask is initialized to 0

8 years agotemplate logger - fix coverity CID 1324964
Jason Ish [Mon, 16 Jan 2017 16:38:08 +0000 (10:38 -0600)] 
template logger - fix coverity CID 1324964

null: At condition templatejs != NULL, the value of templatejs must be
NULL.
dead_error_condition: The condition templatejs != NULL cannot be true.
113    if (templatejs != NULL) {
CID 1324964 (#1 of 1): Logically dead code (DEADCODE)
dead_error_line: Execution cannot reach this statement:
json_decref(templatejs);.
114        json_decref(templatejs);
115    }

8 years agodns (tcp) - fix coverity CIDs 1374306, 1374305
Jason Ish [Mon, 16 Jan 2017 16:34:19 +0000 (10:34 -0600)] 
dns (tcp) - fix coverity CIDs 13743061374305

CID 1374306 (#1 of 1): Dereference before null check (REVERSE_INULL)
check_after_deref: Null-checking dns_state suggests that it may be null,
but it has already been dereferenced on all paths leading to the check.
585    if (dns_state != NULL && f != NULL) {
586        dns_state->last_req = f->lastts;
587    }

CID 1374305 (#1 of 1): Dereference before null check (REVERSE_INULL)
check_after_deref: Null-checking dns_state suggests that it may be null,
but it has already been dereferenced on all paths leading to the check.
366    if (dns_state != NULL && f != NULL) {
367        dns_state->last_req = f->lastts;
368    }

8 years agodns (tcp) - fix coverity cid 1374307
Jason Ish [Mon, 16 Jan 2017 16:31:01 +0000 (10:31 -0600)] 
dns (tcp) - fix coverity cid 1374307

CID 1374307 (#1 of 1): Dereference before null check (REVERSE_INULL)
check_after_deref: Null-checking dns_state suggests that it may be null,
but it has already been dereferenced on all paths leading to the check.
317    if (dns_state != NULL && f != NULL) {
318        dns_state->last_resp = f->lastts;
319    }

8 years agodetect-parse: simplify port prefiltering
Eric Leblond [Tue, 10 Jan 2017 22:46:48 +0000 (14:46 -0800)] 
detect-parse: simplify port prefiltering

Regular expression was not matching some authorized setting like
"![1234, 1235]". This patch simplify the regexp to match on
possible character and let the port parsing code handle the
complete verification.

8 years agodns: increment tx id when allocated during response
Jason Ish [Mon, 9 Jan 2017 21:13:16 +0000 (15:13 -0600)] 
dns: increment tx id when allocated during response

8 years agocommon: improve BUG_ON
Victor Julien [Mon, 16 Jan 2017 15:00:25 +0000 (16:00 +0100)] 
common: improve BUG_ON

When BUG_ON is a wrapper for assert(), we risk getting rid of certain
code lines. Assert is a no-op when NDEBUG is defined.

This patch defines an alternate path for BUG_ON that exits after
printing an error.

Bug #2003.

8 years agodecode-icmpv6: add missing types
Andreas Herz [Fri, 13 Jan 2017 22:44:57 +0000 (23:44 +0100)] 
decode-icmpv6: add missing types

There have been some ICMPv6 types missing within the DecodeICMPV6 that
are added by this commit and the code check is adjusted to always use
the DEFINE.

8 years agodns (tcp): register a to_client (response) probing parser 2484/head
Jason Ish [Tue, 20 Dec 2016 21:37:33 +0000 (15:37 -0600)] 
dns (tcp): register a to_client (response) probing parser

Just a minimal parser to make sure the data contains at
least a header.

8 years agoapp-layer: support to server and to client probing parsers
Jason Ish [Tue, 20 Dec 2016 20:50:58 +0000 (14:50 -0600)] 
app-layer: support to server and to client probing parsers

When registering a probing parser allow to_server and
to_client parsers to be registered. Previously the
probing parser may be called for both directions which
in some cases works OK, but in others can cause
the to_client side to be detected as failed.

8 years agoredis: support for all output types 2467/head
Victor Julien [Tue, 22 Nov 2016 20:46:20 +0000 (21:46 +0100)] 
redis: support for all output types

8 years agoredis: use 'binary' notation for output
Victor Julien [Tue, 22 Nov 2016 17:04:29 +0000 (18:04 +0100)] 
redis: use 'binary' notation for output

8 years agocommon: add WARN_UNUSED macro
Victor Julien [Thu, 15 Dec 2016 15:17:33 +0000 (16:17 +0100)] 
common: add WARN_UNUSED macro

8 years agodetect: remove dead code
Victor Julien [Wed, 14 Dec 2016 13:24:44 +0000 (14:24 +0100)] 
detect: remove dead code

8 years agoutil-magic: fix build when magic is not available
Eric Leblond [Tue, 20 Dec 2016 09:43:07 +0000 (10:43 +0100)] 
util-magic: fix build when magic is not available

If HAVE_MAGIC is not defined then we don't have the test functions
so we can't register them.

8 years agodoc: initial xbits documentation
Victor Julien [Fri, 14 Oct 2016 15:29:54 +0000 (17:29 +0200)] 
doc: initial xbits documentation

8 years agoxbits: clean up parsing and tests
Victor Julien [Thu, 13 Oct 2016 10:42:17 +0000 (12:42 +0200)] 
xbits: clean up parsing and tests

8 years agopcap-log: fix memory leak during initialization of ring buffer 2465/head
Jason Ish [Mon, 19 Dec 2016 15:11:48 +0000 (09:11 -0600)] 
pcap-log: fix memory leak during initialization of ring buffer

A free was missing when files are removed during initialization
of the ring buffer.

Redmine issue:
https://redmine.openinfosecfoundation.org/issues/1985

8 years agosmtp: commands and replies are not case sensitive
Eric Leblond [Wed, 14 Dec 2016 17:01:09 +0000 (18:01 +0100)] 
smtp: commands and replies are not case sensitive

RFC states that "Commands and replies are not case sensitive" and
patterns were registered to be case sensitive. So this patch fixes
a trivial evasion of SMTP signatures.

8 years agotls: fix tls_cert_subject prefilter bug 2462/head
Mats Klepsland [Fri, 16 Dec 2016 13:43:43 +0000 (14:43 +0100)] 
tls: fix tls_cert_subject prefilter bug

If check in prefilter was checking that issuer was non-NULL, when
it in fact should be checking subject.

8 years agotls: increase max number of tls records per packet 2459/head
Mats Klepsland [Fri, 16 Dec 2016 12:04:03 +0000 (13:04 +0100)] 
tls: increase max number of tls records per packet

Tls packets may contain several records. This increase the number
of allowed records per packet from 30 to 255, and adds a new and
more informative decoder event when this limit is reached.

8 years agotls: don't trigger decoder event on no extensions in CLIENT_HELLO
Mats Klepsland [Tue, 13 Dec 2016 13:56:26 +0000 (14:56 +0100)] 
tls: don't trigger decoder event on no extensions in CLIENT_HELLO

No extensions are allowed in <TLSv.1.2, so don't trigger SURICATA
TLS handshake invalid length decoder event when no extensions are
specified in CLIENT HELLO.

8 years agomagic: make optional
Victor Julien [Sun, 13 Nov 2016 13:36:25 +0000 (08:36 -0500)] 
magic: make optional

Make libmagic optional. If installed it will be enabled by default in
configure. Use --disable-libmagic to disable.

8 years agolog-pcap: use a snaplen of 262144 instead of -1.
Jason Ish [Thu, 15 Dec 2016 18:36:25 +0000 (12:36 -0600)] 
log-pcap: use a snaplen of 262144 instead of -1.

Newer versions of libpcap will not open pcap files with a
snaplen of -1, instead use the current maximum value of
262144.

Issue:
https://redmine.openinfosecfoundation.org/issues/1987

8 years agodoc: DNP3 support is now available
Victor Julien [Sun, 4 Dec 2016 10:10:18 +0000 (11:10 +0100)] 
doc: DNP3 support is now available

8 years agohostbits/xbits: free hostbit
Victor Julien [Fri, 16 Dec 2016 11:11:18 +0000 (12:11 +0100)] 
hostbits/xbits: free hostbit

Fix memory leak. Hostbits were not actually freed.

Bug #1975.

8 years agohttp: allow lower/mixed case in proto detect 2454/head
Victor Julien [Tue, 13 Dec 2016 09:23:21 +0000 (10:23 +0100)] 
http: allow lower/mixed case in proto detect

In HTTP detection registered patterns were upper case only. Since the
detection is based on both sides this would still work for sessions
where one of the talkers misbehaved. If both sides misbehave this
would fail however, so this patch introduces case insensive matching.

8 years agotravis: use a build matrix and add additional builds 2447/head
Jason Ish [Tue, 29 Nov 2016 17:03:03 +0000 (11:03 -0600)] 
travis: use a build matrix and add additional builds

The following builds were added:
- linux, clang with -Wshadow
- linux w/ profiling
- linux w/ debug
- linux w/ no-json support

Removes the extra OS X build.

Travis file was reworked signficantly for readabilty.

8 years agoprofiling: fix shadow error
Jason Ish [Tue, 29 Nov 2016 16:45:02 +0000 (10:45 -0600)] 
profiling: fix shadow error

Local variable store was shadowing variable in function
definition.

8 years agounix-socket: clean up path handling
Victor Julien [Fri, 2 Dec 2016 09:10:20 +0000 (10:10 +0100)] 
unix-socket: clean up path handling

Create/check socket path in a single place. Don't use dynamic
memory allocation.

8 years agounix-socket: create socket directory if possible 2445/head
Victor Julien [Thu, 1 Dec 2016 14:19:35 +0000 (15:19 +0100)] 
unix-socket: create socket directory if possible

Create the socket directory in the default case.

Since we're doing stat+mkdir indicate to Coverity not to worry about
the toctou case.

8 years agounix-socket: be more specific about problems
Victor Julien [Thu, 1 Dec 2016 14:06:57 +0000 (15:06 +0100)] 
unix-socket: be more specific about problems

8 years agounix-socket: don't error out on unix socket failure
Victor Julien [Thu, 1 Dec 2016 13:54:04 +0000 (14:54 +0100)] 
unix-socket: don't error out on unix socket failure

If --init-errors-fatal is specified do error out.

Bug https://redmine.openinfosecfoundation.org/issues/1973

8 years agoUpdate Changelog for 3.2 release suricata-3.2
Victor Julien [Tue, 29 Nov 2016 17:15:42 +0000 (18:15 +0100)] 
Update Changelog for 3.2 release

8 years agodnp3: use _ in keyword names instead of "." 2440/head
Jason Ish [Tue, 29 Nov 2016 13:57:02 +0000 (07:57 -0600)] 
dnp3: use _ in keyword names instead of "."

dnp3.ind -> dnp3_ind
dnp3.func -> dnp3_func
dnp3.obj -> dnp3_obj

The variations with a "." are now aliases.

8 years agoaf-packet: fix fanout support on Debian Jessie
Victor Julien [Fri, 7 Oct 2016 11:49:40 +0000 (13:49 +0200)] 
af-packet: fix fanout support on Debian Jessie

Debian Jessie with kernel 3.16 would not accept the 'id' of 99 used
in the test. Id 1 does work.

8 years agoFix port parsing in config file, added one more corresponding test.
Alexander Gozman [Wed, 12 Oct 2016 08:12:34 +0000 (11:12 +0300)] 
Fix port parsing in config file, added one more corresponding test.

Some examples from wiki caused parsing errors.
For example, "[1:80,![2,4]]" was treated as a mistake.

Also fixed loop detection in variables declaration. For example,
'A: "HOME_NET, !$HOME_NET"' resulted in parsing error.

8 years agoqa: only run cocci tests on one linux builder 2438/head
Victor Julien [Tue, 29 Nov 2016 08:29:17 +0000 (09:29 +0100)] 
qa: only run cocci tests on one linux builder

8 years agotravis: macos support
Jason Ish [Mon, 28 Nov 2016 16:23:34 +0000 (10:23 -0600)] 
travis: macos support

8 years agounittest-helper: fix format string compiler warnings
Jason Ish [Mon, 28 Nov 2016 18:19:52 +0000 (12:19 -0600)] 
unittest-helper: fix format string compiler warnings

8 years agodetect-stream_size: fix format string compiler warnings
Jason Ish [Mon, 28 Nov 2016 18:19:13 +0000 (12:19 -0600)] 
detect-stream_size: fix format string compiler warnings

8 years agostream-tcp: fix format string compiler warnings
Jason Ish [Mon, 28 Nov 2016 18:18:47 +0000 (12:18 -0600)] 
stream-tcp: fix format string compiler warnings

8 years agomodbus: fix format string compiler warnings
Jason Ish [Mon, 28 Nov 2016 18:18:23 +0000 (12:18 -0600)] 
modbus: fix format string compiler warnings

8 years agodnp3: rename "index" variables to "point_index"
Jason Ish [Mon, 28 Nov 2016 16:07:41 +0000 (10:07 -0600)] 
dnp3: rename "index" variables to "point_index"

Gcc 4.6 will warning with -Wshadow for a local variable
named "index" as <strings.h> has a function named "index".

Newer versions of gcc handle this case.

8 years agodnp3-gen: rename index variable to point_index
Jason Ish [Mon, 28 Nov 2016 16:06:14 +0000 (10:06 -0600)] 
dnp3-gen: rename index variable to point_index

Gcc 4.6 will warning with -Wshadow for a local variable
named "index" as <strings.h> has a function named "index".

Newer versions of gcc handle this case.

8 years agoqa: add -Wshadow to appveyor builds 2433/head
Victor Julien [Mon, 28 Nov 2016 13:40:20 +0000 (14:40 +0100)] 
qa: add -Wshadow to appveyor builds

8 years agoproto detect: fix -Wshadow warning 2432/head
Victor Julien [Mon, 28 Nov 2016 12:03:34 +0000 (13:03 +0100)] 
proto detect: fix -Wshadow warning

8 years agodcerpc: fix -Wshadow warnings
Victor Julien [Mon, 28 Nov 2016 11:54:16 +0000 (12:54 +0100)] 
dcerpc: fix -Wshadow warnings

8 years agocommandline: fix -Wshadow warnings
Victor Julien [Mon, 28 Nov 2016 11:51:52 +0000 (12:51 +0100)] 
commandline: fix -Wshadow warnings

8 years agodetect-address: fix -Wshadow warnings
Victor Julien [Mon, 28 Nov 2016 11:36:41 +0000 (12:36 +0100)] 
detect-address: fix -Wshadow warnings

8 years agoasn1: fix -Wshadow warnings
Victor Julien [Mon, 28 Nov 2016 11:36:26 +0000 (12:36 +0100)] 
asn1: fix -Wshadow warnings

8 years agoasn1: modernize test
Victor Julien [Mon, 28 Nov 2016 11:24:35 +0000 (12:24 +0100)] 
asn1: modernize test

8 years agoyaml: fix tests for -Wshadow
Victor Julien [Mon, 28 Nov 2016 11:24:19 +0000 (12:24 +0100)] 
yaml: fix tests for -Wshadow

8 years agodnp3: fix test for -Wshadow
Victor Julien [Mon, 28 Nov 2016 11:24:03 +0000 (12:24 +0100)] 
dnp3: fix test for -Wshadow

8 years agorunmodes: fix -Wshadow warnings
Victor Julien [Mon, 28 Nov 2016 09:29:25 +0000 (10:29 +0100)] 
runmodes: fix -Wshadow warnings

8 years agompm ac-bs: fix -Wshadow warnings
Victor Julien [Mon, 28 Nov 2016 09:27:34 +0000 (10:27 +0100)] 
mpm ac-bs: fix -Wshadow warnings

8 years agothreads: fix -Wshadow warnings
Victor Julien [Mon, 28 Nov 2016 09:27:18 +0000 (10:27 +0100)] 
threads: fix -Wshadow warnings

8 years agocommandline: fix -Wshadow warnings
Victor Julien [Mon, 28 Nov 2016 09:21:53 +0000 (10:21 +0100)] 
commandline: fix -Wshadow warnings

8 years agonfq: fix -Wshadow warnings
Victor Julien [Mon, 28 Nov 2016 09:18:03 +0000 (10:18 +0100)] 
nfq: fix -Wshadow warnings

Rename globals to make sure it's clear they are globals.

8 years agoreputation: fix -Wshadow warnings
Victor Julien [Mon, 28 Nov 2016 09:11:44 +0000 (10:11 +0100)] 
reputation: fix -Wshadow warnings

8 years agoeve-flow: fix -Wshadow warning
Victor Julien [Mon, 28 Nov 2016 09:10:40 +0000 (10:10 +0100)] 
eve-flow: fix -Wshadow warning

8 years agoeve-file: fix -Wshadow warnings
Victor Julien [Mon, 28 Nov 2016 09:09:16 +0000 (10:09 +0100)] 
eve-file: fix -Wshadow warnings

8 years agoippair: fix -Wshadow warning
Victor Julien [Mon, 28 Nov 2016 09:07:39 +0000 (10:07 +0100)] 
ippair: fix -Wshadow warning

8 years agohost: fix -Wshadow warning
Victor Julien [Mon, 28 Nov 2016 09:07:25 +0000 (10:07 +0100)] 
host: fix -Wshadow warning

8 years agoflow: fix -Wshadow warning
Victor Julien [Mon, 28 Nov 2016 09:07:09 +0000 (10:07 +0100)] 
flow: fix -Wshadow warning

8 years agowithin: fix -Wshadow warning
Victor Julien [Mon, 28 Nov 2016 09:06:42 +0000 (10:06 +0100)] 
within: fix -Wshadow warning

8 years agoprefilter: fix -Wshadow warnings
Victor Julien [Mon, 28 Nov 2016 09:05:51 +0000 (10:05 +0100)] 
prefilter: fix -Wshadow warnings