Patch 2 #35
Open
Patch 2 #35
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
April 15, 2021 19:10
mpetazzoni
requested changes
Apr 18, 2021
ptftplib/dhcpserver.py
Outdated
| @@ -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') | |||
There was a problem hiding this comment.
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)
There was a problem hiding this comment.
how about this:
zhouronghua#1 (comment)
There was a problem hiding this comment.
Yes. Can you get this into this PR? Don't forget to add six to the requirements.txt file.
There was a problem hiding this comment.
Yes. Can you get this into this PR? Don't forget to add
sixto therequirements.txtfile.
sorry, it doesn't work, the content of the data have changed, i prefer to drop this PR, and adapt ord only
add ord adapter for python2 and python3
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
another version to solve the difference betwwen python2 and python3
decode first when get the packet