diff --git a/CHANGES b/CHANGES index b67f85f563..8273757a2a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,18 @@ +6.0.0-dev.57 | 2023-02-16 15:10:33 -0700 + + * Move get_relative_seq and get_segment_len to public static methods (Tim Wojtulewicz, Corelight) + + * CI: remove no longer needed workaround for GITHUB_ACTION env var in cluster tests (Christian Kreibich, Corelight) + + This got fixed in the testsuite via zeek/zeek-testing-cluster#24. + + * CI: directly invoke btest in the cluster testsuite (Christian Kreibich, Corelight) + + This resembles the way we also invoke it in ci/test.sh, and "-d"'s direct + console output saves a roundtrip through uploaded artifacts when tests fail. + This skips test retries for now -- not sure we really need it for this + testsuite. + 6.0.0-dev.52 | 2023-02-15 11:12:28 -0700 * Fix linking of zeek_build_info on Windows (Tim Wojtulewicz) diff --git a/VERSION b/VERSION index 03dd50eed2..d0d3b41279 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.0.0-dev.55 +6.0.0-dev.57 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;