From: Tom Peters (thopeter) <thopeter@cisco.com>
Date: Mon, 5 Nov 2018 20:27:37 +0000 (-0500)
Subject: Merge pull request #1417 in SNORT/snort3 from http2gid to master
X-Git-Tag: 3.0.0-249~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60668501f48af9484324200199451355cda7a3d8;p=thirdparty%2Fsnort3.git

Merge pull request #1417 in SNORT/snort3 from http2gid to master

Squashed commit of the following:

commit 73f557410d0e828718194046dabca9a520739f09
Author: Mike Redden <miredden@cisco.com>
Date:   Thu Nov 1 14:24:37 2018 -0400

    http2_inspect: Change http2 GID from 219 to 121
---

diff --git a/src/service_inspectors/http2_inspect/http2_enum.h b/src/service_inspectors/http2_inspect/http2_enum.h
index 6413112c1..dc3f34169 100644
--- a/src/service_inspectors/http2_inspect/http2_enum.h
+++ b/src/service_inspectors/http2_inspect/http2_enum.h
@@ -28,8 +28,7 @@ static const int MAX_OCTETS = 63780;
 static const int DATA_SECTION_SIZE = 16384;
 static const int FRAME_HEADER_LENGTH = 9;
 
-// FIXIT-RC need to replace with a real number. CRC: use 120.
-static const uint32_t HTTP2_GID = 219;
+static const uint32_t HTTP2_GID = 121;
 
 // Message originator--client or server
 enum SourceId { SRC__NOT_COMPUTE=-14, SRC_CLIENT=0, SRC_SERVER=1 };