From: Victor Julien Date: Thu, 9 Jan 2014 10:06:59 +0000 (+0100) Subject: App Layer: cleanup state func naming X-Git-Tag: suricata-2.0rc1~251 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8527b8e08ef2fcbde5c64301b13a1bff6dcb1a6a;p=thirdparty%2Fsuricata.git App Layer: cleanup state func naming Rename functions related to AppLayerState to be more consistent. --- diff --git a/src/app-layer-htp.c b/src/app-layer-htp.c index ca793007a1..cfd063a530 100644 --- a/src/app-layer-htp.c +++ b/src/app-layer-htp.c @@ -720,7 +720,7 @@ static int HTPHandleRequestData(Flow *f, void *htp_state, HTPHandleError(hstate); /* if the TCP connection is closed, then close the HTTP connection */ - if (AppLayerParserParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF) && + if (AppLayerParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF) && !(hstate->flags & HTP_FLAG_STATE_CLOSED_TS)) { htp_connp_close(hstate->connp, &ts); @@ -796,7 +796,7 @@ static int HTPHandleResponseData(Flow *f, void *htp_state, } /* if we the TCP connection is closed, then close the HTTP connection */ - if (AppLayerParserParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF) && + if (AppLayerParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF) && !(hstate->flags & HTP_FLAG_STATE_CLOSED_TC)) { htp_connp_close(hstate->connp, &ts); @@ -5517,7 +5517,7 @@ static int HTPBodyReassemblyTest01(void) memset(&hstate, 0x00, sizeof(hstate)); Flow flow; memset(&flow, 0x00, sizeof(flow)); - void *parser = AppLayerParserAllocAppLayerParserParserState(); + void *parser = AppLayerParserStateAlloc(); memset(&parser, 0x00, sizeof(parser)); htp_tx_t tx; memset(&tx, 0, sizeof(tx)); diff --git a/src/app-layer-parser.c b/src/app-layer-parser.c index 7b9e96f0c4..b3df7dba7e 100644 --- a/src/app-layer-parser.c +++ b/src/app-layer-parser.c @@ -170,7 +170,7 @@ static void AppLayerParserTransactionsCleanup(uint16_t ipproto, AppProto alproto SCReturn; } -void *AppLayerParserAllocAppLayerParserParserState(void) +void *AppLayerParserStateAlloc(void) { SCEnter(); @@ -183,7 +183,7 @@ void *AppLayerParserAllocAppLayerParserParserState(void) SCReturnPtr(pstate, "pstate"); } -void AppLayerParserDeAllocAppLayerParserParserState(void *pstate) +void AppLayerParserStateFree(void *pstate) { SCEnter(); @@ -725,7 +725,7 @@ int AppLayerParserParse(void *tctx, Flow *f, AppProto alproto, /* Get the parser state (if any) */ pstate = f->alparser; if (pstate == NULL) { - f->alparser = pstate = AppLayerParserAllocAppLayerParserParserState(); + f->alparser = pstate = AppLayerParserStateAlloc(); if (pstate == NULL) goto error; } @@ -734,7 +734,7 @@ int AppLayerParserParse(void *tctx, Flow *f, AppProto alproto, pstate->version); if (flags & STREAM_EOF) - AppLayerParserParserStateSetFlag(pstate, APP_LAYER_PARSER_EOF); + AppLayerParserStateSetFlag(pstate, APP_LAYER_PARSER_EOF); alstate = f->alstate; if (alstate == NULL) { @@ -802,7 +802,7 @@ void AppLayerParserSetEOF(void *pstate) if (pstate == NULL) goto end; - AppLayerParserParserStateSetFlag(pstate, APP_LAYER_PARSER_EOF); + AppLayerParserStateSetFlag(pstate, APP_LAYER_PARSER_EOF); /* increase version so we will inspect it one more time * with the EOF flags now set */ ((AppLayerParserState *)pstate)->version++; @@ -883,7 +883,7 @@ void AppLayerParserTriggerRawStreamReassembly(Flow *f) /***** Cleanup *****/ -void AppLayerParserCleanupParserState(uint16_t ipproto, AppProto alproto, void *alstate, void *pstate) +void AppLayerParserStateCleanup(uint16_t ipproto, AppProto alproto, void *alstate, void *pstate) { SCEnter(); @@ -894,7 +894,7 @@ void AppLayerParserCleanupParserState(uint16_t ipproto, AppProto alproto, void * /* free the app layer parser api state */ if (pstate != NULL) - AppLayerParserDeAllocAppLayerParserParserState(pstate); + AppLayerParserStateFree(pstate); SCReturn; } @@ -955,14 +955,14 @@ void AppLayerParserRegisterProtocolParsers(void) } -void AppLayerParserParserStateSetFlag(void *pstate, uint8_t flag) +void AppLayerParserStateSetFlag(void *pstate, uint8_t flag) { SCEnter(); ((AppLayerParserState *)pstate)->flags |= flag; SCReturn; } -int AppLayerParserParserStateIssetFlag(void *pstate, uint8_t flag) +int AppLayerParserStateIssetFlag(void *pstate, uint8_t flag) { SCEnter(); SCReturnInt(((AppLayerParserState *)pstate)->flags & flag); @@ -982,7 +982,7 @@ void AppLayerParserStreamTruncated(uint16_t ipproto, AppProto alproto, void *als } #ifdef DEBUG -void AppLayerParserPrintDetailsParserState(void *pstate) +void AppLayerParserStatePrintDetails(void *pstate) { SCEnter(); diff --git a/src/app-layer-parser.h b/src/app-layer-parser.h index 5025763a0a..af8016730d 100644 --- a/src/app-layer-parser.h +++ b/src/app-layer-parser.h @@ -157,26 +157,26 @@ void AppLayerParserTriggerRawStreamReassembly(Flow *f); /***** Cleanup *****/ -void AppLayerParserCleanupParserState(uint16_t ipproto, AppProto alproto, void *alstate, void *pstate); +void AppLayerParserStateCleanup(uint16_t ipproto, AppProto alproto, void *alstate, void *pstate); void AppLayerParserRegisterProtocolParsers(void); -void AppLayerParserParserStateSetFlag(void *pstate, uint8_t flag); -int AppLayerParserParserStateIssetFlag(void *pstate, uint8_t flag); +void AppLayerParserStateSetFlag(void *pstate, uint8_t flag); +int AppLayerParserStateIssetFlag(void *pstate, uint8_t flag); void AppLayerParserStreamTruncated(uint16_t ipproto, AppProto alproto, void *alstate, uint8_t direction); -void *AppLayerParserAllocAppLayerParserParserState(void); -void AppLayerParserDeAllocAppLayerParserParserState(void *pstate); +void *AppLayerParserStateAlloc(void); +void AppLayerParserStateFree(void *pstate); #ifdef DEBUG -void AppLayerParserPrintDetailsParserState(void *pstate); +void AppLayerParserStatePrintDetails(void *pstate); #endif /***** Unittests *****/ diff --git a/src/app-layer-smtp.c b/src/app-layer-smtp.c index 6b0956c78a..cbc49ced8e 100644 --- a/src/app-layer-smtp.c +++ b/src/app-layer-smtp.c @@ -574,7 +574,7 @@ static int SMTPProcessReply(SMTPState *state, Flow *f, if (reply_code == SMTP_REPLY_220) { /* we are entering STARRTTLS data mode */ state->parser_state |= SMTP_PARSER_STATE_COMMAND_DATA_MODE; - AppLayerParserParserStateSetFlag(pstate, + AppLayerParserStateSetFlag(pstate, APP_LAYER_PARSER_NO_INSPECTION | APP_LAYER_PARSER_NO_REASSEMBLY); } else { diff --git a/src/app-layer-ssl.c b/src/app-layer-ssl.c index 19dbf22c5f..0196fb4349 100644 --- a/src/app-layer-ssl.c +++ b/src/app-layer-ssl.c @@ -643,10 +643,10 @@ static int SSLv2Decode(uint8_t direction, SSLState *ssl_state, if ((ssl_state->flags & SSL_AL_FLAG_SSL_CLIENT_SSN_ENCRYPTED) && (ssl_state->flags & SSL_AL_FLAG_SSL_SERVER_SSN_ENCRYPTED)) { - AppLayerParserParserStateSetFlag(pstate, + AppLayerParserStateSetFlag(pstate, APP_LAYER_PARSER_NO_INSPECTION); if (ssl_config.no_reassemble == 1) - AppLayerParserParserStateSetFlag(pstate, APP_LAYER_PARSER_NO_REASSEMBLY); + AppLayerParserStateSetFlag(pstate, APP_LAYER_PARSER_NO_REASSEMBLY); SCLogDebug("SSLv2 No reassembly & inspection has been set"); } } @@ -718,9 +718,9 @@ static int SSLv3Decode(uint8_t direction, SSLState *ssl_state, if ((ssl_state->flags & SSL_AL_FLAG_CLIENT_CHANGE_CIPHER_SPEC) && (ssl_state->flags & SSL_AL_FLAG_SERVER_CHANGE_CIPHER_SPEC)) { /* set flags */ - AppLayerParserParserStateSetFlag(pstate, APP_LAYER_PARSER_NO_INSPECTION); + AppLayerParserStateSetFlag(pstate, APP_LAYER_PARSER_NO_INSPECTION); if (ssl_config.no_reassemble == 1) - AppLayerParserParserStateSetFlag(pstate, APP_LAYER_PARSER_NO_REASSEMBLY); + AppLayerParserStateSetFlag(pstate, APP_LAYER_PARSER_NO_REASSEMBLY); } break; @@ -3491,7 +3491,7 @@ static int SSLParserTest23(void) goto end; } - if (!AppLayerParserParserStateIssetFlag(f.alparser, APP_LAYER_PARSER_NO_INSPECTION) && + if (!AppLayerParserStateIssetFlag(f.alparser, APP_LAYER_PARSER_NO_INSPECTION) && !(ssn.client.flags & STREAMTCP_STREAM_FLAG_NOREASSEMBLY) && !(ssn.server.flags & STREAMTCP_STREAM_FLAG_NOREASSEMBLY)) { printf("The flags should be set\n"); diff --git a/src/detect.c b/src/detect.c index 678cf0c37c..f16209b346 100644 --- a/src/detect.c +++ b/src/detect.c @@ -1006,7 +1006,7 @@ static void DebugInspectIds(Packet *p, Flow *f, StreamMsg *smsg) p->pcap_cnt, p->flowflags & FLOW_PKT_TOSERVER ? "toserver" : "toclient", p->flags & PKT_STREAM_EST ? "established" : "stateless", smsg ? "yes" : "no"); - AppLayerParserPrintDetailsParserState(f->alparser); + AppLayerParserStatePrintDetails(f->alparser); } #endif diff --git a/src/flow.c b/src/flow.c index 533b980244..9f9e2bd4bd 100644 --- a/src/flow.c +++ b/src/flow.c @@ -97,7 +97,7 @@ void FlowCleanupAppLayer(Flow *f) if (f == NULL || f->proto == 0) return; - AppLayerParserCleanupParserState(f->proto, f->alproto, f->alstate, f->alparser); + AppLayerParserStateCleanup(f->proto, f->alproto, f->alstate, f->alparser); f->alstate = NULL; f->alparser = NULL; return; diff --git a/src/log-httplog.c b/src/log-httplog.c index e8de1bdf14..48d860dad4 100644 --- a/src/log-httplog.c +++ b/src/log-httplog.c @@ -505,7 +505,7 @@ static TmEcode LogHttpLogIPWrapper(ThreadVars *tv, Packet *p, void *data, Packet continue; } - if (!AppLayerParserParserStateIssetFlag(p->flow->alparser, APP_LAYER_PARSER_EOF)) { + if (!AppLayerParserStateIssetFlag(p->flow->alparser, APP_LAYER_PARSER_EOF)) { tx_progress = AppLayerParserGetStateProgress(IPPROTO_TCP, ALPROTO_HTTP, tx, STREAM_TOSERVER); if (tx_progress < tx_progress_done_value_ts) break;