summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-05-10 21:27:43 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2009-05-10 21:27:43 (GMT)
commitc8ab67cad852ec2457adf15bf7883c2f5cdb1b00 (patch)
tree18829f74854afb26e11a1364b38d158fe7a0a2f3
parent8082ea1000af5103b86611835cdca23863e201db (diff)
downloadbusybox-c8ab67cad852ec2457adf15bf7883c2f5cdb1b00.tar.gz
busybox-c8ab67cad852ec2457adf15bf7883c2f5cdb1b00.tar.bz2
tftp: do not risk invoking Sorcerer's Apprentice syndrome
examples/udhcp/simple.script: fix incorrect test for $1 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--examples/udhcp/simple.script2
-rw-r--r--networking/tftp.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/examples/udhcp/simple.script b/examples/udhcp/simple.script
index abf1b6f..40ee738 100644
--- a/examples/udhcp/simple.script
+++ b/examples/udhcp/simple.script
@@ -3,7 +3,7 @@
RESOLV_CONF="/etc/resolv.conf"
-[ -n "$1" ] || echo "Error: should be called from udhcpc" && exit 1
+[ -n "$1" ] || { echo "Error: should be called from udhcpc"; exit 1; }
NETMASK=""
[ -n "$subnet" ] && NETMASK="netmask $subnet"
diff --git a/networking/tftp.c b/networking/tftp.c
index 352037f..6cd3f69 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -501,11 +501,14 @@ static int tftp_protocol(
}
continue; /* send ACK */
}
+/* Disabled to cope with servers with Sorcerer's Apprentice Syndrome */
+#if 0
if (recv_blk == (block_nr - 1)) {
/* Server lost our TFTP_ACK. Resend it */
block_nr = recv_blk;
continue;
}
+#endif
}
if (CMD_PUT(option_mask32) && (opcode == TFTP_ACK)) {