]> git.ipfire.org Git - thirdparty/snort3.git/commit
projects / thirdparty / snort3.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b398a1c) | patch
Merge pull request #1926 in SNORT/snort3 from ~SELYSENK/snort3:dont_log_zero_vid...
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Fri, 24 Jan 2020 17:59:49 +0000 (17:59 +0000)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Fri, 24 Jan 2020 17:59:49 +0000 (17:59 +0000)
commitacae3cf0e8f0e67b4f826c7df5e5c4cf09711aff
treea919639fa0ea0141a2577258d4ca58c520982d98tree
parentb398a1cf0f41fc23585857178f4093cb87cc9bffcommit | diff
Merge pull request #1926 in SNORT/snort3 from ~SELYSENK/snort3:dont_log_zero_vid to master

Squashed commit of the following:

commit acbf1f541bffec35d3d63a779c515287bd43255f
Author: Serhii Lysenko <selysenk@cisco.com>
Date:   Thu Jan 23 16:16:20 2020 +0200

    loggers: update vlan logging in csv and json loggers

    Log vlan id 0 if vlan_agnostic or untagged, use flow vlan id or packet
    vid otherwise.
src/loggers/alert_csv.cc diff | blob | blame | history
src/loggers/alert_json.cc diff | blob | blame | history
src/protocols/packet.cc diff | blob | blame | history
src/protocols/packet.h diff | blob | blame | history
Mirror of https://github.com/snort3/snort3.git