From c54da67276f31cdc6657773fb68f9ee78e454ba9 Mon Sep 17 00:00:00 2001 From: Gavin Atkinson Date: Sun, 27 Jun 2010 14:21:08 +0000 Subject: [PATCH] Fix transfer statistics in the "send file" case - The conditional used to print the stats were using an uninitialised variable. [1] Fix trasnfer statistics in the "receive file" case - the statistics struct was being cleared both before and after the initial connect to the remote server. As a result, the printed time and calculated bandwidth covers the time to connect ad well as the time to transfer the file. This may not be ideal, but now at least matches the "send file" case. Found by: clang static analyser [1] Reviewed by: imp --- usr.bin/tftp/tftp.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c index c6e11180597..f0c01039d98 100644 --- a/usr.bin/tftp/tftp.c +++ b/usr.bin/tftp/tftp.c @@ -75,7 +75,6 @@ xmitfile(int peer, char *port, int fd, char *name, char *mode) struct tftphdr *rp; int n, i; uint16_t block; - uint32_t amount; struct sockaddr_storage serv; /* valid server port number */ char recvbuffer[MAXPKTSIZE]; struct tftp_stats tftp_stats; @@ -162,7 +161,7 @@ xmitfile(int peer, char *port, int fd, char *name, char *mode) tftp_send(peer, &block, &tftp_stats); read_close(); - if (amount > 0) + if (tftp_stats.amount > 0) printstats("Sent", verbose, &tftp_stats); txrx_error = 1; @@ -243,8 +242,6 @@ recvfile(int peer, char *port, int fd, char *name, char *mode) return; } - stats_init(&tftp_stats); - /* * If the first packet is an OACK packet instead of an DATA packet, * handle it different.