diff options
| author | gavin <gavin@FreeBSD.org> | 2010-06-27 14:21:08 +0000 |
|---|---|---|
| committer | gavin <gavin@FreeBSD.org> | 2010-06-27 14:21:08 +0000 |
| commit | ae037afd1541744af241acdab01139b729097793 (patch) | |
| tree | 00a8a2e2de4464dc45263144581c5dc17c6116ae /usr.bin/tftp | |
| parent | 8b5cecf84ee6b6cd467f39af846db1aeb6257c0c (diff) | |
| download | FreeBSD-src-ae037afd1541744af241acdab01139b729097793.zip FreeBSD-src-ae037afd1541744af241acdab01139b729097793.tar.gz | |
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
Diffstat (limited to 'usr.bin/tftp')
| -rw-r--r-- | usr.bin/tftp/tftp.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c index c6e1118..f0c0103 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. |
