From 4aa7c988e8458e8c8ecd2c9b74bce1d077bf2f8e Mon Sep 17 00:00:00 2001 From: Jeff Lucovsky Date: Sun, 26 Jul 2020 14:19:53 -0400 Subject: [PATCH] output/netflow: Eliminate unneeded parameter This commit changes an internal-only function to remove a parameter that's invariant in all use cases. This allows an JSON builder optimization to be used. --- src/output-json-netflow.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/output-json-netflow.c b/src/output-json-netflow.c index 82c74eeb54..a244858f0b 100644 --- a/src/output-json-netflow.c +++ b/src/output-json-netflow.c @@ -61,7 +61,7 @@ typedef struct JsonNetFlowLogThread_ { MemBuffer *buffer; } JsonNetFlowLogThread; -static JsonBuilder *CreateEveHeaderFromFlow(const Flow *f, const char *event_type, int dir) +static JsonBuilder *CreateEveHeaderFromNetFlow(const Flow *f, int dir) { char timebuf[64]; char srcip[46] = {0}, dstip[46] = {0}; @@ -122,9 +122,7 @@ static JsonBuilder *CreateEveHeaderFromFlow(const Flow *f, const char *event_typ jb_set_string(js, "in_iface", f->livedev->dev); } - if (event_type) { - jb_set_string(js, "event_type", event_type); - } + JB_SET_STRING(js, "event_type", "netflow"); /* vlan */ if (f->vlan_idx > 0) { @@ -284,7 +282,7 @@ static int JsonNetFlowLogger(ThreadVars *tv, void *thread_data, Flow *f) /* reset */ MemBufferReset(jhl->buffer); - JsonBuilder *jb = CreateEveHeaderFromFlow(f, "netflow", 0); + JsonBuilder *jb = CreateEveHeaderFromNetFlow(f, 0); if (unlikely(jb == NULL)) return TM_ECODE_OK; NetFlowLogEveToServer(jhl, jb, f); @@ -296,7 +294,7 @@ static int JsonNetFlowLogger(ThreadVars *tv, void *thread_data, Flow *f) if (f->tosrcpktcnt) { /* reset */ MemBufferReset(jhl->buffer); - jb = CreateEveHeaderFromFlow(f, "netflow", 1); + jb = CreateEveHeaderFromNetFlow(f, 1); if (unlikely(jb == NULL)) return TM_ECODE_OK; NetFlowLogEveToClient(jhl, jb, f); -- 2.47.2