Merge remote-tracking branch 'origin/master' into topic/johanna/dtls13

* origin/master: (35 commits)
  Update doc submodule [nomail] [skip ci]
  Updating submodule(s) [nomail]
  zeek.bif: Add log2() and ceil()
  Use the same rules as cmake submodule to reformat Zeek
  Update cmake submodule after reformat
  Fixup Val.h/Val.cc: Actually move ValFromJSON into zeek::detail
  Implement from_json bif
  Revert "Skip version.h by default for Zeek sources"
  BTest baseline updates for -O gen-C++
  updates to C++ maintenance scripts to better handle uncompilable BTests
  added ZEEK_REPORT_UNCOMPILABLE environment variable for "-O report-uncompilable"
  Skip version.h by default for Zeek sources
  core.network_time.broker: Test reliability improvement
  cluster/supervisor: Multi-logger awareness
  Bump zeek-archiver submodule
  ci: Add public-ecr-vacuum.sh
  Update doc submodule [nomail] [skip ci]
  generate-docs: Only update submodule pointer during scheduled builds
  BTest baseline updates for ZAM
  NTP: Detect out-of-order packets
  ...

testing/btest/scripts/base/frameworks/input/from_json.zeek

@@ -0,0 +1,71 @@
+# @TEST-DOC: Reading a jsonl file using the raw input reader and parsing via from_json()
+# @TEST-EXEC: zeek -b %INPUT >out
+# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff out
+
+@TEST-START-FILE denylist.jsonl
+{"ip": "192.168.0.1", "source": "local", "timestamp": "1990-09-22T12:13:14"}
+{"ip": "192.168.0.1", "source": "local", "timestamp": "1990-09-23T13:14:15"}
+{"ip": "192.168.0.2", "source": "local"}
+{"source": "local"}
+{... ]
+{"ip": "8.8.4.4", "source": "remote"}
+@TEST-END-FILE
+
+redef exit_only_after_terminate = T;
+
+module A;
+
+type Line: record {
+	l: string;
+};
+
+type Deny: record {
+	ip: addr;
+	source: string;
+	timestamp: string &optional;
+	timestamp_parsed: time &optional;
+};
+
+event line(description: Input::EventDescription, tpe: Input::Event, line: string)
+	{
+	local r = from_json(line, Deny);
+	if ( r$valid )
+		{
+		local deny = r$v as Deny;
+		if ( deny?$timestamp )
+			deny$timestamp_parsed = strptime("%Y-%m-%dT%H:%M:%S", deny$timestamp);
+
+		print fmt("Valid: %s (%s)", deny, line);
+		}
+	else
+		print fmt("Invalid: '%s'", line);
+	}
+
+event die()
+	{
+	if ( zeek_is_terminating() )
+		return;
+
+	print "error: test timeout";
+	exit(1);
+	}
+
+event zeek_init()
+	{
+	Input::add_event([
+		$source="denylist.jsonl",
+		$name="denylist",
+		$reader=Input::READER_RAW,
+		$fields=Line,
+		$ev=line,
+		$want_record=F
+	]);
+
+	schedule 5sec { die() };
+	}
+
+event Input::end_of_data(name: string, source:string)
+	{
+	Input::remove("deny");
+	terminate();
+	}

testing/btest/scripts/base/protocols/ntp/misordered-ntp.test

@@ -0,0 +1,12 @@
+# @TEST-EXEC: zeek -b -C -r $TRACES/ntp/misordered-ntp.pcap %INPUT
+# @TEST-EXEC: btest-diff ntp.log
+# @TEST-EXEC: btest-diff conn.log
+# @TEST-EXEC: btest-diff .stdout
+
+@load base/protocols/conn
+@load base/protocols/ntp
+
+event ntp_message(c: connection, is_orig: bool, msg: NTP::Message)
+	{
+	print fmt("ntp_message %s -> %s:%d (%s)", c$id$orig_h, c$id$resp_h, c$id$resp_p, c$history);
+	}

testing/btest/scripts/base/protocols/smb/smb2-max-pending-messages.test

@@ -0,0 +1,18 @@
+# @TEST-DOC: Pcap contains 100 file transfers (read requests), force BPF filtering such that the responses aren't seen and we have state growth. Verify a low SMB::max_pending_messages triggers, logs a weird and that script-land message state is reset.
+# @TEST-EXEC: zeek -b -C -r $TRACES/smb/smb2_100_small_files.pcap -f 'src port not 445 or tcp[tcpflags] & (tcp-syn|tcp-fin|tcp-rst) != 0' %INPUT >out
+# @TEST-EXEC: btest-diff weird.log
+# @TEST-EXEC: btest-diff out
+
+@load base/protocols/smb
+
+redef SMB::max_pending_messages = 20;
+
+event smb2_discarded_messages_state(c: connection, request: string) &priority=10
+	{
+	print "smb2_discarded_messages_state before", request, |c$smb_state$pending_cmds|;
+	}
+
+event smb2_discarded_messages_state(c: connection, request: string) &priority=-10
+	{
+	print "smb2_discarded_messages_state after", request, |c$smb_state$pending_cmds|;
+	}

testing/btest/scripts/base/protocols/ssl/tls-protocol-violation.test

@@ -0,0 +1,5 @@
+# This tests that no error messages are output when a protocol violation occurs
+
+# @TEST-EXEC: zeek -C -r $TRACES/tls/tls1.2-protocol-violation.pcap %INPUT
+# @TEST-EXEC: test -f dpd.log
+# @TEST-EXEC: btest-diff .stderr