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

code indentation changes in app-layer-smb.c

Browse Source
remotes/origin/master-1.1.x
Anoop Saldanha 15 years ago committed by Victor Julien
parent 7c31a2327e
commit b7b7bbec37
2 changed files with 96 additions and 65 deletions
Show Stats Download Patch File Download Diff File

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

@ -197,6 +197,10 @@ int AppLayerRegisterParser(char *name, uint16_t proto, uint16_t parser_id,
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 *dependency); char *dependency);
void AppLayerRegisterProbingParser(uint16_t, uint16_t, const char *, uint16_t,
uint16_t, uint16_t, uint8_t, uint8_t,
uint8_t, uint16_t (*ProbingParser)
(uint8_t *, uint32_t));
void AppLayerRegisterStateFuncs(uint16_t proto, void *(*StateAlloc)(void), void AppLayerRegisterStateFuncs(uint16_t proto, void *(*StateAlloc)(void),
void (*StateFree)(void *)); void (*StateFree)(void *));
void AppLayerRegisterTransactionIdFuncs(uint16_t proto, void AppLayerRegisterTransactionIdFuncs(uint16_t proto,

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

@ -1017,7 +1017,9 @@ static int SMBParseHeader(Flow *f, void *smb_state,
} }
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) { uint8_t *input, uint32_t input_len,
AppLayerParserResult *output)
{
SCEnter(); SCEnter();
SMBState *sstate = (SMBState *) smb_state; SMBState *sstate = (SMBState *) smb_state;
@ -1032,14 +1034,14 @@ 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) {
retval = NBSSParseHeader(f, smb_state, pstate, input, retval = NBSSParseHeader(f, smb_state, pstate, input,
input_len, output); input_len, output);
if (retval) { if (retval) {
parsed += retval; parsed += retval;
input_len -= retval; input_len -= retval;
SCLogDebug( SCLogDebug("[1] NBSS Header (%u/%u) Type 0x%02x Length 0x%04x "
"[1] NBSS Header (%u/%u) Type 0x%02x Length 0x%04x parsed %"PRIu64" input_len %u\n", "parsed %"PRIu64" input_len %u",
sstate->bytesprocessed, NBSS_HDR_LEN, sstate->nbss.type, sstate->bytesprocessed, NBSS_HDR_LEN, sstate->nbss.type,
sstate->nbss.length, parsed, input_len); sstate->nbss.length, parsed, input_len);
} else if (input_len) { } else if (input_len) {
SCLogDebug("Error parsing NBSS Header"); SCLogDebug("Error parsing NBSS Header");
sstate->bytesprocessed = 0; sstate->bytesprocessed = 0;
@ -1049,121 +1051,146 @@ static int SMBParse(Flow *f, void *smb_state, AppLayerParserState *pstate,
switch (sstate->nbss.type) { switch (sstate->nbss.type) {
case NBSS_SESSION_MESSAGE: case NBSS_SESSION_MESSAGE:
while (input_len && (sstate->bytesprocessed >= NBSS_HDR_LEN while (input_len &&
&& sstate->bytesprocessed < NBSS_HDR_LEN + SMB_HDR_LEN)) { (sstate->bytesprocessed >= NBSS_HDR_LEN &&
sstate->bytesprocessed < NBSS_HDR_LEN + SMB_HDR_LEN)) {
/* inside while */
hdrretval = SMBParseHeader(f, smb_state, pstate, input + parsed, hdrretval = SMBParseHeader(f, smb_state, pstate, input + parsed,
input_len, output); input_len, output);
if (hdrretval == -1) { if (hdrretval == -1) {
SCLogDebug("Error parsing SMB Header\n"); SCLogDebug("Error parsing SMB Header");
sstate->bytesprocessed = 0; sstate->bytesprocessed = 0;
SCReturnInt(0); SCReturnInt(0);
} else { } else {
parsed += hdrretval; parsed += hdrretval;
input_len -= hdrretval; input_len -= hdrretval;
SCLogDebug( SCLogDebug("[2] SMB Header (%u/%u) Command 0x%02x "
"[2] SMB Header (%u/%u) Command 0x%02x parsed %"PRIu64" input_len %u\n", "parsed %"PRIu64" input_len %u",
sstate->bytesprocessed, NBSS_HDR_LEN + SMB_HDR_LEN, sstate->bytesprocessed, NBSS_HDR_LEN + SMB_HDR_LEN,
sstate->smb.command, parsed, input_len); sstate->smb.command, parsed, input_len);
} }
} } /* while */
do { do {
if (input_len && (sstate->bytesprocessed == NBSS_HDR_LEN if (input_len &&
+ SMB_HDR_LEN)) { (sstate->bytesprocessed == NBSS_HDR_LEN + SMB_HDR_LEN)) {
/* inside if */
retval = SMBGetWordCount(f, smb_state, pstate, input + parsed, retval = SMBGetWordCount(f, smb_state, pstate, input + parsed,
input_len, output); input_len, output);
if (retval) { if (retval) {
parsed += retval; parsed += retval;
input_len -= retval; input_len -= retval;
} else if (input_len) { } else if (input_len) {
SCLogDebug("Error parsing SMB Word Count\n"); SCLogDebug("Error parsing SMB Word Count");
sstate->bytesprocessed = 0; sstate->bytesprocessed = 0;
SCReturnInt(0); SCReturnInt(0);
} }
SCLogDebug("[3] WordCount (%u/%u) WordCount %u parsed %"PRIu64" input_len %u\n", SCLogDebug("[3] WordCount (%u/%u) WordCount %u parsed "
sstate->bytesprocessed, NBSS_HDR_LEN + SMB_HDR_LEN + 1, "%"PRIu64" input_len %u",
sstate->wordcount.wordcount, sstate->bytesprocessed,
parsed, input_len); NBSS_HDR_LEN + SMB_HDR_LEN + 1,
} sstate->wordcount.wordcount,
parsed, input_len);
while (input_len && (sstate->bytesprocessed >= NBSS_HDR_LEN } /* if (input_len && ..) */
+ SMB_HDR_LEN + 1 && sstate->bytesprocessed < NBSS_HDR_LEN
+ SMB_HDR_LEN + 1 + sstate->wordcount.wordcount)) { while (input_len &&
(sstate->bytesprocessed >= NBSS_HDR_LEN + SMB_HDR_LEN + 1 &&
sstate->bytesprocessed < (NBSS_HDR_LEN + SMB_HDR_LEN + 1 +
sstate->wordcount.wordcount))) {
/* inside while */
retval = SMBParseWordCount(f, smb_state, pstate, retval = SMBParseWordCount(f, smb_state, pstate,
input + parsed, input_len, output); input + parsed, input_len, output);
if (retval) { if (retval) {
parsed += retval; parsed += retval;
input_len -= retval; input_len -= retval;
} else if (input_len) { } else if (input_len) {
SCLogDebug("Error parsing SMB Word Count Data retval %"PRIu64" input_len %u\n", retval, input_len); SCLogDebug("Error parsing SMB Word Count Data retval "
"%"PRIu64" input_len %u", retval, input_len);
sstate->bytesprocessed = 0; sstate->bytesprocessed = 0;
SCReturnInt(0); SCReturnInt(0);
} }
SCLogDebug("[4] Parsing WordCount (%u/%u) WordCount %u parsed %"PRIu64" input_len %u\n", SCLogDebug("[4] Parsing WordCount (%u/%u) WordCount %u "
sstate->bytesprocessed, NBSS_HDR_LEN + SMB_HDR_LEN + 1 + sstate->wordcount.wordcount, "parsed %"PRIu64" input_len %u",
sstate->wordcount.wordcount, sstate->bytesprocessed,
parsed, input_len); NBSS_HDR_LEN + SMB_HDR_LEN + 1 +
} sstate->wordcount.wordcount,
sstate->wordcount.wordcount,
while (input_len && (sstate->bytesprocessed >= NBSS_HDR_LEN parsed, input_len);
+ SMB_HDR_LEN + 1 + sstate->wordcount.wordcount } /* while (input_len && ..) */
&& sstate->bytesprocessed < NBSS_HDR_LEN + SMB_HDR_LEN + 3
+ sstate->wordcount.wordcount)) { while (input_len &&
(sstate->bytesprocessed >= (NBSS_HDR_LEN + SMB_HDR_LEN +
1 + sstate->wordcount.wordcount) &&
sstate->bytesprocessed < (NBSS_HDR_LEN + SMB_HDR_LEN + 3
+ sstate->wordcount.wordcount))) {
/* inside while */
retval = SMBGetByteCount(f, smb_state, pstate, input + parsed, retval = SMBGetByteCount(f, smb_state, pstate, input + parsed,
input_len, output); input_len, output);
if (retval) { if (retval) {
parsed += retval; parsed += retval;
input_len -= retval; input_len -= retval;
} else if (input_len) { } else if (input_len) {
SCLogDebug("Error parsing SMB Byte Count\n"); SCLogDebug("Error parsing SMB Byte Count");
sstate->bytesprocessed = 0; sstate->bytesprocessed = 0;
SCReturnInt(0); SCReturnInt(0);
} }
SCLogDebug("[5] ByteCount (%u/%u) ByteCount %u parsed %"PRIu64" input_len %u\n", SCLogDebug("[5] ByteCount (%u/%u) ByteCount %u parsed "
sstate->bytesprocessed, NBSS_HDR_LEN + SMB_HDR_LEN + 3, "%"PRIu64" input_len %u",
sstate->bytecount.bytecount, sstate->bytesprocessed,
parsed, input_len); NBSS_HDR_LEN + SMB_HDR_LEN + 3,
sstate->bytecount.bytecount,
parsed, input_len);
if (sstate->bytecount.bytecount == 0) { if (sstate->bytecount.bytecount == 0) {
sstate->bytesprocessed = 0; sstate->bytesprocessed = 0;
input_len = 0; input_len = 0;
} }
} } /* while (input_len && ..) */
while (input_len && (sstate->bytesprocessed >= NBSS_HDR_LEN while (input_len &&
+ SMB_HDR_LEN + 3 + sstate->wordcount.wordcount) (sstate->bytesprocessed >= (NBSS_HDR_LEN + SMB_HDR_LEN +
&& (sstate->bytesprocessed < NBSS_HDR_LEN + SMB_HDR_LEN + 3 3 + sstate->wordcount.wordcount)) &&
+ sstate->wordcount.wordcount (sstate->bytesprocessed < (NBSS_HDR_LEN + SMB_HDR_LEN + 3
+ sstate->bytecount.bytecount)) { + sstate->wordcount.wordcount
+ sstate->bytecount.bytecount))) {
/* inside while */
retval = SMBParseByteCount(f, smb_state, pstate, retval = SMBParseByteCount(f, smb_state, pstate,
input + parsed, input_len, output); input + parsed, input_len, output);
if (retval) { if (retval) {
parsed += retval; parsed += retval;
input_len -= retval; input_len -= retval;
} else if (input_len) { } else if (input_len) {
SCLogDebug("Error parsing SMB Byte Count Data\n"); SCLogDebug("Error parsing SMB Byte Count Data");
sstate->bytesprocessed = 0; sstate->bytesprocessed = 0;
SCReturnInt(0); SCReturnInt(0);
} }
SCLogDebug("[6] Parsing ByteCount (%u/%u) ByteCount %u parsed %"PRIu64" input_len %u\n", SCLogDebug("[6] Parsing ByteCount (%u/%u) ByteCount %u "
sstate->bytesprocessed, NBSS_HDR_LEN + SMB_HDR_LEN + 1 + sstate->wordcount.wordcount + 2 + sstate->bytecount.bytecount, "parsed %"PRIu64" input_len %u",
sstate->bytecount.bytecount, parsed, input_len); sstate->bytesprocessed,
} NBSS_HDR_LEN + SMB_HDR_LEN + 1 +
sstate->wordcount.wordcount + 2 +
} while (sstate->andx.andxcommand != SMB_NO_SECONDARY_ANDX_COMMAND sstate->bytecount.bytecount,
&& input_len && sstate->andx.maxchainedandx--); sstate->bytecount.bytecount, parsed, input_len);
} /* while (input_len && ..) */
} while (sstate->andx.andxcommand != SMB_NO_SECONDARY_ANDX_COMMAND &&
input_len && sstate->andx.maxchainedandx--);
if (sstate->bytesprocessed >= sstate->nbss.length + NBSS_HDR_LEN || if (sstate->bytesprocessed >= sstate->nbss.length + NBSS_HDR_LEN ||
sstate->andx.maxchainedandx == 0) { sstate->andx.maxchainedandx == 0) {
/* inside if */
sstate->bytesprocessed = 0; sstate->bytesprocessed = 0;
sstate->transaction_id++; sstate->transaction_id++;
} }
break; break;
default: default:
sstate->bytesprocessed = 0; sstate->bytesprocessed = 0;
break; break;
} }
pstate->parse_field = 0; pstate->parse_field = 0;
SCReturnInt(1); SCReturnInt(1);
} }

Write Preview
Loading…
Cancel
Save