mirrors/tftp-hpa-google
1
0
Fork 1
mirror of https://kernel.googlesource.com/pub/scm/network/tftp/tftp-hpa synced 2025-04-29 11:29:52 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
H. Peter Anvin 2011-05-09 21:09:18 -07:00
commit 05ffcecaa8
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -6,6 +6,9 @@ Changes in 5.1:
Build fixes. Build fixes.
Fix handling of block number wraparound after a successful
options negotiation.
Changes in 5.0: Changes in 5.0:
Try to on platforms with getaddrinfo() without AI_ADDRCONFIG or Try to on platforms with getaddrinfo() without AI_ADDRCONFIG or

3
tftpd/recvfrom.c
View file

@ -245,7 +245,8 @@ myrecvfrom(int s, void *buf, int len, unsigned int flags,
int int
myrecvfrom(int s, void *buf, int len, unsigned int flags, myrecvfrom(int s, void *buf, int len, unsigned int flags,
struct sockaddr *from, int *fromlen, union sock_addr *myaddr) struct sockaddr *from, socklen_t * fromlen,
union sock_addr *myaddr)
{ {
/* There is no way we can get the local address, fudge it */ /* There is no way we can get the local address, fudge it */

4
tftpd/tftpd.c
View file

@ -1648,6 +1648,10 @@ static void tftp_recvfile(const struct formats *pf, struct tftphdr *oap, int oac
ap->th_opcode = htons((u_short) ACK); ap->th_opcode = htons((u_short) ACK);
ap->th_block = htons((u_short) block); ap->th_block = htons((u_short) block);
acksize = 4; acksize = 4;
/* If we're sending a regular ACK, that means we have successfully
* sent the OACK. Clear oap so that we won't try to send another
* OACK when the block number wraps back to 0. */
oap = NULL;
} }
if (!++block) if (!++block)
block = rollover_val; block = rollover_val;