Merge pull request #2997 in SNORT/snort3 from ~KATHARVE/snort3:issues_fix to master

Squashed commit of the following:

commit b616ac88a9716e843939404d638da82c71aabd62
Author: Katura Harvey <katharve@cisco.com>
Date:   Mon Jul 26 10:28:24 2021 -0400

    http2_inspect: remove unused variables

diff --git a/src/service_inspectors/http2_inspect/http2_hpack.h b/src/service_inspectors/http2_inspect/http2_hpack.h
index 07ea8ed6c625ac06915b4cc66150ddf9b628d4b9..1a0b5f90a41a5b81da145b315da25b220de7d6b2 100644 (file)
--- a/src/service_inspectors/http2_inspect/http2_hpack.h
+++ b/src/service_inspectors/http2_inspect/http2_hpack.h
@@ -44,7 +44,7 @@ public:
     Http2HpackDecoder(Http2FlowData* flow_data, HttpCommon::SourceId src_id,
         Http2EventGen* const _events, Http2Infractions* const _infractions) :
         session_data(flow_data), events(_events), infractions(_infractions), source_id(src_id),
-        decode_table(flow_data, src_id) { }
+        decode_table(flow_data) { }
     bool decode_headers(const uint8_t* encoded_headers, const uint32_t encoded_headers_length,
         uint8_t* decoded_headers, Http2StartLine* start_line, bool trailers);
     bool write_decoded_headers(const uint8_t* in_buffer, const uint32_t in_length,

diff --git a/src/service_inspectors/http2_inspect/http2_hpack_table.h b/src/service_inspectors/http2_inspect/http2_hpack_table.h
index 16ac1330f07c4a720644a01ce5984f9c33f2fae2..579253ef251632bfa31139bf0ed8347c510d62a6 100644 (file)
--- a/src/service_inspectors/http2_inspect/http2_hpack_table.h
+++ b/src/service_inspectors/http2_inspect/http2_hpack_table.h
@@ -40,9 +40,7 @@ struct HpackTableEntry
 class HpackIndexTable
 {
 public:
-    HpackIndexTable(Http2FlowData* flow_data, HttpCommon::SourceId src_id) :
-        dynamic_table(flow_data), session_data(flow_data), source_id(src_id)
-        { }
+    HpackIndexTable(Http2FlowData* flow_data) : dynamic_table(flow_data) { }
     const HpackTableEntry* lookup(uint64_t index) const;
     bool add_index(const Field& name, const Field& value);
     HpackDynamicTable& get_dynamic_table() { return dynamic_table; }
@@ -53,7 +51,5 @@ public:
 private:
     const static HpackTableEntry static_table[STATIC_MAX_INDEX + 1];
     HpackDynamicTable dynamic_table;
-    Http2FlowData* session_data;
-    HttpCommon::SourceId source_id;
 };
 #endif