From: Bendik Hagen <bendik@mnemonic.no>
Date: Thu, 31 Jan 2019 21:41:46 +0000 (+0100)
Subject: Flow: Set flow iface and vlan_idx
X-Git-Tag: suricata-5.0.0-beta1~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7b40393dce953f76e7aab63001963396332360c;p=thirdparty%2Fsuricata.git

Flow: Set flow iface and vlan_idx

Setting flow iface and vlan_idx from packet, making it possible to log
iface and vlan on psuedopackets and in flow-logs.
---

diff --git a/src/flow-util.c b/src/flow-util.c
index b819f6a5bf..0e254f32d7 100644
--- a/src/flow-util.c
+++ b/src/flow-util.c
@@ -153,6 +153,8 @@ void FlowInit(Flow *f, const Packet *p)
     f->recursion_level = p->recursion_level;
     f->vlan_id[0] = p->vlan_id[0];
     f->vlan_id[1] = p->vlan_id[1];
+    f->vlan_idx = p->vlan_idx;
+    f->livedev = p->livedev;
 
     if (PKT_IS_IPV4(p)) {
         FLOW_SET_IPV4_SRC_ADDR_FROM_PACKET(p, &f->src);