From: Russ Combs (rucombs) Date: Thu, 27 Sep 2018 13:13:48 +0000 (-0400) Subject: Merge pull request #1371 in SNORT/snort3 from typos to master X-Git-Tag: 3.0.0-249~41 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=854ef8bed5efaf83839bf956f3edd98b24ce47ea;p=thirdparty%2Fsnort3.git Merge pull request #1371 in SNORT/snort3 from typos to master Squashed commit of the following: commit 46622b7e8f5d394060d66e543c4c814fb7d31661 Author: Russ Combs Date: Tue Sep 25 23:51:05 2018 -0400 manual: fix some typos commit 304524c7a7aa1214225258cb4f919779de3f8aa4 Author: Russ Combs Date: Tue Sep 25 23:42:07 2018 -0400 source: fix some typos --- diff --git a/doc/active.txt b/doc/active.txt index 0c88f12ad..3c48eff2a 100644 --- a/doc/active.txt +++ b/doc/active.txt @@ -88,7 +88,7 @@ resetting it. The page to be sent can be read from a file: - react = { page = "custmized_block_page.html", } + react = { page = "customized_block_page.html", } or else the default is used: diff --git a/src/detection/regex_offload.cc b/src/detection/regex_offload.cc index 9e34e056d..d29d4d37f 100644 --- a/src/detection/regex_offload.cc +++ b/src/detection/regex_offload.cc @@ -119,7 +119,7 @@ void RegexOffload::worker(RegexRequest* req) void RegexOffload::tterm() { - // FIXIT-M break this overcoupling. In reality we shouldn't be evaluating latency in offload. + // FIXIT-M break this over-coupling. In reality we shouldn't be evaluating latency in offload. PacketLatency::tterm(); RuleLatency::tterm(); } diff --git a/src/file_api/circular_buffer.cc b/src/file_api/circular_buffer.cc index 1452082ce..e71f28a94 100644 --- a/src/file_api/circular_buffer.cc +++ b/src/file_api/circular_buffer.cc @@ -22,7 +22,7 @@ ** ** NOTES ** - ** Circular buffer is thread safe for one writer and one reader thread + ** Circular buffer is thread-safe for one writer and one reader thread ** ** This implementation is inspired by one slot open approach. ** See http://en.wikipedia.org/wiki/Circular_buffer diff --git a/src/flow/flow_key.cc b/src/flow/flow_key.cc index c4dc91ffc..afaf68267 100644 --- a/src/flow/flow_key.cc +++ b/src/flow/flow_key.cc @@ -103,7 +103,7 @@ inline bool FlowKey::init4( if (ip_proto == IpProtocol::ICMPV4) update_icmp4(srcIP, srcPort, dstIP, dstPort); - + src = srcIP->get_ip4_value(); dst = dstIP->get_ip4_value(); @@ -324,7 +324,7 @@ uint32_t FlowKey::hash(HashFnc* hf, const unsigned char* p, int) a += d[9]; // port lo & port hi b += d[10]; // vlan tag, address space id - c += d[11]; // ip_proto, pkt_type, version, and 8bits of zeroed pad, + c += d[11]; // ip_proto, pkt_type, version, and 8 bits of zeroed pad finalize(a, b, c); diff --git a/src/main/snort_config.cc b/src/main/snort_config.cc index 91ecf2d77..303a69de0 100644 --- a/src/main/snort_config.cc +++ b/src/main/snort_config.cc @@ -253,7 +253,7 @@ SnortConfig::~SnortConfig() if ( scratch_handlers[i - 1].second ) scratch_handlers[i - 1].second(this); } - // FIXME-T: Do we need to shrink_to_fit() state->scratch at this point? + // FIXIT-T: Do we need to shrink_to_fit() state->scratch at this point? } FreeRuleLists(this); diff --git a/src/main/snort_debug.h b/src/main/snort_debug.h index 2c67171d8..f934cd690 100644 --- a/src/main/snort_debug.h +++ b/src/main/snort_debug.h @@ -21,7 +21,7 @@ #ifndef SNORT_DEBUG_H #define SNORT_DEBUG_H -// this provides a module trace capabilty that can be set by config to +// this provides a module trace capability that can be set by config to // turn on the output of specific debug messages. // diff --git a/src/network_inspectors/appid/appid_config.cc b/src/network_inspectors/appid/appid_config.cc index f179f5ca7..ede083f09 100644 --- a/src/network_inspectors/appid/appid_config.cc +++ b/src/network_inspectors/appid/appid_config.cc @@ -133,7 +133,7 @@ AppIdConfig::~AppIdConfig() cleanup(); } -//FIXIT-M: RELOAD - Move app info tabe cleanup back +//FIXIT-M: RELOAD - Move app info table cleanup back //to AppId config destructor - cleanup() void AppIdConfig::pterm() { diff --git a/src/network_inspectors/appid/appid_http_session.h b/src/network_inspectors/appid/appid_http_session.h index 198608fa5..2b592c83d 100644 --- a/src/network_inspectors/appid/appid_http_session.h +++ b/src/network_inspectors/appid/appid_http_session.h @@ -41,7 +41,7 @@ class HttpPatternMatchers; // 0 - 8 (inclusive) : used heavily in CHP code. DO NOT CHANGE. // 9 - NUM_METADATA_FIELDS : extra metadata buffers, beyond CHP. // NUM_METADATA_FIELDS : must always follow the last metadata FID. -// NUM_HTTP_FIELDS : number of CHP filds, so always RSP_BODY_FID + 1 +// NUM_HTTP_FIELDS : number of CHP fields, so always RSP_BODY_FID + 1 enum HttpFieldIds : uint8_t { // 0-8: CHP fields. DO NOT CHANGE diff --git a/src/network_inspectors/appid/lua_detector_flow_api.cc b/src/network_inspectors/appid/lua_detector_flow_api.cc index c1e190815..9aa2fb00c 100644 --- a/src/network_inspectors/appid/lua_detector_flow_api.cc +++ b/src/network_inspectors/appid/lua_detector_flow_api.cc @@ -313,7 +313,7 @@ static int clear_detector_flow_flag(lua_State* L) } /**Set service id on a flow - * If funtion is implemented, then + * If function is implemented, then * verify detector user data and that we are in packet context * * @param Lua_State* - Lua state variable. @@ -325,7 +325,7 @@ static int set_detector_flow_service_id(lua_State*) { return 0; } /**Set client application id on a flow, during packet processing - * If funtion is implemented, then + * If function is implemented, then * verify detector user data and that we are in packet context * * @param Lua_State* - Lua state variable. @@ -339,7 +339,7 @@ static int set_detecter_flow_cln_app_id(lua_State*) } /**Set client application type id on a flow, during packet processing - * If funtion is implemented, then + * If function is implemented, then * verify detector user data and that we are in packet context * * @param Lua_State* - Lua state variable. diff --git a/src/network_inspectors/packet_capture/packet_capture.cc b/src/network_inspectors/packet_capture/packet_capture.cc index 3bfa85085..ac7c644fa 100644 --- a/src/network_inspectors/packet_capture/packet_capture.cc +++ b/src/network_inspectors/packet_capture/packet_capture.cc @@ -76,7 +76,7 @@ static void _capture_term() static bool bpf_compile_and_validate() { - // FIXIT-M This BPF compilation is not threadsafe and should be handled by the main thread + // FIXIT-M This BPF compilation is not thread-safe and should be handled by the main thread // and this call should use DLT from DAQ rather then hard coding DLT_EN10MB if ( pcap_compile_nopcap(SNAP_LEN, DLT_EN10MB, &bpf, config.filter.c_str(), 1, 0) >= 0 ) diff --git a/src/network_inspectors/packet_tracer/packet_tracer.cc b/src/network_inspectors/packet_tracer/packet_tracer.cc index 80c67dbcb..af5a3b5cd 100644 --- a/src/network_inspectors/packet_tracer/packet_tracer.cc +++ b/src/network_inspectors/packet_tracer/packet_tracer.cc @@ -50,7 +50,7 @@ using namespace snort; static const uint8_t VERDICT_REASON_NO_BLOCK = 2; /* Not blocking packet; all enum defined after this indicates blocking */ -// FIXIT-M currently non-threadsafe accesses being done in packet threads against this +// FIXIT-M currently non-thread-safe accesses being done in packet threads against this static std::unordered_map reasons = { {VERDICT_REASON_NO_BLOCK, PacketTracer::PRIORITY_UNSET} }; // FIXIT-M refactor the way this is used so all methods are members called against this pointer diff --git a/src/service_inspectors/sip/test/sip_splitter_test.h b/src/service_inspectors/sip/test/sip_splitter_test.h index 2963345d5..a14cbae7e 100644 --- a/src/service_inspectors/sip/test/sip_splitter_test.h +++ b/src/service_inspectors/sip/test/sip_splitter_test.h @@ -36,7 +36,7 @@ const uint8_t no_lf_cr = '\t'; //characters recognized by isspace() as spaces const uint8_t spaces[] = {' ', '\t', '\n', '\v', '\f', '\r'}; -//character recognized by isblanck() as seperators +//character recognized by isblank() as separators const uint8_t blanks[] = {' ', '\t' }; class SipSplitterUT diff --git a/tools/snort2lua/helpers/converter.cc b/tools/snort2lua/helpers/converter.cc index 66b65a7b3..709398c60 100644 --- a/tools/snort2lua/helpers/converter.cc +++ b/tools/snort2lua/helpers/converter.cc @@ -215,7 +215,7 @@ int Converter::parse_file( if ( tmp.empty() ) continue; - // same critea used for rtrim + // same criteria used for rtrim // http://en.cppreference.com/w/cpp/string/byte/isspace std::size_t first_non_white_char = tmp.find_first_not_of(" \f\n\r\t\v");