aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove need_lock from app layer parsers.

Browse Source
remotes/origin/master-1.0.x
Victor Julien 16 years ago
parent 7e2408d273
commit 18fe3818dc
6 changed files with 39 additions and 42 deletions
Show Stats Download Patch File Download Diff File

8
src/app-layer-dcerpc.c
Unescape Escape View File

@ -38,7 +38,7 @@ enum {
}; };
#if 0 #if 0
static int DCERPCParseBIND(void *dcerpc_state, AppLayerParserState *pstate, uint8_t *input, uint32_t input_len, AppLayerParserResult *output, char need_lock) { static int DCERPCParseBIND(void *dcerpc_state, AppLayerParserState *pstate, uint8_t *input, uint32_t input_len, AppLayerParserResult *output) {
DCERPCState *sstate = (DCERPCState *)dcerpc_state; DCERPCState *sstate = (DCERPCState *)dcerpc_state;
uint8_t *p = input; uint8_t *p = input;
if (input_len) { if (input_len) {
@ -73,7 +73,7 @@ static int DCERPCParseBIND(void *dcerpc_state, AppLayerParserState *pstate, uint
return (p - input); return (p - input);
} }
static int DCERPCParseBINDACK(void *dcerpc_state, AppLayerParserState *pstate, uint8_t *input, uint32_t input_len, AppLayerParserResult *output, char need_lock) { static int DCERPCParseBINDACK(void *dcerpc_state, AppLayerParserState *pstate, uint8_t *input, uint32_t input_len, AppLayerParserResult *output) {
DCERPCState *sstate = (DCERPCState *)dcerpc_state; DCERPCState *sstate = (DCERPCState *)dcerpc_state;
uint8_t *p = input; uint8_t *p = input;
return 0; return 0;
@ -82,7 +82,7 @@ static int DCERPCParseBINDACK(void *dcerpc_state, AppLayerParserState *pstate, u
static int DCERPCParseHeader(Flow *f, void *dcerpc_state, AppLayerParserState static int DCERPCParseHeader(Flow *f, void *dcerpc_state, AppLayerParserState
*pstate, uint8_t *input, uint32_t input_len, *pstate, uint8_t *input, uint32_t input_len,
AppLayerParserResult *output, char need_lock) { AppLayerParserResult *output) {
SCEnter(); SCEnter();
DCERPCState *sstate = (DCERPCState *)dcerpc_state; DCERPCState *sstate = (DCERPCState *)dcerpc_state;
@ -175,7 +175,7 @@ static int DCERPCParseHeader(Flow *f, void *dcerpc_state, AppLayerParserState
SCReturnInt(0); SCReturnInt(0);
} }
static int DCERPCParse(Flow *f, void *dcerpc_state, AppLayerParserState *pstate, uint8_t *input, uint32_t input_len, AppLayerParserResult *output, char need_lock) { static int DCERPCParse(Flow *f, void *dcerpc_state, AppLayerParserState *pstate, uint8_t *input, uint32_t input_len, AppLayerParserResult *output) {
SCEnter(); SCEnter();
// DCERPCState *sstate = (DCERPCState *)dcerpc_state; // DCERPCState *sstate = (DCERPCState *)dcerpc_state;
uint16_t max_fields = 3; uint16_t max_fields = 3;

4
src/app-layer-htp.c
Unescape Escape View File

@ -108,7 +108,7 @@ void HTPGetIPAddr(Flow *f, int family, char *remote_addr, char *local_addr)
static int HTPHandleRequestData(Flow *f, void *htp_state, static int HTPHandleRequestData(Flow *f, void *htp_state,
AppLayerParserState *pstate, AppLayerParserState *pstate,
uint8_t *input, uint32_t input_len, uint8_t *input, uint32_t input_len,
AppLayerParserResult *output, char need_lock) AppLayerParserResult *output)
{ {
SCEnter(); SCEnter();
HtpState *hstate = (HtpState *)htp_state; HtpState *hstate = (HtpState *)htp_state;
@ -165,7 +165,7 @@ static int HTPHandleRequestData(Flow *f, void *htp_state,
static int HTPHandleResponseData(Flow *f, void *htp_state, static int HTPHandleResponseData(Flow *f, void *htp_state,
AppLayerParserState *pstate, AppLayerParserState *pstate,
uint8_t *input, uint32_t input_len, uint8_t *input, uint32_t input_len,
AppLayerParserResult *output, char need_lock) AppLayerParserResult *output)
{ {
SCEnter(); SCEnter();
HtpState *hstate = (HtpState *)htp_state; HtpState *hstate = (HtpState *)htp_state;

12
src/app-layer-parser.c
Unescape Escape View File

@ -477,8 +477,8 @@ uint16_t AppLayerGetProtoByName(const char *name)
int AppLayerRegisterParser(char *name, uint16_t proto, uint16_t parser_id, int AppLayerRegisterParser(char *name, uint16_t proto, uint16_t parser_id,
int (*AppLayerParser)(Flow *f, void *protocol_state, int (*AppLayerParser)(Flow *f, void *protocol_state,
AppLayerParserState *parser_state, uint8_t *input, AppLayerParserState *parser_state, uint8_t *input,
uint32_t input_len, AppLayerParserResult *output, uint32_t input_len, AppLayerParserResult *output),
char need_lock), char *dependency) char *dependency)
{ {
al_max_parsers++; al_max_parsers++;
@ -513,8 +513,7 @@ int AppLayerRegisterParser(char *name, uint16_t proto, uint16_t parser_id,
int AppLayerRegisterProto(char *name, uint8_t proto, uint8_t flags, int AppLayerRegisterProto(char *name, uint8_t proto, uint8_t flags,
int (*AppLayerParser)(Flow *f, void *protocol_state, int (*AppLayerParser)(Flow *f, void *protocol_state,
AppLayerParserState *parser_state, uint8_t *input, AppLayerParserState *parser_state, uint8_t *input,
uint32_t input_len, AppLayerParserResult *output, uint32_t input_len, AppLayerParserResult *output))
char need_lock))
{ {
al_max_parsers++; al_max_parsers++;
@ -610,8 +609,7 @@ static int AppLayerDoParse(Flow *f, void *app_layer_state, AppLayerParserState *
/* invoke the parser */ /* invoke the parser */
int r = al_parser_table[parser_idx].AppLayerParser(f, app_layer_state, int r = al_parser_table[parser_idx].AppLayerParser(f, app_layer_state,
parser_state, input, input_len, &result, parser_state, input, input_len, &result);
need_lock);
if (r < 0) { if (r < 0) {
if (r == -1) { if (r == -1) {
AppLayerParserResultCleanup(&result); AppLayerParserResultCleanup(&result);
@ -981,7 +979,7 @@ typedef struct TestState_ {
*/ */
static int TestProtocolParser(Flow *f, void *test_state, AppLayerParserState *pstate, static int TestProtocolParser(Flow *f, void *test_state, AppLayerParserState *pstate,
uint8_t *input, uint32_t input_len, uint8_t *input, uint32_t input_len,
AppLayerParserResult *output, char need_lock) AppLayerParserResult *output)
{ {
return -1; return -1;
} }

9
src/app-layer-parser.h
Unescape Escape View File

@ -77,7 +77,7 @@ typedef struct AppLayerParserTableElement_ {
uint8_t flags; uint8_t flags;
int (*AppLayerParser)(Flow *f, void *protocol_state, AppLayerParserState int (*AppLayerParser)(Flow *f, void *protocol_state, AppLayerParserState
*parser_state, uint8_t *input, uint32_t input_len, *parser_state, uint8_t *input, uint32_t input_len,
AppLayerParserResult *output, char need_lock); AppLayerParserResult *output);
uint16_t max_outputs; /* rationele is that if we know the max outputs of all uint16_t max_outputs; /* rationele is that if we know the max outputs of all
parsers, we can statically define our output array parsers, we can statically define our output array
to be a certain size */ to be a certain size */
@ -90,13 +90,12 @@ void RegisterAppLayerParsers(void);
int AppLayerRegisterProto(char *name, uint8_t proto, uint8_t flags, int AppLayerRegisterProto(char *name, uint8_t proto, uint8_t flags,
int (*AppLayerParser)(Flow *f, void *protocol_state, int (*AppLayerParser)(Flow *f, void *protocol_state,
AppLayerParserState *parser_state, uint8_t *input, AppLayerParserState *parser_state, uint8_t *input,
uint32_t input_len, AppLayerParserResult *output, uint32_t input_len, AppLayerParserResult *output));
char need_lock));
int AppLayerRegisterParser(char *name, uint16_t proto, uint16_t parser_id, int AppLayerRegisterParser(char *name, uint16_t proto, uint16_t parser_id,
int (*AppLayerParser)(Flow *f, void *protocol_state, int (*AppLayerParser)(Flow *f, void *protocol_state,
AppLayerParserState *parser_state, uint8_t *input, AppLayerParserState *parser_state, uint8_t *input,
uint32_t input_len, AppLayerParserResult *output, uint32_t input_len, AppLayerParserResult *output),
char need_lock), char *dependency); char *dependency);
void AppLayerRegisterStateFuncs(uint16_t proto, void *(*StateAlloc)(void), void AppLayerRegisterStateFuncs(uint16_t proto, void *(*StateAlloc)(void),
void (*StateFree)(void *)); void (*StateFree)(void *));

36
src/app-layer-smb.c
Unescape Escape View File

@ -100,8 +100,8 @@ void hexdump(const void *buf, size_t len) {
* \brief SMB Write AndX Request Parsing * \brief SMB Write AndX Request Parsing
*/ */
/* For WriteAndX we need to get writeandxdataoffset */ /* For WriteAndX we need to get writeandxdataoffset */
static int SMBParseAndX(Flow *f, void *smb_state, AppLayerParserState *pstate, static int SMBParseWriteAndX(Flow *f, void *smb_state, AppLayerParserState *pstate,
uint8_t *input, uint32_t input_len, AppLayerParserResult *output, char need_lock) { uint8_t *input, uint32_t input_len, AppLayerParserResult *output) {
SMBState *sstate = (SMBState *) smb_state; SMBState *sstate = (SMBState *) smb_state;
uint8_t *p = input; uint8_t *p = input;
switch (sstate->andx.andxbytesprocessed) { switch (sstate->andx.andxbytesprocessed) {
@ -239,7 +239,7 @@ static int SMBParseAndX(Flow *f, void *smb_state, AppLayerParserState *pstate,
/** /**
* \brief SMB Read AndX Response Parsing * \brief SMB Read AndX Response Parsing
*/ */
static int SMBParseReadAndX(void *smb_state, AppLayerParserState *pstate, static int SMBParseReadAndX(Flow *f, void *smb_state, AppLayerParserState *pstate,
uint8_t *input, uint32_t input_len, AppLayerParserResult *output) { uint8_t *input, uint32_t input_len, AppLayerParserResult *output) {
SMBState *sstate = (SMBState *) smb_state; SMBState *sstate = (SMBState *) smb_state;
uint8_t *p = input; uint8_t *p = input;
@ -380,7 +380,7 @@ static int DataParser(void *smb_state, AppLayerParserState *pstate,
* Determine if this is an SMB AndX Command * Determine if this is an SMB AndX Command
*/ */
static int SMBGetWordCount(Flow *f, void *smb_state, AppLayerParserState *pstate, static int SMBGetWordCount(Flow *f, void *smb_state, AppLayerParserState *pstate,
uint8_t *input, uint32_t input_len, AppLayerParserResult *output, char need_lock) uint8_t *input, uint32_t input_len, AppLayerParserResult *output)
{ {
SCEnter(); SCEnter();
if (input_len) { if (input_len) {
@ -402,7 +402,7 @@ static int SMBGetWordCount(Flow *f, void *smb_state, AppLayerParserState *pstate
*/ */
static int SMBGetByteCount(Flow *f, void *smb_state, AppLayerParserState *pstate, static int SMBGetByteCount(Flow *f, void *smb_state, AppLayerParserState *pstate,
uint8_t *input, uint32_t input_len, AppLayerParserResult *output, char need_lock) uint8_t *input, uint32_t input_len, AppLayerParserResult *output)
{ {
SCEnter(); SCEnter();
SMBState *sstate = (SMBState *) smb_state; SMBState *sstate = (SMBState *) smb_state;
@ -428,7 +428,7 @@ static int SMBGetByteCount(Flow *f, void *smb_state, AppLayerParserState *pstate
* until sstate->wordcount.wordcount bytes are parsed. * until sstate->wordcount.wordcount bytes are parsed.
*/ */
static int SMBParseWordCount(Flow *f, void *smb_state, AppLayerParserState *pstate, static int SMBParseWordCount(Flow *f, void *smb_state, AppLayerParserState *pstate,
uint8_t *input, uint32_t input_len, AppLayerParserResult *output, char need_lock) uint8_t *input, uint32_t input_len, AppLayerParserResult *output)
{ {
SCEnter(); SCEnter();
SMBState *sstate = (SMBState *) smb_state; SMBState *sstate = (SMBState *) smb_state;
@ -436,13 +436,13 @@ static int SMBParseWordCount(Flow *f, void *smb_state, AppLayerParserState *psta
uint32_t retval = 0; uint32_t retval = 0;
uint32_t parsed = 0; uint32_t parsed = 0;
if ((sstate->smb.flags & SMB_FLAGS_SERVER_TO_REDIR) && sstate->smb.command == SMB_COM_READ_ANDX) { if ((sstate->smb.flags & SMB_FLAGS_SERVER_TO_REDIR) && sstate->smb.command == SMB_COM_READ_ANDX) {
retval = SMBParseReadAndX(sstate, pstate, input + parsed, input_len, output); retval = SMBParseReadAndX(f, sstate, pstate, input + parsed, input_len, output);
parsed += retval; parsed += retval;
input_len -= retval; input_len -= retval;
sstate->wordcount.wordcount -= retval; sstate->wordcount.wordcount -= retval;
return retval; return retval;
} else if (((sstate->smb.flags & SMB_FLAGS_SERVER_TO_REDIR) == 0) && sstate->smb.command == SMB_COM_WRITE_ANDX) { } else if (((sstate->smb.flags & SMB_FLAGS_SERVER_TO_REDIR) == 0) && sstate->smb.command == SMB_COM_WRITE_ANDX) {
retval = SMBParseWriteAndX(sstate, pstate, input + parsed, input_len, output); retval = SMBParseWriteAndX(f, sstate, pstate, input + parsed, input_len, output);
parsed += retval; parsed += retval;
input_len -= retval; input_len -= retval;
sstate->wordcount.wordcount -= retval; sstate->wordcount.wordcount -= retval;
@ -464,7 +464,7 @@ static int SMBParseWordCount(Flow *f, void *smb_state, AppLayerParserState *psta
*/ */
static int SMBParseByteCount(Flow *f, void *smb_state, AppLayerParserState *pstate, static int SMBParseByteCount(Flow *f, void *smb_state, AppLayerParserState *pstate,
uint8_t *input, uint32_t input_len, AppLayerParserResult *output, char need_lock) uint8_t *input, uint32_t input_len, AppLayerParserResult *output)
{ {
SCEnter(); SCEnter();
SMBState *sstate = (SMBState *) smb_state; SMBState *sstate = (SMBState *) smb_state;
@ -500,7 +500,7 @@ static int SMBParseByteCount(Flow *f, void *smb_state, AppLayerParserState *psta
#define DEBUG 1 #define DEBUG 1
static int NBSSParseHeader(Flow *f, void *smb_state, AppLayerParserState *pstate, static int NBSSParseHeader(Flow *f, void *smb_state, AppLayerParserState *pstate,
uint8_t *input, uint32_t input_len, AppLayerParserResult *output, char need_lock) uint8_t *input, uint32_t input_len, AppLayerParserResult *output)
{ {
SCEnter(); SCEnter();
SMBState *sstate = (SMBState *) smb_state; SMBState *sstate = (SMBState *) smb_state;
@ -543,7 +543,7 @@ static int NBSSParseHeader(Flow *f, void *smb_state, AppLayerParserState *pstate
} }
static int SMBParseHeader(Flow *f, void *smb_state, AppLayerParserState *pstate, static int SMBParseHeader(Flow *f, void *smb_state, AppLayerParserState *pstate,
uint8_t *input, uint32_t input_len, AppLayerParserResult *output, char need_lock) uint8_t *input, uint32_t input_len, AppLayerParserResult *output)
{ {
SCEnter(); SCEnter();
SMBState *sstate = (SMBState *) smb_state; SMBState *sstate = (SMBState *) smb_state;
@ -701,7 +701,7 @@ static int SMBParseHeader(Flow *f, void *smb_state, AppLayerParserState *pstate,
} }
static int SMBParse(Flow *f, void *smb_state, AppLayerParserState *pstate, static int SMBParse(Flow *f, void *smb_state, AppLayerParserState *pstate,
uint8_t *input, uint32_t input_len, AppLayerParserResult *output, char need_lock) uint8_t *input, uint32_t input_len, AppLayerParserResult *output)
{ {
SCEnter(); SCEnter();
@ -714,7 +714,7 @@ static int SMBParse(Flow *f, void *smb_state, AppLayerParserState *pstate,
while (sstate->bytesprocessed < NBSS_HDR_LEN) { while (sstate->bytesprocessed < NBSS_HDR_LEN) {
retval = NBSSParseHeader(f, smb_state, pstate, input, input_len, retval = NBSSParseHeader(f, smb_state, pstate, input, input_len,
output, need_lock); output);
parsed += retval; parsed += retval;
input_len -= retval; input_len -= retval;
@ -728,7 +728,7 @@ static int SMBParse(Flow *f, void *smb_state, AppLayerParserState *pstate,
while (input_len && (sstate->bytesprocessed >= NBSS_HDR_LEN && while (input_len && (sstate->bytesprocessed >= NBSS_HDR_LEN &&
sstate->bytesprocessed < NBSS_HDR_LEN + SMB_HDR_LEN)) { sstate->bytesprocessed < NBSS_HDR_LEN + SMB_HDR_LEN)) {
retval = SMBParseHeader(f, smb_state, pstate, input + retval = SMBParseHeader(f, smb_state, pstate, input +
parsed, input_len, output, need_lock); parsed, input_len, output);
parsed += retval; parsed += retval;
input_len -= retval; input_len -= retval;
printf("SMB Header (%u/%u) Command 0x%02x parsed %u input_len %u\n", printf("SMB Header (%u/%u) Command 0x%02x parsed %u input_len %u\n",
@ -740,7 +740,7 @@ static int SMBParse(Flow *f, void *smb_state, AppLayerParserState *pstate,
if (input_len && (sstate->bytesprocessed == NBSS_HDR_LEN + SMB_HDR_LEN)) { if (input_len && (sstate->bytesprocessed == NBSS_HDR_LEN + SMB_HDR_LEN)) {
retval = SMBGetWordCount(f, smb_state, pstate, retval = SMBGetWordCount(f, smb_state, pstate,
input + parsed, input_len, input + parsed, input_len,
output, need_lock); output);
parsed += retval; parsed += retval;
input_len -= retval; input_len -= retval;
printf("Wordcount (%u) parsed %u input_len %u\n", printf("Wordcount (%u) parsed %u input_len %u\n",
@ -752,7 +752,7 @@ static int SMBParse(Flow *f, void *smb_state, AppLayerParserState *pstate,
+ sstate->wordcount.wordcount)) { + sstate->wordcount.wordcount)) {
retval = SMBParseWordCount(f, smb_state, pstate, retval = SMBParseWordCount(f, smb_state, pstate,
input + parsed, input_len, input + parsed, input_len,
output, need_lock); output);
parsed += retval; parsed += retval;
input_len -= retval; input_len -= retval;
} }
@ -762,7 +762,7 @@ static int SMBParse(Flow *f, void *smb_state, AppLayerParserState *pstate,
SMB_HDR_LEN + 3 + sstate->wordcount.wordcount)) { SMB_HDR_LEN + 3 + sstate->wordcount.wordcount)) {
retval = SMBGetByteCount(f, smb_state, pstate, retval = SMBGetByteCount(f, smb_state, pstate,
input + parsed, input_len, input + parsed, input_len,
output, need_lock); output);
parsed += retval; parsed += retval;
input_len -= retval; input_len -= retval;
} }
@ -773,7 +773,7 @@ static int SMBParse(Flow *f, void *smb_state, AppLayerParserState *pstate,
+ sstate->wordcount.wordcount + sstate->bytecount.bytecount)) { + sstate->wordcount.wordcount + sstate->bytecount.bytecount)) {
retval = SMBParseByteCount(f, smb_state, pstate, retval = SMBParseByteCount(f, smb_state, pstate,
input + parsed, input_len, input + parsed, input_len,
output, need_lock); output);
parsed += retval; parsed += retval;
input_len -= retval; input_len -= retval;
} }

12
src/app-layer-tls.c
Unescape Escape View File

@ -43,7 +43,7 @@
*/ */
static int TLSParseClientContentType(Flow *f, void *tls_state, AppLayerParserState static int TLSParseClientContentType(Flow *f, void *tls_state, AppLayerParserState
*pstate, uint8_t *input, uint32_t input_len, *pstate, uint8_t *input, uint32_t input_len,
AppLayerParserResult *output, char need_lock) AppLayerParserResult *output)
{ {
SCEnter(); SCEnter();
@ -102,7 +102,7 @@ static int TLSParseClientContentType(Flow *f, void *tls_state, AppLayerParserSta
* \param output Pointer to the list of parsed elements * \param output Pointer to the list of parsed elements
*/ */
static int TLSParseClientVersion(Flow *f, void *tls_state, AppLayerParserState *pstate, static int TLSParseClientVersion(Flow *f, void *tls_state, AppLayerParserState *pstate,
uint8_t *input, uint32_t input_len, AppLayerParserResult *output, char need_lock) uint8_t *input, uint32_t input_len, AppLayerParserResult *output)
{ {
SCEnter(); SCEnter();
@ -144,7 +144,7 @@ static int TLSParseClientVersion(Flow *f, void *tls_state, AppLayerParserState *
*/ */
static int TLSParseClientRecord(Flow *f, void *tls_state, AppLayerParserState *pstate, static int TLSParseClientRecord(Flow *f, void *tls_state, AppLayerParserState *pstate,
uint8_t *input, uint32_t input_len, uint8_t *input, uint32_t input_len,
AppLayerParserResult *output, char need_lock) AppLayerParserResult *output)
{ {
SCEnter(); SCEnter();
@ -269,7 +269,7 @@ static int TLSParseClientRecord(Flow *f, void *tls_state, AppLayerParserState *p
*/ */
static int TLSParseServerRecord(Flow *f, void *tls_state, AppLayerParserState *pstate, static int TLSParseServerRecord(Flow *f, void *tls_state, AppLayerParserState *pstate,
uint8_t *input, uint32_t input_len, uint8_t *input, uint32_t input_len,
AppLayerParserResult *output, char need_lock) AppLayerParserResult *output)
{ {
SCEnter(); SCEnter();
@ -393,7 +393,7 @@ static int TLSParseServerRecord(Flow *f, void *tls_state, AppLayerParserState *p
*/ */
static int TLSParseServerVersion(Flow *f, void *tls_state, AppLayerParserState *pstate, static int TLSParseServerVersion(Flow *f, void *tls_state, AppLayerParserState *pstate,
uint8_t *input, uint32_t input_len, uint8_t *input, uint32_t input_len,
AppLayerParserResult *output, char need_lock) AppLayerParserResult *output)
{ {
SCEnter(); SCEnter();
TlsState *state = (TlsState *)tls_state; TlsState *state = (TlsState *)tls_state;
@ -424,7 +424,7 @@ static int TLSParseServerVersion(Flow *f, void *tls_state, AppLayerParserState *
*/ */
static int TLSParseServerContentType(Flow *f, void *tls_state, AppLayerParserState *pstate, static int TLSParseServerContentType(Flow *f, void *tls_state, AppLayerParserState *pstate,
uint8_t *input, uint32_t input_len, uint8_t *input, uint32_t input_len,
AppLayerParserResult *output, char need_lock) AppLayerParserResult *output)
{ {
SCEnter(); SCEnter();
TlsState *state = (TlsState *)tls_state; TlsState *state = (TlsState *)tls_state;

Write Preview
Loading…
Cancel
Save