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

app-layer: pass full flags around in tx handling

Browse Source
pull/1606/head
Victor Julien 10 years ago
parent ea571add73
commit 00ef789ffc
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File

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

@ -660,10 +660,9 @@ uint64_t AppLayerTransactionGetActiveLogOnly(Flow *f, uint8_t flags)
} }
/* logger is disabled, return highest 'complete' tx id */ /* logger is disabled, return highest 'complete' tx id */
uint8_t direction = flags & (STREAM_TOSERVER|STREAM_TOCLIENT);
uint64_t total_txs = AppLayerParserGetTxCnt(f->proto, f->alproto, f->alstate); uint64_t total_txs = AppLayerParserGetTxCnt(f->proto, f->alproto, f->alstate);
uint64_t idx = AppLayerParserGetTransactionInspectId(f->alparser, direction); uint64_t idx = AppLayerParserGetTransactionInspectId(f->alparser, flags);
int state_done_progress = AppLayerParserGetStateProgressCompletionStatus(f->proto, f->alproto, direction); int state_done_progress = AppLayerParserGetStateProgressCompletionStatus(f->proto, f->alproto, flags);
void *tx; void *tx;
int state_progress; int state_progress;
@ -671,7 +670,7 @@ uint64_t AppLayerTransactionGetActiveLogOnly(Flow *f, uint8_t flags)
tx = AppLayerParserGetTx(f->proto, f->alproto, f->alstate, idx); tx = AppLayerParserGetTx(f->proto, f->alproto, f->alstate, idx);
if (tx == NULL) if (tx == NULL)
continue; continue;
state_progress = AppLayerParserGetStateProgress(f->proto, f->alproto, tx, direction); state_progress = AppLayerParserGetStateProgress(f->proto, f->alproto, tx, flags);
if (state_progress >= state_done_progress) if (state_progress >= state_done_progress)
continue; continue;
else else

Write Preview
Loading…
Cancel
Save