Skip to content
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

Jump to bottom

Core compatible constants & setsockopt #157

Merged
merged 3 commits into from
Apr 22, 2024
Merged

Core compatible constants & setsockopt #157

merged 3 commits into from
Apr 22, 2024

Conversation

jepler
Copy link
Member

@jepler jepler commented Apr 17, 2024 •
edited
Loading

This is needed as a part of enabling an implementation of SSL in the CircuitPython core to work with wiznet. See adafruit/circuitpython#8954

Also closes #155 (not tested)

@jepler
Use SOCK_STREAM & SOCK_DGRAM numbers that match circuitpython core
e6bbb52 
A future enhancement to the core ssl module might require this
@jepler
remove unused constants
47d5c93
@jepler
Add setsockopt implementation
72fd989 
This is called by httpserver, and also the ssl support in the core
assumes that any socket object provides setsockopt (it passes along
calls on wrapped sockets, but eagerly fetches the "setsockopt" property
on construction of the SSL wrapper object)
@jepler jepler changed the title Core compatible socket type numbers Core compatible socket type numbers & setsockopt Apr 17, 2024
@jepler jepler changed the title Core compatible socket type numbers & setsockopt Core compatible constants & setsockopt Apr 17, 2024
jepler added a commit to adafruit/Adafruit_CircuitPython_Requests that referenced this pull request Apr 17, 2024
@jepler
Add wiznet ssl example
dd0cbf8 
This requires adafruit/circuitpython#8954
and adafruit/Adafruit_CircuitPython_Wiznet5k#157
@jepler jepler mentioned this pull request Apr 17, 2024
Merged
4 tasks
@justmobilize justmobilize mentioned this pull request Apr 20, 2024
Merged
@justmobilize
Copy link
Collaborator

Did a bunch of testing and playing with an UM Feather S3 + Ethernet FeatherWing and everything worked great. Testing a handful of things:

  • long running loops
  • ssl redirects
  • using native ssl for both wifi and ethernet at the same time

@anecdata anecdata mentioned this pull request Apr 21, 2024
Closed
FoamyGuy
FoamyGuy approved these changes Apr 22, 2024
View reviewed changes
Copy link
Contributor

@FoamyGuy FoamyGuy left a comment

Choose a reason for hiding this comment

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

This looks good to me. I tested this branch successfully on a Feather RP2040 + Ethernet Featherwing with the simpletest example from this repo and the httpserver example.

@FoamyGuy FoamyGuy merged commit 9fd20cf into main Apr 22, 2024
2 checks passed
adafruit-adabot added a commit to adafruit/Adafruit_CircuitPython_Bundle that referenced this pull request Apr 23, 2024
@adafruit-adabot
Automated update by Adabot (adafruit/adabot@38b61d2)
809d872 
Updating https://github.com/adafruit/Adafruit_CircuitPython_floppy to 2.0.0 from 1.0.11:
  > Merge pull request adafruit/Adafruit_CircuitPython_floppy#11 from adafruit/updates-incompatible-floppyio-floppsy

Updating https://github.com/adafruit/Adafruit_CircuitPython_SharpMemoryDisplay to 1.4.12 from 1.4.11:
  > Merge pull request adafruit/Adafruit_CircuitPython_SharpMemoryDisplay#24 from makermelissa/master

Updating https://github.com/adafruit/Adafruit_CircuitPython_Thermistor to 3.4.11 from 3.4.10:
  > Merge pull request adafruit/Adafruit_CircuitPython_Thermistor#22 from adafruit/dhalbert-patch-1

Updating https://github.com/adafruit/Adafruit_CircuitPython_Wiznet5k to 5.2.1 from 5.0.9:
  > Merge pull request adafruit/Adafruit_CircuitPython_Wiznet5k#151 from pinkavaj/pi-fix-recv
  > Merge pull request adafruit/Adafruit_CircuitPython_Wiznet5k#157 from adafruit/core-compatible-socket-type-numbers
  > Merge pull request adafruit/Adafruit_CircuitPython_Wiznet5k#153 from us3r64/fix/socket-httpserver-poll
  > Merge pull request adafruit/Adafruit_CircuitPython_Wiznet5k#149 from pinkavaj/pi-fix-close-wait
  > Merge pull request adafruit/Adafruit_CircuitPython_Wiznet5k#156 from kevin-tritz/main

Updating https://github.com/adafruit/Adafruit_CircuitPython_BLE to 10.0.7 from 10.0.6:
  > Merge pull request adafruit/Adafruit_CircuitPython_BLE#195 from adafruit/dhalbert-patch-1

Updating https://github.com/adafruit/Adafruit_CircuitPython_BusDevice to 5.2.9 from 5.2.8:
  > Merge pull request adafruit/Adafruit_CircuitPython_BusDevice#99 from RetiredWizard/spicsinit

Updating https://github.com/adafruit/Adafruit_CircuitPython_Bundle/circuitpython_library_list.md to NA from NA:
  > Updated download stats for the libraries
jepler added a commit to adafruit/Adafruit_CircuitPython_Requests that referenced this pull request Jul 3, 2024
@jepler
Add wiznet ssl example
73be888 
This requires adafruit/circuitpython#8954
and adafruit/Adafruit_CircuitPython_Wiznet5k#157
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FoamyGuy FoamyGuy FoamyGuy approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

AttributeError: 'socket' object has no attribute 'setsockopt' (TLS)
3 participants
@jepler @justmobilize @FoamyGuy