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

This commit changes the prefix of the FTP helper routines from Json to
Eve.
pull/5110/head
Jeff Lucovsky 5 years ago committed by Victor Julien
parent 1f19ab1013
commit 648bd5afff

@ -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)

@ -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__ */

@ -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);

@ -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)) {

Loading…
Cancel
Save