]> git.ipfire.org Git - people/ms/suricata.git/commitdiff
output-tx: use disrupt flags
authorVictor Julien <victor@inliniac.net>
Fri, 17 Jul 2015 11:10:15 +0000 (13:10 +0200)
committerVictor Julien <victor@inliniac.net>
Wed, 22 Jul 2015 10:13:43 +0000 (12:13 +0200)
src/output-streaming.c
src/output-tx.c

index bc2a7d4be03d74b582d335c5969de6e4e239efef..d416cbc3c6c4a8b5b0b994a00d8b4c0d5a02060b 100644 (file)
@@ -164,10 +164,10 @@ int HttpBodyIterator(Flow *f, int close, void *cbdata, uint8_t iflags)
                 int tx_logged = 0;
 
                 int tx_progress_ts = AppLayerParserGetStateProgress(
-                        IPPROTO_TCP, ALPROTO_HTTP, tx, STREAM_TOSERVER);
+                        IPPROTO_TCP, ALPROTO_HTTP, tx, FlowGetDisruptionFlags(f, STREAM_TOSERVER));
                 if (tx_progress_ts >= tx_progress_done_value_ts) {
                     int tx_progress_tc = AppLayerParserGetStateProgress(
-                            IPPROTO_TCP, ALPROTO_HTTP, tx, STREAM_TOCLIENT);
+                            IPPROTO_TCP, ALPROTO_HTTP, tx, FlowGetDisruptionFlags(f, STREAM_TOCLIENT));
                     if (tx_progress_tc >= tx_progress_done_value_tc) {
                         tx_done = 1;
                     }
index aa48d9e121c6bd00ab77ed94c344c2822a934883..93ba9956042b839ee27d71aeb48a352980c95955 100644 (file)
@@ -138,14 +138,14 @@ static TmEcode OutputTxLog(ThreadVars *tv, Packet *p, void *thread_data, PacketQ
         if (!(AppLayerParserStateIssetFlag(f->alparser, APP_LAYER_PARSER_EOF)))
         {
             int tx_progress = AppLayerParserGetStateProgress(p->proto, alproto,
-                                                             tx, STREAM_TOSERVER);
+                                                             tx, FlowGetDisruptionFlags(f, STREAM_TOSERVER));
             if (tx_progress < tx_progress_done_value_ts) {
                 SCLogDebug("progress not far enough, not logging");
                 break;
             }
 
             tx_progress = AppLayerParserGetStateProgress(p->proto, alproto,
-                                                         tx, STREAM_TOCLIENT);
+                                                         tx, FlowGetDisruptionFlags(f, STREAM_TOCLIENT));
             if (tx_progress < tx_progress_done_value_tc) {
                 SCLogDebug("progress not far enough, not logging");
                 break;