ID: Add conn_id_ctx

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

View file

@ -54,18 +54,16 @@ protected:
};
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 inner_vlan_offset = -2;
if ( vlan_offset == -2 && inner_vlan_offset == -2 ) {
vlan_offset = conn_id_ctx->FieldOffset("vlan");
if ( vlan_offset < 0 || conn_id_ctx->GetFieldType(vlan_offset)->Tag() != TYPE_INT )
vlan_offset = id::conn_id_ctx->FieldOffset("vlan");
if ( vlan_offset < 0 || id::conn_id_ctx->GetFieldType(vlan_offset)->Tag() != TYPE_INT )
vlan_offset = -1;
inner_vlan_offset = conn_id_ctx->FieldOffset("inner_vlan");
if ( inner_vlan_offset < 0 || conn_id_ctx->GetFieldType(inner_vlan_offset)->Tag() != TYPE_INT )
inner_vlan_offset = id::conn_id_ctx->FieldOffset("inner_vlan");
if ( inner_vlan_offset < 0 || id::conn_id_ctx->GetFieldType(inner_vlan_offset)->Tag() != TYPE_INT )
inner_vlan_offset = -1;
}