forks/tftp-hpa-google
1
0
Fork 0
forked from mirrors/tftp-hpa-google
Code Pull requests Releases 1 Activity

tftpd: implement the "rollover" option

Browse source 
Implement the "rollover" option, to set the rollover block number to
anything other than zero.  Apparently some idiots have gotten the idea
that block numbers should roll over to one, rather than zero.
This commit is contained in:
H. Peter Anvin 2009-02-02 15:14:27 -08:00
parent fcdd859a75
commit 932277c9a5
2 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tftpd/tftpd.8.in
View file

@ -218,6 +218,10 @@ Set the time before the server retransmits a packet, in seconds.
.TP .TP
\fButimeout\fP (nonstandard) \fButimeout\fP (nonstandard)
Set the time before the server retransmits a packet, in microseconds. Set the time before the server retransmits a packet, in microseconds.
.TP
\fBrollover\fP (nonstandard)
Set the block number to resume at after a block number rollover. The
default and recommended value is zero.
.PP .PP
The The
.B \-\-refuse .B \-\-refuse

26
tftpd/tftpd.c
View file

@ -81,6 +81,7 @@ static unsigned long rexmtval = TIMEOUT; /* Basic timeout value */
static unsigned long maxtimeout = TIMEOUT_LIMIT * TIMEOUT; static unsigned long maxtimeout = TIMEOUT_LIMIT * TIMEOUT;
static int timeout_quit = 0; static int timeout_quit = 0;
static sigjmp_buf timeoutbuf; static sigjmp_buf timeoutbuf;
static uint16_t rollover_val = 0;
#define PKTSIZE MAX_SEGSIZE+4 #define PKTSIZE MAX_SEGSIZE+4
static char buf[PKTSIZE]; static char buf[PKTSIZE];
@ -119,6 +120,7 @@ static int set_blksize2(char *, char **);
static int set_tsize(char *, char **); static int set_tsize(char *, char **);
static int set_timeout(char *, char **); static int set_timeout(char *, char **);
static int set_utimeout(char *, char **); static int set_utimeout(char *, char **);
static int set_rollover(char *, char **);
struct options { struct options {
const char *o_opt; const char *o_opt;
@ -129,6 +131,7 @@ struct options {
{"tsize", set_tsize}, {"tsize", set_tsize},
{"timeout", set_timeout}, {"timeout", set_timeout},
{"utimeout", set_utimeout}, {"utimeout", set_utimeout},
{"rollover", set_rollover},
{NULL, NULL} {NULL, NULL}
}; };
@ -1160,6 +1163,23 @@ static int set_blksize2(char *val, char **ret)
return (1); return (1);
} }
/*
* Set the block number rollover value
*/
static int set_rollover(char *val, char **ret)
{
uintmax_t ro;
char *vend;
ro = strtoumax(val, &vend, 10);
if (ro > 65535 || *vend)
return 0;
rollover_val = (uint16_t)ro;
*ret = val;
return 1;
}
/* /*
* Return a file size (c.f. RFC2349) * Return a file size (c.f. RFC2349)
* For netascii mode, we don't know the size ahead of time; * For netascii mode, we don't know the size ahead of time;
@ -1542,7 +1562,8 @@ static void tftp_sendfile(struct formats *pf, struct tftphdr *oap, int oacklen)
} }
} }
block++; if (!++block)
block = rollover_val;
} while (size == segsize); } while (size == segsize);
abort: abort:
(void)fclose(file); (void)fclose(file);
@ -1575,7 +1596,8 @@ static void tftp_recvfile(struct formats *pf, struct tftphdr *oap, int oacklen)
ap->th_block = htons((u_short) block); ap->th_block = htons((u_short) block);
acksize = 4; acksize = 4;
} }
block++; if (!++block)
block = rollover_val;
(void)sigsetjmp(timeoutbuf, 1); (void)sigsetjmp(timeoutbuf, 1);
send_ack: send_ack:
r_timeout = timeout; r_timeout = timeout;