From 9d7cfcbce302784d017611a97ed37809e3a7a70e Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Wed, 6 Aug 2025 15:17:45 +0200 Subject: [PATCH] tcp,udp,icmp adapters: Fix UpdateConnVal() superclass call Now that SessionAdapter implements UpdateConnVal(), the individual adapters need to call that instead of Analyzer::UpdateConnVal() Thanks clang-tidy. Relates to #4337 #4725 #4734 #4737 --- src/packet_analysis/protocol/icmp/ICMPSessionAdapter.cc | 2 +- src/packet_analysis/protocol/tcp/TCPSessionAdapter.cc | 2 +- src/packet_analysis/protocol/udp/UDPSessionAdapter.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/packet_analysis/protocol/icmp/ICMPSessionAdapter.cc b/src/packet_analysis/protocol/icmp/ICMPSessionAdapter.cc index 472df6a098..f0fb4ffb39 100644 --- a/src/packet_analysis/protocol/icmp/ICMPSessionAdapter.cc +++ b/src/packet_analysis/protocol/icmp/ICMPSessionAdapter.cc @@ -32,7 +32,7 @@ void ICMPSessionAdapter::UpdateConnVal(zeek::RecordVal* conn_val) { UpdateEndpointVal(orig_endp_val, true); UpdateEndpointVal(resp_endp_val, false); - analyzer::Analyzer::UpdateConnVal(conn_val); + SessionAdapter::UpdateConnVal(conn_val); } void ICMPSessionAdapter::UpdateEndpointVal(RecordVal* endp, bool is_orig) { diff --git a/src/packet_analysis/protocol/tcp/TCPSessionAdapter.cc b/src/packet_analysis/protocol/tcp/TCPSessionAdapter.cc index b7a73d5da1..61da05ca85 100644 --- a/src/packet_analysis/protocol/tcp/TCPSessionAdapter.cc +++ b/src/packet_analysis/protocol/tcp/TCPSessionAdapter.cc @@ -1044,7 +1044,7 @@ void TCPSessionAdapter::UpdateConnVal(RecordVal* conn_val) { resp_endp_val->Assign(1, resp->state); // Call children's UpdateConnVal - Analyzer::UpdateConnVal(conn_val); + SessionAdapter::UpdateConnVal(conn_val); // Have to do packet_children ourselves. for ( Analyzer* a : packet_children ) diff --git a/src/packet_analysis/protocol/udp/UDPSessionAdapter.cc b/src/packet_analysis/protocol/udp/UDPSessionAdapter.cc index 8f0a1761d8..fa5adc39e7 100644 --- a/src/packet_analysis/protocol/udp/UDPSessionAdapter.cc +++ b/src/packet_analysis/protocol/udp/UDPSessionAdapter.cc @@ -33,7 +33,7 @@ void UDPSessionAdapter::UpdateConnVal(RecordVal* conn_val) { UpdateEndpointVal(resp_endp_val, false); // Call children's UpdateConnVal - Analyzer::UpdateConnVal(conn_val); + SessionAdapter::UpdateConnVal(conn_val); } void UDPSessionAdapter::UpdateEndpointVal(RecordVal* endp, bool is_orig) {