]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1144 in SNORT/snort3 from metapacket to master
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Tue, 27 Mar 2018 22:34:23 +0000 (18:34 -0400)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Tue, 27 Mar 2018 22:34:23 +0000 (18:34 -0400)
commit4dcb8d6959f4f21acd14e8d855cbbd30ec536c54
tree7612d23389c87456daaa4cf941a24b8cd660a71b
parentb817455b44f6214fdcbc6881ed22f6c17d74162e
Merge pull request #1144 in SNORT/snort3 from metapacket to master

Squashed commit of the following:

commit e6660bd853546dd1de7a708a9bc84f2bf922765d
Author: Victor Roemer (viroemer) <viroemer@cisco.com>
Date:   Tue Mar 27 16:29:28 2018 -0400

    fix

commit 2dc5713408cb250ba89e74298e99437063b1509d
Author: Victor Roemer (viroemer) <viroemer@cisco.com>
Date:   Fri Mar 16 14:44:14 2018 -0400

    sfip: A version of set() which automatically determines the family

commit 2386b17110b3ae536cde1f9481414510a3e7173d
Author: Victor Roemer (viroemer) <viroemer@cisco.com>
Date:   Tue Mar 13 15:59:27 2018 -0400

    flow: SO_PUBLIC FlowKey
16 files changed:
daqs/daq_hext.c
src/flow/expect_cache.h
src/flow/flow.h
src/flow/flow_cache.h
src/flow/flow_control.h
src/flow/flow_key.h
src/flow/ha.h
src/loggers/log_hext.cc
src/service_inspectors/ftp_telnet/ftpp_si.h
src/sfip/sf_ip.cc
src/sfip/sf_ip.h
src/stream/base/stream_ha.h
src/stream/icmp/icmp_ha.h
src/stream/ip/ip_ha.h
src/stream/tcp/tcp_ha.h
src/stream/udp/udp_ha.h