[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-3.2.1-326-gab1200f
OISF Git
noreply at openinfosecfoundation.org
Tue May 2 12:41:10 UTC 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OISF".
The branch, master has been updated
via ab1200fbd7fd4d3e0fe097fab3b3bcfefaba7e2e (commit)
via 342059835fe7ec0079ac91a152a0abab516b184f (commit)
from 842dfbc3f86cee39d19ae394d39f87be2e1eea94 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ab1200fbd7fd4d3e0fe097fab3b3bcfefaba7e2e
Author: Victor Julien <victor at inliniac.net>
Date: Tue May 2 09:11:16 2017 +0200
compiler: more strict compiler warnings
Set flags by default:
-Wmissing-prototypes
-Wmissing-declarations
-Wstrict-prototypes
-Wwrite-strings
-Wcast-align
-Wbad-function-cast
-Wformat-security
-Wno-format-nonliteral
-Wmissing-format-attribute
-funsigned-char
Fix minor compiler warnings for these new flags on gcc and clang.
commit 342059835fe7ec0079ac91a152a0abab516b184f
Author: Victor Julien <victor at inliniac.net>
Date: Mon May 1 20:34:07 2017 +0200
detect-parse: improve common parser
In preparation of turning input to keyword parsers to const add
options to the common rule parser to enforce and strip double
quotes and parse negation support.
At registration, the keyword can register 3 extra flags:
SIGMATCH_QUOTES_MANDATORY: value to keyword must be quoted
SIGMATCH_QUOTES_OPTIONAL: value to keyword may be quoted
SIGMATCH_HANDLE_NEGATION: leading ! is parsed
In all cases leading spaces are removed. If the 'quote' flags are
set, the quotes are removed from the input as well.
-----------------------------------------------------------------------
Summary of changes:
src/Makefile.am | 9 +-
src/alert-debuglog.c | 2 +-
src/alert-fastlog.c | 10 +-
src/alert-prelude.c | 2 +
src/alert-syslog.c | 10 +-
src/alert-unified2-alert.c | 7 +-
src/app-layer-dcerpc-common.h | 2 +-
src/app-layer-dcerpc-udp.c | 4 +-
src/app-layer-dcerpc.c | 42 +-
src/app-layer-detect-proto.c | 71 +-
src/app-layer-detect-proto.h | 12 +-
src/app-layer-dnp3.c | 6 +-
src/app-layer-dns-tcp.c | 2 +-
src/app-layer-dns-udp.c | 2 +-
src/app-layer-enip-common.c | 15 +-
src/app-layer-enip.c | 35 +-
src/app-layer-ftp.c | 12 +-
src/app-layer-htp-body.c | 1 +
src/app-layer-htp-file.c | 1 +
src/app-layer-htp-libhtp.c | 51 +-
src/app-layer-htp-libhtp.h | 1 -
src/app-layer-htp-mem.c | 8 +-
src/app-layer-htp-mem.h | 2 +-
src/app-layer-htp-xff.h | 2 +-
src/app-layer-htp.c | 92 +-
src/app-layer-htp.h | 4 -
src/app-layer-modbus.c | 40 +-
src/app-layer-smb.c | 22 +-
src/app-layer-smb2.c | 4 +-
src/app-layer-smtp.c | 6 +-
src/app-layer-ssh.c | 2 +-
src/app-layer-ssl.c | 36 +-
src/app-layer-template.c | 2 +-
src/app-layer.c | 8 +-
src/app-layer.h | 2 +-
src/conf-yaml-loader.c | 5 +-
src/conf.c | 48 +-
src/conf.h | 13 +-
src/counters.c | 50 +-
src/counters.h | 8 +-
src/decode-ethernet.h | 2 +
src/decode-events.h | 2 +-
src/decode-icmpv4.c | 2 +-
src/decode-icmpv6.c | 2 +-
src/decode-ipv4.c | 62 +-
src/decode-teredo.c | 1 +
src/decode.c | 2 +-
src/decode.h | 7 +
src/defrag-hash.c | 6 +-
src/defrag-queue.h | 2 +-
src/defrag-timeout.c | 11 +-
src/defrag.c | 4 -
src/detect-ack.c | 4 +-
src/detect-app-layer-event.c | 14 +-
src/detect-app-layer-protocol.c | 37 +-
src/detect-asn1.c | 19 +-
src/detect-base64-data.c | 7 +-
src/detect-base64-decode.c | 4 +-
src/detect-bypass.c | 11 +-
src/detect-byte-extract.c | 6 +-
src/detect-bytejump.c | 8 +-
src/detect-bytetest.c | 6 +-
src/detect-cipservice.c | 8 +-
src/detect-classtype.c | 19 +-
src/detect-content.c | 420 +-
src/detect-content.h | 8 +-
src/detect-csum.c | 32 +-
src/detect-dce-iface.c | 4 +-
src/detect-dce-opnum.c | 4 +-
src/detect-dce-stub-data.c | 4 +-
src/detect-depth.c | 21 +-
src/detect-detection-filter.c | 6 +-
src/detect-distance.c | 21 +-
src/detect-dnp3.c | 14 +-
src/detect-dnp3.h | 2 +-
src/detect-dns-query.c | 4 +-
src/detect-dsize.c | 48 +-
src/detect-engine-address-ipv4.c | 1 +
src/detect-engine-address-ipv6.c | 53 +-
src/detect-engine-address-ipv6.h | 6 +
src/detect-engine-address.c | 270 +-
src/detect-engine-address.h | 2 +-
src/detect-engine-analyzer.c | 4 +-
src/detect-engine-analyzer.h | 2 +-
src/detect-engine-dcepayload.c | 35 +-
src/detect-engine-dns.c | 1 +
src/detect-engine-enip.c | 4 +-
src/detect-engine-event.c | 32 +-
src/detect-engine-file.c | 7 +-
src/detect-engine-filedata-smtp.c | 3 +-
src/detect-engine-hcbd.c | 3 +-
src/detect-engine-hsbd.c | 3 +-
src/detect-engine-iponly.c | 43 +-
src/detect-engine-loader.c | 4 +-
src/detect-engine-loader.h | 4 +-
src/detect-engine-mpm.c | 6 +-
src/detect-engine-mpm.h | 2 -
src/detect-engine-payload.c | 3 +-
src/detect-engine-port.c | 273 +-
src/detect-engine-port.h | 2 +-
src/detect-engine-prefilter.c | 2 +
src/detect-engine-profile.c | 1 +
src/detect-engine-proto.c | 34 +-
src/detect-engine-proto.h | 2 +-
src/detect-engine-siggroup.c | 4 +-
src/detect-engine-sigorder.c | 173 +-
src/detect-engine-tag.c | 20 +-
src/detect-engine-template.c | 4 +-
src/detect-engine-threshold.c | 4 +-
src/detect-engine-tls.c | 9 +-
src/detect-engine-uri.c | 3 +-
src/detect-engine.c | 50 +-
src/detect-fast-pattern.c | 1330 +++----
src/detect-file-data.c | 5 +-
src/detect-file-hash-common.c | 8 +-
src/detect-file-hash-common.h | 6 +-
src/detect-fileext.c | 27 +-
src/detect-filemagic.c | 32 +-
src/detect-filemd5.c | 8 +-
src/detect-filename.c | 27 +-
src/detect-filesha1.c | 8 +-
src/detect-filesha256.c | 8 +-
src/detect-filesize.c | 8 +-
src/detect-filestore.c | 4 +-
src/detect-flags.c | 6 +-
src/detect-flow.c | 76 +-
src/detect-flowbits.c | 6 +-
src/detect-flowint.c | 62 +-
src/detect-flowvar.c | 16 +-
src/detect-fragbits.c | 103 +-
src/detect-fragoffset.c | 14 +-
src/detect-ftpbounce.c | 4 +-
src/detect-geoip.c | 76 +-
src/detect-gid.c | 23 +-
src/detect-hostbits.c | 4 +-
src/detect-http-accept-enc.c | 1 +
src/detect-http-accept-lang.c | 1 +
src/detect-http-accept.c | 1 +
src/detect-http-client-body.c | 34 +-
src/detect-http-connection.c | 1 +
src/detect-http-content-len.c | 1 +
src/detect-http-content-type.c | 1 +
src/detect-http-cookie.c | 4 +-
src/detect-http-header-names.c | 9 +-
src/detect-http-header.c | 20 +-
src/detect-http-headers-stub.h | 2 +-
src/detect-http-headers.c | 1 +
src/detect-http-hh.c | 34 +-
src/detect-http-hrh.c | 34 +-
src/detect-http-method.c | 20 +-
src/detect-http-protocol.c | 3 +-
src/detect-http-raw-header.c | 20 +-
src/detect-http-raw-uri.c | 30 +-
src/detect-http-referer.c | 1 +
src/detect-http-request-line.c | 4 +-
src/detect-http-response-line.c | 4 +-
src/detect-http-server-body.c | 34 +-
src/detect-http-start.c | 3 +-
src/detect-http-stat-code.c | 8 +-
src/detect-http-stat-msg.c | 8 +-
src/detect-http-ua.c | 34 +-
src/detect-http-uri.c | 4 +-
src/detect-http-uri.h | 2 +-
src/detect-icmp-id.c | 20 +-
src/detect-icmp-seq.c | 14 +-
src/detect-icode.c | 24 +-
src/detect-id.c | 18 +-
src/detect-ipopts.c | 14 +-
src/detect-ipproto.c | 7950 ++-----------------------------------
src/detect-iprep.c | 12 +-
src/detect-isdataat.c | 26 +-
src/detect-itype.c | 24 +-
src/detect-l3proto.c | 24 +-
src/detect-lua-extensions.c | 1 +
src/detect-lua.c | 10 +-
src/detect-mark.c | 6 +-
src/detect-metadata.c | 5 +-
src/detect-modbus.c | 6 +-
src/detect-msg.c | 58 +-
src/detect-noalert.c | 5 +-
src/detect-nocase.c | 15 +-
src/detect-offset.c | 22 +-
src/detect-parse.c | 166 +-
src/detect-parse.h | 8 +-
src/detect-pcre.c | 103 +-
src/detect-pkt-data.c | 6 +-
src/detect-pktvar.c | 22 +-
src/detect-prefilter.c | 6 +-
src/detect-priority.c | 9 +-
src/detect-rawbytes.c | 6 +-
src/detect-reference.c | 6 +-
src/detect-replace.c | 82 +-
src/detect-rev.c | 23 +-
src/detect-rpc.c | 16 +-
src/detect-sameip.c | 4 +-
src/detect-seq.c | 6 +-
src/detect-sid.c | 25 +-
src/detect-ssh-proto-version.c | 13 +-
src/detect-ssh-proto.c | 3 +-
src/detect-ssh-software-version.c | 7 +-
src/detect-ssh-software.c | 3 +-
src/detect-ssl-state.c | 8 +-
src/detect-ssl-version.c | 6 +-
src/detect-stream_size.c | 7 +-
src/detect-tag.c | 6 +-
src/detect-template-buffer.c | 5 +-
src/detect-template.c | 4 +-
src/detect-threshold.c | 6 +-
src/detect-tls-cert-issuer.c | 5 +-
src/detect-tls-cert-serial.c | 5 +-
src/detect-tls-cert-subject.c | 7 +-
src/detect-tls-cert-validity.c | 78 +-
src/detect-tls-sni.c | 5 +-
src/detect-tls-version.c | 6 +-
src/detect-tls.c | 73 +-
src/detect-tos.c | 96 +-
src/detect-ttl.c | 10 +-
src/detect-uricontent.c | 43 +-
src/detect-urilen.c | 8 +-
src/detect-window.c | 18 +-
src/detect-within.c | 25 +-
src/detect-xbits.c | 4 +-
src/detect.c | 337 +-
src/detect.h | 30 +-
src/flow-manager.c | 6 +-
src/flow-queue.h | 2 +-
src/flow-storage.c | 2 +-
src/flow-timeout.c | 1 +
src/flow-worker.c | 4 +-
src/flow.c | 4 +-
src/host-bit.c | 3 +-
src/host-queue.h | 2 +-
src/host-timeout.c | 1 +
src/host.c | 8 +-
src/host.h | 4 +-
src/ippair-bit.c | 3 +-
src/ippair-queue.h | 2 +-
src/ippair-timeout.c | 1 +
src/ippair.c | 6 +-
src/log-cf-common.c | 2 +-
src/log-dnslog.c | 2 +-
src/log-droplog.c | 6 +-
src/log-file.c | 17 +-
src/log-filestore.c | 5 +-
src/log-httplog.c | 4 +-
src/log-pcap.c | 12 +-
src/log-stats.c | 11 +-
src/log-tcp-data.c | 6 +-
src/log-tlslog.c | 2 +-
src/log-tlsstore.c | 5 +-
src/output-file.c | 2 +-
src/output-filedata.c | 4 +-
src/output-flow.c | 2 +-
src/output-json-alert.c | 7 +-
src/output-json-dnp3-objects.c | 1 +
src/output-json-dnp3.c | 3 +-
src/output-json-dns.c | 5 +-
src/output-json-drop.c | 3 +-
src/output-json-email-common.c | 6 +-
src/output-json-file.c | 5 +-
src/output-json-flow.c | 11 +-
src/output-json-http.c | 15 +-
src/output-json-http.h | 2 -
src/output-json-netflow.c | 9 +-
src/output-json-smtp.c | 5 +-
src/output-json-ssh.c | 7 +-
src/output-json-stats.c | 9 +-
src/output-json-template.c | 3 +-
src/output-json-tls.c | 9 +-
src/output-json-vars.c | 3 +-
src/output-json.c | 2 +-
src/output-lua.c | 6 +-
src/output-packet.c | 2 +-
src/output-stats.c | 2 +-
src/output-streaming.c | 8 +-
src/output-tx.c | 4 +-
src/output.c | 6 +-
src/output.h | 2 +-
src/packet-queue.c | 3 +
src/reputation.c | 24 +-
src/reputation.h | 4 +-
src/runmode-af-packet.c | 28 +-
src/runmode-af-packet.h | 2 +-
src/runmode-erf-file.c | 4 +-
src/runmode-netmap.c | 20 +-
src/runmode-netmap.h | 2 +-
src/runmode-nflog.c | 7 +-
src/runmode-pcap-file.c | 4 +-
src/runmode-pcap.c | 21 +-
src/runmode-pfring.c | 24 +-
src/runmode-unittests.c | 8 +-
src/runmode-unittests.h | 2 +-
src/runmode-unix-socket.c | 4 +-
src/runmodes.c | 2 +-
src/source-af-packet.c | 42 +-
src/source-af-packet.h | 10 +-
src/source-erf-dag.c | 6 +-
src/source-erf-file.c | 9 +-
src/source-ipfw.c | 16 +-
src/source-napatech.c | 14 +-
src/source-netmap.c | 10 +-
src/source-netmap.h | 2 +-
src/source-nflog.c | 8 +-
src/source-nfq.c | 24 +-
src/source-pcap-file.c | 16 +-
src/source-pcap-file.h | 4 +-
src/source-pcap.c | 18 +-
src/source-pcap.h | 2 +-
src/source-pfring.c | 12 +-
src/stream-tcp-list.c | 2 +
src/stream-tcp-reassemble.c | 10 +-
src/stream-tcp-sack.c | 2 +-
src/stream-tcp-util.c | 6 +-
src/stream-tcp.c | 47 +-
src/stream-tcp.h | 2 +
src/suricata-common.h | 4 +
src/suricata.c | 65 +-
src/suricata.h | 11 +-
src/threads.c | 13 +-
src/threadvars.h | 2 +-
src/tm-modules.h | 6 +-
src/tm-queuehandlers.c | 2 +-
src/tm-queuehandlers.h | 6 +-
src/tm-queues.c | 17 +-
src/tm-queues.h | 4 +-
src/tm-threads.c | 49 +-
src/tm-threads.h | 17 +-
src/tmqh-flow.c | 12 +-
src/tmqh-nfq.c | 1 +
src/tmqh-simple.c | 1 +
src/unix-manager.c | 85 +-
src/util-action.c | 82 +-
src/util-action.h | 4 +-
src/util-affinity.c | 2 +-
src/util-affinity.h | 2 +-
src/util-bloomfilter-counting.c | 10 +-
src/util-bloomfilter-counting.h | 10 +-
src/util-bloomfilter.c | 2 +-
src/util-bloomfilter.h | 2 +-
src/util-byte.c | 5 +-
src/util-cidr.c | 1 +
src/util-classification-config.c | 26 +-
src/util-conf.c | 8 +-
src/util-conf.h | 4 +-
src/util-coredump-config.c | 2 +-
src/util-cpu.c | 9 +-
src/util-cpu.h | 8 +-
src/util-daemon.c | 2 +-
src/util-debug-filters.c | 2 +-
src/util-debug.c | 44 +-
src/util-debug.h | 6 +-
src/util-decode-asn1.c | 26 +-
src/util-decode-asn1.h | 2 +-
src/util-decode-mime.c | 18 +-
src/util-enum.h | 2 +-
src/util-file.c | 4 +-
src/util-file.h | 2 +-
src/util-fix_checksum.c | 2 +
src/util-hash-lookup3.c | 1 +
src/util-hash.c | 14 +-
src/util-hashlist.c | 20 +-
src/util-host-info.c | 1 +
src/util-host-os-info.c | 72 +-
src/util-host-os-info.h | 4 +-
src/util-hyperscan.c | 1 +
src/util-ioctl.c | 10 +-
src/util-ioctl.h | 4 +
src/util-ip.c | 3 +-
src/util-log-redis.c | 4 +-
src/util-log-redis.h | 2 +-
src/util-logopenfile.c | 2 +-
src/util-lua-common.c | 1 +
src/util-lua-dnp3-objects.c | 1 +
src/util-lua-dnp3.c | 1 +
src/util-lua-dns.c | 1 +
src/util-lua-http.c | 1 +
src/util-lua-smtp.c | 1 +
src/util-lua-ssh.c | 1 +
src/util-lua-tls.c | 1 +
src/util-magic.c | 29 +-
src/util-memcmp.c | 20 +-
src/util-memrchr.c | 3 +-
src/util-misc.c | 3 +-
src/util-mpm-ac-bs.c | 66 +-
src/util-mpm-ac-tile.c | 70 +-
src/util-mpm-ac.c | 64 +-
src/util-pages.c | 9 +-
src/util-pages.h | 2 +
src/util-pool-thread.c | 4 +-
src/util-pool-thread.h | 4 +-
src/util-pool.c | 10 +-
src/util-pool.h | 4 +-
src/util-privs.c | 19 +-
src/util-privs.h | 4 +-
src/util-profiling-keywords.c | 7 +-
src/util-profiling-locks.h | 4 +-
src/util-profiling-rulegroups.c | 7 +-
src/util-profiling-rules.c | 6 +-
src/util-profiling.c | 13 +-
src/util-radix-tree.c | 185 +-
src/util-random.c | 1 +
src/util-reference-config.c | 20 +-
src/util-rule-vars.c | 14 +-
src/util-rule-vars.h | 2 +-
src/util-running-modes.c | 1 +
src/util-running-modes.h | 4 +-
src/util-signal.c | 5 +-
src/util-signal.h | 4 +-
src/util-spm.c | 102 +-
src/util-storage.c | 2 +-
src/util-streaming-buffer.c | 6 +-
src/util-strlcatu.c | 7 +-
src/util-strlcpyu.c | 7 +-
src/util-syslog.c | 5 +-
src/util-threshold-config.c | 70 +-
src/util-threshold-config.h | 2 +-
src/util-time.c | 2 +-
src/util-time.h | 2 +-
src/util-unittest-helper.c | 38 +-
src/util-unittest-helper.h | 18 +-
src/util-unittest.c | 22 +-
src/util-unittest.h | 14 +-
422 files changed, 4082 insertions(+), 12506 deletions(-)
hooks/post-receive
--
OISF
More information about the Oisf-devel
mailing list