Merge remote-tracking branch 'security/topic/awelzel/196-ftp-timeout-smaller-fix'

* security/topic/awelzel/196-ftp-timeout-smaller-fix:
  Update baselines
  ftp: Do not base seq on number of pending commands

scripts/base/protocols/ftp/info.zeek

@@ -64,6 +64,9 @@ export {
 		## to are tracked here.
 		pending_commands:   PendingCmds;
 
+		## Sequence number of previous command.
+		command_seq:        count &default=0;
+
 		## Indicates if the session is in active or passive mode.
 		passive:            bool &default=F;
 

scripts/base/protocols/ftp/main.zeek

@@ -165,7 +165,7 @@ function set_ftp_session(c: connection)
 		Conn::register_removal_hook(c, finalize_ftp);
 
 		# Add a shim command so the server can respond with some init response.
-		add_pending_cmd(c$ftp$pending_commands, "<init>", "");
+		add_pending_cmd(c$ftp$pending_commands, ++c$ftp$command_seq, "<init>", "");
 		}
 	}
 
@@ -270,7 +270,7 @@ event ftp_request(c: connection, command: string, arg: string) &priority=5
 
 	# Queue up the new command and argument
 	if ( |c$ftp$pending_commands| < max_pending_commands )
-		add_pending_cmd(c$ftp$pending_commands, command, arg);
+		add_pending_cmd(c$ftp$pending_commands, ++c$ftp$command_seq, command, arg);
 	else
 		Reporter::conn_weird("FTP_too_many_pending_commands", c,
 				     cat(|c$ftp$pending_commands|), "FTP");

scripts/base/protocols/ftp/utils-commands.zeek

@@ -78,9 +78,9 @@ export {
 	};
 }
 
-function add_pending_cmd(pc: PendingCmds, cmd: string, arg: string): CmdArg
+function add_pending_cmd(pc: PendingCmds, seq: count, cmd: string, arg: string): CmdArg
 	{
-	local ca = [$cmd = cmd, $arg = arg, $seq=|pc|+1, $ts=network_time()];
+	local ca = [$cmd = cmd, $arg = arg, $seq=seq, $ts=network_time()];
 	pc[ca$seq] = ca;
 
 	return ca;

testing/btest/Baseline/coverage.record-fields/out.default

@@ -162,6 +162,7 @@ connection {
               * ts: time, log=F, optional=F
              }
         * command: string, log=T, optional=T
+        * command_seq: count, log=F, optional=T
         * cwd: string, log=F, optional=T
         * data_channel: record FTP::ExpectedDataChannel, log=T, optional=T
             FTP::ExpectedDataChannel {

testing/external/commit-hash.zeek-testing

@@ -1 +1 @@
-05af330a994b192cefecb00dcaf78ad8f7cb5ab2
+1084213b00cbde4dd0ea985f92f9c89c1042ce73

testing/external/commit-hash.zeek-testing-private

@@ -1 +1 @@
-1522faf244d4de213a8f17ab4e2c5273d80d99e4
+05e472a9d035c183383b06bc12d79610d42654e0