Improving sample client output on error and fixing default blocksize when

server ignores options.

1 files changed, 6 insertions, 0 deletions

diff --git a/tftpy/TftpClient.py b/tftpy/TftpClient.py
index 0935c61..a840689 100644
--- a/tftpy/TftpClient.py
+++ b/tftpy/TftpClient.py
@@ -119,6 +119,12 @@ class TftpClient(TftpSession):
             if isinstance(recvpkt, TftpPacketDAT):
                 logger.debug("recvpkt.blocknumber = %d" % recvpkt.blocknumber)
                 logger.debug("curblock = %d" % curblock)
+
+                if self.state.state == 'rrq' and self.options:
+                    logger.info("no OACK, our options were ignored")
+                    self.options = { 'blksize': DEF_BLKSIZE }
+                    self.state.state = 'ack'
+
                 expected_block = curblock + 1
                 if expected_block > 65535:
                     logger.debug("block number rollover to 0 again")