]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1152 in SNORT/snort3 from thread_locals to master
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Tue, 27 Mar 2018 19:38:52 +0000 (15:38 -0400)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Tue, 27 Mar 2018 19:38:52 +0000 (15:38 -0400)
commitb817455b44f6214fdcbc6881ed22f6c17d74162e
tree7d79aee433d0bf7c5df7196b4d3bc2f9db8a9f2e
parenta230cf061d4c3f44c8195f05983b16bf5ff2a6b8
Merge pull request #1152 in SNORT/snort3 from thread_locals to master

Squashed commit of the following:

commit 6fd127316644edddab9f03949a49a0e88ecde837
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Mon Mar 19 14:26:22 2018 -0400

    sfip: removed ntoa. use ntop(SfIpString) instead.

commit bd42f67b12a43aea0793c75c4ac0ee38b36fb33a
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Mon Mar 19 13:18:12 2018 -0400

    stream ip: refactored to use MemoryManager allocators

commit 818c7a25505ae6e151790db3e76027252cb854e0
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Fri Mar 16 14:06:08 2018 -0400

    jsnorm: moved decode buffer to stack

commit 7c91b75afa0ab2a95791c93b0e3e59a55b332f04
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Tue Mar 20 15:53:32 2018 -0400

    Buffer: fixed off-by-one error in underlying buffer handling

commit dc54e219cc30033dac1cb93915508a7a945695e2
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Fri Mar 16 13:14:29 2018 -0400

    PacketManager: moved encode storage to heap

commit 7604a81d30a022ff3b50f4116fddd38246057f54
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Fri Mar 16 12:57:37 2018 -0400

    CodecManager: removed unused code

commit 18b6d223d5bba03483b5ea02563328b784990009
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Fri Mar 16 12:47:50 2018 -0400

    Snort: moved s_data to heap

commit c04fd730a33ed86cd68e4a1e2739157d5eaf73a0
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Fri Mar 16 09:48:26 2018 -0400

    appid sip: moved pattern thread local to class instance

commit 46c886725f8b69cfeb36c9b5580970dfbeabc703
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Mar 15 14:47:22 2018 -0400

    Base64DecodeOption: moved buffer storage to regular heap
38 files changed:
extra/src/inspectors/data_log/data_log.cc
extra/src/loggers/alert_json/alert_json.cc
src/detection/detect_trace.cc
src/detection/rtn_checks.cc
src/detection/tag.cc
src/file_api/file_log.cc
src/framework/codec.cc
src/ips_options/ips_base64.cc
src/ips_options/ips_session.cc
src/loggers/alert_csv.cc
src/main/snort.cc
src/managers/codec_manager.cc
src/network_inspectors/appid/appid_detector.h
src/network_inspectors/appid/appid_inspector.cc
src/network_inspectors/appid/client_plugins/client_discovery.cc
src/network_inspectors/appid/detector_plugins/detector_sip.cc
src/network_inspectors/appid/detector_plugins/detector_sip.h
src/network_inspectors/arp_spoof/arp_spoof.cc
src/network_inspectors/port_scan/ipobj.cc
src/network_inspectors/port_scan/port_scan.cc
src/network_inspectors/reputation/reputation_inspect.cc
src/network_inspectors/reputation/reputation_parse.cc
src/packet_io/intf.cc
src/protocols/packet_manager.cc
src/protocols/packet_manager.h
src/service_inspectors/sip/sip_dialog.cc
src/sfip/sf_cidr.h
src/sfip/sf_ip.cc
src/sfip/sf_ip.h
src/sfip/sf_ipvar.cc
src/sfrt/sfrt_test.cc
src/stream/ip/ip_defrag.cc
src/stream/ip/ip_module.h
src/stream/ip/ip_session.cc
src/target_based/sftarget_reader.cc
src/utils/util_jsnorm.cc
src/utils/util_jsnorm.h
src/utils/util_net.cc