From 600f2ab39159b475f72a19837a91dd4432905df1 Mon Sep 17 00:00:00 2001 From: Mark Janssen Date: Sun, 10 Feb 2019 15:29:42 +0100 Subject: [PATCH] eve/json: always output vlan field as array --- src/output-json.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/src/output-json.c b/src/output-json.c index a91d6eb982..cf0fafd5cb 100644 --- a/src/output-json.c +++ b/src/output-json.c @@ -716,27 +716,13 @@ json_t *CreateJSONHeader(const Packet *p, enum OutputJsonLogDirection dir, } /* vlan */ - if (p->vlan_idx > 0) { - json_t *js_vlan; - switch (p->vlan_idx) { - case 1: - json_object_set_new(js, "vlan", - json_integer(VLAN_GET_ID1(p))); - break; - case 2: - js_vlan = json_array(); - if (unlikely(js != NULL)) { - json_array_append_new(js_vlan, - json_integer(VLAN_GET_ID1(p))); - json_array_append_new(js_vlan, - json_integer(VLAN_GET_ID2(p))); - json_object_set_new(js, "vlan", js_vlan); - } - break; - default: - /* shouldn't get here */ - break; + if (f->vlan_idx > 0) { + json_t *js_vlan = json_array(); + json_array_append_new(js_vlan, json_integer(f->vlan_id[0])); + if (f->vlan_idx > 1) { + json_array_append_new(js_vlan, json_integer(f->vlan_id[1])); } + json_object_set_new(js, "vlan", js_vlan); } /* 5-tuple */