1d4c88c8a
Paul Fox
2005-07-20
Subject
applying fix for: 0000271: [PATCH] tftp -g fails if a TFTP_ACK is lost
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
networking/tftp.c+6 -1
| @@ -320,7 +320,7 @@ static inline int tftp(const int cmd, const struct hostent *host, | |
| FD_ZERO(&rfds); | |
| FD_SET(socketfd, &rfds); | |
| - | switch (select(FD_SETSIZE, &rfds, NULL, NULL, &tv)) { |
| + | switch (select(socketfd + 1, &rfds, NULL, NULL, &tv)) { |
| case 1: | |
| len = recvfrom(socketfd, buf, tftp_bufsize, 0, | |
| (struct sockaddr *) &from, &fromlen); | |
| @@ -463,6 +463,11 @@ static inline int tftp(const int cmd, const struct hostent *host, | |
| --block_nr; | |
| opcode = TFTP_ACK; | |
| continue; | |
| + | } else if (tmp + 1 == block_nr) { |
| + | /* Server lost our TFTP_ACK. Resend it */ |
| + | block_nr = tmp; |
| + | opcode = TFTP_ACK; |
| + | continue; |
| } | |
| } | |