http2: rename state *start to *started

This is to make the hook use names consistent with the default
hooks and other protocols.
pull/15846/head
Victor Julien 4 months ago
parent f8f28c6f6f
commit cf216b6309

@ -137,7 +137,7 @@ pub enum HTTP2FrameTypeData {
#[derive(AppLayerState, Copy, Clone, PartialOrd, PartialEq, Eq, Debug)]
#[suricata(alstate_strip_prefix = "HTTP2Prog")]
pub enum HTTP2TxProgress {
HTTP2ProgStart = 0,
HTTP2ProgStarted = 0,
HTTP2ProgHeaders = 1,
HTTP2ProgData = 2,
HTTP2ProgClosed = 3,
@ -148,7 +148,7 @@ pub enum HTTP2TxProgress {
#[derive(AppLayerState, Copy, Clone, PartialOrd, PartialEq, Eq, Debug)]
#[suricata(alstate_strip_prefix = "HTTP2ProgGlobal")]
pub enum HTTP2TxGlobalProgress {
HTTP2ProgGlobalStart = 0,
HTTP2ProgGlobalStarted = 0,
HTTP2ProgGlobalComplete = 1,
}
@ -180,8 +180,8 @@ pub struct HTTP2StreamProgress {
impl HTTP2StreamProgress {
fn init() -> Self {
Self {
progress_ts: HTTP2TxProgress::HTTP2ProgStart,
progress_tc: HTTP2TxProgress::HTTP2ProgStart,
progress_ts: HTTP2TxProgress::HTTP2ProgStarted,
progress_tc: HTTP2TxProgress::HTTP2ProgStarted,
}
}
fn complete() -> Self {
@ -212,8 +212,8 @@ pub struct HTTP2GlobalProgress {
impl HTTP2GlobalProgress {
fn _init() -> Self {
Self {
progress_ts: HTTP2TxGlobalProgress::HTTP2ProgGlobalStart,
progress_tc: HTTP2TxGlobalProgress::HTTP2ProgGlobalStart,
progress_ts: HTTP2TxGlobalProgress::HTTP2ProgGlobalStarted,
progress_tc: HTTP2TxGlobalProgress::HTTP2ProgGlobalStarted,
}
}
fn complete() -> Self {

@ -173,15 +173,15 @@ void DetectHttpProtocolRegister(void)
HTP_RESPONSE_PROGRESS_LINE, DetectEngineInspectBufferGeneric, GetData);
DetectAppLayerInspectEngineRegisterSubState(BUFFER_NAME, ALPROTO_HTTP2, SIG_FLAG_TOSERVER,
HTTP2TxTypeStream, HTTP2ProgStart, DetectEngineInspectBufferGeneric, GetData2);
HTTP2TxTypeStream, HTTP2ProgStarted, DetectEngineInspectBufferGeneric, GetData2);
DetectAppLayerMpmRegisterSubState(BUFFER_NAME, SIG_FLAG_TOSERVER, 2,
PrefilterGenericMpmRegister, GetData2, ALPROTO_HTTP2, HTTP2TxTypeStream,
HTTP2ProgStart);
HTTP2ProgStarted);
DetectAppLayerInspectEngineRegisterSubState(BUFFER_NAME, ALPROTO_HTTP2, SIG_FLAG_TOCLIENT,
HTTP2TxTypeStream, HTTP2ProgStart, DetectEngineInspectBufferGeneric, GetData2);
HTTP2TxTypeStream, HTTP2ProgStarted, DetectEngineInspectBufferGeneric, GetData2);
DetectAppLayerMpmRegisterSubState(BUFFER_NAME, SIG_FLAG_TOCLIENT, 2,
PrefilterGenericMpmRegister, GetData2, ALPROTO_HTTP2, HTTP2TxTypeStream,
HTTP2ProgStart);
HTTP2ProgStarted);
DetectBufferTypeSetDescriptionByName(BUFFER_NAME,
BUFFER_DESC);

@ -118,10 +118,10 @@ void DetectHttpStatMsgRegister (void)
GetData, ALPROTO_HTTP1, HTP_RESPONSE_PROGRESS_LINE);
DetectAppLayerInspectEngineRegisterSubState("http_stat_msg", ALPROTO_HTTP2, SIG_FLAG_TOCLIENT,
HTTP2TxTypeStream, HTTP2ProgStart, DetectEngineInspectBufferGeneric, GetData2);
HTTP2TxTypeStream, HTTP2ProgStarted, DetectEngineInspectBufferGeneric, GetData2);
DetectAppLayerMpmRegisterSubState("http_stat_msg", SIG_FLAG_TOCLIENT, 2,
PrefilterGenericMpmRegister, GetData2, ALPROTO_HTTP2, HTTP2TxTypeStream,
HTTP2ProgStart);
HTTP2ProgStarted);
DetectBufferTypeSetDescriptionByName("http_stat_msg",
"http response status message");

Loading…
Cancel
Save