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

fixup! Resolve conflicts for cherry-pick to 7.0

Browse source 
ZAM fixes maybe needed?
This commit is contained in:
Arne Welzel 2025-07-04 15:05:43 +02:00
parent 13b79ecb74
commit 797e438b5b
2 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/script_opt/ZAM/OPs/ZAM.op
View file

@ -2515,10 +2515,11 @@ eval auto teredo = zeek::packet_mgr->GetAnalyzer("Teredo");
if ( teredo ) if ( teredo )
{ {
auto r = zeek::conn_key_mgr->GetFactory().ConnKeyFromVal(*frame[z.v1].record_val); auto r = zeek::conn_key_mgr->GetFactory().ConnKeyFromVal(*frame[z.v1].record_val);
if ( ! r.has_value() ) if ( r.has_value() )
return zeek::val_mgr->False(); {
auto sk = r.value()->SessionKey(); auto sk = r.value()->SessionKey();
static_cast<zeek::packet_analysis::teredo::TeredoAnalyzer*>(teredo.get())->RemoveConnection(sk); static_cast<zeek::packet_analysis::teredo::TeredoAnalyzer*>(teredo.get())->RemoveConnection(sk);
}
} }
internal-op Remove-Teredo internal-op Remove-Teredo
@ -2528,10 +2529,11 @@ eval auto teredo = zeek::packet_mgr->GetAnalyzer("Teredo");
if ( teredo ) if ( teredo )
{ {
auto r = zeek::conn_key_mgr->GetFactory().ConnKeyFromVal(*frame[z.v2].record_val); auto r = zeek::conn_key_mgr->GetFactory().ConnKeyFromVal(*frame[z.v2].record_val);
if ( ! r.has_value() ) if ( r.has_value() )
return zeek::val_mgr->False(); {
auto sk = r.value()->SessionKey(); auto sk = r.value()->SessionKey();
static_cast<zeek::packet_analysis::teredo::TeredoAnalyzer*>(teredo.get())->RemoveConnection(sk); static_cast<zeek::packet_analysis::teredo::TeredoAnalyzer*>(teredo.get())->RemoveConnection(sk);
}
} }
frame[z.v1].int_val = 1; frame[z.v1].int_val = 1;
@ -2542,10 +2544,11 @@ eval auto gtpv1 = zeek::packet_mgr->GetAnalyzer("GTPv1");
if ( gtpv1 ) if ( gtpv1 )
{ {
auto r = zeek::conn_key_mgr->GetFactory().ConnKeyFromVal(*frame[z.v1].record_val); auto r = zeek::conn_key_mgr->GetFactory().ConnKeyFromVal(*frame[z.v1].record_val);
if ( ! r.has_value() ) if ( r.has_value() )
return zeek::val_mgr->False(); {
auto sk = r.value()->SessionKey(); auto sk = r.value()->SessionKey();
static_cast<zeek::packet_analysis::gtpv1::GTPv1_Analyzer*>(gtpv1.get())->RemoveConnection(sk); static_cast<zeek::packet_analysis::gtpv1::GTPv1_Analyzer*>(gtpv1.get())->RemoveConnection(sk);
}
} }
internal-op Remove-GTPv1 internal-op Remove-GTPv1
@ -2555,10 +2558,11 @@ eval auto gtpv1 = zeek::packet_mgr->GetAnalyzer("GTPv1");
if ( gtpv1 ) if ( gtpv1 )
{ {
auto r = zeek::conn_key_mgr->GetFactory().ConnKeyFromVal(*frame[z.v2].record_val); auto r = zeek::conn_key_mgr->GetFactory().ConnKeyFromVal(*frame[z.v2].record_val);
if ( ! r.has_value() ) if ( r.has_value() )
return zeek::val_mgr->False(); {
auto sk = r.value()->SessionKey(); auto sk = r.value()->SessionKey();
static_cast<zeek::packet_analysis::gtpv1::GTPv1_Analyzer*>(gtpv1.get())->RemoveConnection(sk); static_cast<zeek::packet_analysis::gtpv1::GTPv1_Analyzer*>(gtpv1.get())->RemoveConnection(sk);
}
} }
frame[z.v1].int_val = 1; frame[z.v1].int_val = 1;

3
testing/btest/Baseline.zam/scripts.base.protocols.quic.analyzer-confirmations/out Normal file
View file

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