Aren
/
rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #55 from N00byEdge/pxe_smaller_packets_fix 

Don't stop download if tftp server sends packets smaller than the negotiated mtu
This commit is contained in:
mint 2020-12-02 19:08:20 +01:00 committed by GitHub
parent 99aacedad9 78b19f8713
commit 60b72aee6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
limine-pxe.bin
View File

Binary file not shown.

BIN
limine.bin
View File

Binary file not shown.

BIN
stage2.map
View File

Binary file not shown.

7
stage2/pxe/tftp.c
View File

@ -61,6 +61,8 @@ int tftp_open(struct tftp_file_handle* handle, uint32_t server_ip, uint16_t serv
size_t to_transfer = handle->file_size; size_t to_transfer = handle->file_size;
size_t progress = 0; size_t progress = 0;
bool slow = false;
while (to_transfer > 0) { while (to_transfer > 0) {
volatile struct pxenv_read read = { volatile struct pxenv_read read = {
.boff = ((uint16_t)rm_off(buf)), .boff = ((uint16_t)rm_off(buf)),
@ -72,8 +74,9 @@ int tftp_open(struct tftp_file_handle* handle, uint32_t server_ip, uint16_t serv
} }
memcpy(handle->data + progress, buf, read.bsize); memcpy(handle->data + progress, buf, read.bsize);
if (read.bsize < mtu) { if (read.bsize < mtu && !slow) {
break; slow = true;
print("Server is sending the file in smaller packets (it sent %d bytes), download might take longer.\n", read.bsize);
} }
to_transfer -= read.bsize; to_transfer -= read.bsize;
progress += read.bsize; progress += read.bsize;