]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1946 in SNORT/snort3 from ~SELYSENK/snort3:bug/362106 to master
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Tue, 21 Jan 2020 03:04:07 +0000 (03:04 +0000)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Tue, 21 Jan 2020 03:04:07 +0000 (03:04 +0000)
commitfa2b44d03c846735ff00495d5b7e31daa2bdc90c
tree247c6d1aecc8763c40feaa173d8f21f12c025b07
parentd50fd707aa9b7863fab25e627bf6d650f34c0002
Merge pull request #1946 in SNORT/snort3 from ~SELYSENK/snort3:bug/362106 to master

Squashed commit of the following:

commit 47f108c7be1b3aca7ff8a0b238ca997c469ffbde
Author: Serhii Lysenko <selysenk@cisco.com>
Date:   Fri Jan 17 15:18:21 2020 +0200

    cip: explicitly include sys/time.h header

commit 51d311de1b4f34931b017529ff382ae2a79b7cba
Author: Serhii Lysenko <selysenk@cisco.com>
Date:   Fri Jan 17 18:24:31 2020 +0200

    rna: use standard uint8_t type instead of u_int8_t
src/host_tracker/host_tracker.cc
src/host_tracker/host_tracker.h
src/host_tracker/test/host_tracker_test.cc
src/network_inspectors/rna/rna_logger.cc
src/network_inspectors/rna/rna_logger.h
src/network_inspectors/rna/rna_pnd.cc
src/network_inspectors/rna/rna_pnd.h
src/service_inspectors/cip/cip_definitions.h