From bf6b0145e2758784643576312bff8d33bf730ceb Mon Sep 17 00:00:00 2001
From: Eric Leblond <eric@regit.org>
Date: Tue, 15 Sep 2015 09:36:00 +0200
Subject: [PATCH] json-http: gen metadata function with tx_id param

---
 src/output-json-alert.c | 2 +-
 src/output-json-file.c  | 2 +-
 src/output-json-http.c  | 3 +--
 src/output-json-http.h  | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/output-json-alert.c b/src/output-json-alert.c
index b5c624e2b2..ce216ddaad 100644
--- a/src/output-json-alert.c
+++ b/src/output-json-alert.c
@@ -204,7 +204,7 @@ static int AlertJson(ThreadVars *tv, JsonAlertLogThread *aft, const Packet *p)
 
                 /* http alert */
                 if (proto == ALPROTO_HTTP) {
-                    hjs = JsonHttpAddMetadata(p->flow);
+                    hjs = JsonHttpAddMetadata(p->flow, pa->tx_id);
                     if (hjs)
                         json_object_set_new(js, "http", hjs);
                 }
diff --git a/src/output-json-file.c b/src/output-json-file.c
index 09ee967907..b13852bd16 100644
--- a/src/output-json-file.c
+++ b/src/output-json-file.c
@@ -94,7 +94,7 @@ static void FileWriteJsonRecord(JsonFileLogThread *aft, const Packet *p, const F
 
     switch (p->flow->alproto) {
         case ALPROTO_HTTP:
-            hjs = JsonHttpAddMetadata(p->flow);
+            hjs = JsonHttpAddMetadata(p->flow, ff->txid);
             if (hjs)
                 json_object_set_new(js, "http", hjs);
             break;
diff --git a/src/output-json-http.c b/src/output-json-http.c
index bf926b2adf..6cfed78ca3 100644
--- a/src/output-json-http.c
+++ b/src/output-json-http.c
@@ -396,11 +396,10 @@ static int JsonHttpLogger(ThreadVars *tv, void *thread_data, const Packet *p, Fl
     SCReturnInt(TM_ECODE_OK);
 }
 
-json_t *JsonHttpAddMetadata(const Flow *f)
+json_t *JsonHttpAddMetadata(const Flow *f, uint64_t tx_id)
 {
     HtpState *htp_state = (HtpState *)FlowGetAppState(f);
     if (htp_state) {
-        uint64_t tx_id = AppLayerParserGetTransactionLogId(f->alparser);
         htp_tx_t *tx = AppLayerParserGetTx(IPPROTO_TCP, ALPROTO_HTTP, htp_state, tx_id);
 
         if (tx) {
diff --git a/src/output-json-http.h b/src/output-json-http.h
index b8fcea15be..0c886f3dd5 100644
--- a/src/output-json-http.h
+++ b/src/output-json-http.h
@@ -29,7 +29,7 @@ void TmModuleJsonHttpLogRegister (void);
 #ifdef HAVE_LIBJANSSON
 void JsonHttpLogJSONBasic(json_t *js, htp_tx_t *tx);
 void JsonHttpLogJSONExtended(json_t *js, htp_tx_t *tx);
-json_t *JsonHttpAddMetadata(const Flow *f);
+json_t *JsonHttpAddMetadata(const Flow *f, uint64_t tx_id);
 #endif /* HAVE_LIBJANSSON */
 
 #endif /* __OUTPUT_JSON_HTTP_H__ */
-- 
2.47.2