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

ID: Add conn_id_ctx

Browse source 
Seemed a bit unfortunate to use id::connection and id::conn_id, but
then do something different for conn_id_ctx.
This commit is contained in:
Arne Welzel 2025-07-24 15:50:22 +02:00
parent e231efac0b
commit a2922cdde9
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ID.cc
View file

@ -24,6 +24,7 @@
namespace zeek { namespace zeek {
RecordTypePtr id::conn_id; RecordTypePtr id::conn_id;
RecordTypePtr id::conn_id_ctx;
RecordTypePtr id::endpoint; RecordTypePtr id::endpoint;
RecordTypePtr id::connection; RecordTypePtr id::connection;
RecordTypePtr id::fa_file; RecordTypePtr id::fa_file;
@ -81,6 +82,7 @@ FuncPtr id::find_func(std::string_view name) {
void id::detail::init_types() { void id::detail::init_types() {
conn_id = id::find_type<RecordType>("conn_id"); conn_id = id::find_type<RecordType>("conn_id");
conn_id_ctx = id::find_type<RecordType>("conn_id_ctx");
endpoint = id::find_type<RecordType>("endpoint"); endpoint = id::find_type<RecordType>("endpoint");
connection = id::find_type<RecordType>("connection"); connection = id::find_type<RecordType>("connection");
fa_file = id::find_type<RecordType>("fa_file"); fa_file = id::find_type<RecordType>("fa_file");

1
src/ID.h
View file

@ -259,6 +259,7 @@ IntrusivePtr<T> find_const(std::string_view name) {
FuncPtr find_func(std::string_view name); FuncPtr find_func(std::string_view name);
extern RecordTypePtr conn_id; extern RecordTypePtr conn_id;
extern RecordTypePtr conn_id_ctx;
extern RecordTypePtr endpoint; extern RecordTypePtr endpoint;
extern RecordTypePtr connection; extern RecordTypePtr connection;
extern RecordTypePtr fa_file; extern RecordTypePtr fa_file;

10
src/packet_analysis/protocol/ip/conn_key/vlan_fivetuple/Factory.cc
View file

@ -54,18 +54,16 @@ protected:
}; };
std::pair<int, int> GetConnCtxFieldOffsets() { std::pair<int, int> GetConnCtxFieldOffsets() {
static const auto& conn_id_ctx = zeek::id::find_type<zeek::RecordType>("conn_id_ctx");
static int vlan_offset = -2; static int vlan_offset = -2;
static int inner_vlan_offset = -2; static int inner_vlan_offset = -2;
if ( vlan_offset == -2 && inner_vlan_offset == -2 ) { if ( vlan_offset == -2 && inner_vlan_offset == -2 ) {
vlan_offset = conn_id_ctx->FieldOffset("vlan"); vlan_offset = id::conn_id_ctx->FieldOffset("vlan");
if ( vlan_offset < 0 || conn_id_ctx->GetFieldType(vlan_offset)->Tag() != TYPE_INT ) if ( vlan_offset < 0 || id::conn_id_ctx->GetFieldType(vlan_offset)->Tag() != TYPE_INT )
vlan_offset = -1; vlan_offset = -1;
inner_vlan_offset = conn_id_ctx->FieldOffset("inner_vlan"); inner_vlan_offset = id::conn_id_ctx->FieldOffset("inner_vlan");
if ( inner_vlan_offset < 0 || conn_id_ctx->GetFieldType(inner_vlan_offset)->Tag() != TYPE_INT ) if ( inner_vlan_offset < 0 || id::conn_id_ctx->GetFieldType(inner_vlan_offset)->Tag() != TYPE_INT )
inner_vlan_offset = -1; inner_vlan_offset = -1;
} }