]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1531 in SNORT/snort3 from ~STECHEW/snort3:daq_retry3 to master
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Tue, 9 Apr 2019 21:42:34 +0000 (17:42 -0400)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Tue, 9 Apr 2019 21:42:34 +0000 (17:42 -0400)
commit37c76ac833ae5ae05bc2a5cac92b5ac3d466ff3e
treeb0ee247fa226349b6e97762acc3b523bf055854a
parent8ee96aa3e05f000caf14d4657bbc14d860860d26
Merge pull request #1531 in SNORT/snort3 from ~STECHEW/snort3:daq_retry3 to master

Squashed commit of the following:

commit f33b4040c35afc9809a0b7902764d61d9b56a3c2
Author: Steve Chew <stechew@cisco.com>
Date:   Wed Mar 27 02:02:59 2019 +0530

    stream: set retransmit flag.

commit 7de134a1caac546342abd0ed928a5b18ca9a6df4
Author: Steve Chew <stechew@cisco.com>
Date:   Thu Mar 21 03:22:23 2019 +0530

    u2spewfoo: update due to re-ording of retry action.

commit 32361ffa3a697e41cbfae701d4ae11afc0a49ca0
Author: Steve Chew <stechew@cisco.com>
Date:   Wed Mar 20 21:28:35 2019 +0530

    packet_io: Due to re-ordering, need to add entry for retry in act_str.

commit 8618472dadc2f160d801b12f80b3646e69354404
Author: Steve Chew <stechew@cisco.com>
Date:   Tue Mar 19 06:37:12 2019 +0530

    file_api: use timersub_ms, updates to packettracer logs.

commit 01b6e4f2ace3a78568612e76784484a209320d89
Author: Steve Chew <stechew@cisco.com>
Date:   Thu Mar 14 01:06:37 2019 +0530

    packet_io: re-order ACT_RETRY to be before ACT_DROP.

commit 092a415aa0ee3a4531341f3636586c7c9dd6435d
Author: Steve Chew <stechew@cisco.com>
Date:   Wed Mar 13 18:16:13 2019 +0530

    file_api: use more generic form of timercmp and fix timersub call.

commit 6a63b7f0b19dbe65106ae216fcd9bfdfbde4db93
Author: Steve Chew <stechew@cisco.com>
Date:   Sat Mar 9 02:43:47 2019 +0530

    file_api: If configured, reset session when lookup times out.

commit 4d00d8ee8a082d8f72df12ca2d0d20c36c7d9cd1
Author: Steve Chew <stechew@cisco.com>
Date:   Fri Mar 8 23:46:19 2019 +0530

    file_api: Make expiration timers more granular.

commit 67b047bcc5318c927472cd37384a06363f115c28
Author: Steve Chew <stechew@cisco.com>
Date:   Wed Mar 6 22:39:51 2019 +0530

    file_api: Add timer to limit how long we want for pending file lookup.

commit 8580f1e4b427c58525de7dd2803e4bdaebe6c5a1
Author: Steve Chew <stechew@cisco.com>
Date:   Fri Mar 1 06:56:57 2019 +0530

    packet_io: Changes to allow daq retries to work properly.
15 files changed:
src/file_api/file_cache.cc
src/file_api/file_cache.h
src/file_api/file_lib.cc
src/file_api/file_lib.h
src/main/snort.cc
src/network_inspectors/appid/tp_appid_utils.cc
src/network_inspectors/packet_tracer/packet_tracer.cc
src/network_inspectors/packet_tracer/packet_tracer.h
src/packet_io/active.cc
src/packet_io/active.h
src/protocols/packet.h
src/stream/tcp/segment_overlap_editor.cc
src/stream/tcp/tcp_normalizer.cc
src/stream/tcp/tcp_segment_node.cc
tools/u2spewfoo/u2spewfoo.cc