From: Russ Combs <rucombs@cisco.com>
Date: Wed, 18 Nov 2015 20:32:40 +0000 (-0500)
Subject: fix collision with unidentified 'perf' macro
X-Git-Tag: 3.0.0-233~722
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb1d771;p=thirdparty%2Fsnort3.git

fix collision with unidentified 'perf' macro
---

diff --git a/src/stream/tcp/tcp_normalizer.cc b/src/stream/tcp/tcp_normalizer.cc
index 5f544a686..51f1dc119 100644
--- a/src/stream/tcp/tcp_normalizer.cc
+++ b/src/stream/tcp/tcp_normalizer.cc
@@ -72,7 +72,8 @@ NormPegs TcpNormalizer::get_normalization_counts(unsigned& c)
     return normStats;
 }
 
-void TcpNormalizer::trim_payload(TcpDataBlock* tdb, uint32_t max, NormMode mode, PegCounts peg, PerfCounts perf)
+void TcpNormalizer::trim_payload(
+    TcpDataBlock* tdb, uint32_t max, NormMode mode, PegCounts peg, PerfCounts perfc)
 {
     if (mode == NORM_MODE_ON)
     {
@@ -83,10 +84,11 @@ void TcpNormalizer::trim_payload(TcpDataBlock* tdb, uint32_t max, NormMode mode,
     }
 
     normStats[peg][mode]++;
-    sfBase.iPegs[perf][mode]++;
+    sfBase.iPegs[perfc][mode]++;
 }
 
-bool TcpNormalizer::strip_tcp_timestamp(TcpDataBlock* tdb, const tcp::TcpOption* opt, NormMode mode)
+bool TcpNormalizer::strip_tcp_timestamp(
+    TcpDataBlock* tdb, const tcp::TcpOption* opt, NormMode mode)
 {
      normStats[PC_TCP_TS_NOP][mode]++;
      sfBase.iPegs[PERF_COUNT_TCP_TS_NOP][mode]++;