Removal of per flow 'aldata' array. It contained a ptr for each ALPROTO. Instead now we have 2 ptrs in the flow: alparser and alstate.
Various cleanups and dead code removal from the app layer API.
Should safe 100+ bytes memory per flow on 64 bit.
Updated lots of unittests to reflect these changes.
FLOW_INITIALIZE(&f);
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_DCERPC_UDP, STREAM_TOSERVER|STREAM_START, dcerpcrequest, requestlen);
if (r != 0) {
goto end;
}
- DCERPCUDPState *dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC_UDP)];
+ DCERPCUDPState *dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_DCERPC, STREAM_TOSERVER|STREAM_START, dcerpcbind, bindlen);
if (r != 0) {
goto end;
}
- DCERPCState *dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ DCERPCState *dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
result = 0;
goto end;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_DCERPC, STREAM_TOSERVER|STREAM_START, dcerpcrequest, requestlen);
if (r != 0) {
goto end;
}
- DCERPCState *dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ DCERPCState *dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_DCERPC, STREAM_TOSERVER|STREAM_START, dcerpcrequest, requestlen);
if (r != 0) {
goto end;
}
- DCERPCState *dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ DCERPCState *dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
result = 0;
goto end;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
/* bind */
int r = AppLayerParse(&f, ALPROTO_DCERPC, STREAM_TOSERVER|STREAM_START,
goto end;
}
- DCERPCState *dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ DCERPCState *dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
result = 0;
goto end;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_DCERPC, STREAM_TOSERVER | STREAM_START,
bind1, bind1_len);
goto end;
}
- DCERPCState *dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ DCERPCState *dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
result = 0;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_DCERPC, STREAM_TOSERVER|STREAM_START,
bind1, bind1_len);
goto end;
}
- DCERPCState *dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ DCERPCState *dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
result = 0;
result &= (dcerpc_state->dcerpc.dcerpcbindbindack.numctxitemsleft == 0);
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_DCERPC, STREAM_TOSERVER|STREAM_START,
request1, request1_len);
goto end;
}
- DCERPCState *dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ DCERPCState *dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
result = 0;
result &= (dcerpc_state->dcerpc.pdu_fragged == 0);
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_DCERPC, STREAM_TOSERVER | STREAM_START,
request, request_len);
goto end;
}
- DCERPCState *dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ DCERPCState *dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
result = 0;
result &= (dcerpc_state->dcerpc.pdu_fragged == 0);
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_DCERPC, STREAM_TOSERVER | STREAM_START,
request, request_len);
goto end;
}
- DCERPCState *dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ DCERPCState *dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
result = 0;
result &= (dcerpc_state->dcerpc.pdu_fragged == 1);
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_DCERPC, STREAM_TOSERVER|STREAM_START,
fault, fault_len);
goto end;
}
- DCERPCState *dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ DCERPCState *dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
result = 0;
result &= (dcerpc_state->dcerpc.pdu_fragged == 0);
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_DCERPC, STREAM_TOSERVER,
request1, request1_len);
goto end;
}
- DCERPCState *dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ DCERPCState *dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
result = 0;
result &= (dcerpc_state->dcerpc.pdu_fragged == 0);
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_DCERPC, STREAM_TOSERVER,
bind_ack1, bind_ack1_len);
goto end;
}
- DCERPCState *dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ DCERPCState *dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
result = 0;
result &= (dcerpc_state->dcerpc.pdu_fragged == 0);
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_DCERPC, STREAM_TOSERVER,
bind, bind_len);
goto end;
}
- DCERPCState *dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ DCERPCState *dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_DCERPC, STREAM_TOSERVER,
bind, bind_len);
goto end;
}
- DCERPCState *dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ DCERPCState *dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_DCERPC, STREAM_TOCLIENT,
bind_ack, bind_ack_len);
goto end;
}
- DCERPCState *dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ DCERPCState *dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_DCERPC, STREAM_TOSERVER,
bind1, bind1_len);
goto end;
}
- DCERPCState *dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ DCERPCState *dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_DCERPC, STREAM_TOSERVER,
bind, bind_len);
goto end;
}
- DCERPCState *dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ DCERPCState *dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_DCERPC, STREAM_TOSERVER,
request1, request1_len);
goto end;
}
- DCERPCState *dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ DCERPCState *dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
result = 0;
result &= (dcerpc_state->dcerpc.dcerpcrequest.opnum == 2);
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
{
int result = 0;
Flow f;
- HtpState *http_state = NULL;
uint8_t http_buf1[] = "MPUT one\r\n";
uint32_t http_buf1_len = sizeof(http_buf1) - 1;
TcpSession ssn;
f.alproto = ALPROTO_FTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
- if (http_state != NULL) {
- printf("this is not http: ");
- goto end;
- }
-
/* do detect */
SigMatchSignatures(&tv, de_ctx, det_ctx, p);
}
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
StreamMsg *stream_msg = StreamMsgGetFromPool();
if (stream_msg == NULL) {
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_FTP, STREAM_TOSERVER|STREAM_EOF, ftpbuf, ftplen);
if (r != 0) {
goto end;
}
- FtpState *ftp_state = f.aldata[AlpGetStateIdx(ALPROTO_FTP)];
+ FtpState *ftp_state = f.alstate;
if (ftp_state == NULL) {
SCLogDebug("no ftp state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_FTP, STREAM_TOSERVER|STREAM_START, ftpbuf1, ftplen1);
if (r != 0) {
goto end;
}
- FtpState *ftp_state = f.aldata[AlpGetStateIdx(ALPROTO_FTP)];
+ FtpState *ftp_state = f.alstate;
if (ftp_state == NULL) {
SCLogDebug("no ftp state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_FTP, STREAM_TOSERVER|STREAM_START|STREAM_EOF, ftpbuf1, ftplen1);
if (r != 0) {
goto end;
}
- FtpState *ftp_state = f.aldata[AlpGetStateIdx(ALPROTO_FTP)];
+ FtpState *ftp_state = f.alstate;
if (ftp_state == NULL) {
SCLogDebug("no ftp state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_FTP, STREAM_TOSERVER|STREAM_START, ftpbuf1, ftplen1);
if (r != 0) {
goto end;
}
- FtpState *ftp_state = f.aldata[AlpGetStateIdx(ALPROTO_FTP)];
+ FtpState *ftp_state = f.alstate;
if (ftp_state == NULL) {
SCLogDebug("no ftp state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
uint32_t u;
for (u = 0; u < ftplen1; u++) {
}
}
- FtpState *ftp_state = f.aldata[AlpGetStateIdx(ALPROTO_FTP)];
+ FtpState *ftp_state = f.alstate;
if (ftp_state == NULL) {
SCLogDebug("no ftp state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
{
SCEnter();
- /* Get the parser state (if any) */
- if (f->aldata == NULL) {
- SCLogDebug("no aldata");
- goto error;
- }
-
AppLayerParserStateStore *parser_state_store =
- (AppLayerParserStateStore *)f->aldata[app_layer_sid];
+ (AppLayerParserStateStore *)f->alparser;
if (parser_state_store == NULL) {
SCLogDebug("no state store");
int id = 0;
- HtpState *http_state = f->aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ HtpState *http_state = f->alstate;
if (http_state == NULL || http_state->connp == NULL ||
http_state->connp->conn == NULL) {
SCLogDebug("no (void) http state");
f.dst.family = AF_INET;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
uint32_t u;
for (u = 0; u < httplen1; u++) {
}
}
- htp_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ htp_state = f.alstate;
if (htp_state == NULL) {
printf("no http state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
if (htp_state != NULL)
HTPStateFree(htp_state);
f.dst.family = AF_INET;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_HTTP, STREAM_TOSERVER|STREAM_START|
STREAM_EOF, httpbuf1, httplen1);
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
if (http_state != NULL)
HTPStateFree(http_state);
f.dst.family = AF_INET;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
uint32_t u;
for (u = 0; u < httplen1; u++) {
goto end;
}
}
- htp_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ htp_state = f.alstate;
if (htp_state == NULL) {
printf("no http state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
if (htp_state != NULL)
HTPStateFree(htp_state);
f.dst.family = AF_INET;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_HTTP, STREAM_TOSERVER|STREAM_START|
STREAM_EOF, httpbuf1, httplen1);
goto end;
}
- htp_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ htp_state = f.alstate;
if (htp_state == NULL) {
printf("no http state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
if (htp_state != NULL)
HTPStateFree(htp_state);
f.dst.family = AF_INET;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_HTTP, STREAM_TOSERVER|STREAM_START,
httpbuf1, httplen1);
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
goto end;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
if (http_state != NULL)
HTPStateFree(http_state);
f.dst.family = AF_INET;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_HTTP, STREAM_TOSERVER|STREAM_START,
httpbuf1, httplen1);
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
goto end;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
if (http_state != NULL)
HTPStateFree(http_state);
f.dst.family = AF_INET;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
uint32_t u;
for (u = 0; u < httplen1; u++) {
}
}
- htp_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ htp_state = f.alstate;
if (htp_state == NULL) {
printf("no http state: ");
goto end;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
if (htp_state != NULL)
HTPStateFree(htp_state);
f.dst.family = AF_INET;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
uint8_t flags = 0;
flags = STREAM_TOSERVER|STREAM_START|STREAM_EOF;
goto end;
}
- htp_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ htp_state = f.alstate;
if (htp_state == NULL) {
printf("no http state: ");
result = 0;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
if (htp_state != NULL)
HTPStateFree(htp_state);
f.dst.family = AF_INET;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
uint8_t flags = 0;
flags = STREAM_TOSERVER|STREAM_START|STREAM_EOF;
goto end;
}
- htp_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ htp_state = f.alstate;
if (htp_state == NULL) {
printf("no http state: ");
result = 0;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
if (htp_state != NULL)
HTPStateFree(htp_state);
}
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
uint32_t u;
for (u = 0; u < httplen1; u++) {
}
}
- htp_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ htp_state = f.alstate;
if (htp_state == NULL) {
printf("no http state: ");
result = 0;
ConfRestoreContextBackup();
HtpConfigRestoreBackup();
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
if (htp_state != NULL)
HTPStateFree(htp_state);
#include "util-debug.h"
-uint16_t app_layer_sid = 0;
static AppLayerProto al_proto_table[ALPROTO_MAX]; /**< Application layer protocol
- table mapped to their
- corresponding parsers */
+ table mapped to their
+ corresponding parsers */
#define MAX_PARSERS 100
static AppLayerParserTableElement al_parser_table[MAX_PARSERS];
void AppLayerSetEOF(Flow *f)
{
- if (f == NULL || f->aldata == NULL)
+ if (f == NULL)
return;
AppLayerParserStateStore *parser_state_store =
- (AppLayerParserStateStore *)f->aldata[app_layer_sid];
+ (AppLayerParserStateStore *)f->alparser;
if (parser_state_store != NULL) {
parser_state_store->id_flags |= APP_LAYER_TRANSACTION_EOF;
parser_state_store->to_client.flags |= APP_LAYER_PARSER_EOF;
SCReturnInt(0);
}
-/** app layer id counter */
-static uint8_t al_module_id = 0;
-
-/** \brief Get a unique app layer id
- */
-uint8_t AppLayerRegisterModule(void) {
- uint8_t id = al_module_id;
- al_module_id++;
- return id;
-}
-
-uint8_t AppLayerGetStorageSize(void) {
- return al_module_id;
-}
-
-/** \brief Get the Parsers id for storing the parser state.
- *
- * \retval Parser subsys id
- */
-uint16_t AppLayerParserGetStorageId(void)
-{
- return app_layer_sid;
-}
-
uint16_t AppLayerGetProtoByName(const char *name)
{
uint8_t u = 1;
* \todo do we need recursive, so a "http" and a "request_line" where the engine
* knows it's actually "http.request_line"... same difference maybe.
* \param AppLayerParser pointer to the parser function
- * \param max_outputs max number of unique outputs the parser can generate
*
* \retval 0 on success
* \retval -1 on error
al_parser_table[al_max_parsers].AppLayerParser = AppLayerParser;
SCLogDebug("registered %p at proto %" PRIu32 ", al_proto_table idx "
- "%" PRIu32 ", storage_id %" PRIu32 ", parser_local_id %" PRIu32 "",
+ "%" PRIu32 ", parser_local_id %" PRIu32 "",
AppLayerParser, proto, al_max_parsers,
- al_proto_table[proto].storage_id, parser_id);
+ parser_id);
return 0;
}
al_proto_table[proto].to_client = al_max_parsers;
}
- if (al_proto_table[proto].storage_id == 0) {
- al_proto_table[proto].storage_id = AppLayerRegisterModule();
- }
-
SCLogDebug("registered %p at proto %" PRIu32 " flags %02X, al_proto_table "
- "idx %" PRIu32 ", storage_id %" PRIu32 " %s", AppLayerParser, proto,
- flags, al_max_parsers, al_proto_table[proto].storage_id, name);
+ "idx %" PRIu32 ", %s", AppLayerParser, proto,
+ flags, al_max_parsers, name);
return 0;
}
}
-uint16_t AlpGetStateIdx(uint16_t proto)
-{
- return al_proto_table[proto].storage_id;
-}
-
AppLayerParserStateStore *AppLayerParserStateStoreAlloc(void)
{
AppLayerParserStateStore *s = (AppLayerParserStateStore *)SCMalloc
if (r == -1) {
AppLayerParserResultCleanup(&result);
SCReturnInt(-1);
+#ifdef DEBUG
} else {
BUG_ON(r); /* this is not supposed to happen!! */
+#else
+ SCReturnInt(-1);
+#endif
}
}
if (r == -1) {
retval = -1;
break;
+#ifdef DEBUG
} else {
- BUG_ON(r);
+ BUG_ON(r); /* this is not supposed to happen!! */
+#else
+ SCReturnInt(-1);
+#endif
}
}
}
}
/* Get the parser state (if any) */
- AppLayerParserStateStore *parser_state_store = NULL;
-
- if (f->aldata != NULL) {
- parser_state_store = (AppLayerParserStateStore *)
- f->aldata[app_layer_sid];
- if (parser_state_store == NULL) {
- parser_state_store = AppLayerParserStateStoreAlloc();
- if (parser_state_store == NULL)
- goto error;
-
- f->aldata[app_layer_sid] = (void *)parser_state_store;
- }
- } else {
- SCLogDebug("No App Layer Data");
- /* Nothing is there to clean up, so just return from here after setting
- * up the no reassembly flags */
- FlowSetSessionNoApplayerInspectionFlag(f);
+ AppLayerParserStateStore *parser_state_store = f->alparser;
+ if (parser_state_store == NULL) {
+ parser_state_store = AppLayerParserStateStoreAlloc();
+ if (parser_state_store == NULL)
+ goto error;
- SCReturnInt(-1);
+ f->alparser = (void *)parser_state_store;
}
parser_state_store->version++;
parser_state->flags |= APP_LAYER_PARSER_EOF;
/* See if we already have a 'app layer' state */
- void *app_layer_state = NULL;
- app_layer_state = f->aldata[p->storage_id];
-
+ void *app_layer_state = f->alstate;
if (app_layer_state == NULL) {
/* lock the allocation of state as we may
* alloc more than one otherwise */
goto error;
}
- f->aldata[p->storage_id] = app_layer_state;
- SCLogDebug("alloced new app layer state %p (p->storage_id %u, name %s)",
- app_layer_state, p->storage_id, al_proto_table[f->alproto].name);
+ f->alstate = app_layer_state;
+ SCLogDebug("alloced new app layer state %p (name %s)",
+ app_layer_state, al_proto_table[f->alproto].name);
} else {
- SCLogDebug("using existing app layer state %p (p->storage_id %u, name %s))",
- app_layer_state, p->storage_id, al_proto_table[f->alproto].name);
+ SCLogDebug("using existing app layer state %p (name %s))",
+ app_layer_state, al_proto_table[f->alproto].name);
}
/* invoke the recursive parser, but only on data. We may get empty msgs on EOF */
int AppLayerTransactionGetBaseId(Flow *f) {
SCEnter();
- /* Get the parser state (if any) */
- if (f->aldata == NULL) {
- SCLogDebug("no aldata");
- goto error;
- }
-
AppLayerParserStateStore *parser_state_store =
- (AppLayerParserStateStore *)f->aldata[app_layer_sid];
+ (AppLayerParserStateStore *)f->alparser;
if (parser_state_store == NULL) {
SCLogDebug("no state store");
int AppLayerTransactionGetInspectId(Flow *f) {
SCEnter();
- /* Get the parser state (if any) */
- if (f->aldata == NULL) {
- SCLogDebug("no aldata");
- goto error;
- }
-
AppLayerParserStateStore *parser_state_store =
- (AppLayerParserStateStore *)f->aldata[app_layer_sid];
+ (AppLayerParserStateStore *)f->alparser;
if (parser_state_store == NULL) {
SCLogDebug("no state store");
int AppLayerTransactionGetLoggableId(Flow *f) {
SCEnter();
- /* Get the parser state (if any) */
- if (f->aldata == NULL) {
- SCLogDebug("no aldata");
- goto error;
- }
-
AppLayerParserStateStore *parser_state_store =
- (AppLayerParserStateStore *)f->aldata[app_layer_sid];
+ (AppLayerParserStateStore *)f->alparser;
if (parser_state_store == NULL) {
SCLogDebug("no state store");
void AppLayerTransactionUpdateLoggedId(Flow *f) {
SCEnter();
- /* Get the parser state (if any) */
- if (f->aldata == NULL) {
- SCLogDebug("no aldata");
- goto error;
- }
-
AppLayerParserStateStore *parser_state_store =
- (AppLayerParserStateStore *)f->aldata[app_layer_sid];
+ (AppLayerParserStateStore *)f->alparser;
if (parser_state_store == NULL) {
SCLogDebug("no state store");
int AppLayerTransactionGetLoggedId(Flow *f) {
SCEnter();
- /* Get the parser state (if any) */
- if (f->aldata == NULL) {
- SCLogDebug("no aldata");
- goto error;
- }
-
AppLayerParserStateStore *parser_state_store =
- (AppLayerParserStateStore *)f->aldata[app_layer_sid];
+ (AppLayerParserStateStore *)f->alparser;
if (parser_state_store == NULL) {
SCLogDebug("no state store");
uint16_t version = 0;
AppLayerParserStateStore *parser_state_store = NULL;
- /* Get the parser state (if any) */
- if (f->aldata != NULL) {
- parser_state_store = (AppLayerParserStateStore *)f->aldata[app_layer_sid];
- if (parser_state_store != NULL) {
- version = parser_state_store->version;
- }
+ parser_state_store = (AppLayerParserStateStore *)f->alparser;
+ if (parser_state_store != NULL) {
+ version = parser_state_store->version;
}
SCReturnUInt(version);
SCEnter();
int r = 0;
-
- /* Get the parser state (if any) */
AppLayerParserStateStore *parser_state_store = NULL;
- if (f->aldata != NULL) {
- parser_state_store = (AppLayerParserStateStore *)f->aldata[app_layer_sid];
- if (parser_state_store != NULL) {
- /* update inspect_id and see if it there are other transactions
- * as well */
+ parser_state_store = (AppLayerParserStateStore *)f->alparser;
+ if (parser_state_store != NULL) {
+ /* update inspect_id and see if it there are other transactions
+ * as well */
- SCLogDebug("avail_id %"PRIu16", inspect_id %"PRIu16,
- parser_state_store->avail_id, parser_state_store->inspect_id);
+ SCLogDebug("avail_id %"PRIu16", inspect_id %"PRIu16,
+ parser_state_store->avail_id, parser_state_store->inspect_id);
- if (direction == STREAM_TOSERVER)
- parser_state_store->id_flags |= APP_LAYER_TRANSACTION_TOSERVER;
- else
- parser_state_store->id_flags |= APP_LAYER_TRANSACTION_TOCLIENT;
-
- if ((parser_state_store->inspect_id+1) < parser_state_store->avail_id &&
- (parser_state_store->id_flags & APP_LAYER_TRANSACTION_TOCLIENT) &&
- (parser_state_store->id_flags & APP_LAYER_TRANSACTION_TOSERVER))
- {
- parser_state_store->id_flags &=~ APP_LAYER_TRANSACTION_TOCLIENT;
- parser_state_store->id_flags &=~ APP_LAYER_TRANSACTION_TOSERVER;
-
- parser_state_store->inspect_id = parser_state_store->avail_id - 1;
- if (parser_state_store->inspect_id < parser_state_store->avail_id) {
- /* done and more transactions available */
- r = 2;
-
- SCLogDebug("inspect_id %"PRIu16", avail_id %"PRIu16,
- parser_state_store->inspect_id,
- parser_state_store->avail_id);
- } else {
- /* done but no more transactions available */
- r = 1;
-
- SCLogDebug("inspect_id %"PRIu16", avail_id %"PRIu16,
- parser_state_store->inspect_id,
- parser_state_store->avail_id);
- }
+ if (direction == STREAM_TOSERVER)
+ parser_state_store->id_flags |= APP_LAYER_TRANSACTION_TOSERVER;
+ else
+ parser_state_store->id_flags |= APP_LAYER_TRANSACTION_TOCLIENT;
+
+ if ((parser_state_store->inspect_id+1) < parser_state_store->avail_id &&
+ (parser_state_store->id_flags & APP_LAYER_TRANSACTION_TOCLIENT) &&
+ (parser_state_store->id_flags & APP_LAYER_TRANSACTION_TOSERVER))
+ {
+ parser_state_store->id_flags &=~ APP_LAYER_TRANSACTION_TOCLIENT;
+ parser_state_store->id_flags &=~ APP_LAYER_TRANSACTION_TOSERVER;
+
+ parser_state_store->inspect_id = parser_state_store->avail_id - 1;
+ if (parser_state_store->inspect_id < parser_state_store->avail_id) {
+ /* done and more transactions available */
+ r = 2;
+
+ SCLogDebug("inspect_id %"PRIu16", avail_id %"PRIu16,
+ parser_state_store->inspect_id,
+ parser_state_store->avail_id);
+ } else {
+ /* done but no more transactions available */
+ r = 1;
+
+ SCLogDebug("inspect_id %"PRIu16", avail_id %"PRIu16,
+ parser_state_store->inspect_id,
+ parser_state_store->avail_id);
}
}
}
memset(&al_proto_table, 0, sizeof(al_proto_table));
memset(&al_parser_table, 0, sizeof(al_parser_table));
- app_layer_sid = AppLayerRegisterModule();
-
/** setup result pool
* \todo Per thread pool */
al_result_pool = PoolInit(1000,250,AlpResultElmtPoolAlloc,NULL,AlpResultElmtPoolFree);
/* free the parser protocol state */
AppLayerProto *p = &al_proto_table[f->alproto];
- if (p->StateFree != NULL && f->aldata != NULL) {
- if (f->aldata[p->storage_id] != NULL) {
- SCLogDebug("calling StateFree");
- p->StateFree(f->aldata[p->storage_id]);
- f->aldata[p->storage_id] = NULL;
- }
+ if (p->StateFree != NULL && f->alstate != NULL) {
+ SCLogDebug("calling StateFree");
+ p->StateFree(f->alstate);
+ f->alstate = NULL;
}
/* free the app layer parser api state */
- if (f->aldata != NULL) {
- if (f->aldata[app_layer_sid] != NULL) {
- SCLogDebug("calling AppLayerParserStateStoreFree");
- AppLayerParserStateStoreFree(f->aldata[app_layer_sid]);
- f->aldata[app_layer_sid] = NULL;
- }
-
- //StreamTcpDecrMemuse((uint32_t)(StreamL7GetStorageSize() * sizeof(void *)));
- SCFree(f->aldata);
- f->aldata = NULL;
+ if (f->alparser != NULL) {
+ SCLogDebug("calling AppLayerParserStateStoreFree");
+ AppLayerParserStateStoreFree(f->alparser);
+ f->alparser = NULL;
}
}
f.proto = IPPROTO_TCP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TEST, STREAM_TOSERVER|STREAM_EOF, testbuf,
testlen);
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.proto = IPPROTO_UDP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TEST, STREAM_TOSERVER|STREAM_EOF, testbuf,
testlen);
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
uint16_t to_server;
uint16_t to_client;
- uint8_t storage_id;
+ uint16_t map_size;
+ char logger; /**< does this proto have a logger enabled? */
AppLayerLocalMap **map;
- uint16_t map_size;
void *(*StateAlloc)(void);
void (*StateFree)(void *);
void (*StateUpdateTransactionId)(void *, uint16_t *);
void (*StateTransactionFree)(void *, uint16_t);
- char logger; /**< does this proto have a logger enabled? */
} AppLayerProto;
/** flags for the result elmts */
} AppLayerParserStateStore;
typedef struct AppLayerParserTableElement_ {
- char *name;
- uint16_t proto;
- uint16_t parser_local_id; /** local id of the parser in the parser itself. */
- uint8_t flags;
int (*AppLayerParser)(Flow *f, void *protocol_state, AppLayerParserState
*parser_state, uint8_t *input, uint32_t input_len,
AppLayerParserResult *output);
- uint16_t max_outputs; /* rationele is that if we know the max outputs of all
- parsers, we can statically define our output array
- to be a certain size */
+
+ char *name;
+
+ uint16_t proto;
+ uint16_t parser_local_id; /**< local id of the parser in the parser itself. */
} AppLayerParserTableElement;
typedef struct AppLayerProbingParserElement_ {
return NULL;
}
-extern uint16_t app_layer_sid;
-
struct AlpProtoDetectCtx_;
-extern uint16_t app_layer_sid;
-
/* prototypes */
void AppLayerParsersInitPostProcess(void);
void RegisterAppLayerParsers(void);
+void AppLayerParserRegisterTests(void);
+/* registration */
int AppLayerRegisterProto(char *name, uint8_t proto, uint8_t flags,
int (*AppLayerParser)(Flow *f, void *protocol_state,
AppLayerParserState *parser_state, uint8_t *input,
void (*StateTransactionId)(void *, uint16_t *),
void (*StateTransactionFree)(void *, uint16_t id));
void AppLayerRegisterLogger(uint16_t proto);
+uint16_t AppLayerGetProtoByName(const char *);
+/* parsing */
int AppLayerParse(Flow *, uint8_t proto, uint8_t flags, uint8_t *input,
uint32_t input_len);
int AlpParseFieldByDelimiter(AppLayerParserResult *, AppLayerParserState *,
uint16_t, const uint8_t *, uint8_t, uint8_t *,
uint32_t, uint32_t *);
-uint16_t AlpGetStateIdx(uint16_t);
-void AppLayerSetEOF(Flow *);
-uint16_t AppLayerGetProtoByName(const char *);
+/* transaction handling */
int AppLayerTransactionUpdateInspectId(Flow *, char);
void AppLayerTransactionUpdateLoggedId(Flow *);
-
int AppLayerTransactionGetLoggableId(Flow *f);
int AppLayerTransactionGetLoggedId(Flow *f);
int AppLayerTransactionGetBaseId(Flow *f);
int AppLayerTransactionGetInspectId(Flow *f);
+void AppLayerSetEOF(Flow *);
-void AppLayerParserRegisterTests(void);
+uint16_t AppLayerGetStateVersion(Flow *f);
+/* cleanup */
void AppLayerParserCleanupState(Flow *);
-
-uint8_t AppLayerRegisterModule(void);
-uint8_t AppLayerGetStorageSize(void);
void AppLayerFreeProbingParsers(AppLayerProbingParser *);
void AppLayerFreeProbingParsersInfo(AppLayerProbingParserInfo *);
void AppLayerPrintProbingParsers(AppLayerProbingParser *);
-uint16_t AppLayerGetStateVersion(Flow *f);
-
#endif /* __APP_LAYER_PARSER_H__ */
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_SMB, STREAM_TOSERVER|STREAM_EOF, smbbuf, smblen);
if (r != 0) {
goto end;
}
- SMBState *smb_state = f.aldata[AlpGetStateIdx(ALPROTO_SMB)];
+ SMBState *smb_state = f.alstate;
if (smb_state == NULL) {
printf("no smb state: ");
goto end;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_SMB, STREAM_TOSERVER|STREAM_EOF, smbbuf, smblen);
if (r != 0) {
goto end;
}
- SMBState *smb_state = f.aldata[AlpGetStateIdx(ALPROTO_SMB)];
+ SMBState *smb_state = f.alstate;
if (smb_state == NULL) {
printf("no smb state: ");
goto end;
printUUID("BIND", smb_state->dcerpc.dcerpcbindbindack.uuid_entry);
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_SMB, STREAM_TOSERVER|STREAM_START, smbbuf1, smblen1);
if (r != 0) {
goto end;
}
- SMBState *smb_state = f.aldata[AlpGetStateIdx(ALPROTO_SMB)];
+ SMBState *smb_state = f.alstate;
if (smb_state == NULL) {
printf("no smb state: ");
goto end;
printUUID("BIND", smb_state->dcerpc.dcerpcbindbindack.uuid_entry);
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_SMB, STREAM_TOSERVER|STREAM_START, smbbuf1, smblen1);
if (r != 0) {
goto end;
}
- SMBState *smb_state = f.aldata[AlpGetStateIdx(ALPROTO_SMB)];
+ SMBState *smb_state = f.alstate;
if (smb_state == NULL) {
printf("no smb state: ");
goto end;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_SMB, STREAM_TOCLIENT | STREAM_START, smbbuf1, smblen1);
if (r != 0) {
goto end;
}
- SMBState *smb_state = f.aldata[AlpGetStateIdx(ALPROTO_SMB)];
+ SMBState *smb_state = f.alstate;
if (smb_state == NULL) {
printf("no smb state: ");
goto end;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_SMB, STREAM_TOCLIENT | STREAM_START, smbbuf1, smblen1);
if (r != 0) {
goto end;
}
- SMBState *smb_state = f.aldata[AlpGetStateIdx(ALPROTO_SMB)];
+ SMBState *smb_state = f.alstate;
if (smb_state == NULL) {
printf("no smb state: ");
goto end;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_SMB, STREAM_TOSERVER | STREAM_START, smbbuf1, smblen1);
if (r != 0) {
goto end;
}
- SMBState *smb_state = f.aldata[AlpGetStateIdx(ALPROTO_SMB)];
+ SMBState *smb_state = f.alstate;
if (smb_state == NULL) {
printf("no smb state: ");
goto end;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_SMB2, STREAM_TOSERVER|STREAM_EOF, smb2buf, smb2len);
if (r != 0) {
goto end;
}
- SMB2State *smb2_state = f.aldata[AlpGetStateIdx(ALPROTO_SMB2)];
+ SMB2State *smb2_state = f.alstate;
if (smb2_state == NULL) {
printf("no smb2 state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_SMTP, STREAM_TOSERVER,
request1, request1_len);
printf("smtp check returned %" PRId32 ", expected 0: ", r);
goto end;
}
- SMTPState *smtp_state = f.aldata[AlpGetStateIdx(ALPROTO_SMTP)];
+ SMTPState *smtp_state = f.alstate;
if (smtp_state == NULL) {
printf("no smtp state: ");
goto end;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_SMTP, STREAM_TOSERVER,
request1, request1_len);
printf("smtp check returned %" PRId32 ", expected 0: ", r);
goto end;
}
- SMTPState *smtp_state = f.aldata[AlpGetStateIdx(ALPROTO_SMTP)];
+ SMTPState *smtp_state = f.alstate;
if (smtp_state == NULL) {
printf("no smtp state: ");
goto end;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_SMTP, STREAM_TOSERVER,
request1, request1_len);
printf("smtp check returned %" PRId32 ", expected 0: ", r);
goto end;
}
- SMTPState *smtp_state = f.aldata[AlpGetStateIdx(ALPROTO_SMTP)];
+ SMTPState *smtp_state = f.alstate;
if (smtp_state == NULL) {
printf("no smtp state: ");
goto end;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_SMTP, STREAM_TOSERVER,
request1, request1_len);
printf("smtp check returned %" PRId32 ", expected 0: ", r);
goto end;
}
- SMTPState *smtp_state = f.aldata[AlpGetStateIdx(ALPROTO_SMTP)];
+ SMTPState *smtp_state = f.alstate;
if (smtp_state == NULL) {
printf("no smtp state: ");
goto end;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_SMTP, STREAM_TOSERVER,
request1, request1_len);
printf("smtp check returned %" PRId32 ", expected 0: ", r);
goto end;
}
- SMTPState *smtp_state = f.aldata[AlpGetStateIdx(ALPROTO_SMTP)];
+ SMTPState *smtp_state = f.alstate;
if (smtp_state == NULL) {
printf("no smtp state: ");
goto end;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_SMTP, STREAM_TOSERVER,
request1, request1_len);
printf("smtp check returned %" PRId32 ", expected 0: ", r);
goto end;
}
- SMTPState *smtp_state = f.aldata[AlpGetStateIdx(ALPROTO_SMTP)];
+ SMTPState *smtp_state = f.alstate;
if (smtp_state == NULL) {
printf("no smtp state: ");
goto end;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_SSH, STREAM_TOSERVER|STREAM_EOF, sshbuf, sshlen);
if (r != 0) {
goto end;
}
- SshState *ssh_state = f.aldata[AlpGetStateIdx(ALPROTO_SSH)];
+ SshState *ssh_state = f.alstate;
if (ssh_state == NULL) {
printf("no ssh state: ");
result = 0;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_SSH, STREAM_TOSERVER|STREAM_EOF, sshbuf, sshlen);
if (r != 0) {
goto end;
}
- SshState *ssh_state = f.aldata[AlpGetStateIdx(ALPROTO_SSH)];
+ SshState *ssh_state = f.alstate;
if (ssh_state == NULL) {
printf("no ssh state: ");
result = 0;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_SSH, STREAM_TOSERVER|STREAM_EOF, sshbuf, sshlen);
if (r == 0) {
}
/* Ok, it returned an error. Let's make sure we didn't parse the string at all */
- SshState *ssh_state = f.aldata[AlpGetStateIdx(ALPROTO_SSH)];
+ SshState *ssh_state = f.alstate;
if (ssh_state == NULL) {
printf("no ssh state: ");
result = 0;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_SSH, STREAM_TOCLIENT|STREAM_EOF, sshbuf, sshlen);
if (r != 0) {
goto end;
}
- SshState *ssh_state = f.aldata[AlpGetStateIdx(ALPROTO_SSH)];
+ SshState *ssh_state = f.alstate;
if (ssh_state == NULL) {
printf("no ssh state: ");
result = 0;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_SSH, STREAM_TOCLIENT|STREAM_EOF, sshbuf, sshlen);
if (r != 0) {
goto end;
}
- SshState *ssh_state = f.aldata[AlpGetStateIdx(ALPROTO_SSH)];
+ SshState *ssh_state = f.alstate;
if (ssh_state == NULL) {
printf("no ssh state: ");
result = 0;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_SSH, STREAM_TOCLIENT|STREAM_EOF, sshbuf, sshlen);
if (r == 0) {
}
/* Ok, it returned an error. Let's make sure we didn't parse the string at all */
- SshState *ssh_state = f.aldata[AlpGetStateIdx(ALPROTO_SSH)];
+ SshState *ssh_state = f.alstate;
if (ssh_state == NULL) {
printf("no ssh state: ");
result = 0;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_SSH, STREAM_TOSERVER, sshbuf1, sshlen1);
if (r != 0) {
goto end;
}
- SshState *ssh_state = f.aldata[AlpGetStateIdx(ALPROTO_SSH)];
+ SshState *ssh_state = f.alstate;
if (ssh_state == NULL) {
printf("no ssh state: ");
goto end;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_SSH, STREAM_TOSERVER, sshbuf1, sshlen1);
if (r != 0) {
goto end;
}
- SshState *ssh_state = f.aldata[AlpGetStateIdx(ALPROTO_SSH)];
+ SshState *ssh_state = f.alstate;
if (ssh_state == NULL) {
printf("no ssh state: ");
goto end;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_SSH, STREAM_TOCLIENT, sshbuf1, sshlen1);
if (r != 0) {
goto end;
}
- SshState *ssh_state = f.aldata[AlpGetStateIdx(ALPROTO_SSH)];
+ SshState *ssh_state = f.alstate;
if (ssh_state == NULL) {
printf("no ssh state: ");
goto end;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_SSH, STREAM_TOCLIENT, sshbuf1, sshlen1);
if (r != 0) {
goto end;
}
- SshState *ssh_state = f.aldata[AlpGetStateIdx(ALPROTO_SSH)];
+ SshState *ssh_state = f.alstate;
if (ssh_state == NULL) {
printf("no ssh state: ");
goto end;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_SSH, STREAM_TOSERVER, sshbuf1, sshlen1);
if (r != 0) {
goto end;
}
- SshState *ssh_state = f.aldata[AlpGetStateIdx(ALPROTO_SSH)];
+ SshState *ssh_state = f.alstate;
if (ssh_state == NULL) {
printf("no ssh state: ");
goto end;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_SSH, STREAM_TOSERVER, sshbuf1, sshlen1);
if (r != 0) {
goto end;
}
- SshState *ssh_state = f.aldata[AlpGetStateIdx(ALPROTO_SSH)];
+ SshState *ssh_state = f.alstate;
if (ssh_state == NULL) {
printf("no ssh state: ");
goto end;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_SSH, STREAM_TOCLIENT, sshbuf1, sshlen1);
if (r != 0) {
goto end;
}
- SshState *ssh_state = f.aldata[AlpGetStateIdx(ALPROTO_SSH)];
+ SshState *ssh_state = f.alstate;
if (ssh_state == NULL) {
printf("no ssh state: ");
goto end;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_SSH, STREAM_TOCLIENT, sshbuf1, sshlen1);
if (r != 0) {
goto end;
}
- SshState *ssh_state = f.aldata[AlpGetStateIdx(ALPROTO_SSH)];
+ SshState *ssh_state = f.alstate;
if (ssh_state == NULL) {
printf("no ssh state: ");
goto end;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
#ifdef UNITTESTS
-extern uint16_t AppLayerParserGetStorageId (void);
-
/**
*\test Send a get request in one chunk.
*/
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER | STREAM_EOF, tlsbuf, tlslen);
if (r != 0) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
result = 0;
goto end;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER, tlsbuf1, tlslen1);
if (r != 0) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
result = 0;
goto end;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER, tlsbuf1, tlslen1);
if (r != 0) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
result = 0;
goto end;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER, tlsbuf1, tlslen1);
if (r != 0) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
result = 0;
goto end;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER, tlsbuf, tlslen);
if (r != 0) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
result = 0;
goto end;
}
- uint16_t app_layer_sid = AppLayerParserGetStorageId();
AppLayerParserStateStore *parser_state_store = (AppLayerParserStateStore *)
- f.aldata[app_layer_sid];
+ ssn.alparser;
AppLayerParserState *parser_state = &parser_state_store->to_server;
if (!(parser_state->flags & APP_LAYER_PARSER_NO_INSPECTION) &&
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER, tlsbuf, tlslen);
if (r != 0) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
result = 0;
goto end;
}
- uint16_t app_layer_sid = AppLayerParserGetStorageId();
AppLayerParserStateStore *parser_state_store = (AppLayerParserStateStore *)
- f.aldata[app_layer_sid];
+ ssn.alparser;
AppLayerParserState *parser_state = &parser_state_store->to_server;
if ((parser_state->flags & APP_LAYER_PARSER_NO_INSPECTION) ||
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER, tlsbuf1, tlslen1);
if (r != 0) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
result = 0;
goto end;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOCLIENT, tlsbuf1, tlslen1);
if (r != 0) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
result = 0;
goto end;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER, tlsbuf, tlslen);
if (r != 0) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER, tlsbuf, tlslen);
if (r != 0) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
result = 0;
goto end;
}
- uint16_t app_layer_sid = AppLayerParserGetStorageId();
AppLayerParserStateStore *parser_state_store = (AppLayerParserStateStore *)
- f.aldata[app_layer_sid];
+ ssn.alparser;
AppLayerParserState *parser_state = &parser_state_store->to_server;
if (!(parser_state->flags & APP_LAYER_PARSER_NO_INSPECTION) &&
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER, buf1, buf1_len);
if (r != 0) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER, buf1, buf1_len);
if (r != 0) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER, buf1, buf1_len);
if (r != 0) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER, buf1, buf1_len);
if (r != 0) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER, buf1, buf1_len);
if (r != 0) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER, buf1, buf1_len);
if (r != 0) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER, buf1, buf1_len);
if (r != 0) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER, buf1, buf1_len);
if (r != 0) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER, buf1, buf1_len);
if (r != 0) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER, buf1, buf1_len);
if (r != 0) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER, buf1, buf1_len);
if (r != 0) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER, buf1, buf1_len);
if (r != 0) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER | STREAM_EOF, buf,
buf_len);
goto end;
}
- SSLState *app_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *app_state = f.alstate;
if (app_state == NULL) {
printf("no ssl state: ");
goto end;
result = 1;
end:
- FlowL7DataPtrFree(&f);
- StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
}
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOCLIENT | STREAM_EOF, buf,
buf_len);
goto end;
}
- SSLState *app_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *app_state = f.alstate;
if (app_state == NULL) {
printf("no ssl state: ");
result = 0;
goto end;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER | STREAM_START, chello_buf,
chello_buf_len);
goto end;
}
- SSLState *app_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *app_state = f.alstate;
if (app_state == NULL) {
printf("no ssl state: ");
result = 0;
goto end;
}
- uint16_t app_layer_sid = AppLayerParserGetStorageId();
AppLayerParserStateStore *parser_state_store =
- (AppLayerParserStateStore *)f.aldata[app_layer_sid];
+ (AppLayerParserStateStore *)f.alparser;
AppLayerParserState *parser_state = &parser_state_store->to_server;
if (!(parser_state->flags & APP_LAYER_PARSER_NO_INSPECTION) &&
!(ssn.client.flags & STREAMTCP_STREAM_FLAG_NOREASSEMBLY) &&
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER, buf1, buf1_len);
if (r != 0) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
result = 0;
}
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
return result;
}
-/* Copyright (C) 2007-2010 Open Information Security Foundation
+/* Copyright (C) 2007-2011 Open Information Security Foundation
*
* You can copy, redistribute or modify this Program under the terms of
* the GNU General Public License version 2 as published by the Free
SCReturnUInt(ALPROTO_UNKNOWN);
}
- if (p->flow->aldata == NULL) {
- SCReturnUInt(ALPROTO_UNKNOWN);
- }
-
SCLogDebug("p->flow->alproto %"PRIu16"", p->flow->alproto);
SCReturnUInt(p->flow->alproto);
SCReturnPtr(NULL, "void");
}
- if (p->flow->aldata == NULL) {
- SCReturnPtr(NULL, "void");
- }
-
SCLogDebug("p->flow->alproto %"PRIu16"", p->flow->alproto);
- void *alstate = p->flow->aldata[AlpGetStateIdx(p->flow->alproto)];
-
SCLogDebug("p->flow %p", p->flow);
- SCReturnPtr(alstate, "void");
+ SCReturnPtr(p->flow->alstate, "void");
}
/** \brief Get the active app layer state from the flow
SCReturnPtr(NULL, "void");
}
- if (f->aldata == NULL) {
- SCReturnPtr(NULL, "void");
- }
-
SCLogDebug("f->alproto %"PRIu16"", f->alproto);
- void *alstate = f->aldata[AlpGetStateIdx(f->alproto)];
- SCReturnPtr(alstate, "void");
+ SCReturnPtr(f->alstate, "void");
}
/** global app layer detection context */
{
SCEnter();
- uint16_t alproto = ALPROTO_UNKNOWN;
int r = 0;
+#if DEBUG
BUG_ON(f == NULL);
BUG_ON(ssn == NULL);
-
- alproto = f->alproto;
+#endif
SCLogDebug("data_len %u flags %02X", data_len, flags);
if (!(f->flags & FLOW_NO_APPLAYER_INSPECTION)) {
* initializer message, we run proto detection.
* We receive 2 stream init msgs (one for each direction) but we
* only run the proto detection once. */
- if (alproto == ALPROTO_UNKNOWN && flags & STREAM_GAP) {
+ if (f->alproto == ALPROTO_UNKNOWN && flags & STREAM_GAP) {
ssn->flags |= STREAMTCP_FLAG_APPPROTO_DETECTION_COMPLETED;
SCLogDebug("ALPROTO_UNKNOWN flow %p, due to GAP in stream start", f);
StreamTcpSetSessionNoReassemblyFlag(ssn, 0);
- } else if (alproto == ALPROTO_UNKNOWN && flags & STREAM_START) {
+ } else if (f->alproto == ALPROTO_UNKNOWN && flags & STREAM_START) {
SCLogDebug("Stream initializer (len %" PRIu32 ")", data_len);
#ifdef PRINT
if (data_len > 0) {
#endif
PACKET_PROFILING_APP_PD_START(dp_ctx);
- alproto = AppLayerDetectGetProto(&alp_proto_ctx, dp_ctx, f,
+ f->alproto = AppLayerDetectGetProto(&alp_proto_ctx, dp_ctx, f,
data, data_len, flags, IPPROTO_TCP);
PACKET_PROFILING_APP_PD_END(dp_ctx);
- if (alproto != ALPROTO_UNKNOWN) {
- /* store the proto and setup the L7 data array */
- FlowL7DataPtrInit(f);
- f->alproto = alproto;
+ if (f->alproto != ALPROTO_UNKNOWN) {
ssn->flags |= STREAMTCP_FLAG_APPPROTO_DETECTION_COMPLETED;
- PACKET_PROFILING_APP_START(dp_ctx, alproto);
- r = AppLayerParse(f, alproto, flags, data, data_len);
- PACKET_PROFILING_APP_END(dp_ctx, alproto);
+ PACKET_PROFILING_APP_START(dp_ctx, f->alproto);
+ r = AppLayerParse(f, f->alproto, flags, data, data_len);
+ PACKET_PROFILING_APP_END(dp_ctx, f->alproto);
} else {
if (f->flags & FLOW_TS_PM_PP_ALPROTO_DETECT_DONE &&
f->flags & FLOW_TC_PM_PP_ALPROTO_DETECT_DONE) {
}
} else {
SCLogDebug("stream data (len %" PRIu32 " alproto "
- "%"PRIu16" (flow %p)", data_len, alproto, f);
+ "%"PRIu16" (flow %p)", data_len, f->alproto, f);
#ifdef PRINT
if (data_len > 0) {
printf("=> Stream Data (app layer) -- start %s%s\n",
#endif
/* if we don't have a data object here we are not getting it
* a start msg should have gotten us one */
- if (alproto != ALPROTO_UNKNOWN) {
- PACKET_PROFILING_APP_START(dp_ctx, alproto);
- r = AppLayerParse(f, alproto, flags, data, data_len);
- PACKET_PROFILING_APP_END(dp_ctx, alproto);
+ if (f->alproto != ALPROTO_UNKNOWN) {
+ PACKET_PROFILING_APP_START(dp_ctx, f->alproto);
+ r = AppLayerParse(f, f->alproto, flags, data, data_len);
+ PACKET_PROFILING_APP_END(dp_ctx, f->alproto);
} else {
SCLogDebug(" smsg not start, but no l7 data? Weird");
}
SCReturnInt(0);
}
-#if 0
-/**
- * \brief Handle a app layer TCP message
- *
- * If the protocol is yet unknown, the proto detection code is run first.
- *
- * \param dp_ctx Thread app layer detect context
- * \param smsg Stream message
- *
- * \retval 0 ok
- * \retval -1 error
- */
-int AppLayerHandleMsg(AlpProtoDetectThreadCtx *dp_ctx, StreamMsg *smsg)
-{
- SCEnter();
-
- uint16_t alproto = ALPROTO_UNKNOWN;
- int r = 0;
-
- SCLogDebug("smsg %p", smsg);
-
- BUG_ON(smsg->flow == NULL);
-
- TcpSession *ssn = smsg->flow->protoctx;
- if (ssn != NULL) {
- alproto = smsg->flow->alproto;
-
- if (!(smsg->flow->flags & FLOW_NO_APPLAYER_INSPECTION)) {
- /* if we don't know the proto yet and we have received a stream
- * initializer message, we run proto detection.
- * We receive 2 stream init msgs (one for each direction) but we
- * only run the proto detection once. */
- if (alproto == ALPROTO_UNKNOWN && smsg->flags & STREAM_START) {
- SCLogDebug("Stream initializer (len %" PRIu32 " (%" PRIu32 "))",
- smsg->data.data_len, MSG_DATA_SIZE);
-
- //printf("=> Init Stream Data -- start\n");
- //PrintRawDataFp(stdout, smsg->init.data, smsg->init.data_len);
- //printf("=> Init Stream Data -- end\n");
-
- alproto = AppLayerDetectGetProto(&alp_proto_ctx, dp_ctx, f
- smsg->data.data, smsg->data.data_len, smsg->flow->alflags, IPPROTO_TCP);
- if (alproto != ALPROTO_UNKNOWN) {
- /* store the proto and setup the L7 data array */
- FlowL7DataPtrInit(smsg->flow);
- smsg->flow->alproto = alproto;
- ssn->flags |= STREAMTCP_FLAG_APPPROTO_DETECTION_COMPLETED;
-
- r = AppLayerParse(smsg->flow, alproto, smsg->flow->alflags,
- smsg->data.data, smsg->data.data_len);
- } else {
- if (smsg->flags & STREAM_TOSERVER) {
- if (smsg->data.data_len >= alp_proto_ctx.toserver.max_len) {
- /* protocol detection has failed */
- ssn->flags |= STREAMTCP_FLAG_APPPROTO_DETECTION_COMPLETED;
- smsg->flow->alflags |= FLOW_AL_NO_APPLAYER_INSPECTION;
- SCLogDebug("ALPROTO_UNKNOWN flow %p", smsg->flow);
- }
- } else if (smsg->flags & STREAM_TOCLIENT) {
- if (smsg->data.data_len >= alp_proto_ctx.toclient.max_len) {
- /* protocol detection has failed */
- ssn->flags |= STREAMTCP_FLAG_APPPROTO_DETECTION_COMPLETED;
- smsg->flow->alflags |= FLOW_AL_NO_APPLAYER_INSPECTION;
- SCLogDebug("ALPROTO_UNKNOWN flow %p", smsg->flow);
- }
- }
- }
- } else {
- SCLogDebug("stream data (len %" PRIu32 " (%" PRIu32 ")), alproto "
- "%"PRIu16" (flow %p)", smsg->data.data_len, MSG_DATA_SIZE,
- alproto, smsg->flow);
-
- //printf("=> Stream Data -- start\n");
- //PrintRawDataFp(stdout, smsg->data.data, smsg->data.data_len);
- //printf("=> Stream Data -- end\n");
-
- /* if we don't have a data object here we are not getting it
- * a start msg should have gotten us one */
- if (alproto != ALPROTO_UNKNOWN) {
- r = AppLayerParse(smsg->flow, alproto, smsg->flags,
- smsg->data.data, smsg->data.data_len);
- } else {
- SCLogDebug(" smsg not start, but no l7 data? Weird");
- }
- }
- }
-
- SCLogDebug("storing smsg %p in the tcp session", smsg);
-
- /* store the smsg in the tcp stream */
- if (smsg->flags & STREAM_TOSERVER) {
- SCLogDebug("storing smsg in the to_server");
-#if 0
- PrintRawDataFp(stdout,smsg->data.data,smsg->data.data_len);
-#endif
- /* put the smsg in the stream list */
- if (ssn->toserver_smsg_head == NULL) {
- ssn->toserver_smsg_head = smsg;
- ssn->toserver_smsg_tail = smsg;
- smsg->next = NULL;
- smsg->prev = NULL;
- } else {
- StreamMsg *cur = ssn->toserver_smsg_tail;
- cur->next = smsg;
- smsg->prev = cur;
- smsg->next = NULL;
- ssn->toserver_smsg_tail = smsg;
- }
- } else {
- SCLogDebug("storing smsg in the to_client");
-
- /* put the smsg in the stream list */
- if (ssn->toclient_smsg_head == NULL) {
- ssn->toclient_smsg_head = smsg;
- ssn->toclient_smsg_tail = smsg;
- smsg->next = NULL;
- smsg->prev = NULL;
- } else {
- StreamMsg *cur = ssn->toclient_smsg_tail;
- cur->next = smsg;
- smsg->prev = cur;
- smsg->next = NULL;
- ssn->toclient_smsg_tail = smsg;
- }
- }
-
- /* flow is free again */
- FlowDecrUsecnt(smsg->flow);
- /* dereference the flow */
- smsg->flow = NULL;
-
- } else { /* no ssn ptr */
-
- /* if there is no ssn ptr we won't
- * be inspecting this msg in detect
- * so return it to the pool. */
-
- /* flow is free again */
- FlowDecrUsecnt(smsg->flow);
-
- /* return the used message to the queue */
- StreamMsgReturnToPool(smsg);
- }
-
- SCReturnInt(r);
-}
-#endif
-
/**
* \brief Handle a app layer UDP message
*
{
SCEnter();
- uint16_t alproto = ALPROTO_UNKNOWN;
int r = 0;
if (f == NULL) {
SCMutexLock(&f->m);
- alproto = f->alproto;
-
uint8_t flags = 0;
if (p->flowflags & FLOW_PKT_TOSERVER) {
flags |= STREAM_TOSERVER;
* initializer message, we run proto detection.
* We receive 2 stream init msgs (one for each direction) but we
* only run the proto detection once. */
- if (alproto == ALPROTO_UNKNOWN && !(f->flags & FLOW_ALPROTO_DETECT_DONE)) {
+ if (f->alproto == ALPROTO_UNKNOWN && !(f->flags & FLOW_ALPROTO_DETECT_DONE)) {
SCLogDebug("Detecting AL proto on udp mesg (len %" PRIu32 ")",
p->payload_len);
//PrintRawDataFp(stdout, smsg->init.data, smsg->init.data_len);
//printf("=> Init Stream Data -- end\n");
- alproto = AppLayerDetectGetProto(&alp_proto_ctx, dp_ctx, f,
+ f->alproto = AppLayerDetectGetProto(&alp_proto_ctx, dp_ctx, f,
p->payload, p->payload_len, flags, IPPROTO_UDP);
- if (alproto != ALPROTO_UNKNOWN) {
- /* store the proto and setup the L7 data array */
- FlowL7DataPtrInit(f);
- f->alproto = alproto;
+ if (f->alproto != ALPROTO_UNKNOWN) {
f->flags |= FLOW_ALPROTO_DETECT_DONE;
- r = AppLayerParse(f, alproto, flags,
+ r = AppLayerParse(f, f->alproto, flags,
p->payload, p->payload_len);
} else {
f->flags |= FLOW_ALPROTO_DETECT_DONE;
}
} else {
SCLogDebug("stream data (len %" PRIu32 " ), alproto "
- "%"PRIu16" (flow %p)", p->payload_len, alproto, f);
+ "%"PRIu16" (flow %p)", p->payload_len, f->alproto, f);
//printf("=> Stream Data -- start\n");
//PrintRawDataFp(stdout, smsg->data.data, smsg->data.data_len);
/* if we don't have a data object here we are not getting it
* a start msg should have gotten us one */
- if (alproto != ALPROTO_UNKNOWN) {
- r = AppLayerParse(f, alproto, flags,
+ if (f->alproto != ALPROTO_UNKNOWN) {
+ r = AppLayerParse(f, f->alproto, flags,
p->payload, p->payload_len);
} else {
SCLogDebug(" udp session not start, but no l7 data? Weird");
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
SCLogDebug("no dcerpc state: ");
goto end;
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
SCLogDebug("no dcerpc state: ");
goto end;
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
return result;
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
SCLogDebug("no dcerpc state: ");
goto end;
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
SCLogDebug("no dcerpc state: ");
goto end;
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
SCLogDebug("no dcerpc state: ");
goto end;
goto end;
}
- dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
SCLogDebug("no dcerpc state: ");
goto end;
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
SCLogDebug("no dcerpc state: ");
goto end;
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
SCLogDebug("no dcerpc state: ");
goto end;
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
SCLogDebug("no dcerpc state: ");
printf("no dcerpc state: ");
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
p->flowflags |= FLOW_PKT_TOSERVER;
SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
- dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
goto end;
goto end;
}
- dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
goto end;
goto end;
}
- dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
goto end;
goto end;
}
- dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
goto end;
goto end;
}
- dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
goto end;
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
goto end;
goto end;
}
- dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
goto end;
goto end;
}
- dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
goto end;
goto end;
}
- dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
printf("no dcerpc state: ");
goto end;
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
SCLogDebug("no dcerpc state: ");
goto end;
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
SCLogDebug("no dcerpc state: ");
goto end;
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
p->flowflags |= FLOW_PKT_TOSERVER;
SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
- dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
SCLogDebug("no dcerpc state: ");
goto end;
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- dcerpc_state = f.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
+ dcerpc_state = f.alstate;
if (dcerpc_state == NULL) {
SCLogDebug("no dcerpc state: ");
goto end;
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(p, 11);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(p, 4);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(p, 4);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(p, 4);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(p, 4);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(p, 4);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(p, 4);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(p, 1);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(p, 1);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(p, 1);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(p, 2);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(p, 2);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(p, 8);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(p, 6);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_DCERPC;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePacket(p);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePacket(p);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
p->flags |= PKT_HAS_FLOW|PKT_STREAM_EST;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_FTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
SigGroupBuild(de_ctx);
DetectEngineThreadCtxInit(&th_v,(void *)de_ctx,(void *)&det_ctx);
- FlowL7DataPtrInit(&f);
int r = AppLayerParse(&f, ALPROTO_FTP, STREAM_TOSERVER, ftpbuf1, ftplen1);
if (r != 0) {
SCLogDebug("toserver chunk 1 returned %" PRId32 ", expected 0: ", r);
goto end;
}
- FtpState *ftp_state = f.aldata[AlpGetStateIdx(ALPROTO_FTP)];
+ FtpState *ftp_state = f.alstate;
if (ftp_state == NULL) {
SCLogDebug("no ftp state: ");
result = 0;
DetectEngineThreadCtxDeinit(&th_v,(void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
f.alproto = ALPROTO_FTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- FtpState *ftp_state = f.aldata[AlpGetStateIdx(ALPROTO_FTP)];
+ FtpState *ftp_state = f.alstate;
if (ftp_state == NULL) {
SCLogDebug("no ftp state: ");
result = 0;
DetectEngineThreadCtxDeinit(&th_v,(void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
SCFree(p);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: \n");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
}
p->alerts.cnt = 0;
- HtpState *htp_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ HtpState *htp_state = f.alstate;
if (htp_state == NULL) {
printf("no http state: ");
result = 0;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePacket(p);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
}
p->alerts.cnt = 0;
- HtpState *htp_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ HtpState *htp_state = f.alstate;
if (htp_state == NULL) {
printf("no http state: ");
result = 0;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePacket(p);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
SigGroupCleanup(de_ctx);
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
return result;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
return result;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
return result;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
return result;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
return result;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
return result;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
SCLogDebug("no http state: ");
goto end;
if (de_ctx != NULL) SigCleanSignatures(de_ctx);
if (de_ctx != NULL) DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
SCLogDebug("no http state: ");
goto end;
if (det_ctx != NULL) DetectEngineThreadCtxDeinit(&th_v, (void *) det_ctx);
if (de_ctx != NULL) DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
SCLogDebug("no http state: ");
goto end;
if (de_ctx != NULL) SigCleanSignatures(de_ctx);
if (de_ctx != NULL) DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
SCLogDebug("no http state: ");
goto end;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL)
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
p->flags |= PKT_HAS_FLOW|PKT_STREAM_EST;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- HtpState *http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ HtpState *http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL) SigCleanSignatures(de_ctx);
if (de_ctx != NULL) DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
/* do detect for p1 */
SigMatchSignatures(&th_v, de_ctx, det_ctx, p1);
- HtpState *http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ HtpState *http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
result = 0;
if (de_ctx != NULL) SigCleanSignatures(de_ctx);
if (de_ctx != NULL) DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p1, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
return result;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
return result;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
return result;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
return result;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
return result;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
UTHFreePackets(&p, 1);
return result;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
AppLayerHtpEnableRequestBodyCallback();
/* Now we should have 2 transactions, each with it's own list
* of request body chunks (let's test it) */
- HtpState *htp_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ HtpState *htp_state = f.alstate;
if (htp_state == NULL) {
printf("no http state: ");
result = 0;
goto end;
}
- FlowL7DataPtrFree(&f);
result = 1;
end:
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
}
p->alerts.cnt = 0;
- HtpState *htp_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ HtpState *htp_state = f.alstate;
if (htp_state == NULL) {
printf("no http state: ");
result = 0;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePacket(p);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
}
p->alerts.cnt = 0;
- HtpState *htp_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ HtpState *htp_state = f.alstate;
if (htp_state == NULL) {
printf("no http state: ");
result = 0;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePacket(p);
f.alproto = ALPROTO_SSH;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- SshState *ssh_state = f.aldata[AlpGetStateIdx(ALPROTO_SSH)];
+ SshState *ssh_state = f.alstate;
if (ssh_state == NULL) {
printf("no ssh state: ");
goto end;
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
f.alproto = ALPROTO_SSH;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- SshState *ssh_state = f.aldata[AlpGetStateIdx(ALPROTO_SSH)];
+ SshState *ssh_state = f.alstate;
if (ssh_state == NULL) {
printf("no ssh state: ");
goto end;
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
f.alproto = ALPROTO_SSH;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- SshState *ssh_state = f.aldata[AlpGetStateIdx(ALPROTO_SSH)];
+ SshState *ssh_state = f.alstate;
if (ssh_state == NULL) {
printf("no ssh state: ");
goto end;
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
f.alproto = ALPROTO_SSH;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- SshState *ssh_state = f.aldata[AlpGetStateIdx(ALPROTO_SSH)];
+ SshState *ssh_state = f.alstate;
if (ssh_state == NULL) {
printf("no ssh state: ");
goto end;
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
f.alproto = ALPROTO_SSH;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- SshState *ssh_state = f.aldata[AlpGetStateIdx(ALPROTO_SSH)];
+ SshState *ssh_state = f.alstate;
if (ssh_state == NULL) {
printf("no ssh state: ");
goto end;
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
f.alproto = ALPROTO_SSH;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- SshState *ssh_state = f.aldata[AlpGetStateIdx(ALPROTO_SSH)];
+ SshState *ssh_state = f.alstate;
if (ssh_state == NULL) {
printf("no ssh state: ");
goto end;
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
f.alproto = ALPROTO_TLS;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL)
goto end;
}
- ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no ssl state: ");
goto end;
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_TLS;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- SSLState *app_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *app_state = f.alstate;
if (app_state == NULL) {
printf("no ssl state: ");
goto end;
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
f.alproto = ALPROTO_TLS;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- SSLState *app_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *app_state = f.alstate;
if (app_state == NULL) {
printf("no ssl state: ");
goto end;
SigCleanSignatures(de_ctx);
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.proto = p->proto;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
StreamMsg *stream_msg = StreamMsgGetFromPool();
if (stream_msg == NULL) {
goto end;
}
- SSLState *app_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *app_state = f.alstate;
if (app_state == NULL) {
printf("no ssl state: ");
goto end;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_TLS;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
goto end;
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
f.alproto = ALPROTO_TLS;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
goto end;
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
f.proto = p->proto;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
StreamMsg *stream_msg = StreamMsgGetFromPool();
if (stream_msg == NULL) {
goto end;
}
- SSLState *ssl_state = f.aldata[AlpGetStateIdx(ALPROTO_TLS)];
+ SSLState *ssl_state = f.alstate;
if (ssl_state == NULL) {
printf("no tls state: ");
goto end;
DetectEngineCtxFree(de_ctx);
}
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.dst.family = AF_INET;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_HTTP, STREAM_TOSERVER|STREAM_START|
STREAM_EOF, httpbuf1, httplen1);
goto end;
}
- HtpState *htp_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ HtpState *htp_state = f.alstate;
if (htp_state == NULL) {
printf("no http state: ");
goto end;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.dst.family = AF_INET;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_HTTP, STREAM_TOSERVER|STREAM_START|
STREAM_EOF, httpbuf1, httplen1);
goto end;
}
- htp_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ htp_state = f.alstate;
if (htp_state == NULL) {
printf("no http state: ");
goto end;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
if (htp_state != NULL)
HTPStateFree(htp_state);
f.dst.family = AF_INET;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_HTTP, STREAM_TOSERVER|STREAM_START|
STREAM_EOF, httpbuf1, httplen1);
goto end;
}
- htp_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ htp_state = f.alstate;
if (htp_state == NULL) {
printf("no http state: ");
goto end;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
if (htp_state != NULL)
HTPStateFree(htp_state);
f.dst.family = AF_INET;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
r = AppLayerParse(&f, ALPROTO_HTTP, STREAM_TOSERVER|STREAM_START|
STREAM_EOF, httpbuf1, httplen1);
goto end;
}
- htp_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ htp_state = f.alstate;
if (htp_state == NULL) {
printf("no http state: ");
result = 0;
result = 1;
end:
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
if (htp_state != NULL)
HTPStateFree(htp_state);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
if (det_ctx != NULL) DetectEngineThreadCtxDeinit(&th_v, det_ctx);
if (de_ctx != NULL) DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
if (det_ctx != NULL) DetectEngineThreadCtxDeinit(&th_v, det_ctx);
if (de_ctx != NULL) DetectEngineCtxFree(de_ctx);
- //FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.proto = p->proto;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
StreamMsg *stream_msg = StreamMsgGetFromPool();
if (stream_msg == NULL) {
/* do detect */
SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
if (det_ctx != NULL) DetectEngineThreadCtxDeinit(&th_v, det_ctx);
if (de_ctx != NULL) DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.proto = p->proto;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
StreamMsg *stream_msg = StreamMsgGetFromPool();
if (stream_msg == NULL) {
/* do detect */
SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
if (det_ctx != NULL) DetectEngineThreadCtxDeinit(&th_v, det_ctx);
if (de_ctx != NULL) DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
/* do detect */
SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
if (det_ctx != NULL) DetectEngineThreadCtxDeinit(&th_v, det_ctx);
if (de_ctx != NULL) DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- HtpState *htp_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ HtpState *htp_state = f.alstate;
if (htp_state == NULL) {
SCLogDebug("no http state: ");
goto end;
if (de_ctx != NULL) SigCleanSignatures(de_ctx);
if (de_ctx != NULL) DetectEngineCtxFree(de_ctx);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
UTHFreePackets(&p, 1);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
DetectEngineCtxFree(de_ctx);
end:
UTHFreePackets(&p, 1);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
end:
UTHFreePackets(&p, 1);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
AppLayerParserCleanupState(&f);
FLOW_DESTROY(&f);
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
DetectEngineCtxFree(de_ctx);
end:
UTHFreePackets(&p, 1);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
DetectEngineCtxFree(de_ctx);
end:
UTHFreePackets(&p, 1);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
DetectEngineCtxFree(de_ctx);
end:
UTHFreePackets(&p, 1);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
DetectEngineCtxFree(de_ctx);
end:
UTHFreePackets(&p, 1);
- FlowL7DataPtrFree(&f);
StreamTcpFreeConfig(TRUE);
FLOW_DESTROY(&f);
return result;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
f.alproto = ALPROTO_HTTP;
StreamTcpInitConfig(TRUE);
- FlowL7DataPtrInit(&f);
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
if (de_ctx == NULL) {
goto end;
}
- http_state = f.aldata[AlpGetStateIdx(ALPROTO_HTTP)];
+ http_state = f.alstate;
if (http_state == NULL) {
printf("no http state: ");
goto end;
printf("FIXME: %s:%s:%" PRId32 "\n", __FILE__, __FUNCTION__, __LINE__);
}
- FlowL7DataPtrInit(f);
COPY_TIMESTAMP(&p->ts, &f->startts);
f->protomap = FlowGetProtoMapping(f->proto);
(f)->alproto = 0; \
(f)->probing_parser_toserver_al_proto_masks = 0; \
(f)->probing_parser_toclient_al_proto_masks = 0; \
- (f)->aldata = NULL; \
+ (f)->alparser = NULL; \
+ (f)->alstate = NULL; \
(f)->de_state = NULL; \
(f)->sgh_toserver = NULL; \
(f)->sgh_toclient = NULL; \
(f)->flags = 0; \
(f)->lastts_sec = 0; \
(f)->protoctx = NULL; \
- FlowL7DataPtrFree(f); \
+ FlowCleanupAppLayer((f)); \
+ (f)->alparser = NULL; \
+ (f)->alstate = NULL; \
(f)->alproto = 0; \
(f)->probing_parser_toserver_al_proto_masks = 0; \
(f)->probing_parser_toclient_al_proto_masks = 0; \
SC_ATOMIC_DESTROY((f)->use_cnt); \
\
SCMutexDestroy(&(f)->m); \
+ FlowCleanupAppLayer((f)); \
if ((f)->de_state != NULL) { \
DetectEngineStateFree((f)->de_state); \
} \
- /* clear app layer related memory */ \
- FlowL7DataPtrFree(f); \
DetectTagDataListFree((f)->tag_list); \
GenericVarFree((f)->flowvar); \
SCMutexDestroy(&(f)->de_state_m); \
/* Run mode selected at suricata.c */
extern int run_mode;
-/** \brief Initialize the l7data ptr in the Flow session used by the L7 Modules
- * for data storage.
- *
- * \param f Flow to init the ptrs for
- * \param cnt number of items in the array
- *
- * \todo VJ use a pool?
- */
-void FlowL7DataPtrInit(Flow *f)
-{
- if (f->aldata != NULL)
- return;
-
- uint32_t size = (uint32_t)(sizeof (void *) * AppLayerGetStorageSize());
-
- // XXXPR pass to flow memcap if (StreamTcpCheckMemcap(size) == 0)
- // XXXPR pass to flow memcap return;
-
- f->aldata = (void **) SCMalloc(size);
- if (f->aldata != NULL) {
- // StreamTcpIncrMemuse(size);
- uint8_t u;
- for (u = 0; u < AppLayerGetStorageSize(); u++) {
- f->aldata[u] = NULL;
- }
- }
-
- return;
-}
-
-void FlowL7DataPtrFree(Flow *f)
+void FlowCleanupAppLayer(Flow *f)
{
if (f == NULL)
return;
- if (f->aldata == NULL)
- return;
-
AppLayerParserCleanupState(f);
- SCFree(f->aldata);
- f->aldata = NULL;
-
- // uint32_t size = (uint32_t)(sizeof (void *) * StreamL7GetStorageSize());
- // StreamTcpDecrMemuse(size);
-
return;
}
uint16_t alproto; /**< \brief application level protocol */
- /** \brief array of application level storage ptrs.
+ /** application level storage ptrs.
*
- * The size of array is ALPROTO_MAX and thus depends on the number of protocol
- * supported. Regarding the memeber of the arrays, for an HTTP flow member
- * can point to a ::HtpState.
- *
- * Use AppLayerGetProtoStateFromPacket() to get a pointer to the application
- * layer the packet belongs to.
*/
+ void *alparser; /**< parser internal state */
+ void *alstate; /**< application layer state */
- void **aldata;
/** detection engine state */
struct DetectEngineState_ *de_state;
int FlowGetPacketDirection(Flow *, Packet *);
-void FlowL7DataPtrInit(Flow *);
-void FlowL7DataPtrFree(Flow *);
+void FlowCleanupAppLayer(Flow *);
/** ----- Inline functions ----- */
uint16_t flags;
TcpStream server;
TcpStream client;
- struct StreamMsg_ *toserver_smsg_head; /**< list of stream msgs (for detection inspection) */
- struct StreamMsg_ *toserver_smsg_tail; /**< list of stream msgs (for detection inspection) */
- struct StreamMsg_ *toclient_smsg_head; /**< list of stream msgs (for detection inspection) */
- struct StreamMsg_ *toclient_smsg_tail; /**< list of stream msgs (for detection inspection) */
+ struct StreamMsg_ *toserver_smsg_head; /**< list of stream msgs (for detection inspection) */
+ struct StreamMsg_ *toserver_smsg_tail; /**< list of stream msgs (for detection inspection) */
+ struct StreamMsg_ *toclient_smsg_head; /**< list of stream msgs (for detection inspection) */
+ struct StreamMsg_ *toclient_smsg_tail; /**< list of stream msgs (for detection inspection) */
} TcpSession;
#endif /* __STREAM_TCP_PRIVATE_H__ */
StreamTcpSackFreeList(&ssn->server);
/* reset the app layer state */
AppLayerParserCleanupState(p->flow);
- FlowL7DataPtrInit(p->flow);
ssn->state = 0;
ssn->flags = 0;
}
f.protoctx = ssn;
- if (f.aldata != NULL) {
+ if (f.alparser != NULL) {
printf("AppLayer field not set to NULL: ");
goto end;
}
projects / people / ms / suricata.git / commitdiff
