grub fails to tftp a file with more than 64K blocks

[Guzovsky, Eduard]

Grub version 0.94 with (or without) “grub-0[1].94-diskless-1.patch” fails to tftp a file with more than 64K blocks. Bellow is a fix. Note that the bug exists in buf_fill() function.

“grub-0[1].94-diskless-1.patch” has identical code in tftp_file_read() function which does not have this problem.

 

-Ed

 

 

*** grub-0.94/netboot/fsys_tftp.c   Tue Apr 13 15:48:25 2004

--- grub-0.94.orig/netboot/fsys_tftp.c Thu Apr 8 15:45:37 2004

***************

*** 375,381 ****

      /* Neither TFTP_OACK nor TFTP_DATA.  */

      break;

 

!     if ((block || bcounter) && (block != (unsigned short)(prevblock + 1)))

      /* Block order should be continuous */

      tp.u.ack.block = htons (block = prevblock);

       

--- 375,381 ----

      /* Neither TFTP_OACK nor TFTP_DATA.  */

      break;

 

!     if ((block || bcounter) && (block != prevblock + 1))

      /* Block order should be continuous */

      tp.u.ack.block = htons (block = prevblock);