Re: [Etherboot-developers] [PATCH] Fix large TFTP boot

--00163645938c06f5d5047d1c954c
Content-Type: text/plain; charset=ISO-8859-1

Sorry for dropping this patch.  I picked it up again this week.

I don't think a separate variable is necessary to track the block
offset.  The block bitmap has enough information to do wrapping.

The block offset will be incremented multiple times when block=65535
and an ack is retransmitted by gPXE.

Attached is a patch that works with retransmission.  I have tested
tftpd-hpa.  Want to give Solaris another spin?

Stefan

--00163645938c06f5d5047d1c954c
Content-Type: text/x-patch; charset=US-ASCII; name="tftpblkwrap.patch"
Content-Disposition: attachment; filename="tftpblkwrap.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_g4fcaxbl0

RnJvbSAwYTc3MjE0OTEwMjVjN2ZmNWU4MzA3OThlZTY5M2QxOTcyMjZkYzEzIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGVmYW4gSGFqbm9jemkgPHN0ZWZhbmhhQGdtYWlsLmNvbT4K
RGF0ZTogU3VuLCAxMCBKYW4gMjAxMCAxOTowNToxNyArMDAwMApTdWJqZWN0OiBbdGZ0cF0gQWxs
b3cgZmV0Y2hpbmcgbGFyZ2VyIGZpbGVzIGJ5IHdyYXBwaW5nIGJsb2NrIG51bWJlcgoKVGhpcyBw
YXRjaCBhZGRzIFRGVFAgc3VwcG9ydCBmb3IgZmlsZXMgbGFyZ2VyIHRoYW4gNjU1MzUgYmxvY2tz
IGJ5CndyYXBwaW5nIHRoZSAxNi1iaXQgYmxvY2sgbnVtYmVyLgoKUmVwb3J0ZWQtYnk6IE1hcmsg
Sm9obnNvbiA8am9obnNvbi5uaEBnbWFpbC5jb20+ClNpZ25lZC1vZmYtYnk6IFN0ZWZhbiBIYWpu
b2N6aSA8c3RlZmFuaGFAZ21haWwuY29tPgotLS0KIHNyYy9uZXQvdWRwL3RmdHAuYyB8ICAgIDkg
KysrKysrLS0tCiAxIGZpbGVzIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMo
LSkKCmRpZmYgLS1naXQgYS9zcmMvbmV0L3VkcC90ZnRwLmMgYi9zcmMvbmV0L3VkcC90ZnRwLmMK
aW5kZXggYmIwMzFlYy4uODIwNTVmYyAxMDA2NDQKLS0tIGEvc3JjL25ldC91ZHAvdGZ0cC5jCisr
KyBiL3NyYy9uZXQvdWRwL3RmdHAuYwpAQCAtNzQ3LDcgKzc0Nyw3IEBAIHN0YXRpYyBpbnQgdGZ0
cF9yeF9kYXRhICggc3RydWN0IHRmdHBfcmVxdWVzdCAqdGZ0cCwKIAkJCSAgc3RydWN0IGlvX2J1
ZmZlciAqaW9idWYgKSB7CiAJc3RydWN0IHRmdHBfZGF0YSAqZGF0YSA9IGlvYnVmLT5kYXRhOwog
CXN0cnVjdCB4ZmVyX21ldGFkYXRhIG1ldGE7Ci0JaW50IGJsb2NrOworCXVuc2lnbmVkIGludCBi
bG9jazsKIAlvZmZfdCBvZmZzZXQ7CiAJc2l6ZV90IGRhdGFfbGVuOwogCWludCByYzsKQEAgLTc1
OSwxNCArNzU5LDE3IEBAIHN0YXRpYyBpbnQgdGZ0cF9yeF9kYXRhICggc3RydWN0IHRmdHBfcmVx
dWVzdCAqdGZ0cCwKIAkJcmMgPSAtRUlOVkFMOwogCQlnb3RvIGRvbmU7CiAJfQotCWlmICggZGF0
YS0+YmxvY2sgPT0gMCApIHsKKworCS8qIENhbGN1bGF0ZSBibG9jayBudW1iZXIgKi8KKwlibG9j
ayA9ICggKCBiaXRtYXBfZmlyc3RfZ2FwICggJnRmdHAtPmJpdG1hcCApICsgMSApICYgfjB4ZmZm
ZiApOworCWlmICggZGF0YS0+YmxvY2sgPT0gMCAmJiBibG9jayA9PSAwICkgewogCQlEQkdDICgg
dGZ0cCwgIlRGVFAgJXAgcmVjZWl2ZWQgZGF0YSBibG9jayAwXG4iLCB0ZnRwICk7CiAJCXJjID0g
LUVJTlZBTDsKIAkJZ290byBkb25lOwogCX0KKwlibG9jayArPSAoIG50b2hzICggZGF0YS0+Ymxv
Y2sgKSAtIDEgKTsKIAogCS8qIEV4dHJhY3QgZGF0YSAqLwotCWJsb2NrID0gKCBudG9ocyAoIGRh
dGEtPmJsb2NrICkgLSAxICk7CiAJb2Zmc2V0ID0gKCBibG9jayAqIHRmdHAtPmJsa3NpemUgKTsK
IAlpb2JfcHVsbCAoIGlvYnVmLCBzaXplb2YgKCAqZGF0YSApICk7CiAJZGF0YV9sZW4gPSBpb2Jf
bGVuICggaW9idWYgKTsKLS0gCjEuNi41Cgo=
--00163645938c06f5d5047d1c954c
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
gPXE mailing list
[email protected]
http://etherboot.org/mailman/listinfo/gpxe

--00163645938c06f5d5047d1c954c--