mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-23 11:18:54 +00:00
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
This commit is contained in:
parent
a1ec94b88d
commit
c54da67276
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=209551
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user