[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-3.0-167-gef4c717

[OISF Git]

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  ef4c71705281f38f7972b3a980bfb03d1d04d662 (commit)
       via  a70ff19911b2be650c1b115eae7681480851f2e9 (commit)
       via  3c3fe4b47d1f9bc23113d8b8c2ea98c5096e4e8f (commit)
       via  9afaf14ba4137f535aa6414982fdf488f0f3cce8 (commit)
       via  77358a4113e4fab82464a257e95484f8dcb25d21 (commit)
       via  5aee386fa99c643602d311a986a9c09ca98cb0ed (commit)
       via  c19412243a7f1c9cf3d07de0999c026bba313c69 (commit)
       via  4526aed2b1029fe3f909ea4ca12045e4cf209e08 (commit)
       via  32bf68aef83aa3df393877860c249dde2b9f37fc (commit)
       via  4783d5107f1058f1473169824f80530596c5f089 (commit)
       via  01a8cc4ec9466ff4d35c75f17f5ef5d0f4193b7c (commit)
      from  8394b38941492b7264e26c14b8fa435c859d2497 (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 ef4c71705281f38f7972b3a980bfb03d1d04d662
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Mar 16 12:37:25 2016 +0100

    ip parsing: fix cppcheck negative shift warning
    
    [src/util-ip.c:104]: (error) Shifting a negative value is undefined behaviour
    [src/util-radix-tree.c:1160]: (error) Shifting a negative value is undefined behaviour
    [src/util-radix-tree.c:1357]: (error) Shifting a negative value is undefined behaviour
    [src/util-radix-tree.c:1380]: (error) Shifting a negative value is undefined behaviour
    [src/util-radix-tree.c:1438]: (error) Shifting a negative value is undefined behaviour

commit a70ff19911b2be650c1b115eae7681480851f2e9
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Mar 16 12:20:17 2016 +0100

    stats: fix unix socket crash
    
    Reset counters_global_id at ctx destruction. In the unix socket
    runmode the lack of this reset would cause the id's to increase with
    each pcap, leading to an ever larger stats array.

commit 3c3fe4b47d1f9bc23113d8b8c2ea98c5096e4e8f
Author: Jason Ish <ish at unx.ca>
Date:   Tue Jan 26 23:22:27 2016 -0600

    detect: denote the max detection list; fix issue 1674.
    
    Denotes the max detection list so that rule validation can
    allow post-detection lists to come after base64_data, but
    disallow detection lists to come after it.

commit 9afaf14ba4137f535aa6414982fdf488f0f3cce8
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Mar 9 20:44:26 2016 +0100

    smtp: use detection file tracking
    
    As SMTP file_data detection uses the file API, the file's inspect
    tracker should be considered when pruning files.
    
    This patch sets the FILE_USE_DETECT flag on files tracked by smtp.
    
    It also adds logic to move inspected tracker ahead if detection
    doesn't do it, like when no rules are matching or detection engine
    is disabled.

commit 77358a4113e4fab82464a257e95484f8dcb25d21
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Mar 9 20:43:54 2016 +0100

    file: optionally use detect tracking in pruning
    
    When the file API is used to do content inspection (currently only
    smtp does this), the detection should be considered while pruning
    the file chunks.
    
    This patch introduces a new flag for the file API: FILE_USE_DETECT
    
    When it is used, 'FilePrune' will not remove chunks that are (partly)
    beyond the File::content_inspected tracker.
    
    When using this flag, it's important to realize that when the detect
    engine is disabled or rules are not matching, content_inspected
    might not get updated.

commit 5aee386fa99c643602d311a986a9c09ca98cb0ed
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Mar 9 17:24:51 2016 +0100

    smtp: add file_data debug code

commit c19412243a7f1c9cf3d07de0999c026bba313c69
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Mar 10 09:56:15 2016 +0100

    file logging: fix bad end of file check
    
    File storage could end file storing when the logger was invoked
    while no new data chunks were available.

commit 4526aed2b1029fe3f909ea4ca12045e4cf209e08
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Dec 15 10:13:48 2015 +0100

    smtp: fix config parsing and config defaults

commit 32bf68aef83aa3df393877860c249dde2b9f37fc
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Dec 14 18:34:38 2015 +0100

    smtp: consider file state in file_data inspection limits

commit 4783d5107f1058f1473169824f80530596c5f089
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Mar 15 18:01:06 2016 +0100

    pfring: strip prio from vlan id

commit 01a8cc4ec9466ff4d35c75f17f5ef5d0f4193b7c
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Mar 15 18:00:54 2016 +0100

    afpacket: strip prio from vlan id

-----------------------------------------------------------------------

Summary of changes:
 src/app-layer-smtp.c              | 98 ++++++++++++++++++++++++++++-----------
 src/counters.c                    |  1 +
 src/detect-base64-data.c          | 38 +++++++++++++++
 src/detect-engine-filedata-smtp.c | 19 ++++++--
 src/detect-parse.c                |  2 +-
 src/detect.h                      |  9 +++-
 src/output-filedata.c             |  9 +++-
 src/source-af-packet.c            |  2 +-
 src/source-pfring.c               |  2 +-
 src/util-file.c                   | 12 +++++
 src/util-file.h                   |  4 +-
 src/util-ip.c                     |  6 +--
 src/util-radix-tree.c             | 16 +++----
 suricata.yaml.in                  |  6 +--
 14 files changed, 171 insertions(+), 53 deletions(-)


hooks/post-receive
-- 
OISF