From 024d3a227a769ef47aa12574ddf6ca2a5d34b827 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Thu, 16 Feb 2023 10:45:11 -0700 Subject: [PATCH] Move get_relative_seq and get_segment_len to public static methods --- src/packet_analysis/protocol/tcp/TCPSessionAdapter.cc | 7 ++++--- src/packet_analysis/protocol/tcp/TCPSessionAdapter.h | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/packet_analysis/protocol/tcp/TCPSessionAdapter.cc b/src/packet_analysis/protocol/tcp/TCPSessionAdapter.cc index 3aa3438c7f..f8f400ad3e 100644 --- a/src/packet_analysis/protocol/tcp/TCPSessionAdapter.cc +++ b/src/packet_analysis/protocol/tcp/TCPSessionAdapter.cc @@ -77,7 +77,7 @@ void TCPSessionAdapter::Done() finished = 1; } -static int get_segment_len(int payload_len, analyzer::tcp::TCP_Flags flags) +int TCPSessionAdapter::get_segment_len(int payload_len, analyzer::tcp::TCP_Flags flags) { int seg_len = payload_len; @@ -175,8 +175,9 @@ static void init_endpoint(analyzer::tcp::TCP_Endpoint* endpoint, analyzer::tcp:: } } -static uint64_t get_relative_seq(const analyzer::tcp::TCP_Endpoint* endpoint, uint32_t cur_base, - uint32_t last, uint32_t wraps, bool* underflow) +uint64_t TCPSessionAdapter::get_relative_seq(const analyzer::tcp::TCP_Endpoint* endpoint, + uint32_t cur_base, uint32_t last, uint32_t wraps, + bool* underflow) { int32_t delta = seq_delta(cur_base, last); diff --git a/src/packet_analysis/protocol/tcp/TCPSessionAdapter.h b/src/packet_analysis/protocol/tcp/TCPSessionAdapter.h index e79242869a..bec86f9979 100644 --- a/src/packet_analysis/protocol/tcp/TCPSessionAdapter.h +++ b/src/packet_analysis/protocol/tcp/TCPSessionAdapter.h @@ -78,6 +78,10 @@ public: void AddExtraAnalyzers(Connection* conn) override; + static int get_segment_len(int payload_len, analyzer::tcp::TCP_Flags flags); + static uint64_t get_relative_seq(const analyzer::tcp::TCP_Endpoint* endpoint, uint32_t cur_base, + uint32_t last, uint32_t wraps, bool* underflow); + protected: friend class analyzer::tcp::TCP_ApplicationAnalyzer; friend class analyzer::tcp::TCP_Endpoint;