json-http: gen metadata function with tx_id param

diff --git a/src/output-json-alert.c b/src/output-json-alert.c
index b5c624e2b25b9ce469d1d866ea2db1343fe4a98e..ce216ddaadc400d5b49320db3882b7c5d7e4844f 100644 (file)
--- 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 09ee967907345e8e0f074d44229b7690f468a2db..b13852bd16213291ba9f0a930944757c183a7124 100644 (file)
--- 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 bf926b2adf94676eca4dba7f41831be0665d714e..6cfed78ca324d23a0f549443c4a322a0d2cabf42 100644 (file)
--- 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 b8fcea15be0e3183b385b6c3d8c5c406339bffb9..0c886f3dd56dd944bc6502d7337b2c364e658ac0 100644 (file)
--- 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__ */