Skip to content
This repository has been archived by the owner on Oct 26, 2023. It is now read-only.

Commit

Permalink
Merge branch 'jcea-raspberry_pi'
Browse files Browse the repository at this point in the history
* jcea-raspberry_pi:
  Make ProxyDHCP compatible with Python 3
  Typo
  Show file sizes in TFTP
  Show requested files in TFTP
  Timeout logging reports the affected client
  Notify file transfer progress and timeouts
  Options are not correctly parsed/replied in Python 3
  Typo
  Typo
  "isAlive()" is deprecated in Python 3
  • Loading branch information
icb- committed Aug 29, 2020
2 parents 15119b7 + 1af7a32 commit 33dec45
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pypxe/dhcp.py
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ def craft_header(self, message):
# BOOTP legacy pad
response += b'\x00' * 64 # server name
if self.mode_proxy:
response += self.file_name
response += self.file_name.encode('ascii')
response += b'\x00' * (128 - len(self.file_name))
else:
response += b'\x00' * 128
Expand Down Expand Up @@ -300,7 +300,7 @@ def craft_options(self, opt53, client_mac):

if self.mode_proxy:
response += self.tlv_encode(60, 'PXEClient')
response += struct.pack('!BBBBBBB4sB', 43, 10, 6, 1, 0b1000, 10, 4, b'\x00' + 'PXE', 0xff)
response += struct.pack('!BBBBBBB4sB', 43, 10, 6, 1, 0b1000, 10, 4, b'\x00' + b'PXE', 0xff)
response += b'\xff'
return response

Expand Down

0 comments on commit 33dec45

Please sign in to comment.