svn commit: r337247 - in stable/10: libexec/tftpd libexec/tftpd/tests usr.bin/tftp

[Alan Somers]

Author: asomers
Date: Fri Aug  3 14:17:11 2018
New Revision: 337247
URL: https://svnweb.freebsd.org/changeset/base/337247

Log:
  MFC r330710:
  
  tftpd: Flush files as soon as they are fully received
  
  On an RRQ, tftpd doesn't exit as soon as it's finished receiving a file.
  Instead, it waits five seconds just in case the client didn't receive the
  server's last ACK and decides to resend the final DATA packet.
  Unfortunately, this created a 5 second delay from when the client thinks
  it's done sending the file, and when the file is available for other
  processes.
  
  Fix this bug by closing the file as soon as receipt is finished.
  
  PR:			157700
  Reported by:		Barry Mishler <barry_mishler at yahoo.com>

Modified:
  stable/10/libexec/tftpd/tests/functional.c
  stable/10/libexec/tftpd/tftp-transfer.c
  stable/10/libexec/tftpd/tftpd.c
  stable/10/usr.bin/tftp/tftp.c

Modified: stable/10/libexec/tftpd/tests/functional.c
==============================================================================
--- stable/10/libexec/tftpd/tests/functional.c	Fri Aug  3 14:13:15 2018	(r337246)
+++ stable/10/libexec/tftpd/tests/functional.c	Fri Aug  3 14:17:11 2018	(r337247)
@@ -692,7 +692,6 @@ TFTPD_TC_DEFINE(w_flag,, w_flag = 1;)
 	send_data(1, contents, contents_len);
 	recv_ack(1);
 
-	atf_tc_expect_fail("PR 157700 tftpd expects more data after EOF");
 	fd = open("small.txt", O_RDONLY);
 	ATF_REQUIRE(fd >= 0);
 	r = read(fd, buffer, sizeof(buffer));
@@ -730,7 +729,6 @@ TFTPD_TC_DEFINE(wrq_dropped_ack,)
 	send_data(2, (const char*)&contents[128], 256);
 	recv_ack(2);
 
-	atf_tc_expect_fail("PR 157700 tftpd expects more data after EOF");
 	fd = open("medium.txt", O_RDONLY);
 	ATF_REQUIRE(fd >= 0);
 	r = read(fd, buffer, sizeof(buffer));
@@ -764,7 +762,6 @@ TFTPD_TC_DEFINE(wrq_dropped_data,)
 	send_data(1, contents, contents_len);
 	recv_ack(1);
 
-	atf_tc_expect_fail("PR 157700 tftpd expects more data after EOF");
 	fd = open("small.txt", O_RDONLY);
 	ATF_REQUIRE(fd >= 0);
 	r = read(fd, buffer, sizeof(buffer));
@@ -799,7 +796,6 @@ TFTPD_TC_DEFINE(wrq_duped_data,)
 	send_data(2, (const char*)&contents[128], 256);
 	recv_ack(2);
 
-	atf_tc_expect_fail("PR 157700 tftpd expects more data after EOF");
 	fd = open("medium.txt", O_RDONLY);
 	ATF_REQUIRE(fd >= 0);
 	r = read(fd, buffer, sizeof(buffer));
@@ -867,7 +863,6 @@ TFTPD_TC_DEFINE(wrq_medium,)
 	send_data(2, (const char*)&contents[128], 256);
 	recv_ack(2);
 
-	atf_tc_expect_fail("PR 157700 tftpd expects more data after EOF");
 	fd = open("medium.txt", O_RDONLY);
 	ATF_REQUIRE(fd >= 0);
 	r = read(fd, buffer, sizeof(buffer));
@@ -894,14 +889,13 @@ TFTPD_TC_DEFINE(wrq_netascii,)
 	fd = open("unix.txt", O_RDWR | O_CREAT, 0666);
 	ATF_REQUIRE(fd >= 0);
 	close(fd);
-	contents_len = strlen(contents) + 1;
+	contents_len = sizeof(contents);
 
 	SEND_WRQ("unix.txt", "netascii");
 	recv_ack(0);
 	send_data(1, contents, contents_len);
 	recv_ack(1);
 
-	atf_tc_expect_fail("PR 157700 tftpd expects more data after EOF");
 	fd = open("unix.txt", O_RDONLY);
 	ATF_REQUIRE(fd >= 0);
 	r = read(fd, buffer, sizeof(buffer));
@@ -942,7 +936,6 @@ TFTPD_TC_DEFINE(wrq_small,)
 	send_data(1, contents, contents_len);
 	recv_ack(1);
 
-	atf_tc_expect_fail("PR 157700 tftpd expects more data after EOF");
 	fd = open("small.txt", O_RDONLY);
 	ATF_REQUIRE(fd >= 0);
 	r = read(fd, buffer, sizeof(buffer));

Modified: stable/10/libexec/tftpd/tftp-transfer.c
==============================================================================
--- stable/10/libexec/tftpd/tftp-transfer.c	Fri Aug  3 14:13:15 2018	(r337246)
+++ stable/10/libexec/tftpd/tftp-transfer.c	Fri Aug  3 14:17:11 2018	(r337247)
@@ -302,6 +302,8 @@ send_ack:
 		gettimeofday(&(ts->tstop), NULL);
 	} while (n_data == segsize);
 
+	write_close();
+
 	/* Don't do late packet management for the client implementation */
 	if (acting_as_client)
 		return;

Modified: stable/10/libexec/tftpd/tftpd.c
==============================================================================
--- stable/10/libexec/tftpd/tftpd.c	Fri Aug  3 14:13:15 2018	(r337246)
+++ stable/10/libexec/tftpd/tftpd.c	Fri Aug  3 14:17:11 2018	(r337247)
@@ -821,7 +821,6 @@ tftp_recvfile(int peer, const char *mode)
 	block = 0;
 	tftp_receive(peer, &block, &ts, NULL, 0);
 
-	write_close();
 	gettimeofday(&now2, NULL);
 
 	if (debug&DEBUG_SIMPLE) {

Modified: stable/10/usr.bin/tftp/tftp.c
==============================================================================
--- stable/10/usr.bin/tftp/tftp.c	Fri Aug  3 14:13:15 2018	(r337246)
+++ stable/10/usr.bin/tftp/tftp.c	Fri Aug  3 14:17:11 2018	(r337247)
@@ -263,7 +263,6 @@ recvfile(int peer, char *port, int fd, char *name, cha
 		tftp_receive(peer, &block, &tftp_stats, rp, n);
 	}
 
-	write_close();
 	if (tftp_stats.amount > 0)
 		printstats("Received", verbose, &tftp_stats);
 	return;