[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.1beta4-435-g4dfbc0e

[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  4dfbc0effa668745a5535ce81b32f2e0cebcaca8 (commit)
       via  07d8617b3e0aab69d4fa6a3c4baee24480607bab (commit)
       via  906b95eed3cafcae4ebef1cbbc012e441948ce70 (commit)
       via  27783f4c667262a7bbb6e962678ebaf0146e30d6 (commit)
       via  04889f154d64e70d2b3e2e7bfc4977ecd53dacfd (commit)
       via  d7d76e7b273c23c144a32ba54151bb75502ba68a (commit)
       via  dc3c1ef01eabb86285636ba9de5a9e50e467fbb4 (commit)
      from  adecf41720bae7a3f0552d710ec19a3d2fc7708b (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 4dfbc0effa668745a5535ce81b32f2e0cebcaca8
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Nov 23 17:18:57 2015 +0100

    multi-detect: fix and simplify config
    
    instead
    
    mappings:
      - vlan:
        vlan-id: 1
        tenant-id: 2
    
    we'll now use:
    
    mappings:
      - vlan-id: 1
        tenant-id: 2
    
    For YAML it pretty much means the same thing.
    
    Ticket: 1517

commit 07d8617b3e0aab69d4fa6a3c4baee24480607bab
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Nov 23 14:58:34 2015 +0100

    multi-detect: improve error handling

commit 906b95eed3cafcae4ebef1cbbc012e441948ce70
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Nov 23 14:05:21 2015 +0100

    multi-detect: handle missing mappings
    
    Notify/warn user about missing mappings depending on other settings
    like unix socket and init errors fatal.

commit 27783f4c667262a7bbb6e962678ebaf0146e30d6
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Nov 23 13:38:59 2015 +0100

    multi-detect: consider vlan tracking
    
    Refuse to use vlan selector if vlan tracking is disabled.

commit 04889f154d64e70d2b3e2e7bfc4977ecd53dacfd
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Nov 23 13:30:03 2015 +0100

    multi-detect: validate vlan_id

commit d7d76e7b273c23c144a32ba54151bb75502ba68a
Author: Victor Julien <victor at inliniac.net>
Date:   Fri Nov 20 15:52:50 2015 +0100

    multi-detect: use default tenant
    
    The default detect engine can be used as 'default tenant'.

commit dc3c1ef01eabb86285636ba9de5a9e50e467fbb4
Author: Victor Julien <victor at inliniac.net>
Date:   Fri Nov 20 12:05:02 2015 +0100

    multi-detect: clean up output

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

Summary of changes:
 src/detect-engine.c | 423 ++++++++++++++++++++++++++++------------------------
 src/detect-engine.h |   2 +-
 src/detect.c        |  13 +-
 src/suricata.c      |  19 ++-
 src/util-error.c    |   1 +
 src/util-error.h    |   1 +
 6 files changed, 249 insertions(+), 210 deletions(-)


hooks/post-receive
-- 
OISF