diff --git a/CHANGES b/CHANGES index 3d8e5d4bc6..6943702656 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +4.2.0-dev.159 | 2021-09-14 13:00:50 -0700 + + * ignore_checksums_nets: Add test for multiple subnets (Arne Welzel, Corelight) + + This test fails with Zeek 4.1 and Zeek 4.0.3. + 4.2.0-dev.157 | 2021-09-08 12:04:45 -0700 * fix for looping over vectors with holes per https://github.com/zeek/zeek/issues/1763 (Vern Paxson, Corelight) diff --git a/VERSION b/VERSION index 6e49fb7671..21a84a9ebd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.2.0-dev.157 +4.2.0-dev.159 diff --git a/testing/btest/Baseline/core.checksums_ignore_nets/conn-worked-multi-subnets.log b/testing/btest/Baseline/core.checksums_ignore_nets/conn-worked-multi-subnets.log new file mode 100644 index 0000000000..9097cb30dd --- /dev/null +++ b/testing/btest/Baseline/core.checksums_ignore_nets/conn-worked-multi-subnets.log @@ -0,0 +1,11 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +#separator \x09 +#set_separator , +#empty_field (empty) +#unset_field - +#path conn +#open XXXX-XX-XX-XX-XX-XX +#fields ts uid id.orig_h id.orig_p id.resp_h id.resp_p proto service duration orig_bytes resp_bytes conn_state local_orig local_resp missed_bytes history orig_pkts orig_ip_bytes resp_pkts resp_ip_bytes tunnel_parents +#types time string addr port addr port enum string interval count count string bool bool count string count count count count set[string] +XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 192.168.1.28 53246 35.221.46.9 80 tcp - 0.091969 74 432 SF - - 0 ShADadFf 6 338 4 604 - +#close XXXX-XX-XX-XX-XX-XX diff --git a/testing/btest/core/checksums_ignore_nets.test b/testing/btest/core/checksums_ignore_nets.test index 89b21a502a..bc8d7cb733 100644 --- a/testing/btest/core/checksums_ignore_nets.test +++ b/testing/btest/core/checksums_ignore_nets.test @@ -1,7 +1,9 @@ # @TEST-EXEC: zeek -b -r $TRACES/chksums/localhost-bad-chksum.pcap "ignore_checksums_nets += {192.168.0.0/16}" %INPUT && mv conn.log conn-worked.log +# @TEST-EXEC: zeek -b -r $TRACES/chksums/localhost-bad-chksum.pcap "ignore_checksums_nets += {192.168.0.0/16, 192.169.0.0/16}" %INPUT && mv conn.log conn-worked-multi-subnets.log # @TEST-EXEC: zeek -b -r $TRACES/chksums/localhost-bad-chksum.pcap %INPUT && mv conn.log conn-failed.log # @TEST-EXEC: btest-diff conn-worked.log +# @TEST-EXEC: btest-diff conn-worked-multi-subnets.log # @TEST-EXEC: btest-diff conn-failed.log @load base/protocols/conn