Skip to content

Don't send more than one ACK to the last DATA packet when writing. #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jcollie wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Don't send more than one ACK to the last DATA packet when writing. #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions tftp/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,18 +116,26 @@ def blockWriteSuccess(self, ign, datagram):

"""
bytes = ACKDatagram(datagram.blocknum).to_wire()
self.timeout_watchdog = SequentialCall.run(self.timeout[:-1],
callable=self.sendData, callable_args=[bytes, ],
on_timeout=lambda: self._clock.callLater(self.timeout[-1], self.timedOut),
run_now=True,
_clock=self._clock
)
if len(datagram.data) < self.block_size:
self._clock.callLater(0, self.sendData, bytes)
self.timeout_watchdog = SequentialCall.run(self.timeout[:-1],
callable=lambda: None,
on_timeout=lambda: self._clock.callLater(self.timeout[-1], self.timedOut),
run_now=False,
_clock=self._clock
)
self.completed = True
self.writer.finish()
# TODO: If self.tsize is not None, compare it with the actual
# count of bytes written. Log if there's a mismatch. Should it
# also emit an error datagram?
else:
self.timeout_watchdog = SequentialCall.run(self.timeout[:-1],
callable=self.sendData, callable_args=[bytes, ],
on_timeout=lambda: self._clock.callLater(self.timeout[-1], self.timedOut),
run_now=True,
_clock=self._clock
)

def blockWriteFailure(self, failure):
"""Write failed"""
Expand Down