]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #953 in SNORT/snort3 from reload_inspector to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Fri, 4 Aug 2017 16:36:21 +0000 (12:36 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Fri, 4 Aug 2017 16:36:21 +0000 (12:36 -0400)
commit19ab78a7f8b3340a2942c26f78f050130be1b444
treed07129c920cce6be0eb6960a94e501f07926941b
parent82808abfa706fe65006e598496d698ea1f161db6
Merge pull request #953 in SNORT/snort3 from reload_inspector to master

Squashed commit of the following:

commit c5ec856a1fd022d83fddc05eac88aa5969dede2c
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Thu Aug 3 23:53:09 2017 -0400

    control: dev notes updates, updates to code per review

commit 4c020ea967d22d3db38468fd46810c304bbba64e
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Mon Jul 31 09:35:40 2017 -0400

    control: updates to reload_policy per review

commit a1218168afb28e65253bd0a5e4984438e0214bba
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Wed Jul 26 12:39:02 2017 -0400

    control: enforce fname argument for reload policy

commit 80a3a2d95d0738818017904920546e42738d3cd7
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Wed Jul 26 12:17:29 2017 -0400

    control: renaming the stats for policy reloads

commit fa2456f55f3cd0925a227ca0e26083b87ee91c26
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Wed Jul 26 11:37:55 2017 -0400

    control: update snort_config.cc per master

commit 408f6872cda9970d940ea8623486fdb829e36024
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Sun Jul 23 16:16:49 2017 -0400

    updating unit tests

commit 249eeee92fdcff74e4fd093e4c5022451aeb484f
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Sat Jul 22 16:07:28 2017 -0400

    control: update binder with new inspector

commit cd0b2b8f38af2d1a38f4b6aedb574791ccf30512
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Mon Jul 17 21:44:41 2017 -0400

    control: Changes per code review : reinstantiate default binder when inspectors are enabled. rename command to reload_policy

commit 06e84c034ec8da7fe8daea2afb8d0ed9e26136cc
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Fri Jul 14 16:48:34 2017 -0400

    control: delete the old binder while reloading inspector

commit 9b1928c8587b878b518eb7b5339ec290c613daa5
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Wed Jul 26 11:05:30 2017 -0400

    control: resolve merge conflicts
19 files changed:
src/dev_notes.txt
src/hash/test/sfghash_test.cc
src/ips_options/test/ips_regex_test.cc
src/main.cc
src/main.h
src/main/policy.cc
src/main/policy.h
src/main/snort.cc
src/main/snort.h
src/main/snort_config.cc
src/main/snort_config.h
src/main/snort_module.cc
src/managers/inspector_manager.cc
src/managers/inspector_manager.h
src/managers/module_manager.cc
src/search_engines/test/hyperscan_test.cc
src/search_engines/test/search_tool_test.cc
src/utils/stats.cc
src/utils/stats.h