Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-20 02:38:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweak recently altered TFTP code.

Browse Source
This commit is contained in:
Simon Kelley
2025-08-21 16:19:58 +01:00
parent 06e2d479c9
commit 9a566c0913
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/dnsmasq.h
View File

@@ -1117,8 +1117,9 @@ struct tftp_file {
struct tftp_transfer { struct tftp_transfer {
int sockfd; int sockfd;
u16 block_hi, ackprev;
time_t retransmit, start; time_t retransmit, start;
unsigned int lastack, block, ackblock, blocksize, windowsize, timeout, expansion; unsigned int lastack, block, blocksize, windowsize, timeout, expansion;
off_t offset; off_t offset;
union mysockaddr peer; union mysockaddr peer;
union all_addr source; union all_addr source;

26
src/tftp.c
View File

@@ -326,7 +326,8 @@ static void tftp_request(struct listener *listen, time_t now)
transfer->start = now; transfer->start = now;
transfer->backoff = 1; transfer->backoff = 1;
transfer->block = 1; transfer->block = 1;
transfer->ackblock = 0; transfer->ackprev = 0;
transfer->block_hi = 0;
transfer->blocksize = 512; transfer->blocksize = 512;
transfer->windowsize = 1; transfer->windowsize = 1;
@@ -757,9 +758,7 @@ static void handle_tftp(time_t now, struct tftp_transfer *transfer, ssize_t len)
{ {
/* Handle 16-bit block number wrap-around. */ /* Handle 16-bit block number wrap-around. */
u16 new = ntohs(mess->block); u16 new = ntohs(mess->block);
u16 prev = transfer->ackblock; u32 block;
transfer->ackblock = new | (transfer->ackblock & 0xffff0000);
/* If the last ack received was in the top quarter of a 64k block /* If the last ack received was in the top quarter of a 64k block
and this one is in the bottom quarter, assume it has wrapped. and this one is in the bottom quarter, assume it has wrapped.
@@ -768,26 +767,29 @@ static void handle_tftp(time_t now, struct tftp_transfer *transfer, ssize_t len)
need to drop back to a previous segment. Such an ACK is ignored below; need to drop back to a previous segment. Such an ACK is ignored below;
here we're just getting the most likely 32 bit value from the here we're just getting the most likely 32 bit value from the
16 bits that we have. */ 16 bits that we have. */
if (new <= 0x4000 && prev >= 0xc000) if (new <= 0x4000 && transfer->ackprev >= 0xc000)
transfer->ackblock += 0x10000; transfer->block_hi++;
else if (new >= 0xc000 && prev <= 0x4000 && transfer->ackblock != 0) else if (new >= 0xc000 && transfer->ackprev <= 0x4000 && transfer->block_hi != 0)
transfer->ackblock -= 0x10000; transfer->block_hi--;
transfer->ackprev = new;
block = (((u32)transfer->block_hi) << 16) + (u32)new;
/* Ignore duplicate ACKs and ACKs for blocks we've not yet sent. */ /* Ignore duplicate ACKs and ACKs for blocks we've not yet sent. */
if (transfer->ackblock >= transfer->lastack && if (block >= transfer->lastack &&
transfer->ackblock <= transfer->block) block <= transfer->block)
{ {
/* Got ack, move forward and ensure we take the (re)transmit path */ /* Got ack, move forward and ensure we take the (re)transmit path */
transfer->retransmit = transfer->start = now; transfer->retransmit = transfer->start = now;
transfer->backoff = 0; transfer->backoff = 0;
transfer->lastack = transfer->ackblock + 1; transfer->lastack = block + 1;
/* We have no easy function from block no. to file offset when /* We have no easy function from block no. to file offset when
expanding line breaks in netascii mode, so we update the offset here expanding line breaks in netascii mode, so we update the offset here
as each block is acknowledged. This explains why the window size must be as each block is acknowledged. This explains why the window size must be
one for a netascii transfer; to avoid the block no. doing anything one for a netascii transfer; to avoid the block no. doing anything
other than incrementing by one. */ other than incrementing by one. */
if (transfer->netascii && transfer->ackblock != 0) if (transfer->netascii && block != 0)
transfer->offset += transfer->blocksize - transfer->expansion; transfer->offset += transfer->blocksize - transfer->expansion;
} }
} }