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

Remove @load base/frameworks/dpd from tests

Browse source 
Now that it's loaded in bare mode, no need to load it explicitly.

The main thing that tests were relying on seems to be tracking of
c$service for conn.log baselines. Very few were actually checking
for dpd.log
This commit is contained in:
Arne Welzel 2022-08-25 19:24:22 +02:00
parent 9e7f2a04c1
commit 654fd9c7da
42 changed files with 0 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

1
testing/btest/core/history-flip.zeek
View file

@ -2,5 +2,4 @@
# @TEST-EXEC: btest-diff conn.log # @TEST-EXEC: btest-diff conn.log
@load base/protocols/http @load base/protocols/http
@load base/frameworks/dpd
@load policy/protocols/conn/mac-logging @load policy/protocols/conn/mac-logging

1
testing/btest/core/pcap/dynamic-filter.zeek
View file

@ -5,7 +5,6 @@
@load base/protocols/conn @load base/protocols/conn
@load base/protocols/http @load base/protocols/http
@load base/protocols/dns @load base/protocols/dns
@load base/frameworks/dpd
redef enum PcapFilterID += { A, B }; redef enum PcapFilterID += { A, B };

1
testing/btest/core/radiotap.zeek
View file

@ -3,4 +3,3 @@
@load base/protocols/conn @load base/protocols/conn
@load base/protocols/dns @load base/protocols/dns
@load base/frameworks/dpd

1
testing/btest/core/tcp/miss-end-data.zeek
View file

@ -4,7 +4,6 @@
@load base/protocols/conn @load base/protocols/conn
@load base/protocols/http @load base/protocols/http
@load base/frameworks/dpd
redef report_gaps_for_partial = T; redef report_gaps_for_partial = T;

1
testing/btest/core/tcp/missing-syn.zeek
View file

@ -3,4 +3,3 @@
@load base/protocols/conn @load base/protocols/conn
@load base/protocols/http @load base/protocols/http
@load base/frameworks/dpd

1
testing/btest/core/tunnels/ayiya.test
View file

@ -6,4 +6,3 @@
@load base/protocols/tunnels @load base/protocols/tunnels
@load base/protocols/conn @load base/protocols/conn
@load base/protocols/http @load base/protocols/http
@load base/frameworks/dpd

1
testing/btest/core/tunnels/geneve.zeek
View file

@ -4,7 +4,6 @@
# @TEST-EXEC: btest-diff tunnel.log # @TEST-EXEC: btest-diff tunnel.log
@load base/frameworks/tunnels @load base/frameworks/tunnels
@load base/frameworks/dpd
@load base/protocols/conn @load base/protocols/conn
event geneve_packet(c: connection, inner: pkt_hdr, vni: count) event geneve_packet(c: connection, inner: pkt_hdr, vni: count)

1
testing/btest/core/tunnels/gre-pptp.test
View file

@ -4,6 +4,5 @@
# @TEST-EXEC: btest-diff dns.log # @TEST-EXEC: btest-diff dns.log
# #
@load base/frameworks/tunnels @load base/frameworks/tunnels
@load base/frameworks/dpd
@load base/protocols/conn @load base/protocols/conn
@load base/protocols/dns @load base/protocols/dns

1
testing/btest/core/tunnels/gre.test
View file

@ -5,7 +5,6 @@
# @TEST-EXEC: btest-diff ssh.log # @TEST-EXEC: btest-diff ssh.log
# #
@load base/frameworks/tunnels @load base/frameworks/tunnels
@load base/frameworks/dpd
@load base/protocols/conn @load base/protocols/conn
@load base/protocols/dns @load base/protocols/dns
@load base/protocols/ssh @load base/protocols/ssh

1
testing/btest/core/tunnels/gtp/different_dl_and_ul.test
View file

@ -10,6 +10,5 @@
# seems to fail to correct the checksums when there's IP fragmentation). # seems to fail to correct the checksums when there's IP fragmentation).
# #
@load base/frameworks/tunnels @load base/frameworks/tunnels
@load base/frameworks/dpd
@load base/protocols/conn @load base/protocols/conn
@load base/protocols/http @load base/protocols/http

1
testing/btest/core/tunnels/gtp/inner_ipv6.test
View file

