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.
pull/5257/head
Jeff Lucovsky 6 years ago committed by Victor Julien
parent 1569f3e349
commit 4aa7c988e8

@ -61,7 +61,7 @@ typedef struct JsonNetFlowLogThread_ {
MemBuffer *buffer; MemBuffer *buffer;
} JsonNetFlowLogThread; } 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 timebuf[64];
char srcip[46] = {0}, dstip[46] = {0}; 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); jb_set_string(js, "in_iface", f->livedev->dev);
} }
if (event_type) { JB_SET_STRING(js, "event_type", "netflow");
jb_set_string(js, "event_type", event_type);
}
/* vlan */ /* vlan */
if (f->vlan_idx > 0) { if (f->vlan_idx > 0) {
@ -284,7 +282,7 @@ static int JsonNetFlowLogger(ThreadVars *tv, void *thread_data, Flow *f)
/* reset */ /* reset */
MemBufferReset(jhl->buffer); MemBufferReset(jhl->buffer);
JsonBuilder *jb = CreateEveHeaderFromFlow(f, "netflow", 0); JsonBuilder *jb = CreateEveHeaderFromNetFlow(f, 0);
if (unlikely(jb == NULL)) if (unlikely(jb == NULL))
return TM_ECODE_OK; return TM_ECODE_OK;
NetFlowLogEveToServer(jhl, jb, f); NetFlowLogEveToServer(jhl, jb, f);
@ -296,7 +294,7 @@ static int JsonNetFlowLogger(ThreadVars *tv, void *thread_data, Flow *f)
if (f->tosrcpktcnt) { if (f->tosrcpktcnt) {
/* reset */ /* reset */
MemBufferReset(jhl->buffer); MemBufferReset(jhl->buffer);
jb = CreateEveHeaderFromFlow(f, "netflow", 1); jb = CreateEveHeaderFromNetFlow(f, 1);
if (unlikely(jb == NULL)) if (unlikely(jb == NULL))
return TM_ECODE_OK; return TM_ECODE_OK;
NetFlowLogEveToClient(jhl, jb, f); NetFlowLogEveToClient(jhl, jb, f);

Loading…
Cancel
Save