carry out hhd mpm on both request/response headers

src/detect-engine-hhd.c

@@ -430,15 +430,59 @@ int DetectEngineRunHttpHeaderMpm(DetectEngineThreadCtx *det_ctx, Flow *f,
     uint32_t cnt = 0;
 
     if (det_ctx->hhd_buffers_list_len == 0) {
+        SCMutexLock(&f->m);
+        DetectEngineBufferHttpHeaders(det_ctx, f, htp_state,
+                                      (flags & STREAM_TOSERVER) ? STREAM_TOCLIENT : STREAM_TOSERVER);
+        SCMutexUnlock(&f->m);
+
+        for (i = 0; i < det_ctx->hhd_buffers_list_len; i++) {
+            cnt += HttpHeaderPatternSearch(det_ctx,
+                                           det_ctx->hhd_buffers[i],
+                                           det_ctx->hhd_buffers_len[i]);
+        }
+
+        DetectEngineCleanHHDBuffers(det_ctx);
+
         SCMutexLock(&f->m);
         DetectEngineBufferHttpHeaders(det_ctx, f, htp_state, flags);
         SCMutexUnlock(&f->m);
-    }
 
-    for (i = 0; i < det_ctx->hhd_buffers_list_len; i++) {
-        cnt += HttpHeaderPatternSearch(det_ctx,
-                                       det_ctx->hhd_buffers[i],
-                                       det_ctx->hhd_buffers_len[i]);
+        for (i = 0; i < det_ctx->hhd_buffers_list_len; i++) {
+            cnt += HttpHeaderPatternSearch(det_ctx,
+                                           det_ctx->hhd_buffers[i],
+                                           det_ctx->hhd_buffers_len[i]);
+        }
+    } else {
+        for (i = 0; i < det_ctx->hhd_buffers_list_len; i++) {
+            cnt += HttpHeaderPatternSearch(det_ctx,
+                                           det_ctx->hhd_buffers[i],
+                                           det_ctx->hhd_buffers_len[i]);
+        }
+
+        uint16_t hhd_buffers_list_len = det_ctx->hhd_buffers_list_len;
+        uint8_t **hhd_buffers = det_ctx->hhd_buffers;
+        uint32_t *hhd_buffers_len = det_ctx->hhd_buffers_len;
+
+        det_ctx->hhd_buffers_list_len = 0;
+        det_ctx->hhd_buffers = NULL;
+        det_ctx->hhd_buffers_len = NULL;
+
+        SCMutexLock(&f->m);
+        DetectEngineBufferHttpHeaders(det_ctx, f, htp_state,
+                                      (flags & STREAM_TOSERVER) ? STREAM_TOCLIENT : STREAM_TOSERVER);
+        SCMutexUnlock(&f->m);
+
+        for (i = 0; i < det_ctx->hhd_buffers_list_len; i++) {
+            cnt += HttpHeaderPatternSearch(det_ctx,
+                                           det_ctx->hhd_buffers[i],
+                                           det_ctx->hhd_buffers_len[i]);
+        }
+
+        DetectEngineCleanHHDBuffers(det_ctx);
+
+        det_ctx->hhd_buffers_list_len = hhd_buffers_list_len;
+        det_ctx->hhd_buffers = hhd_buffers;
+        det_ctx->hhd_buffers_len = hhd_buffers_len;
     }
 
     return cnt;