Skip to content

Patch 2 #35

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
zhouronghua wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Patch 2 #35

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
901637a
Update dhcpserver.py
Apr 15, 2021
5a6b482
Update dhcpserver.py
Apr 15, 2021
aae2b8d
Update dhcpserver.py
Apr 21, 2021
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
3 changes: 3 additions & 0 deletions ptftplib/dhcpserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,9 @@ def __init__(self, pkt):

# Strip off the ethernet frame and check the IP packet type. It should
# be UDP (0x11)
# for python3 it's bytes, need to decode to str first
if type(pkt) is bytes:
pkt = pkt.decode(errors='ignore')

@mpetazzoni mpetazzoni Apr 18, 2021

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My point is that I think this should happen in DHCPServer.serve_forever() (line 251):

import six
...
pkt = DhcpPacket(six.ensure_str(data))
self.handle_dhcp_request(pkt)

@zhouronghua zhouronghua Apr 19, 2021

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how about this:
zhouronghua#1 (comment)

@mpetazzoni mpetazzoni Apr 20, 2021

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. Can you get this into this PR? Don't forget to add six to the requirements.txt file.

@zhouronghua zhouronghua Apr 21, 2021

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. Can you get this into this PR? Don't forget to add six to the requirements.txt file.

sorry, it doesn't work, the content of the data have changed, i prefer to drop this PR, and adapt ord only

pkt = pkt[14:]
if ord(pkt[9]) != IP_UDP_PROTO:
raise NotDhcpPacketError()
Expand Down