eve/file: remove rust and jansson ifdefs.

Both Rust and Jansson are required now.
pull/3830/head
Jason Ish 8 years ago committed by Victor Julien
parent 42c327adc4
commit 3dc973d4b1

@ -68,8 +68,6 @@
#include "util-memcmp.h" #include "util-memcmp.h"
#include "stream-tcp-reassemble.h" #include "stream-tcp-reassemble.h"
#ifdef HAVE_LIBJANSSON
typedef struct OutputFileCtx_ { typedef struct OutputFileCtx_ {
LogFileCtx *file_ctx; LogFileCtx *file_ctx;
uint32_t file_cnt; uint32_t file_cnt;
@ -118,7 +116,6 @@ json_t *JsonBuildFileInfoRecord(const Packet *p, const File *ff,
if (hjs) if (hjs)
json_object_set_new(js, "email", hjs); json_object_set_new(js, "email", hjs);
break; break;
#ifdef HAVE_RUST
case ALPROTO_NFS: case ALPROTO_NFS:
hjs = JsonNFSAddMetadataRPC(p->flow, ff->txid); hjs = JsonNFSAddMetadataRPC(p->flow, ff->txid);
if (hjs) if (hjs)
@ -132,7 +129,6 @@ json_t *JsonBuildFileInfoRecord(const Packet *p, const File *ff,
if (hjs) if (hjs)
json_object_set_new(js, "smb", hjs); json_object_set_new(js, "smb", hjs);
break; break;
#endif
} }
json_object_set_new(js, "app_proto", json_object_set_new(js, "app_proto",
@ -402,11 +398,3 @@ void JsonFileLogRegister (void)
"eve-log.files", OutputFileLogInitSub, JsonFileLogger, "eve-log.files", OutputFileLogInitSub, JsonFileLogger,
JsonFileLogThreadInit, JsonFileLogThreadDeinit, NULL); JsonFileLogThreadInit, JsonFileLogThreadDeinit, NULL);
} }
#else
void JsonFileLogRegister (void)
{
}
#endif

@ -24,13 +24,10 @@
#ifndef __OUTPUT_JSON_FILE_H__ #ifndef __OUTPUT_JSON_FILE_H__
#define __OUTPUT_JSON_FILE_H__ #define __OUTPUT_JSON_FILE_H__
void JsonFileLogRegister(void);
#ifdef HAVE_LIBJANSSON
#include "app-layer-htp-xff.h" #include "app-layer-htp-xff.h"
void JsonFileLogRegister(void);
json_t *JsonBuildFileInfoRecord(const Packet *p, const File *ff, json_t *JsonBuildFileInfoRecord(const Packet *p, const File *ff,
const bool stored, uint8_t dir, HttpXFFCfg *xff_cfg); const bool stored, uint8_t dir, HttpXFFCfg *xff_cfg);
#endif
#endif /* __OUTPUT_JSON_FILE_H__ */ #endif /* __OUTPUT_JSON_FILE_H__ */

Loading…
Cancel
Save