From: Steve Chew (stechew) <stechew@cisco.com>
Date: Wed, 7 Apr 2021 03:52:00 +0000 (+0000)
Subject: Merge pull request #2829 in SNORT/snort3 from ~SBAIGAL/snort3:netflow_zone to master
X-Git-Tag: 3.1.4.0~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=911cf29fb938d70ea501371c24101d9a48038133;p=thirdparty%2Fsnort3.git

Merge pull request #2829 in SNORT/snort3 from ~SBAIGAL/snort3:netflow_zone to master

Squashed commit of the following:

commit 2d625d0f1d4ffa8648679d735b5e6895f9278d73
Author: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date:   Tue Apr 6 16:14:01 2021 -0400

    netflow: get correct zone info from packet
---

diff --git a/src/service_inspectors/netflow/netflow.cc b/src/service_inspectors/netflow/netflow.cc
index 599737ebd..369a160e3 100644
--- a/src/service_inspectors/netflow/netflow.cc
+++ b/src/service_inspectors/netflow/netflow.cc
@@ -141,7 +141,7 @@ static bool decode_netflow_v5(const unsigned char* data, uint16_t size,
     
     if ( p_rules == nullptr )
         return false;
-    const int zone = p->pkth->ingress_group;
+    const int zone = p->pkth->ingress_index;
 
     data += sizeof(Netflow5Hdr);
     precord = (const Netflow5RecordHdr *)data;