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.

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

Made libwebsocket usage default #555

Merged
merged 7 commits into from
Apr 9, 2024

Conversation

AssemblyJohn
Copy link
Contributor

@AssemblyJohn AssemblyJohn commented Apr 8, 2024

Describe your changes

Websocket++ usage has been deprecated and due to future heavy interface refactoring it has been removed from the default compilation. Libwebsocket has been made the default websocket library that is used.

Issue ticket number and link

Checklist before requesting a review

  • I have performed a self-review of my code
  • I have made corresponding changes to the documentation
  • I read the contribution documentation and made sure that my changes meet its requirements

@AssemblyJohn AssemblyJohn force-pushed the enhancement/deprecate_websocketpp_default branch 3 times, most recently from 9e416fb to e9ac589 Compare April 8, 2024 10:16
…h a cmake option that is default OFF

Signed-off-by: AssemblyJohn <[email protected]>
@AssemblyJohn AssemblyJohn force-pushed the enhancement/deprecate_websocketpp_default branch from e9ac589 to 7e5ad55 Compare April 8, 2024 10:21
@marcemmers marcemmers self-assigned this Apr 8, 2024
@AssemblyJohn AssemblyJohn self-assigned this Apr 8, 2024
AssemblyJohn and others added 5 commits April 8, 2024 14:12
Co-authored-by: Piet Gömpel <[email protected]>
Signed-off-by: John <[email protected]>
Co-authored-by: Piet Gömpel <[email protected]>
Signed-off-by: John <[email protected]>
Co-authored-by: Piet Gömpel <[email protected]>
Signed-off-by: John <[email protected]>
Co-authored-by: Piet Gömpel <[email protected]>
Signed-off-by: John <[email protected]>
Signed-off-by: AssemblyJohn <[email protected]>
@AssemblyJohn AssemblyJohn requested a review from Pietfried April 8, 2024 11:58
@AssemblyJohn AssemblyJohn dismissed Pietfried’s stale review April 8, 2024 14:10

First batch of requested changes has been resolved.

@AssemblyJohn AssemblyJohn requested a review from hikinggrass April 9, 2024 08:15
if (connection_options.security_profile <= 1) {
this->websocket = std::make_unique<WebsocketPlain>(connection_options);
} else if (connection_options.security_profile >= 2) {
this->websocket = std::make_unique<WebsocketTLS>(connection_options, evse_security);
}
#else
this->websocket = std::make_unique<WebsocketTlsTPM>(connection_options, evse_security);
Copy link
Contributor

Choose a reason for hiding this comment

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

We should rename this class in another PR at some point..

@AssemblyJohn AssemblyJohn merged commit 3ce375e into main Apr 9, 2024
4 checks passed
@AssemblyJohn AssemblyJohn deleted the enhancement/deprecate_websocketpp_default branch April 9, 2024 12:31
folkengine pushed a commit to US-JOET/libocpp that referenced this pull request Apr 15, 2024
* Made libwebsocket usage as default, and websocket++ usage enabled with a cmake option that is default OFF
* Update README.md
* Update dependencies.yaml
* Update lib/CMakeLists.txt
* Fixed import issue
* Add missing find_package for libwebsockets in non-edm builds
---------

Signed-off-by: AssemblyJohn <[email protected]>
Signed-off-by: John <[email protected]>
Signed-off-by: Kai-Uwe Hermann <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants