summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsoulier <msoulier@63283fd4-ec1e-0410-9879-cb7f675518da>2007-02-17 01:40:02 +0000
committermsoulier <msoulier@63283fd4-ec1e-0410-9879-cb7f675518da>2007-02-17 01:40:02 +0000
commitc7d86d36dfd4ab7220fefb8930e2940ec20e69db (patch)
treee8260a7838e0d56a51501816eddc5aabbcac4e11
parent07906cdbd96865cb9d3688cc1e463d7730d62c20 (diff)
downloadtftpy-c7d86d36dfd4ab7220fefb8930e2940ec20e69db.tar.gz
Supplying a default blksize options in the server.
Fix for 1633625. git-svn-id: https://tftpy.svn.sourceforge.net/svnroot/tftpy/trunk@60 63283fd4-ec1e-0410-9879-cb7f675518da
-rw-r--r--bin/tftpy_client.py1
-rw-r--r--tftpy/TftpServer.py2
2 files changed, 1 insertions, 2 deletions
diff --git a/bin/tftpy_client.py b/bin/tftpy_client.py
index 7b5fbc5..c3fa1a3 100644
--- a/bin/tftpy_client.py
+++ b/bin/tftpy_client.py
@@ -29,7 +29,6 @@ def main():
dest='blocksize',
help='udp packet size to use (default: 512)',
default=512)
- # FIXME - default should be same as --filename
parser.add_option('-o',
'--output',
action='store',
diff --git a/tftpy/TftpServer.py b/tftpy/TftpServer.py
index 5b5d705..dcb86b1 100644
--- a/tftpy/TftpServer.py
+++ b/tftpy/TftpServer.py
@@ -185,7 +185,7 @@ class TftpServerHandler(TftpSession):
self.mode = None
self.filename = None
self.sock = False
- self.options = {}
+ self.options = { 'blksize': DEF_BLKSIZE }
self.blocknumber = 0
self.buffer = None
self.fileobj = None