From: Victor Julien <victor@inliniac.net>
Date: Fri, 17 Jul 2015 11:10:15 +0000 (+0200)
Subject: output-tx: use disrupt flags
X-Git-Tag: suricata-3.0RC1~234
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c087708fa999c18ffbf486366db6386996fed438;p=thirdparty%2Fsuricata.git

output-tx: use disrupt flags
---

diff --git a/src/output-streaming.c b/src/output-streaming.c
index bc2a7d4be0..d416cbc3c6 100644
--- a/src/output-streaming.c
+++ b/src/output-streaming.c
@@ -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;
                     }
diff --git a/src/output-tx.c b/src/output-tx.c
index aa48d9e121..93ba995604 100644
--- a/src/output-tx.c
+++ b/src/output-tx.c
@@ -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;