[git commit master 1/1] tftp: make message about 512 byte block less confusing

Denys Vlasenko vda.linux at googlemail.com
Sat Jun 12 01:29:58 UTC 2010


commit: http://git.busybox.net/busybox/commit/?id=53e2f38b6963958d9a4fc47bc71d7c1afbdcd9d5
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 networking/tftp.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/networking/tftp.c b/networking/tftp.c
index ab4e259..f895d19 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -582,7 +582,8 @@ static int tftp_protocol(
 			 * "An option not acknowledged by the server
 			 * must be ignored by the client and server
 			 * as if it were never requested." */
-			bb_error_msg("server only supports blocksize of 512");
+			if (blksize != TFTP_BLKSIZE_DEFAULT)
+				bb_error_msg("falling back to blocksize "TFTP_BLKSIZE_DEFAULT_STR);
 			blksize = TFTP_BLKSIZE_DEFAULT;
 			io_bufsize = TFTP_BLKSIZE_DEFAULT + 4;
 		}
-- 
1.7.1



More information about the busybox-cvs mailing list