output/ftp: Use "Eve" prefix with FTP helpers

This commit changes the prefix of the FTP helper routines from Json to
Eve.

diff --git a/src/app-layer-ftp.c b/src/app-layer-ftp.c
index 6a19e3a31cb6e5b07ea8dcd922cf96d8031aaf88..e23b1056576e1fb69eef132578ceaeb911b676ed 100644 (file)
--- a/src/app-layer-ftp.c
+++ b/src/app-layer-ftp.c
@@ -1438,7 +1438,7 @@ uint16_t JsonGetNextLineFromBuffer(const char *buffer, const uint16_t len)
     return c == NULL ? len : c - buffer + 1;
 }
 
-void JsonFTPDataAddMetadata(const Flow *f, JsonBuilder *jb)
+void EveFTPDataAddMetadata(const Flow *f, JsonBuilder *jb)
 {
     const FtpDataState *ftp_state = NULL;
     if (f->alstate == NULL)

diff --git a/src/app-layer-ftp.h b/src/app-layer-ftp.h
index 081b23f7d370240591b51a10f93663df4c919521..52e302c6359594262f289f9a104504fa046d05d6 100644 (file)
--- a/src/app-layer-ftp.h
+++ b/src/app-layer-ftp.h
@@ -223,7 +223,7 @@ uint64_t FTPMemuseGlobalCounter(void);
 uint64_t FTPMemcapGlobalCounter(void);
 
 uint16_t JsonGetNextLineFromBuffer(const char *buffer, const uint16_t len);
-void JsonFTPDataAddMetadata(const Flow *f, JsonBuilder *jb);
+void EveFTPDataAddMetadata(const Flow *f, JsonBuilder *jb);
 
 #endif /* __APP_LAYER_FTP_H__ */
 

diff --git a/src/output-json-alert.c b/src/output-json-alert.c
index 9765128216e477e16cc3ae219906cd32dcf99462..c796aceee1d466465a77bd214b5a5b4f1b79ac69 100644 (file)
--- a/src/output-json-alert.c
+++ b/src/output-json-alert.c
@@ -549,7 +549,7 @@ static int AlertJson(ThreadVars *tv, JsonAlertLogThread *aft, const Packet *p)
                     break;
                 }
                 case ALPROTO_FTPDATA:
-                    JsonFTPDataAddMetadata(p->flow, jb);
+                    EveFTPDataAddMetadata(p->flow, jb);
                     break;
                 case ALPROTO_DNP3:
                     AlertJsonDnp3(p->flow, pa->tx_id, jb);

diff --git a/src/output-json-ftp.c b/src/output-json-ftp.c
index 04a908b9ca114f5f22a40cefe3a907e77859f21a..3b179957366f849ce2ab8a183e7765b5177fcc65 100644 (file)
--- a/src/output-json-ftp.c
+++ b/src/output-json-ftp.c
@@ -59,7 +59,7 @@ typedef struct LogFTPLogThread_ {
     MemBuffer          *buffer;
 } LogFTPLogThread;
 
-static void JsonFTPLogCommand(Flow *f, FTPTransaction *tx, JsonBuilder *jb)
+static void EveFTPLogCommand(Flow *f, FTPTransaction *tx, JsonBuilder *jb)
 {
     /* Preallocate array objects to simplify failure case */
     JsonBuilder *js_resplist = NULL;
@@ -173,9 +173,9 @@ static int JsonFTPLogger(ThreadVars *tv, void *thread_data,
         EveAddCommonOptions(&ftp_ctx->cfg, p, f, jb);
         jb_open_object(jb, event_type);
         if (f->alproto == ALPROTO_FTPDATA) {
-            JsonFTPDataAddMetadata(f, jb);
+            EveFTPDataAddMetadata(f, jb);
         } else {
-            JsonFTPLogCommand(f, tx, jb);
+            EveFTPLogCommand(f, tx, jb);
         }
 
         if (!jb_close(jb)) {