Skip to content

Commit f3735b9

Browse files
committed
fix negotiated options
Signed-off-by: Benny Zlotnik <[email protected]>
1 parent 2d88c72 commit f3735b9

File tree

1 file changed

+4
-5
lines changed
  • packages/jumpstarter-driver-tftp/jumpstarter_driver_tftp

1 file changed

+4
-5
lines changed

packages/jumpstarter-driver-tftp/jumpstarter_driver_tftp/server.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -273,23 +273,22 @@ def _negotiate_timeout(self, requested_timeout: Optional[str]) -> float:
273273

274274
def _negotiate_options(self, options: dict) -> Tuple[dict, int, float]:
275275
negotiated = {}
276-
blksize = 512 # RFC default
276+
blksize = self.server.block_size
277277
timeout = self.server.timeout
278278

279279
if 'blksize' in options:
280280
requested = options['blksize']
281281
blksize = self._negotiate_block_size(requested)
282-
if blksize != int(requested):
283-
negotiated['blksize'] = blksize
282+
negotiated['blksize'] = blksize
284283

285284
if 'timeout' in options:
286285
requested = options['timeout']
287286
timeout = self._negotiate_timeout(requested)
288-
if timeout != int(requested):
289-
negotiated['timeout'] = timeout
287+
negotiated['timeout'] = int(timeout)
290288

291289
return negotiated, blksize, timeout
292290

291+
293292
async def _start_transfer(self, filepath: pathlib.Path, addr: Tuple[str, int],
294293
blksize: int, timeout: float, negotiated_options: dict):
295294
transfer = TftpReadTransfer(

0 commit comments

Comments
 (0)