diff --git a/testing/btest/Baseline/core.expire-all-timers/conn-all.log b/testing/btest/Baseline/core.expire-all-timers/conn-all.log new file mode 100644 index 0000000000..194375388d --- /dev/null +++ b/testing/btest/Baseline/core.expire-all-timers/conn-all.log @@ -0,0 +1,12 @@ +### 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 10.0.0.1 51889 192.168.0.1 80 tcp - 0.000010 18 0 OTH - - 0 Da 1 58 1 40 - +XXXXXXXXXX.XXXXXX ClEkJM2Vm5giqnMf4h 10.0.0.1 51889 192.168.0.1 80 tcp - - - - OTH - - 0 D 1 58 0 0 - +#close XXXX-XX-XX-XX-XX-XX diff --git a/testing/btest/Baseline/core.expire-all-timers/conn-limited.log b/testing/btest/Baseline/core.expire-all-timers/conn-limited.log new file mode 100644 index 0000000000..c349ee4a03 --- /dev/null +++ b/testing/btest/Baseline/core.expire-all-timers/conn-limited.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 10.0.0.1 51889 192.168.0.1 80 tcp - 300.000010 18 0 OTH - - 0 DaT 2 116 1 40 - +#close XXXX-XX-XX-XX-XX-XX diff --git a/testing/btest/Traces/tcp/retransmit-timeout.pcap b/testing/btest/Traces/tcp/retransmit-timeout.pcap new file mode 100644 index 0000000000..2529d4d214 Binary files /dev/null and b/testing/btest/Traces/tcp/retransmit-timeout.pcap differ diff --git a/testing/btest/core/expire-all-timers.zeek b/testing/btest/core/expire-all-timers.zeek new file mode 100644 index 0000000000..a6cff297f2 --- /dev/null +++ b/testing/btest/core/expire-all-timers.zeek @@ -0,0 +1,26 @@ +# @TEST-EXEC: zeek -b -C -r $TRACES/tcp/retransmit-timeout.pcap %INPUT +# @TEST-EXEC: mv conn.log conn-limited.log + +# @TEST-EXEC: zeek -b -C -r $TRACES/tcp/retransmit-timeout.pcap %INPUT max_timer_expires=0 +# @TEST-EXEC: mv conn.log conn-all.log + + +# @TEST-EXEC: btest-diff conn-limited.log +# @TEST-EXEC: btest-diff conn-all.log + +@load base/protocols/conn + +const max_timer_expires_default = max_timer_expires; + +event dummy() + { + } + +event network_time_init() + { + # Suppress connection timeout by scheduling more timers than + # can be handled in the context of a single packet, by default. + local i = 0; + while ( ++i <= max_timer_expires_default ) + schedule 4 min { dummy() }; + }