From 797e438b5bbd0e79d0c594b0b8163408b247df33 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Fri, 4 Jul 2025 15:05:43 +0200 Subject: [PATCH] fixup! Resolve conflicts for cherry-pick to 7.0 ZAM fixes maybe needed? --- src/script_opt/ZAM/OPs/ZAM.op | 36 ++++++++++--------- .../out | 3 ++ 2 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 testing/btest/Baseline.zam/scripts.base.protocols.quic.analyzer-confirmations/out diff --git a/src/script_opt/ZAM/OPs/ZAM.op b/src/script_opt/ZAM/OPs/ZAM.op index aa73c90629..4e782055f2 100644 --- a/src/script_opt/ZAM/OPs/ZAM.op +++ b/src/script_opt/ZAM/OPs/ZAM.op @@ -2515,10 +2515,11 @@ eval auto teredo = zeek::packet_mgr->GetAnalyzer("Teredo"); if ( teredo ) { auto r = zeek::conn_key_mgr->GetFactory().ConnKeyFromVal(*frame[z.v1].record_val); - if ( ! r.has_value() ) - return zeek::val_mgr->False(); - auto sk = r.value()->SessionKey(); - static_cast(teredo.get())->RemoveConnection(sk); + if ( r.has_value() ) + { + auto sk = r.value()->SessionKey(); + static_cast(teredo.get())->RemoveConnection(sk); + } } internal-op Remove-Teredo @@ -2528,10 +2529,11 @@ eval auto teredo = zeek::packet_mgr->GetAnalyzer("Teredo"); if ( teredo ) { auto r = zeek::conn_key_mgr->GetFactory().ConnKeyFromVal(*frame[z.v2].record_val); - if ( ! r.has_value() ) - return zeek::val_mgr->False(); - auto sk = r.value()->SessionKey(); - static_cast(teredo.get())->RemoveConnection(sk); + if ( r.has_value() ) + { + auto sk = r.value()->SessionKey(); + static_cast(teredo.get())->RemoveConnection(sk); + } } frame[z.v1].int_val = 1; @@ -2542,10 +2544,11 @@ eval auto gtpv1 = zeek::packet_mgr->GetAnalyzer("GTPv1"); if ( gtpv1 ) { auto r = zeek::conn_key_mgr->GetFactory().ConnKeyFromVal(*frame[z.v1].record_val); - if ( ! r.has_value() ) - return zeek::val_mgr->False(); - auto sk = r.value()->SessionKey(); - static_cast(gtpv1.get())->RemoveConnection(sk); + if ( r.has_value() ) + { + auto sk = r.value()->SessionKey(); + static_cast(gtpv1.get())->RemoveConnection(sk); + } } internal-op Remove-GTPv1 @@ -2555,10 +2558,11 @@ eval auto gtpv1 = zeek::packet_mgr->GetAnalyzer("GTPv1"); if ( gtpv1 ) { auto r = zeek::conn_key_mgr->GetFactory().ConnKeyFromVal(*frame[z.v2].record_val); - if ( ! r.has_value() ) - return zeek::val_mgr->False(); - auto sk = r.value()->SessionKey(); - static_cast(gtpv1.get())->RemoveConnection(sk); + if ( r.has_value() ) + { + auto sk = r.value()->SessionKey(); + static_cast(gtpv1.get())->RemoveConnection(sk); + } } frame[z.v1].int_val = 1; diff --git a/testing/btest/Baseline.zam/scripts.base.protocols.quic.analyzer-confirmations/out b/testing/btest/Baseline.zam/scripts.base.protocols.quic.analyzer-confirmations/out new file mode 100644 index 0000000000..594e75d111 --- /dev/null +++ b/testing/btest/Baseline.zam/scripts.base.protocols.quic.analyzer-confirmations/out @@ -0,0 +1,3 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +analyzer_confirmation, 1692198386.837988, CHhAvVGS1DHFjwGM9, AllAnalyzers::ANALYZER_ANALYZER_QUIC +analyzer_confirmation, 1692198386.837988, CHhAvVGS1DHFjwGM9, AllAnalyzers::ANALYZER_ANALYZER_SSL