@ -6,6 +6,5 @@
# there is sometimes already native IPv6. # there is sometimes already native IPv6.
@load base/frameworks/tunnels @load base/frameworks/tunnels
@load base/frameworks/dpd
@load base/protocols/conn @load base/protocols/conn
@load base/protocols/dns @load base/protocols/dns

1
testing/btest/core/tunnels/gtp/opt_header.test
View file

@ -9,7 +9,6 @@
@load base/protocols/conn @load base/protocols/conn
@load base/protocols/ssl @load base/protocols/ssl
@load base/frameworks/tunnels @load base/frameworks/tunnels
@load base/frameworks/dpd
event gtpv1_g_pdu_packet(outer: connection, inner_gtp: gtpv1_hdr, inner_ip: pkt_hdr) event gtpv1_g_pdu_packet(outer: connection, inner_gtp: gtpv1_hdr, inner_ip: pkt_hdr)
{ {

1
testing/btest/core/tunnels/teredo.zeek
View file

@ -5,7 +5,6 @@
# @TEST-EXEC: btest-diff http.log # @TEST-EXEC: btest-diff http.log
@load base/frameworks/tunnels @load base/frameworks/tunnels
@load base/frameworks/dpd
@load base/frameworks/notice/weird @load base/frameworks/notice/weird
@load base/protocols/tunnels @load base/protocols/tunnels
@load base/protocols/conn @load base/protocols/conn

1
testing/btest/core/tunnels/teredo_bubble_with_payload.test
View file

@ -6,7 +6,6 @@
# @TEST-EXEC: btest-diff weird.log # @TEST-EXEC: btest-diff weird.log
@load base/frameworks/tunnels @load base/frameworks/tunnels
@load base/frameworks/dpd
@load base/frameworks/notice/weird @load base/frameworks/notice/weird
@load base/protocols/tunnels @load base/protocols/tunnels
@load base/protocols/conn @load base/protocols/conn

1
testing/btest/core/tunnels/vxlan.zeek
View file

@ -4,7 +4,6 @@
# @TEST-EXEC: btest-diff tunnel.log # @TEST-EXEC: btest-diff tunnel.log
@load base/frameworks/tunnels @load base/frameworks/tunnels
@load base/frameworks/dpd
@load base/protocols/conn @load base/protocols/conn
event vxlan_packet(c: connection, inner: pkt_hdr, vni: count) event vxlan_packet(c: connection, inner: pkt_hdr, vni: count)

1
testing/btest/core/vlan-mpls.zeek
View file

@ -3,4 +3,3 @@
@load base/protocols/conn @load base/protocols/conn
@load base/protocols/http @load base/protocols/http
@load base/frameworks/dpd

1
testing/btest/core/wlanmon.zeek
View file

@ -3,4 +3,3 @@
@load base/protocols/conn @load base/protocols/conn
@load base/protocols/dns @load base/protocols/dns
@load base/frameworks/dpd

1
testing/btest/scripts/base/frameworks/analyzer/disable-analyzer.zeek
View file

@ -7,7 +7,6 @@
@load base/protocols/conn @load base/protocols/conn
@load base/protocols/dns @load base/protocols/dns
@load base/protocols/ssh @load base/protocols/ssh
@load base/frameworks/dpd
redef Analyzer::disabled_analyzers += { Analyzer::ANALYZER_SSH }; redef Analyzer::disabled_analyzers += { Analyzer::ANALYZER_SSH };

1
testing/btest/scripts/base/frameworks/input/config/enum-set.zeek
View file

@ -8,7 +8,6 @@ DPD::ignore_violations Analyzer::ANALYZER_SYSLOG
@TEST-END-FILE @TEST-END-FILE
@load base/frameworks/config @load base/frameworks/config
@load base/frameworks/dpd
redef exit_only_after_terminate = T; redef exit_only_after_terminate = T;
redef InputConfig::empty_field = "EMPTY"; redef InputConfig::empty_field = "EMPTY";

1
testing/btest/scripts/base/frameworks/logging/sqlite/wikipedia.zeek
View file

@ -12,4 +12,3 @@
@load base/protocols/http @load base/protocols/http
@load base/protocols/dns @load base/protocols/dns
@load base/protocols/conn @load base/protocols/conn
@load base/frameworks/dpd

1
testing/btest/scripts/base/frameworks/netcontrol/packetfilter.zeek
View file

@ -4,7 +4,6 @@
@load base/protocols/conn @load base/protocols/conn
@load base/protocols/smtp @load base/protocols/smtp
@load base/protocols/dns @load base/protocols/dns
@load base/frameworks/dpd
@load base/frameworks/netcontrol @load base/frameworks/netcontrol
event NetControl::init() event NetControl::init()

1
testing/btest/scripts/base/protocols/ftp/cwd-navigation.zeek
View file

@ -5,7 +5,6 @@
@load base/protocols/conn @load base/protocols/conn
@load base/protocols/ftp @load base/protocols/ftp
@load base/frameworks/dpd
# Make sure we're tracking the CWD correctly. # Make sure we're tracking the CWD correctly.
event ftp_reply(c: connection, code: count, msg: string, cont_resp: bool) &priority=10 event ftp_reply(c: connection, code: count, msg: string, cont_resp: bool) &priority=10

1
testing/btest/scripts/base/protocols/ftp/ftp-ipv4.zeek
View file

@ -6,4 +6,3 @@
@load base/protocols/conn @load base/protocols/conn
@load base/protocols/ftp @load base/protocols/ftp
@load base/frameworks/dpd

1
testing/btest/scripts/base/protocols/ftp/ftp-ipv6.zeek
View file

@ -6,4 +6,3 @@
@load base/protocols/conn @load base/protocols/conn
@load base/protocols/ftp @load base/protocols/ftp
@load base/frameworks/dpd

1
testing/btest/scripts/base/protocols/http/http-connect-with-header.zeek
View file

@ -10,4 +10,3 @@
@load base/protocols/http @load base/protocols/http
@load base/protocols/ssl @load base/protocols/ssl
@load base/protocols/tunnels @load base/protocols/tunnels
@load base/frameworks/dpd

1
testing/btest/scripts/base/protocols/http/http-connect.zeek
View file

@ -10,4 +10,3 @@
@load base/protocols/http @load base/protocols/http
@load base/protocols/smtp @load base/protocols/smtp
@load base/protocols/tunnels @load base/protocols/tunnels
@load base/frameworks/dpd

1
testing/btest/scripts/base/protocols/http/http-no-crlf.zeek
View file

@ -7,4 +7,3 @@
@load base/protocols/conn @load base/protocols/conn
@load base/protocols/http @load base/protocols/http
@load base/frameworks/dpd

1
testing/btest/scripts/base/protocols/imap/starttls.test
View file

@ -6,7 +6,6 @@
@load base/protocols/ssl @load base/protocols/ssl
@load base/protocols/conn @load base/protocols/conn
@load base/frameworks/dpd
@load base/protocols/imap @load base/protocols/imap
redef SSL::log_include_server_certificate_subject_issuer=T; redef SSL::log_include_server_certificate_subject_issuer=T;

1
testing/btest/scripts/base/protocols/irc/basic.test
View file

@ -8,7 +8,6 @@
@load base/protocols/conn @load base/protocols/conn
@load base/protocols/irc @load base/protocols/irc
@load base/frameworks/dpd
# dcc mime types are irrelevant to this test, so filter it out # dcc mime types are irrelevant to this test, so filter it out
event zeek_init() event zeek_init()

1
testing/btest/scripts/base/protocols/irc/starttls.test
View file

@ -4,6 +4,5 @@
# @TEST-EXEC: btest-diff x509.log # @TEST-EXEC: btest-diff x509.log
@load base/protocols/conn @load base/protocols/conn
@load base/frameworks/dpd
@load base/protocols/ssl @load base/protocols/ssl
@load base/protocols/irc @load base/protocols/irc

1
testing/btest/scripts/base/protocols/krb/krb-service-name.test
View file

@ -4,4 +4,3 @@
@load base/protocols/krb @load base/protocols/krb
@load base/protocols/conn @load base/protocols/conn
@load base/frameworks/dpd

1
testing/btest/scripts/base/protocols/modbus/events.zeek
View file

@ -9,7 +9,6 @@
@load base/protocols/modbus @load base/protocols/modbus
@load base/protocols/conn @load base/protocols/conn
@load base/frameworks/dpd
redef DPD::ignore_violations_after = 1; redef DPD::ignore_violations_after = 1;

1
testing/btest/scripts/base/protocols/pop3/starttls.zeek
View file

@ -4,7 +4,6 @@
# @TEST-EXEC: btest-diff x509.log # @TEST-EXEC: btest-diff x509.log
@load base/protocols/conn @load base/protocols/conn
@load base/frameworks/dpd
@load base/protocols/ssl @load base/protocols/ssl
module POP3; module POP3;

1
testing/btest/scripts/base/protocols/rdp/rdpeudp-handshake-fail.zeek
View file

@ -4,7 +4,6 @@
@load base/protocols/rdp @load base/protocols/rdp
@load base/protocols/conn @load base/protocols/conn
@load base/frameworks/dpd
event rdpeudp_syn(c: connection) event rdpeudp_syn(c: connection)
{ {

1
testing/btest/scripts/base/protocols/rdp/rdpeudp-handshake-success.zeek
View file

@ -4,7 +4,6 @@
@load base/protocols/rdp @load base/protocols/rdp
@load base/protocols/conn @load base/protocols/conn
@load base/frameworks/dpd
event rdpeudp_syn(c: connection) event rdpeudp_syn(c: connection)
{ {

1
testing/btest/scripts/base/protocols/rdp/rdpeudp2-handshake-success.zeek
View file

@ -4,7 +4,6 @@
@load base/protocols/rdp @load base/protocols/rdp
@load base/protocols/conn @load base/protocols/conn
@load base/frameworks/dpd
event rdpeudp_syn(c: connection) event rdpeudp_syn(c: connection)
{ {

1
testing/btest/scripts/base/protocols/ssl/dtls-stun-dpd.test
View file

@ -5,7 +5,6 @@
# @TEST-EXEC: btest-diff .stdout # @TEST-EXEC: btest-diff .stdout
@load base/protocols/ssl @load base/protocols/ssl
@load base/frameworks/dpd
redef SSL::log_include_client_certificate_subject_issuer = T; redef SSL::log_include_client_certificate_subject_issuer = T;
redef SSL::log_include_server_certificate_subject_issuer = T; redef SSL::log_include_server_certificate_subject_issuer = T;

1
testing/btest/scripts/base/protocols/ssl/tls1_1.test
View file

@ -7,4 +7,3 @@
@load base/protocols/ssl @load base/protocols/ssl
@load base/files/x509 @load base/files/x509
@load base/frameworks/dpd

1
testing/btest/scripts/base/protocols/xmpp/starttls.test
View file

@ -4,6 +4,5 @@
# @TEST-EXEC: btest-diff x509.log # @TEST-EXEC: btest-diff x509.log
@load base/protocols/conn @load base/protocols/conn
@load base/frameworks/dpd
@load base/protocols/ssl @load base/protocols/ssl
@load base/protocols/xmpp @load base/protocols/xmpp

1
testing/btest/scripts/policy/protocols/conn/known-services-multi.zeek
View file

@ -6,5 +6,4 @@
@load base/protocols/ssh @load base/protocols/ssh
@load base/protocols/ssl @load base/protocols/ssl
@load base/frameworks/dpd
@load protocols/conn/known-services @load protocols/conn/known-services

1
testing/btest/scripts/policy/protocols/conn/speculative-service.zeek
View file

@ -11,5 +11,4 @@
@load base/protocols/conn @load base/protocols/conn
@load base/protocols/dns @load base/protocols/dns
@load base/protocols/http @load base/protocols/http
@load base/frameworks/dpd
@load protocols/conn/speculative-service @load protocols/conn/speculative-service

1
testing/btest/signatures/eval-condition.zeek
View file

@ -3,7 +3,6 @@
@load base/protocols/conn @load base/protocols/conn
@load base/protocols/ftp @load base/protocols/ftp
@load base/frameworks/dpd
@load-sigs blah.sig @load-sigs blah.sig
@TEST-START-FILE blah.sig @TEST-START-FILE blah.sig