emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tftp: do not risk invoking Sorcerer's Apprentice syndrome

Browse Source 
examples/udhcp/simple.script: fix incorrect test for $1

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-05-10 23:27:43 +02:00
parent 8082ea1000
commit c8ab67cad8
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/udhcp/simple.script
View File

@ -3,7 +3,7 @@
RESOLV_CONF="/etc/resolv.conf" 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="" NETMASK=""
[ -n "$subnet" ] && NETMASK="netmask $subnet" [ -n "$subnet" ] && NETMASK="netmask $subnet"

3
networking/tftp.c
View File

@ -501,11 +501,14 @@ static int tftp_protocol(
} }
continue; /* send ACK */ continue; /* send ACK */
} }
/* Disabled to cope with servers with Sorcerer's Apprentice Syndrome */
#if 0
if (recv_blk == (block_nr - 1)) { if (recv_blk == (block_nr - 1)) {
/* Server lost our TFTP_ACK. Resend it */ /* Server lost our TFTP_ACK. Resend it */
block_nr = recv_blk; block_nr = recv_blk;
continue; continue;
} }
#endif
} }
if (CMD_PUT(option_mask32) && (opcode == TFTP_ACK)) { if (CMD_PUT(option_mask32) && (opcode == TFTP_ACK)) {