Fix DHCP socket leak #122
Merged
Fix DHCP socket leak #122
Conversation
This file contains hidden or 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 6 commits
June 21, 2023 08:26
FoamyGuy
approved these changes
Jul 21, 2023
There was a problem hiding this comment.
Looks good to me. Thanks for the fixes @BiffoBear!
I tested successfully with simpletest, simpleserver, and cheerlight examples with an Ethernet Featherwing and Feather S3 TFT 8.2.0-beta.0.
I also did a quick check with git grep in the learn guide repo and didn't find any usages of any of the now-private functions.
adafruit-adabot
added a commit
to adafruit/Adafruit_CircuitPython_Bundle
that referenced
this pull request
Jul 22, 2023
Updating https://github.com/adafruit/Adafruit_CircuitPython_Wiznet5k to 5.0.1 from 3.0.0: > Merge pull request adafruit/Adafruit_CircuitPython_Wiznet5k#130 from fasteddy516/fix_socket_swap > Merge pull request adafruit/Adafruit_CircuitPython_Wiznet5k#123 from BiffoBear/remove_ntp_client > Merge pull request adafruit/Adafruit_CircuitPython_Wiznet5k#122 from BiffoBear/fix_socket_leaks Updating https://github.com/adafruit/Adafruit_CircuitPython_Requests to 2.0.1 from 2.0.0: > Merge pull request adafruit/Adafruit_CircuitPython_Requests#136 from DJDevon3/WorkingBranch Updating https://github.com/adafruit/Adafruit_CircuitPython_Bundle/circuitpython_library_list.md to NA from NA: > Updated download stats for the libraries
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.
Closes #121. Moved all references to hardware sockets in the DHCP module to
_handle_dhcp_messageand_receive_dhcp_response. Addedtry… finallyblock to ensure that the hardware socket is always closed.Made the socket number a local method attribute since it doesn't need to be stored.
Removed unused methods to initialise and release hardware sockets.
Refactored DHCP module to use higher level calls to the
WIZNET5Kinstance.Renamed several methods in
WIZNET5Kas they are private and no longer called from outsideWIZNET5K.Added
_read_socket_reservationsand_read_sndportmethods toWIZNET5Kto help dumping of socket state for troubleshooting.Tested with a DHCP server and without a DHCP server to force a TimeoutError. Hardware socket closed in both cases.
Tests carried out with
wiznet5k_simpletest.pyon w5100s, w5500 and w6100 chips.