From: Victor Julien <victor@inliniac.net>
Date: Tue, 20 Mar 2012 11:55:45 +0000 (+0100)
Subject: Bail out early if we're in http tunnel mode.
X-Git-Tag: suricata-1.3beta1~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18e81b7ba90382e481171a207e81eaf8120ef2dd;p=thirdparty%2Fsuricata.git

Bail out early if we're in http tunnel mode.
---

diff --git a/src/app-layer-htp.c b/src/app-layer-htp.c
index a320f4f2db..694bfa5210 100644
--- a/src/app-layer-htp.c
+++ b/src/app-layer-htp.c
@@ -640,6 +640,8 @@ static int HTPHandleRequestData(Flow *f, void *htp_state,
         SCLogError(SC_ERR_ALPARSER, "Inbound parser is in error state, no"
                 " need to feed data to libhtp");
         SCReturnInt(-1);
+    } else if (hstate->connp->in_status == STREAM_STATE_TUNNEL) {
+        SCReturnInt(0);
     }
 
     /* Unset the body inspection (the callback should
@@ -731,6 +733,8 @@ static int HTPHandleResponseData(Flow *f, void *htp_state,
         SCLogError(SC_ERR_ALPARSER, "Outbound parser is in error state, no"
                 " need to feed data to libhtp");
         SCReturnInt(-1);
+    } else if (hstate->connp->out_status == STREAM_STATE_TUNNEL) {
+        SCReturnInt(0);
     }
 
     /* Unset the body inspection (the callback should