Make this slightly more readable, and expose the hypocrasy of a comment that
says "our implementation makes it impossible to use blocksizes smaller than 22 octets" right above a check for blocksize < 8.
This commit is contained in:
parent
b000586d02
commit
14d7065ef1
@ -38,10 +38,6 @@
|
||||
#define TFTP_TIMEOUT 5 /* seconds */
|
||||
#define TFTP_NUM_RETRIES 5 /* number of retries */
|
||||
|
||||
/* RFC2348 says between 8 and 65464 */
|
||||
#define TFTP_OCTECTS_MIN 8
|
||||
#define TFTP_OCTECTS_MAX 65464
|
||||
|
||||
static const char * const MODE_OCTET = "octet";
|
||||
#define MODE_OCTET_LEN 6 /* sizeof(MODE_OCTET)*/
|
||||
|
||||
@ -87,7 +83,7 @@ static int tftp_blocksize_check(int blocksize, int bufsize)
|
||||
*/
|
||||
|
||||
if ((bufsize && (blocksize > bufsize)) ||
|
||||
(blocksize < TFTP_OCTECTS_MIN) || (blocksize > TFTP_OCTECTS_MAX)) {
|
||||
(blocksize < 8) || (blocksize > 65564)) {
|
||||
bb_error_msg("bad blocksize");
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user