eblot/pybootd
1
1
Fork 0
mirror of https://github.com/eblot/pybootd.git synced 2024-08-17 18:00:33 +03:00
Code Issues Projects Releases Wiki Activity

Fix block number overflow

Browse Source 
* wrap around block number on 16-bit
* use positive integers for block number
This commit is contained in:
Emmanuel Blot 2019-09-19 09:58:48 +02:00
parent bbf0b15edb
commit f08a6cf99d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pybootd/tftpd.py
View File

@ -263,9 +263,9 @@ class TftpConnection(object):
if not self.time:
self.time = now()
blocksize = self.blocksize
block = self.blockNumber = self.blockNumber + 1
block = self.blockNumber = (self.blockNumber + 1) 0xFFFF
lendata = len(data)
fmt = '!hh%ds' % lendata
fmt = '!hH%ds' % lendata
pkt = pack(fmt, self.DATA, block, data)
self.send(pkt)
self.active = (len(data) == blocksize)
@ -290,8 +290,8 @@ class TftpConnection(object):
def send_ack(self, pack=spack):
self.log.debug('send_ack')
block = self.blockNumber
self.blockNumber = self.blockNumber + 1
fmt = '!hh'
self.blockNumber = (self.blockNumber + 1) 0xFFFF
fmt = '!hH'
pkt = pack(fmt, self.ACK, block)
self.send(pkt)