]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
eve/alert: take vlan from packet, not flow
authorVictor Julien <victor@inliniac.net>
Tue, 23 Apr 2019 11:06:16 +0000 (13:06 +0200)
committerVictor Julien <victor@inliniac.net>
Wed, 24 Apr 2019 18:15:39 +0000 (20:15 +0200)
Flow is not guaranteed to exist.

src/output-json.c

index cf0fafd5cb0f9d5d98f0bfa8aa100c8c9231300c..64d5b44220e30238894440130e0029bb484cdbff 100644 (file)
@@ -716,13 +716,15 @@ json_t *CreateJSONHeader(const Packet *p, enum OutputJsonLogDirection dir,
     }
 
     /* vlan */
-    if (f->vlan_idx > 0) {
+    if (p->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]));
+        if (js_vlan) {
+            json_array_append_new(js_vlan, json_integer(p->vlan_id[0]));
+            if (p->vlan_idx > 1) {
+                json_array_append_new(js_vlan, json_integer(p->vlan_id[1]));
+            }
+            json_object_set_new(js, "vlan", js_vlan);
         }
-        json_object_set_new(js, "vlan", js_vlan);
     }
 
     /* 5-tuple */