[BusyBox-cvs] busybox/networking tftp.c,1.21,1.22

Glenn McGrath bug1 at busybox.net
Sun Feb 22 03:33:55 UTC 2004


Update of /var/cvs/busybox/networking
In directory nail:/tmp/cvs-serv29858/networking

Modified Files:
	tftp.c 
Log Message:
Ptch by Hideki IWAMOTO, fix a bug preventing tftp from getting or 
putting more than 0xffff blocks.


Index: tftp.c
===================================================================
RCS file: /var/cvs/busybox/networking/tftp.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- a/tftp.c	17 Jan 2004 05:03:31 -0000	1.21
+++ b/tftp.c	22 Feb 2004 03:33:53 -0000	1.22
@@ -156,7 +156,7 @@
 	int opcode = 0;
 	int finished = 0;
 	int timeout = bb_tftp_num_retries;
-	int block_nr = 1;
+	unsigned short block_nr = 1;
 
 #ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE
 	int want_option_ack = 0;
@@ -462,7 +462,7 @@
 
 		if (cmd_put && (opcode == TFTP_ACK)) {
 
-			if (tmp == (block_nr - 1)) {
+			if (tmp == (unsigned short)(block_nr - 1)) {
 				if (finished) {
 					break;
 				}




More information about the busybox-cvs mailing list