]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #989 in SNORT/snort3 from pause_fix to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Mon, 14 Aug 2017 20:28:10 +0000 (16:28 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Mon, 14 Aug 2017 20:28:10 +0000 (16:28 -0400)
commit057fb1edfa95abf679f7eb2946aebb10f24e72eb
treeb9259a3c43d811283d6c259d3b332d707a9b9b62
parent29d792b09340c85b0887b0e014a7a502bee9e662
Merge pull request #989 in SNORT/snort3 from pause_fix to master

Squashed commit of the following:

commit 22cbf9fe707272c9549ec81125fec4fbc69d961e
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Fri Aug 11 13:34:12 2017 -0400

    main: Fix pause command issued from command line to accept control commands while in paused state

commit 8519c9d98ebc9375e66234de9aa3a6d108d27fd8
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Fri Aug 11 12:46:48 2017 -0400

    main: Fix pause command issued from command line to accept control commands while in paused state
src/main.cc
src/main/analyzer.cc
src/main/analyzer.h
src/main/analyzer_command.cc
src/main/analyzer_command.h