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.

diff --git a/networking/tftp.c b/networking/tftp.c
index 237609fad66e20ce5eb03f2edc703990163ff087..b0572c89009c676088b4db32733a3f315eefa5da 100644 (file)
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -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;
        }