Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-17 14:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/topic/timw/2788-tcp-utility-functions'

Browse source 
* origin/topic/timw/2788-tcp-utility-functions:
  Move get_relative_seq and get_segment_len to public static methods
This commit is contained in:
Tim Wojtulewicz 2023-02-16 15:10:33 -07:00
commit 3de785114b
4 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
CHANGES
View file

@ -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)

2
VERSION
View file

@ -1 +1 @@
6.0.0-dev.55
6.0.0-dev.57

7
src/packet_analysis/protocol/tcp/TCPSessionAdapter.cc
View file

@ -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);

4
src/packet_analysis/protocol/tcp/TCPSessionAdapter.h
View file

@ -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;