From cb1d77178190ffad893854420d95f88c331040b3 Mon Sep 17 00:00:00 2001 From: Russ Combs Date: Wed, 18 Nov 2015 15:32:40 -0500 Subject: [PATCH] fix collision with unidentified 'perf' macro --- src/stream/tcp/tcp_normalizer.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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]++; -- 2.47.3